From 051cd950fe0f7ca0bfa8270b61af62409bdf2209 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 21 Feb 2008 13:44:06 +0000 Subject: [PATCH 1/3] * Use the latest Nix. What a relief. :-) svn path=/nixpkgs/trunk/; revision=10801 --- .../tools/package-management/nix/unstable.nix | 4 ++-- pkgs/top-level/all-packages.nix | 19 +++++++++---------- 2 files changed, 11 insertions(+), 12 deletions(-) diff --git a/pkgs/tools/package-management/nix/unstable.nix b/pkgs/tools/package-management/nix/unstable.nix index 1a507f20a043..bfcf3697d8a9 100644 --- a/pkgs/tools/package-management/nix/unstable.nix +++ b/pkgs/tools/package-management/nix/unstable.nix @@ -3,14 +3,14 @@ , stateDir ? "/nix/var" }: -let version = "0.12pre10505"; in +let version = "0.12pre10798"; in stdenv.mkDerivation { name = "nix-${version}"; src = fetchurl { url = "http://nix.cs.uu.nl/dist/nix/nix-${version}/nix-${version}.tar.bz2"; - md5 = "44dd2927ce97f12b3f110a7ad991828e"; + md5 = "1f3d0a72c9bf1297c2daa32e601bde82"; }; buildInputs = [perl curl openssl]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9cb844a6eaa2..1bf3f007775e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5760,17 +5760,16 @@ rec { db4 = db45; }; - nixCustomFun = src: preConfigure: configureFlags : - (import ../tools/package-management/nix/custom.nix { - inherit fetchurl stdenv perl curl bzip2 openssl src preConfigure automake + nixCustomFun = src: preConfigure: configureFlags: + import ../tools/package-management/nix/custom.nix { + inherit fetchurl stdenv perl curl bzip2 openssl src preConfigure automake autoconf libtool configureFlags; - bison = bison23; - flex = flex2533; - aterm = aterm242fixes; - db4 = db45; - inherit docbook5_xsl libxslt docbook5 docbook_xml_dtd_43 w3m; - - }); + bison = bison23; + flex = flex2533; + aterm = aterm242fixes; + db4 = db45; + inherit docbook5_xsl libxslt docbook5 docbook_xml_dtd_43 w3m; + }; ntfs3g = import ../misc/ntfs-3g { inherit fetchurl stdenv fuse pkgconfig; From cee8b8ebac6f2e58bff5dd2b6d1df4c8def065a5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Thu, 21 Feb 2008 15:34:56 +0000 Subject: [PATCH 2/3] Add GNU Texinfo 4.9, use it to produce GCC 4.x documentation. svn path=/nixpkgs/trunk/; revision=10805 --- pkgs/development/compilers/gcc-4.0/default.nix | 4 +++- pkgs/development/compilers/gcc-4.1/default.nix | 4 +++- pkgs/development/compilers/gcc-4.2/default.nix | 4 ++++ pkgs/development/tools/misc/texinfo/4.9.nix | 10 ++++++++++ pkgs/top-level/all-packages.nix | 12 ++++++++++++ 5 files changed, 32 insertions(+), 2 deletions(-) create mode 100644 pkgs/development/tools/misc/texinfo/4.9.nix diff --git a/pkgs/development/compilers/gcc-4.0/default.nix b/pkgs/development/compilers/gcc-4.0/default.nix index 5d81ecbfd74d..8e7724865599 100644 --- a/pkgs/development/compilers/gcc-4.0/default.nix +++ b/pkgs/development/compilers/gcc-4.0/default.nix @@ -1,7 +1,8 @@ { stdenv, fetchurl, noSysDirs , langC ? true, langCC ? true, langF77 ? false , profiledCompiler ? false -,gmp ? null , mpfr ? null +, gmp ? null , mpfr ? null +, texinfo ? null }: assert langC; @@ -24,6 +25,7 @@ stdenv.mkDerivation { buildInputs = [] ++ (if gmp != null then [gmp] else []) ++ (if mpfr != null then [mpfr] else []) + ++ (if texinfo != null then [texinfo] else []) ; configureFlags = " diff --git a/pkgs/development/compilers/gcc-4.1/default.nix b/pkgs/development/compilers/gcc-4.1/default.nix index e6d5452512e0..f01696b36648 100644 --- a/pkgs/development/compilers/gcc-4.1/default.nix +++ b/pkgs/development/compilers/gcc-4.1/default.nix @@ -4,6 +4,7 @@ , staticCompiler ? false , gmp ? null , mpfr ? null +, texinfo ? null }: assert langC || langF77; @@ -66,5 +67,6 @@ stdenv.mkDerivation ({ // (if gmp != null || mpfr != null then { buildInputs = [] ++ (if gmp != null then [gmp] else []) - ++ (if mpfr != null then [mpfr] else []); + ++ (if mpfr != null then [mpfr] else []) + ++ (if texinfo != null then [texinfo] else []); } else {})) diff --git a/pkgs/development/compilers/gcc-4.2/default.nix b/pkgs/development/compilers/gcc-4.2/default.nix index 2681531f2044..a027512f5083 100644 --- a/pkgs/development/compilers/gcc-4.2/default.nix +++ b/pkgs/development/compilers/gcc-4.2/default.nix @@ -2,6 +2,7 @@ , langC ? true, langCC ? true, langF77 ? false , profiledCompiler ? false , staticCompiler ? false +, texinfo ? null }: assert langC; @@ -32,6 +33,9 @@ stdenv.mkDerivation { inherit noSysDirs profiledCompiler staticCompiler; + buildInputs = [] + ++ optional (texinfo != null) [texinfo]; + configureFlags = " --disable-multilib --disable-libstdcxx-pch diff --git a/pkgs/development/tools/misc/texinfo/4.9.nix b/pkgs/development/tools/misc/texinfo/4.9.nix new file mode 100644 index 000000000000..fd42093e561d --- /dev/null +++ b/pkgs/development/tools/misc/texinfo/4.9.nix @@ -0,0 +1,10 @@ +{stdenv, fetchurl, ncurses}: + +stdenv.mkDerivation { + name = "texinfo-4.9"; + src = fetchurl { + url = mirror://gnu/texinfo/texinfo-4.9.tar.bz2; + sha256 = "0h7q9h405m88fjj067brzniiv8306ryl087pgjpmbpd2jci9h6g7"; + }; + buildInputs = [ncurses]; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1bf3f007775e..9ef5d47c0adb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1094,13 +1094,20 @@ rec { inherit fetchurl stdenv noSysDirs; }); + # XXX: GCC 4.2 (and possibly others) misdetects `makeinfo' when + # using Texinfo >= 4.10, just because it uses a stupid regexp that + # expects a single digit after the dot. As a workaround, we feed + # GCC with Texinfo 4.9. Stupid bug, hackish workaround. + gcc40 = wrapGCC (import ../development/compilers/gcc-4.0 { inherit fetchurl stdenv noSysDirs; + texinfo = texinfo49; profiledCompiler = true; }); gcc41 = useFromStdenv (stdenv ? gcc) stdenv.gcc (wrapGCC (import ../development/compilers/gcc-4.1 { inherit fetchurl stdenv noSysDirs; + texinfo = texinfo49; profiledCompiler = false; })); @@ -1108,6 +1115,7 @@ rec { gcc42 = lowPrio (wrapGCC (import ../development/compilers/gcc-4.2 { inherit fetchurl stdenv noSysDirs; + texinfo = texinfo49; profiledCompiler = true; })); @@ -1990,6 +1998,10 @@ rec { javaSupport = true; })); + texinfo49 = import ../development/tools/misc/texinfo/4.9.nix { + inherit fetchurl stdenv ncurses; + }; + texinfo = import ../development/tools/misc/texinfo { inherit fetchurl stdenv ncurses; }; From 4050f8fa459d392c61aaf28a5a85212a5c0033f7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Thu, 21 Feb 2008 16:17:43 +0000 Subject: [PATCH 3/3] Add MPICH2, an implementation of the Message Passing Interface. svn path=/nixpkgs/trunk/; revision=10807 --- pkgs/development/libraries/mpich2/default.nix | 20 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 ++++ 2 files changed, 24 insertions(+) create mode 100644 pkgs/development/libraries/mpich2/default.nix diff --git a/pkgs/development/libraries/mpich2/default.nix b/pkgs/development/libraries/mpich2/default.nix new file mode 100644 index 000000000000..b92eed68bdea --- /dev/null +++ b/pkgs/development/libraries/mpich2/default.nix @@ -0,0 +1,20 @@ +{stdenv, fetchurl, python}: + +stdenv.mkDerivation rec { + name = "mpich2-1.0.6p1"; + src = fetchurl { + url = "http://www.mcs.anl.gov/research/projects/mpich2/downloads/tarballs/" + + name + ".tar.gz"; + sha256 = "1k0za8951j5fn89ww6bsy9b4yi989zz7bnd8a6acfr8r0yb8z01q"; + }; + + buildInputs = [ python ]; + + meta = { + description = ''MPICH2 is a free high-performance and portable + implementation of the Message Passing Interface + (MPI) standard, both version 1 and version 2.''; + homepage = http://www.mcs.anl.gov/mpi/mpich2/; + license = "free, see http://www.mcs.anl.gov/research/projects/mpich2/downloads/index.php?s=license"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9ef5d47c0adb..e6e547636ecc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2788,6 +2788,10 @@ rec { inherit fetchurl stdenv; }; + mpich2 = import ../development/libraries/mpich2 { + inherit fetchurl stdenv python; + }; + mysqlConnectorODBC = import ../development/libraries/mysql-connector-odbc { inherit fetchurl stdenv mysql libtool zlib unixODBC; };