diff --git a/pkgs/os-specific/linux/util-linux-static/MCONFIG.patch b/pkgs/os-specific/linux/util-linux-static/MCONFIG.patch deleted file mode 100644 index 2a7816db8501..000000000000 --- a/pkgs/os-specific/linux/util-linux-static/MCONFIG.patch +++ /dev/null @@ -1,141 +0,0 @@ -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 -*************** -*** 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.) -! HAVE_WRITE=no - - # If HAVE_GETTY is set to "yes", then agetty will not be built or - # installed from the login-utils subdirectory. Note that agetty can - # co-exist with other gettys, so this option should never be used. -! HAVE_GETTY=no - - # 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. ---- 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.) -! HAVE_WRITE=yes - - # If HAVE_GETTY is set to "yes", then agetty will not be built or - # installed from the login-utils subdirectory. Note that agetty can - # co-exist with other gettys, so this option should never be used. -! HAVE_GETTY=yes - - # 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. -*************** -*** 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.] -! USE_TTY_GROUP=yes - - # If HAVE_KILL is set to "yes", then kill will not be built or - # installed from the misc-utils subdirectory. ---- 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.] -! USE_TTY_GROUP=no - - # If HAVE_KILL is set to "yes", then kill will not be built or - # installed from the misc-utils subdirectory. -*************** -*** 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. -! HAVE_SLN=no - - # If HAVE_FDUTILS is set to "yes", then setfdprm won't be installed. -! HAVE_FDUTILS=no - - # If SILENT_PG is set to "yes", then pg will not ring the bell - # when an invalid key is pressed ---- 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. -! HAVE_SLN=yes - - # If HAVE_FDUTILS is set to "yes", then setfdprm won't be installed. -! HAVE_FDUTILS=yes - - # If SILENT_PG is set to "yes", then pg will not ring the bell - # when an invalid key is pressed -*************** -*** 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 -! USRSHAREMISC_DIR=/usr/share/misc -! LOCALE_DIR= /usr/share/locale - BIN_DIR= /bin - VAR_PATH= /var - LOG_DIR= /var/log -! MAN_DIR= /usr/share/man -! INFO_DIR= /usr/share/info - - # - # Paths used for install ---- 168,184 ---- - DEV_DIR= /dev - ETC_DIR= /etc - SBIN_DIR= /sbin -! USRSBIN_DIR= /sbin -! USRLIB_DIR= /lib -! USRBIN_DIR= /bin -! USRGAMES_DIR= /games -! USRSHAREMISC_DIR=/share/misc -! LOCALE_DIR= /share/locale - BIN_DIR= /bin - VAR_PATH= /var - LOG_DIR= /var/log -! MAN_DIR= /share/man -! INFO_DIR= /share/info - - # - # Paths used for install -*************** -*** 212,218 **** - MANMODE= 644 - DATMODE= 644 - INFOMODE= 644 -! SUIDMODE= 4755 - - CHMOD= chmod - INSTALL= install ---- 212,218 ---- - MANMODE= 644 - DATMODE= 644 - INFOMODE= 644 -! SUIDMODE= 755 - - CHMOD= chmod - INSTALL= install -*************** -*** 220,226 **** - INSTALLBIN= $(INSTALL) -m $(BINMODE) - INSTALLMAN= $(INSTALL) -m $(MANMODE) - INSTALLDAT= $(INSTALL) -m $(DATMODE) -! INSTALLSUID= $(INSTALL) -m $(SUIDMODE) -o root - - ifeq "$(DISABLE_NLS)" "yes" - NLSFLAGS = -DDISABLE_NLS ---- 220,226 ---- - INSTALLBIN= $(INSTALL) -m $(BINMODE) - INSTALLMAN= $(INSTALL) -m $(MANMODE) - INSTALLDAT= $(INSTALL) -m $(DATMODE) -! INSTALLSUID= $(INSTALL) -m $(SUIDMODE) # -o root - - ifeq "$(DISABLE_NLS)" "yes" - NLSFLAGS = -DDISABLE_NLS diff --git a/pkgs/os-specific/linux/util-linux-static/builder.sh b/pkgs/os-specific/linux/util-linux-static/builder.sh deleted file mode 100644 index b0603104573c..000000000000 --- a/pkgs/os-specific/linux/util-linux-static/builder.sh +++ /dev/null @@ -1,9 +0,0 @@ -source $stdenv/setup - -export LDFLAGS=-static -export DESTDIR=$out - -genericBuild - -#strip $out/bin/* -#strip $out/sbin/* diff --git a/pkgs/os-specific/linux/util-linux-static/default.nix b/pkgs/os-specific/linux/util-linux-static/default.nix deleted file mode 100644 index ec50916ec19e..000000000000 --- a/pkgs/os-specific/linux/util-linux-static/default.nix +++ /dev/null @@ -1,11 +0,0 @@ -{stdenv, fetchurl}: - -stdenv.mkDerivation { - name = "util-linux-2.12r"; - builder = ./builder.sh; - src = fetchurl { - url = http://nix.cs.uu.nl/dist/tarballs/util-linux-2.12r.tar.bz2; - md5 = "af9d9e03038481fbf79ea3ac33f116f9"; - }; - patches = [./MCONFIG.patch]; -} diff --git a/pkgs/os-specific/linux/util-linux/MCONFIG.patch b/pkgs/os-specific/linux/util-linux/MCONFIG.patch deleted file mode 100644 index 2a7816db8501..000000000000 --- a/pkgs/os-specific/linux/util-linux/MCONFIG.patch +++ /dev/null @@ -1,141 +0,0 @@ -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 -*************** -*** 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.) -! HAVE_WRITE=no - - # If HAVE_GETTY is set to "yes", then agetty will not be built or - # installed from the login-utils subdirectory. Note that agetty can - # co-exist with other gettys, so this option should never be used. -! HAVE_GETTY=no - - # 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. ---- 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.) -! HAVE_WRITE=yes - - # If HAVE_GETTY is set to "yes", then agetty will not be built or - # installed from the login-utils subdirectory. Note that agetty can - # co-exist with other gettys, so this option should never be used. -! HAVE_GETTY=yes - - # 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. -*************** -*** 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.] -! USE_TTY_GROUP=yes - - # If HAVE_KILL is set to "yes", then kill will not be built or - # installed from the misc-utils subdirectory. ---- 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.] -! USE_TTY_GROUP=no - - # If HAVE_KILL is set to "yes", then kill will not be built or - # installed from the misc-utils subdirectory. -*************** -*** 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. -! HAVE_SLN=no - - # If HAVE_FDUTILS is set to "yes", then setfdprm won't be installed. -! HAVE_FDUTILS=no - - # If SILENT_PG is set to "yes", then pg will not ring the bell - # when an invalid key is pressed ---- 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. -! HAVE_SLN=yes - - # If HAVE_FDUTILS is set to "yes", then setfdprm won't be installed. -! HAVE_FDUTILS=yes - - # If SILENT_PG is set to "yes", then pg will not ring the bell - # when an invalid key is pressed -*************** -*** 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 -! USRSHAREMISC_DIR=/usr/share/misc -! LOCALE_DIR= /usr/share/locale - BIN_DIR= /bin - VAR_PATH= /var - LOG_DIR= /var/log -! MAN_DIR= /usr/share/man -! INFO_DIR= /usr/share/info - - # - # Paths used for install ---- 168,184 ---- - DEV_DIR= /dev - ETC_DIR= /etc - SBIN_DIR= /sbin -! USRSBIN_DIR= /sbin -! USRLIB_DIR= /lib -! USRBIN_DIR= /bin -! USRGAMES_DIR= /games -! USRSHAREMISC_DIR=/share/misc -! LOCALE_DIR= /share/locale - BIN_DIR= /bin - VAR_PATH= /var - LOG_DIR= /var/log -! MAN_DIR= /share/man -! INFO_DIR= /share/info - - # - # Paths used for install -*************** -*** 212,218 **** - MANMODE= 644 - DATMODE= 644 - INFOMODE= 644 -! SUIDMODE= 4755 - - CHMOD= chmod - INSTALL= install ---- 212,218 ---- - MANMODE= 644 - DATMODE= 644 - INFOMODE= 644 -! SUIDMODE= 755 - - CHMOD= chmod - INSTALL= install -*************** -*** 220,226 **** - INSTALLBIN= $(INSTALL) -m $(BINMODE) - INSTALLMAN= $(INSTALL) -m $(MANMODE) - INSTALLDAT= $(INSTALL) -m $(DATMODE) -! INSTALLSUID= $(INSTALL) -m $(SUIDMODE) -o root - - ifeq "$(DISABLE_NLS)" "yes" - NLSFLAGS = -DDISABLE_NLS ---- 220,226 ---- - INSTALLBIN= $(INSTALL) -m $(BINMODE) - INSTALLMAN= $(INSTALL) -m $(MANMODE) - INSTALLDAT= $(INSTALL) -m $(DATMODE) -! INSTALLSUID= $(INSTALL) -m $(SUIDMODE) # -o root - - ifeq "$(DISABLE_NLS)" "yes" - NLSFLAGS = -DDISABLE_NLS diff --git a/pkgs/os-specific/linux/util-linux/builder.sh b/pkgs/os-specific/linux/util-linux/builder.sh deleted file mode 100644 index c61ce6798b0b..000000000000 --- a/pkgs/os-specific/linux/util-linux/builder.sh +++ /dev/null @@ -1,3 +0,0 @@ -source $stdenv/setup -export DESTDIR=$out -genericBuild diff --git a/pkgs/os-specific/linux/util-linux/default.nix b/pkgs/os-specific/linux/util-linux/default.nix index ec50916ec19e..3f3d899885fc 100644 --- a/pkgs/os-specific/linux/util-linux/default.nix +++ b/pkgs/os-specific/linux/util-linux/default.nix @@ -1,11 +1,17 @@ {stdenv, fetchurl}: stdenv.mkDerivation { - name = "util-linux-2.12r"; - builder = ./builder.sh; + name = "util-linux-2.13-pre7"; + src = fetchurl { - url = http://nix.cs.uu.nl/dist/tarballs/util-linux-2.12r.tar.bz2; - md5 = "af9d9e03038481fbf79ea3ac33f116f9"; + url = ftp://ftp.nl.kernel.org/pub/linux/utils/util-linux/testing/util-linux-2.13-pre7.tar.bz2; + md5 = "13cdf4b76533e8421dc49de188f85291"; }; - patches = [./MCONFIG.patch]; + + configureFlags = "--disable-use-tty-group"; + + preBuild = " + makeFlagsArray=(usrbinexecdir=$out/bin usrsbinexecdir=$out/sbin datadir=$out/share exampledir=$out/share/getopt) + installFlagsArray=(\"\${makeFlagsArray[@]}\") + "; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 664652b20638..a1f6e24e4a6a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2206,8 +2206,9 @@ rec { inherit fetchurl stdenv; }; - utillinuxStatic = import ../os-specific/linux/util-linux-static { - inherit fetchurl stdenv; + utillinuxStatic = import ../os-specific/linux/util-linux { + inherit fetchurl; + stdenv = makeStaticBinaries stdenv; }; xorg_sys_opengl = import ../os-specific/linux/opengl/xorg-sys {