diff options
author | Vincent Laporte <Vincent.Laporte@gmail.com> | 2019-09-23 19:55:47 +0000 |
---|---|---|
committer | Vincent Laporte <vbgl@users.noreply.github.com> | 2019-09-30 21:52:34 +0200 |
commit | c2ef0a08756863e09ec85d8b6b2c2f58dbd23495 (patch) | |
tree | e2e90307932a26f862bdbb556ebc00172c7e47ab /pkgs/development/ocaml-modules | |
parent | 5afde25a10185b56f348eb6112656ed9ef2d4bb0 (diff) | |
download | nixlib-c2ef0a08756863e09ec85d8b6b2c2f58dbd23495.tar nixlib-c2ef0a08756863e09ec85d8b6b2c2f58dbd23495.tar.gz nixlib-c2ef0a08756863e09ec85d8b6b2c2f58dbd23495.tar.bz2 nixlib-c2ef0a08756863e09ec85d8b6b2c2f58dbd23495.tar.lz nixlib-c2ef0a08756863e09ec85d8b6b2c2f58dbd23495.tar.xz nixlib-c2ef0a08756863e09ec85d8b6b2c2f58dbd23495.tar.zst nixlib-c2ef0a08756863e09ec85d8b6b2c2f58dbd23495.zip |
ocamlPackages.camlpdf: 2.2.1 → 2.3
Diffstat (limited to 'pkgs/development/ocaml-modules')
-rw-r--r-- | pkgs/development/ocaml-modules/camlpdf/default.nix | 25 |
1 files changed, 12 insertions, 13 deletions
diff --git a/pkgs/development/ocaml-modules/camlpdf/default.nix b/pkgs/development/ocaml-modules/camlpdf/default.nix index a0a00472a4de..e1e213eca788 100644 --- a/pkgs/development/ocaml-modules/camlpdf/default.nix +++ b/pkgs/development/ocaml-modules/camlpdf/default.nix @@ -1,15 +1,20 @@ -{ stdenv, fetchgit, ocaml, findlib, ncurses }: +{ stdenv, fetchFromGitHub, ocaml, findlib }: + +if !stdenv.lib.versionAtLeast ocaml.version "4.02" +then throw "camlpdf is not available for OCaml ${ocaml.version}" +else stdenv.mkDerivation rec { - version = "2.2.1"; + version = "2.3"; name = "ocaml${ocaml.version}-camlpdf-${version}"; - src = fetchgit { - url = https://github.com/johnwhitington/camlpdf.git; - rev = "refs/tags/v${version}"; - sha256 = "0wa4rw8ccpb8xprslg88hbk352bi8bia4iffc22y55gkjr60f8gj"; + src = fetchFromGitHub { + owner = "johnwhitington"; + repo = "camlpdf"; + rev = "v${version}"; + sha256 = "1z8h6bjzmlscr6h6kdvzj8kspifb4n9dg7zi54z1cv2qi03kr8dk"; }; - buildInputs = [ ocaml findlib ncurses ]; + buildInputs = [ ocaml findlib ]; # Version number in META file is wrong patchPhase = '' @@ -21,12 +26,6 @@ stdenv.mkDerivation rec { EOF ''; - makeFlags = with stdenv.lib; - optionals (versionAtLeast ocaml.version "4.06") [ - "OCAMLBCFLAGS+=-unsafe-string" - "OCAMLNCFLAGS+=-unsafe-string" - ]; - createFindlibDestdir = true; meta = with stdenv.lib; { |