forked from mirrors/nixpkgs
ocamlPackages.menhir: 20170712 -> 20181026
This commit is contained in:
parent
17585ff6d8
commit
80bb1db72c
|
@ -1,12 +1,14 @@
|
|||
{ stdenv, fetchurl, ocaml, findlib, ocamlbuild
|
||||
, version ? if stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "4.02" then "20170712" else "20140422"
|
||||
, version ? if stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "4.02" then "20181026" else "20140422"
|
||||
}@args:
|
||||
|
||||
let
|
||||
sha256 =
|
||||
if version == "20140422" then "1ki1f2id6a14h9xpv2k8yb6px7dyw8cvwh39csyzj4qpzx7wia0d"
|
||||
else if version == "20170712" then "006hq3bwj81j67f2k9cgzj5wr4hai8j36925p5n3sd2j01ljsj6a"
|
||||
else throw ("menhir: unknown version " ++ version);
|
||||
src = fetchurl (
|
||||
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 == "20181026" then { url = "https://gitlab.inria.fr/fpottier/menhir/repository/20181026/archive.tar.gz"; sha256 = "1zhacw60996i9b88kbnfvrvjk3ps9p9n9syjk9np545jp8l0582g"; }
|
||||
else throw ("menhir: unknown version " ++ version)
|
||||
);
|
||||
in
|
||||
|
||||
import ./generic.nix (args // { inherit version sha256; })
|
||||
import ./generic.nix (args // { inherit version src; })
|
||||
|
|
|
@ -1,12 +1,9 @@
|
|||
{ version, sha256, stdenv, fetchurl, ocaml, findlib, ocamlbuild }:
|
||||
{ version, src, stdenv, fetchurl, ocaml, findlib, ocamlbuild }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "menhir-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://pauillac.inria.fr/~fpottier/menhir/menhir-${version}.tar.gz";
|
||||
inherit sha256;
|
||||
};
|
||||
inherit src;
|
||||
|
||||
buildInputs = [ ocaml findlib ocamlbuild ];
|
||||
|
||||
|
|
|
@ -1024,11 +1024,15 @@ let
|
|||
|
||||
omake_rc1 = callPackage ../development/tools/ocaml/omake/0.9.8.6-rc1.nix { };
|
||||
|
||||
verasco = callPackage ../development/tools/analysis/verasco (
|
||||
verasco = callPackage ../development/tools/analysis/verasco ((
|
||||
if system == "x86_64-linux"
|
||||
then { tools = pkgs.pkgsi686Linux.stdenv.cc; }
|
||||
else {}
|
||||
);
|
||||
) // {
|
||||
menhir = callPackage ../development/ocaml-modules/menhir {
|
||||
version = "20170712";
|
||||
};
|
||||
});
|
||||
|
||||
google-drive-ocamlfuse = callPackage ../applications/networking/google-drive-ocamlfuse { };
|
||||
|
||||
|
|
Loading…
Reference in a new issue