switch to nixpkgs deploykit

Flake lock file updates:

• Removed input 'deploykit'
• Removed input 'deploykit/flake-parts'
• Removed input 'deploykit/nixpkgs'
This commit is contained in:
zowoq 2022-11-04 08:53:33 +10:00
parent 856120e1ef
commit e4a10c6daf
3 changed files with 6 additions and 32 deletions

24
flake.lock generated
View file

@ -1,28 +1,5 @@
{ {
"nodes": { "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-compat": {
"flake": false, "flake": false,
"locked": { "locked": {
@ -316,7 +293,6 @@
}, },
"root": { "root": {
"inputs": { "inputs": {
"deploykit": "deploykit",
"flake-parts": "flake-parts", "flake-parts": "flake-parts",
"hercules-ci-agent": "hercules-ci-agent", "hercules-ci-agent": "hercules-ci-agent",
"nixpkgs": "nixpkgs_2", "nixpkgs": "nixpkgs_2",

View file

@ -23,10 +23,6 @@
flake-parts.url = "github:hercules-ci/flake-parts"; flake-parts.url = "github:hercules-ci/flake-parts";
flake-parts.inputs.nixpkgs-lib.follows = "nixpkgs"; 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 = { outputs = {
@ -47,7 +43,6 @@
}: { }: {
devShells.default = pkgs.callPackage ./shell.nix { devShells.default = pkgs.callPackage ./shell.nix {
inherit (inputs'.sops-nix.packages) sops-import-keys-hook; inherit (inputs'.sops-nix.packages) sops-import-keys-hook;
inherit (inputs'.deploykit.packages) deploykit;
}; };
}; };
flake.nixosConfigurations = let flake.nixosConfigurations = let

View file

@ -1,6 +1,5 @@
{ pkgs ? import <nixpkgs> {} { pkgs ? import <nixpkgs> {}
, sops-import-keys-hook , sops-import-keys-hook
, deploykit
}: }:
with pkgs; with pkgs;
@ -20,10 +19,14 @@ mkShellNoCC {
)) ))
jq jq
sops sops
python3.pkgs.invoke (python3.withPackages (
p: [
p.deploykit
p.invoke
]
))
rsync rsync
sops-import-keys-hook sops-import-keys-hook
deploykit
]; ];
} }