Skip to content

Commit 0cd363c

Browse files
committed
fix: handle nix breaking change of removing buildGoPackage
Signed-off-by: Bence Csati <[email protected]>
1 parent 26d64fc commit 0cd363c

File tree

2 files changed

+4
-18
lines changed

2 files changed

+4
-18
lines changed

deploy/dev/multi-dc/test/multi-dc-raft.sh

+4-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ set -xeo pipefail
77
# - kubectl
88
# - helm3
99
# - https://github.com/subfuzion/envtpl
10-
# - https://github.com/hankjacobs/cidr
10+
# - go
1111
# - jq
1212
# - kind
1313
# - vault
@@ -50,6 +50,9 @@ function metallb_setup {
5050
}
5151

5252
function cidr_range {
53+
go get github.com/hankjacobs/cidr
54+
go install github.com/hankjacobs/cidr
55+
5356
local cidr=$1
5457
cidr "${cidr}" | tr -d ' '
5558
}

flake.nix

-17
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,6 @@
5656
self'.packages.licensei
5757
self'.packages.kurun
5858
self'.packages.envtpl
59-
self'.packages.cidr
6059
self'.packages.vault
6160
];
6261

@@ -172,22 +171,6 @@
172171

173172
subPackages = [ "cmd/envtpl" ];
174173
};
175-
176-
cidr = pkgs.buildGoPackage rec {
177-
pname = "cidr";
178-
version = "9c69a7cbc86a584f29cb8492b245e17b0267237d";
179-
180-
goPackagePath = "github.com/hankjacobs/cidr";
181-
182-
src = pkgs.fetchFromGitHub {
183-
owner = "hankjacobs";
184-
repo = "cidr";
185-
rev = "9c69a7cbc86a584f29cb8492b245e17b0267237d";
186-
sha256 = "sha256-kdPTGjXcna/Khdcvn+IWjoqCeWoQnYvXdEAy0bqKb24=";
187-
};
188-
189-
subPackages = [ "." ];
190-
};
191174
};
192175
};
193176
};

0 commit comments

Comments
 (0)