Merge pull request #94598 from kampka/kops

kops_1_18: init at 1.18.0
This commit is contained in:
Frederik Rietdijk 2020-08-31 16:50:46 +02:00 committed by GitHub
commit 90e5341240
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 10 deletions

View File

@ -3,8 +3,8 @@
let
goPackagePath = "k8s.io/kops";
generic = { version, sha256, ...}@attrs:
let attrs' = builtins.removeAttrs attrs ["version" "sha256"] ; in
generic = { version, sha256, rev ? version, ...}@attrs:
let attrs' = builtins.removeAttrs attrs ["version" "sha256" "rev"] ; in
buildGoPackage {
pname = "kops";
inherit version;
@ -12,7 +12,7 @@ let
inherit goPackagePath;
src = fetchFromGitHub {
rev = version;
rev = rev;
owner = "kubernetes";
repo = "kops";
inherit sha256;
@ -51,11 +51,6 @@ in rec {
mkKops = generic;
kops_1_15 = mkKops {
version = "1.15.3";
sha256 = "0pzgrsl61nw8pm3s032lj020fw13x3fpzlj7lknsnd581f0gg4df";
};
kops_1_16 = mkKops {
version = "1.16.4";
sha256 = "0qi80hzd5wc8vn3y0wsckd7pq09xcshpzvcr7rl5zd4akxb0wl3f";
@ -65,4 +60,10 @@ in rec {
version = "1.17.1";
sha256 = "1km6nwanmhfx8rl1wp445z9ib50jr2f86rd92vilm3q4rs9kig1h";
};
kops_1_18 = mkKops rec {
version = "1.18.0";
sha256 = "16zbjxxv08j31y7lhkqx2bnx0pc3r0vpfrlhdjs26z22p5rc4rrh";
rev = "v${version}";
};
}

View File

@ -26675,11 +26675,11 @@ in
# Exceptions are versions that we need to keep to allow upgrades from older NixOS releases
inherit (callPackage ../applications/networking/cluster/kops {})
mkKops
kops_1_15
kops_1_16
kops_1_17
kops_1_18
;
kops = kops_1_17;
kops = kops_1_18;
lguf-brightness = callPackage ../misc/lguf-brightness { };