diff --git a/common/server/drastikbot.nix b/common/server/drastikbot.nix index 9fd2075..f3e33a2 100644 --- a/common/server/drastikbot.nix +++ b/common/server/drastikbot.nix @@ -1,4 +1,4 @@ -{ config, pkgs, lib, ... }: +{ config, pkgs, lib, inputs, ... }: let cfg = config.services.drastikbot; @@ -9,26 +9,9 @@ let format = "other"; srcs = [ - (pkgs.fetchFromGitHub { - name = pname; - owner = "olagood"; - repo = pname; - rev = version; - sha256 = "1L8vTE1YEhFWzY5RYb+s5Hb4LrVJNN2leKlZEugEyRU="; - }) - (pkgs.fetchFromGitHub { - name = "drastikbot_modules"; - owner = "olagood"; - repo = "drastikbot_modules"; - rev = version; - sha256 = "w1164FkRkeyWnx6a95WDbwEUvNkNwFWa/6mhKtgVw0c="; - }) - (pkgs.fetchgit { - name = "dailybuild_modules"; - url = "https://git.neet.dev/zuckerberg/dailybuild_modules.git"; - rev = "b2c8335badd1efd9be856263b739f3429cff54de"; - sha256 = "xNnlEQyYVgUxwo80CSbs3YxVhRsn3gRRfMLceRxrk2s="; - }) + inputs.drastikbot + inputs.drastikbot_modules + inputs.dailybuild_modules ]; sourceRoot = pname; diff --git a/flake.lock b/flake.lock index cb453c9..37a2697 100644 --- a/flake.lock +++ b/flake.lock @@ -18,6 +18,56 @@ "type": "github" } }, + "dailybuild_modules": { + "flake": false, + "locked": { + "lastModified": 1629735378, + "narHash": "sha256-8goq0lEOhqfpLPRyzUeUdjkHjXRmd7gL4MNsKWPOuFY=", + "ref": "master", + "rev": "63378f60aa6174a3e557c2b9a24098eca936faad", + "revCount": 4, + "type": "git", + "url": "https://git.neet.dev/zuckerberg/dailybuild_modules.git" + }, + "original": { + "type": "git", + "url": "https://git.neet.dev/zuckerberg/dailybuild_modules.git" + } + }, + "drastikbot": { + "flake": false, + "locked": { + "lastModified": 1596211584, + "narHash": "sha256-1L8vTE1YEhFWzY5RYb+s5Hb4LrVJNN2leKlZEugEyRU=", + "owner": "olagood", + "repo": "drastikbot", + "rev": "ef72e3afe7602d95c8b014202e220f04796900ab", + "type": "github" + }, + "original": { + "owner": "olagood", + "ref": "v2.1", + "repo": "drastikbot", + "type": "github" + } + }, + "drastikbot_modules": { + "flake": false, + "locked": { + "lastModified": 1619214744, + "narHash": "sha256-w1164FkRkeyWnx6a95WDbwEUvNkNwFWa/6mhKtgVw0c=", + "owner": "olagood", + "repo": "drastikbot_modules", + "rev": "3af549a8c3f6e55b63758a61a751bebb1b2db3a3", + "type": "github" + }, + "original": { + "owner": "olagood", + "ref": "v2.1", + "repo": "drastikbot_modules", + "type": "github" + } + }, "flake-utils": { "locked": { "lastModified": 1620759905, @@ -146,6 +196,9 @@ "root": { "inputs": { "agenix": "agenix", + "dailybuild_modules": "dailybuild_modules", + "drastikbot": "drastikbot", + "drastikbot_modules": "drastikbot_modules", "nixpkgs": "nixpkgs_2", "nixpkgs-peertube": "nixpkgs-peertube", "radio": "radio", diff --git a/flake.nix b/flake.nix index 7db76e6..f6c157e 100644 --- a/flake.nix +++ b/flake.nix @@ -4,9 +4,19 @@ nixpkgs-peertube.url = "github:GoogleBot42/nixpkgs/add-peertube-service"; simple-nixos-mailserver.url = "gitlab:simple-nixos-mailserver/nixos-mailserver/nixos-21.05"; agenix.url = "github:ryantm/agenix"; + + # radio radio.url = "git+https://git.neet.dev/zuckerberg/radio.git?ref=main"; radio-web.url = "git+https://git.neet.dev/zuckerberg/radio-web.git"; radio-web.flake = false; + + # drastikbot + drastikbot.url = "github:olagood/drastikbot/v2.1"; + drastikbot.flake = false; + drastikbot_modules.url = "github:olagood/drastikbot_modules/v2.1"; + drastikbot_modules.flake = false; + dailybuild_modules.url = "git+https://git.neet.dev/zuckerberg/dailybuild_modules.git"; + dailybuild_modules.flake = false; }; outputs = inputs: {