From 743c0ec2d8dec65cf0a7a67c9d4971a5b3325fbe Mon Sep 17 00:00:00 2001 From: Ashish SHUKLA Date: Fri, 29 Oct 2021 23:33:25 +0530 Subject: [PATCH] cni-flannel-plugin: 1.1 -> 1.0.0 Update to a properly tagged version. Previously the tag was temporary, and it was not obvious. See flannel-io/cni-plugin/issues/21 While here, also add some install time checking --- pkgs/tools/networking/flannel/plugin.nix | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/flannel/plugin.nix b/pkgs/tools/networking/flannel/plugin.nix index 51e29a31ddc5..db55a3dfd04c 100644 --- a/pkgs/tools/networking/flannel/plugin.nix +++ b/pkgs/tools/networking/flannel/plugin.nix @@ -2,22 +2,29 @@ buildGoModule rec { pname = "cni-plugin-flannel"; - version = "1.1"; + version = "1.0.0"; src = fetchFromGitHub { owner = "flannel-io"; repo = "cni-plugin"; rev = "v${version}"; - sha256 = "sha256-DZC6uJR6TIHdmu8kZcbM+RC7pdejqLCOep0v3PM8/QY="; + sha256 = "sha256-zWxw4LZIlkT88yGTnxdupq7cUSacNRxPzzp01O9USDw="; }; - vendorSha256 = "sha256-TLAwE3pTnJYOi1AsOQfsG6t3xLKOah/7DvYjsqyltKs="; + vendorSha256 = "sha256-zteMlrvRTVxOFlBy+z/qfiSii8+c8PMapwIsdbN+Aig="; postInstall = '' mv $out/bin/cni-plugin $out/bin/flannel ''; doCheck = false; + doInstallCheck = true; + + installCheckPhase = '' + runHook preInstallCheck + $out/bin/flannel 2>&1 | fgrep -q v$version + runHook postInstallCheck + ''; meta = with lib; { description = "flannel CNI plugin";