public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nixos/tests/acme: go compat update, unvendor pkcs11

Browse Source
This commit is contained in:
Sarah Brofeldt 2018-03-08 22:38:38 +01:00
parent 51954f1997
commit bd35580860
1 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
nixos/tests/common/letsencrypt.nix
View File

@ -138,8 +138,8 @@ let
boulder = let boulder = let
owner = "letsencrypt"; owner = "letsencrypt";
repo = "boulder"; repo = "boulder";
rev = "9866abab8962a591f06db457a4b84c518cc88243"; rev = "9c6a1f2adc4c26d925588f5ae366cfd4efb7813a";
version = "20170510"; version = "20180129";
in pkgs.buildGoPackage rec { in pkgs.buildGoPackage rec {
name = "${repo}-${version}"; name = "${repo}-${version}";
@ -147,7 +147,7 @@ let
src = pkgs.fetchFromGitHub { src = pkgs.fetchFromGitHub {
name = "${name}-src"; name = "${name}-src";
inherit rev owner repo; inherit rev owner repo;
sha256 = "170m5cjngbrm36wi7wschqw8jzs7kxpcyzmshq3pcrmcpigrhna1"; sha256 = "09kszswrifm9rc6idfaq0p1mz5w21as2qbc8gd5pphrq9cf9pn55";
}; };
postPatch = '' postPatch = ''
@ -168,6 +168,18 @@ let
cat "${snakeOilCa}/ca.pem" > test/test-ca.pem 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}"; goPackagePath = "github.com/${owner}/${repo}";
buildInputs = [ pkgs.libtool ]; buildInputs = [ pkgs.libtool ];
}; };