From fa47d66e22732ed054ba9a77649397ad89179cc0 Mon Sep 17 00:00:00 2001 From: Marco Maggesi Date: Thu, 10 Nov 2011 15:35:53 +0000 Subject: Updated HOL Light to revision 112 svn path=/nixpkgs/trunk/; revision=30369 --- pkgs/applications/science/logic/hol_light/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs/applications/science/logic') diff --git a/pkgs/applications/science/logic/hol_light/default.nix b/pkgs/applications/science/logic/hol_light/default.nix index d835e351cac6..3f161b5249d7 100644 --- a/pkgs/applications/science/logic/hol_light/default.nix +++ b/pkgs/applications/science/logic/hol_light/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchsvn, writeScript, ocaml, findlib, camlp5}: stdenv.mkDerivation rec { - name = "hol_light-20110813"; + name = "hol_light-20111106"; src = fetchsvn { url = http://hol-light.googlecode.com/svn/trunk; - rev = "102"; - sha256 = "5b972672db6aa1838dc5d130accd9ab6a62030c6b0c1dc4b69e42088b1ae86c9"; + rev = "112"; + sha256 = "6c7b39ea024b2e8042c1a22a01f778caedaaf82189c9f2c1cfa8c08707151129"; }; buildInputs = [ ocaml findlib camlp5 ]; -- cgit 1.4.1 From 845f2a8658af89c96c66a5989cf383a09ba8c56e Mon Sep 17 00:00:00 2001 From: Russell O'Connor Date: Thu, 24 Nov 2011 19:43:03 +0000 Subject: 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. svn path=/nixpkgs/trunk/; revision=30552 --- pkgs/applications/science/logic/matita/default.nix | 4 ++-- pkgs/development/ocaml-modules/ulex/0.8/default.nix | 2 ++ pkgs/top-level/all-packages.nix | 1 - 3 files changed, 4 insertions(+), 3 deletions(-) (limited to 'pkgs/applications/science/logic') diff --git a/pkgs/applications/science/logic/matita/default.nix b/pkgs/applications/science/logic/matita/default.nix index 6ac672193e27..92e9479d9a44 100644 --- a/pkgs/applications/science/logic/matita/default.nix +++ b/pkgs/applications/science/logic/matita/default.nix @@ -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 @@ stdenv.mkDerivation { 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) diff --git a/pkgs/development/ocaml-modules/ulex/0.8/default.nix b/pkgs/development/ocaml-modules/ulex/0.8/default.nix index 169f3bfad8c2..e996b6223b1e 100644 --- a/pkgs/development/ocaml-modules/ulex/0.8/default.nix +++ b/pkgs/development/ocaml-modules/ulex/0.8/default.nix @@ -21,6 +21,8 @@ stdenv.mkDerivation { patches = [ ./meta_version.patch ./camlp5.patch ]; + propagatedBuildInputs = [ camlp5 ]; + buildFlags = "all all.opt"; meta = { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ef1bae599226..789edc93593a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8240,7 +8240,6 @@ let 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 {}; -- cgit 1.4.1 From bf394d80ec1d03bbed699c42f98bdba2ab71913c Mon Sep 17 00:00:00 2001 From: Marco Maggesi Date: Sat, 26 Nov 2011 18:45:15 +0000 Subject: Update url for Isabelle2011 svn path=/nixpkgs/trunk/; revision=30574 --- pkgs/applications/science/logic/isabelle/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pkgs/applications/science/logic') diff --git a/pkgs/applications/science/logic/isabelle/default.nix b/pkgs/applications/science/logic/isabelle/default.nix index 5705262f3771..7cfe5f927363 100644 --- a/pkgs/applications/science/logic/isabelle/default.nix +++ b/pkgs/applications/science/logic/isabelle/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation { inherit name theories; src = fetchurl { - url = "http://www.cl.cam.ac.uk/research/hvg/${pname}/dist/${name}.tar.gz"; + url = http://isabelle.in.tum.de/website-Isabelle2011/dist/Isabelle2011.tar.gz; sha256 = "ea85eb2a859891be387f020b2e45f8c9a0bd1d8bbc3902f28a429e9c61cb0b6a"; }; -- cgit 1.4.1