Merge pull request #218268 from stehessel/cosign-fix-darwin-build

cosign: allow darwin networking for tests

authored by

Thomas Gerbet and committed by
GitHub
43230448 246e2960

+24 -4
+24 -4
pkgs/tools/security/cosign/default.nix
··· 1 - { stdenv, lib, buildGoModule, fetchFromGitHub, pcsclite, pkg-config, installShellFiles, PCSC, pivKeySupport ? true, pkcs11Support ? true }: 2 - 3 buildGoModule rec { 4 pname = "cosign"; 5 version = "2.0.0"; ··· 11 sha256 = "sha256-919oxYi4e56EhSBN0FdcEZBA430owaDnKHkgTneScXw="; 12 }; 13 14 - buildInputs = lib.optional (stdenv.isLinux && pivKeySupport) (lib.getDev pcsclite) 15 ++ lib.optionals (stdenv.isDarwin && pivKeySupport) [ PCSC ]; 16 17 nativeBuildInputs = [ pkg-config installShellFiles ]; ··· 22 "cmd/cosign" 23 ]; 24 25 - tags = [] ++ lib.optionals pivKeySupport [ "pivkey" ] ++ lib.optionals pkcs11Support [ "pkcs11key" ]; 26 27 ldflags = [ 28 "-s" ··· 31 "-X sigs.k8s.io/release-utils/version.gitTreeState=clean" 32 ]; 33 34 preCheck = '' 35 # test all paths 36 unset subPackages ··· 46 --fish <($out/bin/cosign completion fish) \ 47 --zsh <($out/bin/cosign completion zsh) 48 ''; 49 50 meta = with lib; { 51 homepage = "https://github.com/sigstore/cosign";
··· 1 + { stdenv 2 + , lib 3 + , buildGoModule 4 + , fetchFromGitHub 5 + , pcsclite 6 + , pkg-config 7 + , installShellFiles 8 + , PCSC 9 + , pivKeySupport ? true 10 + , pkcs11Support ? true 11 + , testers 12 + , cosign 13 + }: 14 buildGoModule rec { 15 pname = "cosign"; 16 version = "2.0.0"; ··· 22 sha256 = "sha256-919oxYi4e56EhSBN0FdcEZBA430owaDnKHkgTneScXw="; 23 }; 24 25 + buildInputs = 26 + lib.optional (stdenv.isLinux && pivKeySupport) (lib.getDev pcsclite) 27 ++ lib.optionals (stdenv.isDarwin && pivKeySupport) [ PCSC ]; 28 29 nativeBuildInputs = [ pkg-config installShellFiles ]; ··· 34 "cmd/cosign" 35 ]; 36 37 + tags = [ ] ++ lib.optionals pivKeySupport [ "pivkey" ] ++ lib.optionals pkcs11Support [ "pkcs11key" ]; 38 39 ldflags = [ 40 "-s" ··· 43 "-X sigs.k8s.io/release-utils/version.gitTreeState=clean" 44 ]; 45 46 + __darwinAllowLocalNetworking = true; 47 + 48 preCheck = '' 49 # test all paths 50 unset subPackages ··· 60 --fish <($out/bin/cosign completion fish) \ 61 --zsh <($out/bin/cosign completion zsh) 62 ''; 63 + 64 + passthru.tests.version = testers.testVersion { 65 + package = cosign; 66 + command = "cosign version"; 67 + version = "v${version}"; 68 + }; 69 70 meta = with lib; { 71 homepage = "https://github.com/sigstore/cosign";