public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

treewide: use ocaml.version (#19192)

Browse Source
This commit is contained in:
Kirill Boltaev
2016-10-05 09:32:30 +02:00
committed by vbgl
parent 916364af72
commit 3e646865f4
49 changed files with 170 additions and 287 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/tools/ocaml/camlp4/4_03.nix
+6 -9
View File
@@ -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
'';
pkgs/development/tools/ocaml/camlp4/default.nix
+8 -11
View File
@@ -1,14 +1,11 @@
{stdenv, fetchzip, which, ocaml}:
let
ocaml_version = (stdenv.lib.getVersion ocaml);
assert stdenv.lib.versionAtLeast ocaml.version "4.02";
stdenv.mkDerivation rec {
name = "camlp4-${version}";
version = "4.02+6";
in
assert stdenv.lib.versionAtLeast ocaml_version "4.02";
stdenv.mkDerivation {
name = "camlp4-${version}";
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
'';