diff options
| author | lassulus <lass@blue.r> | 2018-06-04 12:55:49 +0200 |
|---|---|---|
| committer | lassulus <lass@blue.r> | 2018-06-04 12:55:49 +0200 |
| commit | 680e063c0fe208da326eaa8fe01c9c712e8e04db (patch) | |
| tree | b64f5a77edfbd25517306548411cf692ef9dd1b4 | |
| parent | 113f4bf82e3b4fad14b13cceeeff2319d1f1270a (diff) | |
kops -> krops
| -rw-r--r-- | krebs/krops.nix (renamed from krebs/kops.nix) | 17 | ||||
| -rw-r--r-- | krebs/source.nix | 2 |
2 files changed, 9 insertions, 10 deletions
diff --git a/krebs/kops.nix b/krebs/krops.nix index add1a359c..03bcdc83e 100644 --- a/krebs/kops.nix +++ b/krebs/krops.nix @@ -1,15 +1,14 @@ { name }: rec { - kops = (import <nixpkgs> {}).fetchgit { - url = https://cgit.krebsco.de/kops/; - rev = "e89cf20d4310070a877c2e24a287659546b561c9"; - sha256 = "0wg8d80sxa46z4i7ir79sci2hwmv3qskzqdg0si64p6vazy8vckb"; + krops = builtins.fetchGit { + url = https://cgit.krebsco.de/krops/; + rev = "4e466eaf05861b47365c5ef46a31a188b70f3615"; }; - lib = import "${kops}/lib"; + lib = import "${krops}/lib"; # TODO document why pkgs should be used like this - pkgs = import "${kops}/pkgs" {}; + pkgs = import "${krops}/pkgs" {}; krebs-source = { nixpkgs.git = { @@ -51,14 +50,14 @@ ]; # 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; }; target = "root@${name}/var/src"; }; # 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; }; - target = "${lib.getEnv "HOME"}/tmp/${name}-kops-test-src"; + target = "${lib.getEnv "HOME"}/tmp/${name}-krops-test-src"; }; } diff --git a/krebs/source.nix b/krebs/source.nix index 49f464f61..2aaa27b2b 100644 --- a/krebs/source.nix +++ b/krebs/source.nix @@ -22,7 +22,7 @@ in }; stockholm.file = toString <stockholm>; 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 ] |