diff options
author | Mateusz Kowalczyk <mk440@bath.ac.uk> | 2014-10-03 18:36:06 +0100 |
---|---|---|
committer | Mateusz Kowalczyk <mk440@bath.ac.uk> | 2014-10-03 18:36:06 +0100 |
commit | 3d26ea99dc279e5221c3058a94bfcbad588feee6 (patch) | |
tree | 7c2ab6f6808ce88edd1908bee0f52019367ce843 /pkgs/development | |
parent | d28b75564c74bfa7f7629c49b8bb1ca70da7a279 (diff) | |
parent | 01c6d8569fdc176bdcbc7894e932bbcb6d4b6277 (diff) | |
download | nixpkgs-3d26ea99dc279e5221c3058a94bfcbad588feee6.tar nixpkgs-3d26ea99dc279e5221c3058a94bfcbad588feee6.tar.gz nixpkgs-3d26ea99dc279e5221c3058a94bfcbad588feee6.tar.bz2 nixpkgs-3d26ea99dc279e5221c3058a94bfcbad588feee6.tar.lz nixpkgs-3d26ea99dc279e5221c3058a94bfcbad588feee6.tar.xz nixpkgs-3d26ea99dc279e5221c3058a94bfcbad588feee6.tar.zst nixpkgs-3d26ea99dc279e5221c3058a94bfcbad588feee6.zip |
Merge pull request #4342 from vbgl/camlp5-6.12
Camlp5: update to 6.12; hol-light: update to r199
Diffstat (limited to 'pkgs/development')
-rw-r--r-- | pkgs/development/coq-modules/containers/default.nix | 1 | ||||
-rw-r--r-- | pkgs/development/tools/ocaml/camlp5/default.nix | 14 |
2 files changed, 8 insertions, 7 deletions
diff --git a/pkgs/development/coq-modules/containers/default.nix b/pkgs/development/coq-modules/containers/default.nix index 9856ba6955f..8c20d64d8c7 100644 --- a/pkgs/development/coq-modules/containers/default.nix +++ b/pkgs/development/coq-modules/containers/default.nix @@ -19,6 +19,7 @@ stdenv.mkDerivation { description = "A typeclass-based Coq library of finite sets/maps"; maintainers = with maintainers; [ vbgl ]; platforms = coq.meta.platforms; + broken = true; /* the source hash is wrong */ }; } diff --git a/pkgs/development/tools/ocaml/camlp5/default.nix b/pkgs/development/tools/ocaml/camlp5/default.nix index 8691e1b9d11..1c811b21758 100644 --- a/pkgs/development/tools/ocaml/camlp5/default.nix +++ b/pkgs/development/tools/ocaml/camlp5/default.nix @@ -7,11 +7,11 @@ in stdenv.mkDerivation { - name = "camlp5${if transitional then "_transitional" else ""}-6.11"; + name = "camlp5${if transitional then "_transitional" else ""}-6.12"; src = fetchurl { - url = http://pauillac.inria.fr/~ddr/camlp5/distrib/src/camlp5-6.11.tgz; - sha256 = "0dxb5id6imq502sic75l786q94dhplqx6yyhjkkw19kf64fiqlk5"; + url = http://camlp5.gforge.inria.fr/distrib/src/camlp5-6.12.tgz; + sha256 = "00jwgp6w4g64lfqjx77xziy532091fy00c42fsy0b4i892rch5mp"; }; buildInputs = [ ocaml ]; @@ -25,17 +25,17 @@ stdenv.mkDerivation { postInstall = "cp ${metafile} $out/lib/ocaml/${ocaml_version}/site-lib/camlp5/META"; - meta = { + meta = with stdenv.lib; { description = "Preprocessor-pretty-printer for OCaml"; longDescription = '' Camlp5 is a preprocessor and pretty-printer for OCaml programs. It also provides parsing and printing tools. ''; homepage = http://pauillac.inria.fr/~ddr/camlp5/; - license = stdenv.lib.licenses.bsd3; + license = licenses.bsd3; platforms = ocaml.meta.platforms; - maintainers = [ - stdenv.lib.maintainers.z77z + maintainers = with maintainers; [ + z77z vbgl ]; }; } |