diff options
Diffstat (limited to 'pkgs/development/tools/ocaml/camlp4')
-rw-r--r-- | pkgs/development/tools/ocaml/camlp4/4_03.nix | 15 | ||||
-rw-r--r-- | pkgs/development/tools/ocaml/camlp4/default.nix | 17 |
2 files changed, 13 insertions, 19 deletions
diff --git a/pkgs/development/tools/ocaml/camlp4/4_03.nix b/pkgs/development/tools/ocaml/camlp4/4_03.nix index f05a556c3886..a92f2491e468 100644 --- a/pkgs/development/tools/ocaml/camlp4/4_03.nix +++ b/pkgs/development/tools/ocaml/camlp4/4_03.nix @@ -1,14 +1,11 @@ {stdenv, fetchzip, which, ocaml, ocamlbuild}: -let - ocaml_version = (stdenv.lib.getVersion ocaml); - version = "4.03+1"; - -in -assert stdenv.lib.versionAtLeast ocaml_version "4.02"; +assert stdenv.lib.versionAtLeast ocaml.version "4.02"; stdenv.mkDerivation { name = "camlp4-${version}"; + version = "4.03+1"; + src = fetchzip { url = "https://github.com/ocaml/camlp4/archive/${version}.tar.gz"; sha256 = "1f2ndch6f1m4fgnxsjb94qbpwjnjgdlya6pard44y6n0dqxi1wsq"; @@ -21,14 +18,14 @@ stdenv.mkDerivation { preConfigure = '' configureFlagsArray=( --bindir=$out/bin - --libdir=$out/lib/ocaml/${ocaml_version}/site-lib - --pkgdir=$out/lib/ocaml/${ocaml_version}/site-lib + --libdir=$out/lib/ocaml/${ocaml.version}/site-lib + --pkgdir=$out/lib/ocaml/${ocaml.version}/site-lib ) ''; postConfigure = '' substituteInPlace camlp4/META.in \ - --replace +camlp4 $out/lib/ocaml/${ocaml_version}/site-lib/camlp4 + --replace +camlp4 $out/lib/ocaml/${ocaml.version}/site-lib/camlp4 ''; diff --git a/pkgs/development/tools/ocaml/camlp4/default.nix b/pkgs/development/tools/ocaml/camlp4/default.nix index ae253180aee1..145a3a2b54a9 100644 --- a/pkgs/development/tools/ocaml/camlp4/default.nix +++ b/pkgs/development/tools/ocaml/camlp4/default.nix @@ -1,14 +1,11 @@ {stdenv, fetchzip, which, ocaml}: -let - ocaml_version = (stdenv.lib.getVersion ocaml); - version = "4.02+6"; - -in -assert stdenv.lib.versionAtLeast ocaml_version "4.02"; +assert stdenv.lib.versionAtLeast ocaml.version "4.02"; -stdenv.mkDerivation { +stdenv.mkDerivation rec { name = "camlp4-${version}"; + version = "4.02+6"; + src = fetchzip { url = "https://github.com/ocaml/camlp4/archive/${version}.tar.gz"; sha256 = "06yl4q0qazl7g25b0axd1gdkfd4qpqzs1gr5fkvmkrcbz113h1hj"; @@ -21,14 +18,14 @@ stdenv.mkDerivation { preConfigure = '' configureFlagsArray=( --bindir=$out/bin - --libdir=$out/lib/ocaml/${ocaml_version}/site-lib - --pkgdir=$out/lib/ocaml/${ocaml_version}/site-lib + --libdir=$out/lib/ocaml/${ocaml.version}/site-lib + --pkgdir=$out/lib/ocaml/${ocaml.version}/site-lib ) ''; postConfigure = '' substituteInPlace camlp4/META.in \ - --replace +camlp4 $out/lib/ocaml/${ocaml_version}/site-lib/camlp4 + --replace +camlp4 $out/lib/ocaml/${ocaml.version}/site-lib/camlp4 ''; |