diff options
| author | Alyssa Ross <hi@alyssa.is> | 2021-06-22 15:01:47 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2021-06-22 16:57:59 +0000 |
| commit | 633cab0ecb07627706c6b523e219490f019eaab5 (patch) | |
| tree | 4fb472bdfe2723037dad53dc1b8a87c939015f5e /nixpkgs/pkgs/development/ocaml-modules/ca-certs | |
| parent | ffb691c199e7e0cbc4e45e5310779c9e3f7c2a73 (diff) | |
| parent | 432fc2d9a67f92e05438dff5fdc2b39d33f77997 (diff) | |
| download | nixlib-633cab0ecb07627706c6b523e219490f019eaab5.tar nixlib-633cab0ecb07627706c6b523e219490f019eaab5.tar.gz nixlib-633cab0ecb07627706c6b523e219490f019eaab5.tar.bz2 nixlib-633cab0ecb07627706c6b523e219490f019eaab5.tar.lz nixlib-633cab0ecb07627706c6b523e219490f019eaab5.tar.xz nixlib-633cab0ecb07627706c6b523e219490f019eaab5.tar.zst nixlib-633cab0ecb07627706c6b523e219490f019eaab5.zip | |
Merge commit '432fc2d9a67f92e05438dff5fdc2b39d33f77997'
# Conflicts: # nixpkgs/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix # nixpkgs/pkgs/applications/networking/mailreaders/thunderbird/default.nix # nixpkgs/pkgs/applications/window-managers/sway/default.nix # nixpkgs/pkgs/build-support/rust/default.nix # nixpkgs/pkgs/development/go-modules/generic/default.nix
Diffstat (limited to 'nixpkgs/pkgs/development/ocaml-modules/ca-certs')
| -rw-r--r-- | nixpkgs/pkgs/development/ocaml-modules/ca-certs/default.nix | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/nixpkgs/pkgs/development/ocaml-modules/ca-certs/default.nix b/nixpkgs/pkgs/development/ocaml-modules/ca-certs/default.nix index dacc181f751c..acf869dbd275 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/ca-certs/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/ca-certs/default.nix @@ -1,24 +1,28 @@ { lib, buildDunePackage, fetchurl , bos, fpath, rresult, ptime, mirage-crypto, x509, astring, logs +, cacert, alcotest }: buildDunePackage rec { pname = "ca-certs"; - version = "0.2.0"; + version = "0.2.1"; minimumOCamlVersion = "4.07"; src = fetchurl { url = "https://github.com/mirage/ca-certs/releases/download/v${version}/ca-certs-v${version}.tbz"; - sha256 = "15jfb5zvahs90jsfs7ridqihlka5198z2xrvplj8ddchxfmpx868"; + sha256 = "d43109496a5129feff967d557c556af96f8b10456896a405c43b7cf0c35d0af3"; }; useDune2 = true; propagatedBuildInputs = [ bos fpath rresult ptime mirage-crypto x509 astring logs ]; - # tests need access to network and systemwide ca cert chain - doCheck = false; + doCheck = true; + checkInputs = [ + cacert # for /etc/ssl/certs/ca-bundle.crt + alcotest + ]; meta = with lib; { description = "Detect root CA certificates from the operating system"; |