diff options
| author | Samuel Rivas <samuelrivas@gmail.com> | 2015-07-28 17:30:40 +0200 |
|---|---|---|
| committer | Samuel Rivas <samuel.rivas@klarna.com> | 2015-08-06 08:06:16 +0200 |
| commit | d516f12dbae4fccf184cef11ce49529b56e9df39 (patch) | |
| tree | 89c31e11c7387bf4b10a44f0e5ee511e45b7aecc /pkgs/development/tools/ocaml/camlp4 | |
| parent | 9d5508d85c33b8fb22d79dde6176792eac2c2696 (diff) | |
| download | nixpkgs-d516f12dbae4fccf184cef11ce49529b56e9df39.tar nixpkgs-d516f12dbae4fccf184cef11ce49529b56e9df39.tar.gz nixpkgs-d516f12dbae4fccf184cef11ce49529b56e9df39.tar.bz2 nixpkgs-d516f12dbae4fccf184cef11ce49529b56e9df39.tar.lz nixpkgs-d516f12dbae4fccf184cef11ce49529b56e9df39.tar.xz nixpkgs-d516f12dbae4fccf184cef11ce49529b56e9df39.tar.zst nixpkgs-d516f12dbae4fccf184cef11ce49529b56e9df39.zip | |
camlp4: 4.02.0+1 -> 4.02+6
* Remove unneeded substitution in postConfigure This was fixed here: https://github.com/ocaml/camlp4/commit/81ed5cf2e857c08e433d891328767ad7f07f1447 * camlp4: use fetchzip It is considered more reliable than fetchurl
Diffstat (limited to 'pkgs/development/tools/ocaml/camlp4')
| -rw-r--r-- | pkgs/development/tools/ocaml/camlp4/default.nix | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/pkgs/development/tools/ocaml/camlp4/default.nix b/pkgs/development/tools/ocaml/camlp4/default.nix index a8043a9fc5e..20373c923e7 100644 --- a/pkgs/development/tools/ocaml/camlp4/default.nix +++ b/pkgs/development/tools/ocaml/camlp4/default.nix @@ -1,15 +1,17 @@ -{stdenv, fetchurl, which, ocaml}: +{stdenv, fetchzip, which, ocaml}: let ocaml_version = (stdenv.lib.getVersion ocaml); + version = "4.02+6"; + in assert stdenv.lib.versionAtLeast ocaml_version "4.02"; stdenv.mkDerivation { - name = "camlp4-4.02.0+1"; - src = fetchurl { - url = https://github.com/ocaml/camlp4/archive/4.02.0+1.tar.gz; - sha256 = "0055f4jiz82rgn581xhq3mr4qgq2qgdxqppmp8i2x1xnsim4h9pn"; + name = "camlp4-${version}"; + src = fetchzip { + url = "https://github.com/ocaml/camlp4/archive/${version}.tar.gz"; + sha256 = "06yl4q0qazl7g25b0axd1gdkfd4qpqzs1gr5fkvmkrcbz113h1hj"; }; buildInputs = [ which ocaml ]; @@ -27,10 +29,6 @@ stdenv.mkDerivation { postConfigure = '' substituteInPlace camlp4/META.in \ --replace +camlp4 $out/lib/ocaml/${ocaml_version}/site-lib/camlp4 - substituteInPlace camlp4/config/Camlp4_config.ml \ - --replace \ - "Filename.concat ocaml_standard_library" \ - "Filename.concat \"$out/lib/ocaml/${ocaml_version}/site-lib\"" ''; |