public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ocamlPackages.findlib: 1.7.3 -> 1.8.0

Browse Source
This commit is contained in:
Vincent Laporte 2018-04-19 05:28:16 +00:00 committed by Vincent Laporte
parent a1349f0a3b
commit c4b7bbf77e
1 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
pkgs/development/tools/ocaml/findlib/default.nix
View File

@ -1,22 +1,33 @@
{ stdenv, fetchurl, fetchpatch, m4, ncurses, ocaml, writeText }: { 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 { stdenv.mkDerivation rec {
name = "ocaml-findlib-${version}"; name = "ocaml-findlib-${version}";
version = "1.7.3"; inherit (param) version;
src = fetchurl { src = fetchurl {
url = "http://download.camlcity.org/download/findlib-${version}.tar.gz"; url = "http://download.camlcity.org/download/findlib-${version}.tar.gz";
sha256 = "12xx8si1qv3xz90qsrpazjjk4lc1989fzm97rsmc4diwla7n15ni"; inherit (param) sha256;
}; };
buildInputs = [m4 ncurses ocaml]; buildInputs = [m4 ncurses ocaml];
patches = [ ./ldconf.patch ./install_topfind.patch patches = [ ./ldconf.patch ./install_topfind.patch ]
(fetchpatch { ++ (param.patches or []);
url = "https://raw.githubusercontent.com/ocaml/opam-repository/1f29c5ef8eccd373e5ff2169a30bfd95a9ae6050/packages/ocamlfind/ocamlfind.1.7.3-1/files/threads.patch";
sha256 = "0cqgpjqpmfbr0ph3jr25gw8hgckj4qlfwmir6vkgi5hvn2qnjpx3";
})
];
dontAddPrefix=true; dontAddPrefix=true;