diff options
Diffstat (limited to 'nixpkgs/pkgs/development/tools/ocaml/findlib/default.nix')
-rw-r--r-- | nixpkgs/pkgs/development/tools/ocaml/findlib/default.nix | 22 |
1 files changed, 3 insertions, 19 deletions
diff --git a/nixpkgs/pkgs/development/tools/ocaml/findlib/default.nix b/nixpkgs/pkgs/development/tools/ocaml/findlib/default.nix index 18b84e2c961d..91870a570b09 100644 --- a/nixpkgs/pkgs/development/tools/ocaml/findlib/default.nix +++ b/nixpkgs/pkgs/development/tools/ocaml/findlib/default.nix @@ -1,33 +1,17 @@ { 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}"; - inherit (param) version; + version = "1.8.1"; src = fetchurl { url = "http://download.camlcity.org/download/findlib-${version}.tar.gz"; - inherit (param) sha256; + sha256 = "00s3sfb02pnjmkax25pcnljcnhcggiliccfz69a72ic7gsjwz1cf"; }; buildInputs = [m4 ncurses ocaml]; - patches = [ ./ldconf.patch ./install_topfind.patch ] - ++ (param.patches or []); + patches = [ ./ldconf.patch ./install_topfind.patch ]; dontAddPrefix=true; |