diff options
| author | Vincent Laporte <Vincent.Laporte@gmail.com> | 2019-10-12 16:50:25 +0000 |
|---|---|---|
| committer | Vincent Laporte <vbgl@users.noreply.github.com> | 2019-10-19 20:30:48 +0000 |
| commit | 430e5ce04c7943323e573c40d15c0e7e109cc72a (patch) | |
| tree | 573f931abcfce1e772048fb13b0824c697ead828 /pkgs/development | |
| parent | 183b9d0957216f4e005c1aa9c04d3d0ea1fd88bb (diff) | |
| download | nixlib-430e5ce04c7943323e573c40d15c0e7e109cc72a.tar nixlib-430e5ce04c7943323e573c40d15c0e7e109cc72a.tar.gz nixlib-430e5ce04c7943323e573c40d15c0e7e109cc72a.tar.bz2 nixlib-430e5ce04c7943323e573c40d15c0e7e109cc72a.tar.lz nixlib-430e5ce04c7943323e573c40d15c0e7e109cc72a.tar.xz nixlib-430e5ce04c7943323e573c40d15c0e7e109cc72a.tar.zst nixlib-430e5ce04c7943323e573c40d15c0e7e109cc72a.zip | |
compcert: 3.5 → 3.6
ocamlPackages.menhir: 20181113 → 20190626
Diffstat (limited to 'pkgs/development')
| -rw-r--r-- | pkgs/development/compilers/compcert/default.nix | 7 | ||||
| -rw-r--r-- | pkgs/development/ocaml-modules/menhir/default.nix | 3 |
2 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/development/compilers/compcert/default.nix b/pkgs/development/compilers/compcert/default.nix index 940eb851fe61..3a6c5e9c2c7e 100644 --- a/pkgs/development/compilers/compcert/default.nix +++ b/pkgs/development/compilers/compcert/default.nix @@ -4,7 +4,7 @@ }: assert lib.versionAtLeast ocamlPackages.ocaml.version "4.02"; -assert lib.versionAtLeast coq.coq-version "8.6.1"; +assert lib.versionAtLeast coq.coq-version "8.8.0"; let ocaml-pkgs = with ocamlPackages; [ ocaml findlib menhir ]; @@ -12,13 +12,13 @@ let in stdenv.mkDerivation rec { pname = "compcert"; - version = "3.5"; + version = "3.6"; src = fetchFromGitHub { owner = "AbsInt"; repo = "CompCert"; rev = "v${version}"; - sha256 = "1g8067a5x3vd0l47d04gjvy5yx49nghh55am5d1fbrjirfsnsz8j"; + sha256 = "1k9xhj7fgllhf7bn7rp3w6zfvs4clglnc4w39zp4678hrwvdcpha"; }; nativeBuildInputs = [ makeWrapper ]; @@ -27,7 +27,6 @@ stdenv.mkDerivation rec { patchPhase = '' substituteInPlace ./configure \ - --replace '|8.9.0' '|8.9.0|8.9.1' \ --replace '{toolprefix}gcc' '{toolprefix}cc' ''; diff --git a/pkgs/development/ocaml-modules/menhir/default.nix b/pkgs/development/ocaml-modules/menhir/default.nix index 1a2a31277af4..23e31e75779d 100644 --- a/pkgs/development/ocaml-modules/menhir/default.nix +++ b/pkgs/development/ocaml-modules/menhir/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, ocaml, findlib, ocamlbuild -, version ? if stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "4.02" then "20181113" else "20140422" +, version ? if stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "4.02" then "20190626" else "20140422" }@args: let @@ -7,6 +7,7 @@ let if version == "20140422" then { url = "http://cristal.inria.fr/~fpottier/menhir/menhir-20140422.tar.gz"; sha256 = "1ki1f2id6a14h9xpv2k8yb6px7dyw8cvwh39csyzj4qpzx7wia0d"; } else if version == "20170712" then { url = "http://gallium.inria.fr/~fpottier/menhir/menhir-20170712.tar.gz"; sha256 = "006hq3bwj81j67f2k9cgzj5wr4hai8j36925p5n3sd2j01ljsj6a"; } else if version == "20181113" then { url = "https://gitlab.inria.fr/fpottier/menhir/repository/20181113/archive.tar.gz"; sha256 = "0hl611l0gyl7b2bm7m0sk7vjz14m0i7znrnjq3gw58pylj934dx4"; } + else if version == "20190626" then { url = "https://gitlab.inria.fr/fpottier/menhir/repository/20190626/archive.tar.gz"; sha256 = "0nigjnskg89knyi2zj1w211mb1pvkrwfqpz9a0qbw80k3hm8gg0h"; } else throw ("menhir: unknown version " ++ version) ); in |