kops -> krops

This commit is contained in:
lassulus 2018-06-04 12:55:49 +02:00
parent 113f4bf82e
commit 680e063c0f
2 changed files with 9 additions and 10 deletions

View File

@ -1,15 +1,14 @@
{ name }: rec { { name }: rec {
kops = (import <nixpkgs> {}).fetchgit { krops = builtins.fetchGit {
url = https://cgit.krebsco.de/kops/; url = https://cgit.krebsco.de/krops/;
rev = "e89cf20d4310070a877c2e24a287659546b561c9"; rev = "4e466eaf05861b47365c5ef46a31a188b70f3615";
sha256 = "0wg8d80sxa46z4i7ir79sci2hwmv3qskzqdg0si64p6vazy8vckb";
}; };
lib = import "${kops}/lib"; lib = import "${krops}/lib";
# TODO document why pkgs should be used like this # TODO document why pkgs should be used like this
pkgs = import "${kops}/pkgs" {}; pkgs = import "${krops}/pkgs" {};
krebs-source = { krebs-source = {
nixpkgs.git = { nixpkgs.git = {
@ -51,14 +50,14 @@
]; ];
# usage: $(nix-build --no-out-link --argstr name HOSTNAME -A deploy) # usage: $(nix-build --no-out-link --argstr name HOSTNAME -A deploy)
deploy = pkgs.kops.writeDeploy "${name}-deploy" { deploy = pkgs.krops.writeDeploy "${name}-deploy" {
source = source { test = false; }; source = source { test = false; };
target = "root@${name}/var/src"; target = "root@${name}/var/src";
}; };
# usage: $(nix-build --no-out-link --argstr name HOSTNAME -A test) # usage: $(nix-build --no-out-link --argstr name HOSTNAME -A test)
test = pkgs.kops.writeTest "${name}-test" { test = pkgs.krops.writeTest "${name}-test" {
source = source { test = true; }; source = source { test = true; };
target = "${lib.getEnv "HOME"}/tmp/${name}-kops-test-src"; target = "${lib.getEnv "HOME"}/tmp/${name}-krops-test-src";
}; };
} }

View File

@ -22,7 +22,7 @@ in
}; };
stockholm.file = toString <stockholm>; stockholm.file = toString <stockholm>;
stockholm-version.pipe = "${pkgs.stockholm}/bin/get-version"; stockholm-version.pipe = "${pkgs.stockholm}/bin/get-version";
nixpkgs = (import ./kops.nix { name = ""; }).krebs-source.nixpkgs; nixpkgs = (import ./krops.nix { name = ""; }).krebs-source.nixpkgs;
} }
override override
] ]