summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVincent Laporte <Vincent.Laporte@gmail.com>2020-08-29 06:35:16 +0200
committerVincent Laporte <vbgl@users.noreply.github.com>2020-09-03 15:27:29 +0200
commit53bce4da36f7a789929c983d29aebbaf873c7bef (patch)
tree2c5f9371df549ea3cfaf1f9f486f1ec513cdf503
parentf806b3c81b99ea402cad8d641323e61215a855b3 (diff)
ocamlPackages.piqi-ocaml: 0.7.5 → 0.7.7
-rw-r--r--pkgs/development/ocaml-modules/piqi-ocaml/default.nix20
1 files changed, 9 insertions, 11 deletions
diff --git a/pkgs/development/ocaml-modules/piqi-ocaml/default.nix b/pkgs/development/ocaml-modules/piqi-ocaml/default.nix
index 731a5303ff51..39201d0570b3 100644
--- a/pkgs/development/ocaml-modules/piqi-ocaml/default.nix
+++ b/pkgs/development/ocaml-modules/piqi-ocaml/default.nix
@@ -1,20 +1,18 @@
-{ stdenv, fetchurl, fetchpatch, ocaml, findlib, piqi, camlp4 }:
+{ stdenv, fetchFromGitHub, fetchpatch, ocaml, findlib, piqi, stdlib-shims }:
stdenv.mkDerivation rec {
- version = "0.7.5";
+ version = "0.7.7";
pname = "piqi-ocaml";
+ name = "ocaml${ocaml.version}-${pname}-${version}";
- src = fetchurl {
- url = "https://github.com/alavrik/piqi-ocaml/archive/v${version}.tar.gz";
- sha256 = "0ngz6y8i98i5v2ma8nk6mc83pdsmf2z0ks7m3xi6clfg3zqbddrv";
+ src = fetchFromGitHub {
+ owner = "alavrik";
+ repo = pname;
+ rev = "v${version}";
+ sha256 = "1913jpsb8mvqi8609j4g4sm5jhg50dq0xqxgy8nmvknfryyc89nm";
};
- patches = [ (fetchpatch {
- url = "https://github.com/alavrik/piqi-ocaml/commit/336e8fdb84e77f4105e9bbb5ab545b8729101308.patch";
- sha256 = "071s4xjyr6xx95v6az2lbl2igc87n7z5jqnnbhfq2pidrxakd0la";
- })];
-
- buildInputs = [ ocaml findlib piqi camlp4 ];
+ buildInputs = [ ocaml findlib piqi stdlib-shims ];
createFindlibDestdir = true;