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/camlp5/5.15.nix
+5 -6
View File
@@ -1,18 +1,17 @@
{stdenv, fetchurl, ocaml, transitional ? false}:
let
ocaml_version = (builtins.parseDrvName ocaml.name).version;
pname = "camlp5";
version = "5.15";
webpage = http://pauillac.inria.fr/~ddr/camlp5/;
metafile = ./META;
in
assert !stdenv.lib.versionOlder "4.00" ocaml_version;
assert !stdenv.lib.versionOlder "4.00" ocaml.version;
stdenv.mkDerivation {
stdenv.mkDerivation rec {
name = "${pname}${if transitional then "_transitional" else ""}-${version}";
version = "5.15";
src = fetchurl {
url = "${webpage}/distrib/src/${pname}-${version}.tgz";
@@ -24,11 +23,11 @@ stdenv.mkDerivation {
prefixKey = "-prefix ";
preConfigure = "configureFlagsArray=(" + (if transitional then "--transitional" else "--strict") +
" --libdir $out/lib/ocaml/${ocaml_version}/site-lib)";
" --libdir $out/lib/ocaml/${ocaml.version}/site-lib)";
buildFlags = "world.opt";
postInstall = "cp ${metafile} $out/lib/ocaml/${ocaml_version}/site-lib/camlp5/META";
postInstall = "cp ${metafile} $out/lib/ocaml/${ocaml.version}/site-lib/camlp5/META";
meta = {
description = "Preprocessor-pretty-printer for OCaml";
pkgs/development/tools/ocaml/camlp5/default.nix
+2 -3
View File
@@ -1,7 +1,6 @@
{stdenv, fetchurl, ocaml, transitional ? false}:
let
ocaml_version = (builtins.parseDrvName ocaml.name).version;
metafile = ./META;
in
@@ -19,11 +18,11 @@ stdenv.mkDerivation {
prefixKey = "-prefix ";
preConfigure = "configureFlagsArray=(" + (if transitional then "--transitional" else "--strict") +
" --libdir $out/lib/ocaml/${ocaml_version}/site-lib)";
" --libdir $out/lib/ocaml/${ocaml.version}/site-lib)";
buildFlags = "world.opt";
postInstall = "cp ${metafile} $out/lib/ocaml/${ocaml_version}/site-lib/camlp5/META";
postInstall = "cp ${metafile} $out/lib/ocaml/${ocaml.version}/site-lib/camlp5/META";
meta = with stdenv.lib; {
description = "Preprocessor-pretty-printer for OCaml";