diff options
| author | Vincent Laporte <Vincent.Laporte@gmail.com> | 2018-10-27 16:41:18 +0000 |
|---|---|---|
| committer | Vincent Laporte <Vincent.Laporte@gmail.com> | 2018-10-28 15:30:49 +0000 |
| commit | 80bb1db72c495d77dacdb1c32c192a0d6a53829e (patch) | |
| tree | 5e9cd4f462db5ef3158f2ce4f2a7fe49eb23826d /pkgs/development/ocaml-modules/menhir | |
| parent | 17585ff6d8e7db7cd665f1eb8212d795c926120b (diff) | |
| download | nixpkgs-80bb1db72c495d77dacdb1c32c192a0d6a53829e.tar nixpkgs-80bb1db72c495d77dacdb1c32c192a0d6a53829e.tar.gz nixpkgs-80bb1db72c495d77dacdb1c32c192a0d6a53829e.tar.bz2 nixpkgs-80bb1db72c495d77dacdb1c32c192a0d6a53829e.tar.lz nixpkgs-80bb1db72c495d77dacdb1c32c192a0d6a53829e.tar.xz nixpkgs-80bb1db72c495d77dacdb1c32c192a0d6a53829e.tar.zst nixpkgs-80bb1db72c495d77dacdb1c32c192a0d6a53829e.zip | |
ocamlPackages.menhir: 20170712 -> 20181026
Diffstat (limited to 'pkgs/development/ocaml-modules/menhir')
| -rw-r--r-- | pkgs/development/ocaml-modules/menhir/default.nix | 14 | ||||
| -rw-r--r-- | pkgs/development/ocaml-modules/menhir/generic.nix | 7 |
2 files changed, 10 insertions, 11 deletions
diff --git a/pkgs/development/ocaml-modules/menhir/default.nix b/pkgs/development/ocaml-modules/menhir/default.nix index 2a101da74d5..ce9ddeea0c4 100644 --- a/pkgs/development/ocaml-modules/menhir/default.nix +++ b/pkgs/development/ocaml-modules/menhir/default.nix @@ -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; }) diff --git a/pkgs/development/ocaml-modules/menhir/generic.nix b/pkgs/development/ocaml-modules/menhir/generic.nix index d52da82d6d7..bac6cd70794 100644 --- a/pkgs/development/ocaml-modules/menhir/generic.nix +++ b/pkgs/development/ocaml-modules/menhir/generic.nix @@ -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 ]; |