diff options
author | Vincent Laporte <Vincent.Laporte@gmail.com> | 2018-04-19 05:28:16 +0000 |
---|---|---|
committer | Vincent Laporte <vbgl@users.noreply.github.com> | 2018-04-25 18:19:27 +0200 |
commit | c4b7bbf77e15b9e7d0cf8a76ecffde0e5893fe74 (patch) | |
tree | 44d3775508e7d87017dbe68e6aaa49632652b8a9 /pkgs/development/tools/ocaml | |
parent | a1349f0a3be43fe1f840d90b816f82a341a467c1 (diff) | |
download | nixlib-c4b7bbf77e15b9e7d0cf8a76ecffde0e5893fe74.tar nixlib-c4b7bbf77e15b9e7d0cf8a76ecffde0e5893fe74.tar.gz nixlib-c4b7bbf77e15b9e7d0cf8a76ecffde0e5893fe74.tar.bz2 nixlib-c4b7bbf77e15b9e7d0cf8a76ecffde0e5893fe74.tar.lz nixlib-c4b7bbf77e15b9e7d0cf8a76ecffde0e5893fe74.tar.xz nixlib-c4b7bbf77e15b9e7d0cf8a76ecffde0e5893fe74.tar.zst nixlib-c4b7bbf77e15b9e7d0cf8a76ecffde0e5893fe74.zip |
ocamlPackages.findlib: 1.7.3 -> 1.8.0
Diffstat (limited to 'pkgs/development/tools/ocaml')
-rw-r--r-- | pkgs/development/tools/ocaml/findlib/default.nix | 27 |
1 files changed, 19 insertions, 8 deletions
diff --git a/pkgs/development/tools/ocaml/findlib/default.nix b/pkgs/development/tools/ocaml/findlib/default.nix index 6f136a7ef289..e25b94714b68 100644 --- a/pkgs/development/tools/ocaml/findlib/default.nix +++ b/pkgs/development/tools/ocaml/findlib/default.nix @@ -1,22 +1,33 @@ { stdenv, fetchurl, fetchpatch, m4, ncurses, ocaml, writeText }: +let param = + if stdenv.lib.versionAtLeast ocaml.version "4" + then { + version = "1.8.0"; + sha256 = "1b97zqjdriqd2ikgh4rmqajgxwdwn013riji5j53y3xvcmnpsyrb"; + } else { + version = "1.7.3"; + sha256 = "12xx8si1qv3xz90qsrpazjjk4lc1989fzm97rsmc4diwla7n15ni"; + patches = [ (fetchpatch { + url = "https://raw.githubusercontent.com/ocaml/opam-repository/1f29c5ef8eccd373e5ff2169a30bfd95a9ae6050/packages/ocamlfind/ocamlfind.1.7.3-1/files/threads.patch"; + sha256 = "0cqgpjqpmfbr0ph3jr25gw8hgckj4qlfwmir6vkgi5hvn2qnjpx3"; + }) ]; + }; +in + stdenv.mkDerivation rec { name = "ocaml-findlib-${version}"; - version = "1.7.3"; + inherit (param) version; src = fetchurl { url = "http://download.camlcity.org/download/findlib-${version}.tar.gz"; - sha256 = "12xx8si1qv3xz90qsrpazjjk4lc1989fzm97rsmc4diwla7n15ni"; + inherit (param) sha256; }; buildInputs = [m4 ncurses ocaml]; - patches = [ ./ldconf.patch ./install_topfind.patch - (fetchpatch { - url = "https://raw.githubusercontent.com/ocaml/opam-repository/1f29c5ef8eccd373e5ff2169a30bfd95a9ae6050/packages/ocamlfind/ocamlfind.1.7.3-1/files/threads.patch"; - sha256 = "0cqgpjqpmfbr0ph3jr25gw8hgckj4qlfwmir6vkgi5hvn2qnjpx3"; - }) - ]; + patches = [ ./ldconf.patch ./install_topfind.patch ] + ++ (param.patches or []); dontAddPrefix=true; |