summary refs log tree commit diff
path: root/pkgs/development/ocaml-modules/x509
diff options
context:
space:
mode:
authorUlrik <ulrik.strid@outlook.com>2021-04-18 14:09:33 +0200
committerVincent Laporte <vbgl@users.noreply.github.com>2021-04-18 21:07:26 +0200
commit1a2c0d22135a64ceedcbac8dd615f219e37202be (patch)
treea6954a7b0bfde0dae7c4176e64fa3f720021fbc8 /pkgs/development/ocaml-modules/x509
parent8e16538785c87e081cfb5fa68847b3aa550c33c6 (diff)
downloadnixpkgs-1a2c0d22135a64ceedcbac8dd615f219e37202be.tar
nixpkgs-1a2c0d22135a64ceedcbac8dd615f219e37202be.tar.gz
nixpkgs-1a2c0d22135a64ceedcbac8dd615f219e37202be.tar.bz2
nixpkgs-1a2c0d22135a64ceedcbac8dd615f219e37202be.tar.lz
nixpkgs-1a2c0d22135a64ceedcbac8dd615f219e37202be.tar.xz
nixpkgs-1a2c0d22135a64ceedcbac8dd615f219e37202be.tar.zst
nixpkgs-1a2c0d22135a64ceedcbac8dd615f219e37202be.zip
ocamlPackages.x509: 0.11.2 -> 0.12.0
Adds support for EC DSA from mirage-crypto

Co-authored-by: Vincent Laporte <vbgl@users.noreply.github.com>
Diffstat (limited to 'pkgs/development/ocaml-modules/x509')
-rw-r--r--pkgs/development/ocaml-modules/x509/default.nix18
1 files changed, 5 insertions, 13 deletions
diff --git a/pkgs/development/ocaml-modules/x509/default.nix b/pkgs/development/ocaml-modules/x509/default.nix
index 23efd4bb9fc..637105361fd 100644
--- a/pkgs/development/ocaml-modules/x509/default.nix
+++ b/pkgs/development/ocaml-modules/x509/default.nix
@@ -1,6 +1,6 @@
-{ lib, fetchurl, buildDunePackage, fetchpatch
+{ lib, fetchurl, buildDunePackage
 , alcotest, cstruct-unix
-, asn1-combinators, domain-name, fmt, gmap, rresult, mirage-crypto, mirage-crypto-pk
+, asn1-combinators, domain-name, fmt, gmap, pbkdf, rresult, mirage-crypto, mirage-crypto-ec, mirage-crypto-pk
 , logs, base64
 }:
 
@@ -8,25 +8,17 @@ buildDunePackage rec {
   minimumOCamlVersion = "4.07";
 
   pname = "x509";
-  version = "0.11.2";
+  version = "0.12.0";
 
   src = fetchurl {
     url = "https://github.com/mirleft/ocaml-x509/releases/download/v${version}/x509-v${version}.tbz";
-    sha256 = "1b4lcphmlyjhdgqi0brakgjp3diwmrj1y9hx87svi5xklw3zik22";
+    sha256 = "04g59j8sn8am0z0a94h8cyvr6cqzd5gkn2lj6g51nb5dkwajj19h";
   };
 
-  patches = [
-    # fix tests for mirage-crypto >= 0.8.9, can be removed at next release
-    (fetchpatch {
-      url = "https://github.com/mirleft/ocaml-x509/commit/ba1fdd4432950293e663416a0c454c8c04a71c0f.patch";
-      sha256 = "1rbjf7408772ns3ypk2hyw9v17iy1kcx84plr1rqc56iwk9zzxmr";
-    })
-  ];
-
   useDune2 = true;
 
   buildInputs = [ alcotest cstruct-unix ];
-  propagatedBuildInputs = [ asn1-combinators domain-name fmt gmap mirage-crypto mirage-crypto-pk rresult  logs base64 ];
+  propagatedBuildInputs = [ asn1-combinators domain-name fmt gmap mirage-crypto mirage-crypto-pk mirage-crypto-ec pbkdf rresult logs base64 ];
 
   doCheck = true;