Merge pull request #219327 from aaronjheng/yubihsm-connector

yubihsm-connector: 3.0.2 -> 3.0.4
NixOS · Mar 19, 2023 · eefe9c8 · eefe9c8
2 parents b58639c + c5a6d51
commit eefe9c8
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 124 deletions.
diff --git a/pkgs/tools/security/yubihsm-connector/default.nix b/pkgs/tools/security/yubihsm-connector/default.nix
@@ -2,22 +2,16 @@
 
 buildGoModule rec {
   pname = "yubihsm-connector";
-  version = "3.0.2";
+  version = "3.0.4";
 
   src = fetchFromGitHub {
     owner = "Yubico";
     repo = "yubihsm-connector";
     rev = version;
-    sha256 = "FQ64tSZN55QpXjMZITzlWOPTKSgnoCpkRngQUQHVavc=";
+    hash = "sha256-snoQZsmKQPcsB5EpZc4yon02QbxNU5B5TAwRPjs1O5I=";
   };
 
-  vendorSha256 = "kVBzdJk/1LvjdUtLqHAw9ZxDfCo3mBWVMYG/nQXpDrk=";
-
-  patches = [
-    # Awaiting a new release to fix the upstream lockfile
-    # https://github.com/Yubico/yubihsm-connector/issues/36
-    ./lockfile-fix.patch
-  ];
+  vendorHash = "sha256-XW7rEHY3S+M3b6QjmINgrCak+BqCEV3PJP90jz7J47A=";
 
   nativeBuildInputs = [
     pkg-config
@@ -27,6 +21,8 @@ buildGoModule rec {
     libusb1
   ];
 
+  ldflags = [ "-s" "-w" ];
+
   preBuild = ''
     go generate
   '';

diff --git a/pkgs/tools/security/yubihsm-connector/lockfile-fix.patch b/pkgs/tools/security/yubihsm-connector/lockfile-fix.patch