Author: roconnor
Date: Thu Nov 24 19:43:03 2011
New Revision: 30552
URL: https://nixos.org/websvn/nix/?rev=30552&sc=1
Log:
adding camlp5 as a propogated build input to ulex 0.8
matita and ulex must build against the same version of camlp5, so in an attempt
to force them to always be the same I am adding a propgatedBuildInput to ulex.
Granted Matita still requires camlp5_traditional and this is less obvious in
the matita file now, so I am not entirely sure this is the right design choice.
Modified:
nixpkgs/trunk/pkgs/applications/science/logic/matita/default.nix
nixpkgs/trunk/pkgs/development/ocaml-modules/ulex/0.8/default.nix
nixpkgs/trunk/pkgs/top-level/all-packages.nix
Modified: nixpkgs/trunk/pkgs/applications/science/logic/matita/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/applications/science/logic/matita/default.nix Thu Nov
24 18:28:45 2011 (r30551)
+++ nixpkgs/trunk/pkgs/applications/science/logic/matita/default.nix Thu Nov
24 19:43:03 2011 (r30552)
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, ocaml, camlp5, findlib, gdome2, ocaml_expat, gmetadom,
ocaml_http, lablgtk, lablgtkmathview, ocaml_mysql, ocaml_sqlite3, ocamlnet,
ulex08, camlzip, ocaml_pcre }:
+{stdenv, fetchurl, ocaml, findlib, gdome2, ocaml_expat, gmetadom, ocaml_http,
lablgtk, lablgtkmathview, ocaml_mysql, ocaml_sqlite3, ocamlnet, ulex08,
camlzip, ocaml_pcre }:
let
ocaml_version = (builtins.parseDrvName ocaml.name).version;
@@ -15,7 +15,7 @@
sha256 = "04sxklfak71khy1f07ks5c6163jbpxv6fmaw03fx8gwwlvpmzglh";
};
- buildInputs = [ocaml camlp5 findlib gdome2 ocaml_expat gmetadom ocaml_http
lablgtk lablgtkmathview ocaml_mysql ocaml_sqlite3 ocamlnet ulex08 camlzip
ocaml_pcre ];
+ buildInputs = [ocaml findlib gdome2 ocaml_expat gmetadom ocaml_http lablgtk
lablgtkmathview ocaml_mysql ocaml_sqlite3 ocamlnet ulex08 camlzip ocaml_pcre ];
postPatch = ''
BASH=$(type -tp bash)
Modified: nixpkgs/trunk/pkgs/development/ocaml-modules/ulex/0.8/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/development/ocaml-modules/ulex/0.8/default.nix Thu Nov
24 18:28:45 2011 (r30551)
+++ nixpkgs/trunk/pkgs/development/ocaml-modules/ulex/0.8/default.nix Thu Nov
24 19:43:03 2011 (r30552)
@@ -21,6 +21,8 @@
patches = [ ./meta_version.patch ./camlp5.patch ];
+ propagatedBuildInputs = [ camlp5 ];
+
buildFlags = "all all.opt";
meta = {
Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix
==============================================================================
--- nixpkgs/trunk/pkgs/top-level/all-packages.nix Thu Nov 24 18:28:45
2011 (r30551)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix Thu Nov 24 19:43:03
2011 (r30552)
@@ -8240,7 +8240,6 @@
matita = callPackage ../applications/science/logic/matita {
inherit (ocamlPackages) findlib lablgtk ocaml_expat gmetadom ocaml_http
lablgtkmathview ocaml_mysql ocaml_sqlite3 ocamlnet ulex08 camlzip
ocaml_pcre;
- camlp5 = ocamlPackages.camlp5_transitional;
};
minisat = callPackage ../applications/science/logic/minisat {};
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
