* Merged r2372.

svn path=/nixpkgs/branches/one-click/; revision=2373

pkgs/misc/nix/default.nix

@@ -8,11 +8,11 @@ assert aterm != null && bdb != null && perl != null;
 # assert aterm.version >= 2.0
 
 stdenv.mkDerivation {
-  name = "nix-0.6";
+  name = "nix-0.8pre2297";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://catamaran.labs.cs.uu.nl/dist/nix/nix-0.6/nix-0.6.tar.gz;
-    md5 = "c4a40960d7b00390b24f6f16e87153d3";
+    url = http://catamaran.labs.cs.uu.nl/dist/nix/nix-0.8pre2297/nix-0.8pre2297.tar.gz;
+    md5 = "81245c790227c8315c988403f1da62a5";
   };
   buildInputs = [aterm bdb perl curl];
   inherit storeDir stateDir aterm bdb;

pkgs/os-specific/linux/e2fsprogs/builder.sh

@@ -1,8 +0,0 @@
-buildinputs="$gettext"
-. $stdenv/setup 
-
-tar xvfz $src 
-cd e2fsprogs-* 
-./configure --prefix=$out --enable-dynamic-e2fsck
-make 
-make install 

pkgs/os-specific/linux/e2fsprogs/default.nix

@@ -1,11 +1,11 @@
 {stdenv, fetchurl, gettext}:
 
 stdenv.mkDerivation {
-  name = "e2fsprogs-1.34";
-  builder = ./builder.sh;
+  name = "e2fsprogs-1.36";
   src = fetchurl {
-    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/e2fsprogs-1.34.tar.gz;
-    md5 = "9be9375224f0970a55e39ebebf2a0ce5";
+    url = http://heanet.dl.sourceforge.net/sourceforge/e2fsprogs/e2fsprogs-1.36.tar.gz;
+    md5 = "1804ee96b76e5e7113fe3cecd6fe582b";
   };
-  inherit gettext;
+  configureFlags = "--enable-dynamic-e2fsck";
+  buildInputs = [gettext];
 }

pkgs/os-specific/linux/util-linux/MCONFIG.patch

@@ -1,7 +1,8 @@
-*** MCONFIG.old	2004-02-16 10:54:10.000000000 +0100
---- MCONFIG.new	2004-02-16 11:38:35.000000000 +0100
+diff -rc util-linux-2.12q-orig/MCONFIG util-linux-2.12q/MCONFIG
+*** util-linux-2.12q-orig/MCONFIG	2004-12-13 00:15:48.000000000 +0100
+--- util-linux-2.12q/MCONFIG	2005-03-10 16:28:53.000000000 +0100
 ***************
-*** 55,66 ****
+*** 64,75 ****
   # If HAVE_WRITE is set to "yes", then write will not be built or
   # installed from the misc-utils subdirectory.
   # (There is a network aware write in netwrite from NetKit 0.16 or later.)
@@ -14,7 +15,7 @@
   
   # If USE_TTY_GROUP is set to "yes", then wall and write will be installed
   # setgid to the "tty" group, and mesg will only set the group write bit.
---- 55,66 ----
+--- 64,75 ----
   # If HAVE_WRITE is set to "yes", then write will not be built or
   # installed from the misc-utils subdirectory.
   # (There is a network aware write in netwrite from NetKit 0.16 or later.)
@@ -28,7 +29,7 @@
   # If USE_TTY_GROUP is set to "yes", then wall and write will be installed
   # setgid to the "tty" group, and mesg will only set the group write bit.
 ***************
-*** 68,74 ****
+*** 77,83 ****
   # user's tty to "tty" [The login in util-linux does this correctly, and
   # xterm will do it correctly if X is compiled with USE_TTY_GROUP set
   # properly.]
@@ -36,7 +37,7 @@
   
   # If HAVE_KILL is set to "yes", then kill will not be built or
   # installed from the misc-utils subdirectory.
---- 68,74 ----
+--- 77,83 ----
   # user's tty to "tty" [The login in util-linux does this correctly, and
   # xterm will do it correctly if X is compiled with USE_TTY_GROUP set
   # properly.]
@@ -45,7 +46,7 @@
   # If HAVE_KILL is set to "yes", then kill will not be built or
   # installed from the misc-utils subdirectory.
 ***************
-*** 88,97 ****
+*** 102,111 ****
   # If HAVE_SLN is set to "yes", then sln won't be installed
   # (but the man page sln.8 will be installed anyway).
   # sln also comes with libc and glibc.
@@ -56,7 +57,7 @@
   
   # If SILENT_PG is set to "yes", then pg will not ring the bell
   # when an invalid key is pressed
---- 88,97 ----
+--- 102,111 ----
   # If HAVE_SLN is set to "yes", then sln won't be installed
   # (but the man page sln.8 will be installed anyway).
   # sln also comes with libc and glibc.
@@ -68,14 +69,14 @@
   # If SILENT_PG is set to "yes", then pg will not ring the bell
   # when an invalid key is pressed
 ***************
-*** 146,162 ****
+*** 168,184 ****
   DEV_DIR=	/dev
   ETC_DIR=	/etc
   SBIN_DIR=	/sbin
 ! USRSBIN_DIR=	/usr/sbin
 ! USRLIB_DIR=	/usr/lib
 ! USRBIN_DIR=	/usr/bin
-  USRGAMES_DIR=	/usr/games
+! USRGAMES_DIR=	/usr/games
 ! USRSHAREMISC_DIR=/usr/share/misc
 ! LOCALE_DIR=	/usr/share/locale
   BIN_DIR=        /bin
@@ -86,14 +87,14 @@
   
   #
   # Paths used for install
---- 146,162 ----
+--- 168,184 ----
   DEV_DIR=	/dev
   ETC_DIR=	/etc
   SBIN_DIR=	/sbin
 ! USRSBIN_DIR=	/sbin
 ! USRLIB_DIR=	/lib
 ! USRBIN_DIR=	/bin
-  USRGAMES_DIR=	/usr/games
+! USRGAMES_DIR=	/games
 ! USRSHAREMISC_DIR=/share/misc
 ! LOCALE_DIR=	/share/locale
   BIN_DIR=        /bin
@@ -105,7 +106,7 @@
   #
   # Paths used for install
 ***************
-*** 190,196 ****
+*** 212,218 ****
   MANMODE=	644
   DATMODE=	644
   INFOMODE=	644
@@ -113,7 +114,7 @@
   
   CHMOD=		chmod
   INSTALL=	install
---- 190,196 ----
+--- 212,218 ----
   MANMODE=	644
   DATMODE=	644
   INFOMODE=	644
@@ -122,7 +123,7 @@
   CHMOD=		chmod
   INSTALL=	install
 ***************
-*** 198,204 ****
+*** 220,226 ****
   INSTALLBIN=	$(INSTALL) -m $(BINMODE)
   INSTALLMAN=	$(INSTALL) -m $(MANMODE)
   INSTALLDAT=	$(INSTALL) -m $(DATMODE)
@@ -130,7 +131,7 @@
   
   ifeq "$(DISABLE_NLS)" "yes"
   NLSFLAGS = -DDISABLE_NLS
---- 198,204 ----
+--- 220,226 ----
   INSTALLBIN=	$(INSTALL) -m $(BINMODE)
   INSTALLMAN=	$(INSTALL) -m $(MANMODE)
   INSTALLDAT=	$(INSTALL) -m $(DATMODE)

pkgs/os-specific/linux/util-linux/builder.sh

@@ -1,14 +1,3 @@
-buildinputs="$patch"
 . $stdenv/setup
-
-# !!! hack; this is because $linuxHeaders/config.h includes some
-# file autoconf.h.  What is that?
-export NIX_CFLAGS_COMPILE="-D_LINUX_CONFIG_H $NIX_CFLAGS_COMPILE"
-
-tar xvfz $src
-cd util-linux-*
-patch MCONFIG $mconfigPatch
-./configure
-make
 export DESTDIR=$out
-make install
+genericBuild

pkgs/os-specific/linux/util-linux/default.nix

@@ -1,11 +1,11 @@
 {stdenv, fetchurl}:
 
 stdenv.mkDerivation {
-  name = "util-linux-2.12";
+  name = "util-linux-2.12q";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/util-linux-2.12.tar.gz;
-    md5 = "997adf78b98d9d1c5db4f37ea982acff";
+    url = http://www.kernel.org/pub/linux/utils/util-linux/util-linux-2.12q.tar.bz2;
+    md5 = "54320aa1abbce00c0dc030e2c3afe5d7";
   };
-  mconfigPatch = ./MCONFIG.patch;
+  patches = [./MCONFIG.patch];
 }

pkgs/system/all-packages-generic.nix

@@ -605,7 +605,7 @@ rec {
             libtiff libjpeg libpng;
   };
 
-  gtkLibs22 = import ../development/libraries/gtk-libs-2.4 {
+  gtkLibs24 = import ../development/libraries/gtk-libs-2.4 {
     inherit fetchurl stdenv pkgconfig gettext perl x11
             libtiff libjpeg libpng;
   };
@@ -676,7 +676,6 @@ rec {
   zvbi = (import ../development/libraries/zvbi) {
     inherit fetchurl stdenv libpng x11;
     pngSupport = true;
-    libpng = libpng;
   };
 
   rte = (import ../development/libraries/rte) {