pyrox.dev
Merge pull request #176645 from bdd/certigo-patch-tests
certigo: patch tests and enable checks on Darwin
authored by
Mario Rodas
and committed by
GitHub
a785565f
02ab2e2a
+15
-6
pkgs/tools/admin/certigo/default.nix
+15
-6
pkgs/tools/admin/certigo/default.nix
···
1
-
{ lib, stdenv, buildGoModule, fetchFromGitHub }:
1
+
{ lib, stdenv, buildGoModule, fetchFromGitHub, fetchpatch }:
2
2
3
3
buildGoModule rec {
4
4
pname = "certigo";
···
11
11
sha256 = "sha256-XGR6xIXdFLnJTFd+mJneRb/WkLmi0Jscta9Bj3paM1M=";
12
12
};
13
13
14
-
vendorSha256 = "sha256-qS/tIi6umSuQcl43SI4LyL0k5eWfRWs7kVybRPGKcbs=";
14
+
patches = [
15
+
(fetchpatch {
16
+
name = "backport_TestConnect-Apple-Fixes.patch";
17
+
url = "https://github.com/square/certigo/commit/5332ac7ca20bdea63657cc8319e8b8fda4326938.patch";
18
+
sha256 = "sha256-mSNuiui2dxkXnCrXJ/asIzC8F1mtPecOVOIu6mE5jq4=";
19
+
})
20
+
21
+
(fetchpatch {
22
+
name = "backport_TestConnect-Expected-CipherSuite-Fixes.patch";
23
+
url = "https://github.com/square/certigo/commit/7ef0417bde4aafc69cbb72f0dd6d3577a56054a1.patch";
24
+
sha256 = "sha256-TUQ8B23HKheaPUjj4NkvjmZBAAhDNTyo2c8jf4qukds=";
25
+
})
26
+
];
15
27
16
-
# Go running under Hydra Darwin x86_64 picks CHAPOLY instead of AES-GCM as
17
-
# the default TLS ciphersuite, and breaks the arguably flakey `TestConnect`
18
-
# test.
19
-
doCheck = !(stdenv.isDarwin && stdenv.isx86_64);
28
+
vendorSha256 = "sha256-qS/tIi6umSuQcl43SI4LyL0k5eWfRWs7kVybRPGKcbs=";
20
29
21
30
meta = with lib; {
22
31
description = "A utility to examine and validate certificates in a variety of formats";