diff --git a/flake.lock b/flake.lock index 8a407c5..14a6710 100644 --- a/flake.lock +++ b/flake.lock @@ -1,28 +1,5 @@ { "nodes": { - "deploykit": { - "inputs": { - "flake-parts": [ - "flake-parts" - ], - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1666677873, - "narHash": "sha256-eKyqsGgnJmF2wUYa7HjC1Jwsh03qVTJEP1MtL7JL4Ts=", - "owner": "numtide", - "repo": "deploykit", - "rev": "bcc1cfc6be8bed354ac776404da8da044ca0a252", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "deploykit", - "type": "github" - } - }, "flake-compat": { "flake": false, "locked": { @@ -316,7 +293,6 @@ }, "root": { "inputs": { - "deploykit": "deploykit", "flake-parts": "flake-parts", "hercules-ci-agent": "hercules-ci-agent", "nixpkgs": "nixpkgs_2", diff --git a/flake.nix b/flake.nix index 124fdbc..0766fbe 100644 --- a/flake.nix +++ b/flake.nix @@ -23,10 +23,6 @@ flake-parts.url = "github:hercules-ci/flake-parts"; flake-parts.inputs.nixpkgs-lib.follows = "nixpkgs"; - - deploykit.url = "github:numtide/deploykit"; - deploykit.inputs.nixpkgs.follows = "nixpkgs"; - deploykit.inputs.flake-parts.follows = "flake-parts"; }; outputs = { @@ -47,7 +43,6 @@ }: { devShells.default = pkgs.callPackage ./shell.nix { inherit (inputs'.sops-nix.packages) sops-import-keys-hook; - inherit (inputs'.deploykit.packages) deploykit; }; }; flake.nixosConfigurations = let diff --git a/shell.nix b/shell.nix index aafdcf2..c9f9016 100644 --- a/shell.nix +++ b/shell.nix @@ -1,6 +1,5 @@ { pkgs ? import <nixpkgs> {} , sops-import-keys-hook -, deploykit }: with pkgs; @@ -20,10 +19,14 @@ mkShellNoCC { )) jq sops - python3.pkgs.invoke + (python3.withPackages ( + p: [ + p.deploykit + p.invoke + ] + )) rsync sops-import-keys-hook - deploykit ]; }