about summary refs log tree commit diff
diff options
context:
space:
mode:
authorsternenseemann <git@lukasepple.de>2020-04-13 16:56:06 +0200
committersternenseemann <git@lukasepple.de>2020-04-16 19:57:35 +0200
commitb5770e34ffb9a8b0b0b03b8658cf45192be78fc7 (patch)
tree0f82e1b18a7f0b0c04d36e6d59d7f7515112311f
parent99ac3ce2bf071a21ed883e13c9fe7dd9c324e9e8 (diff)
downloadnixlib-b5770e34ffb9a8b0b0b03b8658cf45192be78fc7.tar
nixlib-b5770e34ffb9a8b0b0b03b8658cf45192be78fc7.tar.gz
nixlib-b5770e34ffb9a8b0b0b03b8658cf45192be78fc7.tar.bz2
nixlib-b5770e34ffb9a8b0b0b03b8658cf45192be78fc7.tar.lz
nixlib-b5770e34ffb9a8b0b0b03b8658cf45192be78fc7.tar.xz
nixlib-b5770e34ffb9a8b0b0b03b8658cf45192be78fc7.tar.zst
nixlib-b5770e34ffb9a8b0b0b03b8658cf45192be78fc7.zip
ocamlPackages.otr: 0.3.6 -> 0.3.8
Contains switch from nocrypto to mirage-crypto
-rw-r--r--pkgs/development/ocaml-modules/otr/default.nix22
1 files changed, 13 insertions, 9 deletions
diff --git a/pkgs/development/ocaml-modules/otr/default.nix b/pkgs/development/ocaml-modules/otr/default.nix
index 866360856d8f..cec5d2ee0d07 100644
--- a/pkgs/development/ocaml-modules/otr/default.nix
+++ b/pkgs/development/ocaml-modules/otr/default.nix
@@ -1,21 +1,25 @@
-{ lib, fetchFromGitHub, buildDunePackage
-, cstruct, sexplib0, rresult, nocrypto, astring
+{ lib, fetchurl, buildDunePackage
+, cstruct, sexplib0, rresult, mirage-crypto, mirage-crypto-pk, astring, base64
+, mirage-crypto-rng
 }:
 
 buildDunePackage rec {
   pname = "otr";
-  version = "0.3.6";
+  version = "0.3.8";
 
-  src = fetchFromGitHub {
-    owner  = "hannesm";
-    repo   = "ocaml-otr";
-    rev    = version;
-    sha256 = "0iz6p85a0jxng9aq9blqsky173zaqfr6wlc5j48ad55lgwzlbih5";
+  src = fetchurl {
+    url = "https://github.com/hannesm/ocaml-otr/releases/download/v${version}/otr-v${version}.tbz";
+    sha256 = "18hn9l8wznqnlh2jf1hpnp36f1cx80ncwiiivsbj34llhgp3893d";
   };
 
-  propagatedBuildInputs = [ cstruct sexplib0 rresult nocrypto astring ];
+  useDune2 = true;
+
+  propagatedBuildInputs = [ cstruct sexplib0 mirage-crypto mirage-crypto-pk
+                            astring rresult base64 ];
 
   doCheck = true;
+  checkInputs = [ mirage-crypto-rng ];
+
   meta = with lib; {
     homepage = "https://github.com/hannesm/ocaml-otr";
     description = "Off-the-record messaging protocol, purely in OCaml";