Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

ber_metaocaml: n107 -> n111 #173816

Merged
merged 1 commit into from May 26, 2022
Merged

ber_metaocaml: n107 -> n111 #173816

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 8 additions & 12 deletions pkgs/development/compilers/ocaml/ber-metaocaml.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ let
x11deps = [ libX11 xorgproto ];
inherit (lib) optionals;

baseOcamlBranch = "4.07";
baseOcamlBranch = "4.11";
baseOcamlVersion = "${baseOcamlBranch}.1";
metaocamlPatch = "107";
metaocamlPatch = "111";
in

stdenv.mkDerivation rec {
Expand All @@ -20,24 +20,20 @@ stdenv.mkDerivation rec {

src = fetchurl {
url = "https://caml.inria.fr/pub/distrib/ocaml-${baseOcamlBranch}/ocaml-${baseOcamlVersion}.tar.gz";
sha256 = "1x4sln131mcspisr22qc304590rvg720rbl7g2i4xiymgvhkpm1a";
sha256 = "sha256-3Yi2OFvZLgrZInMuKMxoyHd4QXcOoAPCC9FS9dtEFc4=";
};

metaocaml = fetchurl {
url = "http://okmij.org/ftp/ML/ber-metaocaml-107.tar.gz";
sha256 = "0xy6n0yj1f53pk612zfmn49pn04bd75qa40xgmr0w0lzx6dqsfmm";
url = "http://okmij.org/ftp/ML/ber-metaocaml-${metaocamlPatch}.tar.gz";
sha256 = "sha256-hDb0w0ZCm0hCz8jktZKmr/7gPSfBoKPT/cc7sPjt0yE=";
};

x11env = buildEnv { name = "x11env"; paths = x11deps; };
x11lib = "${x11env}/lib";
x11inc = "${x11env}/include";

prefixKey = "-prefix ";
configureFlags = optionals useX11
[ "-x11lib" x11lib
"-x11include" x11inc
"-flambda"
];
configureFlags = optionals useX11 [ "--enable-flambda" ];

dontStrip = true;
buildInputs = [ ncurses ] ++ optionals useX11 x11deps;
Expand All @@ -48,8 +44,8 @@ stdenv.mkDerivation rec {
# used SIGSTKSZ as the size of a statically-allocated array. This
# patch is also applied by the ocaml/4.07.nix expression.
(fetchpatch {
url = "https://github.com/ocaml/ocaml/commit/00b8c4d503732343d5d01761ad09650fe50ff3a0.patch";
sha256 = "sha256:02cfya5ff5szx0fsl5x8ax76jyrla9zmf3qxavf3adhwq5ssrfcv";
url = "https://github.com/ocaml/ocaml/commit/dd28ac0cf4365bd0ea1bcc374cbc5e95a6f39bea.patch";
sha256 = "sha256-OmyovAu+8sgg3n5YD29Cytx3u/9PO2ofMsmrwiKUxks=";
})
];

Expand Down