diff options
author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2021-07-01 18:01:04 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-07-01 18:01:04 +0000 |
commit | 9d5de3eca1530584115286673d3adc9ae5ddf448 (patch) | |
tree | 8b770f2fef7711b305749215edc0e4f7c029a9bd /pkgs/development/ocaml-modules | |
parent | 26416f52eb9439d7f7579ebf7eb18c0a9de34c3c (diff) | |
parent | 9e2a8a2f4a93a27e005dafe0dd6ed9524cc03d2b (diff) | |
download | nixlib-9d5de3eca1530584115286673d3adc9ae5ddf448.tar nixlib-9d5de3eca1530584115286673d3adc9ae5ddf448.tar.gz nixlib-9d5de3eca1530584115286673d3adc9ae5ddf448.tar.bz2 nixlib-9d5de3eca1530584115286673d3adc9ae5ddf448.tar.lz nixlib-9d5de3eca1530584115286673d3adc9ae5ddf448.tar.xz nixlib-9d5de3eca1530584115286673d3adc9ae5ddf448.tar.zst nixlib-9d5de3eca1530584115286673d3adc9ae5ddf448.zip |
Merge master into staging-next
Diffstat (limited to 'pkgs/development/ocaml-modules')
-rw-r--r-- | pkgs/development/ocaml-modules/camlpdf/default.nix | 14 | ||||
-rw-r--r-- | pkgs/development/ocaml-modules/cpdf/default.nix | 17 |
2 files changed, 10 insertions, 21 deletions
diff --git a/pkgs/development/ocaml-modules/camlpdf/default.nix b/pkgs/development/ocaml-modules/camlpdf/default.nix index 18683d5f1709..f496ce91c826 100644 --- a/pkgs/development/ocaml-modules/camlpdf/default.nix +++ b/pkgs/development/ocaml-modules/camlpdf/default.nix @@ -5,27 +5,17 @@ then throw "camlpdf is not available for OCaml ${ocaml.version}" else stdenv.mkDerivation rec { - version = "2.3.1"; + version = "2.4"; name = "ocaml${ocaml.version}-camlpdf-${version}"; src = fetchFromGitHub { owner = "johnwhitington"; repo = "camlpdf"; rev = "v${version}"; - sha256 = "1q69hhk63z836jbkv4wsng27w35w0qpz01c7ax0mqm8d8kmnr0v4"; + sha256 = "09kzrgmlxb567315p3fy59ba0kv7xhp548n9i3l4wf9n06p0ww9m"; }; buildInputs = [ which ocaml findlib ]; - # Version number in META file is wrong - patchPhase = '' - patch -p 0 META <<EOF - 3c3 - < version="1.7.1" - --- - > version="${version}" - EOF - ''; - preInstall = '' mkdir -p $out/lib/ocaml/${ocaml.version}/site-lib/stublibs ''; diff --git a/pkgs/development/ocaml-modules/cpdf/default.nix b/pkgs/development/ocaml-modules/cpdf/default.nix index cc2aad52d3d6..2a0fae4a1dbb 100644 --- a/pkgs/development/ocaml-modules/cpdf/default.nix +++ b/pkgs/development/ocaml-modules/cpdf/default.nix @@ -1,6 +1,10 @@ { lib, stdenv, fetchFromGitHub, ocaml, findlib, camlpdf, ncurses }: -let version = "2.3.1"; in +if !lib.versionAtLeast ocaml.version "4.10" +then throw "cpdf is not available for OCaml ${ocaml.version}" +else + +let version = "2.4"; in stdenv.mkDerivation { name = "ocaml${ocaml.version}-cpdf-${version}"; @@ -9,19 +13,14 @@ stdenv.mkDerivation { owner = "johnwhitington"; repo = "cpdf-source"; rev = "v${version}"; - sha256 = "1gwz0iy28f67kbqap2q10nf98dalwbi03vv5j893z2an7pb4w68z"; + sha256 = "1a8lmfc76dr8x6pxgm4aypbys02pfma9yh4z3l1qxp2q1909na5l"; }; - prePatch = '' - substituteInPlace META --replace 'version="1.7"' 'version="${version}"' - ''; - buildInputs = [ ocaml findlib ncurses ]; propagatedBuildInputs = [ camlpdf ]; - createFindlibDestdir = true; - - postInstall = '' + preInstall = '' + mkdir -p $OCAMLFIND_DESTDIR mkdir -p $out/bin cp cpdf $out/bin mkdir -p $out/share/ |