diff options
| author | Vincent Laporte <Vincent.Laporte@gmail.com> | 2016-01-24 22:54:53 +0100 |
|---|---|---|
| committer | Vincent Laporte <Vincent.Laporte@gmail.com> | 2016-01-25 11:48:47 +0100 |
| commit | c0691a0659a06a0edfaa529568982d34b88e7eb9 (patch) | |
| tree | 7502017f1371471b704c6c82e7ca2950f08945c2 | |
| parent | 1f2b819783d00f876865aee20cb63c477331a901 (diff) | |
| download | nixpkgs-c0691a0659a06a0edfaa529568982d34b88e7eb9.tar nixpkgs-c0691a0659a06a0edfaa529568982d34b88e7eb9.tar.gz nixpkgs-c0691a0659a06a0edfaa529568982d34b88e7eb9.tar.bz2 nixpkgs-c0691a0659a06a0edfaa529568982d34b88e7eb9.tar.lz nixpkgs-c0691a0659a06a0edfaa529568982d34b88e7eb9.tar.xz nixpkgs-c0691a0659a06a0edfaa529568982d34b88e7eb9.tar.zst nixpkgs-c0691a0659a06a0edfaa529568982d34b88e7eb9.zip | |
compcert: 2.5 -> 2.6
| -rw-r--r-- | pkgs/development/compilers/compcert/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 6 |
2 files changed, 7 insertions, 5 deletions
diff --git a/pkgs/development/compilers/compcert/default.nix b/pkgs/development/compilers/compcert/default.nix index 3b1ebca1796..190f2b7a96a 100644 --- a/pkgs/development/compilers/compcert/default.nix +++ b/pkgs/development/compilers/compcert/default.nix @@ -4,14 +4,14 @@ stdenv.mkDerivation rec { name = "compcert-${version}"; - version = "2.5"; + version = "2.6"; src = fetchurl { url = "http://compcert.inria.fr/release/${name}.tgz"; - sha256 = "15gxarl2a8mz33fdn8pycj0ccazgmllbg2940n7aqdjlz807p11n"; + sha256 = "05sdxgg2w7ykw6xbcq6dl2kzxdz4qzhjajiawpy6490wqiji7wm1"; }; - buildInputs = [ coq ] ++ (with ocamlPackages; [ ocaml menhir ]); + buildInputs = [ coq ] ++ (with ocamlPackages; [ ocaml findlib menhir ]); enableParallelBuilding = true; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 905b4c18e8a..a9d1569b24e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3883,11 +3883,13 @@ let cmucl_binary = callPackage_i686 ../development/compilers/cmucl/binary.nix { }; - compcert = callPackage ../development/compilers/compcert ( + compcert = callPackage ../development/compilers/compcert (( if system == "x86_64-linux" then { tools = pkgsi686Linux.stdenv.cc; } else {} - ); + ) // { + ocamlPackages = ocamlPackages_4_02; + }); cryptol = haskellPackages.cryptol; |