mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-12-26 21:21:57 +03:00
ocamlPackages.findlib: 1.7.3 -> 1.8.0
This commit is contained in:
parent
a1349f0a3b
commit
c4b7bbf77e
@ -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;
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user