diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2023-11-09 00:02:14 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-11-09 00:02:14 +0000 |
| commit | 00a0662a3ca0e36397dcc5e3244a7286d46232d4 (patch) | |
| tree | 6b72401855a55cc3960620c4e3428b3abbb79086 /pkgs/tools/security | |
| parent | 536833ef29720974616732e7de73991d3056ca3a (diff) | |
| parent | 1e45a2364239087f7fae9a0dcc97cbdd29aabc78 (diff) | |
| download | nixpkgs-00a0662a3ca0e36397dcc5e3244a7286d46232d4.tar nixpkgs-00a0662a3ca0e36397dcc5e3244a7286d46232d4.tar.gz nixpkgs-00a0662a3ca0e36397dcc5e3244a7286d46232d4.tar.bz2 nixpkgs-00a0662a3ca0e36397dcc5e3244a7286d46232d4.tar.lz nixpkgs-00a0662a3ca0e36397dcc5e3244a7286d46232d4.tar.xz nixpkgs-00a0662a3ca0e36397dcc5e3244a7286d46232d4.tar.zst nixpkgs-00a0662a3ca0e36397dcc5e3244a7286d46232d4.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/tools/security')
| -rw-r--r-- | pkgs/tools/security/age/default.nix | 5 | ||||
| -rw-r--r-- | pkgs/tools/security/cosign/default.nix | 7 |
2 files changed, 9 insertions, 3 deletions
diff --git a/pkgs/tools/security/age/default.nix b/pkgs/tools/security/age/default.nix index 8ad4ff9c904..ea8108fde30 100644 --- a/pkgs/tools/security/age/default.nix +++ b/pkgs/tools/security/age/default.nix @@ -53,6 +53,11 @@ buildGoModule rec { fi ''; + # plugin test is flaky, see https://github.com/FiloSottile/age/issues/517 + checkFlags = [ + "-skip" "TestScript/plugin" + ]; + meta = with lib; { homepage = "https://age-encryption.org/"; description = "Modern encryption tool with small explicit keys"; diff --git a/pkgs/tools/security/cosign/default.nix b/pkgs/tools/security/cosign/default.nix index c08a8cf1dd1..3e8acc96f29 100644 --- a/pkgs/tools/security/cosign/default.nix +++ b/pkgs/tools/security/cosign/default.nix @@ -13,13 +13,13 @@ }: buildGoModule rec { pname = "cosign"; - version = "2.2.0"; + version = "2.2.1"; src = fetchFromGitHub { owner = "sigstore"; repo = pname; rev = "v${version}"; - hash = "sha256-VE/rm85KZs3JWMsidIlUGJ9JrtZ4VBI+Go1yujq7z1s="; + hash = "sha256-J/CQonW/ICrNUSQXVZPMR+WACZYJH0eH6bXhdXE27TY="; }; buildInputs = @@ -28,7 +28,7 @@ buildGoModule rec { nativeBuildInputs = [ pkg-config installShellFiles ]; - vendorHash = "sha256-mpT4/BS/NofMueBbwhh4v6pNEONEpWM9RDKuYZ+9BtA="; + vendorHash = "sha256-RPwU6W6a9mnfriyz3ASvamZ3jEG6C2ug/MTp1Pahc/Q="; subPackages = [ "cmd/cosign" @@ -52,6 +52,7 @@ buildGoModule rec { rm pkg/cosign/ctlog_test.go # Require network access rm pkg/cosign/tlog_test.go # Require network access rm cmd/cosign/cli/verify/verify_blob_attestation_test.go # Require network access + rm cmd/cosign/cli/verify/verify_blob_test.go # Require network access ''; postInstall = '' |