diff options
| author | Sarah Brofeldt <sbrofeldt@gmail.com> | 2018-03-08 22:38:38 +0100 |
|---|---|---|
| committer | Sarah Brofeldt <sbrofeldt@gmail.com> | 2018-03-08 22:50:26 +0100 |
| commit | bd3558086088e36a93590947ce68dc9dad274b8d (patch) | |
| tree | 7a5c959a85919725342d71426f6aa3545fd35f1a /nixos | |
| parent | 51954f199732b56f28c6d37f5af95ba94eec7f04 (diff) | |
| download | nixlib-bd3558086088e36a93590947ce68dc9dad274b8d.tar nixlib-bd3558086088e36a93590947ce68dc9dad274b8d.tar.gz nixlib-bd3558086088e36a93590947ce68dc9dad274b8d.tar.bz2 nixlib-bd3558086088e36a93590947ce68dc9dad274b8d.tar.lz nixlib-bd3558086088e36a93590947ce68dc9dad274b8d.tar.xz nixlib-bd3558086088e36a93590947ce68dc9dad274b8d.tar.zst nixlib-bd3558086088e36a93590947ce68dc9dad274b8d.zip | |
nixos/tests/acme: go compat update, unvendor pkcs11
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/tests/common/letsencrypt.nix | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/nixos/tests/common/letsencrypt.nix b/nixos/tests/common/letsencrypt.nix index 9b53d9d61a16..569df02cee9b 100644 --- a/nixos/tests/common/letsencrypt.nix +++ b/nixos/tests/common/letsencrypt.nix @@ -138,8 +138,8 @@ let boulder = let owner = "letsencrypt"; repo = "boulder"; - rev = "9866abab8962a591f06db457a4b84c518cc88243"; - version = "20170510"; + rev = "9c6a1f2adc4c26d925588f5ae366cfd4efb7813a"; + version = "20180129"; in pkgs.buildGoPackage rec { name = "${repo}-${version}"; @@ -147,7 +147,7 @@ let src = pkgs.fetchFromGitHub { name = "${name}-src"; inherit rev owner repo; - sha256 = "170m5cjngbrm36wi7wschqw8jzs7kxpcyzmshq3pcrmcpigrhna1"; + sha256 = "09kszswrifm9rc6idfaq0p1mz5w21as2qbc8gd5pphrq9cf9pn55"; }; postPatch = '' @@ -168,6 +168,18 @@ let cat "${snakeOilCa}/ca.pem" > test/test-ca.pem ''; + # Until vendored pkcs11 is go 1.9 compatible + preBuild = '' + rm -r go/src/github.com/letsencrypt/boulder/vendor/github.com/miekg/pkcs11 + ''; + + extraSrcs = map mkGoDep [ + { goPackagePath = "github.com/miekg/pkcs11"; + rev = "6dbd569b952ec150d1425722dbbe80f2c6193f83"; + sha256 = "1m8g6fx7df6hf6q6zsbyw1icjmm52dmsx28rgb0h930wagvngfwb"; + } + ]; + goPackagePath = "github.com/${owner}/${repo}"; buildInputs = [ pkgs.libtool ]; }; |