diff options
| author | Matthew Maurer <matthew.r.maurer@gmail.com> | 2017-01-25 01:53:21 -0500 |
|---|---|---|
| committer | Vincent Laporte <Vincent.Laporte@gmail.com> | 2017-03-29 06:12:59 +0000 |
| commit | b4716ea7a2bd666b0c432aca43a2646fcf547b0c (patch) | |
| tree | 73958c3d2e050be2379ac8aa12e5f437e4d17853 /pkgs/development/ocaml-modules | |
| parent | 5dda5a2ea2a9eaf78e70a003b68f606c520ce464 (diff) | |
| download | nixlib-b4716ea7a2bd666b0c432aca43a2646fcf547b0c.tar nixlib-b4716ea7a2bd666b0c432aca43a2646fcf547b0c.tar.gz nixlib-b4716ea7a2bd666b0c432aca43a2646fcf547b0c.tar.bz2 nixlib-b4716ea7a2bd666b0c432aca43a2646fcf547b0c.tar.lz nixlib-b4716ea7a2bd666b0c432aca43a2646fcf547b0c.tar.xz nixlib-b4716ea7a2bd666b0c432aca43a2646fcf547b0c.tar.zst nixlib-b4716ea7a2bd666b0c432aca43a2646fcf547b0c.zip | |
camlzip: 1.06 -> 1.07
Fixes bug with modern zlib and large files
Diffstat (limited to 'pkgs/development/ocaml-modules')
| -rw-r--r-- | pkgs/development/ocaml-modules/camlzip/default.nix | 21 | ||||
| -rw-r--r-- | pkgs/development/ocaml-modules/camlzip/makefile_1_06.patch | 22 |
2 files changed, 12 insertions, 31 deletions
diff --git a/pkgs/development/ocaml-modules/camlzip/default.nix b/pkgs/development/ocaml-modules/camlzip/default.nix index 731d66974c6e..c1490c3bf196 100644 --- a/pkgs/development/ocaml-modules/camlzip/default.nix +++ b/pkgs/development/ocaml-modules/camlzip/default.nix @@ -4,16 +4,17 @@ let param = if stdenv.lib.versionAtLeast ocaml.version "4.02" then { - version = "1.06"; - url = "1616"; - sha256 = "0m6gyjw46w3qnhxfsyqyag42znl5lwargks7w7rfchr9jzwpff68"; - patch = ./makefile_1_06.patch; + version = "1.07"; + url = "https://github.com/xavierleroy/camlzip/archive/rel107.tar.gz"; + sha256 = "1pdz3zyiczm6c46zfgag2frwq3ljlq044p3a2y4wm2wb4pgz8k9g"; + patches = []; installTargets = "install-findlib"; } else { version = "1.05"; - url = "1037"; + download_id = "1037"; + url = "http://forge.ocamlcore.org/frs/download.php/${param.download_id}/camlzip-${param.version}.tar.gz"; sha256 = "930b70c736ab5a7ed1b05220102310a0a2241564786657abe418e834a538d06b"; - patch = ./makefile_1_05.patch; + patches = [./makefile_1_05.patch]; installTargets = "install"; }; in @@ -22,13 +23,15 @@ stdenv.mkDerivation { name = "camlzip-${param.version}"; src = fetchurl { - url = "http://forge.ocamlcore.org/frs/download.php/${param.url}/camlzip-${param.version}.tar.gz"; + inherit (param) url; inherit (param) sha256; }; - buildInputs = [zlib ocaml findlib]; + buildInputs = [ocaml findlib]; - patches = [ param.patch ]; + propagatedBuildInputs = [zlib]; + + inherit (param) patches; createFindlibDestdir = true; diff --git a/pkgs/development/ocaml-modules/camlzip/makefile_1_06.patch b/pkgs/development/ocaml-modules/camlzip/makefile_1_06.patch deleted file mode 100644 index ab0d3528c8c2..000000000000 --- a/pkgs/development/ocaml-modules/camlzip/makefile_1_06.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- a/Makefile 2016-06-10 14:37:48.000000000 +0200 -+++ b/Makefile 2016-06-23 05:10:26.000000000 +0200 -@@ -4,17 +4,13 @@ - ZLIB_LIB=-lz - - # The directory containing the Zlib library (libz.a or libz.so) --ZLIB_LIBDIR=/usr/lib -+ZLIB_LIBDIR=@ZLIB_LIBDIR@ - # ZLIB_LIBDIR=/usr/local/lib - - # The directory containing the Zlib header file (zlib.h) --ZLIB_INCLUDE=/usr/include -+ZLIB_INCLUDE=@ZLIB_INCLUDE@ - # ZLIB_INCLUDE=/usr/local/include - --# Where to install the library. By default: sub-directory 'zip' of --# OCaml's standard library directory. --INSTALLDIR=`$(OCAMLC) -where`/zip -- - ### End of configuration section - - OCAMLC=ocamlc -g -safe-string |