Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 0d703ec3e935
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 255e2751cdfc
Choose a head ref
  • 3 commits
  • 1 file changed
  • 2 contributors

Commits on Mar 8, 2018

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

    @srhb
    srhb committed Mar 8, 2018
    Copy the full SHA
    bd35580 View commit details

  2. nixos/tests/acme: use mail-test-srv tls certs from source

    @srhb
    srhb committed Mar 8, 2018
    Copy the full SHA
    df3706c View commit details

Commits on Mar 12, 2018

  1. Merge pull request #36571 from srhb/acme-test-fix 

    acme: Fix test
    @fpletz
    fpletz authored Mar 12, 2018
    Copy the full SHA
    255e275 View commit details
Showing with 20 additions and 4 deletions.
  1. +20 −4 nixos/tests/common/letsencrypt.nix
24 changes: 20 additions & 4 deletions nixos/tests/common/letsencrypt.nix
View file
Original file line number Diff line number Diff line change
@@ -138,16 +138,16 @@ let
boulder = let
owner = "letsencrypt";
repo = "boulder";
rev = "9866abab8962a591f06db457a4b84c518cc88243";
version = "20170510";
rev = "9c6a1f2adc4c26d925588f5ae366cfd4efb7813a";
version = "20180129";

in pkgs.buildGoPackage rec {
name = "${repo}-${version}";

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 ];
};
@@ -284,7 +296,11 @@ let
ocsp-updater.after = [ "boulder-publisher" ];
ocsp-responder.args = "--config ${cfgDir}/ocsp-responder.json";
ct-test-srv = {};
mail-test-srv.args = "--closeFirst 5";
mail-test-srv.args = let
key = "${boulderSource}/test/mail-test-srv/minica-key.pem";
crt = "${boulderSource}/test/mail-test-srv/minica.pem";
in
"--closeFirst 5 --cert ${crt} --key ${key}";
};

commonPath = [ softhsm pkgs.mariadb goose boulder ];