From ef7b97badef4e6b26b060ed7ff5fba6d0c269942 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 12 Dec 2011 13:45:24 +0000 Subject: [PATCH 001/197] * Fix the zlib build (the patch didn't apply). svn path=/nixpkgs/branches/stdenv-updates/; revision=30847 --- pkgs/development/libraries/zlib/default.nix | 13 ++++++------- .../libraries/zlib/zlib-LARGEFILE64_SOURCE.patch | 8 ++++---- 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/pkgs/development/libraries/zlib/default.nix b/pkgs/development/libraries/zlib/default.nix index 6af8126f5a9..a2f11bca87d 100644 --- a/pkgs/development/libraries/zlib/default.nix +++ b/pkgs/development/libraries/zlib/default.nix @@ -1,6 +1,6 @@ -{stdenv, fetchurl, static ? false}: +{ stdenv, fetchurl, static ? false }: -stdenv.mkDerivation (rec { +stdenv.mkDerivation rec { name = "zlib-1.2.5"; src = fetchurl { @@ -8,7 +8,9 @@ stdenv.mkDerivation (rec { sha256 = "0n7rlgvjn73pyil3s1l6p77m7wkc809n934rnzxv1b1za4pfar30"; }; - patches = [ ./zlib-LARGEFILE64_SOURCE.patch ]; + patches = + [ ./zlib-LARGEFILE64_SOURCE.patch ] + ++ stdenv.lib.optional (stdenv.system == "i686-cygwin") [ ./no-shared.patch ]; configureFlags = if static then "" else "--shared"; @@ -37,7 +39,4 @@ stdenv.mkDerivation (rec { # zlib doesn't like the automatic --disable-shared from the Cygwin stdenv. cygwinConfigureEnableShared = true; - -} // stdenv.lib.optionalAttrs (stdenv.system == "i686-cygwin") { - patches = [ ./no-shared.patch ]; -}) +} diff --git a/pkgs/development/libraries/zlib/zlib-LARGEFILE64_SOURCE.patch b/pkgs/development/libraries/zlib/zlib-LARGEFILE64_SOURCE.patch index 5278d81ba83..6ddb0ad7066 100644 --- a/pkgs/development/libraries/zlib/zlib-LARGEFILE64_SOURCE.patch +++ b/pkgs/development/libraries/zlib/zlib-LARGEFILE64_SOURCE.patch @@ -4,8 +4,8 @@ http://mail.madler.net/pipermail/zlib-devel_madler.net/2011-June/002583.html Mark Adler madler at madler.net -*** ../zlib-1.2.5/zlib.h 2010-04-19 21:12:48.000000000 -0700 ---- zlib.h 2011-02-26 21:23:30.000000000 -0800 +*** a/zlib.h 2010-04-19 21:12:48.000000000 -0700 +--- b/zlib.h 2011-02-26 21:23:30.000000000 -0800 *************** *** 1572,1584 **** #endif @@ -44,8 +44,8 @@ Mark Adler madler at madler.net ZEXTERN gzFile ZEXPORT gzopen64 OF((const char *, const char *)); ZEXTERN z_off_t ZEXPORT gzseek64 OF((gzFile, z_off_t, int)); ZEXTERN z_off_t ZEXPORT gztell64 OF((gzFile)); -*** ../zlib-1.2.5/zconf.h.in 2010-04-18 10:58:06.000000000 -0700 ---- zconf.h.in 2010-07-18 09:05:49.000000000 -0700 +*** a/zconf.h.in 2010-04-18 10:58:06.000000000 -0700 +--- b/zconf.h.in 2010-07-18 09:05:49.000000000 -0700 *************** *** 374,380 **** # undef _LARGEFILE64_SOURCE From 3ea1c308466d2daad18ceac4ef8176bb1c3c85de Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 12 Dec 2011 14:02:12 +0000 Subject: [PATCH 002/197] =?UTF-8?q?*=20Remove=20the=20NIX=5FSTRIP=5FDEBUG?= =?UTF-8?q?=20flag.=20=20It=20was=20undocumented=20and=20confusing=20=20?= =?UTF-8?q?=20in=20its=20interaction=20with=20the=20=E2=80=98dontStrip?= =?UTF-8?q?=E2=80=99=20attribute.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit svn path=/nixpkgs/branches/stdenv-updates/; revision=30848 --- .../clang-wrapper/clang-wrapper.sh | 5 - .../gcc-cross-wrapper/gcc-wrapper.sh | 5 - .../gcc-upc-wrapper/gcc-wrapper.sh | 5 - pkgs/build-support/gcc-wrapper/gcc-wrapper.sh | 5 - .../development/compilers/gcc-4.5/default.nix | 2 +- .../development/compilers/gcc-4.6/default.nix | 2 +- pkgs/games/trackballs/default.nix | 19 ++-- pkgs/misc/misc.nix | 1 - pkgs/misc/uboot/default.nix | 1 - pkgs/misc/uboot/guruplug.nix | 1 - pkgs/misc/uboot/nanonote.nix | 1 - pkgs/misc/uboot/sheevaplug.nix | 1 - pkgs/stdenv/generic/docs.txt | 93 ------------------- pkgs/stdenv/generic/setup.sh | 7 -- pkgs/stdenv/linux/default.nix | 4 +- pkgs/stdenv/mingw/setup.sh | 7 -- pkgs/stdenv/native/default.nix | 1 - pkgs/stdenv/nix/prehook.sh | 1 - .../package-management/disnix/default.nix | 6 +- .../disnix/disnixos/default.nix | 6 +- 20 files changed, 22 insertions(+), 151 deletions(-) delete mode 100644 pkgs/stdenv/generic/docs.txt diff --git a/pkgs/build-support/clang-wrapper/clang-wrapper.sh b/pkgs/build-support/clang-wrapper/clang-wrapper.sh index 473adba8627..2052d2c2eb4 100644 --- a/pkgs/build-support/clang-wrapper/clang-wrapper.sh +++ b/pkgs/build-support/clang-wrapper/clang-wrapper.sh @@ -103,11 +103,6 @@ if test "$dontLink" != "1"; then fi done export NIX_LDFLAGS_SET=1 - - if test "$NIX_STRIP_DEBUG" = "1"; then - # Add executable-stripping flags. - extraAfter=(${extraAfter[@]} $NIX_CFLAGS_STRIP) - fi fi # As a very special hack, if the arguments are just `-v', then don't diff --git a/pkgs/build-support/gcc-cross-wrapper/gcc-wrapper.sh b/pkgs/build-support/gcc-cross-wrapper/gcc-wrapper.sh index 98baafb4878..f954cae05d8 100644 --- a/pkgs/build-support/gcc-cross-wrapper/gcc-wrapper.sh +++ b/pkgs/build-support/gcc-cross-wrapper/gcc-wrapper.sh @@ -89,11 +89,6 @@ if test "$dontLink" != "1"; then fi done export NIX_CROSS_LDFLAGS_SET=1 - - if test "$NIX_STRIP_DEBUG" = "1"; then - # Add executable-stripping flags. - extraAfter=(${extraAfter[@]} $NIX_CFLAGS_STRIP) - fi fi # Optionally print debug info. diff --git a/pkgs/build-support/gcc-upc-wrapper/gcc-wrapper.sh b/pkgs/build-support/gcc-upc-wrapper/gcc-wrapper.sh index a76684806b8..23117694767 100644 --- a/pkgs/build-support/gcc-upc-wrapper/gcc-wrapper.sh +++ b/pkgs/build-support/gcc-upc-wrapper/gcc-wrapper.sh @@ -95,11 +95,6 @@ if test "$dontLink" != "1"; then fi done export NIX_LDFLAGS_SET=1 - - if test "$NIX_STRIP_DEBUG" = "1"; then - # Add executable-stripping flags. - extraAfter=(${extraAfter[@]} $NIX_CFLAGS_STRIP) - fi fi # As a very special hack, if the arguments are just `-v', then don't diff --git a/pkgs/build-support/gcc-wrapper/gcc-wrapper.sh b/pkgs/build-support/gcc-wrapper/gcc-wrapper.sh index f1b394a1f54..2ad7783a442 100644 --- a/pkgs/build-support/gcc-wrapper/gcc-wrapper.sh +++ b/pkgs/build-support/gcc-wrapper/gcc-wrapper.sh @@ -103,11 +103,6 @@ if test "$dontLink" != "1"; then fi done export NIX_LDFLAGS_SET=1 - - if test "$NIX_STRIP_DEBUG" = "1"; then - # Add executable-stripping flags. - extraAfter=(${extraAfter[@]} $NIX_CFLAGS_STRIP) - fi fi # As a very special hack, if the arguments are just `-v', then don't diff --git a/pkgs/development/compilers/gcc-4.5/default.nix b/pkgs/development/compilers/gcc-4.5/default.nix index 61d0af6aa4f..0726d277f81 100644 --- a/pkgs/development/compilers/gcc-4.5/default.nix +++ b/pkgs/development/compilers/gcc-4.5/default.nix @@ -391,7 +391,7 @@ stdenv.mkDerivation ({ # GCC 4.5.2 doesn't support the `install-strip' target, so let `stdenv' do # the stripping by default. -// optionalAttrs (!stripped) { dontStrip = true; NIX_STRIP_DEBUG = false; } +// optionalAttrs (!stripped) { dontStrip = true; } // optionalAttrs langVhdl rec { name = "ghdl-0.29"; diff --git a/pkgs/development/compilers/gcc-4.6/default.nix b/pkgs/development/compilers/gcc-4.6/default.nix index cbbd3bdbf5d..c7d01330cf0 100644 --- a/pkgs/development/compilers/gcc-4.6/default.nix +++ b/pkgs/development/compilers/gcc-4.6/default.nix @@ -405,7 +405,7 @@ stdenv.mkDerivation ({ installTargets = "install-gcc install-target-libgcc"; } -// optionalAttrs (!stripped) { dontStrip = true; NIX_STRIP_DEBUG = false; } +// optionalAttrs (!stripped) { dontStrip = true; } // optionalAttrs langVhdl rec { name = "ghdl-0.29"; diff --git a/pkgs/games/trackballs/default.nix b/pkgs/games/trackballs/default.nix index bdac6cddf2d..79a855cec53 100644 --- a/pkgs/games/trackballs/default.nix +++ b/pkgs/games/trackballs/default.nix @@ -1,8 +1,9 @@ -{stdenv, fetchurl, SDL, mesa, SDL_ttf, gettext, zlib, SDL_mixer, SDL_image, guile, - debug ? false } : +{ stdenv, fetchurl, SDL, mesa, SDL_ttf, gettext, zlib, SDL_mixer, SDL_image, guile +, debug ? false }: stdenv.mkDerivation rec { name = "trackballs-1.1.4"; + src = fetchurl { url = mirror://sourceforge/trackballs/trackballs-1.1.4.tar.gz; sha256 = "19ilnif59sxa8xmfisk90wngrd11pj8s86ixzypv8krm4znbm7a5"; @@ -10,16 +11,14 @@ stdenv.mkDerivation rec { buildInputs = [ zlib mesa SDL SDL_ttf SDL_mixer SDL_image guile gettext ]; - CFLAGS = if debug then "-g -O0" else null; + CFLAGS = optionalString debug "-g -O0"; CXXFLAGS = CFLAGS; - NIX_STRIP_DEBUG = if debug then "0" else "1"; - dontStrip = if debug then true else false; - postUnpack = if debug then - "ensureDir $out/src; cp -R * $out/src ; cd $out/src" - else null; + dontStrip = debug; + postUnpack = optionalString debug + "ensureDir $out/src; cp -R * $out/src ; cd $out/src"; - NIX_CFLAGS_COMPILE="-iquote ${SDL}/include/SDL"; - configureFlags = if debug then "--enable-debug" else null; + NIX_CFLAGS_COMPILE = "-iquote ${SDL}/include/SDL"; + configureFlags = optionalString "--enable-debug"; patchPhase = '' sed -i -e 's/images icons music/images music/' share/Makefile.in diff --git a/pkgs/misc/misc.nix b/pkgs/misc/misc.nix index 15ea4f8bcc1..1b026ebb684 100644 --- a/pkgs/misc/misc.nix +++ b/pkgs/misc/misc.nix @@ -113,7 +113,6 @@ in dontStrip = true; - NIX_STRIP_DEBUG=0; CFLAGS="-ggdb -O0"; CXXFLAGS="-ggdb -O0"; diff --git a/pkgs/misc/uboot/default.nix b/pkgs/misc/uboot/default.nix index ffd40673b2f..0ad55339d08 100644 --- a/pkgs/misc/uboot/default.nix +++ b/pkgs/misc/uboot/default.nix @@ -30,7 +30,6 @@ stdenv.mkDerivation { buildNativeInputs = [ unzip ]; dontStrip = true; - NIX_STRIP_DEBUG = false; installPhase = '' ensureDir $out diff --git a/pkgs/misc/uboot/guruplug.nix b/pkgs/misc/uboot/guruplug.nix index f8048bbe0f4..b78424acfae 100644 --- a/pkgs/misc/uboot/guruplug.nix +++ b/pkgs/misc/uboot/guruplug.nix @@ -42,7 +42,6 @@ stdenv.mkDerivation { buildNativeInputs = [ unzip ]; dontStrip = true; - NIX_STRIP_DEBUG = false; installPhase = '' ensureDir $out diff --git a/pkgs/misc/uboot/nanonote.nix b/pkgs/misc/uboot/nanonote.nix index ff7c7742265..ef0bc190980 100644 --- a/pkgs/misc/uboot/nanonote.nix +++ b/pkgs/misc/uboot/nanonote.nix @@ -46,7 +46,6 @@ stdenv.mkDerivation { ''; dontStrip = true; - NIX_STRIP_DEBUG = false; installPhase = '' ensureDir $out diff --git a/pkgs/misc/uboot/sheevaplug.nix b/pkgs/misc/uboot/sheevaplug.nix index 5c38f1d053b..83d029d4154 100644 --- a/pkgs/misc/uboot/sheevaplug.nix +++ b/pkgs/misc/uboot/sheevaplug.nix @@ -45,7 +45,6 @@ stdenv.mkDerivation { buildNativeInputs = [ unzip ]; dontStrip = true; - NIX_STRIP_DEBUG = false; installPhase = '' ensureDir $out diff --git a/pkgs/stdenv/generic/docs.txt b/pkgs/stdenv/generic/docs.txt deleted file mode 100644 index 060f3cd154b..00000000000 --- a/pkgs/stdenv/generic/docs.txt +++ /dev/null @@ -1,93 +0,0 @@ -* genericBuild performs a generic build of (typically) autotool-style - packages - - -* unpack phase - -** may be overriden by setting $unpackPhase to point at a function that - unpacks the source (which should set $sourceRoot) - -** the generic unpacker unpacks all sources specified by $srcs, or - $src if $srcs is empty - -** supports tar, bzipped tar, gzipped tar, compressed tar, zip - -** zip must be in scope (in $buildinputs) - -** additional file types may be supported by setting $findUnpacker, - which is called with a single argument specifying the file to be - unpacked - -** $findUnpacker should set $unpackCmd, specifying the full command to - unpack the file (must include the file name) - -** alternatively, $unpackCmd can be set before calling the generic - builder (e.g., 'unpackCmd="unrar x $src"'); this only works if - there is a single source file - -** the generic unpacker then sets $sourceRoot to the name of the - directory created by unpacking the source archives - -** the source archives should produce only one directory - -** alternatively, $setSourceRoot may be set to a function that sets - $sourceRoot - - -* the generic builder then chdirs to $sourceRoot - - -* patch phase (skipped if neither $patchPhase nor $patches are set) - -** may be overriden by setting $patchPhase to point at a function that - unpacks the source (which should set $sourceRoot) - -** if the $patches variable is set, it runs `patch -p1 < ...' in - $sourceRoot for each element in $patches (the `patch' command - should be in $PATH; note that it isn't in the standard environment) - - -* configuration phase - -** may be overriden by setting $configurePhase to point at a function - -** calls $preConfigurer first, if set (useful for running - autoconf/automake) - -** the configure script is specified by $configureScript, which - defaults to ./configure - -** if no executable file exists at $configureScript, does nothing - -** if a file ./ltmain.sh exists and $dontFixLibtool is not set, calls - function fixLibtool to remove its default search path (/usr etc.) - -** adds "--prefix=$out" to $configureFlags unless $dontAddPrefix is - set - -** calls $configureScript with $configureFlags - -** calls $postConfigurer, if set (useful for any last-minute patches - prior to building) - - -* build phase - -** may be overriden by setting $buildPhase to point at a function - -** runs make with flags $makeFlags - - -* install phase - -** may be overriden by setting $installPhase to point at a function - -** runs make with flags $installFlags - -** unless $dontStrip is set or $NIX_STRIP_DEBUG is not 1, finds all *.a - files in $out and runs "strip -S" on them (executables and dynamic - libraries can be stripped automatically by setting NIX_STRIP_DEBUG - to 1 (default)) - -** if $propagatedBuildInputs is set, its contents are written to - $out/nix-support/propagated-build-inputs diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh index bf1642d84aa..62327396239 100644 --- a/pkgs/stdenv/generic/setup.sh +++ b/pkgs/stdenv/generic/setup.sh @@ -237,13 +237,6 @@ if test "$NIX_NO_SELF_RPATH" != "1"; then fi -# Strip debug information by default. -if test -z "$NIX_STRIP_DEBUG"; then - export NIX_STRIP_DEBUG=1 - export NIX_CFLAGS_STRIP="-g0 -Wl,--strip-debug" -fi - - # Set the TZ (timezone) environment variable, otherwise commands like # `date' will complain (e.g., `Tue Mar 9 10:01:47 Local time zone must # be set--see zic manual page 2004'). diff --git a/pkgs/stdenv/linux/default.nix b/pkgs/stdenv/linux/default.nix index a45e6a71817..5385fb75e21 100644 --- a/pkgs/stdenv/linux/default.nix +++ b/pkgs/stdenv/linux/default.nix @@ -5,7 +5,9 @@ # ensuring purity of components produced by it. # The function defaults are for easy testing. -{system ? "i686-linux", allPackages ? import ../../top-level/all-packages.nix, platform}: +{ system ? "i686-linux" +, allPackages ? import ../../top-level/all-packages.nix +, platform ? null }: rec { diff --git a/pkgs/stdenv/mingw/setup.sh b/pkgs/stdenv/mingw/setup.sh index 058d8cb1891..2bc961dfaed 100755 --- a/pkgs/stdenv/mingw/setup.sh +++ b/pkgs/stdenv/mingw/setup.sh @@ -202,13 +202,6 @@ if test "$NIX_NO_SELF_RPATH" != "1"; then fi -# Strip debug information by default. -if test -z "$NIX_STRIP_DEBUG"; then - export NIX_STRIP_DEBUG=1 - export NIX_CFLAGS_STRIP="-g0 -Wl,--strip-debug" -fi - - # Set the TZ (timezone) environment variable, otherwise commands like # `date' will complain (e.g., `Tue Mar 9 10:01:47 Local time zone must # be set--see zic manual page 2004'). diff --git a/pkgs/stdenv/native/default.nix b/pkgs/stdenv/native/default.nix index 1f2117ebba0..6cb45909019 100644 --- a/pkgs/stdenv/native/default.nix +++ b/pkgs/stdenv/native/default.nix @@ -19,7 +19,6 @@ rec { export NIX_DONT_SET_RPATH=1 export NIX_NO_SELF_RPATH=1 dontFixLibtool=1 - NIX_STRIP_DEBUG=0 stripAllFlags=" " # the Darwin "strip" command doesn't know "-s" ''; diff --git a/pkgs/stdenv/nix/prehook.sh b/pkgs/stdenv/nix/prehook.sh index 55389b7d771..ea80355f6bb 100644 --- a/pkgs/stdenv/nix/prehook.sh +++ b/pkgs/stdenv/nix/prehook.sh @@ -5,7 +5,6 @@ if test "$system" = "i686-darwin" -o "$system" = "powerpc-darwin" -o "$system" = export NIX_DONT_SET_RPATH=1 export NIX_NO_SELF_RPATH=1 dontFixLibtool=1 - NIX_STRIP_DEBUG=0 # !!! do we still need this? stripAllFlags=" " # the Darwin "strip" command doesn't know "-s" xargsFlags=" " fi diff --git a/pkgs/tools/package-management/disnix/default.nix b/pkgs/tools/package-management/disnix/default.nix index 631db35a9b0..815ec864626 100644 --- a/pkgs/tools/package-management/disnix/default.nix +++ b/pkgs/tools/package-management/disnix/default.nix @@ -1,16 +1,18 @@ -{stdenv, fetchurl, pkgconfig, dbus_glib, libxml2, libxslt, getopt, nixUnstable, gettext, libiconv}: +{ stdenv, fetchurl, pkgconfig, dbus_glib, libxml2, libxslt, getopt, nixUnstable, gettext, libiconv }: stdenv.mkDerivation { name = "disnix-0.3pre29816"; + src = fetchurl { url = http://hydra.nixos.org/build/1453079/download/4/disnix-0.3pre29816.tar.gz; sha256 = "13gi0zs0a8pvgmgh3h431ydran3qf3px5m3d6vddd9b225kbkgwz"; }; + buildInputs = [ pkgconfig dbus_glib libxml2 libxslt getopt nixUnstable ] ++ stdenv.lib.optional (!stdenv.isLinux) libiconv ++ stdenv.lib.optional (!stdenv.isLinux) gettext; + dontStrip = true; - NIX_STRIP_DEBUG = true; meta = { description = "A distributed deployment extension for Nix"; diff --git a/pkgs/tools/package-management/disnix/disnixos/default.nix b/pkgs/tools/package-management/disnix/disnixos/default.nix index 92914dd1cad..843304d9673 100644 --- a/pkgs/tools/package-management/disnix/disnixos/default.nix +++ b/pkgs/tools/package-management/disnix/disnixos/default.nix @@ -1,14 +1,16 @@ -{stdenv, fetchurl, disnix, socat, pkgconfig}: +{ stdenv, fetchurl, disnix, socat, pkgconfig }: stdenv.mkDerivation { name = "disnixos-0.2pre29928"; + src = fetchurl { url = http://hydra.nixos.org/build/1464065/download/3/disnixos-0.2pre29928.tar.gz; sha256 = "0l7kszbpi8lzq95khi45fbq71l5csf8kamds4va6bxsyfwxrx6sm"; }; + buildInputs = [ socat pkgconfig disnix ]; + dontStrip = true; - NIX_STRIP_DEBUG = true; meta = { description = "Provides complementary NixOS infrastructure deployment to Disnix"; From 3db0fe3b9406398ed1ddb0e9e4b9dfda5b0c36cf Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 12 Dec 2011 16:51:09 +0000 Subject: [PATCH 003/197] * Oops. svn path=/nixpkgs/branches/stdenv-updates/; revision=30850 --- pkgs/games/trackballs/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/games/trackballs/default.nix b/pkgs/games/trackballs/default.nix index 79a855cec53..e047596bf6b 100644 --- a/pkgs/games/trackballs/default.nix +++ b/pkgs/games/trackballs/default.nix @@ -1,6 +1,8 @@ { stdenv, fetchurl, SDL, mesa, SDL_ttf, gettext, zlib, SDL_mixer, SDL_image, guile , debug ? false }: +with stdenv.lib; + stdenv.mkDerivation rec { name = "trackballs-1.1.4"; From 5de58eb38778eef03e119545b21b2ad48c125482 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 12 Dec 2011 16:52:03 +0000 Subject: [PATCH 004/197] * More oops. svn path=/nixpkgs/branches/stdenv-updates/; revision=30851 --- pkgs/games/trackballs/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/games/trackballs/default.nix b/pkgs/games/trackballs/default.nix index e047596bf6b..f945e99c071 100644 --- a/pkgs/games/trackballs/default.nix +++ b/pkgs/games/trackballs/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { "ensureDir $out/src; cp -R * $out/src ; cd $out/src"; NIX_CFLAGS_COMPILE = "-iquote ${SDL}/include/SDL"; - configureFlags = optionalString "--enable-debug"; + configureFlags = optionalString debug "--enable-debug"; patchPhase = '' sed -i -e 's/images icons music/images music/' share/Makefile.in From 33090b21986937f9eceb0b26ea99fb158ba1de6a Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 12 Dec 2011 17:06:31 +0000 Subject: [PATCH 005/197] * bzip2 updated to 1.0.6 (with a fix for CVE-2010-0405). svn path=/nixpkgs/branches/stdenv-updates/; revision=30853 --- pkgs/tools/compression/bzip2/default.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/compression/bzip2/default.nix b/pkgs/tools/compression/bzip2/default.nix index ff13c1a2ed0..a431cd30a21 100644 --- a/pkgs/tools/compression/bzip2/default.nix +++ b/pkgs/tools/compression/bzip2/default.nix @@ -1,13 +1,15 @@ -{stdenv, fetchurl, linkStatic ? false}: +{ stdenv, fetchurl, linkStatic ? false }: + +let version = "1.0.6"; in stdenv.mkDerivation { - name = "bzip2-1.0.5"; + name = "bzip2-${version}"; builder = ./builder.sh; src = fetchurl { - url = http://www.bzip.org/1.0.5/bzip2-1.0.5.tar.gz; - sha256 = "08py2s9vw6dgw457lbklh1vsr3b8x8dlv7d8ygdfaxlx61l57gzp"; + url = "http://www.bzip.org/${version}/bzip2-${version}.tar.gz"; + sha256 = "1kfrc7f0ja9fdn6j1y6yir6li818npy6217hvr3wzmnmzhs8z152"; }; crossAttrs = { From 1dbbc4581ba2b3478036a64ecfa04c65a210f11d Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 12 Dec 2011 17:10:28 +0000 Subject: [PATCH 006/197] * Latest bash patches. svn path=/nixpkgs/branches/stdenv-updates/; revision=30854 --- pkgs/shells/bash/bash-4.2-patches.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pkgs/shells/bash/bash-4.2-patches.nix b/pkgs/shells/bash/bash-4.2-patches.nix index 7f4957c500c..0a210186532 100644 --- a/pkgs/shells/bash/bash-4.2-patches.nix +++ b/pkgs/shells/bash/bash-4.2-patches.nix @@ -11,4 +11,14 @@ patch: [ (patch "008" "0dr4p83m2xpxhvd61yny0gdlasq6r9mpyiz220998y0alq8hs213") (patch "009" "086b9jkyjgf2zhwln72d7s5x759iskgg3r4hdrw6b5y1ni059vg7") (patch "010" "1p23m9kssdmpnjfp96bjmmshzf25cdzlyjygdw8j6sayqa159z5c") +(patch "011" "0chm4r6zv2kafq1g8xs7r0gixmw9h9r63rgd38rdgfvyk8ssx4d4") +(patch "012" "1f5pp64rv4mx3r34577pmb15pyxvhmdhmliccnwz20nssbqk6i1m") +(patch "013" "1sl5rxl3kz39xbnbaf0085jcx0l19l2yqjk0ja2wirmwrg3ca4il") +(patch "014" "0cwb5ilgx1gcbvnfk93pcpyhvq5wzasyvyllbxrk51c517k7i9mm") +(patch "015" "164afkc75534x1ad1h6qkl511k2cpirqs2kyx1jddwxx0j1nm1rd") +(patch "016" "19p20g7h7563m79vvy0adkpzlaxg192affzsm1rxm67wyyycr598") +(patch "017" "0zzfva20hxfrj5njd321pcjfydiv0kzcqryxfdh1sxlc95228mbk") +(patch "018" "0ka9pfnjmdak8lvmbryv2r1kkrlffnxbqjxq656la39pf9qlbag2") +(patch "019" "0mpb0whacppwcdx7pcnf0ah5vjvkw14ang6r2rh9fmkn401cvdx8") +(patch "020" "0vrwv9wpbr692kf427npmsxzvn007d9alk6jf99v7307s3q76is9") ] From 8c23cd086fa567b195bfbab13601bc8dadd2cb20 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 12 Dec 2011 17:14:59 +0000 Subject: [PATCH 007/197] * binutils 2.22. svn path=/nixpkgs/branches/stdenv-updates/; revision=30855 --- .../tools/misc/binutils/default.nix | 23 +++---------------- 1 file changed, 3 insertions(+), 20 deletions(-) diff --git a/pkgs/development/tools/misc/binutils/default.nix b/pkgs/development/tools/misc/binutils/default.nix index 2eb9d43bcbe..9c359865af8 100644 --- a/pkgs/development/tools/misc/binutils/default.nix +++ b/pkgs/development/tools/misc/binutils/default.nix @@ -1,30 +1,13 @@ { stdenv, fetchurl, noSysDirs, zlib, cross ? null, gold ? false, bison ? null, flex2535 ? null, bc ? null, dejagnu ? null }: -let - basename = "binutils-2.21.1a"; -in +let basename = "binutils-2.22"; in + stdenv.mkDerivation rec { name = basename + stdenv.lib.optionalString (cross != null) "-${cross.config}"; - # WARNING: Upstream made a mistake in packaging that may mean anyone - # but the FSF hosting this tarball is accidentally in violation of - # the GPL. We can't update binutils until the next stdenv-updates, - # so we are stuck with this version. The issue is discussed in - # this email: http://sourceware.org/ml/binutils/2011-08/msg00198.html - # The tarball for this minor version will not be fixed, as only the - # tarballs for the latest minor version of each major version will - # be repackaged. The fixed sources for the closest version to this one - # can be found at mirror://gnu/binutils/binutils-2.21.1a.tar.bz2 - # or http://ftp.gnu.org/gnu/binutils/binutils-2.21.1a.tar.bz2 - # The sources missing from this tarball come from cgen. It is unclear - # WHICH sources should be included, but the cvs tree can be checked out - # by: - # cvs -z 9 -d :pserver:anoncvs@sourceware.org:/cvs/src login - # {enter "anoncvs" as the password} - # cvs -z 9 -d :pserver:anoncvs@sourceware.org:/cvs/src co cgen src = fetchurl { url = "mirror://gnu/binutils/${basename}.tar.bz2"; - sha256 = "0m7nmd7gc9d9md43wbrv65hz6lbi2crqwryzpigv19ray1lzmv6d"; + sha256 = "1a9w66v5dwvbnawshjwqcgz7km6kw6ihkzp6sswv9ycc3knzhykc"; }; patches = [ From f5fd808b51ac034ee4b2148fd45e6ab614d3bb9f Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 12 Dec 2011 18:51:11 +0000 Subject: [PATCH 008/197] =?UTF-8?q?*=20=E2=80=98linuxHeaders=E2=80=99=20sh?= =?UTF-8?q?ouldn't=20use=20the=20kernel=20sources=20from=20=20=20=E2=80=98?= =?UTF-8?q?linuxPackages.kernel=E2=80=99,=20because=20then=20every=20minor?= =?UTF-8?q?=20kernel=20upgrade=20will=20=20=20cause=20a=20rebuild=20of=20e?= =?UTF-8?q?verything.=20=20So=20fix=20it=20at=202.6.35.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit svn path=/nixpkgs/branches/stdenv-updates/; revision=30857 --- .../linux/kernel-headers/2.6.18.5.nix | 25 ------------------- .../linux/kernel-headers/builder.sh | 9 ------- .../linux/kernel-headers/default.nix | 9 ++++--- pkgs/top-level/all-packages.nix | 15 +---------- 4 files changed, 7 insertions(+), 51 deletions(-) delete mode 100644 pkgs/os-specific/linux/kernel-headers/2.6.18.5.nix delete mode 100644 pkgs/os-specific/linux/kernel-headers/builder.sh diff --git a/pkgs/os-specific/linux/kernel-headers/2.6.18.5.nix b/pkgs/os-specific/linux/kernel-headers/2.6.18.5.nix deleted file mode 100644 index 5ecdd77fb87..00000000000 --- a/pkgs/os-specific/linux/kernel-headers/2.6.18.5.nix +++ /dev/null @@ -1,25 +0,0 @@ -{stdenv, fetchurl, unifdef}: - -assert stdenv.isLinux; - -stdenv.mkDerivation { - name = "linux-headers-2.6.18.5"; - builder = ./builder.sh; - src = fetchurl { - url = "mirror://kernel/linux/kernel/v2.6/linux-2.6.18.5.tar.bz2"; - sha256 = "24f0e0011cdae42e3dba56107bb6a60c57c46d1d688a9b0300fec53e80fd1e53"; - }; - - patches = [ ./unifdef-getline.patch ]; - - buildInputs = [ unifdef ]; - - platform = - if stdenv.system == "i686-linux" then "i386" else - if stdenv.system == "x86_64-linux" then "x86_64" else - if stdenv.system == "powerpc-linux" then "powerpc" else - abort "don't know what the kernel include directory is called for this platform"; - - extraIncludeDirs = - if stdenv.system == "powerpc-linux" then ["ppc"] else []; -} diff --git a/pkgs/os-specific/linux/kernel-headers/builder.sh b/pkgs/os-specific/linux/kernel-headers/builder.sh deleted file mode 100644 index 05392d5fe24..00000000000 --- a/pkgs/os-specific/linux/kernel-headers/builder.sh +++ /dev/null @@ -1,9 +0,0 @@ -source $stdenv/setup - -patchPhase="sed -i '/scsi/d' include/Kbuild" - -buildPhase="make mrproper headers_check"; - -installPhase="make INSTALL_HDR_PATH=$out headers_install" - -genericBuild diff --git a/pkgs/os-specific/linux/kernel-headers/default.nix b/pkgs/os-specific/linux/kernel-headers/default.nix index bb2e6a28803..71b3b39baab 100644 --- a/pkgs/os-specific/linux/kernel-headers/default.nix +++ b/pkgs/os-specific/linux/kernel-headers/default.nix @@ -1,9 +1,9 @@ -{stdenv, fetchurl, perl, cross ? null, kernel}: +{ stdenv, fetchurl, perl, cross ? null }: assert cross == null -> stdenv.isLinux; let - version = kernel.version; + version = "2.6.35.14"; kernelHeadersBaseConfig = if (cross == null) then stdenv.platform.kernelHeadersBaseConfig else @@ -13,7 +13,10 @@ in stdenv.mkDerivation { name = "linux-headers-${version}"; - src = kernel.src; + src = fetchurl { + url = "mirror://kernel/linux/kernel/v2.6/longterm/v2.6.35/linux-${version}.tar.bz2"; + sha256 = "1wzml7s9karfbk2yi36g1r8fyaq4d4f16yizc68zgchv0xzj39zl"; + }; targetConfig = if (cross != null) then cross.config else null; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ae9b3022d2a..d33b82f24de 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5330,16 +5330,7 @@ let libnl1 = callPackage ../os-specific/linux/libnl/v1.nix { }; - linuxHeaders = - let - - kernel = { - src = linuxPackages.kernel.src; - version = linuxPackages.kernel.version; - }; - - in - callPackage ../os-specific/linux/kernel-headers { inherit kernel; }; + linuxHeaders = callPackage ../os-specific/linux/kernel-headers { }; linuxHeaders26Cross = forceBuildDrv (import ../os-specific/linux/kernel-headers/2.6.32.nix { inherit stdenv fetchurl perl; @@ -5359,12 +5350,8 @@ let linuxHeadersCross = assert crossSystem != null; linuxHeadersCrossChooser crossSystem.platform.kernelMajor; - linuxHeaders_2_6_18 = callPackage ../os-specific/linux/kernel-headers/2.6.18.5.nix { }; - linuxHeaders_2_6_28 = callPackage ../os-specific/linux/kernel-headers/2.6.28.nix { }; - linuxHeaders_2_6_32 = callPackage ../os-specific/linux/kernel-headers/2.6.32.nix { }; - kernelPatches = callPackage ../os-specific/linux/kernel/patches.nix { }; linux_2_6_15 = makeOverridable (import ../os-specific/linux/kernel/linux-2.6.15.nix) { From 28e2c7e2f54bd87dcd3296167f8145ffeca4fde1 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 12 Dec 2011 19:56:04 +0000 Subject: [PATCH 009/197] svn path=/nixpkgs/branches/stdenv-updates/; revision=30859 --- pkgs/development/libraries/isl/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/isl/default.nix b/pkgs/development/libraries/isl/default.nix index 2261baba030..65c0bc0c1d2 100644 --- a/pkgs/development/libraries/isl/default.nix +++ b/pkgs/development/libraries/isl/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.kotnet.org/~skimo/isl/; license = "LGPLv2.1"; - description = "A library for manipulating sets and relations of integer points bounded by linear constraints."; + description = "A library for manipulating sets and relations of integer points bounded by linear constraints"; maintainers = [ stdenv.lib.maintainers.shlevy ]; platforms = stdenv.lib.platforms.all; }; From da3eea5c9ec37d7f64057d1545f61c978ef327b7 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 12 Dec 2011 19:56:17 +0000 Subject: [PATCH 010/197] * util-linux 2.20.1. svn path=/nixpkgs/branches/stdenv-updates/; revision=30860 --- .../{util-linux-ng => util-linux}/default.nix | 8 +++++--- pkgs/top-level/all-packages.nix | 14 +++++--------- 2 files changed, 10 insertions(+), 12 deletions(-) rename pkgs/os-specific/linux/{util-linux-ng => util-linux}/default.nix (70%) diff --git a/pkgs/os-specific/linux/util-linux-ng/default.nix b/pkgs/os-specific/linux/util-linux/default.nix similarity index 70% rename from pkgs/os-specific/linux/util-linux-ng/default.nix rename to pkgs/os-specific/linux/util-linux/default.nix index ba9ae72b73a..bd6f26dc58b 100644 --- a/pkgs/os-specific/linux/util-linux-ng/default.nix +++ b/pkgs/os-specific/linux/util-linux/default.nix @@ -1,11 +1,13 @@ { stdenv, fetchurl, zlib, ncurses ? null, perl ? null }: stdenv.mkDerivation rec { - name = "util-linux-ng-2.18"; + name = "util-linux-2.20.1"; src = fetchurl { - url = "mirror://kernel/linux/utils/util-linux-ng/v2.18/${name}.tar.bz2"; - sha256 = "1k1in1ba9kvh0kplri9765wh0yk68qrkk1a55dqsm21qfryc1idq"; + # This used to be mirror://kernel/linux/utils/util-linux, but it + # disappeared in the kernel.org meltdown. + url = "mirror://gentoo/distfiles/${name}.tar.bz2"; + sha256 = "1q5vjcvw4f067c63vj2n3xggvk5prm11571x6vnqiav47vdbqvni"; }; # !!! It would be better to obtain the path to the mount helpers diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d33b82f24de..2bf7cb37d8e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5227,8 +5227,8 @@ let libuuid = if crossSystem != null && crossSystem.config == "i586-pc-gnu" - then (utillinuxng // { - hostDrv = lib.overrideDerivation utillinuxng.hostDrv (args: { + then (utillinux // { + hostDrv = lib.overrideDerivation utillinux.hostDrv (args: { # `libblkid' fails to build on GNU/Hurd. configureFlags = args.configureFlags + " --disable-libblkid --disable-mount --disable-libmount" @@ -5241,7 +5241,7 @@ let }); }) else if stdenv.isLinux - then utillinuxng + then utillinux else null; e3cfsprogs = callPackage ../os-specific/linux/e3cfsprogs { }; @@ -6090,16 +6090,12 @@ let usbutils = callPackage ../os-specific/linux/usbutils { }; - utillinux = utillinuxng; - - utillinuxCurses = utillinuxngCurses; - - utillinuxng = lowPrio (callPackage ../os-specific/linux/util-linux-ng { + utillinux = lowPrio (callPackage ../os-specific/linux/util-linux { ncurses = null; perl = null; }); - utillinuxngCurses = utillinuxng.override { + utillinuxCurses = utillinux.override { inherit ncurses perl; }; From 661ea8936f44aff8fa4c4e178a61ccd7fdd48a04 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 12 Dec 2011 23:41:02 +0000 Subject: [PATCH 011/197] =?UTF-8?q?*=20=E2=80=98which=E2=80=99=20doesn't?= =?UTF-8?q?=20actually=20depend=20on=20readline.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit svn path=/nixpkgs/branches/stdenv-updates/; revision=30861 --- pkgs/tools/system/which/default.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/tools/system/which/default.nix b/pkgs/tools/system/which/default.nix index 3721c0f0be1..fc40cd4722b 100644 --- a/pkgs/tools/system/which/default.nix +++ b/pkgs/tools/system/which/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, readline}: +{ stdenv, fetchurl }: stdenv.mkDerivation { name = "which-2.20"; @@ -8,8 +8,6 @@ stdenv.mkDerivation { sha256 = "1y2p50zadb36izzh2zw4dm5hvdiydqf3qa88l8kav20dcmfbc5yl"; }; - buildInputs = [readline]; - meta = { homepage = http://ftp.gnu.org/gnu/which/; }; From 39c8bfdcc4d2595e15e1211d352f3e300476d6fe Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 12 Dec 2011 23:44:49 +0000 Subject: [PATCH 012/197] =?UTF-8?q?*=20New=20version=20of=20=E2=80=98ed?= =?UTF-8?q?=E2=80=99.=20=20W00t!?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit svn path=/nixpkgs/branches/stdenv-updates/; revision=30862 --- pkgs/applications/editors/ed/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/ed/default.nix b/pkgs/applications/editors/ed/default.nix index 905cde880ed..1b3e4e27f5b 100644 --- a/pkgs/applications/editors/ed/default.nix +++ b/pkgs/applications/editors/ed/default.nix @@ -1,11 +1,11 @@ { fetchurl, stdenv }: stdenv.mkDerivation rec { - name = "ed-1.4"; + name = "ed-1.5"; src = fetchurl { url = "mirror://gnu/ed/${name}.tar.gz"; - sha256 = "1njgcghms1377csldi1yqjhcpghiii6bshdhnjpqp78sxs2xldnv"; + sha256 = "18gvhyhwpabmgv4lh21lg8vl3z7acdyhh2mr2kj9g75wksj39pcp"; }; doCheck = true; From c044d7f56f5f476ea70184afc17a5f72d0be53da Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 13 Dec 2011 12:57:32 +0000 Subject: [PATCH 013/197] * Forgot a few utillinuxng references. svn path=/nixpkgs/branches/stdenv-updates/; revision=30866 --- pkgs/build-support/vm/default.nix | 4 ++-- pkgs/os-specific/linux/hal/default.nix | 6 +++--- pkgs/os-specific/linux/nfs-utils/default.nix | 4 ++-- pkgs/os-specific/linux/pmount/default.nix | 8 ++++---- pkgs/tools/misc/parted/2.3.nix | 4 ++-- pkgs/tools/misc/parted/default.nix | 4 ++-- 6 files changed, 15 insertions(+), 15 deletions(-) diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix index 979ceae5418..207edce147b 100644 --- a/pkgs/build-support/vm/default.nix +++ b/pkgs/build-support/vm/default.nix @@ -351,7 +351,7 @@ rec { with pkgs; runInLinuxVM ( stdenv.mkDerivation { name = "extract-file"; - buildInputs = [utillinuxng]; + buildInputs = [ utillinux ]; buildCommand = '' ln -s ${linux}/lib /lib ${module_init_tools}/sbin/modprobe loop @@ -376,7 +376,7 @@ rec { with pkgs; runInLinuxVM ( stdenv.mkDerivation { name = "extract-file-mtd"; - buildInputs = [utillinuxng mtdutils]; + buildInputs = [ utillinux mtdutils ]; buildCommand = '' ln -s ${linux}/lib /lib ${module_init_tools}/sbin/modprobe mtd diff --git a/pkgs/os-specific/linux/hal/default.nix b/pkgs/os-specific/linux/hal/default.nix index 718d54f3106..f1757be94cf 100644 --- a/pkgs/os-specific/linux/hal/default.nix +++ b/pkgs/os-specific/linux/hal/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, pkgconfig, python, pciutils, expat , libusb, dbus, dbus_glib, glib, libuuid, perl , perlXMLParser, gettext, zlib, gperf, consolekit, policykit -, libsmbios, dmidecode, udev, utillinuxng, pmutils, usbutils +, libsmbios, dmidecode, udev, utillinux, pmutils, usbutils , eject, upstart }: @@ -51,8 +51,8 @@ stdenv.mkDerivation rec { substituteInPlace $i \ ${changeDmidecode} \ ${if udev != null then "--replace /sbin/udevadm ${udev}/sbin/udevadm" else ""} \ - --replace /bin/mount ${utillinuxng}/bin/mount \ - --replace /bin/umount ${utillinuxng}/bin/umount \ + --replace /bin/mount ${utillinux}/bin/mount \ + --replace /bin/umount ${utillinux}/bin/umount \ --replace /usr/bin/pm-is-supported ${pmutils}/bin/pm-is-supported \ --replace /usr/sbin/pm ${pmutils}/sbin/pm \ --replace /sbin/shutdown ${upstart}/sbin/shutdown diff --git a/pkgs/os-specific/linux/nfs-utils/default.nix b/pkgs/os-specific/linux/nfs-utils/default.nix index cf05d0fbaed..cdadcb05849 100644 --- a/pkgs/os-specific/linux/nfs-utils/default.nix +++ b/pkgs/os-specific/linux/nfs-utils/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, tcpWrapper, utillinuxng, libcap }: +{ fetchurl, stdenv, tcpWrapper, utillinux, libcap }: stdenv.mkDerivation rec { name = "nfs-utils-1.2.3"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { }; # Needs `libblkid' and `libcomerr' from `e2fsprogs' or `util-linux-ng'. - buildInputs = [ tcpWrapper utillinuxng libcap ]; + buildInputs = [ tcpWrapper utillinux libcap ]; # FIXME: Add the dependencies needed for NFSv4 and TI-RPC. configureFlags = diff --git a/pkgs/os-specific/linux/pmount/default.nix b/pkgs/os-specific/linux/pmount/default.nix index 8f814c7212a..af2078b676a 100644 --- a/pkgs/os-specific/linux/pmount/default.nix +++ b/pkgs/os-specific/linux/pmount/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, cryptsetup, dbus, dbus_glib, hal, intltool, ntfs3g, utillinuxng +{ stdenv, fetchurl, cryptsetup, dbus, dbus_glib, hal, intltool, ntfs3g, utillinux , mediaDir ? "/media/" , lockDir ? "/var/lock/pmount" , whiteList ? "/etc/pmount.allow" @@ -15,14 +15,14 @@ stdenv.mkDerivation rec { sha256 = "db38fc290b710e8e9e9d442da2fb627d41e13b3ee80326c15cc2595ba00ea036"; }; - buildInputs = [ hal intltool utillinuxng ]; + buildInputs = [ hal intltool utillinux ]; configureFlags = "" + " --with-media-dir=${mediaDir}" + " --with-lock-dir=${lockDir}" + " --with-whitelist=${whiteList}" - + " --with-mount-prog=${utillinuxng}/bin/mount" - + " --with-umount-prog=${utillinuxng}/bin/umount" + + " --with-mount-prog=${utillinux}/bin/mount" + + " --with-umount-prog=${utillinux}/bin/umount" + " --with-cryptsetup=${cryptsetup}/sbin/cryptsetup" + " --with-mount-ntfs3g=${ntfs3g}/sbin/mount.ntfs-3g" + " --enable-hal"; diff --git a/pkgs/tools/misc/parted/2.3.nix b/pkgs/tools/misc/parted/2.3.nix index 622753e2303..52b3c4b4dcf 100644 --- a/pkgs/tools/misc/parted/2.3.nix +++ b/pkgs/tools/misc/parted/2.3.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, devicemapper, libuuid, gettext, readline -, utillinuxng, xz, enableStatic ? false, hurd ? null }: +, utillinux, xz, enableStatic ? false, hurd ? null }: stdenv.mkDerivation rec { name = "parted-2.3"; @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { preCheck = stdenv.lib.optionalString doCheck # The `t0400-loop-clobber-infloop.sh' test wants `mkswap'. - "export PATH=\"${utillinuxng}/sbin:$PATH\""; + "export PATH=\"${utillinux}/sbin:$PATH\""; meta = { description = "GNU Parted, a tool to create, destroy, resize, check, and copy partitions"; diff --git a/pkgs/tools/misc/parted/default.nix b/pkgs/tools/misc/parted/default.nix index 8ceab316be9..80abefc97ad 100644 --- a/pkgs/tools/misc/parted/default.nix +++ b/pkgs/tools/misc/parted/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, devicemapper, libuuid, gettext, readline -, utillinuxng, xz, check, enableStatic ? false, hurd ? null }: +, utillinux, xz, check, enableStatic ? false, hurd ? null }: stdenv.mkDerivation rec { name = "parted-3.0"; @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { preCheck = stdenv.lib.optionalString doCheck # The `t0400-loop-clobber-infloop.sh' test wants `mkswap'. - "export PATH=\"${utillinuxng}/sbin:$PATH\""; + "export PATH=\"${utillinux}/sbin:$PATH\""; meta = { description = "GNU Parted, a tool to create, destroy, resize, check, and copy partitions"; From d2c923bc0112d4d811b9028a0b1ac549e3d725b0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Tue, 13 Dec 2011 16:09:48 +0000 Subject: [PATCH 014/197] GNU grep 2.10. svn path=/nixpkgs/branches/stdenv-updates/; revision=30868 --- pkgs/tools/text/gnugrep/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/text/gnugrep/default.nix b/pkgs/tools/text/gnugrep/default.nix index 402d2413085..2f9cdb2919f 100644 --- a/pkgs/tools/text/gnugrep/default.nix +++ b/pkgs/tools/text/gnugrep/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, pcre, libiconv ? null}: -let version = "2.9"; in +let version = "2.10"; in stdenv.mkDerivation ({ name = "gnugrep-${version}"; src = fetchurl { - url = "mirror://gnu/grep/grep-${version}.tar.gz"; - sha256 = "0w3r6m597p3qgfj6jj1nsggkwr5p38v6cxasfa8i3izcfan8w4g9"; + url = "mirror://gnu/grep/grep-${version}.tar.xz"; + sha256 = "1cvsqyfzk1p38fcaav22dn76fkd02g7bjnqna6vrpk9vy9rnfybc"; }; buildInputs = [ pcre ] From 7bbb1ad569183bbbf0d760975170ea83a9193f2c Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 13 Dec 2011 16:47:29 +0000 Subject: [PATCH 015/197] * Revert to binutils 2.21.1. Binutils 2.22 changes the default handling of dynamic libraries from --copy-dt-needed-entries to --no-copy-dt-needed-entries, which breaks stuff (e.g. GCC, see http://hydra.nixos.org/build/1608471). So stick with 2.21.1 for now. svn path=/nixpkgs/branches/stdenv-updates/; revision=30870 --- .../tools/misc/binutils/default.nix | 21 ++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/misc/binutils/default.nix b/pkgs/development/tools/misc/binutils/default.nix index 9c359865af8..7b7ff2d44be 100644 --- a/pkgs/development/tools/misc/binutils/default.nix +++ b/pkgs/development/tools/misc/binutils/default.nix @@ -1,13 +1,28 @@ { stdenv, fetchurl, noSysDirs, zlib, cross ? null, gold ? false, bison ? null, flex2535 ? null, bc ? null, dejagnu ? null }: -let basename = "binutils-2.22"; in - +let basename = "binutils-2.21.1a"; in stdenv.mkDerivation rec { name = basename + stdenv.lib.optionalString (cross != null) "-${cross.config}"; + # WARNING: Upstream made a mistake in packaging that may mean anyone + # but the FSF hosting this tarball is accidentally in violation of + # the GPL. We can't update binutils until the next stdenv-updates, + # so we are stuck with this version. The issue is discussed in + # this email: http://sourceware.org/ml/binutils/2011-08/msg00198.html + # The tarball for this minor version will not be fixed, as only the + # tarballs for the latest minor version of each major version will + # be repackaged. The fixed sources for the closest version to this one + # can be found at mirror://gnu/binutils/binutils-2.21.1a.tar.bz2 + # or http://ftp.gnu.org/gnu/binutils/binutils-2.21.1a.tar.bz2 + # The sources missing from this tarball come from cgen. It is unclear + # WHICH sources should be included, but the cvs tree can be checked out + # by: + # cvs -z 9 -d :pserver:anoncvs@sourceware.org:/cvs/src login + # {enter "anoncvs" as the password} + # cvs -z 9 -d :pserver:anoncvs@sourceware.org:/cvs/src co cgen src = fetchurl { url = "mirror://gnu/binutils/${basename}.tar.bz2"; - sha256 = "1a9w66v5dwvbnawshjwqcgz7km6kw6ihkzp6sswv9ycc3knzhykc"; + sha256 = "0m7nmd7gc9d9md43wbrv65hz6lbi2crqwryzpigv19ray1lzmv6d"; }; patches = [ From cffad35505d925609bf836364bc01a94400e6457 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Tue, 13 Dec 2011 18:13:45 +0000 Subject: [PATCH 016/197] The GPL issue does not apply to this version of binutils svn path=/nixpkgs/branches/stdenv-updates/; revision=30871 --- pkgs/development/tools/misc/binutils/default.nix | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/pkgs/development/tools/misc/binutils/default.nix b/pkgs/development/tools/misc/binutils/default.nix index 7b7ff2d44be..e2e3c0f14cd 100644 --- a/pkgs/development/tools/misc/binutils/default.nix +++ b/pkgs/development/tools/misc/binutils/default.nix @@ -4,22 +4,6 @@ let basename = "binutils-2.21.1a"; in stdenv.mkDerivation rec { name = basename + stdenv.lib.optionalString (cross != null) "-${cross.config}"; - # WARNING: Upstream made a mistake in packaging that may mean anyone - # but the FSF hosting this tarball is accidentally in violation of - # the GPL. We can't update binutils until the next stdenv-updates, - # so we are stuck with this version. The issue is discussed in - # this email: http://sourceware.org/ml/binutils/2011-08/msg00198.html - # The tarball for this minor version will not be fixed, as only the - # tarballs for the latest minor version of each major version will - # be repackaged. The fixed sources for the closest version to this one - # can be found at mirror://gnu/binutils/binutils-2.21.1a.tar.bz2 - # or http://ftp.gnu.org/gnu/binutils/binutils-2.21.1a.tar.bz2 - # The sources missing from this tarball come from cgen. It is unclear - # WHICH sources should be included, but the cvs tree can be checked out - # by: - # cvs -z 9 -d :pserver:anoncvs@sourceware.org:/cvs/src login - # {enter "anoncvs" as the password} - # cvs -z 9 -d :pserver:anoncvs@sourceware.org:/cvs/src co cgen src = fetchurl { url = "mirror://gnu/binutils/${basename}.tar.bz2"; sha256 = "0m7nmd7gc9d9md43wbrv65hz6lbi2crqwryzpigv19ray1lzmv6d"; From f8f4f4af3351ed2d2418a61150067671ce8772dd Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 14 Dec 2011 10:26:44 +0000 Subject: [PATCH 017/197] * gnugrep needs xz to unpack its sources. svn path=/nixpkgs/branches/stdenv-updates/; revision=30879 --- pkgs/tools/text/gnugrep/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/text/gnugrep/default.nix b/pkgs/tools/text/gnugrep/default.nix index 2f9cdb2919f..957b70f1e58 100644 --- a/pkgs/tools/text/gnugrep/default.nix +++ b/pkgs/tools/text/gnugrep/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pcre, libiconv ? null}: +{ stdenv, fetchurl, pcre, libiconv ? null, xz }: let version = "2.10"; in @@ -10,7 +10,7 @@ stdenv.mkDerivation ({ sha256 = "1cvsqyfzk1p38fcaav22dn76fkd02g7bjnqna6vrpk9vy9rnfybc"; }; - buildInputs = [ pcre ] + buildInputs = [ pcre xz ] ++ (stdenv.lib.optional (libiconv != null) libiconv); doCheck = if stdenv.isDarwin then false else true; From 86415488bb7379acad9c22abb621aef64012fe24 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 14 Dec 2011 10:35:59 +0000 Subject: [PATCH 018/197] * libsigsegv 2.10. svn path=/nixpkgs/branches/stdenv-updates/; revision=30880 --- pkgs/development/libraries/libsigsegv/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libsigsegv/default.nix b/pkgs/development/libraries/libsigsegv/default.nix index 8987797ca8b..b0a726ed7f3 100644 --- a/pkgs/development/libraries/libsigsegv/default.nix +++ b/pkgs/development/libraries/libsigsegv/default.nix @@ -1,11 +1,11 @@ { fetchurl, stdenv }: stdenv.mkDerivation rec { - name = "libsigsegv-2.8"; + name = "libsigsegv-2.10"; src = fetchurl { url = "mirror://gnu/libsigsegv/${name}.tar.gz"; - sha256 = "052vcxgajdlvc77dqcs48axjz698r1g2gyagz2qcr6zvkyw304w6"; + sha256 = "16hrs8k3nmc7a8jam5j1fpspd6sdpkamskvsdpcw6m29vnis8q44"; }; doCheck = true; From bad4ed8717a2ae8c0ab8a91ef9d4cd584be520ed Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 14 Dec 2011 13:36:38 +0000 Subject: [PATCH 019/197] * PCRE updated to 8.21. Also enable Unicode support by default, since it only increases the size of the library a little bit. svn path=/nixpkgs/branches/stdenv-updates/; revision=30886 --- pkgs/development/libraries/pcre/default.nix | 10 +++++----- pkgs/top-level/all-packages.nix | 5 ++--- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/pkgs/development/libraries/pcre/default.nix b/pkgs/development/libraries/pcre/default.nix index 65eb51af9b0..7802f89807d 100644 --- a/pkgs/development/libraries/pcre/default.nix +++ b/pkgs/development/libraries/pcre/default.nix @@ -1,11 +1,11 @@ -{stdenv, fetchurl, unicodeSupport ? false, cplusplusSupport ? true}: +{ stdenv, fetchurl, unicodeSupport ? true, cplusplusSupport ? true }: -stdenv.mkDerivation { - name = "pcre-8.10"; +stdenv.mkDerivation rec { + name = "pcre-8.21"; src = fetchurl { - url = mirror://sourceforge/pcre/pcre-8.10.tar.bz2; - sha256 = "7ac4e016f6bad8c7d990e6de9bce58c04ff5dd8838be0c5ada0afad1d6a07480"; + url = "ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/${name}.tar.bz2"; + sha256 = "1qwrqldbwszbmr4cw4f0xmcl889cmmjbf58l9vxn89zw26fm1f54"; }; # The compiler on Darwin crashes with an internal error while building the diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2bf7cb37d8e..fc7875aeb4b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3215,8 +3215,7 @@ let cln = callPackage ../development/libraries/cln { }; - clppcre = builderDefsPackage (import ../development/libraries/cl-ppcre) { - }; + clppcre = builderDefsPackage (import ../development/libraries/cl-ppcre) { }; clucene_core = callPackage ../development/libraries/clucene-core { }; @@ -4400,7 +4399,7 @@ let }; pcre = callPackage ../development/libraries/pcre { - unicodeSupport = getConfig ["pcre" "unicode"] false; + unicodeSupport = getConfig ["pcre" "unicode"] true; cplusplusSupport = !stdenv ? isDietLibC; }; From adcb6d6a134c8adfcc3d6e0cd772a281355e903a Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 14 Dec 2011 13:37:17 +0000 Subject: [PATCH 020/197] * Cleanup. svn path=/nixpkgs/branches/stdenv-updates/; revision=30887 --- pkgs/development/libraries/gettext/0.17.nix | 14 ++++---------- pkgs/development/libraries/gettext/default.nix | 16 +++++----------- 2 files changed, 9 insertions(+), 21 deletions(-) diff --git a/pkgs/development/libraries/gettext/0.17.nix b/pkgs/development/libraries/gettext/0.17.nix index 6b094fdc839..bee2042f116 100644 --- a/pkgs/development/libraries/gettext/0.17.nix +++ b/pkgs/development/libraries/gettext/0.17.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, libiconv }: -stdenv.mkDerivation (rec { +stdenv.mkDerivation rec { name = "gettext-0.17"; src = fetchurl { @@ -21,6 +21,8 @@ stdenv.mkDerivation (rec { fi ''; + buildInputs = stdenv.lib.optional (!stdenv.isLinux) libiconv; + meta = { description = "GNU gettext, a well integrated set of translation tools and documentation"; @@ -47,12 +49,4 @@ stdenv.mkDerivation (rec { maintainers = [ stdenv.lib.maintainers.ludo ]; }; -} - -// - -(if (!stdenv.isLinux) # any non-GNU system - then { - buildInputs = [ libiconv ]; - } - else {})) +} \ No newline at end of file diff --git a/pkgs/development/libraries/gettext/default.nix b/pkgs/development/libraries/gettext/default.nix index ddcfc327a9e..f7b31139b56 100644 --- a/pkgs/development/libraries/gettext/default.nix +++ b/pkgs/development/libraries/gettext/default.nix @@ -1,8 +1,6 @@ -# XXX: Remove me when `stdenv-updates' is merged. - { stdenv, fetchurl, libiconv }: -stdenv.mkDerivation (rec { +stdenv.mkDerivation rec { name = "gettext-0.18.1.1"; src = fetchurl { @@ -23,6 +21,10 @@ stdenv.mkDerivation (rec { fi ''; + buildInputs = stdenv.lib.optional (!stdenv.isLinux) libiconv; + + enableParallelBuilding = true; + crossAttrs = { buildInputs = stdenv.lib.optional (stdenv.gccCross.libc ? libiconv) stdenv.gccCross.libc.libiconv.hostDrv; @@ -58,11 +60,3 @@ stdenv.mkDerivation (rec { platforms = stdenv.lib.platforms.all; }; } - -// - -(if (!stdenv.isLinux) # any non-GNU system - then { - buildInputs = [ libiconv ]; - } - else {})) From 594dec7c7fc8b9a935d826911759986bc0cbdf0c Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 14 Dec 2011 14:05:22 +0000 Subject: [PATCH 021/197] * mpc updated to 0.9. svn path=/nixpkgs/branches/stdenv-updates/; revision=30888 --- pkgs/development/libraries/mpc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/mpc/default.nix b/pkgs/development/libraries/mpc/default.nix index 88c18565b78..3824e3d3755 100644 --- a/pkgs/development/libraries/mpc/default.nix +++ b/pkgs/development/libraries/mpc/default.nix @@ -1,11 +1,11 @@ { fetchurl, stdenv, gmp, mpfr }: stdenv.mkDerivation rec { - name = "mpc-0.8.2"; + name = "mpc-0.9"; src = fetchurl { url = "http://www.multiprecision.org/mpc/download/${name}.tar.gz"; - sha256 = "1iw0ag28l5r88k7kpn6i89rqn3yhk2irqzk0d1mlb1la3paghydf"; + sha1 = "229722d553030734d49731844abfef7617b64f1a"; }; buildInputs = [ gmp mpfr ]; From 9eb4c4ddef57a82385de4ba7bf45e798d7ec6cbf Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 14 Dec 2011 14:07:23 +0000 Subject: [PATCH 022/197] * GCC 4.6: drop the cloog-ppl backend, which seems obsolete. svn path=/nixpkgs/branches/stdenv-updates/; revision=30889 --- pkgs/development/compilers/gcc-4.6/default.nix | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/pkgs/development/compilers/gcc-4.6/default.nix b/pkgs/development/compilers/gcc-4.6/default.nix index 4faa531f10d..9ae35014916 100644 --- a/pkgs/development/compilers/gcc-4.6/default.nix +++ b/pkgs/development/compilers/gcc-4.6/default.nix @@ -11,7 +11,7 @@ , perl ? null # optional, for texi2pod (then pod2man); required for Java , gmp, mpfr, mpc, gettext, which , libelf # optional, for link-time optimizations (LTO) -, ppl ? null, cloogppl ? null, cloog ? null # optional, for the Graphite optimization framework. Cannot pass both cloog and cloogppl +, ppl ? null, cloog ? null # optional, for the Graphite optimization framework. , zlib ? null, boehmgc ? null , zip ? null, unzip ? null, pkgconfig ? null, gtk ? null, libart_lgpl ? null , libX11 ? null, libXt ? null, libSM ? null, libICE ? null, libXtst ? null @@ -38,9 +38,6 @@ assert langVhdl -> gnat != null; # LTO needs libelf and zlib. assert libelf != null -> zlib != null; -# Cannot use both cloog and cloog-ppl -assert cloog != null -> cloogppl == null; - with stdenv.lib; with builtins; @@ -216,7 +213,6 @@ stdenv.mkDerivation ({ buildInputs = [ gmp mpfr mpc libelf ] ++ (optional (ppl != null) ppl) - ++ (optional (cloogppl != null) cloogppl) ++ (optional (cloog != null) cloog) ++ (optional (zlib != null) zlib) ++ (optionals langJava [ boehmgc zip unzip ]) @@ -227,14 +223,13 @@ stdenv.mkDerivation ({ ; configureFlagsArray = stdenv.lib.optionals - (ppl != null && ppl.dontDisableStatic == true) + (ppl != null && ppl ? dontDisableStatic && ppl.dontDisableStatic) [ "--with-host-libstdcxx=-lstdc++ -lgcc_s" ]; configureFlags = " ${if enableMultilib then "" else "--disable-multilib"} ${if enableShared then "" else "--disable-shared"} ${if ppl != null then "--with-ppl=${ppl}" else ""} - ${if cloogppl != null then "--with-cloog=${cloogppl}" else ""} ${if cloog != null then "--with-cloog=${cloog} --enable-cloog-backend=isl" else ""} @@ -297,7 +292,6 @@ stdenv.mkDerivation ({ ${if enableMultilib then "" else "--disable-multilib"} ${if enableShared then "" else "--disable-shared"} ${if ppl != null then "--with-ppl=${ppl.hostDrv}" else ""} - ${if cloogppl != null then "--with-cloog=${cloogppl.hostDrv}" else ""} ${if cloog != null then "--with-cloog=${cloog.hostDrv} --enable-cloog-backend=isl" else ""} ${if langJava then "--with-ecj-jar=${javaEcj.hostDrv}" else ""} ${if javaAwtGtk then "--enable-java-awt=gtk" else ""} From cfde88976ba4cddd01b1bb28b40afd12ea93a11d Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 14 Dec 2011 14:31:56 +0000 Subject: [PATCH 023/197] =?UTF-8?q?*=20Streamline=20the=20stdenv=20bootstr?= =?UTF-8?q?ap=20and=20resulting=20closure=20by=20removing=20=20=20some=20r?= =?UTF-8?q?edundant=20builds=20(e.g.,=20GMP=20was=20built=20three=20times)?= =?UTF-8?q?.=20*=20Updated=20GMP=20to=205.0.2.=20*=20Updated=20PPL=20to=20?= =?UTF-8?q?0.11.2.=20*=20Remove=20ad=20hoc=20flags=20to=20build=20GCC's=20?= =?UTF-8?q?dependencies=20statically.=20=20=20Instead,=20use=20the=20?= =?UTF-8?q?=E2=80=98makeStaticLibraries=E2=80=99=20stdenv=20adapter.=20*?= =?UTF-8?q?=20Build=20GMP=20with=20C++=20support=20by=20default.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit svn path=/nixpkgs/branches/stdenv-updates/; revision=30891 --- .../development/compilers/gcc-4.5/default.nix | 5 -- .../libraries/cloog-ppl/default.nix | 18 +---- pkgs/development/libraries/cloog/default.nix | 9 +-- pkgs/development/libraries/gmp/default.nix | 19 ++--- pkgs/development/libraries/isl/default.nix | 8 +- pkgs/development/libraries/ppl/0.11.nix | 50 ------------ pkgs/development/libraries/ppl/default.nix | 79 +++++++++---------- .../tools/misc/binutils/default.nix | 2 + .../linux/kernel-headers/default.nix | 2 +- pkgs/stdenv/adapters.nix | 9 ++- pkgs/stdenv/generic/default.nix | 2 +- pkgs/stdenv/linux/default.nix | 57 +++++++------ pkgs/top-level/all-packages.nix | 32 ++------ 13 files changed, 94 insertions(+), 198 deletions(-) delete mode 100644 pkgs/development/libraries/ppl/0.11.nix diff --git a/pkgs/development/compilers/gcc-4.5/default.nix b/pkgs/development/compilers/gcc-4.5/default.nix index 0e0029f9f94..a86c317e265 100644 --- a/pkgs/development/compilers/gcc-4.5/default.nix +++ b/pkgs/development/compilers/gcc-4.5/default.nix @@ -220,11 +220,6 @@ stdenv.mkDerivation ({ ++ (optionals langVhdl [gnat]) ; - configureFlagsArray = stdenv.lib.optionals - (ppl != null && ppl.dontDisableStatic == true) - [ "--with-host-libstdcxx=-lstdc++ -lgcc_s" - "--with-stage1-libs=-lstdc++ -lgcc_s" ]; - configureFlags = " ${if enableMultilib then "" else "--disable-multilib"} ${if enableShared then "" else "--disable-shared"} diff --git a/pkgs/development/libraries/cloog-ppl/default.nix b/pkgs/development/libraries/cloog-ppl/default.nix index d0e4083788b..d9dae7bfd41 100644 --- a/pkgs/development/libraries/cloog-ppl/default.nix +++ b/pkgs/development/libraries/cloog-ppl/default.nix @@ -1,15 +1,4 @@ -{ fetchurl, stdenv, ppl, static ? false }: - -let - - # --with-host-libstdcxx helps when *ppl* is built statically. - # But I will suppose that this is statically built only when ppl is also - # statically built. - staticFlags = - assert static -> ppl.dontDisableStatic == true; - if static then " --enable-static --disable-shared --with-host-libstdcxx=-lstdc++" else ""; - -in +{ fetchurl, stdenv, ppl }: stdenv.mkDerivation rec { name = "cloog-ppl-0.15.11"; @@ -21,11 +10,10 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ ppl ]; - configureFlags = "--with-ppl=${ppl}" + staticFlags; - dontDisableStatic = if static then true else false; + configureFlags = "--with-ppl=${ppl}"; crossAttrs = { - configureFlags = "--with-ppl=${ppl.hostDrv}" + staticFlags; + configureFlags = "--with-ppl=${ppl.hostDrv}"; }; doCheck = true; diff --git a/pkgs/development/libraries/cloog/default.nix b/pkgs/development/libraries/cloog/default.nix index 7bd0d68c3ec..ab5737b20ed 100644 --- a/pkgs/development/libraries/cloog/default.nix +++ b/pkgs/development/libraries/cloog/default.nix @@ -1,6 +1,4 @@ -{ fetchurl, stdenv, gmp, isl, static ? false }: - -assert static -> isl.dontDisableStatic; +{ fetchurl, stdenv, gmp, isl }: stdenv.mkDerivation rec { name = "cloog-0.16.3"; @@ -14,10 +12,7 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ isl ]; - configureFlags = [ "--with-isl=system" ] - ++ (stdenv.lib.optionals static [ "--enable-static" "--disable-shared" ]); - - dontDisableStatic = static; + configureFlags = [ "--with-isl=system" ]; doCheck = true; diff --git a/pkgs/development/libraries/gmp/default.nix b/pkgs/development/libraries/gmp/default.nix index 1b079c05158..a633177c128 100644 --- a/pkgs/development/libraries/gmp/default.nix +++ b/pkgs/development/libraries/gmp/default.nix @@ -1,28 +1,19 @@ -{stdenv, fetchurl, m4, cxx ? true, static ? false}: - -let - staticFlags = stdenv.lib.optionals static - [ "--enable-static" "--disable-shared" ]; -in +{ stdenv, fetchurl, m4, cxx ? true }: stdenv.mkDerivation rec { - name = "gmp-5.0.1"; + name = "gmp-5.0.2"; src = fetchurl { url = "mirror://gnu/gmp/${name}.tar.bz2"; - sha256 = "1yrr14l6vvhm1g27y8nb3c75j0i4ii4k1gw7ik08safk3zq119m2"; + sha256 = "0a2ch2kpbzrsf3c1pfc6sph87hk2xmwa6np3sn2rzsflzmvdphnv"; }; - buildNativeInputs = [m4]; + buildNativeInputs = [ m4 ]; configureFlags = # Build a "fat binary", with routines for several sub-architectures (x86). [ "--enable-fat" ] - - ++ (if cxx then [ "--enable-cxx" ] else [ "--disable-cxx" ]) - ++ staticFlags; - - dontDisableStatic = if static then true else false; + ++ (if cxx then [ "--enable-cxx" ] else [ "--disable-cxx" ]); doCheck = true; diff --git a/pkgs/development/libraries/isl/default.nix b/pkgs/development/libraries/isl/default.nix index 65c0bc0c1d2..b080064d393 100644 --- a/pkgs/development/libraries/isl/default.nix +++ b/pkgs/development/libraries/isl/default.nix @@ -1,7 +1,7 @@ -{stdenv, fetchurl, gmp, static ? false}: +{ stdenv, fetchurl, gmp }: stdenv.mkDerivation rec { - name = "isl-0.07"; # CLooG 0.16.3 fails to build with ISL 0.08. + name = "isl-0.07"; # CLooG 0.16.3 fails to build with ISL 0.08. src = fetchurl { url = "http://www.kotnet.org/~skimo/isl/${name}.tar.bz2"; @@ -10,10 +10,6 @@ stdenv.mkDerivation rec { buildInputs = [ gmp ]; - dontDisableStatic = static; - configureFlags = - stdenv.lib.optionals static [ " --enable-static" "--disable-shared" ]; - meta = { homepage = http://www.kotnet.org/~skimo/isl/; license = "LGPLv2.1"; diff --git a/pkgs/development/libraries/ppl/0.11.nix b/pkgs/development/libraries/ppl/0.11.nix deleted file mode 100644 index d8ffde644de..00000000000 --- a/pkgs/development/libraries/ppl/0.11.nix +++ /dev/null @@ -1,50 +0,0 @@ -{ fetchurl, stdenv, gmpxx, perl, gnum4, static ? false }: - -let - version = "0.11"; - staticFlags = if static then " --enable-static --disable-shared --disable-watchdog" else ""; -in - stdenv.mkDerivation rec { - name = "ppl-${version}"; - - src = fetchurl { - url = "mirror://gcc/infrastructure/ppl-${version}.tar.gz"; - sha256 = "0xqwyaj232gi0pgm6z2rihk6p8l1rngbbibnhmcrbq4jq550clrl"; - }; - - buildNativeInputs = [ perl gnum4 ]; - propagatedBuildInputs = [ gmpxx ]; - - dontDisableStatic = if static then true else false; - configureFlags = staticFlags; - - # Beware! It took ~6 hours to compile PPL and run its tests on a 1.2 GHz - # x86_64 box. Nevertheless, being a dependency of GCC, it probably ought - # to be tested. - doCheck = false; - - meta = { - description = "PPL: The Parma Polyhedra Library"; - - longDescription = '' - The Parma Polyhedra Library (PPL) provides numerical abstractions - especially targeted at applications in the field of analysis and - verification of complex systems. These abstractions include convex - polyhedra, defined as the intersection of a finite number of (open or - closed) halfspaces, each described by a linear inequality (strict or - non-strict) with rational coefficients; some special classes of - polyhedra shapes that offer interesting complexity/precision tradeoffs; - and grids which represent regularly spaced points that satisfy a set of - linear congruence relations. The library also supports finite - powersets and products of (any kind of) polyhedra and grids and a mixed - integer linear programming problem solver using an exact-arithmetic - version of the simplex algorithm. - ''; - - homepage = http://www.cs.unipr.it/ppl/; - - license = "GPLv3+"; - - maintainers = [ stdenv.lib.maintainers.ludo ]; - }; - } diff --git a/pkgs/development/libraries/ppl/default.nix b/pkgs/development/libraries/ppl/default.nix index d8ffde644de..8cad9022d91 100644 --- a/pkgs/development/libraries/ppl/default.nix +++ b/pkgs/development/libraries/ppl/default.nix @@ -1,50 +1,49 @@ -{ fetchurl, stdenv, gmpxx, perl, gnum4, static ? false }: +{ fetchurl, stdenv, gmpxx, perl, gnum4 }: -let - version = "0.11"; - staticFlags = if static then " --enable-static --disable-shared --disable-watchdog" else ""; -in - stdenv.mkDerivation rec { - name = "ppl-${version}"; +let version = "0.11.2"; in - src = fetchurl { - url = "mirror://gcc/infrastructure/ppl-${version}.tar.gz"; - sha256 = "0xqwyaj232gi0pgm6z2rihk6p8l1rngbbibnhmcrbq4jq550clrl"; - }; +stdenv.mkDerivation rec { + name = "ppl-${version}"; - buildNativeInputs = [ perl gnum4 ]; - propagatedBuildInputs = [ gmpxx ]; + src = fetchurl { + url = "http://bugseng.com/products/ppl/download/ftp/releases/${version}/ppl-${version}.tar.bz2"; + sha256 = "1sxviip4yk6gp453pid5scy1ba66dzdpr02i1416yk7lkv0x3yz3"; + }; - dontDisableStatic = if static then true else false; - configureFlags = staticFlags; + buildNativeInputs = [ perl gnum4 ]; + propagatedBuildInputs = [ gmpxx ]; - # Beware! It took ~6 hours to compile PPL and run its tests on a 1.2 GHz - # x86_64 box. Nevertheless, being a dependency of GCC, it probably ought - # to be tested. - doCheck = false; + configureFlags = "--disable-watchdog"; - meta = { - description = "PPL: The Parma Polyhedra Library"; + # Beware! It took ~6 hours to compile PPL and run its tests on a 1.2 GHz + # x86_64 box. Nevertheless, being a dependency of GCC, it probably ought + # to be tested. + doCheck = false; - longDescription = '' - The Parma Polyhedra Library (PPL) provides numerical abstractions - especially targeted at applications in the field of analysis and - verification of complex systems. These abstractions include convex - polyhedra, defined as the intersection of a finite number of (open or - closed) halfspaces, each described by a linear inequality (strict or - non-strict) with rational coefficients; some special classes of - polyhedra shapes that offer interesting complexity/precision tradeoffs; - and grids which represent regularly spaced points that satisfy a set of - linear congruence relations. The library also supports finite - powersets and products of (any kind of) polyhedra and grids and a mixed - integer linear programming problem solver using an exact-arithmetic - version of the simplex algorithm. - ''; + enableParallelBuilding = true; - homepage = http://www.cs.unipr.it/ppl/; + meta = { + description = "PPL: The Parma Polyhedra Library"; - license = "GPLv3+"; + longDescription = '' + The Parma Polyhedra Library (PPL) provides numerical abstractions + especially targeted at applications in the field of analysis and + verification of complex systems. These abstractions include convex + polyhedra, defined as the intersection of a finite number of (open or + closed) halfspaces, each described by a linear inequality (strict or + non-strict) with rational coefficients; some special classes of + polyhedra shapes that offer interesting complexity/precision tradeoffs; + and grids which represent regularly spaced points that satisfy a set of + linear congruence relations. The library also supports finite + powersets and products of (any kind of) polyhedra and grids and a mixed + integer linear programming problem solver using an exact-arithmetic + version of the simplex algorithm. + ''; - maintainers = [ stdenv.lib.maintainers.ludo ]; - }; - } + homepage = http://www.cs.unipr.it/ppl/; + + license = "GPLv3+"; + + maintainers = [ stdenv.lib.maintainers.ludo ]; + }; +} diff --git a/pkgs/development/tools/misc/binutils/default.nix b/pkgs/development/tools/misc/binutils/default.nix index e2e3c0f14cd..526bc45f8bc 100644 --- a/pkgs/development/tools/misc/binutils/default.nix +++ b/pkgs/development/tools/misc/binutils/default.nix @@ -45,6 +45,8 @@ stdenv.mkDerivation rec { + stdenv.lib.optionalString (cross != null) " --target=${cross.config}" + stdenv.lib.optionalString gold " --enable-gold"; + enableParallelBuilding = true; + meta = { description = "GNU Binutils, tools for manipulating binaries (linker, assembler, etc.)"; diff --git a/pkgs/os-specific/linux/kernel-headers/default.nix b/pkgs/os-specific/linux/kernel-headers/default.nix index 71b3b39baab..c0f949186c6 100644 --- a/pkgs/os-specific/linux/kernel-headers/default.nix +++ b/pkgs/os-specific/linux/kernel-headers/default.nix @@ -4,7 +4,7 @@ assert cross == null -> stdenv.isLinux; let version = "2.6.35.14"; - kernelHeadersBaseConfig = if (cross == null) then + kernelHeadersBaseConfig = if cross == null then stdenv.platform.kernelHeadersBaseConfig else cross.platform.kernelHeadersBaseConfig; diff --git a/pkgs/stdenv/adapters.nix b/pkgs/stdenv/adapters.nix index a1e8aafd7bc..11ee83b9456 100644 --- a/pkgs/stdenv/adapters.nix +++ b/pkgs/stdenv/adapters.nix @@ -109,13 +109,14 @@ rec { } // {inherit fetchurl;}; - # Return a modified stdenv that enables building static libraries. - enableStaticLibraries = stdenv: stdenv // + # Return a modified stdenv that builds static libraries instead of + # shared libraries. + makeStaticLibraries = stdenv: stdenv // { mkDerivation = args: stdenv.mkDerivation (args // { dontDisableStatic = true; configureFlags = - (if args ? configureFlags then args.configureFlags else "") - + " --enable-static"; + (if args ? configureFlags then toString args.configureFlags else "") + + " --enable-static --disable-shared"; }); } // {inherit fetchurl;}; diff --git a/pkgs/stdenv/generic/default.nix b/pkgs/stdenv/generic/default.nix index eca128bcd75..b26bda91695 100644 --- a/pkgs/stdenv/generic/default.nix +++ b/pkgs/stdenv/generic/default.nix @@ -1,6 +1,6 @@ { system, name, preHook ? null, postHook ? null, initialPath, gcc, shell , param1 ? "", param2 ? "", param3 ? "", param4 ? "", param5 ? "" -, extraAttrs ? {}, overrides ? {} +, extraAttrs ? {}, overrides ? (pkgs: {}) , # The `fetchurl' to use for downloading curl and its dependencies # (see all-packages.nix). diff --git a/pkgs/stdenv/linux/default.nix b/pkgs/stdenv/linux/default.nix index 5385fb75e21..62ad647064e 100644 --- a/pkgs/stdenv/linux/default.nix +++ b/pkgs/stdenv/linux/default.nix @@ -5,7 +5,7 @@ # ensuring purity of components produced by it. # The function defaults are for easy testing. -{ system ? "i686-linux" +{ system ? builtins.currentSystem , allPackages ? import ../../top-level/all-packages.nix , platform ? null }: @@ -77,7 +77,7 @@ rec { # This function builds the various standard environments used during # the bootstrap. stdenvBootFun = - {gcc, extraAttrs ? {}, overrides ? {}, extraPath ? [], fetchurl}: + {gcc, extraAttrs ? {}, overrides ? (pkgs: {}), extraPath ? [], fetchurl}: import ../generic { inherit system; @@ -97,7 +97,7 @@ rec { # Having the proper 'platform' in all the stdenvs allows getting proper # linuxHeaders for example. extraAttrs = extraAttrs // { inherit platform; }; - overrides = overrides // { + overrides = pkgs: (overrides pkgs) // { inherit fetchurl; }; }; @@ -156,23 +156,25 @@ rec { # 2) These are the packages that we can build with the first - # stdenv. We only need binutils, because recent glibcs - # require recent binutils, and those in bootstrap-tools may - # be too old. (in step 3). + # stdenv. We only need binutils, because recent Glibcs + # require recent Binutils, and those in bootstrap-tools may + # be too old. stdenvLinuxBoot1Pkgs = allPackages { inherit system platform; bootStdenv = stdenvLinuxBoot1; }; - firstBinutils = stdenvLinuxBoot1Pkgs.binutils; - + # 3) 2nd stdenv that we will use to build only the glibc. stdenvLinuxBoot2 = stdenvBootFun { gcc = wrapGCC { libc = bootstrapGlibc; - binutils = firstBinutils; + binutils = stdenvLinuxBoot1Pkgs.binutils; coreutils = bootstrapTools; }; + overrides = pkgs: { + inherit (stdenvLinuxBoot1Pkgs) perl; + }; inherit fetchurl; }; @@ -199,9 +201,18 @@ rec { coreutils = bootstrapTools; libc = stdenvLinuxGlibc; }; - overrides = { + overrides = pkgs: { glibc = stdenvLinuxGlibc; inherit (stdenvLinuxBoot1Pkgs) perl; + # Link GCC statically against GMP etc. This makes sense because + # these builds of the libraries are only used by GCC, so it + # reduces the size of the stdenv closure. + gmp = pkgs.gmp.override { stdenv = pkgs.makeStaticLibraries pkgs.stdenv; }; + mpfr = pkgs.mpfr.override { stdenv = pkgs.makeStaticLibraries pkgs.stdenv; }; + mpc = pkgs.mpc.override { stdenv = pkgs.makeStaticLibraries pkgs.stdenv; }; + isl = pkgs.isl.override { stdenv = pkgs.makeStaticLibraries pkgs.stdenv; }; + cloog = pkgs.cloog.override { stdenv = pkgs.makeStaticLibraries pkgs.stdenv; }; + ppl = pkgs.ppl.override { stdenv = pkgs.makeStaticLibraries pkgs.stdenv; }; }; inherit fetchurl; }; @@ -213,22 +224,7 @@ rec { bootStdenv = stdenvLinuxBoot3; }; - gccWithStaticLibs = stdenvLinuxBoot3Pkgs.gcc.gcc.override (rec { - ppl = stdenvLinuxBoot3Pkgs.ppl.override { - static = true; - gmpxx = stdenvLinuxBoot3Pkgs.gmpxx.override { - static = true; - }; - }; - cloog = stdenvLinuxBoot3Pkgs.cloog.override { - isl = stdenvLinuxBoot3Pkgs.isl.override { - static = true; - }; - static = true; - }; - cloogppl = null; - }); - + # 8) Construct a fourth stdenv identical to the second, except that # this one uses the dynamically linked GCC and Binutils from step # 5. The other tools (e.g. coreutils) are still from the @@ -238,11 +234,12 @@ rec { inherit (stdenvLinuxBoot3Pkgs) binutils; coreutils = bootstrapTools; libc = stdenvLinuxGlibc; - gcc = gccWithStaticLibs; + gcc = stdenvLinuxBoot3Pkgs.gcc.gcc; name = ""; }; - overrides = { + overrides = pkgs: { inherit (stdenvLinuxBoot1Pkgs) perl; + inherit (stdenvLinuxBoot3Pkgs) gettext gnum4 xz gmp; }; inherit fetchurl; }; @@ -277,7 +274,7 @@ rec { inherit (stdenvLinuxBoot3Pkgs) binutils; inherit (stdenvLinuxBoot4Pkgs) coreutils; libc = stdenvLinuxGlibc; - gcc = gccWithStaticLibs; + gcc = stdenvLinuxBoot3Pkgs.gcc.gcc; shell = stdenvLinuxBoot4Pkgs.bash + "/bin/bash"; name = ""; }; @@ -291,7 +288,7 @@ rec { inherit platform; }; - overrides = { + overrides = pkgs: { inherit gcc; inherit (stdenvLinuxBoot3Pkgs) binutils glibc; inherit (stdenvLinuxBoot4Pkgs) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fc7875aeb4b..3b027e3cf7e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -108,7 +108,7 @@ let # overrided packages will not be built with the crossStdenv # adapter. overrides = overrider pkgsOrig // - (lib.optionalAttrs (pkgsOrig.stdenv ? overrides && crossSystem == null) pkgsOrig.stdenv.overrides); + (lib.optionalAttrs (pkgsOrig.stdenv ? overrides && crossSystem == null) (pkgsOrig.stdenv.overrides pkgsOrig)); # The un-overriden packages, passed to `overrider'. pkgsOrig = pkgsFun pkgs {}; @@ -1208,11 +1208,8 @@ let ppl = callPackage ../development/libraries/ppl { }; - ppl0_11 = callPackage ../development/libraries/ppl/0.11.nix { }; - /* WARNING: this version is unsuitable for using with a setuid wrapper */ - ppp = builderDefsPackage (import ../tools/networking/ppp) { - }; + ppp = builderDefsPackage (import ../tools/networking/ppp) { }; pptp = callPackage ../tools/networking/pptp {}; @@ -1777,8 +1774,7 @@ let gcc46_realCross = lib.addMetaAttrs { platforms = []; } (makeOverridable (import ../development/compilers/gcc-4.6) { inherit fetchurl stdenv texinfo gmp mpfr mpc libelf zlib - cloog gettext which noSysDirs; - ppl = ppl0_11; + cloog ppl gettext which noSysDirs; binutilsCross = binutilsCross; libcCross = libcCross; profiledCompiler = false; @@ -1878,9 +1874,6 @@ let libcCross = null; binutilsCross = null; - ppl = ppl0_11; - cloogppl = null; - # bootstrapping a profiled compiler does not work in the sheevaplug: # http://gcc.gnu.org/bugzilla/show_bug.cgi?id=43944 profiledCompiler = if stdenv.system == "armv5tel-linux" then false else true; @@ -1894,9 +1887,6 @@ let cross = null; libcCross = null; binutilsCross = null; - - ppl = ppl0_11; - cloogppl = null; })); gccApple = @@ -2047,7 +2037,6 @@ let gnatboot = gnat45; # We can't use the ppl stuff, because we would have # libstdc++ problems. - cloogppl = null; ppl = null; cloog = null; }); @@ -2547,7 +2536,8 @@ let # compatibility issues in 2.47 - at list 2.44.1 is known good # for sbcl bootstrap clisp_2_44_1 = callPackage ../development/interpreters/clisp/2.44.1.nix { - libsigsegv = libsigsegv_25; }; + libsigsegv = libsigsegv_25; + }; clojure = callPackage ../development/interpreters/clojure { }; @@ -3555,17 +3545,9 @@ let gmp = if stdenv.system == "i686-darwin" then # GMP 4.3.2 is broken on Darwin, so use 4.3.1. - makeOverridable (import ../development/libraries/gmp/4.3.1.nix) { - inherit stdenv fetchurl m4; - cxx = false; - } + callPackage ../development/libraries/gmp/4.3.1.nix { } else - # We temporarily leave gmp 4 here, waiting for a new ppl/cloog-ppl that - # would build well with gmp 5. - makeOverridable (import ../development/libraries/gmp/4.nix) { - inherit stdenv fetchurl m4; - cxx = false; - }; + callPackage ../development/libraries/gmp { }; gmpxx = gmp.override { cxx = true; }; From 26046ace01d659533b2e37f6ea51196885008c3e Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 14 Dec 2011 14:43:43 +0000 Subject: [PATCH 024/197] * Updated attr and acl. svn path=/nixpkgs/branches/stdenv-updates/; revision=30892 --- pkgs/development/libraries/acl/default.nix | 6 +++--- pkgs/development/libraries/attr/default.nix | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/acl/default.nix b/pkgs/development/libraries/acl/default.nix index 5ce81105fa3..3ccb5691980 100644 --- a/pkgs/development/libraries/acl/default.nix +++ b/pkgs/development/libraries/acl/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, gettext, attr }: stdenv.mkDerivation rec { - name = "acl-2.2.49"; + name = "acl-2.2.51"; src = fetchurl { url = "mirror://savannah/acl/${name}.src.tar.gz"; - sha256 = "1mg5nxr0r9y08lmyxmm2lfss5jz1xzbs0npsc8597x2f5rsz9ixr"; + sha256 = "09aj30m49ivycl3irram8c3givc0crivjm3ymw0nhfaxrwhlb186"; }; - buildNativeInputs = [gettext]; + buildNativeInputs = [ gettext ]; buildInputs = [ attr ]; # Upstream use C++-style comments in C code. Remove them. diff --git a/pkgs/development/libraries/attr/default.nix b/pkgs/development/libraries/attr/default.nix index 6477b443dcf..adc53086306 100644 --- a/pkgs/development/libraries/attr/default.nix +++ b/pkgs/development/libraries/attr/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, gettext }: stdenv.mkDerivation rec { - name = "attr-2.4.44"; + name = "attr-2.4.46"; src = fetchurl { url = "mirror://savannah/attr/${name}.src.tar.gz"; - sha256 = "16244r2vrd57i5fnf7dz3yi2mcckc47jr9y539jvljrzwnw18qlz"; + sha256 = "07qf6kb2zk512az481bbnsk9jycn477xpva1a726n5pzlzf9pmnw"; }; - buildNativeInputs = [gettext]; + buildNativeInputs = [ gettext ]; configureFlags = "MAKE=make MSGFMT=msgfmt MSGMERGE=msgmerge XGETTEXT=xgettext ECHO=echo SED=sed AWK=gawk"; From 3103799d477640fb0beea4ce528406a9a2ade85e Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Wed, 14 Dec 2011 18:22:34 +0000 Subject: [PATCH 025/197] Update dbus and dbus-glib to the latest stable versions Drop unstable versions svn path=/nixpkgs/branches/stdenv-updates/; revision=30893 --- pkgs/development/libraries/dbus-glib/0.94.nix | 23 ------- .../libraries/dbus-glib/default.nix | 4 +- pkgs/development/libraries/dbus/1.5.6.nix | 61 ------------------- pkgs/development/libraries/dbus/default.nix | 6 +- pkgs/top-level/all-packages.nix | 12 +--- 5 files changed, 6 insertions(+), 100 deletions(-) delete mode 100644 pkgs/development/libraries/dbus-glib/0.94.nix delete mode 100644 pkgs/development/libraries/dbus/1.5.6.nix diff --git a/pkgs/development/libraries/dbus-glib/0.94.nix b/pkgs/development/libraries/dbus-glib/0.94.nix deleted file mode 100644 index 83c1693d80f..00000000000 --- a/pkgs/development/libraries/dbus-glib/0.94.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, expat, gettext, libiconv, dbus, glib }: - -stdenv.mkDerivation rec { - name = "dbus-glib-0.94"; - - src = fetchurl { - url = "${meta.homepage}/releases/dbus-glib/${name}.tar.gz"; - sha256 = "16yk106bp58in6vz2li2s3iwk1si65f0n22m8c2mplzh2j9zlq74"; - }; - - buildInputs = [ pkgconfig expat gettext ] - ++ stdenv.lib.optional (!stdenv.isLinux) libiconv; - - propagatedBuildInputs = [ dbus glib ]; - - passthru = { inherit dbus glib; }; - - meta = { - homepage = http://dbus.freedesktop.org; - license = "AFL-2.1 or GPL-2"; - description = "GLib bindings for D-Bus lightweight IPC mechanism"; - }; -} diff --git a/pkgs/development/libraries/dbus-glib/default.nix b/pkgs/development/libraries/dbus-glib/default.nix index 467b9c4d506..308b892b08b 100644 --- a/pkgs/development/libraries/dbus-glib/default.nix +++ b/pkgs/development/libraries/dbus-glib/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, expat, gettext, libiconv, dbus, glib }: stdenv.mkDerivation rec { - name = "dbus-glib-0.86"; + name = "dbus-glib-0.98"; src = fetchurl { url = "${meta.homepage}/releases/dbus-glib/${name}.tar.gz"; - sha256 = "1p0bm5p8g8h0mimhj0d58dqdrhfipvcwv95l6hf69z4gygksclak"; + sha256 = "04fiwld5yaxyggxlvdmbaqkngh4fn8gfkkqckcp3274bpgb82z19"; }; buildInputs = [ pkgconfig expat gettext ] diff --git a/pkgs/development/libraries/dbus/1.5.6.nix b/pkgs/development/libraries/dbus/1.5.6.nix deleted file mode 100644 index 9c158933cb0..00000000000 --- a/pkgs/development/libraries/dbus/1.5.6.nix +++ /dev/null @@ -1,61 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, expat, libX11, libICE, libSM, useX11 ? true }: - -let - version = "1.5.6"; - - src = fetchurl { - url = "http://dbus.freedesktop.org/releases/dbus/dbus-${version}.tar.gz"; - sha256 = "18g5328wnh25p0hihv5gg55q5l019zzwr04shvp67myvwy07m851"; - }; - - patches = [ ./ignore-missing-includedirs.patch ]; - - configureFlags = "--localstatedir=/var --sysconfdir=/etc --with-session-socket-dir=/tmp"; - -in rec { - - libs = stdenv.mkDerivation { - name = "dbus-library-" + version; - - buildInputs = [ pkgconfig expat ]; - - inherit src patches configureFlags; - - preConfigure = - '' - sed -i '/mkinstalldirs.*localstatedir/d' bus/Makefile.in - sed -i '/SUBDIRS/s/ tools//' Makefile.in - ''; - - # Enable X11 autolaunch support in libdbus. This doesn't actually - # depend on X11 (it just execs dbus-launch in dbus.tools), - # contrary to what the configure script demands. - NIX_CFLAGS_COMPILE = "-DDBUS_ENABLE_X11_AUTOLAUNCH=1"; - - installFlags = "sysconfdir=$(out)/etc"; - }; - - tools = stdenv.mkDerivation { - name = "dbus-tools-" + version; - - inherit src patches; - - configureFlags = "${configureFlags} --with-dbus-daemondir=${daemon}/bin"; - - buildInputs = [ pkgconfig expat libs ] - ++ stdenv.lib.optionals useX11 [ libX11 libICE libSM ]; - - NIX_LDFLAGS = "-ldbus-1"; - - preConfigure = - '' - sed -i 's@$(top_builddir)/dbus/libdbus-1.la@@' tools/Makefile.in - substituteInPlace tools/Makefile.in --replace 'install-localstatelibDATA:' 'disabled:' - ''; - - postConfigure = "cd tools"; - }; - - # I'm too lazy to separate daemon and libs now. - daemon = libs; -} diff --git a/pkgs/development/libraries/dbus/default.nix b/pkgs/development/libraries/dbus/default.nix index 1d0bcc11146..c4bab3ba853 100644 --- a/pkgs/development/libraries/dbus/default.nix +++ b/pkgs/development/libraries/dbus/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, expat, libX11, libICE, libSM, useX11 ? true }: let - version = "1.4.14"; + version = "1.4.16"; src = fetchurl { url = "http://dbus.freedesktop.org/releases/dbus/dbus-${version}.tar.gz"; - sha256 = "0xsqkq2q2hb09dcdsw0y359zvml480h79qvl9g31r7da57y7xwj7"; + sha256 = "1ii93d0lzj5xm564dcq6ca4s0nvm5i9fx3jp0s7i9hlc5wkfd3hx"; }; patches = [ ./ignore-missing-includedirs.patch ]; @@ -49,7 +49,7 @@ in rec { preConfigure = '' - sed -i 's@ $(top_builddir)/dbus/libdbus-1.la@@' tools/Makefile.in + sed -i 's@$(top_builddir)/dbus/libdbus-1.la@@' tools/Makefile.in substituteInPlace tools/Makefile.in --replace 'install-localstatelibDATA:' 'disabled:' ''; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3b027e3cf7e..63f7458eca7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3265,14 +3265,6 @@ let useX11 = true; }; - dbus_all_1_5_6 = callPackage ../development/libraries/dbus/1.5.6.nix { - useX11 = true; - }; - - dbus_glib_0_94 = callPackage ../development/libraries/dbus-glib/0.94.nix { - dbus = pkgs.dbus_all_1_5_6.libs; - }; - dbus_glib = callPackage ../development/libraries/dbus-glib { }; dbus_java = callPackage ../development/libraries/java/dbus-java { }; @@ -6063,9 +6055,7 @@ let untie = callPackage ../os-specific/linux/untie { }; - upower = callPackage ../os-specific/linux/upower { - dbus_glib = pkgs.dbus_glib_0_94; - }; + upower = callPackage ../os-specific/linux/upower { }; upstart = callPackage ../os-specific/linux/upstart { }; From 5c507048ddc836585961e4fc175fc531a701196a Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Wed, 14 Dec 2011 18:22:48 +0000 Subject: [PATCH 026/197] Review dbus-glib expression * Move pkgconfig and gettext to buildNativeInputs * Add deprecation warning svn path=/nixpkgs/branches/stdenv-updates/; revision=30894 --- pkgs/development/libraries/dbus-glib/default.nix | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/pkgs/development/libraries/dbus-glib/default.nix b/pkgs/development/libraries/dbus-glib/default.nix index 308b892b08b..5fccc7ad66b 100644 --- a/pkgs/development/libraries/dbus-glib/default.nix +++ b/pkgs/development/libraries/dbus-glib/default.nix @@ -7,17 +7,19 @@ stdenv.mkDerivation rec { url = "${meta.homepage}/releases/dbus-glib/${name}.tar.gz"; sha256 = "04fiwld5yaxyggxlvdmbaqkngh4fn8gfkkqckcp3274bpgb82z19"; }; - - buildInputs = [ pkgconfig expat gettext ] - ++ stdenv.lib.optional (!stdenv.isLinux) libiconv; - - propagatedBuildInputs = [ dbus.libs glib ]; - + + buildNativeInputs = [ pkgconfig gettext ]; + + buildInputs = [ expat ] ++ stdenv.lib.optional (!stdenv.isLinux) libiconv; + + propagatedBuildInputs = [ dbus glib ]; + passthru = { inherit dbus glib; }; meta = { homepage = http://dbus.freedesktop.org; license = "AFL-2.1 or GPL-2"; - description = "GLib bindings for D-Bus lightweight IPC mechanism"; + description = "Obsolete glib bindings for D-Bus lightweight IPC mechanism"; + maintainers = [ stdenv.lib.maintainers.urkud ]; }; } From 14bbbbbed249936185785af73a7d20a3a2b7548d Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Wed, 14 Dec 2011 18:22:55 +0000 Subject: [PATCH 027/197] Review dbus-lib expression * Move pkgconfig to buildNativeInputs svn path=/nixpkgs/branches/stdenv-updates/; revision=30895 --- pkgs/development/libraries/dbus/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/dbus/default.nix b/pkgs/development/libraries/dbus/default.nix index c4bab3ba853..c943fe87fb3 100644 --- a/pkgs/development/libraries/dbus/default.nix +++ b/pkgs/development/libraries/dbus/default.nix @@ -17,7 +17,9 @@ in rec { libs = stdenv.mkDerivation { name = "dbus-library-" + version; - buildInputs = [ pkgconfig expat ]; + buildNativeInputs = [ pkgconfig ]; + + buildInputs = [ expat ]; inherit src patches configureFlags; @@ -42,7 +44,9 @@ in rec { configureFlags = "${configureFlags} --with-dbus-daemondir=${daemon}/bin"; - buildInputs = [ pkgconfig expat libs ] + buildNativeInputs = [ pkgconfig ]; + + buildInputs = [ expat libs ] ++ stdenv.lib.optionals useX11 [ libX11 libICE libSM ]; NIX_LDFLAGS = "-ldbus-1"; From b9c26c72bae299fe2eee1e625815ff95b2f2e92c Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 20 Dec 2011 10:32:14 +0000 Subject: [PATCH 028/197] =?UTF-8?q?*=20Add=20=E2=80=98xz=E2=80=99=20to=20s?= =?UTF-8?q?tdenv,=20as=20suggested=20by=20Michael=20Raskin.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit svn path=/nixpkgs/branches/stdenv-updates/; revision=30975 --- pkgs/stdenv/common-path.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/stdenv/common-path.nix b/pkgs/stdenv/common-path.nix index 3b267a543c6..c2e5dedfd22 100644 --- a/pkgs/stdenv/common-path.nix +++ b/pkgs/stdenv/common-path.nix @@ -12,4 +12,5 @@ pkgs.bash pkgs.patch pkgs.replace + pkgs.xz ] From ff2f4827b448aaa2d374548be9e34ee467e935af Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 20 Dec 2011 13:05:51 +0000 Subject: [PATCH 029/197] * Test xz in stdenv. svn path=/nixpkgs/branches/stdenv-updates/; revision=30983 --- pkgs/development/tools/misc/strace/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/misc/strace/default.nix b/pkgs/development/tools/misc/strace/default.nix index 6bd2619e4d3..b3cf2fcbdda 100644 --- a/pkgs/development/tools/misc/strace/default.nix +++ b/pkgs/development/tools/misc/strace/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, xz, perl }: +{ stdenv, fetchurl, perl }: stdenv.mkDerivation rec { name = "strace-4.6"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "12n2faqq7whmszpjhv2lcb06r7900j53p0zl7vipi18inr0smycy"; }; - buildNativeInputs = [ xz perl ]; + buildNativeInputs = [ perl ]; meta = { homepage = http://strace.sourceforge.net/; From ec3f38712af82cb7cfe3cf7125b3d2628b414526 Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Tue, 3 Jan 2012 18:04:57 +0000 Subject: [PATCH 030/197] svn merge /path/to/trunk; svn revert path/to/cmake/default.nix svn path=/nixpkgs/branches/stdenv-updates/; revision=31249 --- pkgs/misc/ghostscript/builder.sh | 19 ------ pkgs/misc/ghostscript/default.nix | 35 +++++++---- pkgs/misc/ghostscript/pstoraster.patch | 81 -------------------------- 3 files changed, 23 insertions(+), 112 deletions(-) delete mode 100644 pkgs/misc/ghostscript/builder.sh delete mode 100644 pkgs/misc/ghostscript/pstoraster.patch diff --git a/pkgs/misc/ghostscript/builder.sh b/pkgs/misc/ghostscript/builder.sh deleted file mode 100644 index 361b7f77f0c..00000000000 --- a/pkgs/misc/ghostscript/builder.sh +++ /dev/null @@ -1,19 +0,0 @@ -source $stdenv/setup - -preConfigure() { - # "ijs" is impure: it contains symlinks to /usr/share/automake etc.! - rm -rf ijs/ltmain.sh - - # Don't install stuff in the Cups store path. - makeFlagsArray=(CUPSSERVERBIN=$out/lib/cups CUPSSERVERROOT=$out/etc/cups CUPSDATA=$out/share/cups) -} - -installTargets="install install-so install-data install-doc install-man" - -postInstall() { - for i in $fonts; do - (cd $out/share/ghostscript && tar xvfz $i) - done -} - -genericBuild diff --git a/pkgs/misc/ghostscript/default.nix b/pkgs/misc/ghostscript/default.nix index 442fb8a0e50..ddd51f73f79 100644 --- a/pkgs/misc/ghostscript/default.nix +++ b/pkgs/misc/ghostscript/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libjpeg, libpng, libtiff, zlib, pkgconfig, fontconfig, openssl +{ stdenv, fetchurl, libjpeg, libpng, libtiff, zlib, pkgconfig, fontconfig, openssl, lcms, freetype , x11Support, x11 ? null , cupsSupport ? false, cups ? null , gnuFork ? true @@ -28,10 +28,10 @@ let }; gnuForkData = rec { - name = "ghostscript-8.71.1"; + name = "ghostscript-9.04.1"; src = fetchurl { url = "mirror://gnu/ghostscript/gnu-${name}.tar.bz2"; - sha256 = "0vab9905h6sl5s5miai4vhhwdacjlkxqmykfr42x32sr25wjqgvl"; + sha256 = "0zqa6ggbkdqiszsywgrra4ij0sddlmrfa50bx2mh568qid4ga0a2"; }; inherit meta; @@ -56,8 +56,6 @@ in stdenv.mkDerivation rec { inherit (variant) name src meta; - builder = ./builder.sh; - fonts = [ (fetchurl { url = mirror://gnu/ghostscript/gnu-gs-fonts-std-6.0.tar.gz; @@ -70,17 +68,30 @@ stdenv.mkDerivation rec { # ... add other fonts here ]; - buildInputs = [libjpeg libpng libtiff zlib pkgconfig fontconfig openssl] - ++ stdenv.lib.optional x11Support x11 + buildInputs = [libjpeg libpng libtiff zlib pkgconfig fontconfig openssl lcms] + ++ stdenv.lib.optionals x11Support [x11 freetype] ++ stdenv.lib.optional cupsSupport cups; - configureFlags = - if x11Support then [ "--with-x" ] else [ "--without-x" ]; - CFLAGS = "-fPIC"; + NIX_LDFLAGS = "-lz -rpath=${freetype}/lib"; - patches = [ ./purity.patch ./urw-font-files.patch ] - ++ stdenv.lib.optional gnuFork ./pstoraster.patch; + patches = [ ./purity.patch ./urw-font-files.patch ]; + + preConfigure = '' + # "ijs" is impure: it contains symlinks to /usr/share/automake etc.! + rm -rf ijs/ltmain.sh + + # Don't install stuff in the Cups store path. + makeFlagsArray=(CUPSSERVERBIN=$out/lib/cups CUPSSERVERROOT=$out/etc/cups CUPSDATA=$out/share/cups) + ''; + + configureFlags = if x11Support then [ "--with-x" ] else [ "--without-x" ]; doCheck = true; + + postInstall = '' + for i in $fonts; do + (cd $out/share/ghostscript && tar xvfz $i) + done + ''; } diff --git a/pkgs/misc/ghostscript/pstoraster.patch b/pkgs/misc/ghostscript/pstoraster.patch deleted file mode 100644 index 465c91e4f19..00000000000 --- a/pkgs/misc/ghostscript/pstoraster.patch +++ /dev/null @@ -1,81 +0,0 @@ -Upstream issue: http://bugs.ghostscript.com/show_bug.cgi?id=691108 -e.g. printing a test page prints only black - -Patch: https://bugs.archlinux.org/task/18339 - ---- a/cups/gdevcups.c -+++ b/cups/gdevcups.c -@@ -975,7 +975,8 @@ cups_map_cmyk(gx_device *pdev, /* I - Device info */ - frac k, /* I - Black value */ - frac *out) /* O - Device colors */ - { -- int c0, c1, c2, c3; /* Temporary color values */ -+ int c0 = 0, c1 = 0, -+ c2 = 0, c3 = 0; /* Temporary color values */ - float rr, rg, rb, /* Real RGB colors */ - ciex, ciey, ciez, /* CIE XYZ colors */ - ciey_yn, /* Normalized luminance */ -@@ -2703,9 +2704,13 @@ cups_put_params(gx_device *pdev, /* I - Device info */ - int color_set; /* Were the color attrs set? */ - gdev_prn_space_params sp; /* Space parameter data */ - int width, /* New width of page */ -- height; /* New height of page */ -+ height, /* New height of page */ -+ colorspace, /* New color space */ -+ bitspercolor; /* New bits per color */ - static int width_old = 0, /* Previous width */ -- height_old = 0; /* Previous height */ -+ height_old = 0, /* Previous height */ -+ colorspace_old = 0,/* Previous color space */ -+ bitspercolor_old = 0;/* Previous bits per color */ - ppd_attr_t *backside = NULL, - *backsiderequiresflippedmargins = NULL; - float swap; -@@ -2800,9 +2805,10 @@ cups_put_params(gx_device *pdev, /* I - Device info */ - else if (code == 0) \ - { \ - dprintf1("DEBUG: Setting %s to", sname); \ -- for (i = 0; i < count; i ++) \ -- dprintf1(" %d", (unsigned)(arrayval.data[i])); \ -- cups->header.name[i] = (unsigned)arrayval.data[i]; \ -+ for (i = 0; i < count; i ++) { \ -+ dprintf1(" %d", (unsigned)(arrayval.data[i])); \ -+ cups->header.name[i] = (unsigned)(arrayval.data[i]); \ -+ } \ - dprintf("...\n"); \ - } - -@@ -3243,23 +3249,31 @@ cups_put_params(gx_device *pdev, /* I - Device info */ - } - #endif /* CUPS_RASTER_SYNCv1 */ - -+ colorspace = cups->header.cupsColorSpace; -+ bitspercolor = cups->header.cupsBitsPerColor; -+ - /* - * Don't reallocate memory unless the device has been opened... - * Also reallocate only if the size has actually changed... - */ - -- if (pdev->is_open && (width != width_old || height != height_old)) -+ if (pdev->is_open && -+ (width != width_old || height != height_old || -+ colorspace != colorspace_old || bitspercolor != bitspercolor_old)) - { - - width_old = width; - height_old = height; -+ colorspace_old = colorspace; -+ bitspercolor_old = bitspercolor; - - /* - * Device is open and size has changed, so reallocate... - */ - -- dprintf4("DEBUG2: Reallocating memory, [%.0f %.0f] = %dx%d pixels...\n", -- pdev->MediaSize[0], pdev->MediaSize[1], width, height); -+ dprintf6("DEBUG2: Reallocating memory, [%.0f %.0f] = %dx%d pixels, color space: %d, bits per color: %d...\n", -+ pdev->MediaSize[0], pdev->MediaSize[1], width, height, -+ colorspace, bitspercolor); - - sp = ((gx_device_printer *)pdev)->space_params; \ No newline at end of file From 80d21cb05b18629b076f3e4129e7242d4a31cd00 Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Thu, 5 Jan 2012 09:54:46 +0000 Subject: [PATCH 031/197] Fix djvulibre compilation Also remove djview3. Use djview4 instead. svn path=/nixpkgs/branches/stdenv-updates/; revision=31307 --- pkgs/applications/misc/djvulibre/default.nix | 11 +- .../applications/misc/djvulibre/gcc-4.6.patch | 658 ++++++++++++++++++ 2 files changed, 664 insertions(+), 5 deletions(-) create mode 100644 pkgs/applications/misc/djvulibre/gcc-4.6.patch diff --git a/pkgs/applications/misc/djvulibre/default.nix b/pkgs/applications/misc/djvulibre/default.nix index b1001976ea0..e22dce72b62 100644 --- a/pkgs/applications/misc/djvulibre/default.nix +++ b/pkgs/applications/misc/djvulibre/default.nix @@ -1,5 +1,4 @@ -{ stdenv, fetchurl, lib, useQt3 ? false, libjpeg, libtiff, libpng, ghostscript -, libungif, zlib, x11, libX11, mesa, qt3 }: +{ stdenv, fetchurl, libjpeg, libtiff, libpng, ghostscript, libungif, zlib }: stdenv.mkDerivation rec { name = "djvulibre-3.5.24"; @@ -9,12 +8,14 @@ stdenv.mkDerivation rec { sha256 = "0d1592cmc7scg2jzah47mnvbqldhxb1x9vxm7y64a3iasa0lqwy0"; }; - buildInputs = [ libjpeg libtiff libpng ghostscript zlib libungif ] ++ - stdenv.lib.optionals useQt3 [qt3 libX11 x11 mesa]; + buildInputs = [ libjpeg libtiff libpng ghostscript zlib libungif ]; + + patches = [ ./gcc-4.6.patch ]; meta = { description = "A library and viewer for the DJVU file format for scanned images"; homepage = http://djvu.sourceforge.net; - maintainers = [ lib.maintainers.urkud ]; + maintainers = [ stdenv.lib.maintainers.urkud ]; + platforms = stdenv.lib.platforms.all; }; } diff --git a/pkgs/applications/misc/djvulibre/gcc-4.6.patch b/pkgs/applications/misc/djvulibre/gcc-4.6.patch new file mode 100644 index 00000000000..48fbc2bc7ac --- /dev/null +++ b/pkgs/applications/misc/djvulibre/gcc-4.6.patch @@ -0,0 +1,658 @@ +commit 3341545edba359b292a8ef6db1b7d342caf3dcf1 +Author: Leon Bottou +Date: Wed May 4 21:25:35 2011 -0700 + + Added include for gcc-4.6 + +diff --git a/libdjvu/BSByteStream.cpp b/libdjvu/BSByteStream.cpp +index b762ccf..d662ab0 100644 +--- a/libdjvu/BSByteStream.cpp ++++ b/libdjvu/BSByteStream.cpp +@@ -62,6 +62,7 @@ + + // - Author: Leon Bottou, 07/1998 + ++#include + #include + #include + #include +diff --git a/libdjvu/BSEncodeByteStream.cpp b/libdjvu/BSEncodeByteStream.cpp +index 5d80e51..68bc3e3 100644 +--- a/libdjvu/BSEncodeByteStream.cpp ++++ b/libdjvu/BSEncodeByteStream.cpp +@@ -71,6 +71,7 @@ + #include "GOS.h" + #endif + ++#include + #include + #include + #include +diff --git a/libdjvu/ByteStream.cpp b/libdjvu/ByteStream.cpp +index 158c33c..be01847 100644 +--- a/libdjvu/ByteStream.cpp ++++ b/libdjvu/ByteStream.cpp +@@ -73,6 +73,7 @@ + #include "GOS.h" + #include "GURL.h" + #include "DjVuMessage.h" ++#include + #include + #if defined(WIN32) || defined(__CYGWIN32__) + # include +diff --git a/libdjvu/DjVuFileCache.cpp b/libdjvu/DjVuFileCache.cpp +index 6b1e85d..7d7a192 100644 +--- a/libdjvu/DjVuFileCache.cpp ++++ b/libdjvu/DjVuFileCache.cpp +@@ -63,6 +63,7 @@ + #include "DjVuFileCache.h" + #include "debug.h" + ++#include + #include + + +diff --git a/libdjvu/DjVuGlobal.cpp b/libdjvu/DjVuGlobal.cpp +index e6d3cec..df9278e 100644 +--- a/libdjvu/DjVuGlobal.cpp ++++ b/libdjvu/DjVuGlobal.cpp +@@ -76,6 +76,8 @@ + #include "GThreads.h" + #include "GException.h" + #include "GContainer.h" ++ ++#include + #include + #include + #include +diff --git a/libdjvu/DjVuGlobalMemory.cpp b/libdjvu/DjVuGlobalMemory.cpp +index 3c6012c..c8ba309 100644 +--- a/libdjvu/DjVuGlobalMemory.cpp ++++ b/libdjvu/DjVuGlobalMemory.cpp +@@ -67,6 +67,8 @@ + + #include "DjVuGlobal.h" + #include "GException.h" ++ ++#include + #include + #include + #include "debug.h" +diff --git a/libdjvu/DjVuMessage.cpp b/libdjvu/DjVuMessage.cpp +index 6f5a735..1726025 100644 +--- a/libdjvu/DjVuMessage.cpp ++++ b/libdjvu/DjVuMessage.cpp +@@ -71,6 +71,7 @@ + #include "debug.h" + #include + #include ++#include + #include + #ifdef WIN32 + # include +diff --git a/libdjvu/DjVuMessageLite.cpp b/libdjvu/DjVuMessageLite.cpp +index b8c1010..5daa9d9 100644 +--- a/libdjvu/DjVuMessageLite.cpp ++++ b/libdjvu/DjVuMessageLite.cpp +@@ -73,8 +73,8 @@ + #include "debug.h" + #include + #include ++#include + #include +-// #include + #ifdef WIN32 + #include + #include +diff --git a/libdjvu/DjVuPalette.cpp b/libdjvu/DjVuPalette.cpp +index c489f7b..76b0bf4 100644 +--- a/libdjvu/DjVuPalette.cpp ++++ b/libdjvu/DjVuPalette.cpp +@@ -64,6 +64,8 @@ + #include "ByteStream.h" + #include "BSByteStream.h" + #include "DjVuPalette.h" ++ ++#include + #include + #include + +diff --git a/libdjvu/DjVuPort.h b/libdjvu/DjVuPort.h +index f6a92f6..e2b3125 100644 +--- a/libdjvu/DjVuPort.h ++++ b/libdjvu/DjVuPort.h +@@ -65,6 +65,7 @@ + + #include "GThreads.h" + #include "GURL.h" ++#include "stddef.h" + + #ifdef HAVE_NAMESPACES + namespace DJVU { +diff --git a/libdjvu/DjVuToPS.cpp b/libdjvu/DjVuToPS.cpp +index 5517bf3..6914ff9 100644 +--- a/libdjvu/DjVuToPS.cpp ++++ b/libdjvu/DjVuToPS.cpp +@@ -72,6 +72,7 @@ + #include "GPixmap.h" + #include "debug.h" + #include ++#include + #include + #include + #include +diff --git a/libdjvu/GBitmap.cpp b/libdjvu/GBitmap.cpp +index ab5c0de..797edcc 100644 +--- a/libdjvu/GBitmap.cpp ++++ b/libdjvu/GBitmap.cpp +@@ -66,6 +66,8 @@ + #include "GString.h" + #include "GThreads.h" + #include "GException.h" ++#include ++#include + #include + + // - Author: Leon Bottou, 05/1997 +diff --git a/libdjvu/GException.cpp b/libdjvu/GException.cpp +index 2ea179a..89da70f 100644 +--- a/libdjvu/GException.cpp ++++ b/libdjvu/GException.cpp +@@ -60,6 +60,7 @@ + # pragma implementation + #endif + ++#include + #include + #include + #include +diff --git a/libdjvu/GOS.cpp b/libdjvu/GOS.cpp +index e784932..d2088e2 100644 +--- a/libdjvu/GOS.cpp ++++ b/libdjvu/GOS.cpp +@@ -65,6 +65,7 @@ + #include "GOS.h" + #include "GURL.h" + ++#include + #include + #include + #include +diff --git a/libdjvu/GPixmap.cpp b/libdjvu/GPixmap.cpp +index 392df54..4bf6f57 100644 +--- a/libdjvu/GPixmap.cpp ++++ b/libdjvu/GPixmap.cpp +@@ -75,6 +75,8 @@ + #include "GThreads.h" + #include "Arrays.h" + #include "JPEGDecoder.h" ++ ++#include + #include + #include + #include +diff --git a/libdjvu/GSmartPointer.cpp b/libdjvu/GSmartPointer.cpp +index 6e523e7..58aef5b 100644 +--- a/libdjvu/GSmartPointer.cpp ++++ b/libdjvu/GSmartPointer.cpp +@@ -67,6 +67,7 @@ + // Our original implementation consisted of multiple classes. + // . + ++#include + #include + #if PARANOID_DEBUG + # include +diff --git a/libdjvu/GSmartPointer.h b/libdjvu/GSmartPointer.h +index 82781bd..8a8bb8a 100644 +--- a/libdjvu/GSmartPointer.h ++++ b/libdjvu/GSmartPointer.h +@@ -97,6 +97,8 @@ + #include "DjVuGlobal.h" + #include "atomic.h" + ++#include ++ + #ifdef HAVE_NAMESPACES + namespace DJVU { + # ifdef NOT_DEFINED // Just to fool emacs c++ mode +diff --git a/libdjvu/GString.cpp b/libdjvu/GString.cpp +index 03f6226..350b11b 100644 +--- a/libdjvu/GString.cpp ++++ b/libdjvu/GString.cpp +@@ -73,6 +73,7 @@ + #include "GThreads.h" + #include "debug.h" + ++#include + #include + #include + #include +diff --git a/libdjvu/GString.h b/libdjvu/GString.h +index b63b753..3aa1f76 100644 +--- a/libdjvu/GString.h ++++ b/libdjvu/GString.h +@@ -108,6 +108,7 @@ + #include "DjVuGlobal.h" + #include "GContainer.h" + ++#include + #include + #include + #ifdef WIN32 +diff --git a/libdjvu/GThreads.cpp b/libdjvu/GThreads.cpp +index d81f3c3..253fed8 100644 +--- a/libdjvu/GThreads.cpp ++++ b/libdjvu/GThreads.cpp +@@ -71,6 +71,8 @@ + #include "GThreads.h" + #include "GException.h" + #include "DjVuMessageLite.h" ++ ++#include + #include + #include + +diff --git a/libdjvu/GURL.cpp b/libdjvu/GURL.cpp +index c37bf52..a80078c 100644 +--- a/libdjvu/GURL.cpp ++++ b/libdjvu/GURL.cpp +@@ -72,6 +72,7 @@ + #include "GURL.h" + #include "debug.h" + ++#include + #include + #include + #include +diff --git a/libdjvu/GUnicode.cpp b/libdjvu/GUnicode.cpp +index 415c081..a8b25b8 100644 +--- a/libdjvu/GUnicode.cpp ++++ b/libdjvu/GUnicode.cpp +@@ -62,6 +62,8 @@ + + #include "GString.h" + ++#include ++ + #if HAS_ICONV + #include + #endif +diff --git a/libdjvu/IFFByteStream.h b/libdjvu/IFFByteStream.h +index a653f8c..e31b216 100644 +--- a/libdjvu/IFFByteStream.h ++++ b/libdjvu/IFFByteStream.h +@@ -124,6 +124,7 @@ + + + #include "DjVuGlobal.h" ++#include + #include + #include + #include +diff --git a/libdjvu/IW44EncodeCodec.cpp b/libdjvu/IW44EncodeCodec.cpp +index 8d7b12c..49081b7 100644 +--- a/libdjvu/IW44EncodeCodec.cpp ++++ b/libdjvu/IW44EncodeCodec.cpp +@@ -76,6 +76,7 @@ + #include "IFFByteStream.h" + #include "GRect.h" + ++#include + #include + #include + #include +diff --git a/libdjvu/IW44Image.cpp b/libdjvu/IW44Image.cpp +index 9476726..4a19fb5 100644 +--- a/libdjvu/IW44Image.cpp ++++ b/libdjvu/IW44Image.cpp +@@ -76,6 +76,7 @@ + #include "IFFByteStream.h" + #include "GRect.h" + ++#include + #include + #include + #include +diff --git a/libdjvu/JPEGDecoder.h b/libdjvu/JPEGDecoder.h +index bd430a0..fad1d4c 100644 +--- a/libdjvu/JPEGDecoder.h ++++ b/libdjvu/JPEGDecoder.h +@@ -64,6 +64,7 @@ + + #ifdef NEED_JPEG_DECODER + ++#include + #include + #include + +diff --git a/libdjvu/MMX.cpp b/libdjvu/MMX.cpp +index 5ab60bb..528dab6 100644 +--- a/libdjvu/MMX.cpp ++++ b/libdjvu/MMX.cpp +@@ -62,6 +62,7 @@ + + #include "MMX.h" + #include ++#include + #include + + +diff --git a/libdjvu/UnicodeByteStream.h b/libdjvu/UnicodeByteStream.h +index 0ae112b..9b49a17 100644 +--- a/libdjvu/UnicodeByteStream.h ++++ b/libdjvu/UnicodeByteStream.h +@@ -88,6 +88,7 @@ + #include "GString.h" + #include "ByteStream.h" + ++#include + + #ifdef HAVE_NAMESPACES + namespace DJVU { +diff --git a/libdjvu/XMLParser.cpp b/libdjvu/XMLParser.cpp +index 84386c5..7da923a 100644 +--- a/libdjvu/XMLParser.cpp ++++ b/libdjvu/XMLParser.cpp +@@ -75,6 +75,7 @@ + #include "debug.h" + #include + #include ++#include + #include + + +diff --git a/libdjvu/ZPCodec.cpp b/libdjvu/ZPCodec.cpp +index f6e971d..ff5b9bf 100644 +--- a/libdjvu/ZPCodec.cpp ++++ b/libdjvu/ZPCodec.cpp +@@ -66,6 +66,8 @@ + #include "ZPCodec.h" + #include "ByteStream.h" + #include "GException.h" ++ ++#include + #include + #include + #include +diff --git a/libdjvu/atomic.cpp b/libdjvu/atomic.cpp +index bdc193e..63fd483 100644 +--- a/libdjvu/atomic.cpp ++++ b/libdjvu/atomic.cpp +@@ -28,6 +28,7 @@ + # include "config.h" + #endif + ++#include + #include + #include + #include "atomic.h" +diff --git a/libdjvu/ddjvuapi.cpp b/libdjvu/ddjvuapi.cpp +index b18b84b..f40f5aa 100644 +--- a/libdjvu/ddjvuapi.cpp ++++ b/libdjvu/ddjvuapi.cpp +@@ -60,6 +60,7 @@ + # pragma implementation "ddjvuapi.h" + #endif + ++#include + #include + #include + #include +diff --git a/libdjvu/ddjvuapi.h b/libdjvu/ddjvuapi.h +index d0ed48f..841f223 100644 +--- a/libdjvu/ddjvuapi.h ++++ b/libdjvu/ddjvuapi.h +@@ -64,6 +64,7 @@ extern "C" { + } + #endif + ++#include + #include + #include + +diff --git a/libdjvu/miniexp.cpp b/libdjvu/miniexp.cpp +index e0fb087..fc51297 100644 +--- a/libdjvu/miniexp.cpp ++++ b/libdjvu/miniexp.cpp +@@ -23,6 +23,7 @@ + # pragma implementation "miniexp.h" + #endif + ++#include + #include + #include + #include +diff --git a/libdjvu/miniexp.h b/libdjvu/miniexp.h +index 91e345d..993005b 100644 +--- a/libdjvu/miniexp.h ++++ b/libdjvu/miniexp.h +@@ -38,7 +38,8 @@ extern "C" { + #ifndef MINILISPAPI + # define MINILISPAPI /**/ + #endif +- ++ ++#include + + /* -------------------------------------------------- */ + /* LISP EXPRESSIONS */ +diff --git a/tools/bzz.cpp b/tools/bzz.cpp +index ca092e1..2ebc7b9 100644 +--- a/tools/bzz.cpp ++++ b/tools/bzz.cpp +@@ -94,6 +94,7 @@ + #include "GURL.h" + #include "DjVuMessage.h" + #include ++#include + #include + + static const char *program = "(unknown)"; +diff --git a/tools/c44.cpp b/tools/c44.cpp +index 6f23b53..855504b 100644 +--- a/tools/c44.cpp ++++ b/tools/c44.cpp +@@ -226,6 +226,7 @@ + #include + #include + #include ++#include + #include + + // command line data +diff --git a/tools/cjb2.cpp b/tools/cjb2.cpp +index 8cf89b9..11eb662 100644 +--- a/tools/cjb2.cpp ++++ b/tools/cjb2.cpp +@@ -120,6 +120,7 @@ + #include "jb2tune.h" + + #include ++#include + #include + #if HAVE_TIFF + #include +diff --git a/tools/cpaldjvu.cpp b/tools/cpaldjvu.cpp +index 111cbd3..b640a7a 100644 +--- a/tools/cpaldjvu.cpp ++++ b/tools/cpaldjvu.cpp +@@ -118,6 +118,7 @@ + #include "jb2tune.h" + + #include ++#include + #include + #include + +diff --git a/tools/csepdjvu.cpp b/tools/csepdjvu.cpp +index cd721f8..d5203d5 100644 +--- a/tools/csepdjvu.cpp ++++ b/tools/csepdjvu.cpp +@@ -162,6 +162,7 @@ + #include "jb2tune.h" + + #include ++#include + #include + + #undef MIN +diff --git a/tools/ddjvu.cpp b/tools/ddjvu.cpp +index 817e045..981a270 100644 +--- a/tools/ddjvu.cpp ++++ b/tools/ddjvu.cpp +@@ -62,6 +62,7 @@ + # include "config.h" + #endif + ++#include + #include + #include + #include +diff --git a/tools/djvm.cpp b/tools/djvm.cpp +index 951bd66..6ea88c2 100644 +--- a/tools/djvm.cpp ++++ b/tools/djvm.cpp +@@ -135,9 +135,9 @@ + #include "DjVuMessage.h" + + #include ++#include + #include + #include +-#include + + static const char * progname; + +diff --git a/tools/djvmcvt.cpp b/tools/djvmcvt.cpp +index 9ca1c54..20b468a 100644 +--- a/tools/djvmcvt.cpp ++++ b/tools/djvmcvt.cpp +@@ -144,6 +144,7 @@ + + #include + #include ++#include + #include + + static const char * progname; +diff --git a/tools/djvudump.cpp b/tools/djvudump.cpp +index 6a0215a..2dddbdf 100644 +--- a/tools/djvudump.cpp ++++ b/tools/djvudump.cpp +@@ -119,6 +119,7 @@ xxx + #include + #include + #include ++#include + #include + + void +diff --git a/tools/djvuextract.cpp b/tools/djvuextract.cpp +index 4a9f381..907b99c 100644 +--- a/tools/djvuextract.cpp ++++ b/tools/djvuextract.cpp +@@ -105,6 +105,7 @@ + #include "GOS.h" + #include "DjVuMessage.h" + #include ++#include + #include + + +diff --git a/tools/djvumake.cpp b/tools/djvumake.cpp +index 7020484..4c5fc0f 100644 +--- a/tools/djvumake.cpp ++++ b/tools/djvumake.cpp +@@ -153,6 +153,7 @@ + + #include + #include ++#include + #include + #include + +diff --git a/tools/djvups.cpp b/tools/djvups.cpp +index 51aa999..632b832 100644 +--- a/tools/djvups.cpp ++++ b/tools/djvups.cpp +@@ -57,6 +57,7 @@ + # include "config.h" + #endif + ++#include + #include + #include + #include +diff --git a/tools/djvused.cpp b/tools/djvused.cpp +index de84dcd..687fdca 100644 +--- a/tools/djvused.cpp ++++ b/tools/djvused.cpp +@@ -61,6 +61,7 @@ + #endif + + #include ++#include + #include + #include + #include +diff --git a/tools/djvuserve.cpp b/tools/djvuserve.cpp +index 19a17da..818fe78 100644 +--- a/tools/djvuserve.cpp ++++ b/tools/djvuserve.cpp +@@ -73,6 +73,7 @@ + + #include + #include ++#include + #include + #include + #include +diff --git a/tools/djvutxt.cpp b/tools/djvutxt.cpp +index ba2c745..9e9124c 100644 +--- a/tools/djvutxt.cpp ++++ b/tools/djvutxt.cpp +@@ -61,6 +61,7 @@ + # include "config.h" + #endif + ++#include + #include + #include + #include +diff --git a/tools/tiff2pdf.h b/tools/tiff2pdf.h +index 082f5fb..656dc43 100644 +--- a/tools/tiff2pdf.h ++++ b/tools/tiff2pdf.h +@@ -22,6 +22,7 @@ + # endif + # if HAVE_TIFF + # include ++# include + # include + # include + # include +diff --git a/xmltools/djvutoxml.cpp b/xmltools/djvutoxml.cpp +index 17c769b..b40535e 100644 +--- a/xmltools/djvutoxml.cpp ++++ b/xmltools/djvutoxml.cpp +@@ -71,6 +71,7 @@ + + #include + #include ++#include + #include + #include + #include +diff --git a/xmltools/djvuxmlparser.cpp b/xmltools/djvuxmlparser.cpp +index bdc5768..6679a9d 100644 +--- a/xmltools/djvuxmlparser.cpp ++++ b/xmltools/djvuxmlparser.cpp +@@ -70,6 +70,7 @@ + #include + #include + #include ++#include + #include + + static void From 26af8dea2264bc319788b62612c3e8da60471829 Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Thu, 5 Jan 2012 10:01:37 +0000 Subject: [PATCH 032/197] Add TODO.txt I've suggested adding such file on ML, and recieved no replies. So, I think that at least nobody objects this idea. OTOH, I'm not sure if somebody else will use this file. svn path=/nixpkgs/branches/stdenv-updates/; revision=31308 --- TODO.txt | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 TODO.txt diff --git a/TODO.txt b/TODO.txt new file mode 100644 index 00000000000..1b5fed54124 --- /dev/null +++ b/TODO.txt @@ -0,0 +1,11 @@ +This file contains list of tasks that should be done before merging +stdenv-updates back into trunk. Notation: +- TODO +* In progress ++ Done + +urkud: +- Remove HAL +- Remove old policykit +- Introduce libiconvOrNull and libiconvOrLibc instead of current 'magic' + From b93a8d3476c9534920bc3ce5ed0a5c1a17b26567 Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Thu, 5 Jan 2012 11:15:40 +0000 Subject: [PATCH 033/197] HAL and PolicyKit will be removed in trunk, see https://nixos.org/wiki/Deprecated_packages svn path=/nixpkgs/branches/stdenv-updates/; revision=31309 --- TODO.txt | 2 -- 1 file changed, 2 deletions(-) diff --git a/TODO.txt b/TODO.txt index 1b5fed54124..76f06274515 100644 --- a/TODO.txt +++ b/TODO.txt @@ -5,7 +5,5 @@ stdenv-updates back into trunk. Notation: + Done urkud: -- Remove HAL -- Remove old policykit - Introduce libiconvOrNull and libiconvOrLibc instead of current 'magic' From 72f2477f80dbb6c9ec4c80672c22cb644af88791 Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Thu, 5 Jan 2012 17:06:15 +0000 Subject: [PATCH 034/197] Use ocaml-3.12.1 by default ocaml-3.11.1 is broken in stdenv, so I made this change in stdenv without waiting for maintainer. Feel free to revert if you have a better solution. svn path=/nixpkgs/branches/stdenv-updates/; revision=31314 --- pkgs/top-level/all-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 41db7baa4bc..470d246e847 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2335,7 +2335,7 @@ let nvidia_cg_toolkit = callPackage ../development/compilers/nvidia-cg-toolkit { }; - ocaml = ocaml_3_11_1; + ocaml = ocaml_3_12_1; ocaml_3_08_0 = callPackage ../development/compilers/ocaml/3.08.0.nix { }; @@ -2428,7 +2428,7 @@ let }; }; - ocamlPackages = recurseIntoAttrs ocamlPackages_3_11_1; + ocamlPackages = recurseIntoAttrs ocamlPackages_3_12_1; ocamlPackages_3_10_0 = mkOcamlPackages ocaml_3_10_0 pkgs.ocamlPackages_3_10_0; ocamlPackages_3_11_1 = mkOcamlPackages ocaml_3_11_1 pkgs.ocamlPackages_3_11_1; ocamlPackages_3_12_1 = mkOcamlPackages ocaml_3_12_1 pkgs.ocamlPackages_3_12_1; From c96b647e300d657f081528d01d1debbeb63da74a Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Thu, 5 Jan 2012 17:06:25 +0000 Subject: [PATCH 035/197] Upgrade libwpd and libwpg to latest versions svn path=/nixpkgs/branches/stdenv-updates/; revision=31315 --- pkgs/development/libraries/libwpd/default.nix | 14 ++++++++------ pkgs/development/libraries/libwpg/default.nix | 9 +++++---- 2 files changed, 13 insertions(+), 10 deletions(-) diff --git a/pkgs/development/libraries/libwpd/default.nix b/pkgs/development/libraries/libwpd/default.nix index 78487a9f323..dc3f8b5352d 100644 --- a/pkgs/development/libraries/libwpd/default.nix +++ b/pkgs/development/libraries/libwpd/default.nix @@ -1,12 +1,14 @@ -{ stdenv, fetchurl, pkgconfig, glib, libgsf, libxml2, bzip2 }: +{ stdenv, fetchurl, pkgconfig, glib, libgsf, libxml2, xz }: -stdenv.mkDerivation { - name = "libwpd-0.8.14"; +stdenv.mkDerivation rec { + name = "libwpd-0.9.4"; src = fetchurl { - url = mirror://sourceforge/libwpd/libwpd-0.8.14.tar.gz; - sha256 = "1syli6i5ma10cwzpa61a18pyjmianjwsf6pvmvzsh5md6yk4yx01"; + url = "mirror://sourceforge/libwpd/${name}.tar.xz"; + sha256 = "0qba429cqd72nwn1mzpj7llyi3kwykb2lplcfxffvq8svzxyzkxy"; }; - buildInputs = [ pkgconfig glib libgsf libxml2 bzip2 ]; + buildInputs = [ glib libgsf libxml2 ]; + + buildNativeInputs = [ pkgconfig xz ]; } diff --git a/pkgs/development/libraries/libwpg/default.nix b/pkgs/development/libraries/libwpg/default.nix index 14c34eaf419..d140b8b8a0c 100644 --- a/pkgs/development/libraries/libwpg/default.nix +++ b/pkgs/development/libraries/libwpg/default.nix @@ -1,14 +1,15 @@ { stdenv, fetchurl, pkgconfig, libwpd }: stdenv.mkDerivation rec { - name = "libwpg-0.1.3"; + name = "libwpg-0.2.1"; src = fetchurl { - url = "mirror://sourceforge/libwpg/${name}.tar.bz2"; - sha256 = "086mgy36mia76mpfa2qgn0q44b3aigvvng9snzrxh60v3v9wixa7"; + url = "mirror://sourceforge/libwpg/${name}.tar.xz"; + sha256 = "0d83nx4rxkrq2sbfbbqpddni56h1328dzmraxyl6vh9p4f19rh5d"; }; - buildInputs = [ pkgconfig libwpd ]; + buildInputs = [ libwpd ]; + buildNativeInputs = [ pkgconfig ]; meta = { homepage = http://libwpg.sourceforge.net; From 10fd822319356efcc5bc3fa71a56894824541ec5 Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Fri, 6 Jan 2012 09:41:22 +0000 Subject: [PATCH 036/197] Fix typo Introduced while merging trunk svn path=/nixpkgs/branches/stdenv-updates/; revision=31339 --- pkgs/development/libraries/openssl/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix index 5301a449a81..241f9154462 100644 --- a/pkgs/development/libraries/openssl/default.nix +++ b/pkgs/development/libraries/openssl/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation { ]) ++ (stdenv.lib.optional stdenv.isDarwin ./darwin-arch.patch) - ++ stdenv.lib.optional (stdenv.system == "x86_64-freebsd") ./freebsd-x86_64-asm.patch;; + ++ stdenv.lib.optional (stdenv.system == "x86_64-freebsd") ./freebsd-x86_64-asm.patch; buildNativeInputs = [ perl ]; From 0b90cd41b2fe467f53d9a082c91e6f6438ba6a2b Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Fri, 6 Jan 2012 09:41:43 +0000 Subject: [PATCH 037/197] Add gnome3.{glib_networking,gsettings_desktop_schemas} svn path=/nixpkgs/branches/stdenv-updates/; revision=31340 --- pkgs/desktops/gnome-3/default.nix | 4 ++++ .../gnome-3/platform/glib-networking.nix | 22 +++++++++++++++++++ .../platform/gsettings-desktop-schemas.nix | 13 +++++++++++ 3 files changed, 39 insertions(+) create mode 100644 pkgs/desktops/gnome-3/platform/glib-networking.nix create mode 100644 pkgs/desktops/gnome-3/platform/gsettings-desktop-schemas.nix diff --git a/pkgs/desktops/gnome-3/default.nix b/pkgs/desktops/gnome-3/default.nix index b82ca22d94f..30ce2f6abcc 100644 --- a/pkgs/desktops/gnome-3/default.nix +++ b/pkgs/desktops/gnome-3/default.nix @@ -4,5 +4,9 @@ # Ensure that we use dbus-glib built with gtkLibs3x.glib dbus_glib = callPackage ../../development/libraries/dbus-glib { }; + glib_networking = callPackage ./platform/glib-networking.nix {}; + + gsettings_desktop_schemas = callPackage ./platform/gsettings-desktop-schemas.nix {}; + GConf = callPackage ./platform/GConf.nix { }; } diff --git a/pkgs/desktops/gnome-3/platform/glib-networking.nix b/pkgs/desktops/gnome-3/platform/glib-networking.nix new file mode 100644 index 00000000000..ed28306d510 --- /dev/null +++ b/pkgs/desktops/gnome-3/platform/glib-networking.nix @@ -0,0 +1,22 @@ +{ stdenv, fetchurl, glib, xz, pkgconfig, intltool, gnutls, libgcrypt +, gsettings_desktop_schemas }: + +stdenv.mkDerivation rec { + name = "glib-networking-2.30.2"; + + src = fetchurl { + url = mirror://gnome/sources/glib-networking/2.30/glib-networking-2.30.2.tar.xz; + sha256 = "1g2ran0rn37009fs3xl38m95i5w8sdf9ax0ady4jbjir15844xcz"; + }; + + propagatedBuildInputs = [ glib gnutls libgcrypt ]; + buildInputs = [ gsettings_desktop_schemas ]; + buildNativeInputs = [ xz pkgconfig intltool ]; + + configureFlags = "--without-ca-certificates"; + postConfigure = "export makeFlags=GIO_MODULE_DIR=$out/${glib.gioModuleDir}"; + + meta = { + TODO = "Look at `--without-ca-certificates` again"; + }; +} diff --git a/pkgs/desktops/gnome-3/platform/gsettings-desktop-schemas.nix b/pkgs/desktops/gnome-3/platform/gsettings-desktop-schemas.nix new file mode 100644 index 00000000000..1d099d3dea3 --- /dev/null +++ b/pkgs/desktops/gnome-3/platform/gsettings-desktop-schemas.nix @@ -0,0 +1,13 @@ +{ stdenv, fetchurl, xz, glib, pkgconfig, intltool }: + +stdenv.mkDerivation rec { + name = "gsettings-desktop-schemas-3.2.0"; + + src = fetchurl { + url = mirror://gnome/sources/gsettings-desktop-schemas/3.2/gsettings-desktop-schemas-3.2.0.tar.xz; + sha256 = "0772axkd1nlf3j1lcg0zi5x5jh4zmr25k98dhn7pzppahljaj3hi"; + }; + + buildInputs = [ glib ]; + buildNativeInputs = [ pkgconfig xz intltool ]; +} From bd7fe12cefe07b03a81e724de3bf55f12c4822e8 Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Mon, 16 Jan 2012 17:39:40 +0000 Subject: [PATCH 038/197] Use qt-4.8 by default svn path=/nixpkgs/branches/stdenv-updates/; revision=31596 --- pkgs/desktops/kde-4.7/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/kde-4.7/default.nix b/pkgs/desktops/kde-4.7/default.nix index 3bdf825410c..6abcc02139d 100644 --- a/pkgs/desktops/kde-4.7/default.nix +++ b/pkgs/desktops/kde-4.7/default.nix @@ -1,4 +1,4 @@ -{ callPackage, callPackageOrig, stdenv, qt47 }: +{ callPackage, callPackageOrig, stdenv, qt48 }: let release = "4.7.4"; @@ -44,7 +44,7 @@ kde.modules // kde.individual // akonadi = callPackage ./support/akonadi { }; - qt4 = qt47; + qt4 = qt48; kdebase_workspace = kde.modules.kde_workspace; From c7a1f309a7cc7b8b42138e52ae6172631d465b51 Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Mon, 16 Jan 2012 17:43:55 +0000 Subject: [PATCH 039/197] Backport some fixes from kde-4.8 svn path=/nixpkgs/branches/stdenv-updates/; revision=31597 --- pkgs/desktops/kde-4.7/kdeaccessibility/kmousetool.nix | 4 ++-- pkgs/desktops/kde-4.7/kdeartwork/kscreensaver.nix | 6 ++++-- pkgs/desktops/kde-4.7/kdegraphics/gwenview.nix | 7 +++++-- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/pkgs/desktops/kde-4.7/kdeaccessibility/kmousetool.nix b/pkgs/desktops/kde-4.7/kdeaccessibility/kmousetool.nix index 42306049c5d..8e0caa76ed9 100644 --- a/pkgs/desktops/kde-4.7/kdeaccessibility/kmousetool.nix +++ b/pkgs/desktops/kde-4.7/kdeaccessibility/kmousetool.nix @@ -1,7 +1,7 @@ -{ kde, kdelibs, libXtst }: +{ kde, kdelibs, libXtst, libXt }: kde { - buildInputs = [ kdelibs libXtst ]; + buildInputs = [ kdelibs libXtst libXt ]; meta = { description = "A program that clicks the mouse for you"; diff --git a/pkgs/desktops/kde-4.7/kdeartwork/kscreensaver.nix b/pkgs/desktops/kde-4.7/kdeartwork/kscreensaver.nix index cc195c8de90..72676e35f71 100644 --- a/pkgs/desktops/kde-4.7/kdeartwork/kscreensaver.nix +++ b/pkgs/desktops/kde-4.7/kdeartwork/kscreensaver.nix @@ -1,7 +1,9 @@ -{ kde, kdelibs, xscreensaver, kde_workspace, eigen, libkexiv2 }: +{ kde, kdelibs, xscreensaver, kde_workspace, eigen, libkexiv2, libXt, pkgconfig }: kde { - buildInputs = [ kdelibs xscreensaver kde_workspace eigen libkexiv2 ]; + buildInputs = [ kdelibs xscreensaver kde_workspace eigen libkexiv2 libXt ]; + + buildNativeInputs = [ pkgconfig ]; preConfigure = "cp -v ${./FindXscreensaver.cmake} cmake/modules/FindXscreensaver.cmake"; diff --git a/pkgs/desktops/kde-4.7/kdegraphics/gwenview.nix b/pkgs/desktops/kde-4.7/kdegraphics/gwenview.nix index efc2707e7d6..b6b659c3947 100644 --- a/pkgs/desktops/kde-4.7/kdegraphics/gwenview.nix +++ b/pkgs/desktops/kde-4.7/kdegraphics/gwenview.nix @@ -1,9 +1,12 @@ -{ kde, kdelibs, exiv2, shared_desktop_ontologies, kde_baseapps, libkipi }: +{ kde, kdelibs, exiv2, shared_desktop_ontologies, kde_baseapps, libkipi +, libjpeg, pkgconfig }: kde { buildInputs = - [ kdelibs exiv2 shared_desktop_ontologies kde_baseapps libkipi ]; + [ kdelibs exiv2 shared_desktop_ontologies kde_baseapps libkipi libjpeg ]; + + buildNativeInputs = [ pkgconfig ]; meta = { description = "Gwenview, the KDE image viewer"; From e6d6520a56fd9cefb5e3a7ccc8d0a6174bf65a5d Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 18 Jan 2012 17:14:18 +0000 Subject: [PATCH 040/197] * Update libsigc++ to get it to build again (http://hydra.nixos.org/build/1803247). svn path=/nixpkgs/branches/stdenv-updates/; revision=31637 --- pkgs/development/libraries/libsigcxx/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/libsigcxx/default.nix b/pkgs/development/libraries/libsigcxx/default.nix index 6d19ce55d3d..c8aa87b26e0 100644 --- a/pkgs/development/libraries/libsigcxx/default.nix +++ b/pkgs/development/libraries/libsigcxx/default.nix @@ -1,14 +1,14 @@ -{stdenv, fetchurl, pkgconfig}: +{ stdenv, fetchurl, pkgconfig, gnum4 }: stdenv.mkDerivation rec { - name = "libsigc++-2.2.3"; + name = "libsigc++-2.2.10"; src = fetchurl { - url = "http://ftp.gnome.org/pub/GNOME/sources/libsigc++/2.2/${name}.tar.bz2"; - sha256 = "0hjh7834mbp2n5qnc7n1r3l70j9g06ibv7kbmhix9b101w6ypnak"; + url = "http://ftp.gnome.org/pub/GNOME/sources/libsigc++/2.2/${name}.tar.xz"; + sha256 = "8ceb6f2732f5399ef50d5b70f433d49945a12e0900b8f9f43c135866a2e5bf47"; }; - buildInputs = [pkgconfig]; + buildInputs = [ pkgconfig gnum4 ]; meta = { homepage = http://libsigc.sourceforge.net/; From 03fb0e59efd37c9abdc40e101eb8834635a70418 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 18 Jan 2012 18:43:34 +0000 Subject: [PATCH 041/197] * Fix GHC. The bootstrap binaries depend on libgmp.so.3, which is provided by GMP 4 but not GMP 5. svn path=/nixpkgs/branches/stdenv-updates/; revision=31639 --- pkgs/development/libraries/gmp/4.nix | 22 ++++------------------ pkgs/top-level/all-packages.nix | 19 +++++++++++-------- 2 files changed, 15 insertions(+), 26 deletions(-) diff --git a/pkgs/development/libraries/gmp/4.nix b/pkgs/development/libraries/gmp/4.nix index 4473e28585d..d25b6941153 100644 --- a/pkgs/development/libraries/gmp/4.nix +++ b/pkgs/development/libraries/gmp/4.nix @@ -1,10 +1,6 @@ -{stdenv, fetchurl, m4, cxx ? true, static ? false}: +{ stdenv, fetchurl, m4, cxx ? true }: -let - staticFlags = if static then " --enable-static --disable-shared" else ""; -in - -stdenv.mkDerivation (rec { +stdenv.mkDerivation rec { name = "gmp-4.3.2"; src = fetchurl { @@ -12,7 +8,7 @@ stdenv.mkDerivation (rec { sha256 = "0x8prpqi9amfcmi7r4zrza609ai9529pjaq0h4aw51i867064qck"; }; - buildNativeInputs = [m4]; + buildNativeInputs = [ m4 ]; # Prevent the build system from using sub-architecture-specific # instructions (e.g., SSE2 on i686). @@ -25,10 +21,7 @@ stdenv.mkDerivation (rec { then "ln -sf configfsf.guess config.guess" else ''echo "Darwin host is `./config.guess`."''; - configureFlags = (if cxx then "--enable-cxx" else "--disable-cxx") + - staticFlags; - - dontDisableStatic = if static then true else false; + configureFlags = if cxx then "--enable-cxx" else "--disable-cxx"; doCheck = true; @@ -64,10 +57,3 @@ stdenv.mkDerivation (rec { platforms = stdenv.lib.platforms.all; }; } - -// - -# Don't run the native `strip' when cross-compiling. -(if (stdenv ? cross) - then { dontStrip = true; } - else { })) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2e0c263c330..a74ed18fd4c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2119,20 +2119,20 @@ let }); */ - ghc6101Binary = lowPrio (import ../development/compilers/ghc/6.10.1-binary.nix { - inherit fetchurl stdenv perl ncurses gmp libedit; + ghc6101Binary = lowPrio (callPackage ../development/compilers/ghc/6.10.1-binary.nix { + gmp = gmp4; }); - ghc6102Binary = lowPrio (import ../development/compilers/ghc/6.10.2-binary.nix { - inherit fetchurl stdenv perl ncurses gmp libedit; + ghc6102Binary = lowPrio (callPackage ../development/compilers/ghc/6.10.2-binary.nix { + gmp = gmp4; }); - ghc6121Binary = lowPrio (import ../development/compilers/ghc/6.12.1-binary.nix { - inherit fetchurl stdenv perl ncurses gmp; + ghc6121Binary = lowPrio (callPackage ../development/compilers/ghc/6.12.1-binary.nix { + gmp = gmp4; }); - ghc704Binary = lowPrio (import ../development/compilers/ghc/7.0.4-binary.nix { - inherit fetchurl stdenv perl ncurses gmp; + ghc704Binary = lowPrio (callPackage ../development/compilers/ghc/7.0.4-binary.nix { + gmp = gmp4; }); # For several compiler versions, we export a large set of Haskell-related @@ -3585,6 +3585,9 @@ let gmpxx = appendToName "with-cxx" (gmp.override { cxx = true; }); + # The GHC bootstrap binaries link against libgmp.so.3, which is in GMP 4.x. + gmp4 = callPackage ../development/libraries/gmp/4.nix { }; + gobjectIntrospection = callPackage ../development/libraries/gobject-introspection { }; goffice = callPackage ../development/libraries/goffice { From 01f48c7fc1b73a544017bb2b0303b8b59d26cafb Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 18 Jan 2012 19:44:16 +0000 Subject: [PATCH 042/197] * Fix "most". Not clear how passing "-ncurses" to the linker ever worked. svn path=/nixpkgs/branches/stdenv-updates/; revision=31641 --- pkgs/tools/misc/most/default.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/misc/most/default.nix b/pkgs/tools/misc/most/default.nix index 98e5d5c25af..941d805a6ff 100644 --- a/pkgs/tools/misc/most/default.nix +++ b/pkgs/tools/misc/most/default.nix @@ -1,22 +1,23 @@ -{stdenv, fetchurl, slang}: +{ stdenv, fetchurl, slang, ncurses }: stdenv.mkDerivation { name = "most-5.0.0"; src = fetchurl { - url = ftp://space.mit.edu/pub/davis/most/most-5.0.0.tar.bz2; - sha256 = "1f5x7rvjg89b5klfqs1gb91jmbnd3fy08d8rwgdvgg0plqkxr7ja"; + url = ftp://space.mit.edu/pub/davis/most/most-5.0.0.tar.bz2; + sha256 = "1f5x7rvjg89b5klfqs1gb91jmbnd3fy08d8rwgdvgg0plqkxr7ja"; }; preConfigure = '' - sed -i -e "s|-ltermcap|-ncurses|" configure + sed -i -e "s|-ltermcap|-lncurses|" configure sed -i autoconf/Makefile.in src/Makefile.in \ -e "s|/bin/cp|cp|" \ -e "s|/bin/rm|rm|" ''; + configureFlags = "--with-slang=${slang}"; - buildInputs = [ slang ]; + buildInputs = [ slang ncurses ]; meta = { description = '' From 923054c92433960dabe923a6328af873b8625a8f Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 18 Jan 2012 19:47:39 +0000 Subject: [PATCH 043/197] * Fix libvirt. svn path=/nixpkgs/branches/stdenv-updates/; revision=31642 --- pkgs/development/libraries/libvirt/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libvirt/default.nix b/pkgs/development/libraries/libvirt/default.nix index bf4d858f023..2e7e4a57e9f 100644 --- a/pkgs/development/libraries/libvirt/default.nix +++ b/pkgs/development/libraries/libvirt/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation { patchShebangs . # fixes /usr/bin/python references ''; - configureFlags = "--localstatedir=/var --sysconfdir=/etc --with-init-script=redhat"; + configureFlags = "--localstatedir=/var --sysconfdir=/etc --with-init-script=redhat --without-macvtap"; installFlags = "localstatedir=$(TMPDIR)/var sysconfdir=$(out)/etc"; From f7159c195a623c311829c38c40ef010ac6e943f7 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 18 Jan 2012 20:09:26 +0000 Subject: [PATCH 044/197] * coreutils 8.15. svn path=/nixpkgs/branches/stdenv-updates/; revision=31643 --- pkgs/tools/misc/coreutils/default.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/misc/coreutils/default.nix b/pkgs/tools/misc/coreutils/default.nix index b1a740ab5f9..7a69f01dad2 100644 --- a/pkgs/tools/misc/coreutils/default.nix +++ b/pkgs/tools/misc/coreutils/default.nix @@ -7,12 +7,12 @@ assert aclSupport -> acl != null; assert selinuxSupport -> ( (libselinux != null) && (libsepol != null) ); -stdenv.mkDerivation (rec { - name = "coreutils-8.14"; +stdenv.mkDerivation rec { + name = "coreutils-8.15"; src = fetchurl { url = "mirror://gnu/coreutils/${name}.tar.xz"; - sha256 = "0bdh31fvd0ng2sqrrbz0a4yy084hmj76pbljksqyv4ljq4bhh4hd"; + sha256 = "176lgw810xw84c6fz5xwhydxggkndmzggl0pxqzldbjf85vv6zl3"; }; buildNativeInputs = [ perl xz ]; @@ -43,6 +43,8 @@ stdenv.mkDerivation (rec { enableParallelBuilding = true; + NIX_LDFLAGS = stdenv.lib.optionalString selinuxSupport "-lsepol"; + meta = { homepage = http://www.gnu.org/software/coreutils/; description = "The basic file, shell and text manipulation utilities of the GNU operating system"; @@ -58,5 +60,5 @@ stdenv.mkDerivation (rec { maintainers = [ stdenv.lib.maintainers.ludo ]; }; -} // (if selinuxSupport then { NIX_LDFLAGS = "-lsepol"; } else { } ) ) +} From c556a6ea46e71e1907d78b71fab36df30297b3ad Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 18 Jan 2012 20:16:00 +0000 Subject: [PATCH 045/197] * "ensureDir" -> "mkdir -p". "ensureDir" is a rather pointless function, so obsolete it. svn path=/nixpkgs/branches/stdenv-updates/; revision=31644 --- doc/stdenv.xml | 12 ++------- maintainers/docs/cross.txt | 6 ++--- pkgs/applications/audio/ardour/default.nix | 2 +- pkgs/applications/audio/gmu/default.nix | 2 +- pkgs/applications/audio/id3v2/default.nix | 2 +- .../audio/ladspa-plugins/default.nix | 2 +- .../audio/ladspa-plugins/ladspah.nix | 2 +- pkgs/applications/audio/mp3info/default.nix | 4 +-- pkgs/applications/audio/mpc123/default.nix | 2 +- pkgs/applications/audio/snd/default.nix | 2 +- .../audio/sonic-visualiser/default.nix | 2 +- pkgs/applications/audio/vkeybd/default.nix | 2 +- .../audio/xsynth-dssi/default.nix | 4 +-- pkgs/applications/editors/eclipse/default.nix | 4 +-- pkgs/applications/editors/elvis/default.nix | 6 ++--- .../editors/emacs-modes/bbdb/default.nix | 2 +- .../editors/emacs-modes/cedet/default.nix | 4 +-- .../editors/emacs-modes/ecb/default.nix | 4 +-- .../editors/emacs-modes/emms/default.nix | 4 +-- .../editors/emacs-modes/haskell/default.nix | 2 +- .../editors/emacs-modes/hol_light/default.nix | 2 +- .../editors/emacs-modes/jdee/default.nix | 4 +-- .../editors/emacs-modes/org/default.nix | 4 +-- .../editors/emacs-modes/quack/default.nix | 2 +- .../editors/emacs-modes/rudel/default.nix | 2 +- .../emacs-modes/scala-mode/default.nix | 2 +- .../session-management-for-emacs/default.nix | 2 +- pkgs/applications/editors/jedit/default.nix | 14 +++++----- pkgs/applications/editors/jedit/wrapper.nix | 2 +- pkgs/applications/editors/nedit/builder.sh | 2 +- pkgs/applications/editors/nvi/default.nix | 4 +-- .../graphics/gimp/plugins/default.nix | 10 +++---- pkgs/applications/graphics/hugin/default.nix | 2 +- pkgs/applications/graphics/jbrout/default.nix | 2 +- .../applications/graphics/meshlab/default.nix | 2 +- .../graphics/minidjvu/default.nix | 2 +- pkgs/applications/graphics/pinta/default.nix | 2 +- .../graphics/rawtherapee/default.nix | 2 +- pkgs/applications/graphics/wings/default.nix | 2 +- pkgs/applications/graphics/xaos/default.nix | 2 +- .../applications/misc/adobe-reader/builder.sh | 4 +-- .../misc/audio/wavesurfer/default.nix | 2 +- pkgs/applications/misc/bitcoin/default.nix | 2 +- pkgs/applications/misc/blender/2.49.nix | 2 +- pkgs/applications/misc/freemind/default.nix | 2 +- .../applications/misc/get_iplayer/default.nix | 2 +- .../applications/misc/googleearth/default.nix | 2 +- .../applications/misc/jbidwatcher/default.nix | 2 +- pkgs/applications/misc/makeself/default.nix | 2 +- pkgs/applications/misc/navipowm/default.nix | 2 +- pkgs/applications/misc/openjump/default.nix | 2 +- pkgs/applications/misc/procmail/default.nix | 2 +- pkgs/applications/misc/pstree/default.nix | 2 +- pkgs/applications/misc/qcad/default.nix | 2 +- .../misc/rxvt_unicode/default.nix | 2 +- pkgs/applications/misc/sbagen/default.nix | 2 +- .../misc/thinking-rock/default.nix | 2 +- pkgs/applications/misc/vue/default.nix | 2 +- pkgs/applications/misc/xpdf/libxpdf.nix | 8 +++--- .../networking/browsers/chromium/default.nix | 4 +-- .../networking/browsers/firefox/wrapper.nix | 2 +- .../networking/browsers/icecat-3/default.nix | 2 +- .../mozilla-plugins/flashplayer-10/builder.sh | 2 +- .../mozilla-plugins/flashplayer-11/builder.sh | 2 +- .../mozilla-plugins/flashplayer-9/builder.sh | 2 +- .../mozilla-plugins/mozplugger/default.nix | 2 +- .../mplayerplug-in/default.nix | 2 +- .../instant-messengers/carrier/2.4.2.nix | 2 +- .../instant-messengers/carrier/2.5.0.nix | 2 +- .../instant-messengers/oneteam/default.nix | 6 ++--- .../pidgin-plugins/msn-pecan/default.nix | 2 +- .../pidgin-latex/pidgin-latex-sf.nix | 6 ++--- .../instant-messengers/psi/default.nix | 4 +-- .../instant-messengers/psi/psimedia.nix | 2 +- .../instant-messengers/torchat/default.nix | 2 +- .../networking/iptraf/default.nix | 2 +- .../mailreaders/thunderbird/9.x.nix | 2 +- .../networking/mumble/default.nix | 2 +- .../networking/offrss/default.nix | 2 +- .../networking/p2p/ldcpp/default.nix | 2 +- .../networking/p2p/mldonkey/default.nix | 2 +- .../applications/networking/pjsip/default.nix | 4 +-- .../applications/networking/skype/default.nix | 4 +-- .../networking/sync/unison/default.nix | 2 +- .../networking/vnstat/default.nix | 2 +- .../office/impressive/default.nix | 2 +- pkgs/applications/office/mmex/default.nix | 2 +- .../applications/office/openoffice/builder.sh | 4 +-- .../office/openoffice/get-go-src.nix | 2 +- pkgs/applications/office/openoffice/go-oo.nix | 2 +- .../science/biology/arb/default.nix | 8 +++--- .../science/biology/pal2nal/default.nix | 4 +-- .../science/biology/slr/default.nix | 2 +- .../science/geometry/tetgen/default.nix | 2 +- .../science/logic/hol/default.nix | 4 +-- .../science/logic/hol_light/default.nix | 2 +- .../science/logic/iprover/default.nix | 4 +-- .../science/logic/isabelle/default.nix | 2 +- .../science/logic/leo2/default.nix | 6 ++--- .../science/logic/matita/default.nix | 2 +- .../science/logic/minisat/default.nix | 2 +- .../science/logic/picosat/default.nix | 6 ++--- .../science/logic/prover9/default.nix | 2 +- .../science/logic/satallax/default.nix | 6 ++--- .../science/logic/ssreflect/default.nix | 2 +- .../science/logic/tptp/default.nix | 4 +-- .../science/math/content/default.nix | 2 +- .../science/math/eukleides/default.nix | 2 +- .../science/math/maxima/default.nix | 2 +- .../science/math/msieve/default.nix | 2 +- .../science/math/singular/default.nix | 2 +- .../taxes/aangifte-2005/builder.sh | 2 +- .../taxes/aangifte-2006/builder.sh | 2 +- .../taxes/aangifte-2007/builder.sh | 2 +- .../taxes/aangifte-2008/builder.sh | 2 +- .../taxes/aangifte-2009/default.nix | 2 +- .../taxes/aangifte-2010/default.nix | 2 +- .../version-management/fossil/default.nix | 2 +- .../git-and-tools/fast-export/default.nix | 2 +- .../git-and-tools/git/default.nix | 6 ++--- .../git-and-tools/git/git-git.nix | 4 +-- .../git-and-tools/stgit/default.nix | 2 +- .../git-and-tools/topgit/default.nix | 4 +-- .../version-management/mercurial/default.nix | 4 +-- .../version-management/monotone/default.nix | 4 +-- .../version-management/veracity/default.nix | 10 +++---- .../version-management/viewmtn/0.10.nix | 6 ++--- pkgs/applications/video/RealPlayer/builder.sh | 4 +-- pkgs/applications/video/dvswitch/default.nix | 2 +- pkgs/applications/video/gnash/default.nix | 2 +- pkgs/applications/video/lxdvdrip/default.nix | 2 +- pkgs/applications/video/mythtv/builder.sh | 2 +- .../virtualization/qemu/linux-img/default.nix | 2 +- .../virtualization/virtualbox/default.nix | 6 ++--- .../virtualbox/guest-additions/default.nix | 16 ++++++------ .../window-managers/stumpwm/default.nix | 8 +++--- .../window-managers/vwm/default.nix | 2 +- .../window-managers/wmii31/default.nix | 2 +- .../builder-defs/builder-defs.nix | 26 +++++++++---------- pkgs/build-support/clang-wrapper/builder.sh | 4 +-- .../dotnetenv/build-solution.nix | 4 +-- pkgs/build-support/fetchcvs/builder.sh | 2 +- .../gcc-cross-wrapper/default.nix | 2 +- pkgs/build-support/gcc-upc-wrapper/builder.sh | 4 +-- pkgs/build-support/gcc-wrapper/builder.sh | 4 +-- pkgs/build-support/kernel/make-initrd.sh | 2 +- pkgs/build-support/kernel/modules-closure.sh | 2 +- .../make-desktopitem/default.nix | 2 +- .../make-wrapper/make-wrapper.sh | 2 +- .../native-darwin-cctools-wrapper/builder.sh | 2 +- pkgs/build-support/nuke-references/builder.sh | 2 +- pkgs/build-support/release/ant-build.nix | 6 ++--- pkgs/build-support/release/binary-tarball.nix | 4 +-- pkgs/build-support/release/debian-build.nix | 4 +-- pkgs/build-support/release/maven-build.nix | 4 +-- pkgs/build-support/release/nix-build.nix | 4 +-- pkgs/build-support/release/rpm-build.nix | 2 +- pkgs/build-support/release/source-tarball.nix | 4 +-- .../substitute/substitute-all.sh | 2 +- pkgs/build-support/trivial-builders.nix | 2 +- .../upstream-updater/attrset-to-dir.nix | 2 +- pkgs/build-support/vm/default.nix | 14 +++++----- pkgs/build-support/vsenv/build-solution.nix | 2 +- .../pthread-man-pages/default.nix | 2 +- pkgs/data/documentation/rnrs/builder.sh | 4 +-- .../documentation/std-man-pages/default.nix | 2 +- pkgs/data/fonts/andagii/default.nix | 2 +- pkgs/data/fonts/bakoma-ttf/default.nix | 2 +- pkgs/data/fonts/clearlyU/default.nix | 2 +- pkgs/data/fonts/corefonts/default.nix | 2 +- pkgs/data/fonts/dejavu-fonts/default.nix | 4 +-- pkgs/data/fonts/fontWrap/default.nix | 2 +- pkgs/data/fonts/freefont-ttf/default.nix | 2 +- pkgs/data/fonts/junicode/default.nix | 2 +- pkgs/data/fonts/lmodern/default.nix | 4 +-- pkgs/data/fonts/mph-2b-damase/default.nix | 2 +- .../fonts/redhat-liberation-fonts/default.nix | 4 +-- .../data/fonts/ttf-bitstream-vera/default.nix | 2 +- pkgs/data/fonts/unifont/default.nix | 2 +- pkgs/data/fonts/vista-fonts/default.nix | 2 +- pkgs/data/fonts/wqy-zenhei/default.nix | 2 +- pkgs/data/misc/cacert/default.nix | 2 +- .../sgml+xml/schemas/docbook-5.0/builder.sh | 8 +++--- .../schemas/xml-dtd/xhtml1/default.nix | 2 +- .../xslt/docbook-xsl-ns/default.nix | 2 +- .../stylesheets/xslt/docbook-xsl/builder.sh | 2 +- .../gnome-2/platform/gtk-doc/default.nix | 2 +- .../compilers/abc/builder-binjar.sh | 2 +- pkgs/development/compilers/abc/builder.sh | 4 +-- .../compilers/abc/jasmin/builder.sh | 2 +- .../compilers/abc/polyglot/builder.sh | 2 +- .../development/compilers/abc/soot/builder.sh | 2 +- .../compilers/adobe-flex-sdk/default.nix | 2 +- pkgs/development/compilers/aspectj/builder.sh | 2 +- pkgs/development/compilers/ccl/default.nix | 4 +-- pkgs/development/compilers/cmucl/binary.nix | 2 +- pkgs/development/compilers/eql/default.nix | 2 +- pkgs/development/compilers/fpc/lazarus.nix | 2 +- .../compilers/ghc/6.10.2-binary.nix | 4 +-- .../compilers/ghc/6.12.1-binary.nix | 2 +- .../compilers/ghc/6.4.2-binary.nix | 4 +-- pkgs/development/compilers/ghc/6.6.1.nix | 2 +- .../compilers/ghc/with-packages.nix | 6 ++--- pkgs/development/compilers/ghc/wrapper.nix | 4 +-- .../compilers/gnatboot/default.nix | 2 +- pkgs/development/compilers/go/default.nix | 6 ++--- pkgs/development/compilers/gwt/builder.sh | 4 +-- pkgs/development/compilers/haxe/default.nix | 4 +-- pkgs/development/compilers/jdk/builder.sh | 2 +- .../compilers/jdk/dlj-bundle-builder.sh | 2 +- pkgs/development/compilers/jdk/ibm-builder.sh | 2 +- pkgs/development/compilers/llvm/dragonegg.nix | 2 +- pkgs/development/compilers/neko/default.nix | 2 +- .../compilers/nvidia-cg-toolkit/default.nix | 10 +++---- pkgs/development/compilers/ocaml/3.10.0.nix | 2 +- pkgs/development/compilers/ocaml/3.11.1.nix | 2 +- pkgs/development/compilers/ocaml/3.12.1.nix | 2 +- .../compilers/ocaml/ber-metaocaml-003.nix | 2 +- .../compilers/ocaml/metaocaml-3.09.nix | 2 +- pkgs/development/compilers/opa/default.nix | 2 +- .../compilers/openjdk-darwin/default.nix | 2 +- .../development/compilers/openjdk/default.nix | 6 ++--- pkgs/development/compilers/pakcs/default.nix | 2 +- pkgs/development/compilers/qi/default.nix | 4 +-- pkgs/development/compilers/scala/default.nix | 2 +- pkgs/development/compilers/stalin/default.nix | 10 +++---- pkgs/development/compilers/tinycc/default.nix | 2 +- .../compilers/visual-c++/builder.sh | 4 +-- .../compilers/visual-c++/test/builder.sh | 2 +- .../compilers/vs90wrapper/default.nix | 2 +- .../development/interpreters/acl2/default.nix | 2 +- .../interpreters/angelscript/default.nix | 4 +-- .../interpreters/clojure/binary.nix | 2 +- .../interpreters/clojure/clooj.nix | 2 +- .../interpreters/clojure/default.nix | 2 +- .../interpreters/groovy/default.nix | 2 +- pkgs/development/interpreters/j/default.nix | 4 +-- .../interpreters/jruby/default.nix | 2 +- .../development/interpreters/kona/default.nix | 2 +- .../interpreters/lua-5/default.nix | 2 +- .../interpreters/maude/default.nix | 2 +- .../interpreters/perl/5.8/default.nix | 2 +- .../interpreters/php-xdebug/default.nix | 2 +- .../interpreters/picolisp/default.nix | 2 +- .../python/pythonhome-wrapper.nix | 2 +- .../interpreters/python/wrapper.nix | 2 +- .../interpreters/spidermonkey/builder.sh | 6 ++--- pkgs/development/libraries/Xaw3d/builder.sh | 2 +- pkgs/development/libraries/box2d/2.0.1.nix | 6 ++--- .../libraries/chipmunk/default.nix | 2 +- .../development/libraries/clapack/default.nix | 2 +- .../libraries/cminpack/default.nix | 2 +- .../libraries/dotnetfx35/default.nix | 2 +- .../libraries/dotnetfx40/default.nix | 2 +- pkgs/development/libraries/eglibc/builder.sh | 2 +- pkgs/development/libraries/glfw/default.nix | 2 +- .../libraries/glibc-2.13/default.nix | 2 +- .../development/libraries/glibc-2.13/info.nix | 2 +- .../libraries/glibc-2.13/locales.nix | 2 +- .../libraries/glibc-2.14/default.nix | 2 +- .../development/libraries/glibc-2.14/info.nix | 2 +- .../libraries/glibc-2.14/locales.nix | 2 +- .../libraries/glibc-2.9/default.nix | 2 +- pkgs/development/libraries/glibc-2.9/info.nix | 2 +- .../libraries/glibc-2.9/locales.nix | 2 +- pkgs/development/libraries/gsm/default.nix | 2 +- .../libraries/haskell/cabal/cabal.nix | 4 +-- pkgs/development/libraries/hawknl/default.nix | 2 +- .../libraries/iniparser/default.nix | 6 ++--- .../libraries/java/geoipjava/default.nix | 2 +- .../libraries/java/gwt-dragdrop/builder.sh | 2 +- .../libraries/java/gwt-widgets/builder.sh | 2 +- .../libraries/java/hsqldb/builder.sh | 2 +- .../java/hydra-ant-logger/default.nix | 2 +- .../libraries/java/jetty-gwt/default.nix | 2 +- .../libraries/java/jetty-util/default.nix | 2 +- .../libraries/java/rhino/default.nix | 4 +-- .../libraries/java/saxon/default8.nix | 2 +- .../libraries/java/smack/builder.sh | 2 +- .../development/libraries/java/swt/builder.sh | 4 +-- .../libraries/java/xalanj/default.nix | 2 +- .../libraries/java/xerces/default.nix | 2 +- pkgs/development/libraries/levmar/default.nix | 2 +- .../libraries/libdvdnav/default.nix | 2 +- .../libraries/libdvdread/default.nix | 2 +- pkgs/development/libraries/libf2c/default.nix | 2 +- .../libraries/libmilter/default.nix | 2 +- .../libraries/libopensc-dnie/default.nix | 2 +- .../development/libraries/libpcap/default.nix | 2 +- .../libraries/libpseudo/default.nix | 4 +-- .../libraries/libviper/default.nix | 4 +-- .../libraries/libvterm/default.nix | 4 +-- .../development/libraries/libxslt/default.nix | 2 +- pkgs/development/libraries/ncbi/default.nix | 2 +- .../libraries/opencascade/default.nix | 2 +- .../development/libraries/pdf2xml/default.nix | 2 +- .../development/libraries/postgis/default.nix | 2 +- .../libraries/qtscriptgenerator/default.nix | 2 +- .../science/math/liblapack/default.nix | 2 +- .../development/libraries/scmccid/default.nix | 2 +- pkgs/development/libraries/slib/default.nix | 2 +- pkgs/development/libraries/snack/default.nix | 2 +- .../libraries/speech-tools/default.nix | 2 +- .../libraries/sphinxbase/default.nix | 4 +-- .../libraries/suitesparse/default.nix | 4 +-- .../libraries/tcp-wrappers/default.nix | 2 +- pkgs/development/libraries/ti-rpc/default.nix | 2 +- pkgs/development/libraries/v8/default.nix | 4 +-- pkgs/development/libraries/webkit/default.nix | 2 +- pkgs/development/libraries/webkit/svn.nix | 2 +- pkgs/development/libraries/wtk/builder.sh | 2 +- .../libraries/xapian/bindings/1.0.x.nix | 4 +-- .../libraries/xapian/bindings/default.nix | 4 +-- .../libraries/xlibs-wrapper/default.nix | 2 +- .../misc/avr8-burn-omat/default.nix | 2 +- pkgs/development/misc/windows-sdk/builder.sh | 4 +-- .../ocaml-modules/batteries/default.nix | 2 +- .../ocaml-modules/cryptokit/default.nix | 2 +- .../ocaml-modules/lablgtkmathview/default.nix | 2 +- .../ocaml-modules/sqlite3/default.nix | 2 +- .../perl-modules/DB_File/default.nix | 2 +- .../python-modules/generic/default.nix | 2 +- .../python-modules/xmpppy/default.nix | 2 +- .../development/ruby-modules/rake/default.nix | 4 +-- .../ruby-modules/sqlite3/default.nix | 2 +- .../tools/analysis/checkstyle/default.nix | 2 +- .../tools/analysis/emma/default.nix | 2 +- .../tools/analysis/findbugs/default.nix | 2 +- .../tools/analysis/jdepend/default.nix | 2 +- .../tools/analysis/pmd/default.nix | 2 +- .../tools/analysis/spin/default.nix | 2 +- .../build-managers/apache-ant/from-source.nix | 4 +-- .../tools/build-managers/bam/default.nix | 4 +-- .../tools/build-managers/buildbot/default.nix | 2 +- .../tools/build-managers/gradle/default.nix | 2 +- .../tools/build-managers/jam/default.nix | 2 +- .../tools/misc/cbrowser/default.nix | 2 +- .../development/tools/misc/cscope/default.nix | 4 +-- .../development/tools/misc/global/default.nix | 2 +- pkgs/development/tools/misc/lsof/default.nix | 2 +- pkgs/development/tools/misc/ninka/default.nix | 4 +-- .../tools/misc/sloccount/default.nix | 6 ++--- .../tools/misc/unifdef/default.nix | 2 +- .../tools/misc/usb-modeswitch/default.nix | 2 +- .../tools/ocaml/camlidl/default.nix | 2 +- .../tools/ocaml/findlib/default.nix | 2 +- .../tools/parsing/antlr/builder.sh | 4 +-- .../tools/parsing/frown/builder.sh | 2 +- .../tools/parsing/jikespg/builder.sh | 2 +- .../tools/selenium/remote-control/default.nix | 4 +-- pkgs/development/web/csslint/default.nix | 2 +- pkgs/games/banner/default.nix | 2 +- pkgs/games/beret/default.nix | 4 +-- pkgs/games/blackshades/default.nix | 2 +- pkgs/games/blackshadeselite/default.nix | 2 +- pkgs/games/castle-combat/default.nix | 2 +- pkgs/games/dwarf-fortress/default.nix | 4 +-- pkgs/games/eduke32/default.nix | 4 +-- pkgs/games/egoboo/default.nix | 2 +- pkgs/games/exult/default.nix | 2 +- pkgs/games/flightgear/default.nix | 2 +- pkgs/games/fsg/default.nix | 2 +- pkgs/games/icbm3d/default.nix | 2 +- pkgs/games/instead/default.nix | 2 +- pkgs/games/keen4/builder.sh | 4 +-- pkgs/games/mars/default.nix | 4 +-- pkgs/games/naev/default.nix | 2 +- pkgs/games/nethack/default.nix | 2 +- pkgs/games/neverball/default.nix | 2 +- pkgs/games/openlierox/default.nix | 2 +- pkgs/games/orbit/default.nix | 2 +- pkgs/games/pong3d/default.nix | 2 +- pkgs/games/privateer/default.nix | 2 +- pkgs/games/quake3/demo/builder.sh | 2 +- pkgs/games/quake3/game/default.nix | 2 +- pkgs/games/quake3/wrapper/builder.sh | 2 +- pkgs/games/rigsofrods/default.nix | 4 +-- pkgs/games/sauerbraten/default.nix | 4 +-- pkgs/games/simutrans/default.nix | 4 +-- pkgs/games/teetertorture/default.nix | 2 +- pkgs/games/teeworlds/default.nix | 6 ++--- pkgs/games/the-butterfly-effect/default.nix | 4 +-- pkgs/games/thePenguinMachine/default.nix | 4 +-- pkgs/games/trackballs/default.nix | 2 +- pkgs/games/tremulous/default.nix | 4 +-- pkgs/games/trigger/default.nix | 2 +- pkgs/games/urbanterror/default.nix | 4 +-- pkgs/games/ut2004demo/make-wrapper.sh | 2 +- pkgs/games/vectoroids/default.nix | 2 +- pkgs/games/warsow/default.nix | 6 ++--- pkgs/games/xonotic/default.nix | 4 +-- pkgs/games/xsokoban/default.nix | 2 +- pkgs/games/zangband/default.nix | 6 ++--- pkgs/games/zod/default.nix | 2 +- pkgs/misc/drivers/gutenprint/bin.nix | 2 +- pkgs/misc/emulators/atari800/builder.sh | 2 +- pkgs/misc/emulators/darcnes/default.nix | 2 +- pkgs/misc/emulators/dosbox/default.nix | 2 +- pkgs/misc/emulators/fakenes/default.nix | 2 +- pkgs/misc/emulators/mess/default.nix | 2 +- pkgs/misc/emulators/vice/default.nix | 2 +- pkgs/misc/foldingathome/default.nix | 2 +- pkgs/misc/gxemul/default.nix | 6 ++--- pkgs/misc/jackaudio/jack1.nix | 2 +- pkgs/misc/misc.nix | 2 +- pkgs/misc/sane-backends/default.nix | 2 +- pkgs/misc/sane-backends/snapshot.nix | 2 +- .../screensavers/electricsheep/default.nix | 2 +- pkgs/misc/screensavers/rss-glx/builder.sh | 6 ++--- pkgs/misc/source-and-tags/default.nix | 4 +-- pkgs/misc/tex/lazylist/builder.sh | 2 +- pkgs/misc/tex/lkproof/default.nix | 2 +- pkgs/misc/tex/nix/animatedot.sh | 2 +- pkgs/misc/tex/nix/default.nix | 2 +- pkgs/misc/tex/nix/dot2pdf.sh | 2 +- pkgs/misc/tex/nix/dot2ps.sh | 2 +- pkgs/misc/tex/nix/lhs2tex.sh | 2 +- pkgs/misc/tex/nix/run-latex.sh | 2 +- pkgs/misc/tex/pgf/1.x.nix | 2 +- pkgs/misc/tex/pgf/2.x.nix | 2 +- pkgs/misc/tex/polytable/builder.sh | 6 ++--- pkgs/misc/tex/tetex/default.nix | 4 +-- pkgs/misc/tex/tex4ht/default.nix | 4 +-- pkgs/misc/tex/texlive/aggregate.nix | 6 ++--- pkgs/misc/tex/texlive/beamer.nix | 4 +-- pkgs/misc/tex/texlive/cm-super.nix | 12 ++++----- pkgs/misc/tex/texlive/context.nix | 4 +-- pkgs/misc/tex/texlive/default.nix | 10 +++---- pkgs/misc/tex/texlive/extra.nix | 2 +- pkgs/misc/tex/texlive/moderncv.nix | 2 +- pkgs/misc/tex/texlive/pgf.nix | 4 +-- pkgs/misc/tex/texlive/xcolor.nix | 8 +++--- pkgs/misc/uboot/default.nix | 4 +-- pkgs/misc/uboot/guruplug.nix | 4 +-- pkgs/misc/uboot/nanonote.nix | 4 +-- pkgs/misc/uboot/sheevaplug.nix | 4 +-- .../linux/915resolution/default.nix | 2 +- pkgs/os-specific/linux/acpi-call/default.nix | 4 +-- pkgs/os-specific/linux/ati-drivers/builder.sh | 6 ++--- pkgs/os-specific/linux/aufs/2.1.nix | 2 +- pkgs/os-specific/linux/aufs/2.nix | 2 +- pkgs/os-specific/linux/aufs/3.nix | 4 +-- .../linux/broadcom-sta/default.nix | 2 +- pkgs/os-specific/linux/cramfsswap/builder.sh | 2 +- pkgs/os-specific/linux/exmap/default.nix | 4 +-- .../linux/ext3cow-tools/builder.sh | 2 +- .../firmware-linux-nonfree/default.nix | 2 +- .../linux/firmware/ipw2100/default.nix | 2 +- .../linux/firmware/ipw2200/default.nix | 2 +- .../firmware/iwlwifi-1000-ucode/default.nix | 2 +- .../firmware/iwlwifi-3945-ucode/default.nix | 2 +- .../firmware/iwlwifi-4965-ucode/default.nix | 2 +- .../firmware/iwlwifi-4965-ucode/version-2.nix | 2 +- .../firmware/iwlwifi-5000-ucode/default.nix | 2 +- .../firmware/iwlwifi-5150-ucode/default.nix | 2 +- .../firmware/iwlwifi-6000-ucode/default.nix | 2 +- .../iwlwifi-6000g2a-ucode/default.nix | 2 +- .../iwlwifi-6000g2b-ucode/default.nix | 2 +- .../linux/firmware/ralink/default.nix | 2 +- .../linux/firmware/rt2860/default.nix | 2 +- .../linux/firmware/rt2870/default.nix | 2 +- .../linux/firmware/rt73/default.nix | 2 +- .../linux/firmware/rtl8192c/default.nix | 2 +- .../linux/firmware/zd1211/default.nix | 2 +- pkgs/os-specific/linux/fxload/default.nix | 6 ++--- pkgs/os-specific/linux/kernel-headers/2.4.nix | 2 +- .../linux/kernel-headers/2.6.28.nix | 2 +- .../linux/kernel-headers/2.6.32.nix | 2 +- .../linux/kernel-headers/default.nix | 2 +- pkgs/os-specific/linux/kernel/builder.sh | 4 +-- pkgs/os-specific/linux/klibc/shrunk.nix | 2 +- pkgs/os-specific/linux/kudzu/builder.sh | 8 +++--- pkgs/os-specific/linux/libcap/default.nix | 2 +- pkgs/os-specific/linux/lsiutil/default.nix | 2 +- pkgs/os-specific/linux/mingetty/default.nix | 2 +- pkgs/os-specific/linux/nss_ldap/default.nix | 2 +- pkgs/os-specific/linux/numactl/default.nix | 2 +- .../linux/nvidia-x11/builder-legacy.sh | 8 +++--- pkgs/os-specific/linux/nvidia-x11/builder.sh | 20 +++++++------- .../linux/opengl/xorg-sys/builder.sh | 2 +- .../linux/ov511/ov511-2.30-builder.sh | 2 +- .../linux/ov511/ov511-2.32-builder.sh | 2 +- .../os-specific/linux/pcmciautils/default.nix | 2 +- pkgs/os-specific/linux/qc-usb/builder.sh | 2 +- .../os-specific/linux/radeontools/default.nix | 2 +- pkgs/os-specific/linux/sysklogd/builder.sh | 6 ++--- pkgs/os-specific/linux/tcp-wrapper/builder.sh | 10 +++---- pkgs/os-specific/linux/tunctl/default.nix | 2 +- pkgs/os-specific/linux/upstart/default.nix | 2 +- pkgs/os-specific/linux/wis-go7007/default.nix | 8 +++--- .../linux/wpa_supplicant/default.nix | 4 +-- .../linux/xf86-input-multitouch/default.nix | 2 +- .../linux/xf86-input-wacom/default.nix | 2 +- .../windows/mingw-headers/default.nix | 2 +- pkgs/os-specific/windows/mingwrt/default.nix | 2 +- pkgs/os-specific/windows/w32api/default.nix | 2 +- pkgs/servers/dict/dictd-db-collector.nix | 2 +- pkgs/servers/dict/dictd-db.nix | 2 +- pkgs/servers/felix/default.nix | 2 +- pkgs/servers/felix/remoteshell.nix | 2 +- pkgs/servers/fingerd/bsd-fingerd/default.nix | 2 +- pkgs/servers/games/ghost-one/default.nix | 8 +++--- .../apache-modules/mod_python/default.nix | 2 +- .../tomcat-connectors/builder.sh | 2 +- pkgs/servers/http/jboss/default.nix | 2 +- pkgs/servers/http/jboss/jdbc/mysql/builder.sh | 2 +- pkgs/servers/http/jetty/6.1/bin-builder.sh | 2 +- pkgs/servers/http/joseki/default.nix | 4 +-- pkgs/servers/http/tomcat/axis2/builder.sh | 4 +-- .../servers/http/tomcat/jdbc/mysql/builder.sh | 2 +- pkgs/servers/mail/postfix/default.nix | 2 +- pkgs/servers/monitoring/zabbix/default.nix | 6 ++--- pkgs/servers/portmap/default.nix | 2 +- pkgs/servers/sql/mysql/jdbc/builder.sh | 2 +- pkgs/servers/sql/postgresql/jdbc/builder.sh | 2 +- pkgs/servers/x11/xorg/builder.sh | 2 +- pkgs/servers/x11/xorg/imake.sh | 2 +- pkgs/servers/x11/xorg/overrides.nix | 2 +- pkgs/servers/xmpp/pyIRCt/default.nix | 2 +- pkgs/servers/xmpp/pyMAILt/default.nix | 2 +- pkgs/shells/zsh/default.nix | 4 +-- pkgs/stdenv/adapters.nix | 6 ++--- pkgs/stdenv/generic/setup.sh | 16 ++++++------ pkgs/stdenv/linux/default.nix | 2 +- pkgs/stdenv/linux/make-bootstrap-tools.nix | 2 +- pkgs/stdenv/mingw/setup.sh | 14 +++++----- pkgs/tools/X11/x2vnc/default.nix | 2 +- pkgs/tools/X11/x2x/default.nix | 4 +-- pkgs/tools/X11/xpra/default.nix | 2 +- pkgs/tools/admin/tightvnc/builder.sh | 6 ++--- pkgs/tools/archivers/unarj/default.nix | 2 +- pkgs/tools/cd-dvd/unetbootin/default.nix | 6 ++--- pkgs/tools/compression/bsdiff/builder.sh | 4 +-- pkgs/tools/compression/bzip2/builder.sh | 2 +- pkgs/tools/compression/upx/default.nix | 2 +- pkgs/tools/compression/zdelta/builder.sh | 2 +- pkgs/tools/filesystems/fsfs/default.nix | 2 +- pkgs/tools/filesystems/fusesmb/default.nix | 2 +- pkgs/tools/filesystems/httpfs/default.nix | 4 +-- pkgs/tools/filesystems/sshfs-fuse/default.nix | 2 +- pkgs/tools/graphics/cfdg/default.nix | 4 +-- pkgs/tools/graphics/cuneiform/default.nix | 2 +- pkgs/tools/graphics/dcraw/default.nix | 2 +- pkgs/tools/graphics/exiftags/default.nix | 2 +- pkgs/tools/graphics/glxinfo/default.nix | 2 +- pkgs/tools/graphics/jhead/default.nix | 2 +- pkgs/tools/graphics/pdfread/default.nix | 4 +-- pkgs/tools/graphics/ploticus/builder.sh | 4 +-- pkgs/tools/graphics/qrdecode/default.nix | 2 +- pkgs/tools/graphics/transfig/builder.sh | 4 +-- pkgs/tools/graphics/welkin/default.nix | 2 +- pkgs/tools/misc/autojump/default.nix | 4 +-- pkgs/tools/misc/debootstrap/default.nix | 4 +-- pkgs/tools/misc/dmg2img/default.nix | 2 +- pkgs/tools/misc/dtach/default.nix | 2 +- pkgs/tools/misc/expect/default.nix | 2 +- pkgs/tools/misc/fdupes/default.nix | 2 +- pkgs/tools/misc/figlet/default.nix | 2 +- pkgs/tools/misc/hddtemp/default.nix | 2 +- pkgs/tools/misc/jdiskreport/builder.sh | 4 +-- pkgs/tools/misc/kermit/default.nix | 6 ++--- pkgs/tools/misc/memtest86/default.nix | 2 +- pkgs/tools/misc/myhasktags/default.nix | 2 +- pkgs/tools/misc/pk2cmd/default.nix | 2 +- pkgs/tools/misc/qjoypad/default.nix | 2 +- pkgs/tools/misc/rockbox-utility/default.nix | 2 +- pkgs/tools/misc/shebangfix/default.nix | 2 +- pkgs/tools/misc/ttf2pt1/default.nix | 2 +- pkgs/tools/misc/ttmkfdir/default.nix | 2 +- pkgs/tools/misc/vfdecrypt/default.nix | 2 +- pkgs/tools/misc/w3c-css-validator/default.nix | 2 +- pkgs/tools/misc/xdaliclock/default.nix | 2 +- pkgs/tools/networking/altermime/default.nix | 2 +- pkgs/tools/networking/bsd-finger/default.nix | 2 +- pkgs/tools/networking/cntlm/default.nix | 6 ++--- pkgs/tools/networking/ddclient/default.nix | 2 +- pkgs/tools/networking/dnstop/default.nix | 2 +- pkgs/tools/networking/eggdrop/default.nix | 2 +- pkgs/tools/networking/flvstreamer/default.nix | 2 +- pkgs/tools/networking/host/default.nix | 4 +-- pkgs/tools/networking/miniupnpc/default.nix | 2 +- pkgs/tools/networking/miniupnpd/default.nix | 2 +- pkgs/tools/networking/netboot/default.nix | 2 +- pkgs/tools/networking/netkit/tftp/default.nix | 2 +- pkgs/tools/networking/openssh/default.nix | 4 +-- pkgs/tools/networking/p2p/azureus/builder.sh | 4 +-- .../tools/networking/p2p/rtorrent/default.nix | 2 +- .../networking/p2p/tahoe-lafs/default.nix | 2 +- pkgs/tools/networking/philter/default.nix | 2 +- pkgs/tools/networking/ripmime/default.nix | 2 +- pkgs/tools/networking/rp-pppoe/default.nix | 2 +- pkgs/tools/networking/s3sync/default.nix | 4 +-- pkgs/tools/networking/siege/default.nix | 2 +- pkgs/tools/networking/slimrat/default.nix | 2 +- pkgs/tools/networking/stun/default.nix | 2 +- pkgs/tools/networking/swec/default.nix | 2 +- pkgs/tools/networking/tcng/default.nix | 2 +- pkgs/tools/networking/uwimap/default.nix | 2 +- pkgs/tools/networking/wakelan/default.nix | 2 +- pkgs/tools/networking/wicd/default.nix | 2 +- pkgs/tools/security/bmrsa/11.nix | 2 +- pkgs/tools/security/chkrootkit/default.nix | 2 +- pkgs/tools/security/metasploit/3.1.nix | 4 +-- .../security/opensc-dnie-wrapper/default.nix | 2 +- pkgs/tools/security/pius/default.nix | 4 +-- pkgs/tools/security/seccure/0.4.nix | 2 +- pkgs/tools/security/ssss/default.nix | 2 +- pkgs/tools/system/bootchart/default.nix | 2 +- pkgs/tools/system/cron/default.nix | 2 +- pkgs/tools/system/dd_rescue/default.nix | 2 +- pkgs/tools/system/gptfdisk/default.nix | 4 +-- pkgs/tools/system/plan9port/builder.sh | 2 +- pkgs/tools/text/convertlit/default.nix | 2 +- pkgs/tools/text/dadadodo/default.nix | 2 +- pkgs/tools/text/qshowdiff/default.nix | 2 +- pkgs/tools/text/replace/default.nix | 2 +- pkgs/tools/text/xml/jing/script-builder.sh | 2 +- pkgs/tools/text/xml/rxp/default.nix | 2 +- pkgs/tools/text/xml/trang/builder.sh | 4 +-- pkgs/tools/typesetting/asciidoc/default.nix | 2 +- pkgs/tools/typesetting/halibut/default.nix | 4 +-- pkgs/tools/typesetting/lhs2tex/default.nix | 4 +-- pkgs/tools/typesetting/pdfjam/builder.sh | 4 +-- pkgs/tools/typesetting/pdftk/default.nix | 2 +- .../amazon-ec2-ami-tools/default.nix | 2 +- .../amazon-ec2-api-tools/default.nix | 2 +- pkgs/top-level/all-packages.nix | 4 +-- pkgs/top-level/make-tarball.nix | 6 ++--- pkgs/top-level/python-packages.nix | 6 ++--- 629 files changed, 931 insertions(+), 939 deletions(-) diff --git a/doc/stdenv.xml b/doc/stdenv.xml index 5c77b416cc0..1ecf72351f2 100644 --- a/doc/stdenv.xml +++ b/doc/stdenv.xml @@ -70,7 +70,7 @@ stdenv.mkDerivation { gcc foo.c -o foo ''; installPhase = '' - ensureDir $out/bin + mkdir -p $out/bin cp foo $out/bin ''; } @@ -112,7 +112,7 @@ buildPhase() { } installPhase() { - ensureDir $out/bin + mkdir -p $out/bin cp foo $out/bin } @@ -939,14 +939,6 @@ functions. - - ensureDir args - Creates the specified directories, including all - necessary parent directories, if they do not already - exist. - - - substitute infile diff --git a/maintainers/docs/cross.txt b/maintainers/docs/cross.txt index 5ae2787d799..32e09086b87 100644 --- a/maintainers/docs/cross.txt +++ b/maintainers/docs/cross.txt @@ -233,9 +233,9 @@ preConfigure() { fi # Cross compiler evilness - ensureDir $out - ensureDir $out/arm-linux - ensureDir $out/arm-linux/bin + mkdir -p $out + mkdir -p $out/arm-linux + mkdir -p $out/arm-linux/bin ln -s $binutilsArm/arm-linux/bin/as $out/arm-linux/bin/as ln -s $binutilsArm/arm-linux/bin/ld $out/arm-linux/bin/ld ln -s $binutilsArm/arm-linux/bin/ar $out/arm-linux/bin/ar diff --git a/pkgs/applications/audio/ardour/default.nix b/pkgs/applications/audio/ardour/default.nix index c9f0fb98af7..2a0caf93001 100644 --- a/pkgs/applications/audio/ardour/default.nix +++ b/pkgs/applications/audio/ardour/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation { ]; buildPhase = '' - ensureDir $out + mkdir -p $out export CXX=g++ scons PREFIX=$out install ''; diff --git a/pkgs/applications/audio/gmu/default.nix b/pkgs/applications/audio/gmu/default.nix index bdda1c6d8d9..e75be3e2c2b 100644 --- a/pkgs/applications/audio/gmu/default.nix +++ b/pkgs/applications/audio/gmu/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { postInstall = '' cp ${keymap}.keymap $out/share/gmu/default.keymap cp gmuinput.${conf}.conf $out/share/gmu/gmuinput.conf - ensureDir $out/etc/gmu + mkdir -p $out/etc/gmu cp gmu.${conf}.conf $out/etc/gmu/gmu.conf ''; diff --git a/pkgs/applications/audio/id3v2/default.nix b/pkgs/applications/audio/id3v2/default.nix index 7f062b1799f..8e7f573cc84 100644 --- a/pkgs/applications/audio/id3v2/default.nix +++ b/pkgs/applications/audio/id3v2/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { ''; preInstall = '' - ensureDir $out/bin $out/man/man1 + mkdir -p $out/bin $out/man/man1 ''; meta = { diff --git a/pkgs/applications/audio/ladspa-plugins/default.nix b/pkgs/applications/audio/ladspa-plugins/default.nix index 1557913f401..b563c850d52 100644 --- a/pkgs/applications/audio/ladspa-plugins/default.nix +++ b/pkgs/applications/audio/ladspa-plugins/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation { postInstall = '' - ensureDir $out/share/ladspa/ + mkdir -p $out/share/ladspa/ ln -sv $out/lib/ladspa $out/share/ladspa/lib ''; diff --git a/pkgs/applications/audio/ladspa-plugins/ladspah.nix b/pkgs/applications/audio/ladspa-plugins/ladspah.nix index 8cd3dcc1bfb..30ba34af16c 100644 --- a/pkgs/applications/audio/ladspa-plugins/ladspah.nix +++ b/pkgs/applications/audio/ladspa-plugins/ladspah.nix @@ -13,7 +13,7 @@ in in with localDefs; let copyFile = fullDepEntry (" - ensureDir \$out/include + mkdir -p \$out/include cp ${src} \$out/include/ladspa.h ") [minInit defEnsureDir]; in diff --git a/pkgs/applications/audio/mp3info/default.nix b/pkgs/applications/audio/mp3info/default.nix index 86ffca4242f..d5a8138a500 100644 --- a/pkgs/applications/audio/mp3info/default.nix +++ b/pkgs/applications/audio/mp3info/default.nix @@ -18,8 +18,8 @@ stdenv.mkDerivation rec { ''; preInstall = - '' ensureDir "$out/bin" - ensureDir "$out/man/man1" + '' mkdir -p "$out/bin" + mkdir -p "$out/man/man1" ''; meta = { diff --git a/pkgs/applications/audio/mpc123/default.nix b/pkgs/applications/audio/mpc123/default.nix index 4ea26b458a7..ccaa428a3f4 100644 --- a/pkgs/applications/audio/mpc123/default.nix +++ b/pkgs/applications/audio/mpc123/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { installPhase = # XXX: Should install locales too (though there's only 1 available). - '' ensureDir "$out/bin" + '' mkdir -p "$out/bin" cp -v mpc123 "$out/bin" ''; diff --git a/pkgs/applications/audio/snd/default.nix b/pkgs/applications/audio/snd/default.nix index e7957e866f1..c295767687f 100644 --- a/pkgs/applications/audio/snd/default.nix +++ b/pkgs/applications/audio/snd/default.nix @@ -40,7 +40,7 @@ rec { makeDocsWork = fullDepEntry '' # hackish way to make html docs work - h="$out/share/snd/html"; ensureDir "$h"; cp *.html "$h" + h="$out/share/snd/html"; mkdir -p "$h"; cp *.html "$h" patch -p1 < ${./doc.patch} sed "s@HTML-DIR@$h@" -i index.scm snd-help.c '' ["defEnsureDir"]; diff --git a/pkgs/applications/audio/sonic-visualiser/default.nix b/pkgs/applications/audio/sonic-visualiser/default.nix index d3ac4c4168c..3a2beff0413 100644 --- a/pkgs/applications/audio/sonic-visualiser/default.nix +++ b/pkgs/applications/audio/sonic-visualiser/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation { ''; installPhase = '' - ensureDir $out/{bin,share/sonic-visualiser} + mkdir -p $out/{bin,share/sonic-visualiser} cp sonic-visualiser/sonic-visualiser $out/bin cp -r sonic-visualiser/samples $out/share/sonic-visualiser/samples wrapProgram $out/bin/sonic-visualiser --prefix LD_LIBRARY_PATH : ${libX11}/lib diff --git a/pkgs/applications/audio/vkeybd/default.nix b/pkgs/applications/audio/vkeybd/default.nix index b751e4da33e..279820a723f 100644 --- a/pkgs/applications/audio/vkeybd/default.nix +++ b/pkgs/applications/audio/vkeybd/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { buildInputs = [ alsaLib libX11 makeWrapper tcl tk ]; configurePhase = '' - ensureDir $out/bin + mkdir -p $out/bin sed -e "s@/usr/local@$out@" -i Makefile ''; diff --git a/pkgs/applications/audio/xsynth-dssi/default.nix b/pkgs/applications/audio/xsynth-dssi/default.nix index 528f0b3412c..0cfbfb4c9bd 100644 --- a/pkgs/applications/audio/xsynth-dssi/default.nix +++ b/pkgs/applications/audio/xsynth-dssi/default.nix @@ -14,8 +14,8 @@ stdenv.mkDerivation rec { ladspaPlugins liblo pkgconfig ]; installPhase = '' - ensureDir $out/bin - ensureDir $out/lib + mkdir -p $out/bin + mkdir -p $out/lib cp src/Xsynth_gtk $out/bin cp src/.libs/* $out/lib ''; diff --git a/pkgs/applications/editors/eclipse/default.nix b/pkgs/applications/editors/eclipse/default.nix index bc53dfc70f3..801efc166da 100644 --- a/pkgs/applications/editors/eclipse/default.nix +++ b/pkgs/applications/editors/eclipse/default.nix @@ -27,7 +27,7 @@ let buildCommand = '' # Unpack tarball. - ensureDir $out + mkdir -p $out tar xfvz $src -C $out # Patch binaries. @@ -47,7 +47,7 @@ let --add-flags "-configuration \$HOME/.eclipse/''${productId}_$productVersion/configuration" # Create desktop item. - ensureDir $out/share/applications + mkdir -p $out/share/applications cp ${desktopItem}/share/applications/* $out/share/applications ''; # */ diff --git a/pkgs/applications/editors/elvis/default.nix b/pkgs/applications/editors/elvis/default.nix index 511e284ed39..e1d2ad69b1d 100644 --- a/pkgs/applications/editors/elvis/default.nix +++ b/pkgs/applications/editors/elvis/default.nix @@ -15,16 +15,16 @@ stdenv.mkDerivation rec { ''; preConfigure = '' - ensureDir $out/share/man/man1 + mkdir -p $out/share/man/man1 ''; installPhase = '' - ensureDir $out/bin $out/share/elvis $out/share/elvis/doc + mkdir -p $out/bin $out/share/elvis $out/share/elvis/doc cp elvis ref elvtags elvfmt $out/bin cp -R data/* $out/share/elvis cp doc/* $out/share/elvis/doc - ensureDir $out/share/man/man1 + mkdir -p $out/share/man/man1 for a in doc/*.man; do cp $a $out/share/man/man1/`basename $a .man`.1 done diff --git a/pkgs/applications/editors/emacs-modes/bbdb/default.nix b/pkgs/applications/editors/emacs-modes/bbdb/default.nix index 52afebc6297..ec7a3e8e600 100644 --- a/pkgs/applications/editors/emacs-modes/bbdb/default.nix +++ b/pkgs/applications/editors/emacs-modes/bbdb/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation { buildInputs = [emacs texinfo ctags]; configureFlags = "--with-package-dir=$$out/share/emacs/site-lisp"; - preInstall = "ensureDir $out/info"; + preInstall = "mkdir -p $out/info"; installTargets = "install-pkg texinfo"; postInstall = '' mv $out/info $out/share/ diff --git a/pkgs/applications/editors/emacs-modes/cedet/default.nix b/pkgs/applications/editors/emacs-modes/cedet/default.nix index 6a91ac49651..46381dfc648 100644 --- a/pkgs/applications/editors/emacs-modes/cedet/default.nix +++ b/pkgs/applications/editors/emacs-modes/cedet/default.nix @@ -14,11 +14,11 @@ stdenv.mkDerivation rec { checkPhase = "make utest"; installPhase = '' - ensureDir "$out/share/emacs/site-lisp" + mkdir -p "$out/share/emacs/site-lisp" cp -v */*.el */*/*.el */*.elc */*/*.elc "$out/share/emacs/site-lisp" chmod a-x "$out/share/emacs/site-lisp/"* - ensureDir "$out/share/info" + mkdir -p "$out/share/info" cp -v */*.info* */*/*.info* "$out/share/info" ''; diff --git a/pkgs/applications/editors/emacs-modes/ecb/default.nix b/pkgs/applications/editors/emacs-modes/ecb/default.nix index 258c13b8eb7..f94d594519c 100644 --- a/pkgs/applications/editors/emacs-modes/ecb/default.nix +++ b/pkgs/applications/editors/emacs-modes/ecb/default.nix @@ -21,10 +21,10 @@ stdenv.mkDerivation rec { ''; installPhase = '' - ensureDir "$out/share/emacs/site-lisp" + mkdir -p "$out/share/emacs/site-lisp" cp -rv *.el *.elc ecb-images "$out/share/emacs/site-lisp" - ensureDir "$out/share/info" + mkdir -p "$out/share/info" cp -v info-help/*.info* "$out/share/info" ''; diff --git a/pkgs/applications/editors/emacs-modes/emms/default.nix b/pkgs/applications/editors/emacs-modes/emms/default.nix index 3a977031436..5439ba9e4d6 100644 --- a/pkgs/applications/editors/emacs-modes/emms/default.nix +++ b/pkgs/applications/editors/emacs-modes/emms/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { s|/usr/include/taglib|${taglib}/include/taglib|g ; s|/usr/lib|${taglib}/lib|g ; s|^all:\(.*\)\$|all:\1 emms-print-metadata|g" - ensureDir "$out/share/man/man1" + mkdir -p "$out/share/man/man1" sed -i "emms-player-mpg321-remote.el" \ -e 's|emms-player-mpg321-remote-command[[:blank:]]\+"mpg321"|emms-player-mpg321-remote-command "${mpg321}/bin/mpg321"|g' @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { ''; postInstall = '' - ensureDir "$out/bin" && cp emms-print-metadata "$out/bin" + mkdir -p "$out/bin" && cp emms-print-metadata "$out/bin" ''; meta = { diff --git a/pkgs/applications/editors/emacs-modes/haskell/default.nix b/pkgs/applications/editors/emacs-modes/haskell/default.nix index 5813fde815f..b73d91b611c 100644 --- a/pkgs/applications/editors/emacs-modes/haskell/default.nix +++ b/pkgs/applications/editors/emacs-modes/haskell/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { buildInputs = [emacs]; installPhase = '' - ensureDir "$out/share/emacs/site-lisp" + mkdir -p "$out/share/emacs/site-lisp" cp *.el *.elc *.hs "$out/share/emacs/site-lisp/" ''; diff --git a/pkgs/applications/editors/emacs-modes/hol_light/default.nix b/pkgs/applications/editors/emacs-modes/hol_light/default.nix index 9dba1d599ff..24eba20be6c 100644 --- a/pkgs/applications/editors/emacs-modes/hol_light/default.nix +++ b/pkgs/applications/editors/emacs-modes/hol_light/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation { installPhase = '' DEST=$out/share/emacs/site-lisp - ensureDir $DEST + mkdir -p $DEST cp -a * $DEST ''; diff --git a/pkgs/applications/editors/emacs-modes/jdee/default.nix b/pkgs/applications/editors/emacs-modes/jdee/default.nix index 2d93e782048..02f60d0d698 100644 --- a/pkgs/applications/editors/emacs-modes/jdee/default.nix +++ b/pkgs/applications/editors/emacs-modes/jdee/default.nix @@ -23,7 +23,7 @@ in ]; configurePhase = '' - ensureDir "dist" + mkdir -p "dist" cat > build.properties < EOF sed -i "s|/usr/share/jEdit/@jar.filename@|$out/share/jEdit/jedit.jar|g" package-files/linux/jedit - ensureDir $out/bin + mkdir -p $out/bin cp package-files/linux/jedit $out/bin/jedit chmod +x $out/bin/jedit ''; diff --git a/pkgs/applications/editors/jedit/wrapper.nix b/pkgs/applications/editors/jedit/wrapper.nix index 8af3d96918d..1126a7278d6 100644 --- a/pkgs/applications/editors/jedit/wrapper.nix +++ b/pkgs/applications/editors/jedit/wrapper.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation { phases = "buildPhase"; buildPhase = " -ensureDir \$out/bin +mkdir -p \$out/bin cat > \$out/bin/${jedit.name} << EOF #!/bin/sh exec $java -jar $jeditjar \\$* diff --git a/pkgs/applications/editors/nedit/builder.sh b/pkgs/applications/editors/nedit/builder.sh index 51b5f183654..15706b0c37d 100644 --- a/pkgs/applications/editors/nedit/builder.sh +++ b/pkgs/applications/editors/nedit/builder.sh @@ -3,7 +3,7 @@ source $stdenv/setup export NIX_CFLAGS_COMPILE="-DBUILD_UNTESTED_NEDIT -L$motif/lib $NIX_CFLAGS_COMPILE" installPhase() { - ensureDir $out/bin + mkdir -p $out/bin cp -p source/nedit source/nc $out/bin } diff --git a/pkgs/applications/editors/nvi/default.nix b/pkgs/applications/editors/nvi/default.nix index c759f977b0d..81e0dd35db9 100644 --- a/pkgs/applications/editors/nvi/default.nix +++ b/pkgs/applications/editors/nvi/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { ''; installPhase = '' - ensureDir $out/bin $out/share/vi/catalog + mkdir -p $out/bin $out/share/vi/catalog for a in dutch english french german ru_SU.KOI8-R spanish swedish; do cp ../catalog/$a $out/share/vi/catalog done @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { ln -s $out/bin/nvi $out/bin/ex ln -s $out/bin/nvi $out/bin/view - ensureDir $out/share/man/man1 + mkdir -p $out/share/man/man1 cp ../docs/USD.doc/vi.man/vi.1 $out/share/man/man1/nvi.1 ln -s $out/share/man/man1/nvi.1 $out/share/man/man1/vi ln -s $out/share/man/man1/nvi.1 $out/share/man/man1/ex diff --git a/pkgs/applications/graphics/gimp/plugins/default.nix b/pkgs/applications/graphics/gimp/plugins/default.nix index 3c900ca1eba..b80d27bfcf9 100644 --- a/pkgs/applications/graphics/gimp/plugins/default.nix +++ b/pkgs/applications/graphics/gimp/plugins/default.nix @@ -15,11 +15,11 @@ let prePhases = "extraLib"; extraLib = '' installScripts(){ - ensureDir ${targetScriptDir}; + mkdir -p ${targetScriptDir}; for p in "$@"; do cp "$p" ${targetScriptDir}; done } installPlugins(){ - ensureDir ${targetPluginDir}; + mkdir -p ${targetPluginDir}; for p in "$@"; do cp "$p" ${targetPluginDir}; done } ''; @@ -137,7 +137,7 @@ rec { url = http://registry.gimp.org/files/gimp-lqr-plugin-0.6.1.tar.bz2; sha256 = "00hklkpcimcbpjly4rjhfipaw096cpy768g9wixglwrsyqhil7l9"; }; - #postInstall = ''ensureDir $out/nix-support; echo "${libLQR}" > "$out/nix-support/propagated-user-env-packages"''; + #postInstall = ''mkdir -p $out/nix-support; echo "${libLQR}" > "$out/nix-support/propagated-user-env-packages"''; installPhase = "installPlugins src/gimp-lqr-plugin"; }; @@ -190,7 +190,7 @@ rec { }; installPhase = " installPlugins ufraw-gimp - ensureDir $out/bin + mkdir -p $out/bin cp ufraw $out/bin "; }; @@ -209,7 +209,7 @@ rec { installPhase = " installPlugins gimplensfun - ensureDir $out/bin + mkdir -p $out/bin cp gimplensfun $out/bin "; diff --git a/pkgs/applications/graphics/hugin/default.nix b/pkgs/applications/graphics/hugin/default.nix index 795417dbf5b..2557f0f82e5 100644 --- a/pkgs/applications/graphics/hugin/default.nix +++ b/pkgs/applications/graphics/hugin/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { exiv2 gettext ilmbase mesa freeglut glew libXmu libXi ]; postInstall = '' - ensureDir "$out/nix-support" + mkdir -p "$out/nix-support" echo "${enblendenfuse} ${autopanosiftc}" > $out/nix-support/propagated-user-env-packages ''; diff --git a/pkgs/applications/graphics/jbrout/default.nix b/pkgs/applications/graphics/jbrout/default.nix index 7c3826369ee..dc397a614d3 100644 --- a/pkgs/applications/graphics/jbrout/default.nix +++ b/pkgs/applications/graphics/jbrout/default.nix @@ -20,7 +20,7 @@ buildPythonPackage { ''; postInstall = '' - ensureDir $out/bin + mkdir -p $out/bin echo '#!/bin/sh' > $out/bin/jbrout echo "python $out/lib/python2.7/site-packages/jbrout-src-py2.7.egg/jbrout/jbrout.py" >> $out/bin/jbrout chmod +x $out/bin/jbrout diff --git a/pkgs/applications/graphics/meshlab/default.nix b/pkgs/applications/graphics/meshlab/default.nix index 8ddaf9bc279..9b39d8e8f1f 100644 --- a/pkgs/applications/graphics/meshlab/default.nix +++ b/pkgs/applications/graphics/meshlab/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { ''; installPhase = '' - ensureDir $out/opt/meshlab $out/bin $out/lib + mkdir -p $out/opt/meshlab $out/bin $out/lib pushd distrib cp -R * $out/opt/meshlab popd diff --git a/pkgs/applications/graphics/minidjvu/default.nix b/pkgs/applications/graphics/minidjvu/default.nix index 8f7ba792914..e3c6deddb29 100644 --- a/pkgs/applications/graphics/minidjvu/default.nix +++ b/pkgs/applications/graphics/minidjvu/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation { buildInputs = [ libtiff gettext]; preInstall = '' - ensureDir $out/lib + mkdir -p $out/lib ''; meta = { diff --git a/pkgs/applications/graphics/pinta/default.nix b/pkgs/applications/graphics/pinta/default.nix index 12f01adc830..349982bc24c 100644 --- a/pkgs/applications/graphics/pinta/default.nix +++ b/pkgs/applications/graphics/pinta/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { # Very ugly - I don't know enough Mono to improve this. Isn't there any rpath in binaries? installPhase = '' - ensureDir $out/lib/pinta $out/bin + mkdir -p $out/lib/pinta $out/bin cp bin/*.{dll,exe} $out/lib/pinta cat > $out/bin/pinta << EOF #!/bin/sh diff --git a/pkgs/applications/graphics/rawtherapee/default.nix b/pkgs/applications/graphics/rawtherapee/default.nix index eda187cbf23..4b61ac740cb 100644 --- a/pkgs/applications/graphics/rawtherapee/default.nix +++ b/pkgs/applications/graphics/rawtherapee/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DWITH_RAWZOR=OFF" ]; installPhase = '' - ensureDir $out/bin $out/lib + mkdir -p $out/bin $out/lib cp rtgui/rt $out/bin # Weird kind of path reference cp -r ../release/* $out/bin diff --git a/pkgs/applications/graphics/wings/default.nix b/pkgs/applications/graphics/wings/default.nix index b40a7251283..6d39c7f2a95 100644 --- a/pkgs/applications/graphics/wings/default.nix +++ b/pkgs/applications/graphics/wings/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { buildInputs = [ erlang esdl ]; installPhase = '' - ensureDir $out/bin $out/lib/${name}/ebin + mkdir -p $out/bin $out/lib/${name}/ebin cp ebin/* $out/lib/${name}/ebin cp -R fonts textures shaders plugins $out/lib/$name cat << EOF > $out/bin/wings diff --git a/pkgs/applications/graphics/xaos/default.nix b/pkgs/applications/graphics/xaos/default.nix index a746eb86b94..307c9477929 100644 --- a/pkgs/applications/graphics/xaos/default.nix +++ b/pkgs/applications/graphics/xaos/default.nix @@ -22,7 +22,7 @@ rec { preConfigure = a.fullDepEntry ('' sed -e s@/usr/@"$out/"@g -i configure $(find . -name 'Makefile*') - ensureDir $out/share/locale + mkdir -p $out/share/locale '') ["doUnpack" "minInit" "defEnsureDir"]; name = "xaos-" + version; diff --git a/pkgs/applications/misc/adobe-reader/builder.sh b/pkgs/applications/misc/adobe-reader/builder.sh index cd4bebfe9ad..1f4844a22c4 100644 --- a/pkgs/applications/misc/adobe-reader/builder.sh +++ b/pkgs/applications/misc/adobe-reader/builder.sh @@ -3,7 +3,7 @@ source $stdenv/setup echo "unpacking $src..." tar xvfa $src -ensureDir $out/Adobe/Reader9 +mkdir -p $out/Adobe/Reader9 echo "unpacking reader..." set +e @@ -24,5 +24,5 @@ substituteInPlace $out/Adobe/Reader*/bin/acroread \ --replace /bin/ls $(type -P ls) \ --replace xargs "xargs -r" -ensureDir $out/bin +mkdir -p $out/bin ln -s $out/Adobe/Reader*/bin/acroread $out/bin/acroread diff --git a/pkgs/applications/misc/audio/wavesurfer/default.nix b/pkgs/applications/misc/audio/wavesurfer/default.nix index ab22312e903..caaa5133c75 100644 --- a/pkgs/applications/misc/audio/wavesurfer/default.nix +++ b/pkgs/applications/misc/audio/wavesurfer/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation { buildInputs = [ snack tcl tk makeWrapper ]; installPhase = '' - ensureDir $out/{bin,nix-support,share/wavesurfer/} + mkdir -p $out/{bin,nix-support,share/wavesurfer/} mv doc $out/share/wavesurfer mv * $out/nix-support ln -s $out/{nix-support,bin}/wavesurfer.tcl diff --git a/pkgs/applications/misc/bitcoin/default.nix b/pkgs/applications/misc/bitcoin/default.nix index d56ebe6b17f..de74cd6abd9 100644 --- a/pkgs/applications/misc/bitcoin/default.nix +++ b/pkgs/applications/misc/bitcoin/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { ''; installPhase = '' - ensureDir $out/bin + mkdir -p $out/bin cp bitcoin-qt $out/bin cp src/bitcoind $out/bin ''; diff --git a/pkgs/applications/misc/blender/2.49.nix b/pkgs/applications/misc/blender/2.49.nix index 6a66c45b94f..b27f60e9bff 100644 --- a/pkgs/applications/misc/blender/2.49.nix +++ b/pkgs/applications/misc/blender/2.49.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = "-iquote ${ilmbase}/include/OpenEXR -I${python}/include/${python.libPrefix} -I${freetype}/include/freetype2"; installPhase = '' - ensureDir $out/bin + mkdir -p $out/bin cp bin/* $out/bin ''; diff --git a/pkgs/applications/misc/freemind/default.nix b/pkgs/applications/misc/freemind/default.nix index 24071d3c683..f67138e66a7 100644 --- a/pkgs/applications/misc/freemind/default.nix +++ b/pkgs/applications/misc/freemind/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation { # JDK 7 beta seems to have fixed this (bug ?) installPhase = '' - ensureDir $out/{bin,nix-support} + mkdir -p $out/{bin,nix-support} cp -r ../bin/dist $out/nix-support sed -i 's/which/type -p/' $out/nix-support/dist/freemind.sh cat > $out/bin/freemind << EOF diff --git a/pkgs/applications/misc/get_iplayer/default.nix b/pkgs/applications/misc/get_iplayer/default.nix index 1a0453797cc..0e222366729 100644 --- a/pkgs/applications/misc/get_iplayer/default.nix +++ b/pkgs/applications/misc/get_iplayer/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation { buildInputs = [makeWrapper perl]; installPhase = '' - ensureDir $out/bin + mkdir -p $out/bin cp get_iplayer $out/bin wrapProgram $out/bin/get_iplayer --suffix PATH ${ffmpeg}/bin:${flvstreamer}/bin ''; diff --git a/pkgs/applications/misc/googleearth/default.nix b/pkgs/applications/misc/googleearth/default.nix index aa4807a34f5..8da4e9de8fd 100644 --- a/pkgs/applications/misc/googleearth/default.nix +++ b/pkgs/applications/misc/googleearth/default.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation { ''; installPhase ='' - ensureDir $out/{opt/googleearth/,bin}; + mkdir -p $out/{opt/googleearth/,bin}; tar xf googleearth-data.tar -C $out/opt/googleearth tar xf googleearth-linux-x86.tar -C $out/opt/googleearth cp bin/googleearth $out/opt/googleearth diff --git a/pkgs/applications/misc/jbidwatcher/default.nix b/pkgs/applications/misc/jbidwatcher/default.nix index 56c547ce435..70cd5d3faf4 100644 --- a/pkgs/applications/misc/jbidwatcher/default.nix +++ b/pkgs/applications/misc/jbidwatcher/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { buildPhase = "true"; installPhase = '' - ensureDir "$out/bin" + mkdir -p "$out/bin" echo > "$out/bin/${pname}" "#!/bin/sh" echo >>"$out/bin/${pname}" "${java}/bin/java -Xmx512m -jar ${jarfile}" chmod +x "$out/bin/${pname}" diff --git a/pkgs/applications/misc/makeself/default.nix b/pkgs/applications/misc/makeself/default.nix index 08edc32e87e..9ea5f18ee62 100644 --- a/pkgs/applications/misc/makeself/default.nix +++ b/pkgs/applications/misc/makeself/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { unpackPhase = "sh ${src}"; installPhase = '' cd ${name} - ensureDir $out/{bin,share/{${name},man/man1}} + mkdir -p $out/{bin,share/{${name},man/man1}} mv makeself.lsm README $out/share/${name} mv makeself.sh $out/bin/makeself mv makeself.1 $out/share/man/man1/ diff --git a/pkgs/applications/misc/navipowm/default.nix b/pkgs/applications/misc/navipowm/default.nix index e308ebe0477..a526774d48e 100644 --- a/pkgs/applications/misc/navipowm/default.nix +++ b/pkgs/applications/misc/navipowm/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { ''; installPhase = '' - ensureDir $out/bin $out/share/${name}/Icons + mkdir -p $out/bin $out/share/${name}/Icons cp bin/NaviPOWM $out/bin cp ../../common/Config/navipowm.ini $out/share/${name} cp ../../common/Images/* $out/share/${name} diff --git a/pkgs/applications/misc/openjump/default.nix b/pkgs/applications/misc/openjump/default.nix index 3b42f0f3322..74f657ee02a 100644 --- a/pkgs/applications/misc/openjump/default.nix +++ b/pkgs/applications/misc/openjump/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation { # error. Still this is better than getting it always. # TODO: build from source and patch this unpackPhase = '' - ensureDir $out/bin; + mkdir -p $out/bin; cd $out; unzip $src s=$out/bin/OpenJump dir=$(echo $out/openjump-*) diff --git a/pkgs/applications/misc/procmail/default.nix b/pkgs/applications/misc/procmail/default.nix index 15bcc477bdd..7b25f9fc5c7 100644 --- a/pkgs/applications/misc/procmail/default.nix +++ b/pkgs/applications/misc/procmail/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation { # getline is defined differently in glibc now. So rename it. installPhase = " - ensureDir \$out/bin + mkdir -p \$out/bin sed -e \"s%^RM.*$%RM=`type -f rm | awk '{print $3;}'` -f%\" -i Makefile sed -e \"s%^BASENAME.*%\BASENAME=$out%\" -i Makefile sed -e \"s%^LIBS=.*%LIBS=-lm%\" -i Makefile diff --git a/pkgs/applications/misc/pstree/default.nix b/pkgs/applications/misc/pstree/default.nix index 67d3f32d53f..6f5c775cfb3 100644 --- a/pkgs/applications/misc/pstree/default.nix +++ b/pkgs/applications/misc/pstree/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { unpackPhase = "unpackFile \$src; sourceRoot=."; buildPhase = "pwd; gcc -o pstree pstree.c"; - installPhase = "ensureDir \$out/bin; cp pstree \$out/bin"; + installPhase = "mkdir -p \$out/bin; cp pstree \$out/bin"; meta = { description = "Show the set of running processes as a tree"; diff --git a/pkgs/applications/misc/qcad/default.nix b/pkgs/applications/misc/qcad/default.nix index 233ee0e6551..ee8876e6b33 100644 --- a/pkgs/applications/misc/qcad/default.nix +++ b/pkgs/applications/misc/qcad/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation { # probably there is more to be done. But this seems to work for now (eg see gentoo ebuild) installPhase = '' - ensureDir $out/{bin,share} + mkdir -p $out/{bin,share} cp -r qcad $out/share # The compilation does not fail with error code. But qcad will not exist diff --git a/pkgs/applications/misc/rxvt_unicode/default.nix b/pkgs/applications/misc/rxvt_unicode/default.nix index 89bce3ff99f..aa8b1b2b29f 100644 --- a/pkgs/applications/misc/rxvt_unicode/default.nix +++ b/pkgs/applications/misc/rxvt_unicode/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation (rec { '' # make urxvt find its perl file lib/perl5/site_perl is added to PERL5LIB automatically + stdenv.lib.optionalString perlSupport '' - ensureDir $out/lib/perl5 + mkdir -p $out/lib/perl5 ln -s $out/{lib/urxvt,lib/perl5/site_perl} ''; diff --git a/pkgs/applications/misc/sbagen/default.nix b/pkgs/applications/misc/sbagen/default.nix index c14f6080b8c..495f37de2f4 100644 --- a/pkgs/applications/misc/sbagen/default.nix +++ b/pkgs/applications/misc/sbagen/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation { buildPhase = "./mk"; installPhase = '' - ensureDir $out/{bin,share/sbagen/doc} + mkdir -p $out/{bin,share/sbagen/doc} cp -r --target-directory=$out/share/sbagen examples scripts river1.ogg river2.ogg cp sbagen $out/bin cp --target-directory=$out/share/sbagen/doc README.txt SBAGEN.txt theory{,2}.txt {wave,holosync,focus,TODO}.txt diff --git a/pkgs/applications/misc/thinking-rock/default.nix b/pkgs/applications/misc/thinking-rock/default.nix index 2faed53b7a5..7b55f39c119 100644 --- a/pkgs/applications/misc/thinking-rock/default.nix +++ b/pkgs/applications/misc/thinking-rock/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation { ls -1 bin/* | grep -ve 'bin/tr''$' | xargs rm # don't keep the other .exe file either find . -iname "*.exe" | xargs -n1 rm - ensureDir $out/{nix-support/tr-files,bin} + mkdir -p $out/{nix-support/tr-files,bin} cp -r . $out/nix-support/tr-files cat >> $out/bin/thinkingrock << EOF #!/bin/sh diff --git a/pkgs/applications/misc/vue/default.nix b/pkgs/applications/misc/vue/default.nix index 3f536ec21c1..8caa86a71cb 100644 --- a/pkgs/applications/misc/vue/default.nix +++ b/pkgs/applications/misc/vue/default.nix @@ -31,7 +31,7 @@ rec { doDeploy = a.fullDepEntry '' unzip ${src} - ensureDir "$out"/{share/vue,bin} + mkdir -p "$out"/{share/vue,bin} cp VUE.jar "$out/share/vue/vue.jar" echo '#!${a.stdenv.shell}' >> "$out/bin/vue" echo '${a.jre}/bin/java -jar "'"$out/share/vue/vue.jar"'" "$@"' >> "$out/bin/vue" diff --git a/pkgs/applications/misc/xpdf/libxpdf.nix b/pkgs/applications/misc/xpdf/libxpdf.nix index 589fbf49786..7987d26946d 100644 --- a/pkgs/applications/misc/xpdf/libxpdf.nix +++ b/pkgs/applications/misc/xpdf/libxpdf.nix @@ -31,10 +31,10 @@ stdenv.mkDerivation { ]; installPhase = '' - ensureDir $out/lib/goo - ensureDir $out/lib/fofi - ensureDir $out/lib/xpdf - ensureDir $out/include + mkdir -p $out/lib/goo + mkdir -p $out/lib/fofi + mkdir -p $out/lib/xpdf + mkdir -p $out/include cp -v goo/libGoo.a $out/lib/goo cp -v fofi/libfofi.a $out/lib/fofi diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix index 0be1d4dc48d..66c0f039403 100644 --- a/pkgs/applications/networking/browsers/chromium/default.nix +++ b/pkgs/applications/networking/browsers/chromium/default.nix @@ -42,8 +42,8 @@ stdenv.mkDerivation rec { ]; installPhase = '' - ensureDir $out/bin - ensureDir $out/libexec/chrome + mkdir -p $out/bin + mkdir -p $out/libexec/chrome cp -R * $out/libexec/chrome diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix index b6ec69ee388..1b8fb796bad 100644 --- a/pkgs/applications/networking/browsers/firefox/wrapper.nix +++ b/pkgs/applications/networking/browsers/firefox/wrapper.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation { --suffix-each LD_LIBRARY_PATH ':' "$libs" \ --prefix-contents PATH ':' "$(filterExisting $(addSuffix /extra-bin-path $plugins))" - ensureDir $out/share/applications + mkdir -p $out/share/applications cp $desktopItem/share/applications/* $out/share/applications ''; diff --git a/pkgs/applications/networking/browsers/icecat-3/default.nix b/pkgs/applications/networking/browsers/icecat-3/default.nix index 99f135c6d7b..7fc5ddbcce5 100644 --- a/pkgs/applications/networking/browsers/icecat-3/default.nix +++ b/pkgs/applications/networking/browsers/icecat-3/default.nix @@ -84,7 +84,7 @@ stdenv.mkDerivation { fi # Put the GNU IceCat icon in the right place. - ensureDir "$out/lib/$libDir/chrome/icons/default" + mkdir -p "$out/lib/$libDir/chrome/icons/default" ln -s ../../../icons/default.xpm "$out/lib/$libDir/chrome/icons/default/" ''; diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-10/builder.sh b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-10/builder.sh index 4db487f5c51..b0f8a2638c1 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-10/builder.sh +++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-10/builder.sh @@ -15,7 +15,7 @@ unpackPhase() { } installPhase() { - ensureDir $out/lib/mozilla/plugins + mkdir -p $out/lib/mozilla/plugins cp -pv libflashplayer.so $out/lib/mozilla/plugins patchelf --set-rpath "$rpath" $out/lib/mozilla/plugins/libflashplayer.so } diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/builder.sh b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/builder.sh index 4db487f5c51..b0f8a2638c1 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/builder.sh +++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/builder.sh @@ -15,7 +15,7 @@ unpackPhase() { } installPhase() { - ensureDir $out/lib/mozilla/plugins + mkdir -p $out/lib/mozilla/plugins cp -pv libflashplayer.so $out/lib/mozilla/plugins patchelf --set-rpath "$rpath" $out/lib/mozilla/plugins/libflashplayer.so } diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-9/builder.sh b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-9/builder.sh index 0f738eb9ccc..86ecd2c3345 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-9/builder.sh +++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-9/builder.sh @@ -6,7 +6,7 @@ dontPatchELF=1 sourceRoot=. installPhase() { - ensureDir $out/lib/mozilla/plugins + mkdir -p $out/lib/mozilla/plugins cp -p libflashplayer.so $out/lib/mozilla/plugins patchelf --set-rpath $rpath $out/lib/mozilla/plugins/libflashplayer.so } diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/mozplugger/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/mozplugger/default.nix index 890021b33d6..37d5cbe039f 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/mozplugger/default.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/mozplugger/default.nix @@ -22,7 +22,7 @@ rec { '') ["doUnpack" "minInit"]; postInstall = a.fullDepEntry('' - ensureDir $out/share/${name}/plugin + mkdir -p $out/share/${name}/plugin ln -s $out/lib/mozilla/plugins/mozplugger.so $out/share/${name}/plugin '') ["doMakeInstall" "minInit" "defEnsureDir"]; diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/mplayerplug-in/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/mplayerplug-in/default.nix index 330fac09862..6ee1735f76c 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/mplayerplug-in/default.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/mplayerplug-in/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig browser (browser.gtk) libXpm gettext ]; installPhase = '' - ensureDir $out/lib/mozilla/plugins + mkdir -p $out/lib/mozilla/plugins cp -p mplayerplug-in*.so mplayerplug-in*.xpt $out/lib/mozilla/plugins ''; diff --git a/pkgs/applications/networking/instant-messengers/carrier/2.4.2.nix b/pkgs/applications/networking/instant-messengers/carrier/2.4.2.nix index 7728f7abcfc..6a86774226d 100644 --- a/pkgs/applications/networking/instant-messengers/carrier/2.4.2.nix +++ b/pkgs/applications/networking/instant-messengers/carrier/2.4.2.nix @@ -46,7 +46,7 @@ rec { }; } // (if externalPurple2 then { postInstall = fullDepEntry ('' - ensureDir $out/lib/purple-2 + mkdir -p $out/lib/purple-2 cp ${args.purple2Source}/lib/purple-2/* $out/lib/purple-2/ '') ["minInit" "defEnsureDir"]; } else {}) diff --git a/pkgs/applications/networking/instant-messengers/carrier/2.5.0.nix b/pkgs/applications/networking/instant-messengers/carrier/2.5.0.nix index 0428ccdc7f3..58f65a2709e 100644 --- a/pkgs/applications/networking/instant-messengers/carrier/2.5.0.nix +++ b/pkgs/applications/networking/instant-messengers/carrier/2.5.0.nix @@ -46,7 +46,7 @@ rec { }; } // (if externalPurple2 then { postInstall = fullDepEntry ('' - ensureDir $out/lib/purple-2 + mkdir -p $out/lib/purple-2 cp ${args.purple2Source}/lib/purple-2/* $out/lib/purple-2/ '') ["minInit" "defEnsureDir"]; } else {}) diff --git a/pkgs/applications/networking/instant-messengers/oneteam/default.nix b/pkgs/applications/networking/instant-messengers/oneteam/default.nix index 37f56a63806..026ab3fff1c 100644 --- a/pkgs/applications/networking/instant-messengers/oneteam/default.nix +++ b/pkgs/applications/networking/instant-messengers/oneteam/default.nix @@ -59,14 +59,14 @@ rec { doDeploy = a.fullDepEntry '' TARGET_DIR="$out/share/oneteam/app" BUILD_DIR="$PWD" - ensureDir "$TARGET_DIR" + mkdir -p "$TARGET_DIR" cd "$TARGET_DIR" unzip "$BUILD_DIR/oneteam.xulapp" - ensureDir "$out/bin" + mkdir -p "$out/bin" echo "#! ${a.stdenv.shell}" > "$out/bin/oneteam" echo "\"${xulrunner}/bin/xulrunner\" \"$TARGET_DIR/application.ini\"" > "$out/bin/oneteam" chmod a+x "$out/bin/oneteam" - ensureDir "$out/share/doc" + mkdir -p "$out/share/doc" cp -r "$BUILD_DIR/docs" "$out/share/doc/oneteam" '' ["defEnsureDir"]; diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/msn-pecan/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/msn-pecan/default.nix index 5e5cf311712..cdbf63dbd9f 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/msn-pecan/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/msn-pecan/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation { }; makeFlags = "PURPLE_LIBDIR=lib PURPLE_DATADIR=share/data DESTDIR=$$out"; - preInstall = "ensureDir \$out/share"; + preInstall = "mkdir -p \$out/share"; postInstall = "ln -s \$out/lib/purple-2 \$out/share/pidgin-msn-pecan"; buildInputs = [pidgin]; diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-latex/pidgin-latex-sf.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-latex/pidgin-latex-sf.nix index cc6901c0384..868b5dbb342 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-latex/pidgin-latex-sf.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-latex/pidgin-latex-sf.nix @@ -12,7 +12,7 @@ rec { ]; preBuild = fullDepEntry ('' - ensureDir $out/bin + mkdir -p $out/bin ln -s $(which convert) $out/bin ln -s $(which xelatex) $out/bin ln -s $(which dvips) $out/bin @@ -26,8 +26,8 @@ rec { '') ["minInit" "addInputs" "defEnsureDir" "doUnpack"]; postInstall = fullDepEntry ('' - ensureDir $out/lib - ensureDir $out/share/pidgin-latex + mkdir -p $out/lib + mkdir -p $out/share/pidgin-latex ln -s ../../lib/pidgin/LaTeX.so $out/share/pidgin-latex '') ["minInit" "defEnsureDir" "doMakeInstall"]; diff --git a/pkgs/applications/networking/instant-messengers/psi/default.nix b/pkgs/applications/networking/instant-messengers/psi/default.nix index b0819da4c6e..7d04d9e9fec 100644 --- a/pkgs/applications/networking/instant-messengers/psi/default.nix +++ b/pkgs/applications/networking/instant-messengers/psi/default.nix @@ -27,10 +27,10 @@ stdenv.mkDerivation rec { postInstall = '' PSI_PLUGINS="$out/lib/psi/plugins" - ensureDir "$PSI_PLUGINS" + mkdir -p "$PSI_PLUGINS" ln -s "${psiMedia}"/share/psi/plugins/*.so "$PSI_PLUGINS" PSI_QT_PLUGINS="$out/share/psi" - ensureDir "$PSI_QT_PLUGINS"/crypto + mkdir -p "$PSI_QT_PLUGINS"/crypto ln -s "${qca2_ossl}"/lib/qt4/plugins/crypto/*.so "$PSI_QT_PLUGINS"/crypto ''; diff --git a/pkgs/applications/networking/instant-messengers/psi/psimedia.nix b/pkgs/applications/networking/instant-messengers/psi/psimedia.nix index 5f6112b53d0..4574b5a9b35 100644 --- a/pkgs/applications/networking/instant-messengers/psi/psimedia.nix +++ b/pkgs/applications/networking/instant-messengers/psi/psimedia.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { postBuild = '' TARGET="$out/share/psi/plugins" - ensureDir "$TARGET" + mkdir -p "$TARGET" cp gstprovider/*.so "$TARGET"/ ''; diff --git a/pkgs/applications/networking/instant-messengers/torchat/default.nix b/pkgs/applications/networking/instant-messengers/torchat/default.nix index 440ab624a62..5a82cf9d640 100644 --- a/pkgs/applications/networking/instant-messengers/torchat/default.nix +++ b/pkgs/applications/networking/instant-messengers/torchat/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { wrapPythonPrograms - ensureDir $out/lib/torchat + mkdir -p $out/lib/torchat cp -rf * $out/lib/torchat makeWrapper ${python}/bin/python $out/bin/torchat \ --set PYTHONPATH $out/lib/torchat:$program_PYTHONPATH \ diff --git a/pkgs/applications/networking/iptraf/default.nix b/pkgs/applications/networking/iptraf/default.nix index ce9e84fd572..8ddf784adc0 100644 --- a/pkgs/applications/networking/iptraf/default.nix +++ b/pkgs/applications/networking/iptraf/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { preConfigure = "cd src"; installPhase = '' - ensureDir $out/bin + mkdir -p $out/bin cp iptraf $out/bin ''; diff --git a/pkgs/applications/networking/mailreaders/thunderbird/9.x.nix b/pkgs/applications/networking/mailreaders/thunderbird/9.x.nix index 62b4d91de58..717d4012645 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird/9.x.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird/9.x.nix @@ -90,7 +90,7 @@ stdenv.mkDerivation { --replace /bin/ls "$(type -tP ls)" # Create a desktop item. - ensureDir $out/share/applications + mkdir -p $out/share/applications cat > $out/share/applications/thunderbird.desktop < Icon=$out/opt/skype/icons/SkypeBlue_48x48.png EOF - ensureDir $out/share/applications + mkdir -p $out/share/applications mv skype.desktop $out/share/applications ''; diff --git a/pkgs/applications/networking/sync/unison/default.nix b/pkgs/applications/networking/sync/unison/default.nix index 06bab807ebd..e3b042aa810 100644 --- a/pkgs/applications/networking/sync/unison/default.nix +++ b/pkgs/applications/networking/sync/unison/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation (rec { makeFlags = "INSTALLDIR=$(out)/bin/" + (if enableX11 then " UISTYLE=gtk2" else "") + (if ! nativeCode then " NATIVE=false" else ""); - preInstall = "ensureDir $out/bin"; + preInstall = "mkdir -p $out/bin"; postInstall = if enableX11 then '' for i in $(cd $out/bin && ls); do diff --git a/pkgs/applications/networking/vnstat/default.nix b/pkgs/applications/networking/vnstat/default.nix index b20f862842c..69a0a7efde8 100644 --- a/pkgs/applications/networking/vnstat/default.nix +++ b/pkgs/applications/networking/vnstat/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { }; installPhase = '' - ensureDir $out/{bin,sbin} $out/share/man/{man1,man5} + mkdir -p $out/{bin,sbin} $out/share/man/{man1,man5} cp src/vnstat $out/bin cp src/vnstatd $out/sbin cp man/vnstat.1 man/vnstatd.1 $out/share/man/man1 diff --git a/pkgs/applications/office/impressive/default.nix b/pkgs/applications/office/impressive/default.nix index aa09b48ab27..f1de422fa24 100644 --- a/pkgs/applications/office/impressive/default.nix +++ b/pkgs/applications/office/impressive/default.nix @@ -25,7 +25,7 @@ in ''; installPhase = '' - ensureDir "$out/bin" "$out/share/doc/impressive" + mkdir -p "$out/bin" "$out/share/doc/impressive" mv impressive.py "$out/bin/impressive" mv * "$out/share/doc/impressive" diff --git a/pkgs/applications/office/mmex/default.nix b/pkgs/applications/office/mmex/default.nix index 1e7aa756471..d56f4bed0ce 100644 --- a/pkgs/applications/office/mmex/default.nix +++ b/pkgs/applications/office/mmex/default.nix @@ -19,7 +19,7 @@ in ''; installPhase = '' - ensureDir $out/opt/mmex + mkdir -p $out/opt/mmex cp -r mmex runtime/{*.txt,*.png,*.db3,en,help,*.wav,*.ico} $out/opt/mmex ''; diff --git a/pkgs/applications/office/openoffice/builder.sh b/pkgs/applications/office/openoffice/builder.sh index 131e85de5bf..2c6e04e049b 100644 --- a/pkgs/applications/office/openoffice/builder.sh +++ b/pkgs/applications/office/openoffice/builder.sh @@ -70,7 +70,7 @@ installPhase() { -f openoffice.lst -l en-US -p OpenOffice \ -buildid $BUILD -simple $ooFiles) - ensureDir $out/bin + mkdir -p $out/bin for i in soffice ooffice; do wrapSOffice $i; done # Create some wrappers to start individual OpenOffice components. @@ -78,7 +78,7 @@ installPhase() { # Create symlinks to desktop files, so that openoffice.org apps can be picked from # the application menu in KDE and GNOME - ensureDir $out/share + mkdir -p $out/share ln -s $out/lib/openoffice/openoffice.org3/share/xdg $out/share/applications # Apply a minor correction to the *.desktop files in order to correctly address the icons diff --git a/pkgs/applications/office/openoffice/get-go-src.nix b/pkgs/applications/office/openoffice/get-go-src.nix index ebdb586bd47..439da366381 100644 --- a/pkgs/applications/office/openoffice/get-go-src.nix +++ b/pkgs/applications/office/openoffice/get-go-src.nix @@ -28,7 +28,7 @@ lib.overrideDerivation go_oo (attrs: { makesh = '' sed -i -e '/-x $WG/d' -e "s/WGET='''/WGET='echo XXX'/" download - ensureDir $out + mkdir -p $out set +e ./download --all | grep XXX | diff --git a/pkgs/applications/office/openoffice/go-oo.nix b/pkgs/applications/office/openoffice/go-oo.nix index 241c2ff2a13..59cd517b55c 100644 --- a/pkgs/applications/office/openoffice/go-oo.nix +++ b/pkgs/applications/office/openoffice/go-oo.nix @@ -77,7 +77,7 @@ stdenv.mkDerivation rec { installPhase = '' bin/ooinstall $out - ensureDir $out/bin + mkdir -p $out/bin for a in $out/program/{sbase,scalc,sdraw,simpress,smath,soffice,swriter,soffice.bin}; do ln -s $a $out/bin done diff --git a/pkgs/applications/science/biology/arb/default.nix b/pkgs/applications/science/biology/arb/default.nix index 4543fce4816..1b4563555c4 100644 --- a/pkgs/applications/science/biology/arb/default.nix +++ b/pkgs/applications/science/biology/arb/default.nix @@ -33,22 +33,22 @@ stdenv.mkDerivation { ''; installPhase = '' - ensureDir $out/lib + mkdir -p $out/lib shareddir=/nix/var/lib/arb # link out writable shared location lib/pts - ensureDir $shareddir/lib/pts + mkdir -p $shareddir/lib/pts cp -vau lib/pts $shareddir/lib rm -vrf lib/pts ln -vs $shareddir/lib/pts $out/lib/pts chmod a+rwx $shareddir/lib/pts # link out writable shared location lib/nas/ - ensureDir $shareddir/lib/nas + mkdir -p $shareddir/lib/nas cp -vau lib/nas $shareddir/lib rm -vrf lib/nas ln -vs $shareddir/lib/nas $out/lib/nas chmod a+rwx $shareddir/lib/nas # link out shared lib/pixmaps (not sure about this, yet): - ensureDir $shareddir/lib/pixmaps + mkdir -p $shareddir/lib/pixmaps cp -vau lib/pixmaps $shareddir/lib rm -vrf lib/pixmaps ln -vs $shareddir/lib/pixmaps $out/lib/pixmaps diff --git a/pkgs/applications/science/biology/pal2nal/default.nix b/pkgs/applications/science/biology/pal2nal/default.nix index ff9e35d9216..956f8b07e98 100644 --- a/pkgs/applications/science/biology/pal2nal/default.nix +++ b/pkgs/applications/science/biology/pal2nal/default.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation { }; installPhase = '' - ensureDir $out/bin + mkdir -p $out/bin cp -v pal2nal.pl $out/bin - ensureDir $out/doc + mkdir -p $out/doc cp -v README $out/doc ''; diff --git a/pkgs/applications/science/biology/slr/default.nix b/pkgs/applications/science/biology/slr/default.nix index 981cf2a6703..629c10aecdf 100644 --- a/pkgs/applications/science/biology/slr/default.nix +++ b/pkgs/applications/science/biology/slr/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation { make -fMakefile.linux ''; installPhase = '' - ensureDir $out/bin + mkdir -p $out/bin cp -v ../Slr $out/bin ''; diff --git a/pkgs/applications/science/geometry/tetgen/default.nix b/pkgs/applications/science/geometry/tetgen/default.nix index a5c3466d57b..a43ec3b0eb9 100644 --- a/pkgs/applications/science/geometry/tetgen/default.nix +++ b/pkgs/applications/science/geometry/tetgen/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { }; installPhase = '' - ensureDir $out/bin + mkdir -p $out/bin cp tetgen $out/bin ''; diff --git a/pkgs/applications/science/logic/hol/default.nix b/pkgs/applications/science/logic/hol/default.nix index 63040b7fdd5..5552fadc555 100644 --- a/pkgs/applications/science/logic/hol/default.nix +++ b/pkgs/applications/science/logic/hol/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation { buildInputs = [polyml]; buildCommand = '' - ensureDir "$out/src" + mkdir -p "$out/src" cd "$out/src" tar -xzf "$src" @@ -28,7 +28,7 @@ stdenv.mkDerivation { bin/build -expk -symlink - ensureDir "$out/bin" + mkdir -p "$out/bin" ln -st $out/bin $out/src/hol/bin/* # ln -s $out/src/hol/bin $out/bin ''; diff --git a/pkgs/applications/science/logic/hol_light/default.nix b/pkgs/applications/science/logic/hol_light/default.nix index 4961bbeabfd..0e688e71a2e 100644 --- a/pkgs/applications/science/logic/hol_light/default.nix +++ b/pkgs/applications/science/logic/hol_light/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation { ''; installPhase = '' - ensureDir "$out/lib/hol_light" "$out/bin" + mkdir -p "$out/lib/hol_light" "$out/bin" cp -a . $out/lib/hol_light echo "${start_script}" > "$out/bin/hol_light" chmod a+x "$out/bin/hol_light" diff --git a/pkgs/applications/science/logic/iprover/default.nix b/pkgs/applications/science/logic/iprover/default.nix index 7bfd8dff12e..91d8c122a8d 100644 --- a/pkgs/applications/science/logic/iprover/default.nix +++ b/pkgs/applications/science/logic/iprover/default.nix @@ -30,10 +30,10 @@ rec { phaseNames = ["doConfigure" "doMake" "doDeploy"]; configureCommand = "sh configure"; doDeploy = a.fullDepEntry ('' - ensureDir "$out/bin" + mkdir -p "$out/bin" cp iproveropt "$out/bin" - ensureDir "$out/share/${name}" + mkdir -p "$out/share/${name}" cp *.p "$out/share/${name}" echo -e "#! /bin/sh\\n$out/bin/iproveropt --clausifier \"${eprover}/bin/eprover\" --clausifier_options \" --tstp-format --silent --cnf \" \"\$@\"" > "$out"/bin/iprover chmod a+x "$out"/bin/iprover diff --git a/pkgs/applications/science/logic/isabelle/default.nix b/pkgs/applications/science/logic/isabelle/default.nix index 7cfe5f92736..4a268cac645 100644 --- a/pkgs/applications/science/logic/isabelle/default.nix +++ b/pkgs/applications/science/logic/isabelle/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation { ''; installPhase = '' - ensureDir $out/bin + mkdir -p $out/bin mv $TMP/$name $out cd $out/$name bin/isabelle install -p $out/bin diff --git a/pkgs/applications/science/logic/leo2/default.nix b/pkgs/applications/science/logic/leo2/default.nix index 04ab9a5b5ab..6b17d7e8f50 100644 --- a/pkgs/applications/science/logic/leo2/default.nix +++ b/pkgs/applications/science/logic/leo2/default.nix @@ -29,17 +29,17 @@ rec { phaseNames = ["makeInstallationDir" "doUnpack" "doMake" "doFinalize"]; makeInstallationDir = a.fullDepEntry ('' - ensureDir "$out/share/leo2/build-dir" + mkdir -p "$out/share/leo2/build-dir" cd "$out/share/leo2/build-dir" '') ["minInit" "defEnsureDir"]; goSrcDir = "cd src/"; doFinalize = a.fullDepEntry ('' - ensureDir "$out/bin" + mkdir -p "$out/bin" echo -e "#! /bin/sh\\n$PWD/../bin/leo --atprc $out/etc/leoatprc \"\$@\"\\n" > "$out/bin/leo" chmod a+x "$out/bin/leo" - ensureDir "$out/etc" + mkdir -p "$out/etc" echo -e "e = ${eprover}/bin/eprover\\nepclextract = ${eprover}/bin/epclextract" > "$out/etc/leoatprc" '') ["minInit" "doMake" "defEnsureDir"]; diff --git a/pkgs/applications/science/logic/matita/default.nix b/pkgs/applications/science/logic/matita/default.nix index 92e9479d9a4..0713ff09e92 100644 --- a/pkgs/applications/science/logic/matita/default.nix +++ b/pkgs/applications/science/logic/matita/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation { ''; postInstall = '' - ensureDir $out/bin + mkdir -p $out/bin ln -vs $RTDIR/matita $RTDIR/matitac $RTDIR/matitaclean $RTDIR/matitadep $RTDIR/matitawiki $out/bin ''; diff --git a/pkgs/applications/science/logic/minisat/default.nix b/pkgs/applications/science/logic/minisat/default.nix index 34a6bd7ceff..1f29b3aa1a1 100644 --- a/pkgs/applications/science/logic/minisat/default.nix +++ b/pkgs/applications/science/logic/minisat/default.nix @@ -29,7 +29,7 @@ rec { phaseNames = ["setVars" "doMake" "doDeploy"]; goSrcDir = "cd simp"; doDeploy = a.fullDepEntry ('' - ensureDir "$out"/bin + mkdir -p "$out"/bin cp minisat_static "$out/bin"/minisat '') ["minInit" "defEnsureDir"]; makeFlags = ["rs"]; diff --git a/pkgs/applications/science/logic/picosat/default.nix b/pkgs/applications/science/logic/picosat/default.nix index 5a92c103961..970daf739fc 100644 --- a/pkgs/applications/science/logic/picosat/default.nix +++ b/pkgs/applications/science/logic/picosat/default.nix @@ -22,13 +22,13 @@ stdenv.mkDerivation rec { ''; installPhase = '' - ensureDir "$out"/bin + mkdir -p "$out"/bin cp picomus "$out"/bin cp picosat "$out"/bin - ensureDir "$out"/lib + mkdir -p "$out"/lib cp libpicosat.a "$out"/lib cp libpicosat.so "$out"/lib - ensureDir "$out"/include/picosat + mkdir -p "$out"/include/picosat cp picosat.h "$out"/include/picosat ''; diff --git a/pkgs/applications/science/logic/prover9/default.nix b/pkgs/applications/science/logic/prover9/default.nix index 129abef0b3d..7ac3831f6a5 100644 --- a/pkgs/applications/science/logic/prover9/default.nix +++ b/pkgs/applications/science/logic/prover9/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation { buildFlags = "all"; installPhase = '' - ensureDir $out/bin + mkdir -p $out/bin cp bin/* $out/bin ''; diff --git a/pkgs/applications/science/logic/satallax/default.nix b/pkgs/applications/science/logic/satallax/default.nix index 4bf6e53737e..2126a4d76d6 100644 --- a/pkgs/applications/science/logic/satallax/default.nix +++ b/pkgs/applications/science/logic/satallax/default.nix @@ -34,21 +34,21 @@ rec { make ) - ensureDir "$out/bin" + mkdir -p "$out/bin" cp minisat/simp/minisat "$out/bin" echo "(setq *minisat-binary* \"$out/bin/minisat\")" > config.lisp '') ["defEnsureDir" "minInit" "addInputs" "doUnpack"]; doDeploy = a.fullDepEntry ('' - ensureDir "$out/share/satallax/build-dir" + mkdir -p "$out/share/satallax/build-dir" cp -r * "$out/share/satallax/build-dir" cd "$out/share/satallax/build-dir" sbcl --load make.lisp ! ( ./test | grep ERROR ) - ensureDir "$out/bin" + mkdir -p "$out/bin" cp bin/satallax "$out/bin" '') ["defEnsureDir" "minInit" "addInputs" "doUnpack"]; diff --git a/pkgs/applications/science/logic/ssreflect/default.nix b/pkgs/applications/science/logic/ssreflect/default.nix index 5a51fe2136a..8443974a0a0 100644 --- a/pkgs/applications/science/logic/ssreflect/default.nix +++ b/pkgs/applications/science/logic/ssreflect/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation { installPhase = '' COQLIB=$out/lib/coq make -f Makefile.coq install -e - ensureDir $out/bin + mkdir -p $out/bin ''; meta = { diff --git a/pkgs/applications/science/logic/tptp/default.nix b/pkgs/applications/science/logic/tptp/default.nix index 3211b6ebdc0..11b8f7ce535 100644 --- a/pkgs/applications/science/logic/tptp/default.nix +++ b/pkgs/applications/science/logic/tptp/default.nix @@ -31,7 +31,7 @@ rec { "patchBinaries" "makeLinks"]; goTarget = a.fullDepEntry '' - ensureDir "$out"/share/ + mkdir -p "$out"/share/ cd "$out"/share/ '' ["defEnsureDir" "minInit"]; @@ -54,7 +54,7 @@ rec { '' ["addInputs"]; makeLinks = a.fullDepEntry '' - ensureDir "$out/bin" + mkdir -p "$out/bin" ln -s "../share/tptp/TPTP2X/tptp2X" "$out/bin" ln -s "../share/tptp/Scripts/tptp2T" "$out/bin" ln -s "../share/tptp/Scripts/tptp4X" "$out/bin" diff --git a/pkgs/applications/science/math/content/default.nix b/pkgs/applications/science/math/content/default.nix index 15abc928f0f..87c047c2995 100644 --- a/pkgs/applications/science/math/content/default.nix +++ b/pkgs/applications/science/math/content/default.nix @@ -77,7 +77,7 @@ rec { '') ["addInputs" "buildVibrant" "setPlatform"]; install = a.fullDepEntry ('' - ensureDir $out/share/${name}/build-snapshot $out/bin $out/lib $out/share/${name}/doc + mkdir -p $out/share/${name}/build-snapshot $out/bin $out/lib $out/share/${name}/doc find . -name '*.o' -exec cp '{}' $out/lib ';' find . -name '*.so' -exec cp '{}' $out/lib ';' find . -name '*.txt' -exec cp '{}' $out/share/${name}/doc ';' diff --git a/pkgs/applications/science/math/eukleides/default.nix b/pkgs/applications/science/math/eukleides/default.nix index 9f65bcb8c14..d15bed8476e 100644 --- a/pkgs/applications/science/math/eukleides/default.nix +++ b/pkgs/applications/science/math/eukleides/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation { buildInputs = [bison flex texinfo readline texLive]; preConfigure = "sed -i 's/ginstall-info/install-info/g' doc/Makefile"; - installPhase = "ensureDir $out/bin ; make PREFIX=$out install"; + installPhase = "mkdir -p $out/bin ; make PREFIX=$out install"; meta = { description = "Geometry Drawing Language"; diff --git a/pkgs/applications/science/math/maxima/default.nix b/pkgs/applications/science/math/maxima/default.nix index 02b7017d295..0d3a12b38c2 100644 --- a/pkgs/applications/science/math/maxima/default.nix +++ b/pkgs/applications/science/math/maxima/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation { wrapProgram "$prog" --prefix PATH ":" "${searchPath}" done # Move emacs modules and documentation into the right place. - ensureDir $out/share/emacs $out/share/doc + mkdir -p $out/share/emacs $out/share/doc ln -s ../maxima/${version}/emacs $out/share/emacs/site-lisp ln -s ../maxima/${version}/doc $out/share/doc/maxima ''; diff --git a/pkgs/applications/science/math/msieve/default.nix b/pkgs/applications/science/math/msieve/default.nix index baee2f23d4c..c8b388a06b7 100644 --- a/pkgs/applications/science/math/msieve/default.nix +++ b/pkgs/applications/science/math/msieve/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation { else if stdenv.system == "i686-linux" then "x86" else "generic"; - installPhase = ''ensureDir $out/bin/ + installPhase = ''mkdir -p $out/bin/ cp msieve $out/bin/''; meta = { diff --git a/pkgs/applications/science/math/singular/default.nix b/pkgs/applications/science/math/singular/default.nix index dfc97eca8eb..5c5dfae8200 100644 --- a/pkgs/applications/science/math/singular/default.nix +++ b/pkgs/applications/science/math/singular/default.nix @@ -37,7 +37,7 @@ rec { fixInstall = a.fullDepEntry ('' rm -rf "$out/LIB" cp -r Singular/LIB "$out" - ensureDir "$out/bin" + mkdir -p "$out/bin" ln -s "$out"/*/Singular "$out/bin" '') ["minInit" "defEnsureDir"]; diff --git a/pkgs/applications/taxes/aangifte-2005/builder.sh b/pkgs/applications/taxes/aangifte-2005/builder.sh index e6b2bb8787e..8d284176d44 100644 --- a/pkgs/applications/taxes/aangifte-2005/builder.sh +++ b/pkgs/applications/taxes/aangifte-2005/builder.sh @@ -10,7 +10,7 @@ buildPhase() { } installPhase() { - ensureDir $out + mkdir -p $out cp -prvd * $out/ } diff --git a/pkgs/applications/taxes/aangifte-2006/builder.sh b/pkgs/applications/taxes/aangifte-2006/builder.sh index e6b2bb8787e..8d284176d44 100644 --- a/pkgs/applications/taxes/aangifte-2006/builder.sh +++ b/pkgs/applications/taxes/aangifte-2006/builder.sh @@ -10,7 +10,7 @@ buildPhase() { } installPhase() { - ensureDir $out + mkdir -p $out cp -prvd * $out/ } diff --git a/pkgs/applications/taxes/aangifte-2007/builder.sh b/pkgs/applications/taxes/aangifte-2007/builder.sh index e89ba5ae36f..f400f1b8855 100644 --- a/pkgs/applications/taxes/aangifte-2007/builder.sh +++ b/pkgs/applications/taxes/aangifte-2007/builder.sh @@ -12,7 +12,7 @@ buildPhase() { } installPhase() { - ensureDir $out + mkdir -p $out cp -prvd * $out/ } diff --git a/pkgs/applications/taxes/aangifte-2008/builder.sh b/pkgs/applications/taxes/aangifte-2008/builder.sh index e89ba5ae36f..f400f1b8855 100644 --- a/pkgs/applications/taxes/aangifte-2008/builder.sh +++ b/pkgs/applications/taxes/aangifte-2008/builder.sh @@ -12,7 +12,7 @@ buildPhase() { } installPhase() { - ensureDir $out + mkdir -p $out cp -prvd * $out/ } diff --git a/pkgs/applications/taxes/aangifte-2009/default.nix b/pkgs/applications/taxes/aangifte-2009/default.nix index 231670d263b..eeeb4a1d1e5 100644 --- a/pkgs/applications/taxes/aangifte-2009/default.nix +++ b/pkgs/applications/taxes/aangifte-2009/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation { installPhase = '' - ensureDir $out + mkdir -p $out cp -prvd * $out/ wrapProgram $out/bin/ib2009ux --prefix PATH : ${xdg_utils}/bin ''; diff --git a/pkgs/applications/taxes/aangifte-2010/default.nix b/pkgs/applications/taxes/aangifte-2010/default.nix index cd8a3b62269..65ff561ee9e 100644 --- a/pkgs/applications/taxes/aangifte-2010/default.nix +++ b/pkgs/applications/taxes/aangifte-2010/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation { installPhase = '' - ensureDir $out + mkdir -p $out cp -prvd * $out/ wrapProgram $out/bin/ib2010ux --prefix PATH : ${xdg_utils}/bin ''; diff --git a/pkgs/applications/version-management/fossil/default.nix b/pkgs/applications/version-management/fossil/default.nix index 7b84dcecb63..325d2e77e1a 100644 --- a/pkgs/applications/version-management/fossil/default.nix +++ b/pkgs/applications/version-management/fossil/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation { checkTarget = "test"; installPhase = '' - ensureDir $out/bin + mkdir -p $out/bin INSTALLDIR=$out/bin make install ''; diff --git a/pkgs/applications/version-management/git-and-tools/fast-export/default.nix b/pkgs/applications/version-management/git-and-tools/fast-export/default.nix index 45860362433..44e9cd535be 100644 --- a/pkgs/applications/version-management/git-and-tools/fast-export/default.nix +++ b/pkgs/applications/version-management/git-and-tools/fast-export/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation { installPhase = '' sed -i "s@/usr/bin/env.*@$(type -p python)@" *.py l=$out/libexec/git-fast-export - ensureDir $out/{bin,doc/git-fast-export} $l + mkdir -p $out/{bin,doc/git-fast-export} $l mv *.txt $out/doc/git-fast-export sed -i "s@ROOT=.*@ROOT=$l@" *.sh mv *.sh $out/bin diff --git a/pkgs/applications/version-management/git-and-tools/git/default.nix b/pkgs/applications/version-management/git-and-tools/git/default.nix index 795d43da6da..f22fbd102c7 100644 --- a/pkgs/applications/version-management/git-and-tools/git/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git/default.nix @@ -42,11 +42,11 @@ stdenv.mkDerivation { } # Install contrib stuff. - ensureDir $out/share/git + mkdir -p $out/share/git mv contrib $out/share/git/ - ensureDir $out/share/emacs/site-lisp + mkdir -p $out/share/emacs/site-lisp ln -s "$out/share/git/contrib/emacs/"*.el $out/share/emacs/site-lisp/ - ensureDir $out/etc/bash_completion.d + mkdir -p $out/etc/bash_completion.d ln -s $out/share/git/contrib/completion/git-completion.bash $out/etc/bash_completion.d/ # grep is a runtime dependence, need to patch so that it's found diff --git a/pkgs/applications/version-management/git-and-tools/git/git-git.nix b/pkgs/applications/version-management/git-and-tools/git/git-git.nix index a3b2a60953a..6371e504bfb 100644 --- a/pkgs/applications/version-management/git-and-tools/git/git-git.nix +++ b/pkgs/applications/version-management/git-and-tools/git/git-git.nix @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { '' # Install Emacs mode. echo "installing Emacs mode..." - ensureDir $out/share/emacs/site-lisp + mkdir -p $out/share/emacs/site-lisp cp -p contrib/emacs/*.el $out/share/emacs/site-lisp wrapArgs= @@ -86,7 +86,7 @@ stdenv.mkDerivation rec { + ''# install bash completion script d="$out/etc/bash_completion.d" - ensureDir $d; cp contrib/completion/git-completion.bash "$d" + mkdir -p $d; cp contrib/completion/git-completion.bash "$d" ''; meta = { diff --git a/pkgs/applications/version-management/git-and-tools/stgit/default.nix b/pkgs/applications/version-management/git-and-tools/stgit/default.nix index 7d622c4067c..a933ae84e60 100644 --- a/pkgs/applications/version-management/git-and-tools/stgit/default.nix +++ b/pkgs/applications/version-management/git-and-tools/stgit/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation { makeFlags = "prefix=$$out"; postInstall = '' - ensureDir "$out/etc/bash_completion.d/" + mkdir -p "$out/etc/bash_completion.d/" ln -s ../../share/stgit/completion/stgit-completion.bash "$out/etc/bash_completion.d/" ''; diff --git a/pkgs/applications/version-management/git-and-tools/topgit/default.nix b/pkgs/applications/version-management/git-and-tools/topgit/default.nix index ef8bb1b4dcf..4b192605182 100644 --- a/pkgs/applications/version-management/git-and-tools/topgit/default.nix +++ b/pkgs/applications/version-management/git-and-tools/topgit/default.nix @@ -16,9 +16,9 @@ stdenv.mkDerivation { configurePhase = "export prefix=$out"; postInstall = '' - ensureDir "$out/share/doc/topgit-${version}" + mkdir -p "$out/share/doc/topgit-${version}" cp README "$out/share/doc/topgit-${version}/" - ensureDir "$out/etc/bash_completion.d" + mkdir -p "$out/etc/bash_completion.d" make prefix="$out" install mv "contrib/tg-completion.bash" "$out/etc/bash_completion.d/" ''; diff --git a/pkgs/applications/version-management/mercurial/default.nix b/pkgs/applications/version-management/mercurial/default.nix index 8d4a45a496c..a5e4eb8e280 100644 --- a/pkgs/applications/version-management/mercurial/default.nix +++ b/pkgs/applications/version-management/mercurial/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation { postInstall = (stdenv.lib.optionalString guiSupport '' - ensureDir $out/etc/mercurial + mkdir -p $out/etc/mercurial cp contrib/hgk $out/bin cat >> $out/etc/mercurial/hgrc << EOF [extensions] @@ -40,7 +40,7 @@ stdenv.mkDerivation { done # copy hgweb.cgi to allow use in apache - ensureDir $out/share/cgi-bin + mkdir -p $out/share/cgi-bin cp -v hgweb.cgi $out/share/cgi-bin chmod u+x $out/share/cgi-bin/hgweb.cgi ''; diff --git a/pkgs/applications/version-management/monotone/default.nix b/pkgs/applications/version-management/monotone/default.nix index 70dd669e30f..cde31b5cef9 100644 --- a/pkgs/applications/version-management/monotone/default.nix +++ b/pkgs/applications/version-management/monotone/default.nix @@ -19,9 +19,9 @@ stdenv.mkDerivation rec { buildInputs = [boost zlib botan libidn lua pcre sqlite pkgconfig]; postInstall = '' - ensureDir $out/share/${name} + mkdir -p $out/share/${name} cp -rv contrib/ $out/share/${name}/contrib - ensureDir $out/lib/perl5/site_perl/${perlVersion} + mkdir -p $out/lib/perl5/site_perl/${perlVersion} cp -v contrib/Monotone.pm $out/lib/perl5/site_perl/${perlVersion} ''; diff --git a/pkgs/applications/version-management/veracity/default.nix b/pkgs/applications/version-management/veracity/default.nix index b4aa63ed014..91650deb077 100644 --- a/pkgs/applications/version-management/veracity/default.nix +++ b/pkgs/applications/version-management/veracity/default.nix @@ -37,10 +37,10 @@ rec { '' else "") ["doMake" "minInit"]; prepare_sgneeds = a.fullDepEntry ('' - ensureDir "$out/sgneeds/include/spidermonkey" + mkdir -p "$out/sgneeds/include/spidermonkey" for d in bin include lib; do - ensureDir "$out/sgneeds/$d" - ensureDir "$out/sgneeds/$d" + mkdir -p "$out/sgneeds/$d" + mkdir -p "$out/sgneeds/$d" for p in "${spidermonkey_1_8_0rc1}"; do for f in "$p"/"$d"/*; do ln -sf "$f" "$out"/sgneeds/"$d" @@ -53,7 +53,7 @@ rec { done done - ensureDir "$out/sgneeds/include/sgbrings" + mkdir -p "$out/sgneeds/include/sgbrings" ln -s "$out/sgneeds/include/js" "$out/sgneeds/include/sgbrings/js" for f in "$out/sgneeds/lib/"libjs*; do bn="$(basename "$f")" @@ -84,7 +84,7 @@ rec { '' ["minInit"]; doDeploy = a.fullDepEntry '' - ensureDir "$out/bin" "$out/share/veracity/" + mkdir -p "$out/bin" "$out/share/veracity/" cp -r .. "$out/share/veracity/build-dir" ln -s "$out/share/veracity/build-dir/build/src/cmd/vv" "$out/bin" ln -s "$out/share/veracity/build-dir/build/src/script/vscript" "$out/bin" diff --git a/pkgs/applications/version-management/viewmtn/0.10.nix b/pkgs/applications/version-management/viewmtn/0.10.nix index a8ced15b58c..d5e7d1e7c83 100644 --- a/pkgs/applications/version-management/viewmtn/0.10.nix +++ b/pkgs/applications/version-management/viewmtn/0.10.nix @@ -26,9 +26,9 @@ rec { fullOut=$(toPythonPath $out) - ensureDir $fullOut - ensureDir $out/bin - ensureDir $out/share/viewmtn + mkdir -p $fullOut + mkdir -p $out/bin + mkdir -p $out/share/viewmtn cp -r * $fullOut cp $fullOut/viewmtn.py $out/bin diff --git a/pkgs/applications/video/RealPlayer/builder.sh b/pkgs/applications/video/RealPlayer/builder.sh index 6a0276d01e4..9929634921c 100644 --- a/pkgs/applications/video/RealPlayer/builder.sh +++ b/pkgs/applications/video/RealPlayer/builder.sh @@ -1,7 +1,7 @@ source $stdenv/setup source $makeWrapper -ensureDir $out/real +mkdir -p $out/real skip=143273 # Look for "BZh91" in the executable. @@ -11,7 +11,7 @@ rm -rf $out/real/Bin $out/real/postinst patchelf --interpreter $(cat $NIX_GCC/nix-support/dynamic-linker) $out/real/realplay.bin -ensureDir $out/bin +mkdir -p $out/bin makeWrapper "$out/real/realplay.bin" "$out/bin/realplay" \ --set HELIX_LIBS "$out/real" \ --suffix-each LD_LIBRARY_PATH ':' "$(addSuffix /lib $libPath)" diff --git a/pkgs/applications/video/dvswitch/default.nix b/pkgs/applications/video/dvswitch/default.nix index 9ef9b678560..097bf4f49f4 100644 --- a/pkgs/applications/video/dvswitch/default.nix +++ b/pkgs/applications/video/dvswitch/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { ]; installPhase = " - ensureDir $out + mkdir -p $out cp src/dv* $out/ "; diff --git a/pkgs/applications/video/gnash/default.nix b/pkgs/applications/video/gnash/default.nix index 81b33849887..5e6d1d8f942 100644 --- a/pkgs/applications/video/gnash/default.nix +++ b/pkgs/applications/video/gnash/default.nix @@ -78,7 +78,7 @@ stdenv.mkDerivation rec { # XXX: Tests currently fail. doCheck = false; - preInstall = ''ensureDir $out/plugins''; + preInstall = ''mkdir -p $out/plugins''; postInstall = '' make install-plugins diff --git a/pkgs/applications/video/lxdvdrip/default.nix b/pkgs/applications/video/lxdvdrip/default.nix index 5a2c6287c6f..9323a1cbd32 100644 --- a/pkgs/applications/video/lxdvdrip/default.nix +++ b/pkgs/applications/video/lxdvdrip/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation { ''; preInstall = '' - ensureDir $out/man/man1 $out/bin $out/share $out/etc + mkdir -p $out/man/man1 $out/bin $out/share $out/etc ''; buildInputs = [ libdvdread ]; diff --git a/pkgs/applications/video/mythtv/builder.sh b/pkgs/applications/video/mythtv/builder.sh index c73132b47bc..31edf87641b 100644 --- a/pkgs/applications/video/mythtv/builder.sh +++ b/pkgs/applications/video/mythtv/builder.sh @@ -17,7 +17,7 @@ buildPhase() { postInstall() { sqlDir="$out/share/mythtv/sql" - ensureDir $sqlDir + mkdir -p $sqlDir cp -p ./database/mc.sql $sqlDir/ } diff --git a/pkgs/applications/virtualization/qemu/linux-img/default.nix b/pkgs/applications/virtualization/qemu/linux-img/default.nix index 23e2ab17477..58a2b29c259 100644 --- a/pkgs/applications/virtualization/qemu/linux-img/default.nix +++ b/pkgs/applications/virtualization/qemu/linux-img/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { installPhase = '' - ensureDir $out/share/qemu-images + mkdir -p $out/share/qemu-images bunzip2 < $src > $out/share/qemu-images/linux-0.2.img ''; diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix index d435f53e109..e0665909a8d 100644 --- a/pkgs/applications/virtualization/virtualbox/default.nix +++ b/pkgs/applications/virtualization/virtualbox/default.nix @@ -57,7 +57,7 @@ stdenv.mkDerivation { installPhase = '' # Install VirtualBox files cd out/linux.*/release/bin - ensureDir $out/virtualbox + mkdir -p $out/virtualbox cp -av * $out/virtualbox # Install kernel module @@ -76,7 +76,7 @@ stdenv.mkDerivation { make install # Create wrapper script - ensureDir $out/bin + mkdir -p $out/bin cp -v ${./VBox.sh} $out/bin/VBox.sh sed -i -e "s|@INSTALL_PATH@|$out/virtualbox|" \ -e "s|@QT4_PATH@|${qt4}/lib|" \ @@ -90,7 +90,7 @@ stdenv.mkDerivation { done # Create and fix desktop item - ensureDir $out/share/applications + mkdir -p $out/share/applications sed -i -e "s|Icon=VBox|Icon=$out/virtualbox/VBox.png|" $out/virtualbox/virtualbox.desktop ln -sfv $out/virtualbox/virtualbox.desktop $out/share/applications ''; diff --git a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix index 9dfe9c26c0d..f9adf6132f5 100644 --- a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix +++ b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation { buildInputs = [ patchelf cdrkit makeWrapper ]; installPhase = '' - ensureDir $out + mkdir -p $out cp -r install/* $out ''; @@ -78,10 +78,10 @@ stdenv.mkDerivation { sed -i -e "s|/usr/bin|$out/bin|" bin/VBoxClient-all # Install binaries - ensureDir $out/sbin + mkdir -p $out/sbin install -m 755 sbin/VBoxService $out/sbin - ensureDir $out/bin + mkdir -p $out/bin install -m 755 bin/VBoxClient $out/bin install -m 755 bin/VBoxControl $out/bin install -m 755 bin/VBoxClient-all $out/bin @@ -90,21 +90,21 @@ stdenv.mkDerivation { --prefix PATH : "${which}/bin" # Install OpenGL libraries - ensureDir $out/lib + mkdir -p $out/lib cp -v lib/VBoxOGL*.so $out/lib - ensureDir $out/lib/dri + mkdir -p $out/lib/dri ln -s $out/lib/VBoxOGL.so $out/lib/dri/vboxvideo_dri.so # Install desktop file - ensureDir $out/share/autostart + mkdir -p $out/share/autostart cp -v share/VBoxGuestAdditions/vboxclient.desktop $out/share/autostart # Install HAL FDI file - ensureDir $out/share/hal/fdi/policy + mkdir -p $out/share/hal/fdi/policy install -m 644 share/VBoxGuestAdditions/90-vboxguest.fdi $out/share/hal/fdi/policy # Install Xorg drivers - ensureDir $out/lib/xorg/modules/{drivers,input} + mkdir -p $out/lib/xorg/modules/{drivers,input} install -m 644 lib/VBoxGuestAdditions/vboxvideo_drv_19.so $out/lib/xorg/modules/drivers/vboxvideo_drv.so install -m 644 lib/VBoxGuestAdditions/vboxmouse_drv_19.so $out/lib/xorg/modules/input/vboxmouse_drv.so diff --git a/pkgs/applications/window-managers/stumpwm/default.nix b/pkgs/applications/window-managers/stumpwm/default.nix index 47ad4ec7aaf..db0b6e1037c 100644 --- a/pkgs/applications/window-managers/stumpwm/default.nix +++ b/pkgs/applications/window-managers/stumpwm/default.nix @@ -23,10 +23,10 @@ rec { ''); installation = fullDepEntry ('' - ensureDir $out/bin - ensureDir $out/share/stumpwm/doc - ensureDir $out/share/info - ensureDir $out/share/stumpwm/lisp + mkdir -p $out/bin + mkdir -p $out/share/stumpwm/doc + mkdir -p $out/share/info + mkdir -p $out/share/stumpwm/lisp cp stumpwm $out/bin cp contrib/stumpish $out/bin || true diff --git a/pkgs/applications/window-managers/vwm/default.nix b/pkgs/applications/window-managers/vwm/default.nix index 7329c48f41d..3613bb21ff6 100644 --- a/pkgs/applications/window-managers/vwm/default.nix +++ b/pkgs/applications/window-managers/vwm/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { ''; preInstall = '' - ensureDir $out/bin $out/include + mkdir -p $out/bin $out/include ''; buildInputs = [ ncurses pkgconfig glib libviper libpseudo gpm libvterm ]; diff --git a/pkgs/applications/window-managers/wmii31/default.nix b/pkgs/applications/window-managers/wmii31/default.nix index d5705af5ce1..50655a851e2 100644 --- a/pkgs/applications/window-managers/wmii31/default.nix +++ b/pkgs/applications/window-managers/wmii31/default.nix @@ -25,7 +25,7 @@ args: with args; stdenv.mkDerivation { set +e make &> /dev/null set -e - ensureDir \$out/bin + mkdir -p \$out/bin cp cmd/wmiimenu \$out/bin "; meta = { homepage = "www.suckless.org"; diff --git a/pkgs/build-support/builder-defs/builder-defs.nix b/pkgs/build-support/builder-defs/builder-defs.nix index ba13a0911f7..50ab7b9a6c1 100644 --- a/pkgs/build-support/builder-defs/builder-defs.nix +++ b/pkgs/build-support/builder-defs/builder-defs.nix @@ -320,7 +320,7 @@ let inherit (builtins) head tail trace; in # changing this ? see [1] doForceShare = fullDepEntry (" - ensureDir \"\$prefix/share\" + mkdir -p \"\$prefix/share\" for d in ${toString forceShare}; do if [ -d \"\$prefix/\$d\" -a ! -d \"\$prefix/share/\$d\" ]; then mv -v \"\$prefix/\$d\" \"\$prefix/share\" @@ -332,7 +332,7 @@ let inherit (builtins) head tail trace; in doForceCopy = fullDepEntry ('' name="$(basename $out)" name="''${name#*-}" - ensureDir "$prefix/share/$name" + mkdir -p "$prefix/share/$name" for f in ${toString forceCopy}; do cp -r "$f" "$prefix/share/$name/$f" || true done; @@ -393,7 +393,7 @@ let inherit (builtins) head tail trace; in preservePathWrapperArguments = ''''${PATH:+ --prefix PATH : $PATH }''; doPropagate = fullDepEntry (" - ensureDir \$out/nix-support + mkdir -p \$out/nix-support echo '${toString (attrByPath ["propagatedBuildInputs"] [] args)}' >\$out/nix-support/propagated-build-inputs ") ["minInit" "defEnsureDir"]; @@ -410,7 +410,7 @@ let inherit (builtins) head tail trace; in '') ["minInit" "addInputs" "doUnpack"]; doScons = fullDepEntry ('' - ensureDir $out + mkdir -p $out ${if (attrByPath ["sconsCleanEnv"] false args) then "" else '' @@ -462,13 +462,13 @@ let inherit (builtins) head tail trace; in x.text + "\n" + after ;}; createDirs = fullDepEntry (concatStringsSep ";" - (map (x: "ensureDir ${x}") (attrByPath ["neededDirs"] [] args)) + (map (x: "mkdir -p ${x}") (attrByPath ["neededDirs"] [] args)) ) ["minInit" "defEnsureDir"]; copyExtraDoc = fullDepEntry ('' name="$(basename $out)" name="''${name#*-}" - ensureDir "$out/share/doc/$name" + mkdir -p "$out/share/doc/$name" '' + (concatStringsSep ";" (map (x: ''cp "${x}" "$out/share/doc/$name" || true;'') @@ -547,11 +547,11 @@ let inherit (builtins) head tail trace; in installFonts = let retrievedName = (if args ? name then args.name else ""); in fullDepEntry ('' - ensureDir $out/share/fonts/truetype/public/${retrievedName} - ensureDir $out/share/fonts/opentype/public/${retrievedName} - ensureDir $out/share/fonts/type1/public/${retrievedName} - ensureDir $out/share/texmf/fonts/enc/${retrievedName} - ensureDir $out/share/texmf/fonts/map/${retrievedName} + mkdir -p $out/share/fonts/truetype/public/${retrievedName} + mkdir -p $out/share/fonts/opentype/public/${retrievedName} + mkdir -p $out/share/fonts/type1/public/${retrievedName} + mkdir -p $out/share/texmf/fonts/enc/${retrievedName} + mkdir -p $out/share/texmf/fonts/map/${retrievedName} cp *.ttf $out/share/fonts/truetype/public/${retrievedName} || echo No TrueType fonts cp *.otf $out/share/fonts/opentype/public/${retrievedName} || echo No OpenType fonts @@ -561,7 +561,7 @@ let inherit (builtins) head tail trace; in '') ["minInit" "defEnsureDir"]; simplyShare = shareName: fullDepEntry ('' - ensureDir $out/share + mkdir -p $out/share cp -r . $out/share/${shareName} '') ["doUnpack" "defEnsureDir"]; @@ -588,7 +588,7 @@ let inherit (builtins) head tail trace; in '') ["minInit"]; createPythonInstallationTarget = fullDepEntry ('' - ensureDir $(toPythonPath $out) + mkdir -p $(toPythonPath $out) export PYTHONPATH=$PYTHONPATH''${PYTHONPATH:+:}$(toPythonPath $out) '') ["minInit" "addInputs" "defEnsureDir"]; diff --git a/pkgs/build-support/clang-wrapper/builder.sh b/pkgs/build-support/clang-wrapper/builder.sh index fe714a0719a..9f1542e0411 100644 --- a/pkgs/build-support/clang-wrapper/builder.sh +++ b/pkgs/build-support/clang-wrapper/builder.sh @@ -1,8 +1,8 @@ source $stdenv/setup -ensureDir $out/bin -ensureDir $out/nix-support +mkdir -p $out/bin +mkdir -p $out/nix-support if test -z "$nativeLibc"; then diff --git a/pkgs/build-support/dotnetenv/build-solution.nix b/pkgs/build-support/dotnetenv/build-solution.nix index 07f1f89c67c..b1853bf7364 100644 --- a/pkgs/build-support/dotnetenv/build-solution.nix +++ b/pkgs/build-support/dotnetenv/build-solution.nix @@ -71,14 +71,14 @@ stdenv.mkDerivation { export AssemblySearchPaths=$assemblySearchPaths fi - ensureDir $out + mkdir -p $out MSBuild.exe ${toString slnFile} /nologo /t:${targets} /p:IntermediateOutputPath=$(cygpath --windows $out)\\ /p:OutputPath=$(cygpath --windows $out)\\ /verbosity:${verbosity} ${options} # Because .NET assemblies store strings as UTF-16 internally, we cannot detect # hashes. Therefore a text files containing the proper paths is created # We can also use this file the propagate transitive dependencies. - ensureDir $out/nix-support + mkdir -p $out/nix-support for i in ${toString assemblyInputs} do diff --git a/pkgs/build-support/fetchcvs/builder.sh b/pkgs/build-support/fetchcvs/builder.sh index 3a1df2553e1..6ee594b33b2 100644 --- a/pkgs/build-support/fetchcvs/builder.sh +++ b/pkgs/build-support/fetchcvs/builder.sh @@ -6,7 +6,7 @@ source $stdenv/setup # should work (but didn't - got no response on #cvs) # See als man Page for those options -ensureDir export +mkdir -p export if [ -n "$tag" ]; then tag="-r $tag" else diff --git a/pkgs/build-support/gcc-cross-wrapper/default.nix b/pkgs/build-support/gcc-cross-wrapper/default.nix index 8bf820e3d34..ab879c1841f 100644 --- a/pkgs/build-support/gcc-cross-wrapper/default.nix +++ b/pkgs/build-support/gcc-cross-wrapper/default.nix @@ -20,7 +20,7 @@ let phases = [ "installPhase" ]; installPhase = '' echo $out - ensureDir $out + mkdir -p $out cp -Rd ${gcc}/${cross.config}/lib $out/lib chmod -R +w $out/lib for a in $out/lib/*.la; do diff --git a/pkgs/build-support/gcc-upc-wrapper/builder.sh b/pkgs/build-support/gcc-upc-wrapper/builder.sh index 0c9dccf6edb..af121afe155 100644 --- a/pkgs/build-support/gcc-upc-wrapper/builder.sh +++ b/pkgs/build-support/gcc-upc-wrapper/builder.sh @@ -1,8 +1,8 @@ source $stdenv/setup -ensureDir $out/bin -ensureDir $out/nix-support +mkdir -p $out/bin +mkdir -p $out/nix-support if test -z "$nativeLibc"; then diff --git a/pkgs/build-support/gcc-wrapper/builder.sh b/pkgs/build-support/gcc-wrapper/builder.sh index 2e87d82f52c..ad2b8003f09 100644 --- a/pkgs/build-support/gcc-wrapper/builder.sh +++ b/pkgs/build-support/gcc-wrapper/builder.sh @@ -1,8 +1,8 @@ source $stdenv/setup -ensureDir $out/bin -ensureDir $out/nix-support +mkdir -p $out/bin +mkdir -p $out/nix-support if test -z "$nativeLibc"; then diff --git a/pkgs/build-support/kernel/make-initrd.sh b/pkgs/build-support/kernel/make-initrd.sh index 69931bad113..8d334447b6d 100644 --- a/pkgs/build-support/kernel/make-initrd.sh +++ b/pkgs/build-support/kernel/make-initrd.sh @@ -35,7 +35,7 @@ storePaths=$(perl $pathsFromGraph closure-*) # Put the closure in a gzipped cpio archive. -ensureDir $out +mkdir -p $out (cd root && find * -print0 | cpio -ov -H newc --null | gzip -9 > $out/initrd) if [ -n "$makeUInitrd" ]; then diff --git a/pkgs/build-support/kernel/modules-closure.sh b/pkgs/build-support/kernel/modules-closure.sh index faf6e92fdff..aa2615eb578 100644 --- a/pkgs/build-support/kernel/modules-closure.sh +++ b/pkgs/build-support/kernel/modules-closure.sh @@ -25,7 +25,7 @@ for module in $rootModules; do done echo "closure:" -ensureDir $out/lib/modules/"$version" +mkdir -p $out/lib/modules/"$version" for module in $closure; do target=$(echo $module | sed "s^$NIX_STORE.*/lib/modules/^$out/lib/modules/^") if test -e "$target"; then continue; fi diff --git a/pkgs/build-support/make-desktopitem/default.nix b/pkgs/build-support/make-desktopitem/default.nix index 7f3b97a33b7..c7f2aea2339 100644 --- a/pkgs/build-support/make-desktopitem/default.nix +++ b/pkgs/build-support/make-desktopitem/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation { inherit name; buildCommand = '' - ensureDir $out/share/applications + mkdir -p $out/share/applications cat > $out/share/applications/$name.desktop < $wrapper diff --git a/pkgs/build-support/native-darwin-cctools-wrapper/builder.sh b/pkgs/build-support/native-darwin-cctools-wrapper/builder.sh index c79b3709ee8..2e2e125c649 100644 --- a/pkgs/build-support/native-darwin-cctools-wrapper/builder.sh +++ b/pkgs/build-support/native-darwin-cctools-wrapper/builder.sh @@ -1,6 +1,6 @@ source $stdenv/setup -ensureDir $out/bin +mkdir -p $out/bin for i in ar as c++filt gprof ld nm nmedit ranlib size strings strip dsymutil libtool; do ln -s /usr/bin/$i $out/bin/ done diff --git a/pkgs/build-support/nuke-references/builder.sh b/pkgs/build-support/nuke-references/builder.sh index 3b9324073ef..9e8c464d828 100644 --- a/pkgs/build-support/nuke-references/builder.sh +++ b/pkgs/build-support/nuke-references/builder.sh @@ -1,6 +1,6 @@ source $stdenv/setup -ensureDir $out/bin +mkdir -p $out/bin cat > $out/bin/nuke-refs <> $out/bin/${w.name} < $out/nix-support/system # If `src' is the result of a call to `makeSourceTarball', then it diff --git a/pkgs/build-support/release/binary-tarball.nix b/pkgs/build-support/release/binary-tarball.nix index f8bb5282ee2..6901c9f5555 100644 --- a/pkgs/build-support/release/binary-tarball.nix +++ b/pkgs/build-support/release/binary-tarball.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation ( name = name + (if src ? version then "-" + src.version else ""); postHook = '' - ensureDir $out/nix-support + mkdir -p $out/nix-support echo "$system" > $out/nix-support/system # If `src' is the result of a call to `makeSourceTarball', then it @@ -62,7 +62,7 @@ stdenv.mkDerivation ( distPhase = '' - ensureDir $out/tarballs + mkdir -p $out/tarballs tar cvfj $out/tarballs/''${releaseName:-binary-dist}.tar.bz2 -C $TMPDIR/inst . ''; diff --git a/pkgs/build-support/release/debian-build.nix b/pkgs/build-support/release/debian-build.nix index 070a54fc945..8d2ea849a09 100644 --- a/pkgs/build-support/release/debian-build.nix +++ b/pkgs/build-support/release/debian-build.nix @@ -30,7 +30,7 @@ vmTools.runInLinuxImage (stdenv.mkDerivation ( # !!! cut&paste from rpm-build.nix postHook = '' - ensureDir $out/nix-support + mkdir -p $out/nix-support cat "$diskImage"/nix-support/full-name > $out/nix-support/full-name # If `src' is the result of a call to `makeSourceTarball', then it @@ -67,7 +67,7 @@ vmTools.runInLinuxImage (stdenv.mkDerivation ( --provides="${concatStringsSep "," debProvides}" \ make install - ensureDir $out/debs + mkdir -p $out/debs find . -name "*.deb" -exec cp {} $out/debs \; [ "$(echo $out/debs/*.deb)" != "" ] diff --git a/pkgs/build-support/release/maven-build.nix b/pkgs/build-support/release/maven-build.nix index 66dd10005f2..39f069cd57f 100644 --- a/pkgs/build-support/release/maven-build.nix +++ b/pkgs/build-support/release/maven-build.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation ( rec { setupPhase = '' runHook preSetupPhase - ensureDir $out/nix-support + mkdir -p $out/nix-support export LANG="en_US.UTF-8" export LOCALE_ARCHIVE=$glibcLocales/lib/locale/locale-archive export M2_REPO=$TMPDIR/repository @@ -74,7 +74,7 @@ stdenv.mkDerivation ( rec { ''; mvnRelease = '' - ensureDir $out/release + mkdir -p $out/release zip=$(ls target/*.zip| head -1) releaseName=$(basename $zip .zip) diff --git a/pkgs/build-support/release/nix-build.nix b/pkgs/build-support/release/nix-build.nix index a32f0e07a0c..64d8b8f1924 100644 --- a/pkgs/build-support/release/nix-build.nix +++ b/pkgs/build-support/release/nix-build.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation ( if test -n "$keepBuildDirectory"; then KEEPBUILDDIR="$out/`basename $TMPDIR`" header "Copying build directory to $KEEPBUILDDIR" - ensureDir $KEEPBUILDDIR + mkdir -p $KEEPBUILDDIR cp -R $TMPDIR/* $KEEPBUILDDIR stopNest fi @@ -56,7 +56,7 @@ stdenv.mkDerivation ( name = name + (if src ? version then "-" + src.version else ""); postHook = '' - ensureDir $out/nix-support + mkdir -p $out/nix-support echo "$system" > $out/nix-support/system if test -z "${toString doCoverageAnalysis}"; then diff --git a/pkgs/build-support/release/rpm-build.nix b/pkgs/build-support/release/rpm-build.nix index 326ccbe9c42..26b120e5b1d 100644 --- a/pkgs/build-support/release/rpm-build.nix +++ b/pkgs/build-support/release/rpm-build.nix @@ -14,7 +14,7 @@ vmTools.buildRPM ( name = name + "-" + diskImage.name + (if src ? version then "-" + src.version else ""); preBuild = '' - ensureDir $out/nix-support + mkdir -p $out/nix-support cat "$diskImage"/nix-support/full-name > $out/nix-support/full-name # If `src' is the result of a call to `makeSourceTarball', then it diff --git a/pkgs/build-support/release/source-tarball.nix b/pkgs/build-support/release/source-tarball.nix index 16ac0033d93..af8b9d3c789 100644 --- a/pkgs/build-support/release/source-tarball.nix +++ b/pkgs/build-support/release/source-tarball.nix @@ -73,7 +73,7 @@ stdenv.mkDerivation ( if test -n "$keepBuildDirectory"; then KEEPBUILDDIR="$out/`basename $TMPDIR`" header "Copying build directory to $KEEPBUILDDIR" - ensureDir $KEEPBUILDDIR + mkdir -p $KEEPBUILDDIR cp -R $TMPDIR/* $KEEPBUILDDIR stopNest fi @@ -91,7 +91,7 @@ stdenv.mkDerivation ( buildInputs = buildInputs ++ bootstrapBuildInputs; postHook = '' - ensureDir $out/nix-support + mkdir -p $out/nix-support ''; postUnpack = '' diff --git a/pkgs/build-support/substitute/substitute-all.sh b/pkgs/build-support/substitute/substitute-all.sh index 796a1a47152..ec220481fcc 100644 --- a/pkgs/build-support/substitute/substitute-all.sh +++ b/pkgs/build-support/substitute/substitute-all.sh @@ -7,7 +7,7 @@ args= target=$out if test -n "$dir"; then target=$out/$dir/$name - ensureDir $out/$dir + mkdir -p $out/$dir fi substituteAll $src $target diff --git a/pkgs/build-support/trivial-builders.nix b/pkgs/build-support/trivial-builders.nix index 5defdb55b95..1815c99a9f4 100644 --- a/pkgs/build-support/trivial-builders.nix +++ b/pkgs/build-support/trivial-builders.nix @@ -48,7 +48,7 @@ rec { makeSetupHook = { deps ? [], substitutions ? {} }: script: runCommand "hook" substitutions ('' - ensureDir $out/nix-support + mkdir -p $out/nix-support cp ${script} $out/nix-support/setup-hook '' + stdenv.lib.optionalString (deps != []) '' echo ${toString deps} > $out/nix-support/propagated-build-native-inputs diff --git a/pkgs/build-support/upstream-updater/attrset-to-dir.nix b/pkgs/build-support/upstream-updater/attrset-to-dir.nix index a05f80da085..bdf44b7a5bf 100644 --- a/pkgs/build-support/upstream-updater/attrset-to-dir.nix +++ b/pkgs/build-support/upstream-updater/attrset-to-dir.nix @@ -1,7 +1,7 @@ a : a.stdenv.mkDerivation rec { buildCommand = '' - ensureDir "$out/attributes" + mkdir -p "$out/attributes" '' + (a.lib.concatStrings (map (n: '' diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix index 207edce147b..63fc994af37 100644 --- a/pkgs/build-support/vm/default.nix +++ b/pkgs/build-support/vm/default.nix @@ -29,8 +29,8 @@ rec { allowedReferences = [ "out" modulesClosure ]; # prevent accidents like glibc being included in the initrd } '' - ensureDir $out/bin - ensureDir $out/lib + mkdir -p $out/bin + mkdir -p $out/lib # Copy what we need from Glibc. cp -p ${glibc}/lib/ld-linux*.so.? $out/lib @@ -364,8 +364,8 @@ rec { ${module_init_tools}/sbin/modprobe cramfs mknod /dev/loop0 b 7 0 - ensureDir $out - ensureDir tmp + mkdir -p $out + mkdir -p tmp mount -o loop,ro,ufstype=44bsd ${lib.optionalString (fs != null) "-t ${fs} "}${file} tmp || mount -o loop,ro ${lib.optionalString (fs != null) "-t ${fs} "}${file} tmp cp -Rv tmp/* $out/ || exit 0 @@ -388,8 +388,8 @@ rec { mknod /dev/mtd0 c 90 0 mknod /dev/mtdblock0 b 31 0 - ensureDir $out - ensureDir tmp + mkdir -p $out + mkdir -p tmp dd if=${file} of=/dev/mtd0 mount ${lib.optionalString (fs != null) "-t ${fs} "}/dev/mtdblock0 tmp @@ -610,7 +610,7 @@ rec { installPhase = '' eval "$preInstall" - ensureDir $out/$outDir + mkdir -p $out/$outDir find $rpmout -name "*.rpm" -exec cp {} $out/$outDir \; for i in $out/$outDir/*.rpm; do diff --git a/pkgs/build-support/vsenv/build-solution.nix b/pkgs/build-support/vsenv/build-solution.nix index 7d7d6a86e1f..32dd06abfaf 100644 --- a/pkgs/build-support/vsenv/build-solution.nix +++ b/pkgs/build-support/vsenv/build-solution.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation { installPhase = '' cd ${baseDir} vcbuild.exe /rebuild ${slnFile} - ensureDir $out + mkdir -p $out cp Debug/* $out ''; buildInputs = [ vs ] ++ extraBuildInputs; diff --git a/pkgs/data/documentation/pthread-man-pages/default.nix b/pkgs/data/documentation/pthread-man-pages/default.nix index a19c8bf8e9a..296ba982b8a 100644 --- a/pkgs/data/documentation/pthread-man-pages/default.nix +++ b/pkgs/data/documentation/pthread-man-pages/default.nix @@ -27,7 +27,7 @@ in ''; patchPhase = '' - ensureDir "$out/share/man/man3" + mkdir -p "$out/share/man/man3" sed -i "linuxthreads/man/Makefile" \ -e "s|MANDIR *=.*$|MANDIR = $out/share/man/man3| ; diff --git a/pkgs/data/documentation/rnrs/builder.sh b/pkgs/data/documentation/rnrs/builder.sh index 096dd2a8ca7..6ec5c855aba 100644 --- a/pkgs/data/documentation/rnrs/builder.sh +++ b/pkgs/data/documentation/rnrs/builder.sh @@ -4,9 +4,9 @@ source "$stdenv/setup" || exit 1 echo "source is \`$src', report name is \`$reportName'" -ensureDir "$out/share/info" && \ +mkdir -p "$out/share/info" && \ makeinfo -o "$out/share/info/${reportName}.info" "$src" # XXX: HTML output is apparently broken. -#ensureDir "$out/share/doc/${reportName}" && \ +#mkdir -p "$out/share/doc/${reportName}" && \ #makeinfo -o "$out/share/doc/${reportName}/html" --html --force "$src" diff --git a/pkgs/data/documentation/std-man-pages/default.nix b/pkgs/data/documentation/std-man-pages/default.nix index 221f76c36fa..3b45da914d2 100644 --- a/pkgs/data/documentation/std-man-pages/default.nix +++ b/pkgs/data/documentation/std-man-pages/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { }; installPhase = '' - ensureDir $out/share/man + mkdir -p $out/share/man cp -R * $out/share/man ''; diff --git a/pkgs/data/fonts/andagii/default.nix b/pkgs/data/fonts/andagii/default.nix index 8c2803c26d7..742f0bd0b4a 100644 --- a/pkgs/data/fonts/andagii/default.nix +++ b/pkgs/data/fonts/andagii/default.nix @@ -32,7 +32,7 @@ rec { '' ["addInputs"]; doInstall = a.fullDepEntry ('' - ensureDir "$out"/share/fonts/ttf/ + mkdir -p "$out"/share/fonts/ttf/ cp ANDAGII_.TTF "$out"/share/fonts/ttf/andagii.ttf '') ["defEnsureDir" "minInit"]; diff --git a/pkgs/data/fonts/bakoma-ttf/default.nix b/pkgs/data/fonts/bakoma-ttf/default.nix index c7f1ad38f47..5f9cbec7a97 100644 --- a/pkgs/data/fonts/bakoma-ttf/default.nix +++ b/pkgs/data/fonts/bakoma-ttf/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation { }; buildPhase = "true"; - installPhase = "ensureDir $out/share/fonts/truetype; cp ttf/*.ttf $out/share/fonts/truetype"; + installPhase = "mkdir -p $out/share/fonts/truetype; cp ttf/*.ttf $out/share/fonts/truetype"; meta = { description = "TrueType versions of the Computer Modern and AMS TeX Fonts"; diff --git a/pkgs/data/fonts/clearlyU/default.nix b/pkgs/data/fonts/clearlyU/default.nix index 32050ac5c28..2761ed6f3e6 100644 --- a/pkgs/data/fonts/clearlyU/default.nix +++ b/pkgs/data/fonts/clearlyU/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation { installPhase = '' - ensureDir $out/share/fonts + mkdir -p $out/share/fonts cp *.bdf $out/share/fonts cd $out/share/fonts mkfontdir diff --git a/pkgs/data/fonts/corefonts/default.nix b/pkgs/data/fonts/corefonts/default.nix index 75896e059bf..b26d3bd8c1d 100644 --- a/pkgs/data/fonts/corefonts/default.nix +++ b/pkgs/data/fonts/corefonts/default.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation { cabextract --lowercase viewer1.cab fontDir=$out/share/fonts/truetype - ensureDir $fontDir + mkdir -p $fontDir cp *.ttf $fontDir # Also put the EULA there to be on the safe side. diff --git a/pkgs/data/fonts/dejavu-fonts/default.nix b/pkgs/data/fonts/dejavu-fonts/default.nix index fb952f39604..505746b3edf 100644 --- a/pkgs/data/fonts/dejavu-fonts/default.nix +++ b/pkgs/data/fonts/dejavu-fonts/default.nix @@ -19,11 +19,11 @@ stdenv.mkDerivation { ln -s ${perl}/lib/*/*/unicore/* -t resources/ ''; installPhase = '' - ensureDir $out/share/fonts/truetype + mkdir -p $out/share/fonts/truetype for i in $(find build -name '*.ttf'); do cp $i $out/share/fonts/truetype; done; - ensureDir $out/share/dejavu-fonts + mkdir -p $out/share/dejavu-fonts cp -r build/* $out/share/dejavu-fonts ''; } diff --git a/pkgs/data/fonts/fontWrap/default.nix b/pkgs/data/fonts/fontWrap/default.nix index 927cc48575d..0d6750614d4 100644 --- a/pkgs/data/fonts/fontWrap/default.nix +++ b/pkgs/data/fonts/fontWrap/default.nix @@ -7,7 +7,7 @@ args : with args; in with localDefs; let doInstall = fullDepEntry (" - ensureDir \$out/share/fonts/ + mkdir -p \$out/share/fonts/ cd \$out/share/fonts for i in ${toString paths}; do find \$i -type f -exec ln -s '{}' . ';' ; diff --git a/pkgs/data/fonts/freefont-ttf/default.nix b/pkgs/data/fonts/freefont-ttf/default.nix index e1427a79f0d..0ff2ec7ba16 100644 --- a/pkgs/data/fonts/freefont-ttf/default.nix +++ b/pkgs/data/fonts/freefont-ttf/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { }; installPhase = '' - ensureDir $out/share/fonts/truetype + mkdir -p $out/share/fonts/truetype cp *.ttf $out/share/fonts/truetype ''; diff --git a/pkgs/data/fonts/junicode/default.nix b/pkgs/data/fonts/junicode/default.nix index eb7547e628f..1690f82aa37 100644 --- a/pkgs/data/fonts/junicode/default.nix +++ b/pkgs/data/fonts/junicode/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation { installPhase = '' - ensureDir $out/share/fonts/junicode-ttf + mkdir -p $out/share/fonts/junicode-ttf cp *.ttf $out/share/fonts/junicode-ttf ''; diff --git a/pkgs/data/fonts/lmodern/default.nix b/pkgs/data/fonts/lmodern/default.nix index a5dc014d8b4..831a3ddbd09 100644 --- a/pkgs/data/fonts/lmodern/default.nix +++ b/pkgs/data/fonts/lmodern/default.nix @@ -9,8 +9,8 @@ stdenv.mkDerivation { }; installPhase = '' - ensureDir $out/texmf/ - ensureDir $out/share/fonts/ + mkdir -p $out/texmf/ + mkdir -p $out/share/fonts/ cp -r ./* $out/texmf/ cp -r fonts/{opentype,type1} $out/share/fonts/ diff --git a/pkgs/data/fonts/mph-2b-damase/default.nix b/pkgs/data/fonts/mph-2b-damase/default.nix index ceca85a0d23..7fe56987ad3 100644 --- a/pkgs/data/fonts/mph-2b-damase/default.nix +++ b/pkgs/data/fonts/mph-2b-damase/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation { unzip $src; ''; installPhase = '' - ensureDir $out/share/fonts/truetype + mkdir -p $out/share/fonts/truetype cp *.ttf $out/share/fonts/truetype ''; } diff --git a/pkgs/data/fonts/redhat-liberation-fonts/default.nix b/pkgs/data/fonts/redhat-liberation-fonts/default.nix index cb1225763fd..c331b85029d 100644 --- a/pkgs/data/fonts/redhat-liberation-fonts/default.nix +++ b/pkgs/data/fonts/redhat-liberation-fonts/default.nix @@ -8,10 +8,10 @@ stdenv.mkDerivation rec { }; installPhase = '' - ensureDir $out/share/fonts/truetype + mkdir -p $out/share/fonts/truetype cp -v *.ttf $out/share/fonts/truetype - ensureDir "$out/doc/${name}" + mkdir -p "$out/doc/${name}" cp -v AUTHORS ChangeLog COPYING License.txt README "$out/doc/${name}" ''; diff --git a/pkgs/data/fonts/ttf-bitstream-vera/default.nix b/pkgs/data/fonts/ttf-bitstream-vera/default.nix index 57f463ba64c..64b18ffdaaa 100644 --- a/pkgs/data/fonts/ttf-bitstream-vera/default.nix +++ b/pkgs/data/fonts/ttf-bitstream-vera/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation { buildPhase = "true"; installPhase = " fontDir=$out/share/fonts/truetype - ensureDir $fontDir + mkdir -p $fontDir cp *.ttf $fontDir "; } diff --git a/pkgs/data/fonts/unifont/default.nix b/pkgs/data/fonts/unifont/default.nix index 76d2f3b28c1..79d1a090905 100644 --- a/pkgs/data/fonts/unifont/default.nix +++ b/pkgs/data/fonts/unifont/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation { installPhase = '' - ensureDir $out/share/fonts $out/share/fonts/truetype + mkdir -p $out/share/fonts $out/share/fonts/truetype cp ${pcf} $out/share/fonts/unifont.pcf.gz gunzip < ${ttf} > $out/share/fonts/truetype/unifont.ttf cd $out/share/fonts diff --git a/pkgs/data/fonts/vista-fonts/default.nix b/pkgs/data/fonts/vista-fonts/default.nix index 73dcf368d72..19996f3f1a3 100644 --- a/pkgs/data/fonts/vista-fonts/default.nix +++ b/pkgs/data/fonts/vista-fonts/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { buildPhase = "true"; installPhase = " - ensureDir $out/share/fonts/truetype; cp *.ttf $out/share/fonts/truetype + mkdir -p $out/share/fonts/truetype; cp *.ttf $out/share/fonts/truetype "; meta = { diff --git a/pkgs/data/fonts/wqy-zenhei/default.nix b/pkgs/data/fonts/wqy-zenhei/default.nix index ba38d8dc1ab..698ecc53046 100644 --- a/pkgs/data/fonts/wqy-zenhei/default.nix +++ b/pkgs/data/fonts/wqy-zenhei/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { installPhase = '' - ensureDir $out/share/fonts + mkdir -p $out/share/fonts cp *.ttf $out/share/fonts ''; diff --git a/pkgs/data/misc/cacert/default.nix b/pkgs/data/misc/cacert/default.nix index 6156cf17f16..4db1e84b485 100644 --- a/pkgs/data/misc/cacert/default.nix +++ b/pkgs/data/misc/cacert/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { installPhase = '' - ensureDir $out/etc + mkdir -p $out/etc bunzip2 < $src > $out/etc/ca-bundle.crt ''; diff --git a/pkgs/data/sgml+xml/schemas/docbook-5.0/builder.sh b/pkgs/data/sgml+xml/schemas/docbook-5.0/builder.sh index e0cdb22e23c..96ad77eaa57 100644 --- a/pkgs/data/sgml+xml/schemas/docbook-5.0/builder.sh +++ b/pkgs/data/sgml+xml/schemas/docbook-5.0/builder.sh @@ -4,14 +4,14 @@ unpackFile $src cd docbook-* -ensureDir $out/xml/rng +mkdir -p $out/xml/rng cp -prv rng $out/xml/rng/docbook -ensureDir $out/xml/dtd +mkdir -p $out/xml/dtd cp -prv dtd $out/xml/dtd/docbook -ensureDir $out/share/doc +mkdir -p $out/share/doc cp -prv docs $out/share/doc/docbook -ensureDir $out/share/docbook +mkdir -p $out/share/docbook cp -prv tools $out/share/docbook/ diff --git a/pkgs/data/sgml+xml/schemas/xml-dtd/xhtml1/default.nix b/pkgs/data/sgml+xml/schemas/xml-dtd/xhtml1/default.nix index cdcf62467db..8e626e3bc52 100644 --- a/pkgs/data/sgml+xml/schemas/xml-dtd/xhtml1/default.nix +++ b/pkgs/data/sgml+xml/schemas/xml-dtd/xhtml1/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation { installPhase = '' - ensureDir $out/xml/dtd/xhtml1 + mkdir -p $out/xml/dtd/xhtml1 cp DTD/*.ent DTD/*.dtd $out/xml/dtd/xhtml1 # Generate an XML catalog. diff --git a/pkgs/data/sgml+xml/stylesheets/xslt/docbook-xsl-ns/default.nix b/pkgs/data/sgml+xml/stylesheets/xslt/docbook-xsl-ns/default.nix index 978bbcbd5a7..c143ce16698 100644 --- a/pkgs/data/sgml+xml/stylesheets/xslt/docbook-xsl-ns/default.nix +++ b/pkgs/data/sgml+xml/stylesheets/xslt/docbook-xsl-ns/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { installPhase = '' - ensureDir $out/xml/xsl + mkdir -p $out/xml/xsl cd .. mv docbook-xsl-ns-* $out/xml/xsl/docbook ''; diff --git a/pkgs/data/sgml+xml/stylesheets/xslt/docbook-xsl/builder.sh b/pkgs/data/sgml+xml/stylesheets/xslt/docbook-xsl/builder.sh index 1534806895c..9ac8e74d93a 100644 --- a/pkgs/data/sgml+xml/stylesheets/xslt/docbook-xsl/builder.sh +++ b/pkgs/data/sgml+xml/stylesheets/xslt/docbook-xsl/builder.sh @@ -1,6 +1,6 @@ source $stdenv/setup -ensureDir $out +mkdir -p $out cd $out unpackFile $src mkdir xml diff --git a/pkgs/desktops/gnome-2/platform/gtk-doc/default.nix b/pkgs/desktops/gnome-2/platform/gtk-doc/default.nix index 90a9088d456..c5086accc0d 100644 --- a/pkgs/desktops/gnome-2/platform/gtk-doc/default.nix +++ b/pkgs/desktops/gnome-2/platform/gtk-doc/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation { # maybe there is a better way to pass the needed dtd and xsl files # "-//OASIS//DTD DocBook XML V4.1.2//EN" and "http://docbook.sourceforge.net/release/xsl/current/html/chunk.xsl" preConfigure = '' - ensureDir $out/nix-support + mkdir -p $out/nix-support cat > $out/nix-support/catalog.xml << EOF diff --git a/pkgs/development/compilers/abc/builder-binjar.sh b/pkgs/development/compilers/abc/builder-binjar.sh index 9faa0541c6c..a954c49aa3f 100644 --- a/pkgs/development/compilers/abc/builder-binjar.sh +++ b/pkgs/development/compilers/abc/builder-binjar.sh @@ -1,4 +1,4 @@ source $stdenv/setup -ensureDir $out/jars +mkdir -p $out/jars cp $src $out/jars/$jarname.jar diff --git a/pkgs/development/compilers/abc/builder.sh b/pkgs/development/compilers/abc/builder.sh index 36d2e4e68e1..ba594023842 100644 --- a/pkgs/development/compilers/abc/builder.sh +++ b/pkgs/development/compilers/abc/builder.sh @@ -23,7 +23,7 @@ EOF $apacheAnt/bin/ant jars -ensureDir $out/jars +mkdir -p $out/jars cp lib/abc.jar $out/jars cp lib/abc-runtime.jar $out/jars @@ -31,7 +31,7 @@ cp lib/abc-testing.jar $out/jars cp lib/abc-complete.jar $out/jars # Create the executable abc script -ensureDir $out/bin +mkdir -p $out/bin cat > $out/bin/abc < "$out"/bin/"$(basename "$i")" chmod a+x "$out"/bin/"$(basename "$i")" diff --git a/pkgs/development/compilers/cmucl/binary.nix b/pkgs/development/compilers/cmucl/binary.nix index 1e5c7d4febc..11d0b723ce4 100644 --- a/pkgs/development/compilers/cmucl/binary.nix +++ b/pkgs/development/compilers/cmucl/binary.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation { name = "cmucl-binary-${version}"; buildCommand = '' - ensureDir $out + mkdir -p $out tar -C $out -xjf ${dist} patchelf --set-interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \ $out/bin/lisp diff --git a/pkgs/development/compilers/eql/default.nix b/pkgs/development/compilers/eql/default.nix index 70d30947224..4e288824713 100644 --- a/pkgs/development/compilers/eql/default.nix +++ b/pkgs/development/compilers/eql/default.nix @@ -64,7 +64,7 @@ rec { doDeploy = a.fullDepEntry ('' cd .. - ensureDir $out/bin $out/lib/eql/ $out/include $out/include/gen $out/lib + mkdir -p $out/bin $out/lib/eql/ $out/include $out/include/gen $out/lib cp -r . $out/lib/eql/build-dir ln -s $out/lib/eql/build-dir/eql $out/bin ln -s $out/lib/eql/build-dir/src/*.h $out/include diff --git a/pkgs/development/compilers/fpc/lazarus.nix b/pkgs/development/compilers/fpc/lazarus.nix index d8830c4e249..1cb4e479e37 100644 --- a/pkgs/development/compilers/fpc/lazarus.nix +++ b/pkgs/development/compilers/fpc/lazarus.nix @@ -23,7 +23,7 @@ rec { preBuild = fullDepEntry ('' export NIX_LDFLAGS='-lXi -lX11 -lglib-2.0 -lgtk-x11-2.0 -lgdk-x11-2.0 -lc -lXext -lpango-1.0 -latk-1.0 -lgdk_pixbuf-2.0 -lcairo' export LCL_PLATFORM=gtk2 - ensureDir $out/share + mkdir -p $out/share tar xf ${fpc.src} --strip-components=1 -C $out/share -m sed -e 's@/usr/fpcsrc@'"$out/share/fpcsrc@" -i ide/include/unix/lazbaseconf.inc '') diff --git a/pkgs/development/compilers/ghc/6.10.2-binary.nix b/pkgs/development/compilers/ghc/6.10.2-binary.nix index bda8372e6c4..616c9de7ede 100644 --- a/pkgs/development/compilers/ghc/6.10.2-binary.nix +++ b/pkgs/development/compilers/ghc/6.10.2-binary.nix @@ -70,11 +70,11 @@ stdenv.mkDerivation rec { postInstall = (if stdenv.isDarwin then '' - ensureDir $out/frameworks/GMP.framework/Versions/A + mkdir -p $out/frameworks/GMP.framework/Versions/A ln -s ${gmp}/lib/libgmp.dylib $out/frameworks/GMP.framework/GMP ln -s ${gmp}/lib/libgmp.dylib $out/frameworks/GMP.framework/Versions/A/GMP # !!! fix this - ensureDir $out/frameworks/GNUeditline.framework/Versions/A + mkdir -p $out/frameworks/GNUeditline.framework/Versions/A ln -s ${libedit}/lib/libeditline.dylib $out/frameworks/GNUeditline.framework/GNUeditline ln -s ${libedit}/lib/libeditline.dylib $out/frameworks/GNUeditline.framework/Versions/A/GNUeditline diff --git a/pkgs/development/compilers/ghc/6.12.1-binary.nix b/pkgs/development/compilers/ghc/6.12.1-binary.nix index 6394780eb68..a84b75d705b 100644 --- a/pkgs/development/compilers/ghc/6.12.1-binary.nix +++ b/pkgs/development/compilers/ghc/6.12.1-binary.nix @@ -75,7 +75,7 @@ stdenv.mkDerivation rec { postInstall = (if stdenv.isDarwin then '' - ensureDir $out/frameworks/GMP.framework/Versions/A + mkdir -p $out/frameworks/GMP.framework/Versions/A ln -s ${gmp}/lib/libgmp.dylib $out/frameworks/GMP.framework/GMP ln -s ${gmp}/lib/libgmp.dylib $out/frameworks/GMP.framework/Versions/A/GMP # !!! fix this diff --git a/pkgs/development/compilers/ghc/6.4.2-binary.nix b/pkgs/development/compilers/ghc/6.4.2-binary.nix index 63cc08db34b..2ed6f2be4fe 100644 --- a/pkgs/development/compilers/ghc/6.4.2-binary.nix +++ b/pkgs/development/compilers/ghc/6.4.2-binary.nix @@ -49,10 +49,10 @@ stdenv.mkDerivation { # that the executables work with no special setup. postInstall = if stdenv.isDarwin then '' - ensureDir $out/frameworks/GMP.framework/Versions/A + mkdir -p $out/frameworks/GMP.framework/Versions/A ln -s ${gmp}/lib/libgmp.dylib $out/frameworks/GMP.framework/GMP ln -s ${gmp}/lib/libgmp.dylib $out/frameworks/GMP.framework/Versions/A/GMP - ensureDir $out/frameworks/GNUreadline.framework/Versions/A + mkdir -p $out/frameworks/GNUreadline.framework/Versions/A ln -s ${readline}/lib/libreadline.dylib $out/frameworks/GNUreadline.framework/GNUreadline ln -s ${readline}/lib/libreadline.dylib $out/frameworks/GNUreadline.framework/Versions/A/GNUreadline diff --git a/pkgs/development/compilers/ghc/6.6.1.nix b/pkgs/development/compilers/ghc/6.6.1.nix index c54c32bfab0..994ebc286c3 100644 --- a/pkgs/development/compilers/ghc/6.6.1.nix +++ b/pkgs/development/compilers/ghc/6.6.1.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation (rec { }; postInstall = '' - ensureDir "$out/nix-support" + mkdir -p "$out/nix-support" echo "# Path to the GHC compiler directory in the store" > $out/nix-support/setup-hook echo "ghc=$out" >> $out/nix-support/setup-hook echo "" >> $out/nix-support/setup-hook diff --git a/pkgs/development/compilers/ghc/with-packages.nix b/pkgs/development/compilers/ghc/with-packages.nix index 19ce4eabf42..63427ea8278 100644 --- a/pkgs/development/compilers/ghc/with-packages.nix +++ b/pkgs/development/compilers/ghc/with-packages.nix @@ -15,9 +15,9 @@ stdenv.mkDerivation rec { linkedTopDir="$out/lib" linkedPkgDir="$linkedTopDir/package.conf.d" - ensureDir $out/bin - ensureDir $linkedTopDir - ensureDir $linkedPkgDir + mkdir -p $out/bin + mkdir -p $linkedTopDir + mkdir -p $linkedPkgDir echo "Linking GHC core libraries:" diff --git a/pkgs/development/compilers/ghc/wrapper.nix b/pkgs/development/compilers/ghc/wrapper.nix index 60342a14a61..b04cd18fb46 100644 --- a/pkgs/development/compilers/ghc/wrapper.nix +++ b/pkgs/development/compilers/ghc/wrapper.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation { unpackPhase = "true"; installPhase = '' - ensureDir $out/bin + mkdir -p $out/bin cp $GHCGetPackages $out/bin/ghc-get-packages.sh chmod 755 $out/bin/ghc-get-packages.sh for prg in ghc ghci ghc-${ghc.version} ghci-${ghc.version}; do @@ -41,7 +41,7 @@ stdenv.mkDerivation { done EOF chmod +x $out/bin/ghc-packages - ensureDir $out/nix-support + mkdir -p $out/nix-support ln -s $out/nix-support/propagated-build-inputs $out/nix-support/propagated-user-env-packages ''; diff --git a/pkgs/development/compilers/gnatboot/default.nix b/pkgs/development/compilers/gnatboot/default.nix index 954fb6bf594..79208743ae4 100644 --- a/pkgs/development/compilers/gnatboot/default.nix +++ b/pkgs/development/compilers/gnatboot/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation { dontStrip=1; installPhase = '' - ensureDir $out + mkdir -p $out cp -R * $out set +e for a in $out/bin/* ; do diff --git a/pkgs/development/compilers/go/default.nix b/pkgs/development/compilers/go/default.nix index 3f2c3274822..143c091a1dc 100644 --- a/pkgs/development/compilers/go/default.nix +++ b/pkgs/development/compilers/go/default.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation { else throw "Unsupported system"; installPhase = '' - ensureDir "$out/bin" + mkdir -p "$out/bin" export GOROOT="$(pwd)/" export GOBIN="$out/bin" export PATH="$GOBIN:$PATH" @@ -57,7 +57,7 @@ stdenv.mkDerivation { # Handle Libraries and make them availabale under /share/go. export GOLIB="pkg/"$GOOS"_"$GOARCH - ensureDir "$out/lib/go/$GOLIB" + mkdir -p "$out/lib/go/$GOLIB" cp -r ./$GOLIB $out/lib/go/pkg/ # this line set $AS $CC $GC $LD @@ -75,7 +75,7 @@ stdenv.mkDerivation { --set "GOARCH" "$GOARCH" # Copy the emacs configuration for Go files. - ensureDir "$out/share/emacs/site-lisp" + mkdir -p "$out/share/emacs/site-lisp" cp ./misc/emacs/* $out/share/emacs/site-lisp/ # */ ''; diff --git a/pkgs/development/compilers/gwt/builder.sh b/pkgs/development/compilers/gwt/builder.sh index d260bd559dc..b14a0432ea5 100644 --- a/pkgs/development/compilers/gwt/builder.sh +++ b/pkgs/development/compilers/gwt/builder.sh @@ -1,14 +1,14 @@ source $stdenv/setup tar xfvj $src -ensureDir $out +mkdir -p $out cp -av $name $out # Create wrapper scripts so that the GWT compiler/host work libPath="$libstdcpp5/lib:$glib/lib:$gtk/lib:$atk/lib:$pango/lib:$libX11/lib:$libXt/lib:$out/$name/mozilla-1.7.12" -ensureDir $out/bin +mkdir -p $out/bin cat > $out/bin/gwt-compile < $target" - ensureDir $out/$(dirname $target) + mkdir -p $out/$(dirname $target) cp -p "$source" $out/"$target" done < $filemap diff --git a/pkgs/development/compilers/visual-c++/test/builder.sh b/pkgs/development/compilers/visual-c++/test/builder.sh index 8adb7e466ee..c11ffc574a8 100644 --- a/pkgs/development/compilers/visual-c++/test/builder.sh +++ b/pkgs/development/compilers/visual-c++/test/builder.sh @@ -2,5 +2,5 @@ source $stdenv/setup source $visualcpp/setup source $windowssdk/setup -ensureDir $out/bin +mkdir -p $out/bin cl "$(cygpath -w $src)" /Fe"$(cygpath -w $out/bin/hello.exe)" user32.lib diff --git a/pkgs/development/compilers/vs90wrapper/default.nix b/pkgs/development/compilers/vs90wrapper/default.nix index 47d7c2654a1..341833fdf47 100644 --- a/pkgs/development/compilers/vs90wrapper/default.nix +++ b/pkgs/development/compilers/vs90wrapper/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation { name = "visual-studio-9.0"; buildCommand = '' - ensureDir $out/bin + mkdir -p $out/bin ln -s "/cygdrive/c/Program Files/Microsoft Visual Studio 9.0/VC/vcpackages/vcbuild.exe" $out/bin/vcbuild.exe ''; } diff --git a/pkgs/development/interpreters/acl2/default.nix b/pkgs/development/interpreters/acl2/default.nix index 6cad083ac85..6d074ac9f27 100644 --- a/pkgs/development/interpreters/acl2/default.nix +++ b/pkgs/development/interpreters/acl2/default.nix @@ -28,7 +28,7 @@ rec { cd $out/share/${installSuffix} make LISP=${a.sbcl}/bin/sbcl make LISP=${a.sbcl}/bin/sbcl regression - ensureDir "$out/bin" + mkdir -p "$out/bin" cp saved_acl2 "$out/bin/acl2" '') ["doDeploy" "addInputs" "defEnsureDir"]; diff --git a/pkgs/development/interpreters/angelscript/default.nix b/pkgs/development/interpreters/angelscript/default.nix index 65ff72bae56..24edb2ec4df 100644 --- a/pkgs/development/interpreters/angelscript/default.nix +++ b/pkgs/development/interpreters/angelscript/default.nix @@ -32,7 +32,7 @@ rec { prepareBuild = a.fullDepEntry '' cd angelscript/projects/gnuc sed -i makefile -e "s@LOCAL = .*@LOCAL = $out@" - ensureDir "$out/lib" "$out/bin" "$out/share" "$out/include" + mkdir -p "$out/lib" "$out/bin" "$out/share" "$out/include" export SHARED=1 export VERSION="${version}" '' ["minInit" "addInputs" "doUnpack" "defEnsureDir"]; @@ -42,7 +42,7 @@ rec { '' ["minInit"]; installDocs = a.fullDepEntry '' - ensureDir "$out/share/angelscript" + mkdir -p "$out/share/angelscript" cp -r ../../../docs "$out/share/angelscript" '' ["defEnsureDir" "prepareBuild"]; diff --git a/pkgs/development/interpreters/clojure/binary.nix b/pkgs/development/interpreters/clojure/binary.nix index 7b53ea9022d..8cf350e7e97 100644 --- a/pkgs/development/interpreters/clojure/binary.nix +++ b/pkgs/development/interpreters/clojure/binary.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation { phases = "unpackPhase installPhase"; installPhase = " - ensureDir $out/lib/java + mkdir -p $out/lib/java install -t $out/lib/java clojure.jar "; diff --git a/pkgs/development/interpreters/clojure/clooj.nix b/pkgs/development/interpreters/clojure/clooj.nix index 23bf9ad03b7..2ad6f751f2b 100644 --- a/pkgs/development/interpreters/clojure/clooj.nix +++ b/pkgs/development/interpreters/clojure/clooj.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation { phases = "installPhase"; installPhase = '' - ensureDir $out/lib/java + mkdir -p $out/lib/java ln -s ${jar} $out/lib/java/clooj.jar ''; diff --git a/pkgs/development/interpreters/clojure/default.nix b/pkgs/development/interpreters/clojure/default.nix index f829beda7ba..f68b89f0398 100644 --- a/pkgs/development/interpreters/clojure/default.nix +++ b/pkgs/development/interpreters/clojure/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation { buildPhase = "ant"; installPhase = " - ensureDir $out/lib/java + mkdir -p $out/lib/java install -t $out/lib/java clojure.jar "; diff --git a/pkgs/development/interpreters/groovy/default.nix b/pkgs/development/interpreters/groovy/default.nix index cc994aeea34..593cc61dc41 100644 --- a/pkgs/development/interpreters/groovy/default.nix +++ b/pkgs/development/interpreters/groovy/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { }; installPhase = '' - ensureDir $out + mkdir -p $out rm bin/*.bat mv * $out ''; diff --git a/pkgs/development/interpreters/j/default.nix b/pkgs/development/interpreters/j/default.nix index 3be0e8aa117..d4a1ab85b13 100644 --- a/pkgs/development/interpreters/j/default.nix +++ b/pkgs/development/interpreters/j/default.nix @@ -53,11 +53,11 @@ rec { '' ["doUnpack" "addInputs" "minInit"]; doDeploy = a.fullDepEntry '' - ensureDir "$out" + mkdir -p "$out" cp -r j/bin "$out/bin" rm "$out/bin/profilex_template.ijs" - ensureDir "$out/share/j" + mkdir -p "$out/share/j" cp -r docs j/addons j/system "$out/share/j" '' ["doUnpack" "doBuildJ" "minInit" "defEnsureDir"]; diff --git a/pkgs/development/interpreters/jruby/default.nix b/pkgs/development/interpreters/jruby/default.nix index d26ab694934..1e402e14e7d 100644 --- a/pkgs/development/interpreters/jruby/default.nix +++ b/pkgs/development/interpreters/jruby/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation { sha256 = "1q3cjshxk484i8gqxm682bxcrps7205nl9vlim4s6z827bjlmc4a"; }; - installPhase = '' ensureDir $out; cp -r * $out ''; + installPhase = '' mkdir -p $out; cp -r * $out ''; meta = { description = "Ruby interpreter written in Java"; diff --git a/pkgs/development/interpreters/kona/default.nix b/pkgs/development/interpreters/kona/default.nix index 2e433e11033..7e4f1e408b4 100644 --- a/pkgs/development/interpreters/kona/default.nix +++ b/pkgs/development/interpreters/kona/default.nix @@ -29,7 +29,7 @@ rec { makeFlags = ["PREFIX=\$out"]; prepareOut = a.fullDepEntry '' - ensureDir "$out/bin" + mkdir -p "$out/bin" '' ["minInit" "defEnsureDir"]; meta = { diff --git a/pkgs/development/interpreters/lua-5/default.nix b/pkgs/development/interpreters/lua-5/default.nix index 06703e12210..c11a9d10d7b 100644 --- a/pkgs/development/interpreters/lua-5/default.nix +++ b/pkgs/development/interpreters/lua-5/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation { postInstall = '' sed -i -e "s@/usr/local@$out@" etc/lua.pc sed -i -e "s@-llua -lm@-llua -lm -ldl@" etc/lua.pc - ensureDir "$out/lib/pkgconfig" + mkdir -p "$out/lib/pkgconfig" install -m 644 etc/lua.pc $out/lib/pkgconfig/lua.pc ''; buildInputs = [ ncurses readline ]; diff --git a/pkgs/development/interpreters/maude/default.nix b/pkgs/development/interpreters/maude/default.nix index f5d4fd09015..de1a14b522b 100644 --- a/pkgs/development/interpreters/maude/default.nix +++ b/pkgs/development/interpreters/maude/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { postInstall = '' for n in "$out/bin/"*; do wrapProgram "$n" --suffix MAUDE_LIB ':' "$out/share/maude"; done - ensureDir $out/share/maude + mkdir -p $out/share/maude cp ${fullMaude} $out/share/maude/full-maude.maude ''; diff --git a/pkgs/development/interpreters/perl/5.8/default.nix b/pkgs/development/interpreters/perl/5.8/default.nix index 4b965999910..c421e2768cd 100644 --- a/pkgs/development/interpreters/perl/5.8/default.nix +++ b/pkgs/development/interpreters/perl/5.8/default.nix @@ -25,7 +25,7 @@ preBuild() { } postInstall() { - ensureDir "$out/nix-support" + mkdir -p "$out/nix-support" cp $setupHook $out/nix-support/setup-hook } diff --git a/pkgs/development/interpreters/php-xdebug/default.nix b/pkgs/development/interpreters/php-xdebug/default.nix index 74aba643ee7..5a242f3c85a 100644 --- a/pkgs/development/interpreters/php-xdebug/default.nix +++ b/pkgs/development/interpreters/php-xdebug/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation { ''; installPhase = '' - ensureDir $out/lib/xdebug + mkdir -p $out/lib/xdebug cp modules/xdebug.so $out/lib cp LICENSE $out/lib/xdebug ''; diff --git a/pkgs/development/interpreters/picolisp/default.nix b/pkgs/development/interpreters/picolisp/default.nix index 298c12d271a..196e7068e14 100644 --- a/pkgs/development/interpreters/picolisp/default.nix +++ b/pkgs/development/interpreters/picolisp/default.nix @@ -41,7 +41,7 @@ rec { sed -e "s@/usr/@$out/@g" -i bin/pil - ensureDir "$out/share/picolisp" "$out/lib" "$out/bin" + mkdir -p "$out/share/picolisp" "$out/lib" "$out/bin" cp -r . "$out/share/picolisp/build-dir" ln -s "$out/share/picolisp/build-dir" "$out/lib/picolisp" ln -s "$out/lib/picolisp/bin/picolisp" "$out/bin/picolisp" diff --git a/pkgs/development/interpreters/python/pythonhome-wrapper.nix b/pkgs/development/interpreters/python/pythonhome-wrapper.nix index 2afbafe7b91..c9cf6277b24 100644 --- a/pkgs/development/interpreters/python/pythonhome-wrapper.nix +++ b/pkgs/development/interpreters/python/pythonhome-wrapper.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation { unpackPhase = "true"; installPhase = '' - ensureDir $out/bin + mkdir -p $out/bin echo ' #!/bin/sh diff --git a/pkgs/development/interpreters/python/wrapper.nix b/pkgs/development/interpreters/python/wrapper.nix index 6f29f79e2c1..727b9cbc676 100644 --- a/pkgs/development/interpreters/python/wrapper.nix +++ b/pkgs/development/interpreters/python/wrapper.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation { unpackPhase = "true"; installPhase = '' - ensureDir "$out/bin" + mkdir -p "$out/bin" for prg in 2to3 idle pydoc python python-config python${python.majorVersion} python${python.majorVersion}-config smtpd.py; do makeWrapper "$python/bin/$prg" "$out/bin/$prg" --suffix PYTHONPATH : "$PYTHONPATH" done diff --git a/pkgs/development/interpreters/spidermonkey/builder.sh b/pkgs/development/interpreters/spidermonkey/builder.sh index b0cfe6c9ed6..91110159665 100644 --- a/pkgs/development/interpreters/spidermonkey/builder.sh +++ b/pkgs/development/interpreters/spidermonkey/builder.sh @@ -22,9 +22,9 @@ $MAKE printlibraries $MAKE printprograms $MAKE -ensureDir $out -ensureDir $out/bin -ensureDir $out/lib +mkdir -p $out +mkdir -p $out/bin +mkdir -p $out/lib # Install the binaries that have been created. install $(cat PROGRAMS) $out/bin diff --git a/pkgs/development/libraries/Xaw3d/builder.sh b/pkgs/development/libraries/Xaw3d/builder.sh index afd640b625d..ff42e47ea56 100644 --- a/pkgs/development/libraries/Xaw3d/builder.sh +++ b/pkgs/development/libraries/Xaw3d/builder.sh @@ -15,7 +15,7 @@ installPhase() { make install SHLIBDIR=$out/lib USRLIBDIR=$out/lib INCDIR=$out/include cd $out/include/X11 && ln -s Xaw3d Xaw - ensureDir "$out/nix-support" + mkdir -p "$out/nix-support" echo "$propagatedBuildInputs" > "$out/nix-support/propagated-build-inputs" } diff --git a/pkgs/development/libraries/box2d/2.0.1.nix b/pkgs/development/libraries/box2d/2.0.1.nix index 9aa08caf00f..c15e27695ac 100644 --- a/pkgs/development/libraries/box2d/2.0.1.nix +++ b/pkgs/development/libraries/box2d/2.0.1.nix @@ -48,14 +48,14 @@ rec { ''; doDeploy = a.fullDepEntry '' - ensureDir "$out"/lib - ensureDir "$out"/include/Box2D + mkdir -p "$out"/lib + mkdir -p "$out"/include/Box2D cp Library/* Source/Gen/float/lib*.{a,so} "$out"/lib cp -r Source "$out"/include/Box2D/Source find "$out"/include/Box2D/Source ! -name '*.h' -exec rm '{}' ';' sed -e s@../Source@Box2D/Source@ -i Include/Box2D.h cp Include/Box2D.h "$out"/include/Box2D - ensureDir "$out/share" + mkdir -p "$out/share" cp -r Examples "$out/share" '' ["minInit" "addInputs" "doMake" "defEnsureDir"]; diff --git a/pkgs/development/libraries/chipmunk/default.nix b/pkgs/development/libraries/chipmunk/default.nix index 5dbb31e9bce..d5471b9be75 100644 --- a/pkgs/development/libraries/chipmunk/default.nix +++ b/pkgs/development/libraries/chipmunk/default.nix @@ -28,7 +28,7 @@ rec { '' ["minInit" "addInputs" "doUnpack"]; demoInstall = fullDepEntry('' - ensureDir $out/bin + mkdir -p $out/bin cp Demo/chipmunk_demos $out/bin '') ["doMakeInstall" "defEnsureDir"]; diff --git a/pkgs/development/libraries/clapack/default.nix b/pkgs/development/libraries/clapack/default.nix index a40044ee3a3..d1c081f45d8 100644 --- a/pkgs/development/libraries/clapack/default.nix +++ b/pkgs/development/libraries/clapack/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { buildNativeInputs = [ cmake ]; installPhase = '' - ensureDir $out/include $out/lib + mkdir -p $out/include $out/lib cp SRC/*.a F2CLIBS/libf2c/*.a BLAS/SRC/*.a $out/lib cp ../INCLUDE/* $out/include ''; diff --git a/pkgs/development/libraries/cminpack/default.nix b/pkgs/development/libraries/cminpack/default.nix index f070f2dfaef..121f41a0f3c 100644 --- a/pkgs/development/libraries/cminpack/default.nix +++ b/pkgs/development/libraries/cminpack/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation { ''; preInstall = '' - ensureDir $out/lib $out/include + mkdir -p $out/lib $out/include ''; meta = { diff --git a/pkgs/development/libraries/dotnetfx35/default.nix b/pkgs/development/libraries/dotnetfx35/default.nix index 7ac4568a4e1..e1c59846aec 100644 --- a/pkgs/development/libraries/dotnetfx35/default.nix +++ b/pkgs/development/libraries/dotnetfx35/default.nix @@ -8,7 +8,7 @@ in name = "dotnetfx-3.5"; src = "${windir}/Microsoft.NET/Framework/v3.5"; buildCommand = '' - ensureDir $out/bin + mkdir -p $out/bin ln -s $src/MSBuild.exe $out/bin ''; }; diff --git a/pkgs/development/libraries/dotnetfx40/default.nix b/pkgs/development/libraries/dotnetfx40/default.nix index b9ce4738d12..701464071d0 100644 --- a/pkgs/development/libraries/dotnetfx40/default.nix +++ b/pkgs/development/libraries/dotnetfx40/default.nix @@ -8,7 +8,7 @@ in name = "dotnetfx-4.0"; src = "${windir}/Microsoft.NET/Framework/v4.0.30319"; buildCommand = '' - ensureDir $out/bin + mkdir -p $out/bin ln -s $src/MSBuild.exe $out/bin ''; }; diff --git a/pkgs/development/libraries/eglibc/builder.sh b/pkgs/development/libraries/eglibc/builder.sh index 47cd1b5e252..6ac1d223b47 100644 --- a/pkgs/development/libraries/eglibc/builder.sh +++ b/pkgs/development/libraries/eglibc/builder.sh @@ -20,7 +20,7 @@ preConfigure() { done # Include source for debugging - ensureDir $out/src + mkdir -p $out/src cp -R libc ports $out/src ln -s $out/src/ports $out/src/libc/ports # glibc wants -O2 minimum diff --git a/pkgs/development/libraries/glfw/default.nix b/pkgs/development/libraries/glfw/default.nix index 1454d2ec94a..1f4df39408e 100644 --- a/pkgs/development/libraries/glfw/default.nix +++ b/pkgs/development/libraries/glfw/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation { buildInputs = [ mesa libX11 libXext ]; buildPhase = '' - ensureDir $out + mkdir -p $out make x11-install PREFIX=$out ''; diff --git a/pkgs/development/libraries/glibc-2.13/default.nix b/pkgs/development/libraries/glibc-2.13/default.nix index 31a8ef13a4f..95778b50b70 100644 --- a/pkgs/development/libraries/glibc-2.13/default.nix +++ b/pkgs/development/libraries/glibc-2.13/default.nix @@ -28,7 +28,7 @@ in # any special hack. preInstall = '' if [ -f ${stdenv.gcc.gcc}/lib/libgcc_s.so.1 ]; then - ensureDir $out/lib + mkdir -p $out/lib ln -s ${stdenv.gcc.gcc}/lib/libgcc_s.so.1 $out/lib/libgcc_s.so.1 fi ''; diff --git a/pkgs/development/libraries/glibc-2.13/info.nix b/pkgs/development/libraries/glibc-2.13/info.nix index 84a16fefce9..75bd996d9bc 100644 --- a/pkgs/development/libraries/glibc-2.13/info.nix +++ b/pkgs/development/libraries/glibc-2.13/info.nix @@ -18,7 +18,7 @@ in # Somehow building the info still does not work, because the final # libc.info hasn't a Top node. installPhase = '' - ensureDir "$out/share/info" + mkdir -p "$out/share/info" cp -v "../$sourceRoot/manual/"*.info* "$out/share/info" ''; diff --git a/pkgs/development/libraries/glibc-2.13/locales.nix b/pkgs/development/libraries/glibc-2.13/locales.nix index d598e0e094d..b7eae50ca38 100644 --- a/pkgs/development/libraries/glibc-2.13/locales.nix +++ b/pkgs/development/libraries/glibc-2.13/locales.nix @@ -39,7 +39,7 @@ in installPhase = '' - ensureDir "$out/lib/locale" + mkdir -p "$out/lib/locale" cp -v "$TMPDIR/nix/store/"*"/lib/locale/locale-archive" "$out/lib/locale" ''; diff --git a/pkgs/development/libraries/glibc-2.14/default.nix b/pkgs/development/libraries/glibc-2.14/default.nix index 31a8ef13a4f..95778b50b70 100644 --- a/pkgs/development/libraries/glibc-2.14/default.nix +++ b/pkgs/development/libraries/glibc-2.14/default.nix @@ -28,7 +28,7 @@ in # any special hack. preInstall = '' if [ -f ${stdenv.gcc.gcc}/lib/libgcc_s.so.1 ]; then - ensureDir $out/lib + mkdir -p $out/lib ln -s ${stdenv.gcc.gcc}/lib/libgcc_s.so.1 $out/lib/libgcc_s.so.1 fi ''; diff --git a/pkgs/development/libraries/glibc-2.14/info.nix b/pkgs/development/libraries/glibc-2.14/info.nix index 84a16fefce9..75bd996d9bc 100644 --- a/pkgs/development/libraries/glibc-2.14/info.nix +++ b/pkgs/development/libraries/glibc-2.14/info.nix @@ -18,7 +18,7 @@ in # Somehow building the info still does not work, because the final # libc.info hasn't a Top node. installPhase = '' - ensureDir "$out/share/info" + mkdir -p "$out/share/info" cp -v "../$sourceRoot/manual/"*.info* "$out/share/info" ''; diff --git a/pkgs/development/libraries/glibc-2.14/locales.nix b/pkgs/development/libraries/glibc-2.14/locales.nix index d598e0e094d..b7eae50ca38 100644 --- a/pkgs/development/libraries/glibc-2.14/locales.nix +++ b/pkgs/development/libraries/glibc-2.14/locales.nix @@ -39,7 +39,7 @@ in installPhase = '' - ensureDir "$out/lib/locale" + mkdir -p "$out/lib/locale" cp -v "$TMPDIR/nix/store/"*"/lib/locale/locale-archive" "$out/lib/locale" ''; diff --git a/pkgs/development/libraries/glibc-2.9/default.nix b/pkgs/development/libraries/glibc-2.9/default.nix index 0cfad299038..b778743147e 100644 --- a/pkgs/development/libraries/glibc-2.9/default.nix +++ b/pkgs/development/libraries/glibc-2.9/default.nix @@ -81,7 +81,7 @@ stdenv.mkDerivation rec { buildNativeInputs = stdenv.lib.optionals (cross != null) [ gccCross ]; preInstall = if (cross != null) then '' - ensureDir $out/lib + mkdir -p $out/lib ln -s ${stdenv.gcc.gcc}/lib/libgcc_s.so.1 $out/lib/libgcc_s.so.1 '' else ""; diff --git a/pkgs/development/libraries/glibc-2.9/info.nix b/pkgs/development/libraries/glibc-2.9/info.nix index 3201bb47440..cc79bbece3d 100644 --- a/pkgs/development/libraries/glibc-2.9/info.nix +++ b/pkgs/development/libraries/glibc-2.9/info.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { # Somehow building the info still does not work, because the final # libc.info hasn't a Top node. installPhase = '' - ensureDir $out/share/info + mkdir -p $out/share/info cp ../$sourceRoot/manual/*.info $out/share/info ''; diff --git a/pkgs/development/libraries/glibc-2.9/locales.nix b/pkgs/development/libraries/glibc-2.9/locales.nix index 3046374ca34..c7b1bb2bff0 100644 --- a/pkgs/development/libraries/glibc-2.9/locales.nix +++ b/pkgs/development/libraries/glibc-2.9/locales.nix @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { installPhase = '' - ensureDir $out/lib/locale + mkdir -p $out/lib/locale cp $TMPDIR/nix/store/*/lib/locale/locale-archive $out/lib/locale/ ''; diff --git a/pkgs/development/libraries/gsm/default.nix b/pkgs/development/libraries/gsm/default.nix index c01987bcc59..04fbb01a3bf 100644 --- a/pkgs/development/libraries/gsm/default.nix +++ b/pkgs/development/libraries/gsm/default.nix @@ -29,7 +29,7 @@ rec { phaseNames = ["createDirs" "setVars" "doMakeInstall"]; createDirs = a.fullDepEntry '' - ensureDir "$out/"{bin,lib,share/man,share/info,include/gsm} + mkdir -p "$out/"{bin,lib,share/man,share/info,include/gsm} '' ["minInit" "defEnsureDir"]; setVars = a.noDepEntry '' diff --git a/pkgs/development/libraries/haskell/cabal/cabal.nix b/pkgs/development/libraries/haskell/cabal/cabal.nix index 3f5bac4d7e4..567e5e2300a 100644 --- a/pkgs/development/libraries/haskell/cabal/cabal.nix +++ b/pkgs/development/libraries/haskell/cabal/cabal.nix @@ -126,12 +126,12 @@ ./Setup copy - ensureDir $out/bin # necessary to get it added to PATH + mkdir -p $out/bin # necessary to get it added to PATH local confDir=$out/lib/ghc-pkgs/ghc-${ghc.ghc.version} local installedPkgConf=$confDir/${self.fname}.installedconf local pkgConf=$confDir/${self.fname}.conf - ensureDir $confDir + mkdir -p $confDir ./Setup register --gen-pkg-config=$pkgConf if test -f $pkgConf; then echo '[]' > $installedPkgConf diff --git a/pkgs/development/libraries/hawknl/default.nix b/pkgs/development/libraries/hawknl/default.nix index 76f4a5a7dae..78206de9f14 100644 --- a/pkgs/development/libraries/hawknl/default.nix +++ b/pkgs/development/libraries/hawknl/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation { preInstall = '' sed -i s,/usr/local,$out, src/makefile.linux - ensureDir $out/lib $out/include + mkdir -p $out/lib $out/include ''; meta = { diff --git a/pkgs/development/libraries/iniparser/default.nix b/pkgs/development/libraries/iniparser/default.nix index 9b45dbb91ec..55c4dbff296 100644 --- a/pkgs/development/libraries/iniparser/default.nix +++ b/pkgs/development/libraries/iniparser/default.nix @@ -13,14 +13,14 @@ stdenv.mkDerivation rec{ buildFlags = "libiniparser.so"; installPhase = '' - ensureDir $out/lib + mkdir -p $out/lib cp libiniparser.so.0 $out/lib ln -s libiniparser.so.0 $out/lib/libiniparser.so - ensureDir $out/include + mkdir -p $out/include cp src/*.h $out/include - ensureDir $out/share/doc/${name} + mkdir -p $out/share/doc/${name} for i in AUTHORS INSTALL LICENSE README; do bzip2 -c -9 $i > $out/share/doc/${name}/$i.bz2; done; diff --git a/pkgs/development/libraries/java/geoipjava/default.nix b/pkgs/development/libraries/java/geoipjava/default.nix index f713ef2f645..9cd61adf775 100644 --- a/pkgs/development/libraries/java/geoipjava/default.nix +++ b/pkgs/development/libraries/java/geoipjava/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation { ''; installPhase = '' - ensureDir $out/share/java + mkdir -p $out/share/java cp maxmindgeoip.jar $out/share/java ''; meta = { diff --git a/pkgs/development/libraries/java/gwt-dragdrop/builder.sh b/pkgs/development/libraries/java/gwt-dragdrop/builder.sh index 605daff0cc8..d37e110011e 100644 --- a/pkgs/development/libraries/java/gwt-dragdrop/builder.sh +++ b/pkgs/development/libraries/java/gwt-dragdrop/builder.sh @@ -1,4 +1,4 @@ source $stdenv/setup -ensureDir $out/share/java +mkdir -p $out/share/java cp $src $out/share/java/$name.jar diff --git a/pkgs/development/libraries/java/gwt-widgets/builder.sh b/pkgs/development/libraries/java/gwt-widgets/builder.sh index f8961eb4f04..8c2502385f2 100644 --- a/pkgs/development/libraries/java/gwt-widgets/builder.sh +++ b/pkgs/development/libraries/java/gwt-widgets/builder.sh @@ -2,5 +2,5 @@ source $stdenv/setup tar xfvz $src cd gwt-widgets-* -ensureDir $out/share/java +mkdir -p $out/share/java cp gwt-widgets-*.jar $out/share/java diff --git a/pkgs/development/libraries/java/hsqldb/builder.sh b/pkgs/development/libraries/java/hsqldb/builder.sh index 2f146a52348..d7de23ab95e 100755 --- a/pkgs/development/libraries/java/hsqldb/builder.sh +++ b/pkgs/development/libraries/java/hsqldb/builder.sh @@ -2,5 +2,5 @@ source $stdenv/setup unzip $src cd hsqldb* -ensureDir $out +mkdir -p $out cp -R * $out/ diff --git a/pkgs/development/libraries/java/hydra-ant-logger/default.nix b/pkgs/development/libraries/java/hydra-ant-logger/default.nix index bb8c67285c5..1439c6101ab 100644 --- a/pkgs/development/libraries/java/hydra-ant-logger/default.nix +++ b/pkgs/development/libraries/java/hydra-ant-logger/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { ''; installPhase = '' - ensureDir "$out/lib/java" + mkdir -p "$out/lib/java" cp -v *.jar "$out/lib/java" ''; } diff --git a/pkgs/development/libraries/java/jetty-gwt/default.nix b/pkgs/development/libraries/java/jetty-gwt/default.nix index e384e35b23f..03433048270 100644 --- a/pkgs/development/libraries/java/jetty-gwt/default.nix +++ b/pkgs/development/libraries/java/jetty-gwt/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation { sha256 = "17x8ss75rx9xjn93rq861mdn9d6gw87rbrf24blawa6ahhb56ppf"; }; buildCommand = '' - ensureDir $out/share/java + mkdir -p $out/share/java cp $src $out/share/java/$name.jar ''; } diff --git a/pkgs/development/libraries/java/jetty-util/default.nix b/pkgs/development/libraries/java/jetty-util/default.nix index 8f1f676c107..349339aad44 100644 --- a/pkgs/development/libraries/java/jetty-util/default.nix +++ b/pkgs/development/libraries/java/jetty-util/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation { sha256 = "1ld94lb5dk7y6sjg1rq8zdk97wiy56ik5vbgy7yjj4f6rz5pxbyq"; }; buildCommand = '' - ensureDir $out/share/java + mkdir -p $out/share/java cp $src $out/share/java/$name.jar ''; } diff --git a/pkgs/development/libraries/java/rhino/default.nix b/pkgs/development/libraries/java/rhino/default.nix index 300266fff5c..800ae7ba718 100644 --- a/pkgs/development/libraries/java/rhino/default.nix +++ b/pkgs/development/libraries/java/rhino/default.nix @@ -23,7 +23,7 @@ in '' find -name \*.jar -or -name \*.class -exec rm -v {} \; # The build process tries to download it by itself. - ensureDir "build/tmp-xbean" + mkdir -p "build/tmp-xbean" ln -sv "${xbeans}" "build/tmp-xbean/xbean.zip" ''; @@ -34,7 +34,7 @@ in # FIXME: Install javadoc as well. installPhase = - '' ensureDir "$out/lib/java" + '' mkdir -p "$out/lib/java" cp -v *.jar "$out/lib/java" ''; diff --git a/pkgs/development/libraries/java/saxon/default8.nix b/pkgs/development/libraries/java/saxon/default8.nix index ab67fc6b893..bf1ee340d46 100644 --- a/pkgs/development/libraries/java/saxon/default8.nix +++ b/pkgs/development/libraries/java/saxon/default8.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation { buildCommand = " unzip $src -d $out - ensureDir $out/bin + mkdir -p $out/bin cat > $out/bin/saxon8 < $out/jars/swt.jar diff --git a/pkgs/development/libraries/java/xalanj/default.nix b/pkgs/development/libraries/java/xalanj/default.nix index ededecdf0e5..0aee98d27bd 100644 --- a/pkgs/development/libraries/java/xalanj/default.nix +++ b/pkgs/development/libraries/java/xalanj/default.nix @@ -24,7 +24,7 @@ in # FIXME: Install javadoc as well. installPhase = - '' ensureDir "$out/lib/java" + '' mkdir -p "$out/lib/java" cp -v build/x*.jar "$out/lib/java" ''; diff --git a/pkgs/development/libraries/java/xerces/default.nix b/pkgs/development/libraries/java/xerces/default.nix index 545bb21508c..a40c30ae6c7 100644 --- a/pkgs/development/libraries/java/xerces/default.nix +++ b/pkgs/development/libraries/java/xerces/default.nix @@ -26,7 +26,7 @@ in # FIXME: Install javadoc as well. installPhase = - '' ensureDir "$out/lib/java" + '' mkdir -p "$out/lib/java" cp -v build/xerces*.jar "$out/lib/java" ''; diff --git a/pkgs/development/libraries/levmar/default.nix b/pkgs/development/libraries/levmar/default.nix index a17cdf0b4d5..3028ba7367c 100644 --- a/pkgs/development/libraries/levmar/default.nix +++ b/pkgs/development/libraries/levmar/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { ''; installPhase = '' - ensureDir $out/include $out/lib + mkdir -p $out/include $out/lib cp lm.h $out/include cp liblevmar.a $out/lib ''; diff --git a/pkgs/development/libraries/libdvdnav/default.nix b/pkgs/development/libraries/libdvdnav/default.nix index 7d6ddd61581..4ba938911a4 100644 --- a/pkgs/development/libraries/libdvdnav/default.nix +++ b/pkgs/development/libraries/libdvdnav/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation { configureScript = "./configure2"; # wtf? preConfigure = '' - ensureDir $out + mkdir -p $out ''; meta = { diff --git a/pkgs/development/libraries/libdvdread/default.nix b/pkgs/development/libraries/libdvdread/default.nix index 30fd6835dfb..ee5d2e5e50e 100644 --- a/pkgs/development/libraries/libdvdread/default.nix +++ b/pkgs/development/libraries/libdvdread/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation { configureScript = "./configure2"; # wtf? preConfigure = '' - ensureDir $out + mkdir -p $out ''; postInstall = '' diff --git a/pkgs/development/libraries/libf2c/default.nix b/pkgs/development/libraries/libf2c/default.nix index b14809d47bf..edcf177add7 100644 --- a/pkgs/development/libraries/libf2c/default.nix +++ b/pkgs/development/libraries/libf2c/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { makeFlags = "-f makefile.u"; installPhase = '' - ensureDir $out/include $out/lib + mkdir -p $out/include $out/lib cp libf2c.a $out/lib cp f2c.h $out/include ''; diff --git a/pkgs/development/libraries/libmilter/default.nix b/pkgs/development/libraries/libmilter/default.nix index 508827b9b3d..c8fa978534d 100644 --- a/pkgs/development/libraries/libmilter/default.nix +++ b/pkgs/development/libraries/libmilter/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { }; buildPhase = '' - ensureDir $out/lib + mkdir -p $out/lib cd libmilter cat > a.m4 <> $out/nix-support/setup-hook echo "export PYTHONPATH=\"$PYTHON_LIB:\$PYTHONPATH\"" >> $out/nix-support/setup-hook ''; @@ -46,7 +46,7 @@ composableDerivation.composableDerivation {} rec { preConfigure = '' export RUBY_LIB=$out/${ruby.libPath} export RUBY_LIB_ARCH=$RUBY_LIB - ensureDir $out/nix-support + mkdir -p $out/nix-support echo "export RUBYLIB=\"$RUBY_LIB:\$RUBYLIB\"" >> $out/nix-support/setup-hook echo "export GEM_PATH=\"$out:\$GEM_PATH\"" >> $out/nix-support/setup-hook ''; diff --git a/pkgs/development/libraries/xapian/bindings/default.nix b/pkgs/development/libraries/xapian/bindings/default.nix index bb7643330a0..93d31ada975 100644 --- a/pkgs/development/libraries/xapian/bindings/default.nix +++ b/pkgs/development/libraries/xapian/bindings/default.nix @@ -23,7 +23,7 @@ composableDerivation.composableDerivation {} rec { # export same env vars as in pythonNew preConfigure = '' export PYTHON_LIB=$out/lib/${python.libPrefix}/site-packages - ensureDir $out/nix-support + mkdir -p $out/nix-support echo "export NIX_PYTHON_SITES=\"$out:\$NIX_PYTHON_SITES\"" >> $out/nix-support/setup-hook echo "export PYTHONPATH=\"$PYTHON_LIB:\$PYTHONPATH\"" >> $out/nix-support/setup-hook ''; @@ -46,7 +46,7 @@ composableDerivation.composableDerivation {} rec { preConfigure = '' export RUBY_LIB=$out/${ruby.libPath} export RUBY_LIB_ARCH=$RUBY_LIB - ensureDir $out/nix-support + mkdir -p $out/nix-support echo "export RUBYLIB=\"$RUBY_LIB:\$RUBYLIB\"" >> $out/nix-support/setup-hook echo "export GEM_PATH=\"$out:\$GEM_PATH\"" >> $out/nix-support/setup-hook ''; diff --git a/pkgs/development/libraries/xlibs-wrapper/default.nix b/pkgs/development/libraries/xlibs-wrapper/default.nix index d8bc32350fb..07220d6e1a6 100644 --- a/pkgs/development/libraries/xlibs-wrapper/default.nix +++ b/pkgs/development/libraries/xlibs-wrapper/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation { name = "xlibs-wrapper"; buildPhase = "true"; - installPhase = "ensureDir $out"; + installPhase = "mkdir -p $out"; unpackPhase = "sourceRoot=."; propagatedBuildInputs = packages; } // { diff --git a/pkgs/development/misc/avr8-burn-omat/default.nix b/pkgs/development/misc/avr8-burn-omat/default.nix index 7c9fb19c275..f79483874f6 100644 --- a/pkgs/development/misc/avr8-burn-omat/default.nix +++ b/pkgs/development/misc/avr8-burn-omat/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation { # move to nix-support to not create that many symlinks.. # TODO burnomat tries to read /usr/local/etc/avrdude.conf (but you can edit it within the settings dialog) installPhase = '' - ensureDir $out/{nix-support,bin} + mkdir -p $out/{nix-support,bin} mv *.jar license_gpl-3.0.txt lib *.xml *.png $out/nix-support cat >> $out/bin/avr8-burn-omat << EOF #!/bin/sh diff --git a/pkgs/development/misc/windows-sdk/builder.sh b/pkgs/development/misc/windows-sdk/builder.sh index e8344798826..8f1eaffbcaf 100644 --- a/pkgs/development/misc/windows-sdk/builder.sh +++ b/pkgs/development/misc/windows-sdk/builder.sh @@ -1,6 +1,6 @@ source $stdenv/setup -ensureDir $out +mkdir -p $out n=1 for p in $srcs; do @@ -21,7 +21,7 @@ done while read target; do read source echo "$source -> $target" - ensureDir "$out/$(dirname "$target")" + mkdir -p "$out/$(dirname "$target")" cp "$source" "$out/$target" done < $filemap diff --git a/pkgs/development/ocaml-modules/batteries/default.nix b/pkgs/development/ocaml-modules/batteries/default.nix index a7c96f1d2ea..3ecf2ae4699 100644 --- a/pkgs/development/ocaml-modules/batteries/default.nix +++ b/pkgs/development/ocaml-modules/batteries/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation { configurePhase = "true"; # Skip configure preInstall = '' - ensureDir "$out/lib/ocaml/${ocaml_version}/site-lib" + mkdir -p "$out/lib/ocaml/${ocaml_version}/site-lib" ''; doCheck = true; diff --git a/pkgs/development/ocaml-modules/cryptokit/default.nix b/pkgs/development/ocaml-modules/cryptokit/default.nix index 8aa3f2ba77e..48e86ed9a68 100644 --- a/pkgs/development/ocaml-modules/cryptokit/default.nix +++ b/pkgs/development/ocaml-modules/cryptokit/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation { buildFlags = "setup.data build"; - preBuild = "ensureDir $out/lib/ocaml/${ocaml_version}/site-lib/cryptokit"; + preBuild = "mkdir -p $out/lib/ocaml/${ocaml_version}/site-lib/cryptokit"; meta = { homepage = "http://pauillac.inria.fr/~xleroy/software.html"; diff --git a/pkgs/development/ocaml-modules/lablgtkmathview/default.nix b/pkgs/development/ocaml-modules/lablgtkmathview/default.nix index 13c25495cdc..976910aae29 100644 --- a/pkgs/development/ocaml-modules/lablgtkmathview/default.nix +++ b/pkgs/development/ocaml-modules/lablgtkmathview/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation { ''; buildPhase = '' - ensureDir .test + mkdir -p .test make make opt ''; diff --git a/pkgs/development/ocaml-modules/sqlite3/default.nix b/pkgs/development/ocaml-modules/sqlite3/default.nix index 9b477fed851..1903068bb0b 100644 --- a/pkgs/development/ocaml-modules/sqlite3/default.nix +++ b/pkgs/development/ocaml-modules/sqlite3/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation { preConfigure = '' export OCAMLPATH=$OCAMLPATH:$OCAMLFIND_DESTDIR - ensureDir $out/bin + mkdir -p $out/bin ''; createFindlibDestdir = true; diff --git a/pkgs/development/perl-modules/DB_File/default.nix b/pkgs/development/perl-modules/DB_File/default.nix index adf66a44806..858d459f5ca 100644 --- a/pkgs/development/perl-modules/DB_File/default.nix +++ b/pkgs/development/perl-modules/DB_File/default.nix @@ -21,7 +21,7 @@ buildPerlPackage { # lib/perl5/site_perl, and the *.pm should be inside lib/perl5/site_perl/... # for other packages to get that in the PERL5LIB env var. postInstall = '' - ensureDir $out/lib/perl5/site_perl/ + mkdir -p $out/lib/perl5/site_perl/ cp -R $out/lib/perl5/5* $out/lib/perl5/site_perl ''; } diff --git a/pkgs/development/python-modules/generic/default.nix b/pkgs/development/python-modules/generic/default.nix index 46149177320..4e0b6100231 100644 --- a/pkgs/development/python-modules/generic/default.nix +++ b/pkgs/development/python-modules/generic/default.nix @@ -50,7 +50,7 @@ python.stdenv.mkDerivation (attrs // { # XXX: Should we run `easy_install --always-unzip'? It doesn't seem # to have a noticeable impact on small scripts. installPhase = '' - ensureDir "$out/lib/${python.libPrefix}/site-packages" + mkdir -p "$out/lib/${python.libPrefix}/site-packages" echo "installing \`${name}' with \`easy_install'..." export PYTHONPATH="$out/lib/${python.libPrefix}/site-packages:$PYTHONPATH" diff --git a/pkgs/development/python-modules/xmpppy/default.nix b/pkgs/development/python-modules/xmpppy/default.nix index 3fc8058dfb2..df5d37853f7 100644 --- a/pkgs/development/python-modules/xmpppy/default.nix +++ b/pkgs/development/python-modules/xmpppy/default.nix @@ -19,7 +19,7 @@ rec { /* doConfigure should be removed if not needed */ phaseNames = ["mkDirs" "installPythonPackage"]; mkDirs = a.fullDepEntry('' - ensureDir $out/bin $out/lib $out/share $(toPythonPath $out) + mkdir -p $out/bin $out/lib $out/share $(toPythonPath $out) export PYTHONPATH=$PYTHONPATH:$(toPythonPath $out) '') ["defEnsureDir" "addInputs"]; diff --git a/pkgs/development/ruby-modules/rake/default.nix b/pkgs/development/ruby-modules/rake/default.nix index 00bad68b695..e1cec53aaa0 100644 --- a/pkgs/development/ruby-modules/rake/default.nix +++ b/pkgs/development/ruby-modules/rake/default.nix @@ -14,8 +14,8 @@ stdenv.mkDerivation { ''; buildPhase = "true"; installPhase = '' - ensureDir $out/lib - ensureDir $out/bin + mkdir -p $out/lib + mkdir -p $out/bin export DESTDIR=$out ruby install.rb ''; diff --git a/pkgs/development/ruby-modules/sqlite3/default.nix b/pkgs/development/ruby-modules/sqlite3/default.nix index a37e91c488f..33a8951921e 100644 --- a/pkgs/development/ruby-modules/sqlite3/default.nix +++ b/pkgs/development/ruby-modules/sqlite3/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation { buildInputs = [ruby sqlite]; buildPhase = "true"; installPhase = '' - ensureDir $out/lib + mkdir -p $out/lib ruby setup.rb config --prefix=$out # --bindir $out/bin --libdir $out/lib ruby setup.rb setup diff --git a/pkgs/development/tools/analysis/checkstyle/default.nix b/pkgs/development/tools/analysis/checkstyle/default.nix index 17fc8de8c95..09656dc520a 100644 --- a/pkgs/development/tools/analysis/checkstyle/default.nix +++ b/pkgs/development/tools/analysis/checkstyle/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation { }; installPhase = '' - ensureDir $out/checkstyle + mkdir -p $out/checkstyle cp -R * $out/checkstyle ''; diff --git a/pkgs/development/tools/analysis/emma/default.nix b/pkgs/development/tools/analysis/emma/default.nix index 97e061d6b3f..8275beff88d 100644 --- a/pkgs/development/tools/analysis/emma/default.nix +++ b/pkgs/development/tools/analysis/emma/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation { buildInputs = [unzip]; installPhase = '' - ensureDir $out/lib/jars + mkdir -p $out/lib/jars cp lib/*.jar $out/lib/jars/ ''; diff --git a/pkgs/development/tools/analysis/findbugs/default.nix b/pkgs/development/tools/analysis/findbugs/default.nix index cf4f87f528e..0623632936d 100644 --- a/pkgs/development/tools/analysis/findbugs/default.nix +++ b/pkgs/development/tools/analysis/findbugs/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation { ''; installPhase = '' - ensureDir $out + mkdir -p $out cp -prd bin lib plugin doc $out/ rm $out/bin/*.bat ''; diff --git a/pkgs/development/tools/analysis/jdepend/default.nix b/pkgs/development/tools/analysis/jdepend/default.nix index 6973fbad9e7..7498d3b652a 100644 --- a/pkgs/development/tools/analysis/jdepend/default.nix +++ b/pkgs/development/tools/analysis/jdepend/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation { }; installPhase = '' - ensureDir $out + mkdir -p $out cp -R * $out ''; diff --git a/pkgs/development/tools/analysis/pmd/default.nix b/pkgs/development/tools/analysis/pmd/default.nix index 7f50431c8d9..b830ee00838 100644 --- a/pkgs/development/tools/analysis/pmd/default.nix +++ b/pkgs/development/tools/analysis/pmd/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation { }; installPhase = '' - ensureDir $out + mkdir -p $out cp -R * $out ''; diff --git a/pkgs/development/tools/analysis/spin/default.nix b/pkgs/development/tools/analysis/spin/default.nix index cedd9584414..b4fdd4c09d4 100644 --- a/pkgs/development/tools/analysis/spin/default.nix +++ b/pkgs/development/tools/analysis/spin/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation { sed -i -e 's/-DNXT/-DNXT -DCPP="\\"gcc -E -x c\\""/' makefile ''; installPhase = '' - ensureDir $out/bin + mkdir -p $out/bin cp ../Xspin*/xsp* $out/bin/xspin sed -i -e '1s@^#!/bin/sh@#!${tk}/bin/wish@' \ -e '/exec wish/d' $out/bin/xspin diff --git a/pkgs/development/tools/build-managers/apache-ant/from-source.nix b/pkgs/development/tools/build-managers/apache-ant/from-source.nix index a5a19a67143..ef6763a0fa2 100644 --- a/pkgs/development/tools/build-managers/apache-ant/from-source.nix +++ b/pkgs/development/tools/build-managers/apache-ant/from-source.nix @@ -39,7 +39,7 @@ EOF # Note: We don't build the javadoc. buildPhase = '' - ensureDir "$out" + mkdir -p "$out" ./build.sh -Dant.install="$out" install-lite ''; @@ -48,7 +48,7 @@ EOF # rearrange a few things. rm -v "$out/bin/"*.bat - ensureDir "$out/lib/java" + mkdir -p "$out/lib/java" mv -v "$out/lib/"*.jar "$out/lib/java" sed -i "$out/bin/ant" \ -e "s|^ANT_LIB=.*$|ANT_LIB=$out/lib/java|g ; diff --git a/pkgs/development/tools/build-managers/bam/default.nix b/pkgs/development/tools/build-managers/bam/default.nix index ef5aed1f26e..e7e4b6d0909 100644 --- a/pkgs/development/tools/build-managers/bam/default.nix +++ b/pkgs/development/tools/build-managers/bam/default.nix @@ -38,9 +38,9 @@ rec { '' ["build" "addInputs"]; doDeploy = a.fullDepEntry '' - ensureDir "$out/share/bam" + mkdir -p "$out/share/bam" cp -r docs examples tests "$out/share/bam" - ensureDir "$out/bin" + mkdir -p "$out/bin" cp bam "$out/bin" '' ["minInit" "defEnsureDir" "build"]; diff --git a/pkgs/development/tools/build-managers/buildbot/default.nix b/pkgs/development/tools/build-managers/buildbot/default.nix index 92b63869f33..71862ec1cf7 100644 --- a/pkgs/development/tools/build-managers/buildbot/default.nix +++ b/pkgs/development/tools/build-managers/buildbot/default.nix @@ -26,7 +26,7 @@ buildPythonPackage (rec { doCheck = false; postInstall = - '' ensureDir "$out/share/info" + '' mkdir -p "$out/share/info" make -C docs buildbot.info cp -v "docs/buildbot.info"* "$out/share/info" ''; diff --git a/pkgs/development/tools/build-managers/gradle/default.nix b/pkgs/development/tools/build-managers/gradle/default.nix index 9fc25aad64d..576d8e357f4 100644 --- a/pkgs/development/tools/build-managers/gradle/default.nix +++ b/pkgs/development/tools/build-managers/gradle/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { }; installPhase = '' - ensureDir $out + mkdir -p $out rm bin/*.bat mv * $out ''; diff --git a/pkgs/development/tools/build-managers/jam/default.nix b/pkgs/development/tools/build-managers/jam/default.nix index d2a002a70cf..6324fa92cbd 100644 --- a/pkgs/development/tools/build-managers/jam/default.nix +++ b/pkgs/development/tools/build-managers/jam/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation { }; installPhase = '' - ensureDir $out/bin + mkdir -p $out/bin cp bin.linux/jam $out/bin ''; diff --git a/pkgs/development/tools/misc/cbrowser/default.nix b/pkgs/development/tools/misc/cbrowser/default.nix index 50dc907a780..bf927db2793 100644 --- a/pkgs/development/tools/misc/cbrowser/default.nix +++ b/pkgs/development/tools/misc/cbrowser/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { buildInputs = [ tk makeWrapper ]; installPhase = '' - ensureDir $out/bin $out/share/${name} + mkdir -p $out/bin $out/share/${name} cp -R * $out/share/${name}/ makeWrapper $out/share/${name}/cbrowser $out/bin/cbrowser \ diff --git a/pkgs/development/tools/misc/cscope/default.nix b/pkgs/development/tools/misc/cscope/default.nix index c27c7ab291a..3cba5cd2e76 100644 --- a/pkgs/development/tools/misc/cscope/default.nix +++ b/pkgs/development/tools/misc/cscope/default.nix @@ -24,10 +24,10 @@ stdenv.mkDerivation rec { # Install Emacs mode. cd "contrib/xcscope" - ensureDir "$out/libexec/cscope" + mkdir -p "$out/libexec/cscope" cp "cscope-indexer" "$out/libexec/cscope" - ensureDir "$out/share/emacs/site-lisp" + mkdir -p "$out/share/emacs/site-lisp" emacs --batch --eval '(byte-compile-file "xcscope.el")' cp xcscope.el{,c} "$out/share/emacs/site-lisp" ''; diff --git a/pkgs/development/tools/misc/global/default.nix b/pkgs/development/tools/misc/global/default.nix index fef5a71201a..6e6464a590b 100644 --- a/pkgs/development/tools/misc/global/default.nix +++ b/pkgs/development/tools/misc/global/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { doCheck = true; postInstall = '' - ensureDir "$out/share/emacs/site-lisp" + mkdir -p "$out/share/emacs/site-lisp" cp -v *.el "$out/share/emacs/site-lisp" ''; diff --git a/pkgs/development/tools/misc/lsof/default.nix b/pkgs/development/tools/misc/lsof/default.nix index f679577a3f1..69503782d6e 100644 --- a/pkgs/development/tools/misc/lsof/default.nix +++ b/pkgs/development/tools/misc/lsof/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation { configurePhase = "./Configure -n linux;"; installPhase = '' - ensureDir $out/bin $out/man/man8 + mkdir -p $out/bin $out/man/man8 cp lsof.8 $out/man/man8/ cp lsof $out/bin ''; diff --git a/pkgs/development/tools/misc/ninka/default.nix b/pkgs/development/tools/misc/ninka/default.nix index dddb577edbf..1cb491df8d1 100644 --- a/pkgs/development/tools/misc/ninka/default.nix +++ b/pkgs/development/tools/misc/ninka/default.nix @@ -25,12 +25,12 @@ stdenv.mkDerivation { installPhase = '' cd ../.. - ensureDir $out/bin + mkdir -p $out/bin cp ninka.pl $out/bin cp -av {extComments,splitter,filter,senttok,matcher} $out/bin cd comments/comments - ensureDir $out/{bin,share/man/man1} + mkdir -p $out/{bin,share/man/man1} make install ''; diff --git a/pkgs/development/tools/misc/sloccount/default.nix b/pkgs/development/tools/misc/sloccount/default.nix index 906770e9066..e7adb30d316 100644 --- a/pkgs/development/tools/misc/sloccount/default.nix +++ b/pkgs/development/tools/misc/sloccount/default.nix @@ -37,9 +37,9 @@ stdenv.mkDerivation rec { checkPhase = ''HOME="$TMPDIR" PATH="$PWD:$PATH" make test''; preInstall = '' - ensureDir "$out/bin" - ensureDir "$out/share/man/man1" - ensureDir "$out/share/doc" + mkdir -p "$out/bin" + mkdir -p "$out/share/man/man1" + mkdir -p "$out/share/doc" ''; meta = { diff --git a/pkgs/development/tools/misc/unifdef/default.nix b/pkgs/development/tools/misc/unifdef/default.nix index 30afee4586b..f4b38f4f7ab 100644 --- a/pkgs/development/tools/misc/unifdef/default.nix +++ b/pkgs/development/tools/misc/unifdef/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation { ''; installPhase = '' - ensureDir $out/bin + mkdir -p $out/bin cp unifdef $out/bin ''; diff --git a/pkgs/development/tools/misc/usb-modeswitch/default.nix b/pkgs/development/tools/misc/usb-modeswitch/default.nix index a883024690a..48a823c3c65 100644 --- a/pkgs/development/tools/misc/usb-modeswitch/default.nix +++ b/pkgs/development/tools/misc/usb-modeswitch/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation { preConfigure = '' find -type f | xargs sed 's@/bin/rm@rm@g' -i make clean - ensureDir $out/{etc,lib/udev,share/man/man1} + mkdir -p $out/{etc,lib/udev,share/man/man1} makeFlags="DESTDIR=$out PREFIX=$out" ''; diff --git a/pkgs/development/tools/ocaml/camlidl/default.nix b/pkgs/development/tools/ocaml/camlidl/default.nix index 8f77c0c6fc0..d049377ea94 100644 --- a/pkgs/development/tools/ocaml/camlidl/default.nix +++ b/pkgs/development/tools/ocaml/camlidl/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation { mv config/Makefile.unix config/Makefile substituteInPlace config/Makefile --replace BINDIR=/usr/local/bin BINDIR=$out substituteInPlace config/Makefile --replace OCAMLLIB=/usr/local/lib/ocaml OCAMLLIB=$out/lib/ocaml/${ocaml_version}/site-lib/camlidl - ensureDir $out/lib/ocaml/${ocaml_version}/site-lib/camlidl/caml + mkdir -p $out/lib/ocaml/${ocaml_version}/site-lib/camlidl/caml ''; meta = { diff --git a/pkgs/development/tools/ocaml/findlib/default.nix b/pkgs/development/tools/ocaml/findlib/default.nix index 70fb45a1979..c89af03097d 100644 --- a/pkgs/development/tools/ocaml/findlib/default.nix +++ b/pkgs/development/tools/ocaml/findlib/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation { fi export OCAMLFIND_DESTDIR="''$out/lib/ocaml/${ocaml_version}/site-lib/" if test -n "$createFindlibDestdir"; then - ensureDir $OCAMLFIND_DESTDIR + mkdir -p $OCAMLFIND_DESTDIR fi } diff --git a/pkgs/development/tools/parsing/antlr/builder.sh b/pkgs/development/tools/parsing/antlr/builder.sh index 1d9f352c569..b8e7791b6fc 100644 --- a/pkgs/development/tools/parsing/antlr/builder.sh +++ b/pkgs/development/tools/parsing/antlr/builder.sh @@ -4,8 +4,8 @@ tar zxvf $src cd antlr-* cd lib -ensureDir $out/lib/antlr -ensureDir $out/bin +mkdir -p $out/lib/antlr +mkdir -p $out/bin cp *.jar $out/lib/antlr diff --git a/pkgs/development/tools/parsing/frown/builder.sh b/pkgs/development/tools/parsing/frown/builder.sh index 82689b42d72..075d2bc758c 100644 --- a/pkgs/development/tools/parsing/frown/builder.sh +++ b/pkgs/development/tools/parsing/frown/builder.sh @@ -2,6 +2,6 @@ source $stdenv/setup makeFlags="-e PREFIX=\"$out\"" -ensureDir $out/bin +mkdir -p $out/bin genericBuild diff --git a/pkgs/development/tools/parsing/jikespg/builder.sh b/pkgs/development/tools/parsing/jikespg/builder.sh index 090def7c464..e63ec9808f2 100644 --- a/pkgs/development/tools/parsing/jikespg/builder.sh +++ b/pkgs/development/tools/parsing/jikespg/builder.sh @@ -8,7 +8,7 @@ configurePhase() { } installPhase() { - ensureDir $out/bin + mkdir -p $out/bin cp jikespg $out/bin } diff --git a/pkgs/development/tools/selenium/remote-control/default.nix b/pkgs/development/tools/selenium/remote-control/default.nix index 0a7a12a6e17..fbe11ed2bc0 100644 --- a/pkgs/development/tools/selenium/remote-control/default.nix +++ b/pkgs/development/tools/selenium/remote-control/default.nix @@ -16,7 +16,7 @@ in stdenv.mkDerivation { buildInputs = [unzip]; phases = "unpackPhase buildPhase"; buildPhase = '' - ensureDir $out/{bin,lib} + mkdir -p $out/{bin,lib} mv * $out/lib bin="$out/bin/selenium-remote-control" cat >> "$bin" << EOF @@ -37,7 +37,7 @@ in stdenv.mkDerivation { }; phases = "buildPhase"; buildPhase = '' - ensureDir $out/{bin,lib} + mkdir -p $out/{bin,lib} cp $src $out/lib/ bin="$out/bin/selenium-remote-control" cat >> "$bin" << EOF diff --git a/pkgs/development/web/csslint/default.nix b/pkgs/development/web/csslint/default.nix index 6f09603b2d5..668ff6a7f4a 100644 --- a/pkgs/development/web/csslint/default.nix +++ b/pkgs/development/web/csslint/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { installPhase = '' sed -i "s/path\.join/path\.resolve/g" cli.js # fixes csslint issue #167 - ensureDir $out/bin; + mkdir -p $out/bin; cp -r * $out/bin mv $out/bin/cli.js $out/bin/csslint ''; diff --git a/pkgs/games/banner/default.nix b/pkgs/games/banner/default.nix index 73d08fda79f..3bb17b3e02f 100644 --- a/pkgs/games/banner/default.nix +++ b/pkgs/games/banner/default.nix @@ -19,7 +19,7 @@ let installPhase = '' make INSTBASEDIR=$out install if [ -d $out/man ]; then - ensureDir $out/share + mkdir -p $out/share mv -v $out/man $out/share/ fi ''; diff --git a/pkgs/games/beret/default.nix b/pkgs/games/beret/default.nix index e41e88fc1b0..2e252a5cd54 100644 --- a/pkgs/games/beret/default.nix +++ b/pkgs/games/beret/default.nix @@ -22,9 +22,9 @@ stdenv.mkDerivation { }; installPhase = '' - ensureDir $out/bin + mkdir -p $out/bin install -v -m755 beret $out/bin - ensureDir $out/share + mkdir -p $out/share cp -av tahoma.ttf images music rooms sfx $out/share ''; diff --git a/pkgs/games/blackshades/default.nix b/pkgs/games/blackshades/default.nix index 8a79326bdea..61e8571c476 100644 --- a/pkgs/games/blackshades/default.nix +++ b/pkgs/games/blackshades/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { ''; installPhase = '' - ensureDir $out/bin $out/opt/$name + mkdir -p $out/bin $out/opt/$name cp objs/blackshades $out/bin cp -R Data IF* Readme $out/opt/$name/ ''; diff --git a/pkgs/games/blackshadeselite/default.nix b/pkgs/games/blackshadeselite/default.nix index 64d94196c64..63139872cf9 100644 --- a/pkgs/games/blackshadeselite/default.nix +++ b/pkgs/games/blackshadeselite/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { ''; installPhase = '' - ensureDir $out/bin $out/opt/$name + mkdir -p $out/bin $out/opt/$name cp objs/blackshades $out/bin/blackshadeselite cp -R Data IF* Readme $out/opt/$name/ ''; diff --git a/pkgs/games/castle-combat/default.nix b/pkgs/games/castle-combat/default.nix index 07778363fd5..6e1af276c1f 100644 --- a/pkgs/games/castle-combat/default.nix +++ b/pkgs/games/castle-combat/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { ''; postInstall = '' - ensureDir "$out/share/${name}" + mkdir -p "$out/share/${name}" cp -rv "data/"* "$out/share/${name}" mv -v "$out/bin/castle-combat.py" "$out/bin/castle-combat" diff --git a/pkgs/games/dwarf-fortress/default.nix b/pkgs/games/dwarf-fortress/default.nix index f12caaae53f..9d363851148 100644 --- a/pkgs/games/dwarf-fortress/default.nix +++ b/pkgs/games/dwarf-fortress/default.nix @@ -18,8 +18,8 @@ stdenv.mkDerivation rec { installPhase = '' set -x - ensureDir $out/bin - ensureDir $out/share/df_linux + mkdir -p $out/bin + mkdir -p $out/share/df_linux cp -r * $out/share/df_linux cp $permission $out/share/df_linux/nix_permission diff --git a/pkgs/games/eduke32/default.nix b/pkgs/games/eduke32/default.nix index b99f8b09b9d..6eab8acce75 100644 --- a/pkgs/games/eduke32/default.nix +++ b/pkgs/games/eduke32/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { installPhase = '' # Install binaries - ensureDir $out/bin + mkdir -p $out/bin cp eduke32 mapster32 $out/bin # Make wrapper script @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { chmod 755 $out/bin/eduke32-wrapper # Install desktop item - ensureDir $out/share/applications + mkdir -p $out/share/applications cp ${desktopItem}/share/applications/* $out/share/applications ''; diff --git a/pkgs/games/egoboo/default.nix b/pkgs/games/egoboo/default.nix index a1b7262f3b9..1f879393868 100644 --- a/pkgs/games/egoboo/default.nix +++ b/pkgs/games/egoboo/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { # The user will need to have all the files in '.' to run egoboo, with # writeable controls.txt and setup.txt installPhase = '' - ensureDir $out/share/${name} + mkdir -p $out/share/${name} cp -v game/egoboo $out/share/${name} cd .. cp -v -Rd controls.txt setup.txt players modules basicdat $out/share/${name} diff --git a/pkgs/games/exult/default.nix b/pkgs/games/exult/default.nix index 4d712601435..e784cc109f5 100644 --- a/pkgs/games/exult/default.nix +++ b/pkgs/games/exult/default.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation { postInstall = '' - ensureDir $out/share/exult/music + mkdir -p $out/share/exult/music for i in $musicFiles; do unzip -o -d $out/share/exult/music $i done diff --git a/pkgs/games/flightgear/default.nix b/pkgs/games/flightgear/default.nix index a7d906ed9b8..fe90156d84c 100644 --- a/pkgs/games/flightgear/default.nix +++ b/pkgs/games/flightgear/default.nix @@ -38,7 +38,7 @@ rec { phaseNames = ["doConfigure" "doMakeInstall" "deployData"]; deployData = a.fullDepEntry '' - ensureDir "$out/share/FlightGear" + mkdir -p "$out/share/FlightGear" cd "$out/share/FlightGear" tar xvf ${datasrc} '' ["minInit" "defEnsureDir"]; diff --git a/pkgs/games/fsg/default.nix b/pkgs/games/fsg/default.nix index 2752e565c58..ba6b65d602b 100644 --- a/pkgs/games/fsg/default.nix +++ b/pkgs/games/fsg/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation { ''; installPhase = '' - ensureDir $out/bin $out/libexec + mkdir -p $out/bin $out/libexec cp sand $out/libexec echo -e '#! /bin/sh\nLC_ALL=C '$out'/libexec/sand "$@"' >$out/bin/fsg chmod a+x $out/bin/fsg diff --git a/pkgs/games/icbm3d/default.nix b/pkgs/games/icbm3d/default.nix index e5e5c94d460..ee792ef1e4d 100644 --- a/pkgs/games/icbm3d/default.nix +++ b/pkgs/games/icbm3d/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation { buildInputs = [ libX11 ]; installPhase = '' - ensureDir $out/bin + mkdir -p $out/bin cp icbm3d $out/bin ''; diff --git a/pkgs/games/instead/default.nix b/pkgs/games/instead/default.nix index d7fcb7a3f4e..0d46e187d7b 100644 --- a/pkgs/games/instead/default.nix +++ b/pkgs/games/instead/default.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { inherit games; installPhase = '' - ensureDir $out/bin $out/share/${name} + mkdir -p $out/bin $out/share/${name} cp sdl-instead $out/bin cp -R games languages stead themes $out/share/${name} pushd $out/share/${name}/games diff --git a/pkgs/games/keen4/builder.sh b/pkgs/games/keen4/builder.sh index f9c62c83ddd..50d261db865 100644 --- a/pkgs/games/keen4/builder.sh +++ b/pkgs/games/keen4/builder.sh @@ -1,9 +1,9 @@ source $stdenv/setup -ensureDir $out/share/keen4 +mkdir -p $out/share/keen4 unzip -j $dist -d $out/share/keen4 -ensureDir $out/bin +mkdir -p $out/bin cat > $out/bin/keen4 < "$out/bin/mars" diff --git a/pkgs/games/naev/default.nix b/pkgs/games/naev/default.nix index f6e571404d6..36ccbf98274 100644 --- a/pkgs/games/naev/default.nix +++ b/pkgs/games/naev/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation { NIX_CFLAGS_COMPILE="-include ${zlib}/include/zlib.h"; postInstall = '' - ensureDir $out/share/naev + mkdir -p $out/share/naev cp -v $srcData $out/share/naev/ndata wrapProgram $out/bin/naev --add-flags $out/share/naev/ndata ''; diff --git a/pkgs/games/nethack/default.nix b/pkgs/games/nethack/default.nix index 0d68b681ba5..d817cf64323 100644 --- a/pkgs/games/nethack/default.nix +++ b/pkgs/games/nethack/default.nix @@ -36,7 +36,7 @@ rec { '') ["minInit" "doUnpack"]; postInstall = a.fullDepEntry ('' - ensureDir $out/bin + mkdir -p $out/bin ln -s $out/games/nethack $out/bin/nethack sed -i $out/bin/nethack -e '5aNEWHACKDIR="$HOME/.nethack"' sed -i $out/bin/nethack -e '6amkdir -p "$NEWHACKDIR/save"' diff --git a/pkgs/games/neverball/default.nix b/pkgs/games/neverball/default.nix index 7e2df42a293..1ebb4b69b6e 100644 --- a/pkgs/games/neverball/default.nix +++ b/pkgs/games/neverball/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { preConfigure = "export HOME=$TMPDIR"; installPhase = '' - ensureDir $out/bin $out + mkdir -p $out/bin $out cp -R data locale $out cp neverball $out/bin cp neverputt $out/bin diff --git a/pkgs/games/openlierox/default.nix b/pkgs/games/openlierox/default.nix index fd2a2f18f39..751941bdfc1 100644 --- a/pkgs/games/openlierox/default.nix +++ b/pkgs/games/openlierox/default.nix @@ -43,7 +43,7 @@ rec { '') ["doUnpack" "addInputs" "setParams"]; doInstall = a.fullDepEntry ('' - ensureDir $BIN_DIR $SYSTEM_DATA_DIR $DOC_DIR $PIXMAP_DIR + mkdir -p $BIN_DIR $SYSTEM_DATA_DIR $DOC_DIR $PIXMAP_DIR bash install.sh '') ["doBuild" "addInputs" "setParams" "defEnsureDir"]; diff --git a/pkgs/games/orbit/default.nix b/pkgs/games/orbit/default.nix index 65e394f60bb..9769e6f5d67 100644 --- a/pkgs/games/orbit/default.nix +++ b/pkgs/games/orbit/default.nix @@ -22,7 +22,7 @@ with builderDefs; sed -e 's@/usr/share/games/orbit/@'$out'/dump/@g' -i *.c sed -e '/DIR=/d; s/-lesd//; s/-DESD//;' -i Makefile make - ensureDir $out/bin + mkdir -p $out/bin cp -r .. $out/dump cat >$out/bin/space-orbit <> "$out/bin/$i" if [ "$i" = "rorconfig" ]; then diff --git a/pkgs/games/sauerbraten/default.nix b/pkgs/games/sauerbraten/default.nix index aca16d14e36..ff99b428cef 100644 --- a/pkgs/games/sauerbraten/default.nix +++ b/pkgs/games/sauerbraten/default.nix @@ -37,7 +37,7 @@ rec { ''; doUnpack = a.fullDepEntry '' - ensureDir $out/share/sauerbraten/build-dir + mkdir -p $out/share/sauerbraten/build-dir ln -s $out/share/sauerbraten/build-dir cd $out/share/sauerbraten/build-dir (cd ${src}; find . -type d) | tail -n +2 | xargs -L 1 mkdir @@ -50,7 +50,7 @@ rec { doCreateScripts = a.fullDepEntry '' cd .. - ensureDir $out/bin + mkdir -p $out/bin echo '#! /bin/sh' >> $out/bin/sauerbraten_server echo 'cd "'"$out"'/share/sauerbraten/build-dir"' >> $out/bin/sauerbraten_server echo './bin_unix/native_server "$@"' >> $out/bin/sauerbraten_server diff --git a/pkgs/games/simutrans/default.nix b/pkgs/games/simutrans/default.nix index 511aa850ff9..c0f9d213762 100644 --- a/pkgs/games/simutrans/default.nix +++ b/pkgs/games/simutrans/default.nix @@ -54,10 +54,10 @@ stdenv.mkDerivation rec { mv sim simutrans/ - ensureDir $out/simutrans + mkdir -p $out/simutrans cp -r simutrans $out - ensureDir $out/bin + mkdir -p $out/bin ln -s $out/simutrans/sim $out/bin/simutrans ''; diff --git a/pkgs/games/teetertorture/default.nix b/pkgs/games/teetertorture/default.nix index 45b5988e88c..18a911d563b 100644 --- a/pkgs/games/teetertorture/default.nix +++ b/pkgs/games/teetertorture/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation { ''; installPhase = '' - ensureDir $out/bin $out/share/teetertorture + mkdir -p $out/bin $out/share/teetertorture cp teetertorture $out/bin cp -R data/* $out/share/teetertorture ''; diff --git a/pkgs/games/teeworlds/default.nix b/pkgs/games/teeworlds/default.nix index 7824fbd9bdf..c685f11c4c1 100644 --- a/pkgs/games/teeworlds/default.nix +++ b/pkgs/games/teeworlds/default.nix @@ -18,11 +18,11 @@ stdenv.mkDerivation rec { installPhase = '' # Copy the graphics, sounds, etc. - ensureDir "$out/share/${name}" + mkdir -p "$out/share/${name}" cp -rv data other/icons "$out/share/${name}" # Copy the executables (client, server, etc.). - ensureDir "$out/bin" + mkdir -p "$out/bin" executables="" for file in * do @@ -46,7 +46,7 @@ EOF done # Copy the documentation. - ensureDir "$out/doc/${name}" + mkdir -p "$out/doc/${name}" cp -v *.txt "$out/doc/${name}" ''; diff --git a/pkgs/games/the-butterfly-effect/default.nix b/pkgs/games/the-butterfly-effect/default.nix index bd1885f9bd9..99f73e07a63 100644 --- a/pkgs/games/the-butterfly-effect/default.nix +++ b/pkgs/games/the-butterfly-effect/default.nix @@ -38,9 +38,9 @@ rec { ''; doDeploy = a.fullDepEntry '' - ensureDir "$out/share/tbe" + mkdir -p "$out/share/tbe" cp -r . "$out/share/tbe/build-dir" - ensureDir "$out/bin" + mkdir -p "$out/bin" echo '#! /bin/sh' >> "$out/bin/tbe" echo "$out/share/tbe/build-dir/tbe \"\$@\"" >> "$out/bin/tbe" chmod a+x "$out/bin/tbe" diff --git a/pkgs/games/thePenguinMachine/default.nix b/pkgs/games/thePenguinMachine/default.nix index 68d44364f59..04438cf70ad 100644 --- a/pkgs/games/thePenguinMachine/default.nix +++ b/pkgs/games/thePenguinMachine/default.nix @@ -26,9 +26,9 @@ stdenv.mkDerivation { ''; installPhase = '' python setup.py install --prefix=$out - ensureDir "$out"/share/tpm/ + mkdir -p "$out"/share/tpm/ cp -r . "$out"/share/tpm/build-dir - ensureDir "$out/bin" + mkdir -p "$out/bin" echo "#! /bin/sh" >> "$out/bin/tpm" echo "export PYTHONPATH=\"\$PYTHONPATH:$PYTHONPATH:$(echo ${pil}/lib/python*/site-packages/PIL)\"" >> "$out/bin/tpm" echo "cd \"$out/share/tpm/build-dir\"" >> "$out/bin/tpm" diff --git a/pkgs/games/trackballs/default.nix b/pkgs/games/trackballs/default.nix index f945e99c071..22d8c944fa8 100644 --- a/pkgs/games/trackballs/default.nix +++ b/pkgs/games/trackballs/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { CXXFLAGS = CFLAGS; dontStrip = debug; postUnpack = optionalString debug - "ensureDir $out/src; cp -R * $out/src ; cd $out/src"; + "mkdir -p $out/src; cp -R * $out/src ; cd $out/src"; NIX_CFLAGS_COMPILE = "-iquote ${SDL}/include/SDL"; configureFlags = optionalString debug "--enable-debug"; diff --git a/pkgs/games/tremulous/default.nix b/pkgs/games/tremulous/default.nix index a4a887e2ed3..bef4b63b0cc 100644 --- a/pkgs/games/tremulous/default.nix +++ b/pkgs/games/tremulous/default.nix @@ -41,11 +41,11 @@ stdenv.mkDerivation rec { ''; installPhase = '' arch=$(uname -m | sed -e s/i.86/x86/) - ensureDir $out/opt/tremulous + mkdir -p $out/opt/tremulous cp -v Release_1.011/build/release-linux-$arch/tremulous.$arch $out/opt/tremulous/ cp -v mg_tremded_source/build/release-linux-$arch/tremded.$arch $out/opt/tremulous/ cp -rv base $out/opt/tremulous - ensureDir $out/bin + mkdir -p $out/bin for b in tremulous tremded do cat << EOF > $out/bin/$b diff --git a/pkgs/games/trigger/default.nix b/pkgs/games/trigger/default.nix index ecc3c1a36fc..fca8ddb889a 100644 --- a/pkgs/games/trigger/default.nix +++ b/pkgs/games/trigger/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { installPhase = '' jam install - ensureDir $out/share + mkdir -p $out/share pushd $out/share tar xf $srcData ''; diff --git a/pkgs/games/urbanterror/default.nix b/pkgs/games/urbanterror/default.nix index dc870c79aba..74448cdad76 100644 --- a/pkgs/games/urbanterror/default.nix +++ b/pkgs/games/urbanterror/default.nix @@ -35,8 +35,8 @@ stdenv.mkDerivation rec { ''; installPhase = '' destDir="$out/opt/urbanterror" - ensureDir "$destDir" - ensureDir "$out/bin" + mkdir -p "$destDir" + mkdir -p "$out/bin" cp -v ioUrbanTerrorClientSource/build/release-linux-*/ioUrbanTerror.* \ "$destDir/ioUrbanTerror" cp -v ioUrbanTerrorServerSource/build/release-linux-*/ioUrTded.* \ diff --git a/pkgs/games/ut2004demo/make-wrapper.sh b/pkgs/games/ut2004demo/make-wrapper.sh index 5dbb451272a..53ef90a615b 100644 --- a/pkgs/games/ut2004demo/make-wrapper.sh +++ b/pkgs/games/ut2004demo/make-wrapper.sh @@ -1,6 +1,6 @@ source $stdenv/setup -ensureDir $out/bin +mkdir -p $out/bin cat > $out/bin/ut2004demo < $out/lib/cups/model/Canon-PIXMA_iP4000-gutenprint.5.0.sim-en.ppd sed -i 's@/opt/gutenprint/cups@${pkgs.gutenprintBin}/cups@' $out/lib/cups/model/Canon-PIXMA_iP4000-gutenprint.5.0.sim-en.ppd diff --git a/pkgs/misc/emulators/atari800/builder.sh b/pkgs/misc/emulators/atari800/builder.sh index f0fcb5150c8..afb9404657a 100644 --- a/pkgs/misc/emulators/atari800/builder.sh +++ b/pkgs/misc/emulators/atari800/builder.sh @@ -6,7 +6,7 @@ preConfigure() { postInstall() { romsDir=$out/share/atari800/roms - ensureDir $romsDir + mkdir -p $romsDir unzip $rom -d $romsDir } diff --git a/pkgs/misc/emulators/darcnes/default.nix b/pkgs/misc/emulators/darcnes/default.nix index 5ce5512119d..15ab18495d2 100644 --- a/pkgs/misc/emulators/darcnes/default.nix +++ b/pkgs/misc/emulators/darcnes/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation { buildInputs = [ libX11 libXt libXext libXaw ]; installPhase = '' - ensureDir $out/bin + mkdir -p $out/bin cp darcnes $out/bin ''; diff --git a/pkgs/misc/emulators/dosbox/default.nix b/pkgs/misc/emulators/dosbox/default.nix index 8a7bff6f7e4..eff47c9c503 100644 --- a/pkgs/misc/emulators/dosbox/default.nix +++ b/pkgs/misc/emulators/dosbox/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { }; postInstall = '' - ensureDir $out/share/applications + mkdir -p $out/share/applications cp ${desktopItem}/share/applications/* $out/share/applications ''; diff --git a/pkgs/misc/emulators/fakenes/default.nix b/pkgs/misc/emulators/fakenes/default.nix index 62ecb6e4156..e3c9dbc84e5 100644 --- a/pkgs/misc/emulators/fakenes/default.nix +++ b/pkgs/misc/emulators/fakenes/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation { libXxf86vm libXcursor libXpm ]; installPhase = '' - ensureDir $out/bin + mkdir -p $out/bin cp fakenes $out/bin ''; diff --git a/pkgs/misc/emulators/mess/default.nix b/pkgs/misc/emulators/mess/default.nix index b3897154e9a..150042ad796 100644 --- a/pkgs/misc/emulators/mess/default.nix +++ b/pkgs/misc/emulators/mess/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation { installPhase = '' - ensureDir $out/bin + mkdir -p $out/bin cp mess* $out/bin/mess ''; diff --git a/pkgs/misc/emulators/vice/default.nix b/pkgs/misc/emulators/vice/default.nix index 425080d7c62..12f1222553e 100644 --- a/pkgs/misc/emulators/vice/default.nix +++ b/pkgs/misc/emulators/vice/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { ''; postInstall = '' - ensureDir $out/share/applications + mkdir -p $out/share/applications cp ${desktopItem}/share/applications/* $out/share/applications ''; diff --git a/pkgs/misc/foldingathome/default.nix b/pkgs/misc/foldingathome/default.nix index ca4fe2657bf..ef8cb7d0a92 100644 --- a/pkgs/misc/foldingathome/default.nix +++ b/pkgs/misc/foldingathome/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation { for a in $BINFILES; do patchelf --set-interpreter $(cat $NIX_GCC/nix-support/dynamic-linker) $a done - ensureDir $out/bin + mkdir -p $out/bin cp $BINFILES $out/bin ''; diff --git a/pkgs/misc/gxemul/default.nix b/pkgs/misc/gxemul/default.nix index ad126b45daa..5cad3c964e4 100644 --- a/pkgs/misc/gxemul/default.nix +++ b/pkgs/misc/gxemul/default.nix @@ -8,8 +8,8 @@ composableDerivation.composableDerivation {} { inherit name; flags = { - doc = { installPhase = "ensureDir \$out/share/${name}; cp -r doc \$out/share/${name};"; implies = "man"; }; - demos = { installPhase = "ensureDir \$out/share/${name}; cp -r demos \$out/share/${name};"; }; + doc = { installPhase = "mkdir -p \$out/share/${name}; cp -r doc \$out/share/${name};"; implies = "man"; }; + demos = { installPhase = "mkdir -p \$out/share/${name}; cp -r demos \$out/share/${name};"; }; man = { installPhase = "cp -r ./man \$out/;";}; }; @@ -19,7 +19,7 @@ composableDerivation.composableDerivation {} { manSupport = true; }; - installPhase = "ensureDir \$out/bin; cp gxemul \$out/bin;"; + installPhase = "mkdir -p \$out/bin; cp gxemul \$out/bin;"; src = fetchurl { url = http://gavare.se/gxemul/src/gxemul-0.4.6.tar.gz; diff --git a/pkgs/misc/jackaudio/jack1.nix b/pkgs/misc/jackaudio/jack1.nix index 88bc4dff540..bb11e5d5f04 100644 --- a/pkgs/misc/jackaudio/jack1.nix +++ b/pkgs/misc/jackaudio/jack1.nix @@ -36,7 +36,7 @@ composableDerivation.composableDerivation {} { # make sure the jackaudio is found by symlinking lib64 to lib postInstall = '' - ensureDir $out/lib + mkdir -p $out/lib ln -s $out/lib{64,}/pkgconfig ''; diff --git a/pkgs/misc/misc.nix b/pkgs/misc/misc.nix index 1b026ebb684..de23d6fa2c8 100644 --- a/pkgs/misc/misc.nix +++ b/pkgs/misc/misc.nix @@ -95,7 +95,7 @@ in ) } - ensureDir $target/{include,lib} + mkdir -p $target/{include,lib} link $target/lib "$(echo "''${!LIB_PATHS[@]}")" link $target/include "$(echo "''${!INCLUDE_PATHS[@]}")" echo "''${!LIBS[@]}" > $target/libs diff --git a/pkgs/misc/sane-backends/default.nix b/pkgs/misc/sane-backends/default.nix index 458985c61f7..3f9ecdccb40 100644 --- a/pkgs/misc/sane-backends/default.nix +++ b/pkgs/misc/sane-backends/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { postInstall = '' if test "$udevSupport" = "1"; then - ensureDir $out/etc/udev/rules.d/ + mkdir -p $out/etc/udev/rules.d/ ./tools/sane-desc -m udev > $out/etc/udev/rules.d/60-libsane.rules || \ cp tools/udev/libsane.rules $out/etc/udev/rules.d/60-libsane.rules fi diff --git a/pkgs/misc/sane-backends/snapshot.nix b/pkgs/misc/sane-backends/snapshot.nix index 8725206ddce..636ae37ec05 100644 --- a/pkgs/misc/sane-backends/snapshot.nix +++ b/pkgs/misc/sane-backends/snapshot.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { postInstall = '' if test "$udevSupport" = "1"; then - ensureDir $out/etc/udev/rules.d/ + mkdir -p $out/etc/udev/rules.d/ ./tools/sane-desc -m udev > $out/etc/udev/rules.d/60-libsane.rules || \ cp tools/udev/libsane.rules $out/etc/udev/rules.d/60-libsane.rules fi diff --git a/pkgs/misc/screensavers/electricsheep/default.nix b/pkgs/misc/screensavers/electricsheep/default.nix index 64674d78ac7..dca60f55af0 100644 --- a/pkgs/misc/screensavers/electricsheep/default.nix +++ b/pkgs/misc/screensavers/electricsheep/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { preInstall = '' installFlags=GNOME_DATADIR=$out - ensureDir $out/control-center/screensavers + mkdir -p $out/control-center/screensavers ''; meta = { diff --git a/pkgs/misc/screensavers/rss-glx/builder.sh b/pkgs/misc/screensavers/rss-glx/builder.sh index 00ec2e065bd..a0c138d5e04 100644 --- a/pkgs/misc/screensavers/rss-glx/builder.sh +++ b/pkgs/misc/screensavers/rss-glx/builder.sh @@ -2,9 +2,9 @@ source $stdenv/setup # This is a very dirty hack to prevent the binaries from putting the # Mesa libraries in their RPATHs. -ensureDir $out/tmp +mkdir -p $out/tmp ln -s $mesa/lib/* $out/tmp/ -ensureDir $out/lib +mkdir -p $out/lib ln -s $mesa/lib/libGLU* $out/lib/ export NIX_LDFLAGS="-L$out/tmp $NIX_LDFLAGS" @@ -14,7 +14,7 @@ rm -rf $out/tmp # Add a wrapper around each program to use the appropriate OpenGL driver. -ensureDir $out/bin/.orig +mkdir -p $out/bin/.orig for i in $(cd $out/bin && ls); do mv $out/bin/$i $out/bin/.orig/$i diff --git a/pkgs/misc/source-and-tags/default.nix b/pkgs/misc/source-and-tags/default.nix index 42101fa6ffe..e3993d0daea 100644 --- a/pkgs/misc/source-and-tags/default.nix +++ b/pkgs/misc/source-and-tags/default.nix @@ -28,13 +28,13 @@ args: with args; { '') createTagFiles ); in '' SRC_DEST=$out/src/$name - ensureDir $SRC_DEST + mkdir -p $SRC_DEST pwd; ls cp -r $srcDir $SRC_DEST cd $SRC_DEST ${createTags} - ensureDir $out/nix-support + mkdir -p $out/nix-support echo "TAG_FILES=\"\$TAG_FILES\''${TAG_FILES:+:}$TAG_FILES\"" >> $out/nix-support/setup-hook ''; }; diff --git a/pkgs/misc/tex/lazylist/builder.sh b/pkgs/misc/tex/lazylist/builder.sh index 140b07f7be7..cdab5bb8c97 100644 --- a/pkgs/misc/tex/lazylist/builder.sh +++ b/pkgs/misc/tex/lazylist/builder.sh @@ -4,7 +4,7 @@ buildPhase=true installPhase=myInstallPhase myInstallPhase() { - ensureDir "$out/share/texmf-nix/tex/latex/lazylist" + mkdir -p "$out/share/texmf-nix/tex/latex/lazylist" cp lazylist.sty "$out/share/texmf-nix/tex/latex/lazylist" } diff --git a/pkgs/misc/tex/lkproof/default.nix b/pkgs/misc/tex/lkproof/default.nix index 2d3a1e5f19c..936e4a31af1 100644 --- a/pkgs/misc/tex/lkproof/default.nix +++ b/pkgs/misc/tex/lkproof/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation { buildInputs = [ unzip ]; installPhase = " - ensureDir $out/share/texmf-nix/tex/generic/lkproof + mkdir -p $out/share/texmf-nix/tex/generic/lkproof cp -prd *.sty $out/share/texmf-nix/tex/generic/lkproof "; } diff --git a/pkgs/misc/tex/nix/animatedot.sh b/pkgs/misc/tex/nix/animatedot.sh index 2e1868d4beb..46a2c515e03 100644 --- a/pkgs/misc/tex/nix/animatedot.sh +++ b/pkgs/misc/tex/nix/animatedot.sh @@ -1,6 +1,6 @@ source $stdenv/setup -ensureDir $out +mkdir -p $out for ((i = 1; i <= $nrFrames; i++)); do echo "producing frame $i..."; diff --git a/pkgs/misc/tex/nix/default.nix b/pkgs/misc/tex/nix/default.nix index f5a34fb67a2..9ae567e635b 100644 --- a/pkgs/misc/tex/nix/default.nix +++ b/pkgs/misc/tex/nix/default.nix @@ -182,7 +182,7 @@ rec { ln -s $postscript $input fi - ensureDir $out + mkdir -p $out convert -units PixelsPerInch \ -density 600 \ -trim \ diff --git a/pkgs/misc/tex/nix/dot2pdf.sh b/pkgs/misc/tex/nix/dot2pdf.sh index 0a9610c00ff..c416bf235a1 100644 --- a/pkgs/misc/tex/nix/dot2pdf.sh +++ b/pkgs/misc/tex/nix/dot2pdf.sh @@ -1,6 +1,6 @@ source $stdenv/setup -ensureDir $out +mkdir -p $out dot2pdf() { sourceFile=$1 diff --git a/pkgs/misc/tex/nix/dot2ps.sh b/pkgs/misc/tex/nix/dot2ps.sh index 1269108d6f5..c70e76ce4c7 100644 --- a/pkgs/misc/tex/nix/dot2ps.sh +++ b/pkgs/misc/tex/nix/dot2ps.sh @@ -1,6 +1,6 @@ source $stdenv/setup -ensureDir $out +mkdir -p $out dot2ps() { sourceFile=$1 diff --git a/pkgs/misc/tex/nix/lhs2tex.sh b/pkgs/misc/tex/nix/lhs2tex.sh index 6edca4baf8a..f34b3944c8e 100644 --- a/pkgs/misc/tex/nix/lhs2tex.sh +++ b/pkgs/misc/tex/nix/lhs2tex.sh @@ -1,6 +1,6 @@ source $stdenv/setup -ensureDir $out +mkdir -p $out mkdir root cd root diff --git a/pkgs/misc/tex/nix/run-latex.sh b/pkgs/misc/tex/nix/run-latex.sh index 6c18721eed6..2886057c894 100644 --- a/pkgs/misc/tex/nix/run-latex.sh +++ b/pkgs/misc/tex/nix/run-latex.sh @@ -1,6 +1,6 @@ source $stdenv/setup -ensureDir $out +mkdir -p $out export TEXMFCNF=$TMPDIR: echo 'max_print_line = 8192' >> $TMPDIR/texmf.cnf diff --git a/pkgs/misc/tex/pgf/1.x.nix b/pkgs/misc/tex/pgf/1.x.nix index 672ae6fdfce..91948f995a0 100644 --- a/pkgs/misc/tex/pgf/1.x.nix +++ b/pkgs/misc/tex/pgf/1.x.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation { buildPhase = "true"; installPhase = " - ensureDir $out/share/texmf-nix + mkdir -p $out/share/texmf-nix cp -prd * $out/share/texmf-nix "; } diff --git a/pkgs/misc/tex/pgf/2.x.nix b/pkgs/misc/tex/pgf/2.x.nix index 5e73d12959c..09ec1729cfd 100644 --- a/pkgs/misc/tex/pgf/2.x.nix +++ b/pkgs/misc/tex/pgf/2.x.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation { buildPhase = "true"; installPhase = " - ensureDir $out/share/texmf-nix + mkdir -p $out/share/texmf-nix cp -prd * $out/share/texmf-nix "; } diff --git a/pkgs/misc/tex/polytable/builder.sh b/pkgs/misc/tex/polytable/builder.sh index 1138b8e6789..68f653ccec0 100644 --- a/pkgs/misc/tex/polytable/builder.sh +++ b/pkgs/misc/tex/polytable/builder.sh @@ -4,14 +4,14 @@ buildPhase=true installPhase=myInstallPhase myInstallPhase() { - ensureDir "$out/share/texmf-nix/tex/latex/polytable" - ensureDir "$out/share/texmf-nix/doc/latex/polytable" + mkdir -p "$out/share/texmf-nix/tex/latex/polytable" + mkdir -p "$out/share/texmf-nix/doc/latex/polytable" latex polytable.ins pdflatex polytable.dtx pdflatex polytable.dtx cp polytable.sty "$out/share/texmf-nix/tex/latex/polytable" cp polytable.pdf "$out/share/texmf-nix/doc/latex/polytable" - ensureDir "$out/nix-support" + mkdir -p "$out/nix-support" echo "$propagatedUserEnvPackages" > "$out/nix-support/propagated-user-env-packages" } diff --git a/pkgs/misc/tex/tetex/default.nix b/pkgs/misc/tex/tetex/default.nix index 5e0fb38c3bd..bb1e3f8b4b0 100644 --- a/pkgs/misc/tex/tetex/default.nix +++ b/pkgs/misc/tex/tetex/default.nix @@ -33,8 +33,8 @@ stdenv.mkDerivation { postUnpack = '' - ensureDir $out/share/texmf - ensureDir $out/share/texmf-dist + mkdir -p $out/share/texmf + mkdir -p $out/share/texmf-dist gunzip < $texmf | (cd $out/share/texmf-dist && tar xvf -) ''; diff --git a/pkgs/misc/tex/tex4ht/default.nix b/pkgs/misc/tex/tex4ht/default.nix index 90d134fcd4e..5d5d85d3c1d 100644 --- a/pkgs/misc/tex/tex4ht/default.nix +++ b/pkgs/misc/tex/tex4ht/default.nix @@ -21,12 +21,12 @@ stdenv.mkDerivation rec { ''; installPhase = '' - ensureDir $out/bin + mkdir -p $out/bin for f in src/tex4ht src/t4ht src/htcmd bin/unix/*; do # */ mv $f $out/bin/. done - ensureDir $out/share + mkdir -p $out/share cp -r texmf $out/share/. ''; diff --git a/pkgs/misc/tex/texlive/aggregate.nix b/pkgs/misc/tex/texlive/aggregate.nix index 1723f481906..c018d2da0d3 100644 --- a/pkgs/misc/tex/texlive/aggregate.nix +++ b/pkgs/misc/tex/texlive/aggregate.nix @@ -7,12 +7,12 @@ rec { doAggregate = fullDepEntry ('' - ensureDir $out/bin + mkdir -p $out/bin for currentPath in ${lib.concatStringsSep " " buildInputs}; do echo Symlinking "$currentPath" find $currentPath/share/info $currentPath/share/man $(echo $currentPath/texmf*/) ! -type d | while read; do REPLY="''${REPLY#$currentPath}" - ensureDir $out/"$(dirname "$REPLY")" + mkdir -p $out/"$(dirname "$REPLY")" ln -fs $currentPath/"$REPLY" $out/"$REPLY" echo done | while read; do head -n 99 >/dev/null; echo -n .; done @@ -33,7 +33,7 @@ rec { rm -r $out/texmf-config find $out/texmf/ -type d | while read; do REPLY="''${REPLY#$out/texmf}" - ensureDir $out/texmf-config/"$REPLY" + mkdir -p $out/texmf-config/"$REPLY" done for i in $out/libexec/*/* :; do diff --git a/pkgs/misc/tex/texlive/beamer.nix b/pkgs/misc/tex/texlive/beamer.nix index 5ff2c89316a..851ad0707a1 100644 --- a/pkgs/misc/tex/texlive/beamer.nix +++ b/pkgs/misc/tex/texlive/beamer.nix @@ -10,9 +10,9 @@ rec { propagatedBuildInputs = [texLiveLatexXColor texLivePGF]; phaseNames = ["doCopy"]; doCopy = fullDepEntry ('' - ensureDir $out/share/ + mkdir -p $out/share/ - ensureDir $out/texmf-dist/tex/latex/beamer + mkdir -p $out/texmf-dist/tex/latex/beamer cp -r * $out/texmf-dist/tex/latex/beamer ln -s $out/texmf* $out/share/ diff --git a/pkgs/misc/tex/texlive/cm-super.nix b/pkgs/misc/tex/texlive/cm-super.nix index 4f15afdc381..e23b3936850 100644 --- a/pkgs/misc/tex/texlive/cm-super.nix +++ b/pkgs/misc/tex/texlive/cm-super.nix @@ -8,17 +8,17 @@ rec { phaseNames = ["doCopy"]; doCopy = fullDepEntry ('' - ensureDir $out/share/ + mkdir -p $out/share/ - ensureDir $out/texmf/fonts/enc - ensureDir $out/texmf/fonts/map - ensureDir $out/texmf/fonts/type1/public/cm-super + mkdir -p $out/texmf/fonts/enc + mkdir -p $out/texmf/fonts/map + mkdir -p $out/texmf/fonts/type1/public/cm-super cp pfb/*.pfb $out/texmf/fonts/type1/public/cm-super - ensureDir $out/texmf/dvips/cm-super + mkdir -p $out/texmf/dvips/cm-super cp dvips/*.{map,enc} $out/texmf/dvips/cm-super cp dvips/*.enc $out/texmf/fonts/enc cp dvips/*.map $out/texmf/fonts/map - ensureDir $out/texmf/dvipdfm/config + mkdir -p $out/texmf/dvipdfm/config cp dvipdfm/*.map $out/texmf/dvipdfm/config ln -s $out/texmf* $out/share/ diff --git a/pkgs/misc/tex/texlive/context.nix b/pkgs/misc/tex/texlive/context.nix index b502b0f2108..a7161cea4c1 100644 --- a/pkgs/misc/tex/texlive/context.nix +++ b/pkgs/misc/tex/texlive/context.nix @@ -9,9 +9,9 @@ rec { buildInputs = [texLive]; phaseNames = ["doCopy"]; doCopy = fullDepEntry ('' - ensureDir $out/share/ + mkdir -p $out/share/ - ensureDir $out/texmf + mkdir -p $out/texmf cp -r * $out/texmf ln -s $out/texmf* $out/share/ diff --git a/pkgs/misc/tex/texlive/default.nix b/pkgs/misc/tex/texlive/default.nix index 69fb5d7e415..30e59849d32 100644 --- a/pkgs/misc/tex/texlive/default.nix +++ b/pkgs/misc/tex/texlive/default.nix @@ -18,10 +18,10 @@ rec { setupHook = ./setup-hook.sh; doMainBuild = fullDepEntry ('' - ensureDir $out - ensureDir $out/nix-support + mkdir -p $out + mkdir -p $out/nix-support cp ${setupHook} $out/nix-support/setup-hook.sh - ensureDir $out/share + mkdir -p $out/share tar xf ${texmfSrc} -C $out --strip-components=1 tar xf ${langTexmfSrc} -C $out --strip-components=1 @@ -45,7 +45,7 @@ rec { doPostInstall = fullDepEntry('' mv $out/bin $out/libexec - ensureDir $out/bin + mkdir -p $out/bin for i in "$out/libexec/"*"/"*; do test \( \! -d "$i" \) -a -x "$i" || continue echo -ne "#! $SHELL\\nexec $i \"\$@\"" >$out/bin/$(basename $i) @@ -69,7 +69,7 @@ rec { # # I find it acceptable, hence the "|| true". echo "building format files..." - ensureDir "$out/texmf-var/web2c" + mkdir -p "$out/texmf-var/web2c" PATH="$PATH:$out/bin" fmtutil-sys --all || true PATH=$PATH:$out/bin mktexlsr $out/texmf* diff --git a/pkgs/misc/tex/texlive/extra.nix b/pkgs/misc/tex/texlive/extra.nix index 598bdd08aef..1ecec91a685 100644 --- a/pkgs/misc/tex/texlive/extra.nix +++ b/pkgs/misc/tex/texlive/extra.nix @@ -9,7 +9,7 @@ rec { buildInputs = [texLive]; phaseNames = ["doCopy"]; doCopy = fullDepEntry ('' - ensureDir $out/share + mkdir -p $out/share cp -r texmf* $out/ ln -s $out/texmf* $out/share '') ["minInit" "doUnpack" "defEnsureDir" "addInputs"]; diff --git a/pkgs/misc/tex/texlive/moderncv.nix b/pkgs/misc/tex/texlive/moderncv.nix index a19835eda4b..bbff2ccf4a1 100644 --- a/pkgs/misc/tex/texlive/moderncv.nix +++ b/pkgs/misc/tex/texlive/moderncv.nix @@ -9,7 +9,7 @@ rec { buildInputs = [texLive unzip]; phaseNames = ["doCopy"]; doCopy = fullDepEntry ('' - ensureDir $out/texmf/tex/latex/moderncv $out/texmf/doc $out/share + mkdir -p $out/texmf/tex/latex/moderncv $out/texmf/doc $out/share mv *.cls *.sty $out/texmf/tex/latex/moderncv/ mv examples $out/texmf/doc/moderncv ln -s $out/texmf* $out/share/ diff --git a/pkgs/misc/tex/texlive/pgf.nix b/pkgs/misc/tex/texlive/pgf.nix index fac520290f0..61e2eb26c68 100644 --- a/pkgs/misc/tex/texlive/pgf.nix +++ b/pkgs/misc/tex/texlive/pgf.nix @@ -12,8 +12,8 @@ rec { phaseNames = ["doCopy"]; doCopy = fullDepEntry ('' - ensureDir $out/share/ - ensureDir $out/texmf/tex/generic/pgf + mkdir -p $out/share/ + mkdir -p $out/texmf/tex/generic/pgf cp -r * $out/texmf/tex/generic/pgf ln -s $out/texmf* $out/share/ '') ["minInit" "doUnpack" "defEnsureDir" "addInputs"]; diff --git a/pkgs/misc/tex/texlive/xcolor.nix b/pkgs/misc/tex/texlive/xcolor.nix index 4e8d5eeb30b..e59a58ce9b2 100644 --- a/pkgs/misc/tex/texlive/xcolor.nix +++ b/pkgs/misc/tex/texlive/xcolor.nix @@ -10,10 +10,10 @@ rec { phaseNames = ["doCopy"]; doCopy = fullDepEntry ('' export HOME=$PWD - ensureDir $out/share/ + mkdir -p $out/share/ - ensureDir $out/texmf/tex/latex/xcolor - ensureDir $out/texmf/dvips/xcolor + mkdir -p $out/texmf/tex/latex/xcolor + mkdir -p $out/texmf/dvips/xcolor latex xcolor.ins cp *.sty *.def $out/texmf/tex/latex/xcolor cp *.pro $out/texmf/dvips/xcolor @@ -25,7 +25,7 @@ rec { #latex xcolor.dtx rm *.sty *.pro *.ins *.def *.dtx - ensureDir $out/texmf/doc/latex-xcolor + mkdir -p $out/texmf/doc/latex-xcolor cp * $out/texmf/doc/latex-xcolor ln -s $out/texmf* $out/share/ diff --git a/pkgs/misc/uboot/default.nix b/pkgs/misc/uboot/default.nix index 0ad55339d08..7525c28e740 100644 --- a/pkgs/misc/uboot/default.nix +++ b/pkgs/misc/uboot/default.nix @@ -32,11 +32,11 @@ stdenv.mkDerivation { dontStrip = true; installPhase = '' - ensureDir $out + mkdir -p $out cp u-boot.bin $out cp u-boot u-boot.map $out - ensureDir $out/bin + mkdir -p $out/bin cp tools/{envcrc,mkimage} $out/bin ''; diff --git a/pkgs/misc/uboot/guruplug.nix b/pkgs/misc/uboot/guruplug.nix index b78424acfae..0e63a56073b 100644 --- a/pkgs/misc/uboot/guruplug.nix +++ b/pkgs/misc/uboot/guruplug.nix @@ -44,10 +44,10 @@ stdenv.mkDerivation { dontStrip = true; installPhase = '' - ensureDir $out + mkdir -p $out cp -v u-boot u-boot.{kwb,map} $out - ensureDir $out/bin + mkdir -p $out/bin cp tools/{envcrc,mkimage} $out/bin ''; } diff --git a/pkgs/misc/uboot/nanonote.nix b/pkgs/misc/uboot/nanonote.nix index c45eb3f1d24..b8261979ec0 100644 --- a/pkgs/misc/uboot/nanonote.nix +++ b/pkgs/misc/uboot/nanonote.nix @@ -50,11 +50,11 @@ stdenv.mkDerivation { dontStrip = true; installPhase = '' - ensureDir $out + mkdir -p $out cp u-boot-nand.bin $out cp u-boot u-boot.map $out - ensureDir $out/bin + mkdir -p $out/bin cp tools/{envcrc,mkimage} $out/bin ''; } diff --git a/pkgs/misc/uboot/sheevaplug.nix b/pkgs/misc/uboot/sheevaplug.nix index 83d029d4154..5eb8d7d7bf8 100644 --- a/pkgs/misc/uboot/sheevaplug.nix +++ b/pkgs/misc/uboot/sheevaplug.nix @@ -47,11 +47,11 @@ stdenv.mkDerivation { dontStrip = true; installPhase = '' - ensureDir $out + mkdir -p $out cp u-boot-rd88f6281Sheevaplug_400db_nand.bin $out cp u-boot u-boot.map $out - ensureDir $out/bin + mkdir -p $out/bin cp tools/{envcrc,mkimage} $out/bin ''; } diff --git a/pkgs/os-specific/linux/915resolution/default.nix b/pkgs/os-specific/linux/915resolution/default.nix index 48ab97d9106..cfb71690ad5 100644 --- a/pkgs/os-specific/linux/915resolution/default.nix +++ b/pkgs/os-specific/linux/915resolution/default.nix @@ -7,5 +7,5 @@ stdenv.mkDerivation { sha256 = "1m5nfzgwaglqabpm2l2mjqvigz1z0dj87cmj2pjbbzxmmpapv0lq"; }; buildPhase = "rm *.o 915resolution; make"; - installPhase = "ensureDir $out/sbin; cp 915resolution $out/sbin/"; + installPhase = "mkdir -p $out/sbin; cp 915resolution $out/sbin/"; } diff --git a/pkgs/os-specific/linux/acpi-call/default.nix b/pkgs/os-specific/linux/acpi-call/default.nix index 1a9b3cbf74d..925e2e2e650 100644 --- a/pkgs/os-specific/linux/acpi-call/default.nix +++ b/pkgs/os-specific/linux/acpi-call/default.nix @@ -17,9 +17,9 @@ stdenv.mkDerivation { installPhase = '' kernelVersion=$(cd ${kernel}/lib/modules && ls) - ensureDir $out/lib/modules/$kernelVersion/misc + mkdir -p $out/lib/modules/$kernelVersion/misc cp acpi_call.ko $out/lib/modules/$kernelVersion/misc - ensureDir $out/bin + mkdir -p $out/bin cp test_off.sh $out/bin/test_discrete_video_off.sh ''; diff --git a/pkgs/os-specific/linux/ati-drivers/builder.sh b/pkgs/os-specific/linux/ati-drivers/builder.sh index 1fd6234b48e..b05093d8915 100644 --- a/pkgs/os-specific/linux/ati-drivers/builder.sh +++ b/pkgs/os-specific/linux/ati-drivers/builder.sh @@ -136,7 +136,7 @@ GCC_MAJOR="`gcc --version | grep -o -e ") ." | head -1 | cut -d " " -f 2`" { # install - ensureDir $out/lib/xorg + mkdir -p $out/lib/xorg cp -r common/usr/include $out cp -r common/usr/sbin $out @@ -152,7 +152,7 @@ GCC_MAJOR="`gcc --version | grep -o -e ") ." | head -1 | cut -d " " -f 2`" cp -r $DIR_DEPENDING_ON_XORG_VERSION/usr/X11R6/$lib_arch/* $out/lib/xorg t=$out/lib/modules/${kernelVersion}/kernel/drivers/misc - ensureDir $t + mkdir -p $t cp ./common/lib/modules/fglrx/build_mod/2.6.x/fglrx.ko $t @@ -174,7 +174,7 @@ GCC_MAJOR="`gcc --version | grep -o -e ") ." | head -1 | cut -d " " -f 2`" } { # build samples - ensureDir $out/bin + mkdir -p $out/bin mkdir -p samples cd samples diff --git a/pkgs/os-specific/linux/aufs/2.1.nix b/pkgs/os-specific/linux/aufs/2.1.nix index f6a3a6dffc2..1539775a2a1 100644 --- a/pkgs/os-specific/linux/aufs/2.1.nix +++ b/pkgs/os-specific/linux/aufs/2.1.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation { installPhase = '' - ensureDir $out/lib/modules/${kernel.version}/misc + mkdir -p $out/lib/modules/${kernel.version}/misc cp -v aufs.ko $out/lib/modules/${kernel.version}/misc # Install the headers because aufs2.1-util requires them. diff --git a/pkgs/os-specific/linux/aufs/2.nix b/pkgs/os-specific/linux/aufs/2.nix index 696ed57b860..4d80ddae0b8 100644 --- a/pkgs/os-specific/linux/aufs/2.nix +++ b/pkgs/os-specific/linux/aufs/2.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation { installPhase = '' - ensureDir $out/lib/modules/${kernel.version}/misc + mkdir -p $out/lib/modules/${kernel.version}/misc cp aufs.ko $out/lib/modules/${kernel.version}/misc # Install the headers because aufs2-util requires them. diff --git a/pkgs/os-specific/linux/aufs/3.nix b/pkgs/os-specific/linux/aufs/3.nix index ec3c5aec85b..731098134b5 100644 --- a/pkgs/os-specific/linux/aufs/3.nix +++ b/pkgs/os-specific/linux/aufs/3.nix @@ -22,11 +22,11 @@ stdenv.mkDerivation { installPhase = '' - ensureDir $out/lib/modules/${kernel.modDirVersion}/misc + mkdir -p $out/lib/modules/${kernel.modDirVersion}/misc cp -v aufs.ko $out/lib/modules/${kernel.modDirVersion}/misc # Install the headers because aufs3-util requires them. - ensureDir $out/include/linux + mkdir -p $out/include/linux cp -v usr/include/linux/aufs_type.h $out/include/linux ''; diff --git a/pkgs/os-specific/linux/broadcom-sta/default.nix b/pkgs/os-specific/linux/broadcom-sta/default.nix index 9749b1568e4..39cc2dd4080 100644 --- a/pkgs/os-specific/linux/broadcom-sta/default.nix +++ b/pkgs/os-specific/linux/broadcom-sta/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation { '' binDir="$out/lib/modules/${kernel.modDirVersion}/kernel/net/wireless/" docDir="$out/share/doc/broadcom-sta/" - ensureDir "$binDir" "$docDir" + mkdir -p "$binDir" "$docDir" cp wl.ko "$binDir" cp lib/LICENSE.txt "$docDir" ''; diff --git a/pkgs/os-specific/linux/cramfsswap/builder.sh b/pkgs/os-specific/linux/cramfsswap/builder.sh index 14e6a11f9d0..51a5b11dda6 100644 --- a/pkgs/os-specific/linux/cramfsswap/builder.sh +++ b/pkgs/os-specific/linux/cramfsswap/builder.sh @@ -1,6 +1,6 @@ source $stdenv/setup export DESTDIR=$out -ensureDir $out/usr/bin +mkdir -p $out/usr/bin genericBuild diff --git a/pkgs/os-specific/linux/exmap/default.nix b/pkgs/os-specific/linux/exmap/default.nix index da5e00e3377..a7fb22f95e9 100644 --- a/pkgs/os-specific/linux/exmap/default.nix +++ b/pkgs/os-specific/linux/exmap/default.nix @@ -31,10 +31,10 @@ stdenv.mkDerivation rec { #checkPhase = "make test" installPhase = '' - ensureDir "$out/share/${name}" + mkdir -p "$out/share/${name}" cp kernel/*.ko "$out/share/${name}" - ensureDir "$out/bin" + mkdir -p "$out/bin" cp src/{gexmap,exmtool,elftool,showproc} "$out/bin" ''; diff --git a/pkgs/os-specific/linux/ext3cow-tools/builder.sh b/pkgs/os-specific/linux/ext3cow-tools/builder.sh index 560b8d6723a..be6e3d9ce3a 100755 --- a/pkgs/os-specific/linux/ext3cow-tools/builder.sh +++ b/pkgs/os-specific/linux/ext3cow-tools/builder.sh @@ -13,7 +13,7 @@ sed -i "s/linux\/ext3cow_fs.h/$kernerlext3cowheader_slashed/" ext3cow_tools.h # make -ensureDir $out/bin/ +mkdir -p $out/bin/ cp ss $out/bin/snapshot cp tt $out/bin/ cp e2d $out/bin/ diff --git a/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix b/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix index 6ad2227ee69..f468b183be9 100644 --- a/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix +++ b/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation { patchPhase = "rm -rf debian defines TODO"; - installPhase = "ensureDir $out && cp -ra * $out/"; + installPhase = "mkdir -p $out && cp -ra * $out/"; # repeat the same trick for radeon, 3com, etc. postInstall = "ln -s $out/realtek/rtlwifi $out/rtlwifi"; diff --git a/pkgs/os-specific/linux/firmware/ipw2100/default.nix b/pkgs/os-specific/linux/firmware/ipw2100/default.nix index 2ffa8c3e837..3548a841aab 100644 --- a/pkgs/os-specific/linux/firmware/ipw2100/default.nix +++ b/pkgs/os-specific/linux/firmware/ipw2100/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation { # says: "Your rights to redistribute the Software shall be # contingent upon your installation of this Agreement in its # entirety in the same directory as the Software." - installPhase = "ensureDir $out; cp * $out"; + installPhase = "mkdir -p $out; cp * $out"; meta = { # "... you may transfer a copy of the Software ... provided such diff --git a/pkgs/os-specific/linux/firmware/ipw2200/default.nix b/pkgs/os-specific/linux/firmware/ipw2200/default.nix index ed6a82e0df7..402636862ec 100644 --- a/pkgs/os-specific/linux/firmware/ipw2200/default.nix +++ b/pkgs/os-specific/linux/firmware/ipw2200/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation { # says: "Your rights to redistribute the Software shall be # contingent upon your installation of this Agreement in its # entirety in the same directory as the Software." - installPhase = "ensureDir $out; cp * $out"; + installPhase = "mkdir -p $out; cp * $out"; meta = { # "... you may transfer a copy of the Software ... provided such diff --git a/pkgs/os-specific/linux/firmware/iwlwifi-1000-ucode/default.nix b/pkgs/os-specific/linux/firmware/iwlwifi-1000-ucode/default.nix index c09bd5c5aca..2660c0b2493 100644 --- a/pkgs/os-specific/linux/firmware/iwlwifi-1000-ucode/default.nix +++ b/pkgs/os-specific/linux/firmware/iwlwifi-1000-ucode/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { buildPhase = "true"; installPhase = '' - ensureDir "$out" + mkdir -p "$out" chmod -x * cp * "$out" ''; diff --git a/pkgs/os-specific/linux/firmware/iwlwifi-3945-ucode/default.nix b/pkgs/os-specific/linux/firmware/iwlwifi-3945-ucode/default.nix index 389d416f2a5..afe2357995c 100644 --- a/pkgs/os-specific/linux/firmware/iwlwifi-3945-ucode/default.nix +++ b/pkgs/os-specific/linux/firmware/iwlwifi-3945-ucode/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { buildPhase = "true"; - installPhase = "ensureDir $out; chmod -x *; cp * $out"; + installPhase = "mkdir -p $out; chmod -x *; cp * $out"; meta = { description = "Firmware for the Intel 3945ABG wireless card"; diff --git a/pkgs/os-specific/linux/firmware/iwlwifi-4965-ucode/default.nix b/pkgs/os-specific/linux/firmware/iwlwifi-4965-ucode/default.nix index b75eae6acf2..3e3ad74adb3 100644 --- a/pkgs/os-specific/linux/firmware/iwlwifi-4965-ucode/default.nix +++ b/pkgs/os-specific/linux/firmware/iwlwifi-4965-ucode/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { buildPhase = "true"; installPhase = '' - ensureDir "$out" + mkdir -p "$out" chmod -x * cp * "$out" diff --git a/pkgs/os-specific/linux/firmware/iwlwifi-4965-ucode/version-2.nix b/pkgs/os-specific/linux/firmware/iwlwifi-4965-ucode/version-2.nix index 0948d381f7f..e1771c7a5cf 100644 --- a/pkgs/os-specific/linux/firmware/iwlwifi-4965-ucode/version-2.nix +++ b/pkgs/os-specific/linux/firmware/iwlwifi-4965-ucode/version-2.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { buildPhase = "true"; installPhase = '' - ensureDir "$out" + mkdir -p "$out" chmod -x * cp * "$out" ''; diff --git a/pkgs/os-specific/linux/firmware/iwlwifi-5000-ucode/default.nix b/pkgs/os-specific/linux/firmware/iwlwifi-5000-ucode/default.nix index 8dc69e0a6a3..b8ee5f388d1 100644 --- a/pkgs/os-specific/linux/firmware/iwlwifi-5000-ucode/default.nix +++ b/pkgs/os-specific/linux/firmware/iwlwifi-5000-ucode/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { buildPhase = "true"; installPhase = '' - ensureDir "$out" + mkdir -p "$out" chmod -x * cp * "$out" ''; diff --git a/pkgs/os-specific/linux/firmware/iwlwifi-5150-ucode/default.nix b/pkgs/os-specific/linux/firmware/iwlwifi-5150-ucode/default.nix index 0505a940d26..0d409bd8427 100644 --- a/pkgs/os-specific/linux/firmware/iwlwifi-5150-ucode/default.nix +++ b/pkgs/os-specific/linux/firmware/iwlwifi-5150-ucode/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { buildPhase = "true"; installPhase = '' - ensureDir "$out" + mkdir -p "$out" chmod -x * cp * "$out" ''; diff --git a/pkgs/os-specific/linux/firmware/iwlwifi-6000-ucode/default.nix b/pkgs/os-specific/linux/firmware/iwlwifi-6000-ucode/default.nix index 5b7e2dc7b5e..e5f3effa4b7 100644 --- a/pkgs/os-specific/linux/firmware/iwlwifi-6000-ucode/default.nix +++ b/pkgs/os-specific/linux/firmware/iwlwifi-6000-ucode/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { buildPhase = "true"; installPhase = '' - ensureDir "$out" + mkdir -p "$out" chmod -x * cp * "$out" ''; diff --git a/pkgs/os-specific/linux/firmware/iwlwifi-6000g2a-ucode/default.nix b/pkgs/os-specific/linux/firmware/iwlwifi-6000g2a-ucode/default.nix index 80aa6d367be..e5fe73ca498 100644 --- a/pkgs/os-specific/linux/firmware/iwlwifi-6000g2a-ucode/default.nix +++ b/pkgs/os-specific/linux/firmware/iwlwifi-6000g2a-ucode/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { buildPhase = "true"; installPhase = '' - ensureDir "$out" + mkdir -p "$out" chmod -x * cp * "$out" ''; diff --git a/pkgs/os-specific/linux/firmware/iwlwifi-6000g2b-ucode/default.nix b/pkgs/os-specific/linux/firmware/iwlwifi-6000g2b-ucode/default.nix index 580af83ea9d..b3a2a810bf7 100644 --- a/pkgs/os-specific/linux/firmware/iwlwifi-6000g2b-ucode/default.nix +++ b/pkgs/os-specific/linux/firmware/iwlwifi-6000g2b-ucode/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { buildPhase = "true"; installPhase = '' - ensureDir "$out" + mkdir -p "$out" chmod -x * cp * "$out" ''; diff --git a/pkgs/os-specific/linux/firmware/ralink/default.nix b/pkgs/os-specific/linux/firmware/ralink/default.nix index 23513d2bf88..abf12fd672b 100644 --- a/pkgs/os-specific/linux/firmware/ralink/default.nix +++ b/pkgs/os-specific/linux/firmware/ralink/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation { # contingent upon your installation of this Agreement in its # entirety in the same directory as the Software." installPhase = '' - ensureDir $out + mkdir -p $out cp $src/*.bin $out cp $src/LICENSE $out/ralink.LICENSE ''; diff --git a/pkgs/os-specific/linux/firmware/rt2860/default.nix b/pkgs/os-specific/linux/firmware/rt2860/default.nix index 0c8accd2f6c..0a1cb655572 100644 --- a/pkgs/os-specific/linux/firmware/rt2860/default.nix +++ b/pkgs/os-specific/linux/firmware/rt2860/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation { # contingent upon your installation of this Agreement in its # entirety in the same directory as the Software." installPhase = '' - ensureDir $out + mkdir -p $out cp $src/rt2860.bin $out cp $src/LICENSE $out/rt2860.LICENSE ''; diff --git a/pkgs/os-specific/linux/firmware/rt2870/default.nix b/pkgs/os-specific/linux/firmware/rt2870/default.nix index 388d3a50343..15de7c30586 100644 --- a/pkgs/os-specific/linux/firmware/rt2870/default.nix +++ b/pkgs/os-specific/linux/firmware/rt2870/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { # says: "Your rights to redistribute the Software shall be # contingent upon your installation of this Agreement in its # entirety in the same directory as the Software." - installPhase = "ensureDir $out/${name}; cp *.bin $out; cp *.txt $out/${name}"; + installPhase = "mkdir -p $out/${name}; cp *.bin $out; cp *.txt $out/${name}"; meta = { description = "Firmware for the Ralink RT2870 wireless cards"; diff --git a/pkgs/os-specific/linux/firmware/rt73/default.nix b/pkgs/os-specific/linux/firmware/rt73/default.nix index 32c097a62df..95393100139 100644 --- a/pkgs/os-specific/linux/firmware/rt73/default.nix +++ b/pkgs/os-specific/linux/firmware/rt73/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { # says: "Your rights to redistribute the Software shall be # contingent upon your installation of this Agreement in its # entirety in the same directory as the Software." - installPhase = "ensureDir $out/${name}; cp *.bin $out; cp *.txt $out/${name}"; + installPhase = "mkdir -p $out/${name}; cp *.bin $out; cp *.txt $out/${name}"; meta = { description = "Firmware for the Ralink RT73 wireless card"; diff --git a/pkgs/os-specific/linux/firmware/rtl8192c/default.nix b/pkgs/os-specific/linux/firmware/rtl8192c/default.nix index 85bbb27c67f..7016e23581b 100644 --- a/pkgs/os-specific/linux/firmware/rtl8192c/default.nix +++ b/pkgs/os-specific/linux/firmware/rtl8192c/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { src = firmwareLinuxNonfree; phases = [ "installPhase" ]; - installPhase = "ensureDir $out/rtlwifi && cp $src/realtek/rtlwifi/rtl8192cfw.bin $out/rtlwifi/rtl8192cfw.bin"; + installPhase = "mkdir -p $out/rtlwifi && cp $src/realtek/rtlwifi/rtl8192cfw.bin $out/rtlwifi/rtl8192cfw.bin"; meta = { description = "Firmware for the Realtek RTL8192c wireless cards"; diff --git a/pkgs/os-specific/linux/firmware/zd1211/default.nix b/pkgs/os-specific/linux/firmware/zd1211/default.nix index dfc384b7adb..a717bd9e117 100644 --- a/pkgs/os-specific/linux/firmware/zd1211/default.nix +++ b/pkgs/os-specific/linux/firmware/zd1211/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { buildPhase = "true"; - installPhase = "ensureDir $out/zd1211; cp * $out/zd1211"; + installPhase = "mkdir -p $out/zd1211; cp * $out/zd1211"; meta = { description = "Firmware for the ZyDAS ZD1211(b) 802.11a/b/g USB WLAN chip"; diff --git a/pkgs/os-specific/linux/fxload/default.nix b/pkgs/os-specific/linux/fxload/default.nix index 455c11cb0a9..d21cdd78daf 100644 --- a/pkgs/os-specific/linux/fxload/default.nix +++ b/pkgs/os-specific/linux/fxload/default.nix @@ -22,9 +22,9 @@ stdenv.mkDerivation { ''; preInstall = '' - ensureDir $out/sbin - ensureDir $out/share/man/man8 - ensureDir $out/share/usb + mkdir -p $out/sbin + mkdir -p $out/share/man/man8 + mkdir -p $out/share/usb ''; meta = { diff --git a/pkgs/os-specific/linux/kernel-headers/2.4.nix b/pkgs/os-specific/linux/kernel-headers/2.4.nix index c179801ca55..32daf5633f7 100644 --- a/pkgs/os-specific/linux/kernel-headers/2.4.nix +++ b/pkgs/os-specific/linux/kernel-headers/2.4.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation { ''; installPhase = '' - ensureDir $out/include + mkdir -p $out/include cp -a include/{asm,asm-$platform,acpi,linux,pcmcia,scsi,video} \ $out/include ''; diff --git a/pkgs/os-specific/linux/kernel-headers/2.6.28.nix b/pkgs/os-specific/linux/kernel-headers/2.6.28.nix index 98a06556a19..920ccf9363d 100644 --- a/pkgs/os-specific/linux/kernel-headers/2.6.28.nix +++ b/pkgs/os-specific/linux/kernel-headers/2.6.28.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation { make INSTALL_HDR_PATH=$out headers_install # Some builds (e.g. KVM) want a kernel.release. - ensureDir $out/include/config + mkdir -p $out/include/config echo "${version}-default" > $out/include/config/kernel.release ''; diff --git a/pkgs/os-specific/linux/kernel-headers/2.6.32.nix b/pkgs/os-specific/linux/kernel-headers/2.6.32.nix index a4e86658193..a7ec522b3d6 100644 --- a/pkgs/os-specific/linux/kernel-headers/2.6.32.nix +++ b/pkgs/os-specific/linux/kernel-headers/2.6.32.nix @@ -48,7 +48,7 @@ stdenv.mkDerivation { make INSTALL_HDR_PATH=$out headers_install # Some builds (e.g. KVM) want a kernel.release. - ensureDir $out/include/config + mkdir -p $out/include/config echo "${version}-default" > $out/include/config/kernel.release ''; diff --git a/pkgs/os-specific/linux/kernel-headers/default.nix b/pkgs/os-specific/linux/kernel-headers/default.nix index c0f949186c6..f5fec3d8620 100644 --- a/pkgs/os-specific/linux/kernel-headers/default.nix +++ b/pkgs/os-specific/linux/kernel-headers/default.nix @@ -48,7 +48,7 @@ stdenv.mkDerivation { make INSTALL_HDR_PATH=$out headers_install # Some builds (e.g. KVM) want a kernel.release. - ensureDir $out/include/config + mkdir -p $out/include/config echo "${version}-default" > $out/include/config/kernel.release ''; diff --git a/pkgs/os-specific/linux/kernel/builder.sh b/pkgs/os-specific/linux/kernel/builder.sh index 61cb8f28081..5d6d48d2fc3 100644 --- a/pkgs/os-specific/linux/kernel/builder.sh +++ b/pkgs/os-specific/linux/kernel/builder.sh @@ -48,7 +48,7 @@ configurePhase() { installPhase() { - ensureDir $out + mkdir -p $out # New kernel versions have a combined tree for i386 and x86_64. archDir=$arch @@ -60,7 +60,7 @@ installPhase() { # Copy the bzImage and System.map. cp System.map $out if test "$arch" = um; then - ensureDir $out/bin + mkdir -p $out/bin cp linux $out/bin elif test "$kernelTarget" != "vmlinux"; then # In any case we copy the 'vmlinux' ELF in the next lines diff --git a/pkgs/os-specific/linux/klibc/shrunk.nix b/pkgs/os-specific/linux/klibc/shrunk.nix index ff72d1f72b8..066b4fcb4e0 100644 --- a/pkgs/os-specific/linux/klibc/shrunk.nix +++ b/pkgs/os-specific/linux/klibc/shrunk.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation { #name = "${klibc.name}-shrunk"; name = "${klibc.name}"; buildCommand = '' - ensureDir $out/lib + mkdir -p $out/lib cp -prd ${klibc}/lib/klibc/bin $out/ cp -p ${klibc}/lib/*.so $out/lib/ chmod +w $out/* diff --git a/pkgs/os-specific/linux/kudzu/builder.sh b/pkgs/os-specific/linux/kudzu/builder.sh index 744d1d516a3..002bac8a1db 100644 --- a/pkgs/os-specific/linux/kudzu/builder.sh +++ b/pkgs/os-specific/linux/kudzu/builder.sh @@ -3,10 +3,10 @@ source $stdenv/setup export DESTDIR=$out preInstall() { - ensureDir $out - ensureDir $out/etc - ensureDir $out/sbin - ensureDir $out/usr + mkdir -p $out + mkdir -p $out/etc + mkdir -p $out/sbin + mkdir -p $out/usr make install-program } diff --git a/pkgs/os-specific/linux/libcap/default.nix b/pkgs/os-specific/linux/libcap/default.nix index d8cb393ac38..c279393d7a4 100644 --- a/pkgs/os-specific/linux/libcap/default.nix +++ b/pkgs/os-specific/linux/libcap/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { passthru = { postinst = n : '' - ensureDir $out/share/doc/${n} + mkdir -p $out/share/doc/${n} cp ../License $out/share/doc/${n}/License ''; }; diff --git a/pkgs/os-specific/linux/lsiutil/default.nix b/pkgs/os-specific/linux/lsiutil/default.nix index 09cd4ab037c..700455d5f8b 100644 --- a/pkgs/os-specific/linux/lsiutil/default.nix +++ b/pkgs/os-specific/linux/lsiutil/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { preBuild = '' - ensureDir $out/bin + mkdir -p $out/bin substituteInPlace Makefile --replace /usr/bin $out/bin substituteInPlace lsiutil.c \ --replace /sbin/modprobe modprobe \ diff --git a/pkgs/os-specific/linux/mingetty/default.nix b/pkgs/os-specific/linux/mingetty/default.nix index b27baa5480b..192e2c7ac5f 100644 --- a/pkgs/os-specific/linux/mingetty/default.nix +++ b/pkgs/os-specific/linux/mingetty/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation { }; preInstall = '' - ensureDir $out/sbin $out/share/man/man8 + mkdir -p $out/sbin $out/share/man/man8 makeFlagsArray=(SBINDIR=$out/sbin MANDIR=$out/share/man/man8) ''; diff --git a/pkgs/os-specific/linux/nss_ldap/default.nix b/pkgs/os-specific/linux/nss_ldap/default.nix index 34de5108164..7c8b526b4c3 100644 --- a/pkgs/os-specific/linux/nss_ldap/default.nix +++ b/pkgs/os-specific/linux/nss_ldap/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation { substituteInPlace Makefile \ --replace '/usr$(libdir)' $TMPDIR \ --replace 'install-data-local:' 'install-data-local-disabled:' - ensureDir $out/etc + mkdir -p $out/etc ''; buildInputs = [openldap]; diff --git a/pkgs/os-specific/linux/numactl/default.nix b/pkgs/os-specific/linux/numactl/default.nix index f329db90cb2..b9240805865 100644 --- a/pkgs/os-specific/linux/numactl/default.nix +++ b/pkgs/os-specific/linux/numactl/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { preInstall = '' # The `install' rule expects this directory to be available. - ensureDir "$out/share/man/man5" + mkdir -p "$out/share/man/man5" ''; meta = { diff --git a/pkgs/os-specific/linux/nvidia-x11/builder-legacy.sh b/pkgs/os-specific/linux/nvidia-x11/builder-legacy.sh index 6941288b390..e0af21759c9 100755 --- a/pkgs/os-specific/linux/nvidia-x11/builder-legacy.sh +++ b/pkgs/os-specific/linux/nvidia-x11/builder-legacy.sh @@ -36,7 +36,7 @@ buildPhase() { installPhase() { # Install libGL and friends. - ensureDir $out/lib + mkdir -p $out/lib cp -prd usr/lib/* usr/X11R6/lib/libXv* $out/lib/ ln -snf libGLcore.so.$versionNumber $out/lib/libGLcore.so @@ -59,11 +59,11 @@ installPhase() { if test -z "$libsOnly"; then # Install the kernel module. - ensureDir $out/lib/modules/$kernelVersion/misc + mkdir -p $out/lib/modules/$kernelVersion/misc cp usr/src/nv/nvidia.ko $out/lib/modules/$kernelVersion/misc # Install the X driver. - ensureDir $out/lib/xorg/modules + mkdir -p $out/lib/xorg/modules cp -prd usr/X11R6/lib/modules/* $out/lib/xorg/modules/ ln -snf libnvidia-wfb.so.$versionNumber $out/lib/xorg/modules/libnvidia-wfb.so.1 @@ -72,7 +72,7 @@ installPhase() { patchelf --set-rpath $out/lib $out/lib/xorg/modules/extensions/libglx.so.*.* # Install the programs. - ensureDir $out/bin + mkdir -p $out/bin for i in nvidia-settings nvidia-xconfig; do cp usr/bin/$i $out/bin/$i diff --git a/pkgs/os-specific/linux/nvidia-x11/builder.sh b/pkgs/os-specific/linux/nvidia-x11/builder.sh index 180eb84e5e4..b0d2bf35c52 100755 --- a/pkgs/os-specific/linux/nvidia-x11/builder.sh +++ b/pkgs/os-specific/linux/nvidia-x11/builder.sh @@ -27,7 +27,7 @@ buildPhase() { installPhase() { # Install libGL and friends. - ensureDir $out/lib + mkdir -p $out/lib cp -prd libcuda.* libGL.* libnvidia-cfg.* libnvidia-compiler.* libnvidia-tls.* libnvidia-glcore.* libOpenCL.* libXv* libvdpau_nvidia* tls $out/lib/ ln -snf libnvidia-glcore.so.$versionNumber $out/lib/libnvidia-glcore.so @@ -50,15 +50,15 @@ installPhase() { if test -z "$libsOnly"; then # Install the kernel module. - ensureDir $out/lib/modules/$kernelVersion/misc + mkdir -p $out/lib/modules/$kernelVersion/misc cp kernel/nvidia.ko $out/lib/modules/$kernelVersion/misc # Install the X driver. - ensureDir $out/lib/xorg/modules + mkdir -p $out/lib/xorg/modules cp -p libnvidia-wfb.* $out/lib/xorg/modules/ - ensureDir $out/lib/xorg/modules/drivers + mkdir -p $out/lib/xorg/modules/drivers cp -p nvidia_drv.so $out/lib/xorg/modules/drivers - ensureDir $out/lib/xorg/modules/extensions + mkdir -p $out/lib/xorg/modules/extensions cp -p libglx.so.* $out/lib/xorg/modules/extensions ln -snf libnvidia-wfb.so.$versionNumber $out/lib/xorg/modules/libnvidia-wfb.so.1 @@ -67,7 +67,7 @@ installPhase() { patchelf --set-rpath $out/lib $out/lib/xorg/modules/extensions/libglx.so.*.* # Install the programs. - ensureDir $out/bin + mkdir -p $out/bin for i in nvidia-settings nvidia-xconfig; do cp $i $out/bin/$i @@ -76,16 +76,16 @@ installPhase() { done # Header files etc. - ensureDir $out/include/nvidia + mkdir -p $out/include/nvidia cp -p *.h $out/include/nvidia - ensureDir $out/share/man/man1 + mkdir -p $out/share/man/man1 cp -p *.1.gz $out/share/man/man1 - ensureDir $out/share/applications + mkdir -p $out/share/applications cp -p *.desktop $out/share/applications - ensureDir $out/share/pixmaps + mkdir -p $out/share/pixmaps cp -p nvidia-settings.png $out/share/pixmaps # Patch the `nvidia-settings.desktop' file. diff --git a/pkgs/os-specific/linux/opengl/xorg-sys/builder.sh b/pkgs/os-specific/linux/opengl/xorg-sys/builder.sh index 7ab20855bd3..cd21899e60e 100644 --- a/pkgs/os-specific/linux/opengl/xorg-sys/builder.sh +++ b/pkgs/os-specific/linux/opengl/xorg-sys/builder.sh @@ -1,6 +1,6 @@ source $stdenv/setup -ensureDir $out/lib +mkdir -p $out/lib ln -s /usr/lib/libGL.so.1 $out/lib/ ln -s /usr/lib/libGLU.so.1 $out/lib/ diff --git a/pkgs/os-specific/linux/ov511/ov511-2.30-builder.sh b/pkgs/os-specific/linux/ov511/ov511-2.30-builder.sh index 8bb282cacf7..21a2ac725ca 100644 --- a/pkgs/os-specific/linux/ov511/ov511-2.30-builder.sh +++ b/pkgs/os-specific/linux/ov511/ov511-2.30-builder.sh @@ -13,6 +13,6 @@ echo "version $version" export version -ensureDir $out/lib/modules/$version/kernel/drivers/usb/media/ +mkdir -p $out/lib/modules/$version/kernel/drivers/usb/media/ genericBuild diff --git a/pkgs/os-specific/linux/ov511/ov511-2.32-builder.sh b/pkgs/os-specific/linux/ov511/ov511-2.32-builder.sh index c189c2e1706..636b19a95af 100644 --- a/pkgs/os-specific/linux/ov511/ov511-2.32-builder.sh +++ b/pkgs/os-specific/linux/ov511/ov511-2.32-builder.sh @@ -13,7 +13,7 @@ echo "version $version" export version -ensureDir $out/lib/modules/$version/kernel/drivers/usb/media/ +mkdir -p $out/lib/modules/$version/kernel/drivers/usb/media/ genericBuild diff --git a/pkgs/os-specific/linux/pcmciautils/default.nix b/pkgs/os-specific/linux/pcmciautils/default.nix index a8b885d8a94..b53c61c754a 100644 --- a/pkgs/os-specific/linux/pcmciautils/default.nix +++ b/pkgs/os-specific/linux/pcmciautils/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { lib.concatMapStrings (path: '' for f in : $(find ${path} -type f); do test "$f" == ":" && continue; - ensureDir $(dirname $out/lib/firmware/$\{f#${path}}); + mkdir -p $(dirname $out/lib/firmware/$\{f#${path}}); ln -s $f $out/lib/firmware/$\{f#${path}}; done; '') firmware; diff --git a/pkgs/os-specific/linux/qc-usb/builder.sh b/pkgs/os-specific/linux/qc-usb/builder.sh index a43138fa84f..041be115328 100644 --- a/pkgs/os-specific/linux/qc-usb/builder.sh +++ b/pkgs/os-specific/linux/qc-usb/builder.sh @@ -13,7 +13,7 @@ echo "version $version" export version -ensureDir $out/lib/modules/$version/misc +mkdir -p $out/lib/modules/$version/misc LINUX_DIR=$kernel/lib/modules/$version/build PREFIX=$out diff --git a/pkgs/os-specific/linux/radeontools/default.nix b/pkgs/os-specific/linux/radeontools/default.nix index ff3cad3fe98..4dbe7e54247 100644 --- a/pkgs/os-specific/linux/radeontools/default.nix +++ b/pkgs/os-specific/linux/radeontools/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { }; installPhase = '' - ensureDir $out/bin + mkdir -p $out/bin chmod +x lightwatch.pl cp radeontool lightwatch.pl $out/bin ''; diff --git a/pkgs/os-specific/linux/sysklogd/builder.sh b/pkgs/os-specific/linux/sysklogd/builder.sh index 62df45ea7c9..d466f075652 100644 --- a/pkgs/os-specific/linux/sysklogd/builder.sh +++ b/pkgs/os-specific/linux/sysklogd/builder.sh @@ -6,8 +6,8 @@ export prefix installFlags="BINDIR=$out/sbin MANDIR=$out/share/man INSTALL=install" patchPhase="sed -e 's@-o \${MAN_USER} -g \${MAN_GROUP} -m \${MAN_PERMS} @@' -i Makefile" -ensureDir "$out/share/man/man8/" -ensureDir "$out/share/man/man5/" -ensureDir "$out/sbin" +mkdir -p "$out/share/man/man8/" +mkdir -p "$out/share/man/man5/" +mkdir -p "$out/sbin" genericBuild diff --git a/pkgs/os-specific/linux/tcp-wrapper/builder.sh b/pkgs/os-specific/linux/tcp-wrapper/builder.sh index 58bc1d4409d..7ea574fcf23 100644 --- a/pkgs/os-specific/linux/tcp-wrapper/builder.sh +++ b/pkgs/os-specific/linux/tcp-wrapper/builder.sh @@ -22,18 +22,18 @@ echo "building..." make REAL_DAEMON_DIR="$out/sbin" linux # Install -ensureDir "$out/sbin" +mkdir -p "$out/sbin" cp -v safe_finger tcpd tcpdchk tcpdmatch try-from "$out/sbin" -ensureDir "$out/lib" +mkdir -p "$out/lib" cp -v shared/lib*.so* "$out/lib" -ensureDir "$out/include" +mkdir -p "$out/include" cp -v *.h "$out/include" -ensureDir "$out/man" +mkdir -p "$out/man" for i in 3 5 8; do - ensureDir "$out/man/man$i" + mkdir -p "$out/man/man$i" cp *.$i "$out/man/man$i" ; done diff --git a/pkgs/os-specific/linux/tunctl/default.nix b/pkgs/os-specific/linux/tunctl/default.nix index f4c3aad938f..8ea3599ff19 100644 --- a/pkgs/os-specific/linux/tunctl/default.nix +++ b/pkgs/os-specific/linux/tunctl/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation { makeFlags = [ "tunctl" ]; installPhase = '' - ensureDir $out/bin + mkdir -p $out/bin cp tunctl $out/bin ''; diff --git a/pkgs/os-specific/linux/upstart/default.nix b/pkgs/os-specific/linux/upstart/default.nix index 4e440770ef9..3c5fb2283cd 100644 --- a/pkgs/os-specific/linux/upstart/default.nix +++ b/pkgs/os-specific/linux/upstart/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { postInstall = '' t=$out/etc/bash_completion.d - ensureDir $t + mkdir -p $t cp ${./upstart-bash-completion} $t/upstart ''; diff --git a/pkgs/os-specific/linux/wis-go7007/default.nix b/pkgs/os-specific/linux/wis-go7007/default.nix index 73e5694572a..4fff3ed37c0 100644 --- a/pkgs/os-specific/linux/wis-go7007/default.nix +++ b/pkgs/os-specific/linux/wis-go7007/default.nix @@ -61,9 +61,9 @@ stdenv.mkDerivation { substituteInPlace Makefile \ --replace '$(DESTDIR)$(KSRC)/include/linux' $includeDir \ --replace '$(DESTDIR)$(FIRMWARE_DIR)' '$(FIRMWARE_DIR)' - ensureDir $includeDir - ensureDir $out/etc/hotplug/usb - ensureDir $out/etc/udev/rules.d + mkdir -p $includeDir + mkdir -p $out/etc/hotplug/usb + mkdir -p $out/etc/udev/rules.d makeFlagsArray=(KERNELSRC=$kernelSource \ FIRMWARE_DIR=$out/firmware FXLOAD=${fxload}/sbin/fxload \ @@ -72,7 +72,7 @@ stdenv.mkDerivation { ''; # */ postInstall = '' - ensureDir $out/bin + mkdir -p $out/bin cp apps/gorecord apps/modet $out/bin/ ''; diff --git a/pkgs/os-specific/linux/wpa_supplicant/default.nix b/pkgs/os-specific/linux/wpa_supplicant/default.nix index fcb6641dfd9..a0e426e482b 100644 --- a/pkgs/os-specific/linux/wpa_supplicant/default.nix +++ b/pkgs/os-specific/linux/wpa_supplicant/default.nix @@ -35,10 +35,10 @@ in }) ]; postInstall = '' - ensureDir $out/share/man/man5 $out/share/man/man8 + mkdir -p $out/share/man/man5 $out/share/man/man8 cp -v doc/docbook/*.5 $out/share/man/man5/ cp -v doc/docbook/*.8 $out/share/man/man8/ - ensureDir $out/etc/dbus-1/system.d $out/share/dbus-1/system-services + mkdir -p $out/etc/dbus-1/system.d $out/share/dbus-1/system-services cp -v dbus/*service $out/share/dbus-1/system-services sed -e "s@/sbin/wpa_supplicant@$out&@" -i $out/share/dbus-1/system-services/* cp -v dbus/dbus-wpa_supplicant.conf $out/etc/dbus-1/system.d diff --git a/pkgs/os-specific/linux/xf86-input-multitouch/default.nix b/pkgs/os-specific/linux/xf86-input-multitouch/default.nix index f04297096d2..c5cc5f3b68f 100644 --- a/pkgs/os-specific/linux/xf86-input-multitouch/default.nix +++ b/pkgs/os-specific/linux/xf86-input-multitouch/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation { installPhase = '' make DESTDIR="$out" LIBDIR="lib" install - ensureDir $out/include/xorg + mkdir -p $out/include/xorg echo -n "$confFile" > $out/include/xorg/10-multitouch.conf ''; diff --git a/pkgs/os-specific/linux/xf86-input-wacom/default.nix b/pkgs/os-specific/linux/xf86-input-wacom/default.nix index 9cc25174c51..98446c70867 100644 --- a/pkgs/os-specific/linux/xf86-input-wacom/default.nix +++ b/pkgs/os-specific/linux/xf86-input-wacom/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { ncurses pkgconfig randrproto xorgserver xproto udev ]; preConfigure = '' - ensureDir $out/share/X11/xorg.conf.d + mkdir -p $out/share/X11/xorg.conf.d configureFlags="--with-xorg-module-dir=$out/lib/xorg/modules --with-sdkdir=$out/include/xorg --with-xorg-conf-dir=$out/share/X11/xorg.conf.d" ''; diff --git a/pkgs/os-specific/windows/mingw-headers/default.nix b/pkgs/os-specific/windows/mingw-headers/default.nix index c4e0063feec..c6941ef01f0 100644 --- a/pkgs/os-specific/windows/mingw-headers/default.nix +++ b/pkgs/os-specific/windows/mingw-headers/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation { phases = [ "installPhase" ]; installPhase = '' - ensureDir $out/include + mkdir -p $out/include cp -R ${mingw_runtime_headers}/include/* $out/include cp -R ${w32api_headers}/include/* $out/include ''; diff --git a/pkgs/os-specific/windows/mingwrt/default.nix b/pkgs/os-specific/windows/mingwrt/default.nix index aecf43c9123..434c439cd78 100644 --- a/pkgs/os-specific/windows/mingwrt/default.nix +++ b/pkgs/os-specific/windows/mingwrt/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation (rec { name = name + "-headers"; phases = [ "unpackPhase" "installPhase" ]; installPhase = '' - ensureDir $out + mkdir -p $out cp -R include $out ''; } else { diff --git a/pkgs/os-specific/windows/w32api/default.nix b/pkgs/os-specific/windows/w32api/default.nix index 570b83f671e..56ab80c7235 100644 --- a/pkgs/os-specific/windows/w32api/default.nix +++ b/pkgs/os-specific/windows/w32api/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation ({ name = name + "-headers"; phases = [ "unpackPhase" "installPhase" ]; installPhase = '' - ensureDir $out + mkdir -p $out cp -R include $out ''; } else { diff --git a/pkgs/servers/dict/dictd-db-collector.nix b/pkgs/servers/dict/dictd-db-collector.nix index 299bfc8ac2f..f635c98602d 100644 --- a/pkgs/servers/dict/dictd-db-collector.nix +++ b/pkgs/servers/dict/dictd-db-collector.nix @@ -25,7 +25,7 @@ let } "; installPhase = '' - ensureDir $out/share/dictd + mkdir -p $out/share/dictd cd $out/share/dictd echo "${databases}" >databases.names echo "${accessSection}" > dictd.conf diff --git a/pkgs/servers/dict/dictd-db.nix b/pkgs/servers/dict/dictd-db.nix index 553b371d24c..c6c0bc73a08 100644 --- a/pkgs/servers/dict/dictd-db.nix +++ b/pkgs/servers/dict/dictd-db.nix @@ -5,7 +5,7 @@ with builderDefs; let localDefs = builderDefs.passthru.function (rec { src=_src; doInstall = fullDepEntry ('' - ensureDir $out/share/dictd + mkdir -p $out/share/dictd tar xf ${src} cp $(ls ./${_subdir}/*.{dict*,index} || true) $out/share/dictd echo "${_locale}" >$out/share/dictd/locale diff --git a/pkgs/servers/felix/default.nix b/pkgs/servers/felix/default.nix index c600573ba86..aa40365e8de 100644 --- a/pkgs/servers/felix/default.nix +++ b/pkgs/servers/felix/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation { '' tar xfvz $src cd felix-framework-* - ensureDir $out + mkdir -p $out cp -av * $out ''; meta = { diff --git a/pkgs/servers/felix/remoteshell.nix b/pkgs/servers/felix/remoteshell.nix index 4d6a8d8318f..6e8089d32e9 100644 --- a/pkgs/servers/felix/remoteshell.nix +++ b/pkgs/servers/felix/remoteshell.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { }; buildCommand = '' - ensureDir $out/bundle + mkdir -p $out/bundle cp ${src} $out/bundle/org.apache.felix.shell.remote-1.0.4.jar ''; } diff --git a/pkgs/servers/fingerd/bsd-fingerd/default.nix b/pkgs/servers/fingerd/bsd-fingerd/default.nix index 5e5d91fa820..2fab0fd9910 100644 --- a/pkgs/servers/fingerd/bsd-fingerd/default.nix +++ b/pkgs/servers/fingerd/bsd-fingerd/default.nix @@ -16,5 +16,5 @@ stdenv.mkDerivation rec { preBuild = "cd fingerd"; - preInstall = '' ensureDir $out/man/man8 $out/sbin ''; + preInstall = '' mkdir -p $out/man/man8 $out/sbin ''; } diff --git a/pkgs/servers/games/ghost-one/default.nix b/pkgs/servers/games/ghost-one/default.nix index 2fd9a45dfc0..f90b5e40997 100644 --- a/pkgs/servers/games/ghost-one/default.nix +++ b/pkgs/servers/games/ghost-one/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { make cd ../../../StormLib/stormlib/ make - ensureDir $out/lib + mkdir -p $out/lib cd ../.. # cp bncsutil/src/bncsutil/libbncutil.so $out/lib # cp StormLib/stormlib/libStorm.so $out/lib @@ -30,14 +30,14 @@ stdenv.mkDerivation rec { ''; installPhase = '' - ensureDir $out/lib + mkdir -p $out/lib cp bncsutil/src/bncsutil/libbncsutil.so $out/lib cp StormLib/stormlib/libStorm.so $out/lib - ensureDir $out/bin + mkdir -p $out/bin cp ghost/ghost++ $out/bin - ensureDir $out/share/ghost-one/languages + mkdir -p $out/share/ghost-one/languages cp -r mapcfgs $out/share/ghost-one cp Languages/*.cfg $out/share/ghost-one/languages cp language.cfg $out/share/ghost-one/languages/English.cfg diff --git a/pkgs/servers/http/apache-modules/mod_python/default.nix b/pkgs/servers/http/apache-modules/mod_python/default.nix index a59fa60c4c7..b36327ff520 100644 --- a/pkgs/servers/http/apache-modules/mod_python/default.nix +++ b/pkgs/servers/http/apache-modules/mod_python/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation { preInstall = '' installFlags="LIBEXECDIR=$out/modules $installFlags" - ensureDir $out/modules + mkdir -p $out/modules ''; passthru = { inherit apacheHttpd; }; diff --git a/pkgs/servers/http/apache-modules/tomcat-connectors/builder.sh b/pkgs/servers/http/apache-modules/tomcat-connectors/builder.sh index 70b609e6465..52efe537c9b 100644 --- a/pkgs/servers/http/apache-modules/tomcat-connectors/builder.sh +++ b/pkgs/servers/http/apache-modules/tomcat-connectors/builder.sh @@ -4,5 +4,5 @@ tar xfvz $src cd tomcat-connectors-*-src/native ./configure --with-apxs=$apacheHttpd/bin/apxs --with-java-home=$jdk make -ensureDir $out/modules +mkdir -p $out/modules cp apache-2.0/mod_jk.so $out/modules diff --git a/pkgs/servers/http/jboss/default.nix b/pkgs/servers/http/jboss/default.nix index 41eff4cf967..2f0b9be96b0 100644 --- a/pkgs/servers/http/jboss/default.nix +++ b/pkgs/servers/http/jboss/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation { ''; installPhase = '' - ensureDir $out + mkdir -p $out cp -av * $out ''; diff --git a/pkgs/servers/http/jboss/jdbc/mysql/builder.sh b/pkgs/servers/http/jboss/jdbc/mysql/builder.sh index 06d60fc5e12..6af39a0cb63 100644 --- a/pkgs/servers/http/jboss/jdbc/mysql/builder.sh +++ b/pkgs/servers/http/jboss/jdbc/mysql/builder.sh @@ -1,5 +1,5 @@ buildInputs="$mysql_jdbc" source $stdenv/setup -ensureDir $out/server/default/lib +mkdir -p $out/server/default/lib ln -s $mysql_jdbc/share/java/mysql-connector-java.jar $out/server/default/lib/mysql-connector-java.jar diff --git a/pkgs/servers/http/jetty/6.1/bin-builder.sh b/pkgs/servers/http/jetty/6.1/bin-builder.sh index d19f42eb45c..bec0663bee7 100644 --- a/pkgs/servers/http/jetty/6.1/bin-builder.sh +++ b/pkgs/servers/http/jetty/6.1/bin-builder.sh @@ -3,5 +3,5 @@ set -e source $stdenv/setup unzip $src -ensureDir $out/$name +mkdir -p $out/$name mv jetty*/* $out/$name diff --git a/pkgs/servers/http/joseki/default.nix b/pkgs/servers/http/joseki/default.nix index 0a83dd09601..1a7e6f6d16c 100644 --- a/pkgs/servers/http/joseki/default.nix +++ b/pkgs/servers/http/joseki/default.nix @@ -72,12 +72,12 @@ rec { mv lib/slf4j-simple-*.jar lib/obsolete - ensureDir "$out/share" + mkdir -p "$out/share" TARGET="$out/share/${name}-dist" cp -r . "$TARGET" ln -s "$TARGET/lib" "$out/lib" chmod a+x "$TARGET/bin/"* - ensureDir "$out/bin" + mkdir -p "$out/bin" echo -e '#! /bin/sh\nls "'"$TARGET"'"/bin' > "$out/bin/jena-list-commands" echo '#! /bin/sh' >> "$out/bin/jena-command" diff --git a/pkgs/servers/http/tomcat/axis2/builder.sh b/pkgs/servers/http/tomcat/axis2/builder.sh index 91d300822a7..2e36367e9dc 100644 --- a/pkgs/servers/http/tomcat/axis2/builder.sh +++ b/pkgs/servers/http/tomcat/axis2/builder.sh @@ -2,12 +2,12 @@ source $stdenv/setup unzip $src cd axis2-* -ensureDir $out +mkdir -p $out cp -av * $out cd webapp ant cd .. -ensureDir $out/webapps +mkdir -p $out/webapps cp dist/axis2.war $out/webapps cd $out/webapps mkdir axis2 diff --git a/pkgs/servers/http/tomcat/jdbc/mysql/builder.sh b/pkgs/servers/http/tomcat/jdbc/mysql/builder.sh index 4a7248dfc8d..14829c5e85d 100644 --- a/pkgs/servers/http/tomcat/jdbc/mysql/builder.sh +++ b/pkgs/servers/http/tomcat/jdbc/mysql/builder.sh @@ -1,4 +1,4 @@ source $stdenv/setup -ensureDir $out/lib +mkdir -p $out/lib ln -s $mysql_jdbc/share/java/mysql-connector-java.jar $out/lib/mysql-connector-java.jar diff --git a/pkgs/servers/mail/postfix/default.nix b/pkgs/servers/mail/postfix/default.nix index 0fa2bf821a4..16d9127e556 100644 --- a/pkgs/servers/mail/postfix/default.nix +++ b/pkgs/servers/mail/postfix/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation { ''; postInstall = '' - ensureDir $out + mkdir -p $out mv ut/$out/* $out/ mkdir $out/share/postfix/conf diff --git a/pkgs/servers/monitoring/zabbix/default.nix b/pkgs/servers/monitoring/zabbix/default.nix index 41e617d80b6..df3fea05f77 100644 --- a/pkgs/servers/monitoring/zabbix/default.nix +++ b/pkgs/servers/monitoring/zabbix/default.nix @@ -33,11 +33,11 @@ in postInstall = '' - ensureDir $out/share/zabbix + mkdir -p $out/share/zabbix cp -prvd frontends/php $out/share/zabbix/php - ensureDir $out/share/zabbix/db/data + mkdir -p $out/share/zabbix/db/data cp -prvd create/data/*.sql $out/share/zabbix/db/data - ensureDir $out/share/zabbix/db/schema + mkdir -p $out/share/zabbix/db/schema cp -prvd create/schema/*.sql $out/share/zabbix/db/schema ''; diff --git a/pkgs/servers/portmap/default.nix b/pkgs/servers/portmap/default.nix index 9d8a641b4a8..aaa9bb684f4 100644 --- a/pkgs/servers/portmap/default.nix +++ b/pkgs/servers/portmap/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { buildInputs = [ tcpWrapper ]; installPhase = '' - ensureDir "$out/sbin" && ensureDir "$out/man/man8" && \ + mkdir -p "$out/sbin" && ensureDir "$out/man/man8" && \ make install BASEDIR=$out ''; diff --git a/pkgs/servers/sql/mysql/jdbc/builder.sh b/pkgs/servers/sql/mysql/jdbc/builder.sh index 29ecbc1aebe..56336e04135 100644 --- a/pkgs/servers/sql/mysql/jdbc/builder.sh +++ b/pkgs/servers/sql/mysql/jdbc/builder.sh @@ -5,5 +5,5 @@ set -e unzip $src cd mysql-connector-java-* -ensureDir $out/share/java +mkdir -p $out/share/java cp mysql-connector-java-*-bin.jar $out/share/java/mysql-connector-java.jar diff --git a/pkgs/servers/sql/postgresql/jdbc/builder.sh b/pkgs/servers/sql/postgresql/jdbc/builder.sh index 318a4e637a0..2fccb686629 100755 --- a/pkgs/servers/sql/postgresql/jdbc/builder.sh +++ b/pkgs/servers/sql/postgresql/jdbc/builder.sh @@ -6,5 +6,5 @@ tar zxvf $src cd postgresql-jdbc-* ant -ensureDir $out/share/java +mkdir -p $out/share/java cp jars/*.jar $out/share/java diff --git a/pkgs/servers/x11/xorg/builder.sh b/pkgs/servers/x11/xorg/builder.sh index c33d1806fd6..bb776a5051b 100644 --- a/pkgs/servers/x11/xorg/builder.sh +++ b/pkgs/servers/x11/xorg/builder.sh @@ -32,7 +32,7 @@ postInstall() { fi done - ensureDir "$out/nix-support" + mkdir -p "$out/nix-support" echo "$propagatedBuildInputs" > "$out/nix-support/propagated-build-inputs" echo "$propagatedBuildNativeInputs" > "$out/nix-support/propagated-build-native-inputs" } diff --git a/pkgs/servers/x11/xorg/imake.sh b/pkgs/servers/x11/xorg/imake.sh index 131ce0e832c..4ab5e2ae160 100644 --- a/pkgs/servers/x11/xorg/imake.sh +++ b/pkgs/servers/x11/xorg/imake.sh @@ -1,5 +1,5 @@ preInstall() { - ensureDir $out/lib/X11/config + mkdir -p $out/lib/X11/config ln -s $xorgcffiles/lib/X11/config/* $out/lib/X11/config #touch $out/lib/X11/config/host.def # !!! hack #touch $out/lib/X11/config/date.def # !!! hack diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index f260ce90cb5..a1d2040483d 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -114,7 +114,7 @@ in setxkbmap = attrs: attrs // { postInstall = '' - ensureDir $out/share + mkdir -p $out/share ln -sfn ${args.xkeyboard_config}/etc/X11 $out/share/X11 ''; }; diff --git a/pkgs/servers/xmpp/pyIRCt/default.nix b/pkgs/servers/xmpp/pyIRCt/default.nix index 161942519e8..27982601f73 100644 --- a/pkgs/servers/xmpp/pyIRCt/default.nix +++ b/pkgs/servers/xmpp/pyIRCt/default.nix @@ -19,7 +19,7 @@ rec { /* doConfigure should be removed if not needed */ phaseNames = ["deploy" (a.makeManyWrappers "$out/share/${name}/irc.py" a.pythonWrapperArguments)]; deploy = a.fullDepEntry ('' - ensureDir $out/bin $out/share/${name} + mkdir -p $out/bin $out/share/${name} sed -e 's@/usr/bin/@${a.python}/bin/@' -i irc.py sed -e '/configFiles/aconfigFiles += [os.getenv("HOME")+"/.pyIRCt.xml"]' -i config.py sed -e '/configFiles/aconfigFiles += [os.getenv("HOME")+"/.python-irc-transport.xml"]' -i config.py diff --git a/pkgs/servers/xmpp/pyMAILt/default.nix b/pkgs/servers/xmpp/pyMAILt/default.nix index a4dcd5a4812..e763d2dce5b 100644 --- a/pkgs/servers/xmpp/pyMAILt/default.nix +++ b/pkgs/servers/xmpp/pyMAILt/default.nix @@ -21,7 +21,7 @@ rec { phaseNames = ["deploy" (a.makeManyWrappers "$out/share/${name}/mail.py" a.pythonWrapperArguments)]; deploy = a.fullDepEntry ('' cd mail-transport - ensureDir $out/bin $out/share/${name} + mkdir -p $out/bin $out/share/${name} sed -e 's@/usr/bin/@${a.python}/bin/@' -i mail.py sed -e '/configFiles/aconfigFiles += [os.getenv("HOME")+"/.pyMAILt.xml"]' -i config.py sed -e '/configFiles/aconfigFiles += [os.getenv("HOME")+"/.python-mail-transport.xml"]' -i config.py diff --git a/pkgs/shells/zsh/default.nix b/pkgs/shells/zsh/default.nix index 6b199e165d0..4fd717fa936 100644 --- a/pkgs/shells/zsh/default.nix +++ b/pkgs/shells/zsh/default.nix @@ -27,9 +27,9 @@ stdenv.mkDerivation { # XXX: think/discuss about this, also with respect to nixos vs nix-on-X postInstall = '' - ensureDir $out/share/ + mkdir -p $out/share/ tar xf ${documentation} -C $out/share - ensureDir $out/etc/ + mkdir -p $out/etc/ cat > $out/etc/zprofile < $out/nix-support/setup-hook ''; }); @@ -209,7 +209,7 @@ rec { moveBuildDir = '' - ensureDir $out/.build + mkdir -p $out/.build cd $out/.build ''; } stdenv; diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh index 62327396239..660ae0c1490 100644 --- a/pkgs/stdenv/generic/setup.sh +++ b/pkgs/stdenv/generic/setup.sh @@ -39,7 +39,7 @@ exitHandler() { # normally. Otherwise, return the original exit code. if test -n "$succeedOnFailure"; then echo "build failed with exit code $exitCode (ignored)" - ensureDir "$out/nix-support" + mkdir -p "$out/nix-support" echo -n $exitCode > "$out/nix-support/failed" exit 0 fi @@ -139,7 +139,7 @@ ensureDir() { } installBin() { - ensureDir $out/bin + mkdir -p $out/bin cp "$@" $out/bin } @@ -682,7 +682,7 @@ patchShebangs() { installPhase() { runHook preInstall - ensureDir "$prefix" + mkdir -p "$prefix" installTargets=${installTargets:-install} echo "install flags: $installTargets $makeFlags ${makeFlagsArray[@]} $installFlags ${installFlagsArray[@]}" @@ -709,7 +709,7 @@ fixupPhase() { echo "both $d/ and share/$d/ exists!" else echo "fixing location of $d/ subdirectory" - ensureDir $prefix/share + mkdir -p $prefix/share if test -w $prefix/share; then mv -v $prefix/$d $prefix/share ln -sv share/$d $prefix @@ -755,17 +755,17 @@ fixupPhase() { fi if test -n "$propagatedBuildInputs"; then - ensureDir "$out/nix-support" + mkdir -p "$out/nix-support" echo "$propagatedBuildInputs" > "$out/nix-support/propagated-build-inputs" fi if test -n "$propagatedBuildNativeInputs"; then - ensureDir "$out/nix-support" + mkdir -p "$out/nix-support" echo "$propagatedBuildNativeInputs" > "$out/nix-support/propagated-build-native-inputs" fi if test -n "$setupHook"; then - ensureDir "$out/nix-support" + mkdir -p "$out/nix-support" substituteAll "$setupHook" "$out/nix-support/setup-hook" fi @@ -780,7 +780,7 @@ distPhase() { make ${makefile:+-f $makefile} $distFlags "${distFlagsArray[@]}" ${distTarget:-dist} if test "$dontCopyDist" != 1; then - ensureDir "$out/tarballs" + mkdir -p "$out/tarballs" # Note: don't quote $tarballs, since we explicitly permit # wildcards in there. diff --git a/pkgs/stdenv/linux/default.nix b/pkgs/stdenv/linux/default.nix index 62ad647064e..900b6253c71 100644 --- a/pkgs/stdenv/linux/default.nix +++ b/pkgs/stdenv/linux/default.nix @@ -123,7 +123,7 @@ rec { bootstrapGlibc = stdenvLinuxBoot0.mkDerivation { name = "bootstrap-glibc"; buildCommand = '' - ensureDir $out + mkdir -p $out ln -s ${bootstrapTools}/lib $out/lib ln -s ${bootstrapTools}/include-glibc $out/include ''; diff --git a/pkgs/stdenv/linux/make-bootstrap-tools.nix b/pkgs/stdenv/linux/make-bootstrap-tools.nix index ba2a953a457..a780574539f 100644 --- a/pkgs/stdenv/linux/make-bootstrap-tools.nix +++ b/pkgs/stdenv/linux/make-bootstrap-tools.nix @@ -92,7 +92,7 @@ rec { buildCommand = '' set -x - ensureDir $out/bin $out/lib $out/libexec + mkdir -p $out/bin $out/lib $out/libexec # Copy what we need of Glibc. cp -d ${glibc}/lib/ld*.so* $out/lib diff --git a/pkgs/stdenv/mingw/setup.sh b/pkgs/stdenv/mingw/setup.sh index 2bc961dfaed..4de3c0ddc9b 100755 --- a/pkgs/stdenv/mingw/setup.sh +++ b/pkgs/stdenv/mingw/setup.sh @@ -38,7 +38,7 @@ exitHandler() { # normally. Otherwise, return the original exit code. if test -n "$succeedOnFailure"; then echo "build failed with exit code $exitCode (ignored)" - ensureDir "$out/nix-support" + mkdir -p "$out/nix-support" echo -n $exitCode > "$out/nix-support/failed" exit 0 fi @@ -133,7 +133,7 @@ ensureDir() { } installBin() { - ensureDir $out/bin + mkdir -p $out/bin cp "$@" $out/bin } @@ -611,7 +611,7 @@ patchShebangs() { installPhase() { runHook preInstall - ensureDir "$prefix" + mkdir -p "$prefix" installTargets=${installTargets:-install} echo "install flags: $installTargets $makeFlags ${makeFlagsArray[@]} $installFlags ${installFlagsArray[@]}" @@ -638,7 +638,7 @@ fixupPhase() { echo "both $d/ and share/$d/ exists!" else echo "fixing location of $d/ subdirectory" - ensureDir $prefix/share + mkdir -p $prefix/share if test -w $prefix/share; then mv -v $prefix/$d $prefix/share ln -sv $prefix/share/$d $prefix/$d @@ -670,12 +670,12 @@ fixupPhase() { fi if test -n "$propagatedBuildInputs"; then - ensureDir "$out/nix-support" + mkdir -p "$out/nix-support" echo "$propagatedBuildInputs" > "$out/nix-support/propagated-build-inputs" fi if test -n "$setupHook"; then - ensureDir "$out/nix-support" + mkdir -p "$out/nix-support" substituteAll "$setupHook" "$out/nix-support/setup-hook" fi @@ -690,7 +690,7 @@ distPhase() { make ${makefile:+-f $makefile} $distFlags "${distFlagsArray[@]}" ${distTarget:-dist} if test "$dontCopyDist" != 1; then - ensureDir "$out/tarballs" + mkdir -p "$out/tarballs" # Note: don't quote $tarballs, since we explicitly permit # wildcards in there. diff --git a/pkgs/tools/X11/x2vnc/default.nix b/pkgs/tools/X11/x2vnc/default.nix index a3d21ab1800..adc04b62944 100644 --- a/pkgs/tools/X11/x2vnc/default.nix +++ b/pkgs/tools/X11/x2vnc/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { xorg.libXrandr xorg.randrproto ]; - preInstall = "ensureDir $out"; + preInstall = "mkdir -p $out"; meta = { homepahe = http://fredrik.hubbe.net/x2vnc.html; diff --git a/pkgs/tools/X11/x2x/default.nix b/pkgs/tools/X11/x2x/default.nix index abe5c9b59d6..5d68e1da1ba 100644 --- a/pkgs/tools/X11/x2x/default.nix +++ b/pkgs/tools/X11/x2x/default.nix @@ -16,8 +16,8 @@ stdenv.mkDerivation { ''; installPhase = '' - ensureDir $out/bin - ensureDir $out/man/man1 + mkdir -p $out/bin + mkdir -p $out/man/man1 cp x2x $out/bin/ cp x2x.1 $out/man/man1/ ''; diff --git a/pkgs/tools/X11/xpra/default.nix b/pkgs/tools/X11/xpra/default.nix index 0691521e44c..cf7692cc58a 100644 --- a/pkgs/tools/X11/xpra/default.nix +++ b/pkgs/tools/X11/xpra/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation { ''; installPhase = '' - ensureDir $out + mkdir -p $out cp -r install/* $out for i in $(cd $out/bin && ls); do diff --git a/pkgs/tools/admin/tightvnc/builder.sh b/pkgs/tools/admin/tightvnc/builder.sh index 72fced37728..10590bbfcf1 100644 --- a/pkgs/tools/admin/tightvnc/builder.sh +++ b/pkgs/tools/admin/tightvnc/builder.sh @@ -31,13 +31,13 @@ buildPhase() { } installPhase() { - ensureDir $out/bin - ensureDir $out/share/man/man1 + mkdir -p $out/bin + mkdir -p $out/share/man/man1 ./vncinstall $out/bin $out/share/man # fix HTTP client: t=$out/share/tightvnc - ensureDir $t + mkdir -p $t sed -i "s@/usr/local/vnc/classes@$out/vnc/classes@g" $out/bin/vncserver cp -r classes $t } diff --git a/pkgs/tools/archivers/unarj/default.nix b/pkgs/tools/archivers/unarj/default.nix index 7a15514a728..0852674e8c8 100644 --- a/pkgs/tools/archivers/unarj/default.nix +++ b/pkgs/tools/archivers/unarj/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { }; preInstall = '' - ensureDir $out/bin + mkdir -p $out/bin sed -i -e s,/usr/local/bin,$out/bin, Makefile ''; diff --git a/pkgs/tools/cd-dvd/unetbootin/default.nix b/pkgs/tools/cd-dvd/unetbootin/default.nix index 20d5ae7715e..b1fd5a10c2b 100644 --- a/pkgs/tools/cd-dvd/unetbootin/default.nix +++ b/pkgs/tools/cd-dvd/unetbootin/default.nix @@ -41,13 +41,13 @@ stdenv.mkDerivation rec { installPhase = '' - ensureDir $out/bin + mkdir -p $out/bin cp unetbootin $out/bin - ensureDir $out/share/unetbootin + mkdir -p $out/share/unetbootin cp unetbootin_*.qm $out/share/unetbootin - ensureDir $out/share/applications + mkdir -p $out/share/applications cp unetbootin.desktop $out/share/applications wrapProgram $out/bin/unetbootin \ diff --git a/pkgs/tools/compression/bsdiff/builder.sh b/pkgs/tools/compression/bsdiff/builder.sh index 1acb10cb794..f2792a40a60 100644 --- a/pkgs/tools/compression/bsdiff/builder.sh +++ b/pkgs/tools/compression/bsdiff/builder.sh @@ -2,7 +2,7 @@ source $stdenv/setup installFlags="PREFIX=$out INSTALL=install" -ensureDir "$out/bin" -ensureDir "$out/man/man1" +mkdir -p "$out/bin" +mkdir -p "$out/man/man1" genericBuild diff --git a/pkgs/tools/compression/bzip2/builder.sh b/pkgs/tools/compression/bzip2/builder.sh index ea2ebc4c2db..4610bdd4085 100644 --- a/pkgs/tools/compression/bzip2/builder.sh +++ b/pkgs/tools/compression/bzip2/builder.sh @@ -8,7 +8,7 @@ if test -n "$sharedLibrary"; then } preInstall() { - ensureDir $out/lib + mkdir -p $out/lib mv libbz2.so* $out/lib ln -s libbz2.so.1.0 $out/lib/libbz2.so } diff --git a/pkgs/tools/compression/upx/default.nix b/pkgs/tools/compression/upx/default.nix index c3fd01d5c88..f3b8037a9f1 100644 --- a/pkgs/tools/compression/upx/default.nix +++ b/pkgs/tools/compression/upx/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation { cd src "; - installPhase = "ensureDir $out/bin ; cp upx.out $out/bin/upx"; + installPhase = "mkdir -p $out/bin ; cp upx.out $out/bin/upx"; meta = { homepage = http://upx.sourceforge.net/; diff --git a/pkgs/tools/compression/zdelta/builder.sh b/pkgs/tools/compression/zdelta/builder.sh index 376c0bf4f39..03db413181d 100644 --- a/pkgs/tools/compression/zdelta/builder.sh +++ b/pkgs/tools/compression/zdelta/builder.sh @@ -1,7 +1,7 @@ source $stdenv/setup installPhase() { - ensureDir $out/bin + mkdir -p $out/bin cp -p zdc zdu $out/bin } diff --git a/pkgs/tools/filesystems/fsfs/default.nix b/pkgs/tools/filesystems/fsfs/default.nix index 622424c302f..0e72c45e31a 100644 --- a/pkgs/tools/filesystems/fsfs/default.nix +++ b/pkgs/tools/filesystems/fsfs/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation { ''; preInstall = '' - ensureDir $out/etc $out/var/lib + mkdir -p $out/etc $out/var/lib makeFlags="$makeFlags prefix=$out" ''; diff --git a/pkgs/tools/filesystems/fusesmb/default.nix b/pkgs/tools/filesystems/fusesmb/default.nix index d6d5c3a48aa..4ddab385a42 100644 --- a/pkgs/tools/filesystems/fusesmb/default.nix +++ b/pkgs/tools/filesystems/fusesmb/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { postInstall = '' - ensureDir $out/lib + mkdir -p $out/lib ln -fs ${samba}/lib/libsmbclient.so $out/lib/libsmbclient.so.0 ''; diff --git a/pkgs/tools/filesystems/httpfs/default.nix b/pkgs/tools/filesystems/httpfs/default.nix index afa4be345a9..717b08acc5f 100644 --- a/pkgs/tools/filesystems/httpfs/default.nix +++ b/pkgs/tools/filesystems/httpfs/default.nix @@ -15,10 +15,10 @@ stdenv.mkDerivation rec { ]; installPhase = - '' ensureDir "$out/bin" + '' mkdir -p "$out/bin" cp -v httpfs2 "$out/bin" - ensureDir "$out/share/man/man1" + mkdir -p "$out/share/man/man1" cp -v *.1 "$out/share/man/man1" ''; diff --git a/pkgs/tools/filesystems/sshfs-fuse/default.nix b/pkgs/tools/filesystems/sshfs-fuse/default.nix index 606914cd976..fcb3c23ed1d 100644 --- a/pkgs/tools/filesystems/sshfs-fuse/default.nix +++ b/pkgs/tools/filesystems/sshfs-fuse/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig glib fuse ]; postInstall = '' - ensureDir $out/sbin + mkdir -p $out/sbin ln -sf $out/bin/sshfs $out/sbin/mount.sshfs ''; diff --git a/pkgs/tools/graphics/cfdg/default.nix b/pkgs/tools/graphics/cfdg/default.nix index 435305f1e2a..26df8818b2b 100644 --- a/pkgs/tools/graphics/cfdg/default.nix +++ b/pkgs/tools/graphics/cfdg/default.nix @@ -16,10 +16,10 @@ rec { phaseNames = ["doMake" "copyFiles"]; copyFiles = a.fullDepEntry '' - ensureDir $out/bin + mkdir -p $out/bin cp cfdg $out/bin/ - ensureDir $out/share/doc/${name} + mkdir -p $out/share/doc/${name} cp *.txt $out/share/doc/${name} '' ["defEnsureDir" "doMake"]; diff --git a/pkgs/tools/graphics/cuneiform/default.nix b/pkgs/tools/graphics/cuneiform/default.nix index 232b6c5464a..13f7d4b7f6f 100644 --- a/pkgs/tools/graphics/cuneiform/default.nix +++ b/pkgs/tools/graphics/cuneiform/default.nix @@ -22,7 +22,7 @@ rec { libc = if a.stdenv ? glibc then a.stdenv.glibc else ""; doCmake = a.fullDepEntry('' - ensureDir $PWD/builddir + mkdir -p $PWD/builddir cd builddir export NIX_LDFLAGS="$NIX_LDFLAGS -ldl -L$out/lib" cmake .. -DCMAKE_BUILD_TYPE=debug -DCMAKE_INSTALL_PREFIX=$out -DDL_LIB=${libc}/lib diff --git a/pkgs/tools/graphics/dcraw/default.nix b/pkgs/tools/graphics/dcraw/default.nix index 8ee02710b05..959241d30ab 100644 --- a/pkgs/tools/graphics/dcraw/default.nix +++ b/pkgs/tools/graphics/dcraw/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { ''; buildPhase = '' - ensureDir $out/bin + mkdir -p $out/bin set +e sh install set -e diff --git a/pkgs/tools/graphics/exiftags/default.nix b/pkgs/tools/graphics/exiftags/default.nix index 32048db4154..531e17b92cb 100644 --- a/pkgs/tools/graphics/exiftags/default.nix +++ b/pkgs/tools/graphics/exiftags/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation { ''; preInstall = '' - ensureDir $out/bin $out/man/man1 + mkdir -p $out/bin $out/man/man1 ''; meta = { diff --git a/pkgs/tools/graphics/glxinfo/default.nix b/pkgs/tools/graphics/glxinfo/default.nix index 02db33f92cb..ed29b743d54 100644 --- a/pkgs/tools/graphics/glxinfo/default.nix +++ b/pkgs/tools/graphics/glxinfo/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation { "; installPhase = " - ensureDir $out/bin + mkdir -p $out/bin cp glxinfo glxgears $out/bin/ "; } diff --git a/pkgs/tools/graphics/jhead/default.nix b/pkgs/tools/graphics/jhead/default.nix index 2d98a1efdce..c497d60aef9 100644 --- a/pkgs/tools/graphics/jhead/default.nix +++ b/pkgs/tools/graphics/jhead/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation { ''; preInstall = '' - ensureDir $out/bin + mkdir -p $out/bin ''; meta = { diff --git a/pkgs/tools/graphics/pdfread/default.nix b/pkgs/tools/graphics/pdfread/default.nix index 1fc14445bbd..fd26174f197 100644 --- a/pkgs/tools/graphics/pdfread/default.nix +++ b/pkgs/tools/graphics/pdfread/default.nix @@ -27,13 +27,13 @@ stdenv.mkDerivation { ''; installPhase = '' - ensureDir $out/bin + mkdir -p $out/bin cp pdfread.py $out/bin chmod +x $out/bin/pdfread.py LIBSUFFIX=lib/${python.libPrefix}/site-packages/ PYDIR=$out/$LIBSUFFIX - ensureDir $PYDIR + mkdir -p $PYDIR cp -R *.py pylrs $PYDIR wrapProgram $out/bin/pdfread.py --prefix PYTHONPATH : $PYTHONPATH:${pil}/$LIBSUFFIX/PIL:$PYDIR \ diff --git a/pkgs/tools/graphics/ploticus/builder.sh b/pkgs/tools/graphics/ploticus/builder.sh index 89d4e3b98ea..2fb16b259bd 100644 --- a/pkgs/tools/graphics/ploticus/builder.sh +++ b/pkgs/tools/graphics/ploticus/builder.sh @@ -5,12 +5,12 @@ preBuild() { } preInstall() { - ensureDir $out/bin + mkdir -p $out/bin } postInstall() { # Install the "prefabs". - ensureDir $out/share/ploticus/prefabs && \ + mkdir -p $out/share/ploticus/prefabs && \ cd .. && \ cp -rv prefabs/* $out/share/ploticus/prefabs diff --git a/pkgs/tools/graphics/qrdecode/default.nix b/pkgs/tools/graphics/qrdecode/default.nix index 16c91720964..edd0a96c689 100644 --- a/pkgs/tools/graphics/qrdecode/default.nix +++ b/pkgs/tools/graphics/qrdecode/default.nix @@ -34,7 +34,7 @@ rec { cd .. '' ["doMake"]; createDirs = fullDepEntry '' - ensureDir $out/bin $out/lib $out/include $out/share + mkdir -p $out/bin $out/lib $out/include $out/share '' ["defEnsureDir"]; name = "libdecodeqr-" + version; diff --git a/pkgs/tools/graphics/transfig/builder.sh b/pkgs/tools/graphics/transfig/builder.sh index f128c4ce364..c466f759446 100644 --- a/pkgs/tools/graphics/transfig/builder.sh +++ b/pkgs/tools/graphics/transfig/builder.sh @@ -31,8 +31,8 @@ buildPhase() { } preInstall() { - ensureDir $out - ensureDir $out/lib + mkdir -p $out + mkdir -p $out/lib } genericBuild diff --git a/pkgs/tools/graphics/welkin/default.nix b/pkgs/tools/graphics/welkin/default.nix index 0076b2a4a86..d02b38b4127 100644 --- a/pkgs/tools/graphics/welkin/default.nix +++ b/pkgs/tools/graphics/welkin/default.nix @@ -32,7 +32,7 @@ rec { doDeploy = a.simplyShare "welkin"; createBin = a.fullDepEntry '' - ensureDir "$out/bin" + mkdir -p "$out/bin" echo "#! ${a.stdenv.shell}" > "$out/bin/welkin" echo "export JAVA_HOME=${jre}" >> "$out/bin/welkin" echo "\"$out/share/welkin/welkin.sh\" \"\$@\"" >> "$out/bin/welkin" diff --git a/pkgs/tools/misc/autojump/default.nix b/pkgs/tools/misc/autojump/default.nix index ac3aa5a6b1e..397e80a745e 100644 --- a/pkgs/tools/misc/autojump/default.nix +++ b/pkgs/tools/misc/autojump/default.nix @@ -21,10 +21,10 @@ let version = "4"; in buildInputs = [ python ]; installPhase = '' - ensureDir "$out/bin" "$out/share/man/man1" + mkdir -p "$out/bin" "$out/share/man/man1" yes no | sh ./install.sh - ensureDir "$out/etc/bash_completion.d" + mkdir -p "$out/etc/bash_completion.d" cp -v autojump.bash "$out/etc/bash_completion.d" echo "Bash users: Make sure to source \`$out/etc/bash_completion.d/autojump.bash'" diff --git a/pkgs/tools/misc/debootstrap/default.nix b/pkgs/tools/misc/debootstrap/default.nix index 53027246b7f..33a1fc839ce 100644 --- a/pkgs/tools/misc/debootstrap/default.nix +++ b/pkgs/tools/misc/debootstrap/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation { installPhase = '' cp -r . $out; cd $out t=bin/debootstrap - ensureDir bin man/man8 + mkdir -p bin man/man8 cat >> $t << EOF #!/bin/sh export DEBOOTSTRAP_DIR=$out/usr/share/debootstrap @@ -66,7 +66,7 @@ stdenv.mkDerivation { /* build from source: installPhase = '' cp ${devices} devices.tar.gz - ensureDir $out/{bin,man/man8}; + mkdir -p $out/{bin,man/man8}; cp debootstrap.8 $out/man/man8 sed -i \ -e 's@-o root@@' \ diff --git a/pkgs/tools/misc/dmg2img/default.nix b/pkgs/tools/misc/dmg2img/default.nix index 72e368e709e..b9a15ac6a20 100644 --- a/pkgs/tools/misc/dmg2img/default.nix +++ b/pkgs/tools/misc/dmg2img/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { buildInputs = [zlib bzip2 openssl]; installPhase = '' - ensureDir $out/bin + mkdir -p $out/bin cp dmg2img $out/bin ''; } diff --git a/pkgs/tools/misc/dtach/default.nix b/pkgs/tools/misc/dtach/default.nix index d203419cd69..7ceecc3690a 100644 --- a/pkgs/tools/misc/dtach/default.nix +++ b/pkgs/tools/misc/dtach/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { }; installPhase = '' - ensureDir $out/bin + mkdir -p $out/bin cp dtach $out/bin/dtach ''; diff --git a/pkgs/tools/misc/expect/default.nix b/pkgs/tools/misc/expect/default.nix index 9f0892bb0aa..a32e5abbb29 100644 --- a/pkgs/tools/misc/expect/default.nix +++ b/pkgs/tools/misc/expect/default.nix @@ -32,5 +32,5 @@ stdenv.mkDerivation { description = "A tool for automating interactive applications"; homepage = http://expect.nist.gov/; }; - postInstall="cp expect{,k} $out/bin; ensureDir $out/lib; cp *.so $out/lib"; + postInstall="cp expect{,k} $out/bin; mkdir -p $out/lib; cp *.so $out/lib"; } diff --git a/pkgs/tools/misc/fdupes/default.nix b/pkgs/tools/misc/fdupes/default.nix index 04a0662a3b6..2de9efdac58 100644 --- a/pkgs/tools/misc/fdupes/default.nix +++ b/pkgs/tools/misc/fdupes/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation { }; # workaround: otherwise make install fails (should be fixed in trunk) - preInstall = "ensureDir $out/bin $out/man/man1"; + preInstall = "mkdir -p $out/bin $out/man/man1"; makeFlags = "PREFIX=\${out}"; diff --git a/pkgs/tools/misc/figlet/default.nix b/pkgs/tools/misc/figlet/default.nix index 00265d1f31d..3f89713918f 100644 --- a/pkgs/tools/misc/figlet/default.nix +++ b/pkgs/tools/misc/figlet/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation { }; preConfigure = '' - ensureDir $out/{man/man6,bin} + mkdir -p $out/{man/man6,bin} makeFlags="DESTDIR=$out/bin MANDIR=$out/man/man6 DEFAULTFONTDIR=$out/share/figlet" ''; diff --git a/pkgs/tools/misc/hddtemp/default.nix b/pkgs/tools/misc/hddtemp/default.nix index 202d28684d0..7db9324c281 100644 --- a/pkgs/tools/misc/hddtemp/default.nix +++ b/pkgs/tools/misc/hddtemp/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation { configurePhase = '' - ensureDir $out/nix-support + mkdir -p $out/nix-support cp $db $out/nix-support/hddtemp.db ./configure --prefix=$out --with-db-path=$out/nix-support/hddtemp.db ''; diff --git a/pkgs/tools/misc/jdiskreport/builder.sh b/pkgs/tools/misc/jdiskreport/builder.sh index aa4ba13963c..1e73b674c15 100644 --- a/pkgs/tools/misc/jdiskreport/builder.sh +++ b/pkgs/tools/misc/jdiskreport/builder.sh @@ -2,11 +2,11 @@ source $stdenv/setup unzip $src -ensureDir $out/jars +mkdir -p $out/jars mv */*.jar $out/jars jar=$(ls $out/jars/jdiskreport-*.jar) -ensureDir $out/bin +mkdir -p $out/bin cat > $out/bin/jdiskreport <> $out/bin/css-validator << EOF #!/bin/sh diff --git a/pkgs/tools/misc/xdaliclock/default.nix b/pkgs/tools/misc/xdaliclock/default.nix index cb2631bd5d8..74ee8b5b548 100644 --- a/pkgs/tools/misc/xdaliclock/default.nix +++ b/pkgs/tools/misc/xdaliclock/default.nix @@ -32,7 +32,7 @@ rec { phaseNames = ["doConfigure" "prepareDirs" "doMakeInstall"]; prepareDirs = a.fullDepEntry '' - ensureDir "$out/bin" "$out/share" "$out/share/man/man1" + mkdir -p "$out/bin" "$out/share" "$out/share/man/man1" '' ["minInit" "defEnsureDir"]; goSrcDir = "cd X11"; diff --git a/pkgs/tools/networking/altermime/default.nix b/pkgs/tools/networking/altermime/default.nix index a98f307c77d..8335b0eb8db 100644 --- a/pkgs/tools/networking/altermime/default.nix +++ b/pkgs/tools/networking/altermime/default.nix @@ -31,7 +31,7 @@ rec { phaseNames = ["doPatch" "fixTarget" "doMakeInstall"]; fixTarget = a.fullDepEntry ('' sed -i Makefile -e "s@/usr/local@$out@" - ensureDir "$out/bin" + mkdir -p "$out/bin" '') ["doUnpack" "minInit" "defEnsureDir"]; meta = { diff --git a/pkgs/tools/networking/bsd-finger/default.nix b/pkgs/tools/networking/bsd-finger/default.nix index fc29af989ce..808c738110e 100644 --- a/pkgs/tools/networking/bsd-finger/default.nix +++ b/pkgs/tools/networking/bsd-finger/default.nix @@ -16,5 +16,5 @@ stdenv.mkDerivation rec { preBuild = "cd finger"; - preInstall = '' ensureDir $out/man/man1 $out/bin ''; + preInstall = '' mkdir -p $out/man/man1 $out/bin ''; } diff --git a/pkgs/tools/networking/cntlm/default.nix b/pkgs/tools/networking/cntlm/default.nix index f5865020785..cd3ae12a11b 100644 --- a/pkgs/tools/networking/cntlm/default.nix +++ b/pkgs/tools/networking/cntlm/default.nix @@ -11,9 +11,9 @@ stdenv.mkDerivation { buildInputs = [ which ]; installPhase = '' - ensureDir $out/bin; cp cntlm $out/bin/; - ensureDir $out/share/; cp COPYRIGHT README VERSION doc/cntlm.conf $out/share/; - ensureDir $out/man/; cp doc/cntlm.1 $out/man/; + mkdir -p $out/bin; cp cntlm $out/bin/; + mkdir -p $out/share/; cp COPYRIGHT README VERSION doc/cntlm.conf $out/share/; + mkdir -p $out/man/; cp doc/cntlm.1 $out/man/; ''; meta = { diff --git a/pkgs/tools/networking/ddclient/default.nix b/pkgs/tools/networking/ddclient/default.nix index 7c1e89083b8..e57ba489450 100644 --- a/pkgs/tools/networking/ddclient/default.nix +++ b/pkgs/tools/networking/ddclient/default.nix @@ -15,7 +15,7 @@ buildPerlPackage { ''; installPhase = '' - ensureDir $out/bin + mkdir -p $out/bin cp ddclient $out/bin ''; diff --git a/pkgs/tools/networking/dnstop/default.nix b/pkgs/tools/networking/dnstop/default.nix index cdab68f22ea..c9e1b58d2d2 100644 --- a/pkgs/tools/networking/dnstop/default.nix +++ b/pkgs/tools/networking/dnstop/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation { buildInputs = [ libpcap ncurses ]; preInstall = '' - ensureDir $out/share/man/man8 $out/bin + mkdir -p $out/share/man/man8 $out/bin ''; meta = { diff --git a/pkgs/tools/networking/eggdrop/default.nix b/pkgs/tools/networking/eggdrop/default.nix index c55688d5060..8649eda4bf7 100644 --- a/pkgs/tools/networking/eggdrop/default.nix +++ b/pkgs/tools/networking/eggdrop/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation { preConfigure = '' prefix=$out/eggdrop - ensureDir $prefix + mkdir -p $prefix ''; postConfigure = '' diff --git a/pkgs/tools/networking/flvstreamer/default.nix b/pkgs/tools/networking/flvstreamer/default.nix index c3ac4e205ae..cbc07522019 100644 --- a/pkgs/tools/networking/flvstreamer/default.nix +++ b/pkgs/tools/networking/flvstreamer/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { ''; installPhase = '' - ensureDir $out/bin + mkdir -p $out/bin cp flvstreamer $out/bin cp streams $out/bin cp rtmpsrv $out/bin diff --git a/pkgs/tools/networking/host/default.nix b/pkgs/tools/networking/host/default.nix index 9383b857a3a..c74dbe52829 100644 --- a/pkgs/tools/networking/host/default.nix +++ b/pkgs/tools/networking/host/default.nix @@ -11,8 +11,8 @@ let version = "20000331"; in preConfigure = '' makeFlagsArray=(DESTBIN=$out/bin DESTMAN=$out/share/man OWNER=$(id -u) GROUP=$(id -g)) - ensureDir "$out/bin" - ensureDir "$out/share/man/man1" + mkdir -p "$out/bin" + mkdir -p "$out/share/man/man1" ''; installTargets = "install man"; diff --git a/pkgs/tools/networking/miniupnpc/default.nix b/pkgs/tools/networking/miniupnpc/default.nix index 1039cadb3ee..34ec8eed90e 100644 --- a/pkgs/tools/networking/miniupnpc/default.nix +++ b/pkgs/tools/networking/miniupnpc/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { postInstall = '' - ensureDir $out/share/man/man3 + mkdir -p $out/share/man/man3 cp man3/miniupnpc.3 $out/share/man/man3/ ''; diff --git a/pkgs/tools/networking/miniupnpd/default.nix b/pkgs/tools/networking/miniupnpd/default.nix index 5d62222d141..6db47f8e079 100644 --- a/pkgs/tools/networking/miniupnpd/default.nix +++ b/pkgs/tools/networking/miniupnpd/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { postInstall = '' - ensureDir $out/share/man/man1 + mkdir -p $out/share/man/man1 cp miniupnpd.1 $out/share/man/man1/ ''; diff --git a/pkgs/tools/networking/netboot/default.nix b/pkgs/tools/networking/netboot/default.nix index a834ffc3739..684507a1d2e 100644 --- a/pkgs/tools/networking/netboot/default.nix +++ b/pkgs/tools/networking/netboot/default.nix @@ -37,7 +37,7 @@ rec { '' ["doUnpack" "addInputs"]; doDeploy = a.fullDepEntry '' - ensureDir "$out/bin" + mkdir -p "$out/bin" cp netboot "$out/bin" '' ["defEnsureDir" "minInit"]; diff --git a/pkgs/tools/networking/netkit/tftp/default.nix b/pkgs/tools/networking/netkit/tftp/default.nix index adf85a981d1..6b9763972df 100644 --- a/pkgs/tools/networking/netkit/tftp/default.nix +++ b/pkgs/tools/networking/netkit/tftp/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { }; preInstall = " - ensureDir $out/man/man{1,8} $out/sbin $out/bin + mkdir -p $out/man/man{1,8} $out/sbin $out/bin "; meta = { diff --git a/pkgs/tools/networking/openssh/default.nix b/pkgs/tools/networking/openssh/default.nix index 69243b4f68e..7cadf8a1345 100644 --- a/pkgs/tools/networking/openssh/default.nix +++ b/pkgs/tools/networking/openssh/default.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { preConfigure = '' configureFlags="$configureFlags --with-privsep-path=$out/empty" - ensureDir $out/empty + mkdir -p $out/empty ''; postInstall = @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { chmod +x $out/bin/ssh-copy-id cp contrib/ssh-copy-id.1 $out/share/man/man1/ - ensureDir $out/etc/ssh + mkdir -p $out/etc/ssh cp moduli $out/etc/ssh/ ''; diff --git a/pkgs/tools/networking/p2p/azureus/builder.sh b/pkgs/tools/networking/p2p/azureus/builder.sh index 13b7a483192..9d41dba2e43 100644 --- a/pkgs/tools/networking/p2p/azureus/builder.sh +++ b/pkgs/tools/networking/p2p/azureus/builder.sh @@ -1,9 +1,9 @@ source $stdenv/setup -ensureDir $out/jars +mkdir -p $out/jars cp $src $out/jars/azureus.jar -ensureDir $out/bin +mkdir -p $out/bin cat > $out/bin/azureus <> Makefile '') ["minInit" "addInputs" "defEnsureDir"]; diff --git a/pkgs/tools/security/chkrootkit/default.nix b/pkgs/tools/security/chkrootkit/default.nix index e7545ac8cd6..73f7f8c9ae5 100644 --- a/pkgs/tools/security/chkrootkit/default.nix +++ b/pkgs/tools/security/chkrootkit/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation { }; installPhase = " - ensureDir $out/sbin + mkdir -p $out/sbin cp check_wtmpx chkdirs chklastlog chkproc chkrootkit chkutmp chkwtmp ifpromisc strings-static $out/sbin "; diff --git a/pkgs/tools/security/metasploit/3.1.nix b/pkgs/tools/security/metasploit/3.1.nix index 94bc009080d..e02ce1316ba 100644 --- a/pkgs/tools/security/metasploit/3.1.nix +++ b/pkgs/tools/security/metasploit/3.1.nix @@ -9,8 +9,8 @@ rec { configureFlags = []; doInstall = fullDepEntry('' - ensureDir $out/share/msf - ensureDir $out/bin + mkdir -p $out/share/msf + mkdir -p $out/bin cp -r * $out/share/msf diff --git a/pkgs/tools/security/opensc-dnie-wrapper/default.nix b/pkgs/tools/security/opensc-dnie-wrapper/default.nix index ec649790e67..b36d99f8ebf 100644 --- a/pkgs/tools/security/opensc-dnie-wrapper/default.nix +++ b/pkgs/tools/security/opensc-dnie-wrapper/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { phases = [ "installPhase" ]; installPhase = '' - ensureDir $out/etc + mkdir -p $out/etc cp ${opensc}/etc/opensc.conf $out/etc chmod +w $out/etc/opensc.conf diff --git a/pkgs/tools/security/pius/default.nix b/pkgs/tools/security/pius/default.nix index d5462a1120a..3ca41032815 100644 --- a/pkgs/tools/security/pius/default.nix +++ b/pkgs/tools/security/pius/default.nix @@ -19,10 +19,10 @@ stdenv.mkDerivation { buildPhase = "true"; installPhase = - '' ensureDir "$out/bin" + '' mkdir -p "$out/bin" cp -v pius "$out/bin" - ensureDir "$out/doc/pius-${version}" + mkdir -p "$out/doc/pius-${version}" cp -v README "$out/doc/pius-${version}" ''; diff --git a/pkgs/tools/security/seccure/0.4.nix b/pkgs/tools/security/seccure/0.4.nix index 0a1452e5355..33a77c07844 100644 --- a/pkgs/tools/security/seccure/0.4.nix +++ b/pkgs/tools/security/seccure/0.4.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { preConfigure = '' sed -e s@/usr/@$out/@g -i Makefile sed -e 's@ln -f@ln -sf@g' -i Makefile - ensureDir $out/bin $out/share/man/man1 + mkdir -p $out/bin $out/share/man/man1 ''; meta = { diff --git a/pkgs/tools/security/ssss/default.nix b/pkgs/tools/security/ssss/default.nix index 3816df415c6..74682d00d03 100644 --- a/pkgs/tools/security/ssss/default.nix +++ b/pkgs/tools/security/ssss/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { sed -e s@/usr/@$out/@g -i Makefile cp ssss.manpage.xml ssss.1 cp ssss.manpage.xml ssss.1.html - ensureDir $out/bin $out/share/man/man1 + mkdir -p $out/bin $out/share/man/man1 echo -e 'install:\n\tcp ssss-combine ssss-split '"$out"'/bin' >>Makefile ''; diff --git a/pkgs/tools/system/bootchart/default.nix b/pkgs/tools/system/bootchart/default.nix index 24a1558e901..bb3f9d72e82 100644 --- a/pkgs/tools/system/bootchart/default.nix +++ b/pkgs/tools/system/bootchart/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { ''; installPhase = '' - ensureDir $out/sbin $out/etc + mkdir -p $out/sbin $out/etc cp script/bootchartd $out/sbin cp script/bootchartd.conf $out/etc chmod +x $out/sbin/bootchartd diff --git a/pkgs/tools/system/cron/default.nix b/pkgs/tools/system/cron/default.nix index 17583f612dc..6132abc0879 100644 --- a/pkgs/tools/system/cron/default.nix +++ b/pkgs/tools/system/cron/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { echo '#define _PATH_SENDMAIL "${sendmailPath}"' >> pathnames.h ''; - preInstall = "ensureDir $out/bin $out/sbin $out/share/man/man1 $out/share/man/man5 $out/share/man/man8"; + preInstall = "mkdir -p $out/bin $out/sbin $out/share/man/man1 $out/share/man/man5 $out/share/man/man8"; meta = { description = "Vixie Cron, a daemon for running commands at specific times"; diff --git a/pkgs/tools/system/dd_rescue/default.nix b/pkgs/tools/system/dd_rescue/default.nix index b018de88f46..57f9a1a57d5 100644 --- a/pkgs/tools/system/dd_rescue/default.nix +++ b/pkgs/tools/system/dd_rescue/default.nix @@ -40,7 +40,7 @@ rec { fixPaths = a.doPatchShebangs ''$out/bin''; install_dd_rhelp = a.fullDepEntry ('' - ensureDir "$out/share/dd_rescue" "$out/bin" + mkdir -p "$out/share/dd_rescue" "$out/bin" tar xf "${dd_rhelp_src}" -C "$out/share/dd_rescue" cp "$out/share/dd_rescue"/dd_rhelp*/dd_rhelp "$out/bin" '') ["minInit" "defEnsureDir"]; diff --git a/pkgs/tools/system/gptfdisk/default.nix b/pkgs/tools/system/gptfdisk/default.nix index 35c510f625c..f82c94c0a72 100644 --- a/pkgs/tools/system/gptfdisk/default.nix +++ b/pkgs/tools/system/gptfdisk/default.nix @@ -11,8 +11,8 @@ stdenv.mkDerivation rec { buildInputs = [ libuuid popt icu ncurses ]; installPhase = '' - ensureDir $out/sbin - ensureDir $out/share/man/man8 + mkdir -p $out/sbin + mkdir -p $out/share/man/man8 install -v -m755 gdisk sgdisk fixparts $out/sbin install -v -m644 gdisk.8 sgdisk.8 fixparts.8 \ $out/share/man/man8 diff --git a/pkgs/tools/system/plan9port/builder.sh b/pkgs/tools/system/plan9port/builder.sh index f33dc7227fb..bf5e6eeffa5 100644 --- a/pkgs/tools/system/plan9port/builder.sh +++ b/pkgs/tools/system/plan9port/builder.sh @@ -40,7 +40,7 @@ popd # Installation export PLAN9=$out -ensureDir $PLAN9 +mkdir -p $PLAN9 GLOBIGNORE='src:.*' cp -R * $PLAN9 GLOBIGNORE= diff --git a/pkgs/tools/text/convertlit/default.nix b/pkgs/tools/text/convertlit/default.nix index 02654cd8922..05494e54a3e 100644 --- a/pkgs/tools/text/convertlit/default.nix +++ b/pkgs/tools/text/convertlit/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation { ''; installPhase = '' - ensureDir $out/bin + mkdir -p $out/bin cp clit $out/bin ''; diff --git a/pkgs/tools/text/dadadodo/default.nix b/pkgs/tools/text/dadadodo/default.nix index 3beb47b0696..1485bbcd467 100644 --- a/pkgs/tools/text/dadadodo/default.nix +++ b/pkgs/tools/text/dadadodo/default.nix @@ -21,7 +21,7 @@ rec { installFlags = "PREFIX=$out"; doDeploy = a.fullDepEntry ('' - ensureDir $out/bin + mkdir -p $out/bin cp dadadodo $out/bin '') [ "minInit" "doMake" "defEnsureDir"]; diff --git a/pkgs/tools/text/qshowdiff/default.nix b/pkgs/tools/text/qshowdiff/default.nix index d033cf4ba6f..7c76c7f1bca 100644 --- a/pkgs/tools/text/qshowdiff/default.nix +++ b/pkgs/tools/text/qshowdiff/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { buildInputs = [ qt4 perl ]; configurePhase = '' - ensureDir $out/{bin,man/man1} + mkdir -p $out/{bin,man/man1} makeFlags="PREFIX=$out" ''; diff --git a/pkgs/tools/text/replace/default.nix b/pkgs/tools/text/replace/default.nix index 01e58146ed8..72dbdbf647f 100644 --- a/pkgs/tools/text/replace/default.nix +++ b/pkgs/tools/text/replace/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation { makeFlags = "TREE=\$(out) MANTREE=\$(TREE)/share/man CC=${stdenv.cross.config}-gcc"; }; - preInstall = "ensureDir \$out/share/man"; + preInstall = "mkdir -p \$out/share/man"; postInstall = "mv \$out/bin/replace \$out/bin/replace-literal"; patches = [./malloc.patch]; diff --git a/pkgs/tools/text/xml/jing/script-builder.sh b/pkgs/tools/text/xml/jing/script-builder.sh index 0a7cdc5b8a8..d9cc8849276 100644 --- a/pkgs/tools/text/xml/jing/script-builder.sh +++ b/pkgs/tools/text/xml/jing/script-builder.sh @@ -1,6 +1,6 @@ source $stdenv/setup -ensureDir $out/bin +mkdir -p $out/bin cat >> $out/bin/jing <> $out/bin/trang <> $out/nix-support/hydra-build-products - ensureDir $out/manual + mkdir -p $out/manual cp doc/manual.html $out/manual/index.html cp doc/style.css $out/manual/ echo "doc manual $out/manual" >> $out/nix-support/hydra-build-products diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index d9cc483ef3a..5e8cf9553d9 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1035,7 +1035,7 @@ let pythonPackages = python.modules // rec { installCommand = '' dest=$(toPythonPath $out)/optfunc - ensureDir $dest + mkdir -p $dest cp * $dest/ ''; @@ -1543,10 +1543,10 @@ let pythonPackages = python.modules // rec { installPhase = '' dest=$(toPythonPath $out)/pysvn - ensureDir $dest + mkdir -p $dest cp pysvn/__init__.py $dest/ cp pysvn/_pysvn*.so $dest/ - ensureDir $out/share/doc + mkdir -p $out/share/doc mv -v ../Docs $out/share/doc/pysvn-1.7.2 rm -v $out/share/doc/pysvn-1.7.2/generate_cpp_docs_from_html_docs.py ''; From d4d7931a6296cd72d3d5f360d628be86bb62246b Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 18 Jan 2012 20:53:01 +0000 Subject: [PATCH 046/197] =?UTF-8?q?*=20Cleanup:=20remove=20obsolete=20refe?= =?UTF-8?q?rences=20to=20=E2=80=98xz=E2=80=99,=20which=20is=20in=20stdenv?= =?UTF-8?q?=20now.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit svn path=/nixpkgs/branches/stdenv-updates/; revision=31678 --- pkgs/applications/graphics/ImageMagick/default.nix | 3 --- pkgs/applications/graphics/dia/default.nix | 4 ++-- pkgs/applications/misc/calibre/default.nix | 2 +- pkgs/applications/misc/lyx/default.nix | 2 +- .../networking/browsers/icecat-3/default.nix | 4 ++-- .../applications/networking/browsers/opera/default.nix | 2 -- .../science/electronics/gtkwave/default.nix | 4 ++-- pkgs/applications/version-management/meld/default.nix | 4 ++-- pkgs/applications/video/xine-ui/default.nix | 4 ++-- pkgs/applications/window-managers/awesome/default.nix | 4 ++-- pkgs/data/fonts/cantarell-fonts/default.nix | 4 +--- pkgs/desktops/gnome-2/platform/audiofile/default.nix | 4 +--- .../gnome-2/platform/libgnome-keyring/default.nix | 4 ++-- pkgs/desktops/gnome-3/platform/GConf.nix | 4 ++-- pkgs/desktops/gnome-3/platform/clutter.nix | 4 ++-- pkgs/desktops/gnome-3/platform/glib-networking.nix | 4 ++-- pkgs/desktops/gnome-3/platform/gnome-user-docs.nix | 4 ++-- .../gnome-3/platform/gsettings-desktop-schemas.nix | 4 ++-- pkgs/desktops/gnome-3/platform/libgnome-keyring.nix | 4 ++-- pkgs/desktops/gnome-3/platform/libsoup.nix | 2 +- pkgs/desktops/kde-4.7/kde-runtime.nix | 4 ++-- pkgs/desktops/kde-4.7/kdelibs.nix | 7 +++---- pkgs/desktops/kde-4.7/kdeutils/ark.nix | 4 ++-- pkgs/desktops/kde-4.8/kde-runtime.nix | 4 ++-- pkgs/desktops/kde-4.8/kdelibs.nix | 2 +- pkgs/desktops/kde-4.8/kdeutils/ark.nix | 4 ++-- pkgs/development/interpreters/guile/default.nix | 4 ++-- pkgs/development/libraries/atk/2.2.x.nix | 4 ++-- pkgs/development/libraries/atkmm/2.22.x.nix | 3 +-- pkgs/development/libraries/cogl/default.nix | 4 ++-- pkgs/development/libraries/gdk-pixbuf/2.24.x.nix | 2 +- pkgs/development/libraries/glib/2.28.x.nix | 4 ++-- pkgs/development/libraries/glib/2.30.x.nix | 4 ++-- pkgs/development/libraries/glibmm/2.28.x.nix | 4 ++-- pkgs/development/libraries/glibmm/2.30.x.nix | 4 ++-- pkgs/development/libraries/gnutls/default.nix | 4 ++-- pkgs/development/libraries/gtk+/2.24.x.nix | 2 +- pkgs/development/libraries/gtk+/3.2.x.nix | 2 +- pkgs/development/libraries/gtkmm/2.24.x.nix | 4 ++-- pkgs/development/libraries/json-glib/default.nix | 4 ++-- pkgs/development/libraries/libarchive/default.nix | 4 ++-- pkgs/development/libraries/libav/default.nix | 2 +- pkgs/development/libraries/libdmtx/default.nix | 4 ++-- pkgs/development/libraries/libgsf/default.nix | 2 +- pkgs/development/libraries/libpng/default.nix | 4 +--- pkgs/development/libraries/libwpd/default.nix | 4 ++-- pkgs/development/libraries/pango/1.29.x.nix | 4 ++-- pkgs/development/libraries/pangomm/2.28.x.nix | 3 +-- pkgs/development/libraries/phonon/default.nix | 4 ++-- pkgs/development/tools/misc/cppi/default.nix | 4 +--- pkgs/development/tools/misc/elfutils/default.nix | 4 ++-- pkgs/os-specific/linux/upower/default.nix | 4 ++-- pkgs/os-specific/linux/zen-kernel/2.6.32-zen4.nix | 4 ++-- pkgs/os-specific/linux/zen-kernel/2.6.33-zen1.nix | 4 ++-- pkgs/servers/http/myserver/default.nix | 4 ++-- pkgs/servers/pulseaudio/default.nix | 4 ++-- pkgs/tools/filesystems/squashfs/default.nix | 2 +- pkgs/tools/graphics/pngcrush/default.nix | 4 ++-- pkgs/tools/misc/coreutils/default.nix | 3 +-- pkgs/tools/misc/grub/1.9x.nix | 4 ++-- pkgs/tools/misc/parted/2.3.nix | 3 +-- pkgs/tools/misc/parted/default.nix | 3 +-- pkgs/tools/misc/system-config-printer/default.nix | 4 ++-- pkgs/tools/networking/lftp/default.nix | 2 +- pkgs/tools/networking/modemmanager/default.nix | 4 ++-- .../networking/network-manager-applet/default.nix | 4 ++-- pkgs/tools/networking/network-manager/pptp.nix | 4 ++-- pkgs/tools/package-management/rpm/default.nix | 4 ++-- pkgs/tools/text/gnugrep/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 10 ++-------- 70 files changed, 117 insertions(+), 142 deletions(-) diff --git a/pkgs/applications/graphics/ImageMagick/default.nix b/pkgs/applications/graphics/ImageMagick/default.nix index a4bd960655c..0b62ffdca5a 100644 --- a/pkgs/applications/graphics/ImageMagick/default.nix +++ b/pkgs/applications/graphics/ImageMagick/default.nix @@ -12,7 +12,6 @@ , libtool , jasper , libX11 -, xz , tetex ? null , librsvg ? null }: @@ -41,8 +40,6 @@ stdenv.mkDerivation rec { buildInputs = [ tetex graphviz ]; - buildNativeInputs = [ xz ]; - preConfigure = if tetex != null then '' export DVIDecodeDelegate=${tetex}/bin/dvips diff --git a/pkgs/applications/graphics/dia/default.nix b/pkgs/applications/graphics/dia/default.nix index f9579336d2c..f0c666b14ea 100644 --- a/pkgs/applications/graphics/dia/default.nix +++ b/pkgs/applications/graphics/dia/default.nix @@ -1,6 +1,6 @@ {stdenv, fetchurl_gnome, gtk, pkgconfig, perl, perlXMLParser, libxml2, gettext , python, libxml2Python, docbook5, docbook_xsl, libxslt, intltool, libart_lgpl -, withGNOME ? false, libgnomeui, xz }: +, withGNOME ? false, libgnomeui }: stdenv.mkDerivation rec { name = src.pkgname; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { libxslt docbook_xsl libart_lgpl ] ++ stdenv.lib.optional withGNOME libgnomeui; - buildNativeInputs = [ pkgconfig intltool perl xz ]; + buildNativeInputs = [ pkgconfig intltool perl ]; configureFlags = stdenv.lib.optionalString withGNOME "--enable-gnome"; diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix index b8100fbd709..9ee87fe3062 100644 --- a/pkgs/applications/misc/calibre/default.nix +++ b/pkgs/applications/misc/calibre/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { inherit python; - buildNativeInputs = [ makeWrapper xz pkgconfig ]; + buildNativeInputs = [ makeWrapper pkgconfig ]; buildInputs = [ python pyqt4 sip popplerQt4 libpng imagemagick libjpeg diff --git a/pkgs/applications/misc/lyx/default.nix b/pkgs/applications/misc/lyx/default.nix index faddeb70e99..27ac0b7bd6a 100644 --- a/pkgs/applications/misc/lyx/default.nix +++ b/pkgs/applications/misc/lyx/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "a790951d6ed660b254e82d682b478665f119dd522ab4759fdeb5cd8d42f66f61"; }; - buildInputs = [texLive qt python makeWrapper xz ]; + buildInputs = [texLive qt python makeWrapper ]; # don't ask me why it can't find libX11.so.6 postInstall = '' diff --git a/pkgs/applications/networking/browsers/icecat-3/default.nix b/pkgs/applications/networking/browsers/icecat-3/default.nix index 7fc5ddbcce5..e916c34631e 100644 --- a/pkgs/applications/networking/browsers/icecat-3/default.nix +++ b/pkgs/applications/networking/browsers/icecat-3/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, xz, pkgconfig, gtk, pango, perl, python, ply, zip, libIDL +{ fetchurl, stdenv, pkgconfig, gtk, pango, perl, python, ply, zip, libIDL , libjpeg, libpng, zlib, cairo, dbus, dbus_glib, bzip2, xlibs, alsaLib , libnotify, gnome_vfs, libgnomeui , freetype, fontconfig, wirelesstools ? null, pixman @@ -19,7 +19,7 @@ stdenv.mkDerivation { }; buildInputs = - [ xz libgnomeui libnotify gnome_vfs alsaLib + [ libgnomeui libnotify gnome_vfs alsaLib pkgconfig gtk perl zip libIDL libjpeg libpng zlib cairo bzip2 pixman python ply dbus dbus_glib pango freetype fontconfig xlibs.libXi xlibs.libX11 xlibs.libXrender xlibs.libXft xlibs.libXt diff --git a/pkgs/applications/networking/browsers/opera/default.nix b/pkgs/applications/networking/browsers/opera/default.nix index 3dddc856963..19a55c0f89c 100644 --- a/pkgs/applications/networking/browsers/opera/default.nix +++ b/pkgs/applications/networking/browsers/opera/default.nix @@ -15,8 +15,6 @@ in stdenv.mkDerivation rec { name = "opera-11.51-1087"; - buildNativeInputs = [ xz ]; - src = if stdenv.system == "i686-linux" then fetchurl { diff --git a/pkgs/applications/science/electronics/gtkwave/default.nix b/pkgs/applications/science/electronics/gtkwave/default.nix index e1bf95700c9..ddffc6ee34b 100644 --- a/pkgs/applications/science/electronics/gtkwave/default.nix +++ b/pkgs/applications/science/electronics/gtkwave/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, gtk, gperf, pkgconfig, bzip2, xz, tcl, tk, judy} : +{stdenv, fetchurl, gtk, gperf, pkgconfig, bzip2, tcl, tk, judy} : stdenv.mkDerivation rec { name = "gtkwave-3.3.28"; @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { sha256 = "0y3dmx39xwc3m23fwjkxvp9gqxpckk8s5814nhs8fnxa384z5cz0"; }; - buildInputs = [ gtk gperf pkgconfig bzip2 xz tcl tk judy]; + buildInputs = [ gtk gperf pkgconfig bzip2 tcl tk judy]; configureFlags = [ "--with-tcl=${tcl}/lib" "--with-tk=${tk}/lib" "--enable-judy" ]; diff --git a/pkgs/applications/version-management/meld/default.nix b/pkgs/applications/version-management/meld/default.nix index 4775a419fd1..42650b3afb3 100644 --- a/pkgs/applications/version-management/meld/default.nix +++ b/pkgs/applications/version-management/meld/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, xz, pygtk, python, intltool, scrollkeeper, makeWrapper }: +{stdenv, fetchurl, pygtk, python, intltool, scrollkeeper, makeWrapper }: let minor = "1.5"; @@ -13,7 +13,7 @@ stdenv.mkDerivation { sha256 = "05rbkqflbqnh2c4682d2fmidhwz2bvlggrhp1p7xbi3z8ci87pdx"; }; - buildInputs = [ pygtk python intltool scrollkeeper makeWrapper xz ]; + buildInputs = [ pygtk python intltool scrollkeeper makeWrapper ]; patchPhase = '' sed -e s,/usr/local,$out, -i INSTALL diff --git a/pkgs/applications/video/xine-ui/default.nix b/pkgs/applications/video/xine-ui/default.nix index 092f5270b78..14fdfdc4660 100644 --- a/pkgs/applications/video/xine-ui/default.nix +++ b/pkgs/applications/video/xine-ui/default.nix @@ -1,5 +1,5 @@ {stdenv, fetchurl, pkgconfig, xlibs, xineLib, libpng, readline, ncurses, curl -, lirc, xz, shared_mime_info }: +, lirc, shared_mime_info }: stdenv.mkDerivation rec { name = "xine-ui-0.99.6"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "1wwylnckm5kfq5fi154w8jqf5cwvp7c1ani15q7sgfrfdkmy7caf"; }; - buildNativeInputs = [ xz pkgconfig shared_mime_info ]; + buildNativeInputs = [ pkgconfig shared_mime_info ]; buildInputs = [ xineLib libpng readline ncurses curl lirc diff --git a/pkgs/applications/window-managers/awesome/default.nix b/pkgs/applications/window-managers/awesome/default.nix index b44f6d9f3aa..5110e42fb18 100644 --- a/pkgs/applications/window-managers/awesome/default.nix +++ b/pkgs/applications/window-managers/awesome/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, xz, cmake, gperf, imagemagick, pkgconfig, lua +{stdenv, fetchurl, cmake, gperf, imagemagick, pkgconfig, lua , glib, cairo, pango, imlib2, libxcb, libxdg_basedir, xcbutil , xcbutilimage, xcbutilkeysyms, xcbutilwm, libpthreadstubs, libXau , libXdmcp, pixman, doxygen @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { sha256 = "576b4f6d2c3f56dfbe52ad92f2eecece111f0f05816e32126cd03d4b4387761d"; }; - buildInputs = [ xz cmake gperf imagemagick pkgconfig lua glib cairo pango + buildInputs = [ cmake gperf imagemagick pkgconfig lua glib cairo pango imlib2 libxcb libxdg_basedir xcbutil xcbutilimage xcbutilkeysyms xcbutilwm libstartup_notification libev libpthreadstubs libXau libXdmcp pixman doxygen asciidoc xmlto dbus docbook_xsl docbook_xml_dtd_45 libxslt ]; diff --git a/pkgs/data/fonts/cantarell-fonts/default.nix b/pkgs/data/fonts/cantarell-fonts/default.nix index c7697c4f072..70a8b2bc9f4 100644 --- a/pkgs/data/fonts/cantarell-fonts/default.nix +++ b/pkgs/data/fonts/cantarell-fonts/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, xz }: +{ stdenv, fetchurl }: stdenv.mkDerivation { name = "cantarell-fonts-0.0.7"; @@ -8,8 +8,6 @@ stdenv.mkDerivation { sha256 = "1410ywvi951ngmx58g339phzsaf1rgjja6i0xvg49r4ds90zh8ba"; }; - buildNativeInputs = [ xz ]; - meta = { maintainers = [ stdenv.lib.maintainers.urkud ]; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/desktops/gnome-2/platform/audiofile/default.nix b/pkgs/desktops/gnome-2/platform/audiofile/default.nix index c39178cdf17..74007218347 100644 --- a/pkgs/desktops/gnome-2/platform/audiofile/default.nix +++ b/pkgs/desktops/gnome-2/platform/audiofile/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, xz, alsaLib}: +{stdenv, fetchurl, alsaLib}: stdenv.mkDerivation { name = "audiofile-0.3.2"; @@ -8,7 +8,5 @@ stdenv.mkDerivation { sha256 = "185j69j6b0vp6h6bb4j4ipvcyysxf63ghxnvdhh8kbc7ixm71hgs"; }; - buildNativeInputs = [ xz ]; - buildInputs = [ alsaLib ]; } diff --git a/pkgs/desktops/gnome-2/platform/libgnome-keyring/default.nix b/pkgs/desktops/gnome-2/platform/libgnome-keyring/default.nix index f937ce26018..05a21f3c82e 100644 --- a/pkgs/desktops/gnome-2/platform/libgnome-keyring/default.nix +++ b/pkgs/desktops/gnome-2/platform/libgnome-keyring/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, glib, dbus_libs, libgcrypt, pkgconfig, xz, +{ stdenv, fetchurl, glib, dbus_libs, libgcrypt, pkgconfig, intltool }: stdenv.mkDerivation { @@ -10,7 +10,7 @@ stdenv.mkDerivation { }; propagatedBuildInputs = [ glib dbus_libs libgcrypt ]; - buildNativeInputs = [ pkgconfig xz intltool ]; + buildNativeInputs = [ pkgconfig intltool ]; meta = { inherit (glib.meta) platforms maintainers; diff --git a/pkgs/desktops/gnome-3/platform/GConf.nix b/pkgs/desktops/gnome-3/platform/GConf.nix index 637d619d022..52f3cba7bdb 100644 --- a/pkgs/desktops/gnome-3/platform/GConf.nix +++ b/pkgs/desktops/gnome-3/platform/GConf.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl_gnome, glib, dbus_glib, pkgconfig, xz, libxml2, gtk, intltool }: +{ stdenv, fetchurl_gnome, glib, dbus_glib, pkgconfig, libxml2, gtk, intltool }: stdenv.mkDerivation rec { name = src.pkgname; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; propagatedBuildInputs = [ glib dbus_glib libxml2 gtk ]; - buildNativeInputs = [ pkgconfig xz intltool ]; + buildNativeInputs = [ pkgconfig intltool ]; configureFlags = "--disable-orbit"; diff --git a/pkgs/desktops/gnome-3/platform/clutter.nix b/pkgs/desktops/gnome-3/platform/clutter.nix index 4e7bc54c129..b2ee5539008 100644 --- a/pkgs/desktops/gnome-3/platform/clutter.nix +++ b/pkgs/desktops/gnome-3/platform/clutter.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, glib, xz, pkgconfig, mesa, libX11, libXext, libXfixes +{ stdenv, fetchurl, glib, pkgconfig, mesa, libX11, libXext, libXfixes , libXdamage, libXcomposite, libXi, cogl, pango, atk, json_glib }: stdenv.mkDerivation { @@ -9,7 +9,7 @@ stdenv.mkDerivation { sha256 = "0bzsvnharawfg525lpavrp55mq4aih5nb01dwwqwnccg8hk9z2fw"; }; - buildNativeInputs = [ xz pkgconfig ]; + buildNativeInputs = [ pkgconfig ]; buildInputs = [ libX11 mesa libXext libXfixes libXdamage libXcomposite libXi cogl pango atk json_glib diff --git a/pkgs/desktops/gnome-3/platform/glib-networking.nix b/pkgs/desktops/gnome-3/platform/glib-networking.nix index 7fa0295fe74..37537b274e1 100644 --- a/pkgs/desktops/gnome-3/platform/glib-networking.nix +++ b/pkgs/desktops/gnome-3/platform/glib-networking.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, glib, xz, pkgconfig, intltool, gnutls, libgcrypt +{ stdenv, fetchurl, glib, pkgconfig, intltool, gnutls, libgcrypt , gsettings_desktop_schemas }: stdenv.mkDerivation { @@ -11,7 +11,7 @@ stdenv.mkDerivation { propagatedBuildInputs = [ glib gnutls libgcrypt ]; buildInputs = [ gsettings_desktop_schemas ]; - buildNativeInputs = [ xz pkgconfig intltool ]; + buildNativeInputs = [ pkgconfig intltool ]; configureFlags = "--without-ca-certificates"; postConfigure = "export makeFlags=GIO_MODULE_DIR=$out/${glib.gioModuleDir}"; diff --git a/pkgs/desktops/gnome-3/platform/gnome-user-docs.nix b/pkgs/desktops/gnome-3/platform/gnome-user-docs.nix index f434b5c155c..f92882b9a83 100644 --- a/pkgs/desktops/gnome-3/platform/gnome-user-docs.nix +++ b/pkgs/desktops/gnome-3/platform/gnome-user-docs.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, xz, itstool, libxml2, gettext }: +{ stdenv, fetchurl, itstool, libxml2, gettext }: stdenv.mkDerivation { name = "gnome-user-docs-3.2.2"; @@ -8,5 +8,5 @@ stdenv.mkDerivation { sha256 = "1ka0nw2kc85p10y8x31v0wv06a88k7qrgafp4ys04y9fzz0rkcjj"; }; - buildNativeInputs = [ xz itstool libxml2 gettext ]; + buildNativeInputs = [ itstool libxml2 gettext ]; } diff --git a/pkgs/desktops/gnome-3/platform/gsettings-desktop-schemas.nix b/pkgs/desktops/gnome-3/platform/gsettings-desktop-schemas.nix index db6453a53c3..4527b2fec0b 100644 --- a/pkgs/desktops/gnome-3/platform/gsettings-desktop-schemas.nix +++ b/pkgs/desktops/gnome-3/platform/gsettings-desktop-schemas.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, xz, glib, pkgconfig, intltool }: +{ stdenv, fetchurl, glib, pkgconfig, intltool }: stdenv.mkDerivation { name = "gsettings-desktop-schemas-3.2.0"; @@ -9,7 +9,7 @@ stdenv.mkDerivation { }; buildInputs = [ glib ]; - buildNativeInputs = [ pkgconfig xz intltool ]; + buildNativeInputs = [ pkgconfig intltool ]; meta = { inherit (glib.meta) maintainers platforms; diff --git a/pkgs/desktops/gnome-3/platform/libgnome-keyring.nix b/pkgs/desktops/gnome-3/platform/libgnome-keyring.nix index b3ceb6df3d5..a8b8e98ced9 100644 --- a/pkgs/desktops/gnome-3/platform/libgnome-keyring.nix +++ b/pkgs/desktops/gnome-3/platform/libgnome-keyring.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, glib, dbus_libs, libgcrypt, pkgconfig, xz, +{ stdenv, fetchurl, glib, dbus_libs, libgcrypt, pkgconfig, intltool }: stdenv.mkDerivation { @@ -10,7 +10,7 @@ stdenv.mkDerivation { }; propagatedBuildInputs = [ glib dbus_libs libgcrypt ]; - buildNativeInputs = [ pkgconfig xz intltool ]; + buildNativeInputs = [ pkgconfig intltool ]; meta = { inherit (glib.meta) platforms maintainers; diff --git a/pkgs/desktops/gnome-3/platform/libsoup.nix b/pkgs/desktops/gnome-3/platform/libsoup.nix index 1827d5c9cd7..fdf9e5bd9fe 100644 --- a/pkgs/desktops/gnome-3/platform/libsoup.nix +++ b/pkgs/desktops/gnome-3/platform/libsoup.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation { }; - buildNativeInputs = [ pkgconfig xz ]; + buildNativeInputs = [ pkgconfig ]; propagatedBuildInputs = [ glib libxml2 ] ++ stdenv.lib.optionals gnomeSupport [ libgnome_keyring sqlite ]; passthru.propagatedUserEnvPackages = [ glib_networking ]; diff --git a/pkgs/desktops/kde-4.7/kde-runtime.nix b/pkgs/desktops/kde-4.7/kde-runtime.nix index 96b6c3a1c78..003c4aceea9 100644 --- a/pkgs/desktops/kde-4.7/kde-runtime.nix +++ b/pkgs/desktops/kde-4.7/kde-runtime.nix @@ -1,10 +1,10 @@ -{ kde, kdelibs, shared_desktop_ontologies, bzip2, xz, libssh, exiv2, attica +{ kde, kdelibs, shared_desktop_ontologies, bzip2, libssh, exiv2, attica , libcanberra, virtuoso, samba, ntrack }: kde { buildInputs = - [ kdelibs shared_desktop_ontologies bzip2 xz libssh exiv2 attica + [ kdelibs shared_desktop_ontologies bzip2 libssh exiv2 attica samba (libcanberra.override { gtk = null; }) ntrack ]; diff --git a/pkgs/desktops/kde-4.7/kdelibs.nix b/pkgs/desktops/kde-4.7/kdelibs.nix index d4383b3e93a..3a6ae7a4afb 100644 --- a/pkgs/desktops/kde-4.7/kdelibs.nix +++ b/pkgs/desktops/kde-4.7/kdelibs.nix @@ -1,6 +1,6 @@ { kde, gcc, cmake, perl , qt4, bzip2, pcre, fam, libxml2, libxslt, shared_mime_info, giflib, jasper -, xz, openexr, avahi, kerberos, acl, attr, shared_desktop_ontologies, libXScrnSaver +, openexr, avahi, kerberos, acl, attr, shared_desktop_ontologies, libXScrnSaver , automoc4, strigi, soprano, qca2, attica, enchant, libdbusmenu_qt , docbook_xml_dtd_42, docbook_xsl, polkit_qt_1 , getopt, udev, herqq, phonon, libjpeg @@ -8,10 +8,9 @@ kde { buildInputs = - [ - acl attr attica avahi bzip2 enchant fam getopt giflib herqq jasper + [ acl attr attica avahi bzip2 enchant fam getopt giflib herqq jasper libdbusmenu_qt libXScrnSaver libxslt pcre polkit_qt_1 qca2 - shared_desktop_ontologies udev xz libxml2 libjpeg + shared_desktop_ontologies udev libxml2 libjpeg ]; propagatedBuildInputs = [ qt4 soprano strigi phonon ]; diff --git a/pkgs/desktops/kde-4.7/kdeutils/ark.nix b/pkgs/desktops/kde-4.7/kdeutils/ark.nix index 4449dd8228f..7fbdaf586d6 100644 --- a/pkgs/desktops/kde-4.7/kdeutils/ark.nix +++ b/pkgs/desktops/kde-4.7/kdeutils/ark.nix @@ -1,7 +1,7 @@ -{ kde, kdelibs, libarchive, xz, bzip2, kde_baseapps }: +{ kde, kdelibs, libarchive, bzip2, kde_baseapps }: kde { - buildInputs = [ kdelibs kde_baseapps libarchive xz bzip2 ]; + buildInputs = [ kdelibs kde_baseapps libarchive bzip2 ]; meta = { description = "KDE Archiving Tool"; diff --git a/pkgs/desktops/kde-4.8/kde-runtime.nix b/pkgs/desktops/kde-4.8/kde-runtime.nix index d827802bb09..9b25e77b083 100644 --- a/pkgs/desktops/kde-4.8/kde-runtime.nix +++ b/pkgs/desktops/kde-4.8/kde-runtime.nix @@ -1,10 +1,10 @@ -{ kde, kdelibs, shared_desktop_ontologies, bzip2, xz, libssh, exiv2, attica +{ kde, kdelibs, shared_desktop_ontologies, bzip2, libssh, exiv2, attica , libcanberra, virtuoso, samba, ntrack, libjpeg }: kde { buildInputs = - [ kdelibs shared_desktop_ontologies bzip2 xz libssh exiv2 attica + [ kdelibs shared_desktop_ontologies bzip2 libssh exiv2 attica samba (libcanberra.override { gtk = null; }) ntrack libjpeg ]; diff --git a/pkgs/desktops/kde-4.8/kdelibs.nix b/pkgs/desktops/kde-4.8/kdelibs.nix index 106909ac3db..7f0ac15d800 100644 --- a/pkgs/desktops/kde-4.8/kdelibs.nix +++ b/pkgs/desktops/kde-4.8/kdelibs.nix @@ -1,6 +1,6 @@ { kde, gcc, cmake, perl , qt4, bzip2, pcre, fam, libxml2, libxslt, shared_mime_info, giflib, jasper -, xz, openexr, avahi, kerberos, acl, attr, shared_desktop_ontologies, libXScrnSaver +, openexr, avahi, kerberos, acl, attr, shared_desktop_ontologies, libXScrnSaver , automoc4, strigi, soprano, qca2, attica, enchant, libdbusmenu_qt , docbook_xml_dtd_42, docbook_xsl, polkit_qt_1 , getopt, udev, herqq, phonon, libjpeg diff --git a/pkgs/desktops/kde-4.8/kdeutils/ark.nix b/pkgs/desktops/kde-4.8/kdeutils/ark.nix index 4449dd8228f..7fbdaf586d6 100644 --- a/pkgs/desktops/kde-4.8/kdeutils/ark.nix +++ b/pkgs/desktops/kde-4.8/kdeutils/ark.nix @@ -1,7 +1,7 @@ -{ kde, kdelibs, libarchive, xz, bzip2, kde_baseapps }: +{ kde, kdelibs, libarchive, bzip2, kde_baseapps }: kde { - buildInputs = [ kdelibs kde_baseapps libarchive xz bzip2 ]; + buildInputs = [ kdelibs kde_baseapps libarchive bzip2 ]; meta = { description = "KDE Archiving Tool"; diff --git a/pkgs/development/interpreters/guile/default.nix b/pkgs/development/interpreters/guile/default.nix index bb64d35f8a4..ffdb957963a 100644 --- a/pkgs/development/interpreters/guile/default.nix +++ b/pkgs/development/interpreters/guile/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, xz, libtool, readline, gmp, pkgconfig, boehmgc, libunistring +{ fetchurl, stdenv, libtool, readline, gmp, pkgconfig, boehmgc, libunistring , libffi, gawk, makeWrapper, coverageAnalysis ? null }: # Do either a coverage analysis build or a standard build. @@ -14,7 +14,7 @@ rec { sha256 = "14rhlpxxa4v5y3gl992l7lnd5qnqawx0a84idnwq0w2qviwcvsyj"; }; - buildNativeInputs = [ xz makeWrapper gawk pkgconfig ]; + buildNativeInputs = [ makeWrapper gawk pkgconfig ]; buildInputs = [ readline libtool libunistring libffi ]; propagatedBuildInputs = [ gmp boehmgc ] diff --git a/pkgs/development/libraries/atk/2.2.x.nix b/pkgs/development/libraries/atk/2.2.x.nix index 8f49532c025..d0f7e109795 100644 --- a/pkgs/development/libraries/atk/2.2.x.nix +++ b/pkgs/development/libraries/atk/2.2.x.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, perl, glib, xz }: +{ stdenv, fetchurl, pkgconfig, perl, glib }: stdenv.mkDerivation rec { name = "atk-2.2.0"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "17bkqg89l9hxbkgc76cxlin1bwczk7m6ikbccx677lrxh3kz08lb"; }; - buildNativeInputs = [ pkgconfig perl xz ]; + buildNativeInputs = [ pkgconfig perl ]; propagatedBuildInputs = [ glib ]; diff --git a/pkgs/development/libraries/atkmm/2.22.x.nix b/pkgs/development/libraries/atkmm/2.22.x.nix index 2d415821fc5..66237c4c7b9 100644 --- a/pkgs/development/libraries/atkmm/2.22.x.nix +++ b/pkgs/development/libraries/atkmm/2.22.x.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, atk, glibmm, pkgconfig, xz }: +{ stdenv, fetchurl, atk, glibmm, pkgconfig }: stdenv.mkDerivation rec { name = "atkmm-2.22.6"; @@ -8,7 +8,6 @@ stdenv.mkDerivation rec { sha256 = "1dmf72i7jv2a2gavjiah2722bf5qk3hb97hn5dasxqxr0r8jjx0a"; }; - buildInputs = [ xz ]; propagatedBuildInputs = [ atk glibmm ]; buildNativeInputs = [ pkgconfig ]; diff --git a/pkgs/development/libraries/cogl/default.nix b/pkgs/development/libraries/cogl/default.nix index 6b517b91810..11a6e374e2e 100644 --- a/pkgs/development/libraries/cogl/default.nix +++ b/pkgs/development/libraries/cogl/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, pkgconfig, mesa, glib, gdk_pixbuf , pangoSupport ? true, pango, cairo -, libXfixes, libXcomposite, libXdamage, xz }: +, libXfixes, libXcomposite, libXdamage }: stdenv.mkDerivation rec { name = "cogl-1.8.2"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "1ix87hz3qxqysqwx58wbc46lzchlmfs08fjzbf3l6mmsqj8gs9pc"; }; - buildNativeInputs = [ xz pkgconfig ]; + buildNativeInputs = [ pkgconfig ]; propagatedBuildInputs = [ mesa glib gdk_pixbuf libXfixes libXcomposite libXdamage ]; diff --git a/pkgs/development/libraries/gdk-pixbuf/2.24.x.nix b/pkgs/development/libraries/gdk-pixbuf/2.24.x.nix index eb7eaf91bb0..5c0860196d3 100644 --- a/pkgs/development/libraries/gdk-pixbuf/2.24.x.nix +++ b/pkgs/development/libraries/gdk-pixbuf/2.24.x.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation { # !!! We might want to factor out the gdk-pixbuf-xlib subpackage. buildInputs = [ libX11 ]; - buildNativeInputs = [ pkgconfig xz ]; + buildNativeInputs = [ pkgconfig ]; propagatedBuildInputs = [ glib libtiff libjpeg libpng jasper ]; diff --git a/pkgs/development/libraries/glib/2.28.x.nix b/pkgs/development/libraries/glib/2.28.x.nix index 3b7f8b18495..dd613c6ce3c 100644 --- a/pkgs/development/libraries/glib/2.28.x.nix +++ b/pkgs/development/libraries/glib/2.28.x.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl_gnome, pkgconfig, gettext, perl, libiconv, zlib, xz }: +{ stdenv, fetchurl_gnome, pkgconfig, gettext, perl, libiconv, zlib }: # TODO: # * Add gio-module-fam @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { # configure script looks for d-bus but it is only needed for tests buildInputs = stdenv.lib.optional (!stdenv.isLinux) libiconv; - buildNativeInputs = [ perl pkgconfig gettext xz ]; + buildNativeInputs = [ perl pkgconfig gettext ]; propagatedBuildInputs = [ zlib ]; diff --git a/pkgs/development/libraries/glib/2.30.x.nix b/pkgs/development/libraries/glib/2.30.x.nix index a0d8ac0eff7..0f1812b4ec5 100644 --- a/pkgs/development/libraries/glib/2.30.x.nix +++ b/pkgs/development/libraries/glib/2.30.x.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, gettext, perl, libiconv, zlib, xz, libffi +{ stdenv, fetchurl, pkgconfig, gettext, perl, libiconv, zlib, libffi , python }: # TODO: @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { # configure script looks for d-bus but it is only needed for tests buildInputs = stdenv.lib.optional (!stdenv.isLinux) libiconv; - buildNativeInputs = [ perl pkgconfig gettext xz python ]; + buildNativeInputs = [ perl pkgconfig gettext python ]; propagatedBuildInputs = [ zlib libffi ]; diff --git a/pkgs/development/libraries/glibmm/2.28.x.nix b/pkgs/development/libraries/glibmm/2.28.x.nix index 3c2c1fbadce..2c1d9a45c8d 100644 --- a/pkgs/development/libraries/glibmm/2.28.x.nix +++ b/pkgs/development/libraries/glibmm/2.28.x.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl_gnome, pkgconfig, glib, libsigcxx, xz }: +{ stdenv, fetchurl_gnome, pkgconfig, glib, libsigcxx }: stdenv.mkDerivation rec { name = src.pkgname; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "1qyb8jb9avfzcdyhldxx7qljjhf30czwnh7c2r9p0x4nin2rjkpq"; }; - buildNativeInputs = [pkgconfig xz]; + buildNativeInputs = [pkgconfig]; propagatedBuildInputs = [glib libsigcxx]; meta = { diff --git a/pkgs/development/libraries/glibmm/2.30.x.nix b/pkgs/development/libraries/glibmm/2.30.x.nix index e3565a4e614..1ed2d0ede62 100644 --- a/pkgs/development/libraries/glibmm/2.30.x.nix +++ b/pkgs/development/libraries/glibmm/2.30.x.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl_gnome, pkgconfig, glib, libsigcxx, xz }: +{ stdenv, fetchurl_gnome, pkgconfig, glib, libsigcxx }: stdenv.mkDerivation rec { name = src.pkgname; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "1d0dxq4iamch8igrnbvbfwkfpvcnjfzyr9iq2x8hi89b9k1kzbd7"; }; - buildNativeInputs = [pkgconfig xz]; + buildNativeInputs = [pkgconfig]; propagatedBuildInputs = [glib libsigcxx]; meta = { diff --git a/pkgs/development/libraries/gnutls/default.nix b/pkgs/development/libraries/gnutls/default.nix index 3cd8e718021..e998887f591 100644 --- a/pkgs/development/libraries/gnutls/default.nix +++ b/pkgs/development/libraries/gnutls/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, xz, zlib, lzo, libtasn1, nettle +{ fetchurl, stdenv, zlib, lzo, libtasn1, nettle , guileBindings, guile, perl }: assert guileBindings -> guile != null; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { buildInputs = [ zlib lzo ] ++ stdenv.lib.optional guileBindings guile; - buildNativeInputs = [ xz perl ]; + buildNativeInputs = [ perl ]; propagatedBuildInputs = [ nettle libtasn1 ]; diff --git a/pkgs/development/libraries/gtk+/2.24.x.nix b/pkgs/development/libraries/gtk+/2.24.x.nix index e3908b2ba37..c9e95ecc9c3 100644 --- a/pkgs/development/libraries/gtk+/2.24.x.nix +++ b/pkgs/development/libraries/gtk+/2.24.x.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation { enableParallelBuilding = true; - buildNativeInputs = [ perl pkgconfig xz ]; + buildNativeInputs = [ perl pkgconfig ]; propagatedBuildInputs = [ xlibs.xlibs glib atk pango gdk_pixbuf cairo diff --git a/pkgs/development/libraries/gtk+/3.2.x.nix b/pkgs/development/libraries/gtk+/3.2.x.nix index a72411d1636..ae6b692e44f 100644 --- a/pkgs/development/libraries/gtk+/3.2.x.nix +++ b/pkgs/development/libraries/gtk+/3.2.x.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - buildNativeInputs = [ perl pkgconfig xz ]; + buildNativeInputs = [ perl pkgconfig ]; propagatedBuildInputs = [ xlibs.xlibs glib atk pango gdk_pixbuf cairo diff --git a/pkgs/development/libraries/gtkmm/2.24.x.nix b/pkgs/development/libraries/gtkmm/2.24.x.nix index 89e12bc4c1c..56d151101c5 100644 --- a/pkgs/development/libraries/gtkmm/2.24.x.nix +++ b/pkgs/development/libraries/gtkmm/2.24.x.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl_gnome, pkgconfig, gtk, glibmm, cairomm, pangomm, atkmm, xz }: +{ stdenv, fetchurl_gnome, pkgconfig, gtk, glibmm, cairomm, pangomm, atkmm }: stdenv.mkDerivation rec { name = src.pkgname; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "0gcm91sc1a05c56kzh74l370ggj0zz8nmmjvjaaxgmhdq8lpl369"; }; - buildNativeInputs = [pkgconfig xz]; + buildNativeInputs = [pkgconfig]; propagatedBuildInputs = [ glibmm gtk atkmm cairomm pangomm ]; diff --git a/pkgs/development/libraries/json-glib/default.nix b/pkgs/development/libraries/json-glib/default.nix index 25d2f1c4435..ace271b7a35 100644 --- a/pkgs/development/libraries/json-glib/default.nix +++ b/pkgs/development/libraries/json-glib/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl_gnome, glib, pkgconfig, xz }: +{ stdenv, fetchurl_gnome, glib, pkgconfig }: stdenv.mkDerivation rec { name = src.pkgname; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; propagatedBuildInputs = [ glib ]; - buildNativeInputs = [ pkgconfig xz ]; + buildNativeInputs = [ pkgconfig ]; meta = { homepage = http://live.gnome.org/JsonGlib; diff --git a/pkgs/development/libraries/libarchive/default.nix b/pkgs/development/libraries/libarchive/default.nix index ab862fd56f0..36e345043e3 100644 --- a/pkgs/development/libraries/libarchive/default.nix +++ b/pkgs/development/libraries/libarchive/default.nix @@ -1,4 +1,4 @@ -{fetchurl, stdenv, acl, openssl, libxml2, attr, zlib, bzip2, xz, e2fsprogs +{fetchurl, stdenv, acl, openssl, libxml2, attr, zlib, bzip2, e2fsprogs , sharutils}: stdenv.mkDerivation rec { @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "16095d15334b3c8dbb02db5af3d415f12c1c3bdd4eb43af7bbc36ab7572c0b7a"; }; - propagatedBuildInputs = [libxml2 zlib bzip2 xz openssl] ++ + propagatedBuildInputs = [libxml2 zlib bzip2 openssl] ++ (if stdenv.isLinux then [e2fsprogs attr acl] else []); buildInputs = [sharutils]; diff --git a/pkgs/development/libraries/libav/default.nix b/pkgs/development/libraries/libav/default.nix index 0d6637d6116..3fb1650bf46 100644 --- a/pkgs/development/libraries/libav/default.nix +++ b/pkgs/development/libraries/libav/default.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { ++ stdenv.lib.optional xvidSupport "--enable-libxvid" ++ stdenv.lib.optional faacSupport "--enable-libfaac --enable-nonfree"; - buildInputs = [ pkgconfig lame yasm xz ] + buildInputs = [ pkgconfig lame yasm ] ++ stdenv.lib.optional mp3Support lame ++ stdenv.lib.optional speexSupport speex ++ stdenv.lib.optional theoraSupport libtheora diff --git a/pkgs/development/libraries/libdmtx/default.nix b/pkgs/development/libraries/libdmtx/default.nix index f9b864143ec..97622bb7b24 100644 --- a/pkgs/development/libraries/libdmtx/default.nix +++ b/pkgs/development/libraries/libdmtx/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, imagemagick, xz }: +{ stdenv, fetchurl, pkgconfig, imagemagick }: stdenv.mkDerivation rec { name = "libdmtx-0.7.2"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { buildNativeInputs = [ pkgconfig ]; - propagatedBuildInputs = [ imagemagick xz ]; + propagatedBuildInputs = [ imagemagick ]; meta = { description = "An open source software for reading and writing Data Matrix barcodes"; diff --git a/pkgs/development/libraries/libgsf/default.nix b/pkgs/development/libraries/libgsf/default.nix index 3f6de4cfb1d..168a2e7381e 100644 --- a/pkgs/development/libraries/libgsf/default.nix +++ b/pkgs/development/libraries/libgsf/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "0gvq1gbbcl078s3kgdc508jp7p3a3ps34fj4pf8vsamprbikpwm5"; }; - buildNativeInputs = [ xz intltool pkgconfig ]; + buildNativeInputs = [ intltool pkgconfig ]; buildInputs = [ perl perlXMLParser gettext bzip2 gnome_vfs python ]; diff --git a/pkgs/development/libraries/libpng/default.nix b/pkgs/development/libraries/libpng/default.nix index 7ba9bfb54b3..85c2fa13a93 100644 --- a/pkgs/development/libraries/libpng/default.nix +++ b/pkgs/development/libraries/libpng/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, zlib, xz }: +{ stdenv, fetchurl, zlib }: assert zlib != null; @@ -13,8 +13,6 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ zlib ]; - buildNativeInputs = [ xz ]; - passthru = { inherit zlib; }; meta = { diff --git a/pkgs/development/libraries/libwpd/default.nix b/pkgs/development/libraries/libwpd/default.nix index dc3f8b5352d..d857b6e17ea 100644 --- a/pkgs/development/libraries/libwpd/default.nix +++ b/pkgs/development/libraries/libwpd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, glib, libgsf, libxml2, xz }: +{ stdenv, fetchurl, pkgconfig, glib, libgsf, libxml2 }: stdenv.mkDerivation rec { name = "libwpd-0.9.4"; @@ -10,5 +10,5 @@ stdenv.mkDerivation rec { buildInputs = [ glib libgsf libxml2 ]; - buildNativeInputs = [ pkgconfig xz ]; + buildNativeInputs = [ pkgconfig ]; } diff --git a/pkgs/development/libraries/pango/1.29.x.nix b/pkgs/development/libraries/pango/1.29.x.nix index b255f05dd23..5a0ff2b5374 100644 --- a/pkgs/development/libraries/pango/1.29.x.nix +++ b/pkgs/development/libraries/pango/1.29.x.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl_gnome, pkgconfig, gettext, x11, glib, cairo, libpng, xz }: +{ stdenv, fetchurl_gnome, pkgconfig, gettext, x11, glib, cairo, libpng }: stdenv.mkDerivation rec { name = src.pkgname; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { buildInputs = stdenv.lib.optional stdenv.isDarwin gettext; - buildNativeInputs = [ pkgconfig xz ]; + buildNativeInputs = [ pkgconfig ]; propagatedBuildInputs = [ x11 glib cairo libpng ]; diff --git a/pkgs/development/libraries/pangomm/2.28.x.nix b/pkgs/development/libraries/pangomm/2.28.x.nix index c004b7160f2..5cd4744fed3 100644 --- a/pkgs/development/libraries/pangomm/2.28.x.nix +++ b/pkgs/development/libraries/pangomm/2.28.x.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, pango, glibmm, cairomm, libpng, xz }: +{ stdenv, fetchurl, pkgconfig, pango, glibmm, cairomm, libpng }: stdenv.mkDerivation rec { name = "pangomm-2.28.4"; @@ -8,7 +8,6 @@ stdenv.mkDerivation rec { sha256 = "10kcdpg080m393f1vz0km41kd3483fkyabprm59gvjwklxkcp3bp"; }; - buildInputs = [ xz]; buildNativeInputs = [ pkgconfig ]; propagatedBuildInputs = [ pango glibmm cairomm libpng ]; diff --git a/pkgs/development/libraries/phonon/default.nix b/pkgs/development/libraries/phonon/default.nix index c8eae2eac4e..c7de1df7190 100644 --- a/pkgs/development/libraries/phonon/default.nix +++ b/pkgs/development/libraries/phonon/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, automoc4, qt4, xz }: +{ stdenv, fetchurl, cmake, automoc4, qt4 }: let v = "4.5.1"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { buildInputs = [ qt4 ]; - buildNativeInputs = [ cmake automoc4 xz ]; + buildNativeInputs = [ cmake automoc4 ]; cmakeFlags = "-DPHONON_MKSPECS_DIR=mkspecs"; preConfigure = diff --git a/pkgs/development/tools/misc/cppi/default.nix b/pkgs/development/tools/misc/cppi/default.nix index b6c0e9a99b4..c72aa02a88a 100644 --- a/pkgs/development/tools/misc/cppi/default.nix +++ b/pkgs/development/tools/misc/cppi/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, xz, stdenv }: +{ fetchurl, stdenv }: stdenv.mkDerivation rec { name = "cppi-1.15"; @@ -8,8 +8,6 @@ stdenv.mkDerivation rec { sha256 = "1avwwpcwx6rvk9j4id8jq58n5kk756dwnd0wqw4a4p3smvby7gw2"; }; - buildInputs = [ xz ]; - doCheck = true; meta = { diff --git a/pkgs/development/tools/misc/elfutils/default.nix b/pkgs/development/tools/misc/elfutils/default.nix index 6254b955a23..61b4647552d 100644 --- a/pkgs/development/tools/misc/elfutils/default.nix +++ b/pkgs/development/tools/misc/elfutils/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, m4, zlib, bzip2, xz, bison, flex, gettext}: +{stdenv, fetchurl, m4, zlib, bzip2, bison, flex, gettext}: # TODO: Look at the hardcoded paths to kernel, modules etc. stdenv.mkDerivation rec { @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { # We need bzip2 in NativeInputs because otherwise we can't unpack the src, # as the host-bzip2 will be in the path. buildNativeInputs = [m4 bison flex gettext bzip2]; - buildInputs = [zlib bzip2 xz]; + buildInputs = [zlib bzip2]; crossAttrs = { diff --git a/pkgs/os-specific/linux/upower/default.nix b/pkgs/os-specific/linux/upower/default.nix index 32698ac4efb..2679d23d76e 100644 --- a/pkgs/os-specific/linux/upower/default.nix +++ b/pkgs/os-specific/linux/upower/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, xz, pkgconfig, glib, dbus, dbus_glib, polkit +{ stdenv, fetchurl, pkgconfig, glib, dbus, dbus_glib, polkit , intltool, libxslt, docbook_xsl, udev, libusb1, pmutils }: assert stdenv.isLinux; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { buildInputs = [ dbus_glib polkit intltool libxslt docbook_xsl udev libusb1 ]; - buildNativeInputs = [ xz pkgconfig ]; + buildNativeInputs = [ pkgconfig ]; configureFlags = "--with-backend=linux --localstatedir=/var"; diff --git a/pkgs/os-specific/linux/zen-kernel/2.6.32-zen4.nix b/pkgs/os-specific/linux/zen-kernel/2.6.32-zen4.nix index 78a36c73ca5..9d1f710c415 100644 --- a/pkgs/os-specific/linux/zen-kernel/2.6.32-zen4.nix +++ b/pkgs/os-specific/linux/zen-kernel/2.6.32-zen4.nix @@ -1,4 +1,4 @@ -args @ {stdenv, fetchurl, xz, runCommand, userModeLinux ? false, extraConfig ? "", +args @ {stdenv, fetchurl, runCommand, userModeLinux ? false, extraConfig ? "", kernelPatches ? [], extraMeta ? {}, features ? {}, preConfigure ? "", ...}: @@ -20,7 +20,7 @@ import ../kernel/generic.nix ( kernelPatches = [ { name = "zen4"; - patch = runCommand "2.6.32-zen4.patch" {} "${xz}/bin/lzma -d < ${ fetchurl { + patch = runCommand "2.6.32-zen4.patch" {} "lzma -d < ${ fetchurl { name = "2.6.32-zen4"; url = "http://downloads.zen-kernel.org/2.6.32/2.6.32-zen4.patch.lzma"; sha256 = "1dyp9sfigqjfqw1c94010c521bhcy1xnzp91kkhg3dwgzfpsp2k2"; diff --git a/pkgs/os-specific/linux/zen-kernel/2.6.33-zen1.nix b/pkgs/os-specific/linux/zen-kernel/2.6.33-zen1.nix index 5c1a315cb38..ab7a0059bbe 100644 --- a/pkgs/os-specific/linux/zen-kernel/2.6.33-zen1.nix +++ b/pkgs/os-specific/linux/zen-kernel/2.6.33-zen1.nix @@ -1,4 +1,4 @@ -args @ {stdenv, fetchurl, xz, runCommand, userModeLinux ? false, extraConfig ? "", +args @ {stdenv, fetchurl, runCommand, userModeLinux ? false, extraConfig ? "", kernelPatches ? [], extraMeta ? {}, features ? {}, preConfigure ? "", ...}: @@ -23,7 +23,7 @@ import ../kernel/generic.nix ( kernelPatches = [ { name = "${ZenSuffix}"; - patch = runCommand "${baseKernelVersion}-${ZenSuffix}.patch" {} "${xz}/bin/lzma -d < ${ fetchurl { + patch = runCommand "${baseKernelVersion}-${ZenSuffix}.patch" {} "lzma -d < ${ fetchurl { name = "${baseKernelVersion}-${ZenSuffix}.patch.lzma"; url = "http://downloads.zen-kernel.org/${baseKernelVersion}/${baseKernelVersion}-${ZenSuffix}.patch.lzma"; sha256 = "0a72d8allr4qi4p6hbbjh33kmcgbg84as0dfb50gsffvaj2d3kwf"; diff --git a/pkgs/servers/http/myserver/default.nix b/pkgs/servers/http/myserver/default.nix index 32526ddf65d..b6aff880e62 100644 --- a/pkgs/servers/http/myserver/default.nix +++ b/pkgs/servers/http/myserver/default.nix @@ -1,5 +1,5 @@ { fetchurl, stdenv, libgcrypt, libevent, libidn, gnutls -, libxml2, zlib, guile, texinfo, cppunit, xz, psmisc }: +, libxml2, zlib, guile, texinfo, cppunit, psmisc }: let version = "0.11"; in stdenv.mkDerivation (rec { @@ -14,7 +14,7 @@ let version = "0.11"; in [ ./disable-dns-lookup-in-chroot.patch ]; buildInputs = - [ libgcrypt libevent libidn gnutls libxml2 zlib guile texinfo xz ] + [ libgcrypt libevent libidn gnutls libxml2 zlib guile texinfo ] ++ stdenv.lib.optional doCheck cppunit; makeFlags = [ "V=1" ]; diff --git a/pkgs/servers/pulseaudio/default.nix b/pkgs/servers/pulseaudio/default.nix index 13d0af8987c..21112250597 100644 --- a/pkgs/servers/pulseaudio/default.nix +++ b/pkgs/servers/pulseaudio/default.nix @@ -3,7 +3,7 @@ , alsaLib, libsamplerate, libsndfile, speex, bluez, udev , jackaudioSupport ? false, jackaudio ? null , x11Support ? false, xlibs -, xz, json_c +, json_c }: assert jackaudioSupport -> jackaudio != null; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig gnum4 libtool intltool glib dbus avahi libsamplerate libsndfile speex alsaLib bluez udev - xz json_c + json_c #gtk gconf ] ++ stdenv.lib.optional jackaudioSupport jackaudio diff --git a/pkgs/tools/filesystems/squashfs/default.nix b/pkgs/tools/filesystems/squashfs/default.nix index a7eb9eb0a1f..2fc0befb9aa 100644 --- a/pkgs/tools/filesystems/squashfs/default.nix +++ b/pkgs/tools/filesystems/squashfs/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "0sh40r7gz81fg7ivgr7rld8spvqb6hsfvnf6gd3gbcr5b830v1rs"; }; - buildInputs = [zlib attr xz]; + buildInputs = [zlib attr]; preBuild = '' cd squashfs-tools diff --git a/pkgs/tools/graphics/pngcrush/default.nix b/pkgs/tools/graphics/pngcrush/default.nix index caa99d2c4e2..08a7e6b2c42 100644 --- a/pkgs/tools/graphics/pngcrush/default.nix +++ b/pkgs/tools/graphics/pngcrush/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libpng, xz }: +{ stdenv, fetchurl, libpng }: stdenv.mkDerivation rec { name = "pngcrush-1.7.17"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sed -i s,/usr,$out, Makefile ''; - buildInputs = [ xz libpng ]; + buildInputs = [ libpng ]; meta = { homepage = http://pmt.sourceforge.net/pngcrush; diff --git a/pkgs/tools/misc/coreutils/default.nix b/pkgs/tools/misc/coreutils/default.nix index 7a69f01dad2..597ab802d74 100644 --- a/pkgs/tools/misc/coreutils/default.nix +++ b/pkgs/tools/misc/coreutils/default.nix @@ -1,7 +1,6 @@ { stdenv, fetchurl, perl, gmp ? null , aclSupport ? false, acl ? null , selinuxSupport? false, libselinux ? null, libsepol ? null -, xz }: assert aclSupport -> acl != null; @@ -15,7 +14,7 @@ stdenv.mkDerivation rec { sha256 = "176lgw810xw84c6fz5xwhydxggkndmzggl0pxqzldbjf85vv6zl3"; }; - buildNativeInputs = [ perl xz ]; + buildNativeInputs = [ perl ]; buildInputs = [ gmp ] ++ stdenv.lib.optional aclSupport acl ++ stdenv.lib.optional selinuxSupport libselinux diff --git a/pkgs/tools/misc/grub/1.9x.nix b/pkgs/tools/misc/grub/1.9x.nix index 14a4932f100..49cc4884e63 100644 --- a/pkgs/tools/misc/grub/1.9x.nix +++ b/pkgs/tools/misc/grub/1.9x.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, xz, flex, bison, gettext, ncurses, libusb, freetype, qemu +{ fetchurl, stdenv, flex, bison, gettext, ncurses, libusb, freetype, qemu , EFIsupport ? false }: let @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { sha256 = "06q2a7bg1mbsms604a89fkdnwrc1jg9hr2mmfdmg3il39j6i827k"; }; - buildNativeInputs = [ xz flex bison ]; + buildNativeInputs = [ flex bison ]; buildInputs = [ ncurses libusb freetype gettext ] ++ stdenv.lib.optional doCheck qemu; diff --git a/pkgs/tools/misc/parted/2.3.nix b/pkgs/tools/misc/parted/2.3.nix index 52b3c4b4dcf..649def69115 100644 --- a/pkgs/tools/misc/parted/2.3.nix +++ b/pkgs/tools/misc/parted/2.3.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, devicemapper, libuuid, gettext, readline -, utillinux, xz, enableStatic ? false, hurd ? null }: +, utillinux, enableStatic ? false, hurd ? null }: stdenv.mkDerivation rec { name = "parted-2.3"; @@ -9,7 +9,6 @@ stdenv.mkDerivation rec { sha256 = "0sabj81nawcjm8ww34lxg65ka8crv3w2ab4crh8ypw5agg681836"; }; - buildNativeInputs = [ xz ]; buildInputs = [ libuuid ] ++ stdenv.lib.optional (readline != null) readline ++ stdenv.lib.optional (gettext != null) gettext diff --git a/pkgs/tools/misc/parted/default.nix b/pkgs/tools/misc/parted/default.nix index 80abefc97ad..3d217d2660c 100644 --- a/pkgs/tools/misc/parted/default.nix +++ b/pkgs/tools/misc/parted/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, devicemapper, libuuid, gettext, readline -, utillinux, xz, check, enableStatic ? false, hurd ? null }: +, utillinux, check, enableStatic ? false, hurd ? null }: stdenv.mkDerivation rec { name = "parted-3.0"; @@ -9,7 +9,6 @@ stdenv.mkDerivation rec { sha256 = "054ybvjkj1mbm4mpn1rl12jzhvqg37b0xwwr4ly1zisvzrjhi11a"; }; - buildNativeInputs = [ xz ]; buildInputs = [ libuuid ] ++ stdenv.lib.optional (readline != null) readline ++ stdenv.lib.optional (gettext != null) gettext diff --git a/pkgs/tools/misc/system-config-printer/default.nix b/pkgs/tools/misc/system-config-printer/default.nix index a7a08f29187..8923637bbdb 100644 --- a/pkgs/tools/misc/system-config-printer/default.nix +++ b/pkgs/tools/misc/system-config-printer/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, udev, intltool, pkgconfig, glib, xmlto , makeWrapper, pygobject, pygtk, docbook_xml_dtd_412, docbook_xsl , pythonDBus, libxml2, desktop_file_utils, libusb, cups, pycups -, xz, pythonPackages +, pythonPackages , withGUI ? true }: @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { }; buildInputs = - [ xz intltool pkgconfig glib udev libusb cups xmlto + [ intltool pkgconfig glib udev libusb cups xmlto libxml2 docbook_xml_dtd_412 docbook_xsl desktop_file_utils pythonPackages.python pythonPackages.wrapPython ]; diff --git a/pkgs/tools/networking/lftp/default.nix b/pkgs/tools/networking/lftp/default.nix index 1b651cab996..64e7ac50bc0 100644 --- a/pkgs/tools/networking/lftp/default.nix +++ b/pkgs/tools/networking/lftp/default.nix @@ -8,5 +8,5 @@ stdenv.mkDerivation rec { sha256 = "0v3591fknmimarzk5icm0qxdcfzfckwi2drh165vsiggmj590iyx"; }; - buildInputs = [gnutls libtasn1 pkgconfig readline zlib xz]; + buildInputs = [gnutls libtasn1 pkgconfig readline zlib]; } diff --git a/pkgs/tools/networking/modemmanager/default.nix b/pkgs/tools/networking/modemmanager/default.nix index b17894edfab..c9c975d557c 100644 --- a/pkgs/tools/networking/modemmanager/default.nix +++ b/pkgs/tools/networking/modemmanager/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl_gnome, udev, polkit, dbus_glib, ppp, intltool, pkgconfig, xz }: +{ stdenv, fetchurl_gnome, udev, polkit, dbus_glib, ppp, intltool, pkgconfig }: stdenv.mkDerivation rec { name = src.pkgname; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "0zvwrni4l21d856nq28khigrhwgrq5cc7nh45zidwjj8q7bsxiz7"; }; - buildNativeInputs = [ xz intltool pkgconfig ]; + buildNativeInputs = [ intltool pkgconfig ]; buildInputs = [ udev polkit dbus_glib ppp ]; diff --git a/pkgs/tools/networking/network-manager-applet/default.nix b/pkgs/tools/networking/network-manager-applet/default.nix index cb0ffe32159..d41b2ad0010 100644 --- a/pkgs/tools/networking/network-manager-applet/default.nix +++ b/pkgs/tools/networking/network-manager-applet/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, intltool, pkgconfig, gtk, glib, libglade , networkmanager, GConf, libnotify, gnome_keyring, dbus_glib -, polkit, xz }: +, polkit }: let pn = "network-manager-applet"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { buildInputs = [ gtk libglade networkmanager GConf libnotify gnome_keyring polkit]; - buildNativeInputs = [ intltool pkgconfig xz ]; + buildNativeInputs = [ intltool pkgconfig ]; meta = with stdenv.lib; { homepage = http://projects.gnome.org/NetworkManager/; diff --git a/pkgs/tools/networking/network-manager/pptp.nix b/pkgs/tools/networking/network-manager/pptp.nix index dbb66a43d38..3abea68366d 100644 --- a/pkgs/tools/networking/network-manager/pptp.nix +++ b/pkgs/tools/networking/network-manager/pptp.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, networkmanager, pptp, ppp, xz, intltool, pkgconfig }: +{ stdenv, fetchurl, networkmanager, pptp, ppp, intltool, pkgconfig }: let pn = "networkmanager-pptp"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { buildInputs = [ networkmanager pptp ppp ]; - buildNativeInputs = [ xz intltool pkgconfig ]; + buildNativeInputs = [ intltool pkgconfig ]; configureFlags = "--without-gnome --disable-nls"; } diff --git a/pkgs/tools/package-management/rpm/default.nix b/pkgs/tools/package-management/rpm/default.nix index 50f495ec8a6..f9c942f333e 100644 --- a/pkgs/tools/package-management/rpm/default.nix +++ b/pkgs/tools/package-management/rpm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cpio, zlib, bzip2, xz, file, elfutils, nspr, nss, popt, db4 }: +{ stdenv, fetchurl, cpio, zlib, bzip2, file, elfutils, nspr, nss, popt, db4 }: stdenv.mkDerivation rec { name = "rpm-4.7.2"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha1 = "07b90f653775329ea726ce0005c4c82f56167ca0"; }; - buildInputs = [ cpio zlib bzip2 xz file nspr nss popt db4 ]; + buildInputs = [ cpio zlib bzip2 file nspr nss popt db4 ]; # Note: we don't add elfutils to buildInputs, since it provides a # bad `ld' and other stuff. diff --git a/pkgs/tools/text/gnugrep/default.nix b/pkgs/tools/text/gnugrep/default.nix index 957b70f1e58..8368edef656 100644 --- a/pkgs/tools/text/gnugrep/default.nix +++ b/pkgs/tools/text/gnugrep/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pcre, libiconv ? null, xz }: +{ stdenv, fetchurl, pcre, libiconv ? null }: let version = "2.10"; in @@ -10,7 +10,7 @@ stdenv.mkDerivation ({ sha256 = "1cvsqyfzk1p38fcaav22dn76fkd02g7bjnqna6vrpk9vy9rnfybc"; }; - buildInputs = [ pcre xz ] + buildInputs = [ pcre ] ++ (stdenv.lib.optional (libiconv != null) libiconv); doCheck = if stdenv.isDarwin then false else true; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fc6424ae60d..a4cc45f53bb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6945,20 +6945,14 @@ let i810switch = callPackage ../os-specific/linux/i810switch { }; - icecat3 = lowPrio (import ../applications/networking/browsers/icecat-3 { - inherit fetchurl stdenv xz pkgconfig perl zip libjpeg libpng zlib cairo - python dbus dbus_glib freetype fontconfig bzip2 xlibs alsaLib libnotify - wirelesstools; + icecat3 = lowPrio (callPackage ../applications/networking/browsers/icecat-3 { inherit (gnome) libIDL libgnomeui gnome_vfs gtk pango; inherit (xlibs) pixman; inherit (pythonPackages) ply; }); - icecatXulrunner3 = lowPrio (import ../applications/networking/browsers/icecat-3 { + icecatXulrunner3 = lowPrio (callPackage ../applications/networking/browsers/icecat-3 { application = "xulrunner"; - inherit fetchurl stdenv xz pkgconfig perl zip libjpeg libpng zlib cairo - python dbus dbus_glib freetype fontconfig bzip2 xlibs alsaLib libnotify - wirelesstools; inherit (gnome) libIDL libgnomeui gnome_vfs gtk pango; inherit (xlibs) pixman; inherit (pythonPackages) ply; From fc89eefa5092d5042dd61f028991e30b67ce555b Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 19 Jan 2012 10:24:26 +0000 Subject: [PATCH 047/197] * Seems that bash 3.2 on Mac OS X doesn't know the \e escape, so use \033 instead. svn path=/nixpkgs/branches/stdenv-updates/; revision=31680 --- pkgs/stdenv/generic/setup.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh index 660ae0c1490..a06b7205826 100644 --- a/pkgs/stdenv/generic/setup.sh +++ b/pkgs/stdenv/generic/setup.sh @@ -394,12 +394,12 @@ nestingLevel=0 startNest() { nestingLevel=$(($nestingLevel + 1)) - echo -en "\e[$1p" + echo -en "\033[$1p" } stopNest() { nestingLevel=$(($nestingLevel - 1)) - echo -en "\e[q" + echo -en "\033[q" } header() { From 0e6fa321bba5746c2f54cc2a75dd999e6af00a92 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 19 Jan 2012 13:47:26 +0000 Subject: [PATCH 048/197] * Don't use the "replace-literal" command in stdenv; instead use bash's pattern replacement feature. "replace-literal" is an uncommon command so it was a headache during the bootstrap. svn path=/nixpkgs/branches/stdenv-updates/; revision=31681 --- pkgs/stdenv/common-path.nix | 1 - pkgs/stdenv/generic/builder.sh | 2 -- pkgs/stdenv/generic/setup.sh | 22 +++++++++------------- pkgs/stdenv/linux/make-bootstrap-tools.nix | 1 - 4 files changed, 9 insertions(+), 17 deletions(-) diff --git a/pkgs/stdenv/common-path.nix b/pkgs/stdenv/common-path.nix index c2e5dedfd22..cff6fd0a3ee 100644 --- a/pkgs/stdenv/common-path.nix +++ b/pkgs/stdenv/common-path.nix @@ -11,6 +11,5 @@ pkgs.gnumake pkgs.bash pkgs.patch - pkgs.replace pkgs.xz ] diff --git a/pkgs/stdenv/generic/builder.sh b/pkgs/stdenv/generic/builder.sh index 23cc2a0775f..01e86ce3998 100644 --- a/pkgs/stdenv/generic/builder.sh +++ b/pkgs/stdenv/generic/builder.sh @@ -16,8 +16,6 @@ done mkdir $out -# Can't use substitute() here, because replace may not have been -# built yet (in the bootstrap). sed \ -e "s^@preHook@^$_preHook^g" \ -e "s^@postHook@^$_postHook^g" \ diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh index a06b7205826..9ea97c1bf58 100644 --- a/pkgs/stdenv/generic/setup.sh +++ b/pkgs/stdenv/generic/setup.sh @@ -315,43 +315,39 @@ substitute() { local output="$2" local -a params=("$@") - local -a args=() local n p pattern replacement varName + local content="$(cat $input)" + for ((n = 2; n < ${#params[*]}; n += 1)); do p=${params[$n]} - if test "$p" = "--replace"; then + if [ "$p" = --replace ]; then pattern="${params[$((n + 1))]}" replacement="${params[$((n + 2))]}" n=$((n + 2)) fi - if test "$p" = "--subst-var"; then + if [ "$p" = --subst-var ]; then varName="${params[$((n + 1))]}" pattern="@$varName@" replacement="${!varName}" n=$((n + 1)) fi - if test "$p" = "--subst-var-by"; then + if [ "$p" = --subst-var-by ]; then pattern="@${params[$((n + 1))]}@" replacement="${params[$((n + 2))]}" n=$((n + 2)) fi - if test ${#args[@]} != 0; then - args[${#args[@]}]="-a" - fi - args[${#args[@]}]="$pattern" - args[${#args[@]}]="$replacement" + content="${content//"$pattern"/$replacement}" done - replace-literal -e -s -- "${args[@]}" < "$input" > "$output".tmp - if test -x "$output"; then - chmod +x "$output".tmp - fi + # !!! This doesn't work properly if $content is "-n". + echo -n "$content" > "$output".tmp + if [ -x "$output" ]; then chmod +x "$output".tmp; fi mv -f "$output".tmp "$output" } diff --git a/pkgs/stdenv/linux/make-bootstrap-tools.nix b/pkgs/stdenv/linux/make-bootstrap-tools.nix index a780574539f..9116b222569 100644 --- a/pkgs/stdenv/linux/make-bootstrap-tools.nix +++ b/pkgs/stdenv/linux/make-bootstrap-tools.nix @@ -133,7 +133,6 @@ rec { cp -d ${gnumake}/bin/* $out/bin cp -d ${patch}/bin/* $out/bin cp ${patchelf}/bin/* $out/bin - cp ${replace}/bin/* $out/bin cp -d ${gnugrep.pcre}/lib/libpcre*.so* $out/lib # needed by grep From 3fa83e15e7e6610e14bb141cf2d3f9ee5c371359 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 19 Jan 2012 13:56:57 +0000 Subject: [PATCH 049/197] * Missed a reference to xz. svn path=/nixpkgs/branches/stdenv-updates/; revision=31682 --- pkgs/desktops/kde-4.8/kdelibs.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/desktops/kde-4.8/kdelibs.nix b/pkgs/desktops/kde-4.8/kdelibs.nix index 7f0ac15d800..bb6e9a84665 100644 --- a/pkgs/desktops/kde-4.8/kdelibs.nix +++ b/pkgs/desktops/kde-4.8/kdelibs.nix @@ -8,10 +8,9 @@ kde { buildInputs = - [ - acl attr attica avahi bzip2 enchant fam getopt giflib herqq jasper + [ acl attr attica avahi bzip2 enchant fam getopt giflib herqq jasper libdbusmenu_qt libXScrnSaver libxslt pcre polkit_qt_1 qca2 - shared_desktop_ontologies udev xz libxml2 libjpeg kerberos + shared_desktop_ontologies udev libxml2 libjpeg kerberos ]; propagatedBuildInputs = [ qt4 soprano strigi phonon ]; From 0e353fdd5aeb71728c71569ea57c62f02ac2407e Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 19 Jan 2012 14:55:12 +0000 Subject: [PATCH 050/197] * Don't use substite() here, because the bash binary in the bootstrap tools (4.1.2) seems to have performance problems doing pattern substitutions on large strings (it takes several minutes on binutils' Makefile.in). Bash 4.2 seems to be fine. svn path=/nixpkgs/branches/stdenv-updates/; revision=31698 --- pkgs/development/tools/misc/binutils/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/misc/binutils/default.nix b/pkgs/development/tools/misc/binutils/default.nix index 526bc45f8bc..4b24c25230a 100644 --- a/pkgs/development/tools/misc/binutils/default.nix +++ b/pkgs/development/tools/misc/binutils/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { # Use symlinks instead of hard links to save space ("strip" in the # fixup phase strips each hard link separately). for i in binutils/Makefile.in gas/Makefile.in ld/Makefile.in; do - substituteInPlace $i --replace 'ln ' 'ln -s ' + set -i "$i" 's|ln |ln -s |' done ''; From 26affd7238ad8ae40ba0b02975a785546c51af8e Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 19 Jan 2012 15:02:47 +0000 Subject: [PATCH 051/197] * Doh! svn path=/nixpkgs/branches/stdenv-updates/; revision=31699 --- pkgs/development/tools/misc/binutils/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/misc/binutils/default.nix b/pkgs/development/tools/misc/binutils/default.nix index 4b24c25230a..41ce4684962 100644 --- a/pkgs/development/tools/misc/binutils/default.nix +++ b/pkgs/development/tools/misc/binutils/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { # Use symlinks instead of hard links to save space ("strip" in the # fixup phase strips each hard link separately). for i in binutils/Makefile.in gas/Makefile.in ld/Makefile.in; do - set -i "$i" 's|ln |ln -s |' + sed -i "$i" -e 's|ln |ln -s |' done ''; From 0d71e75222949f4e4a5ea8af8ac4666c3bb80579 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 19 Jan 2012 15:29:20 +0000 Subject: [PATCH 052/197] * Get rid of params1-5, they're obsolete. svn path=/nixpkgs/branches/stdenv-updates/; revision=31700 --- pkgs/stdenv/generic/builder.sh | 21 +++------------------ pkgs/stdenv/generic/default.nix | 4 ---- pkgs/stdenv/generic/setup.sh | 11 +++-------- pkgs/stdenv/linux/default.nix | 1 - 4 files changed, 6 insertions(+), 31 deletions(-) diff --git a/pkgs/stdenv/generic/builder.sh b/pkgs/stdenv/generic/builder.sh index 01e86ce3998..82620f96ef5 100644 --- a/pkgs/stdenv/generic/builder.sh +++ b/pkgs/stdenv/generic/builder.sh @@ -1,32 +1,17 @@ -p1=$param1 -p2=$param2 -p3=$param3 -p4=$param4 -p5=$param5 -_preHook="$preHook" -_postHook="$postHook" -preHook= -postHook= - export PATH= for i in $initialPath; do - if test "$i" = /; then i=; fi + if [ "$i" = / ]; then i=; fi PATH=$PATH${PATH:+:}$i/bin done mkdir $out sed \ - -e "s^@preHook@^$_preHook^g" \ - -e "s^@postHook@^$_postHook^g" \ + -e "s^@preHook@^$preHook^g" \ + -e "s^@postHook@^$postHook^g" \ -e "s^@initialPath@^$initialPath^g" \ -e "s^@gcc@^$gcc^g" \ -e "s^@shell@^$shell^g" \ - -e "s^@param1@^$p1^g" \ - -e "s^@param2@^$p2^g" \ - -e "s^@param3@^$p3^g" \ - -e "s^@param4@^$p4^g" \ - -e "s^@param5@^$p5^g" \ < "$setup" > "$out/setup" # Allow the user to install stdenv using nix-env and get the packages diff --git a/pkgs/stdenv/generic/default.nix b/pkgs/stdenv/generic/default.nix index b26bda91695..b3f6c16eb02 100644 --- a/pkgs/stdenv/generic/default.nix +++ b/pkgs/stdenv/generic/default.nix @@ -1,5 +1,4 @@ { system, name, preHook ? null, postHook ? null, initialPath, gcc, shell -, param1 ? "", param2 ? "", param3 ? "", param4 ? "", param5 ? "" , extraAttrs ? {}, overrides ? (pkgs: {}) , # The `fetchurl' to use for downloading curl and its dependencies @@ -27,9 +26,6 @@ let inherit preHook postHook initialPath gcc shell; - # TODO: make this more elegant. - inherit param1 param2 param3 param4 param5; - propagatedUserEnvPkgs = [gcc] ++ lib.filter lib.isDerivation initialPath; } diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh index 9ea97c1bf58..ee1bd51caa9 100644 --- a/pkgs/stdenv/generic/setup.sh +++ b/pkgs/stdenv/generic/setup.sh @@ -106,20 +106,15 @@ fi # Execute the pre-hook. export SHELL=@shell@ -if test -z "$shell"; then +if [ -z "$shell" ]; then export shell=@shell@ fi -param1=@param1@ -param2=@param2@ -param3=@param3@ -param4=@param4@ -param5=@param5@ -if test -n "@preHook@"; then source @preHook@; fi +if [ -n "@preHook@" ]; then source @preHook@; fi runHook preHook # Check that the pre-hook initialised SHELL. -if test -z "$SHELL"; then echo "SHELL not set"; exit 1; fi +if [ -z "$SHELL" ]; then echo "SHELL not set"; exit 1; fi # Hack: run gcc's setup hook. diff --git a/pkgs/stdenv/linux/default.nix b/pkgs/stdenv/linux/default.nix index 900b6253c71..9937fd5db6e 100644 --- a/pkgs/stdenv/linux/default.nix +++ b/pkgs/stdenv/linux/default.nix @@ -82,7 +82,6 @@ rec { import ../generic { inherit system; name = "stdenv-linux-boot"; - param1 = bootstrapTools; preHook = builtins.toFile "prehook.sh" '' # Don't patch #!/interpreter because it leads to retained From b31df26cea7b48afbc0624019f7d83bff9123d70 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 19 Jan 2012 15:31:56 +0000 Subject: [PATCH 053/197] * Remove an unnecessary check. svn path=/nixpkgs/branches/stdenv-updates/; revision=31701 --- pkgs/stdenv/generic/setup.sh | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh index ee1bd51caa9..5557e34cd0d 100644 --- a/pkgs/stdenv/generic/setup.sh +++ b/pkgs/stdenv/generic/setup.sh @@ -79,10 +79,6 @@ addToSearchPath() { set -e -# Check that the directory pointed by HOME, usually '/homeless-shelter', -# does not exist, as it may be a good source for impurities. -! test -e $HOME - test -z $NIX_GCC && NIX_GCC=@gcc@ From 6208059079571059cdf462942584efa88f37b52e Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 19 Jan 2012 15:39:12 +0000 Subject: [PATCH 054/197] * The postHook substitution is not used anywhere, so get rid of it. svn path=/nixpkgs/branches/stdenv-updates/; revision=31702 --- pkgs/misc/my-env/default.nix | 2 -- pkgs/stdenv/generic/builder.sh | 1 - pkgs/stdenv/generic/default.nix | 4 ++-- pkgs/stdenv/generic/setup.sh | 5 +---- 4 files changed, 3 insertions(+), 9 deletions(-) diff --git a/pkgs/misc/my-env/default.nix b/pkgs/misc/my-env/default.nix index 76080d8e114..4e63cca439b 100644 --- a/pkgs/misc/my-env/default.nix +++ b/pkgs/misc/my-env/default.nix @@ -48,8 +48,6 @@ mkDerivation { phases = [ "buildPhase" ]; setupNew = substituteAll { src = ../../stdenv/generic/setup.sh; - preHook=""; - postHook=""; initialPath= (import ../../stdenv/common-path.nix) { inherit pkgs; }; gcc = stdenv.gcc; }; diff --git a/pkgs/stdenv/generic/builder.sh b/pkgs/stdenv/generic/builder.sh index 82620f96ef5..6895d104309 100644 --- a/pkgs/stdenv/generic/builder.sh +++ b/pkgs/stdenv/generic/builder.sh @@ -8,7 +8,6 @@ mkdir $out sed \ -e "s^@preHook@^$preHook^g" \ - -e "s^@postHook@^$postHook^g" \ -e "s^@initialPath@^$initialPath^g" \ -e "s^@gcc@^$gcc^g" \ -e "s^@shell@^$shell^g" \ diff --git a/pkgs/stdenv/generic/default.nix b/pkgs/stdenv/generic/default.nix index b3f6c16eb02..b0cee743f8c 100644 --- a/pkgs/stdenv/generic/default.nix +++ b/pkgs/stdenv/generic/default.nix @@ -1,4 +1,4 @@ -{ system, name, preHook ? null, postHook ? null, initialPath, gcc, shell +{ system, name, preHook ? null, initialPath, gcc, shell , extraAttrs ? {}, overrides ? (pkgs: {}) , # The `fetchurl' to use for downloading curl and its dependencies @@ -24,7 +24,7 @@ let setup = setupScript; - inherit preHook postHook initialPath gcc shell; + inherit preHook initialPath gcc shell; propagatedUserEnvPkgs = [gcc] ++ lib.filter lib.isDerivation initialPath; diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh index 5557e34cd0d..aa5f01a75c3 100644 --- a/pkgs/stdenv/generic/setup.sh +++ b/pkgs/stdenv/generic/setup.sh @@ -102,9 +102,7 @@ fi # Execute the pre-hook. export SHELL=@shell@ -if [ -z "$shell" ]; then - export shell=@shell@ -fi +if [ -z "$shell" ]; then export shell=@shell@; fi if [ -n "@preHook@" ]; then source @preHook@; fi runHook preHook @@ -844,7 +842,6 @@ genericBuild() { # Execute the post-hook. -if test -n "@postHook@"; then source @postHook@; fi runHook postHook From ee45e160b1fc2a8d32233bd7647e5e5fb72a486a Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 19 Jan 2012 15:56:17 +0000 Subject: [PATCH 055/197] * Prepend the "prehook" rather than sourcing it. * Don't call xargs with the -r flag in the Darwin bootstrap. svn path=/nixpkgs/branches/stdenv-updates/; revision=31703 --- pkgs/stdenv/generic/builder.sh | 9 +++++---- pkgs/stdenv/generic/default.nix | 2 +- pkgs/stdenv/generic/setup.sh | 2 +- pkgs/stdenv/linux/default.nix | 12 ++++++------ pkgs/stdenv/linux/scripts/prehook.sh | 3 --- pkgs/stdenv/native/default.nix | 23 ++++++++++++----------- pkgs/stdenv/nix/default.nix | 16 +++++++++++++++- pkgs/stdenv/nix/prehook.sh | 10 ---------- 8 files changed, 40 insertions(+), 37 deletions(-) delete mode 100644 pkgs/stdenv/linux/scripts/prehook.sh delete mode 100644 pkgs/stdenv/nix/prehook.sh diff --git a/pkgs/stdenv/generic/builder.sh b/pkgs/stdenv/generic/builder.sh index 6895d104309..98b90144611 100644 --- a/pkgs/stdenv/generic/builder.sh +++ b/pkgs/stdenv/generic/builder.sh @@ -6,12 +6,13 @@ done mkdir $out -sed \ - -e "s^@preHook@^$preHook^g" \ +echo "$preHook" > $out/setup +cat "$setup" >> $out/setup + +sed -i "$out/setup" \ -e "s^@initialPath@^$initialPath^g" \ -e "s^@gcc@^$gcc^g" \ - -e "s^@shell@^$shell^g" \ - < "$setup" > "$out/setup" + -e "s^@shell@^$shell^g" # Allow the user to install stdenv using nix-env and get the packages # in stdenv. diff --git a/pkgs/stdenv/generic/default.nix b/pkgs/stdenv/generic/default.nix index b0cee743f8c..91e6af01578 100644 --- a/pkgs/stdenv/generic/default.nix +++ b/pkgs/stdenv/generic/default.nix @@ -1,4 +1,4 @@ -{ system, name, preHook ? null, initialPath, gcc, shell +{ system, name, preHook ? "", initialPath, gcc, shell , extraAttrs ? {}, overrides ? (pkgs: {}) , # The `fetchurl' to use for downloading curl and its dependencies diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh index aa5f01a75c3..1ec05bc2613 100644 --- a/pkgs/stdenv/generic/setup.sh +++ b/pkgs/stdenv/generic/setup.sh @@ -103,7 +103,6 @@ fi # Execute the pre-hook. export SHELL=@shell@ if [ -z "$shell" ]; then export shell=@shell@; fi -if [ -n "@preHook@" ]; then source @preHook@; fi runHook preHook @@ -174,6 +173,7 @@ for i in $buildNativeInputs $propagatedBuildNativeInputs; do findInputs $i nativePkgs propagated-build-native-inputs done + # Set the relevant environment variables to point to the build inputs # found above. addToNativeEnv() { diff --git a/pkgs/stdenv/linux/default.nix b/pkgs/stdenv/linux/default.nix index 9937fd5db6e..90ce61b25c8 100644 --- a/pkgs/stdenv/linux/default.nix +++ b/pkgs/stdenv/linux/default.nix @@ -55,10 +55,10 @@ rec { builder = bootstrapFiles.sh; - args = if (system == "armv5tel-linux") then - ([ ./scripts/unpack-bootstrap-tools-arm.sh ]) - else - ([ ./scripts/unpack-bootstrap-tools.sh ]); + args = + if system == "armv5tel-linux" + then [ ./scripts/unpack-bootstrap-tools-arm.sh ] + else [ ./scripts/unpack-bootstrap-tools.sh ]; inherit (bootstrapFiles) bzip2 mkdir curl cpio; @@ -82,7 +82,7 @@ rec { import ../generic { inherit system; name = "stdenv-linux-boot"; - preHook = builtins.toFile "prehook.sh" + preHook = '' # Don't patch #!/interpreter because it leads to retained # dependencies on the bootstrapTools in the final stdenv. @@ -263,7 +263,7 @@ rec { inherit system; - preHook = builtins.toFile "prehook.sh" commonPreHook; + preHook = commonPreHook; initialPath = ((import ../common-path.nix) {pkgs = stdenvLinuxBoot4Pkgs;}) diff --git a/pkgs/stdenv/linux/scripts/prehook.sh b/pkgs/stdenv/linux/scripts/prehook.sh deleted file mode 100644 index 29c02e2eaf2..00000000000 --- a/pkgs/stdenv/linux/scripts/prehook.sh +++ /dev/null @@ -1,3 +0,0 @@ -export NIX_ENFORCE_PURITY=1 - -havePatchELF=1 diff --git a/pkgs/stdenv/native/default.nix b/pkgs/stdenv/native/default.nix index 1f3fa69d51b..3319a0d9271 100644 --- a/pkgs/stdenv/native/default.nix +++ b/pkgs/stdenv/native/default.nix @@ -11,22 +11,23 @@ rec { (if system == "i686-netbsd" then [ "/usr/pkg" ] else []) ++ ["/" "/usr" "/usr/local"]; - prehookBase = builtins.toFile "prehook-base.sh" '' + prehookBase = '' # Disable purity tests; it's allowed (even needed) to link to # libraries outside the Nix store (like the C library). export NIX_ENFORCE_PURITY= ''; - prehookDarwin = builtins.toFile "prehook-darwin.sh" '' - source ${prehookBase} + prehookDarwin = '' + ${prehookBase} export NIX_DONT_SET_RPATH=1 export NIX_NO_SELF_RPATH=1 dontFixLibtool=1 stripAllFlags=" " # the Darwin "strip" command doesn't know "-s" + xargsFlags=" " ''; - prehookFreeBSD = builtins.toFile "prehook-freebsd.sh" '' - source ${prehookBase} + prehookFreeBSD = '' + ${prehookBase} alias make=gmake alias tar=gtar @@ -38,8 +39,8 @@ rec { export NIX_GCC_NEEDS_GREP=1 ''; - prehookOpenBSD = builtins.toFile "prehook-openbsd.sh" '' - source ${prehookBase} + prehookOpenBSD = '' + ${prehookBase} alias make=gmake alias grep=ggrep @@ -55,8 +56,8 @@ rec { export NIX_GCC_NEEDS_GREP=1 ''; - prehookNetBSD = builtins.toFile "prehook-netbsd.sh" '' - source ${prehookBase} + prehookNetBSD = '' + ${prehookBase} alias make=gmake alias sed=gsed @@ -68,8 +69,8 @@ rec { export NIX_GCC_NEEDS_GREP=1 ''; - prehookCygwin = builtins.toFile "prehook-cygwin.sh" '' - source ${prehookBase} + prehookCygwin = '' + ${prehookBase} if test -z "$cygwinConfigureEnableShared"; then export configureFlags="$configureFlags --disable-shared" diff --git a/pkgs/stdenv/nix/default.nix b/pkgs/stdenv/nix/default.nix index 5b1b2af8285..b7411290f9f 100644 --- a/pkgs/stdenv/nix/default.nix +++ b/pkgs/stdenv/nix/default.nix @@ -2,7 +2,21 @@ import ../generic { name = "stdenv-nix"; - preHook = ./prehook.sh; + + preHook = + '' + export NIX_ENFORCE_PURITY=1 + export NIX_IGNORE_LD_THROUGH_GCC=1 + + if [ "$system" = "i686-darwin" -o "$system" = "powerpc-darwin" -o "$system" = "x86_64-darwin" ]; then + export NIX_DONT_SET_RPATH=1 + export NIX_NO_SELF_RPATH=1 + dontFixLibtool=1 + stripAllFlags=" " # the Darwin "strip" command doesn't know "-s" + xargsFlags=" " + fi + ''; + initialPath = (import ../common-path.nix) {pkgs = pkgs;}; system = stdenv.system; diff --git a/pkgs/stdenv/nix/prehook.sh b/pkgs/stdenv/nix/prehook.sh deleted file mode 100644 index ea80355f6bb..00000000000 --- a/pkgs/stdenv/nix/prehook.sh +++ /dev/null @@ -1,10 +0,0 @@ -export NIX_ENFORCE_PURITY=1 -export NIX_IGNORE_LD_THROUGH_GCC=1 - -if test "$system" = "i686-darwin" -o "$system" = "powerpc-darwin" -o "$system" = "x86_64-darwin"; then - export NIX_DONT_SET_RPATH=1 - export NIX_NO_SELF_RPATH=1 - dontFixLibtool=1 - stripAllFlags=" " # the Darwin "strip" command doesn't know "-s" - xargsFlags=" " -fi From 698c4d296b569ab535dcbe7374c1d371507d1cc3 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 19 Jan 2012 16:14:09 +0000 Subject: [PATCH 056/197] * "test" -> "[ ... ]" (style cleanup). svn path=/nixpkgs/branches/stdenv-updates/; revision=31704 --- pkgs/stdenv/generic/setup.sh | 140 +++++++++++++++++------------------ 1 file changed, 70 insertions(+), 70 deletions(-) diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh index 1ec05bc2613..a967f81ece9 100644 --- a/pkgs/stdenv/generic/setup.sh +++ b/pkgs/stdenv/generic/setup.sh @@ -19,7 +19,7 @@ exitHandler() { closeNest - if test -n "$showBuildStats"; then + if [ -n "$showBuildStats" ]; then times > "$NIX_BUILD_TOP/.times" local -a times=($(cat "$NIX_BUILD_TOP/.times")) # Print the following statistics: @@ -30,14 +30,14 @@ exitHandler() { echo "build time elapsed: " ${times[*]} fi - if test $exitCode != 0; then + if [ $exitCode != 0 ]; then runHook failureHook # If the builder had a non-zero exit code and # $succeedOnFailure is set, create the file # `$out/nix-support/failed' to signal failure, and exit # normally. Otherwise, return the original exit code. - if test -n "$succeedOnFailure"; then + if [ -n "$succeedOnFailure" ]; then echo "build failed with exit code $exitCode (ignored)" mkdir -p "$out/nix-support" echo -n $exitCode > "$out/nix-support/failed" @@ -79,7 +79,7 @@ addToSearchPath() { set -e -test -z $NIX_GCC && NIX_GCC=@gcc@ +[ -z $NIX_GCC ] && NIX_GCC=@gcc@ # Wildcard expansions that don't match should expand to an empty list. @@ -91,11 +91,11 @@ shopt -s nullglob # Set up the initial path. PATH= for i in $NIX_GCC @initialPath@; do - if test "$i" = /; then i=; fi + if [ "$i" = / ]; then i=; fi addToSearchPath PATH $i/bin done -if test "$NIX_DEBUG" = "1"; then +if [ "$NIX_DEBUG" = 1 ]; then echo "initial path: $PATH" fi @@ -113,7 +113,7 @@ if [ -z "$SHELL" ]; then echo "SHELL not set"; exit 1; fi # Hack: run gcc's setup hook. envHooks=() crossEnvHooks=() -if test -f $NIX_GCC/nix-support/setup-hook; then +if [ -f $NIX_GCC/nix-support/setup-hook ]; then source $NIX_GCC/nix-support/setup-hook fi @@ -122,7 +122,7 @@ fi ensureDir() { local dir for dir in "$@"; do - if ! test -x "$dir"; then mkdir -p "$dir"; fi + if ! [ -x "$dir" ]; then mkdir -p "$dir"; fi done } @@ -152,11 +152,11 @@ findInputs() { eval $var="'${!var} $pkg '" - if test -f $pkg/nix-support/setup-hook; then + if [ -f $pkg/nix-support/setup-hook ]; then source $pkg/nix-support/setup-hook fi - if test -f $pkg/nix-support/$propagatedBuildInputsFile; then + if [ -f $pkg/nix-support/$propagatedBuildInputsFile ]; then for i in $(cat $pkg/nix-support/$propagatedBuildInputsFile); do findInputs $i $var $propagatedBuildInputsFile done @@ -179,7 +179,7 @@ done addToNativeEnv() { local pkg=$1 - if test -d $1/bin; then + if [ -d $1/bin ]; then addToSearchPath _PATH $1/bin fi @@ -199,7 +199,7 @@ addToCrossEnv() { # Some programs put important build scripts (freetype-config and similar) # into their hostDrv bin path. Intentionally these should go after # the nativePkgs in PATH. - if test -d $1/bin; then + if [ -d $1/bin ]; then addToSearchPath _PATH $1/bin fi @@ -215,12 +215,12 @@ done # Add the output as an rpath. -if test "$NIX_NO_SELF_RPATH" != "1"; then +if [ "$NIX_NO_SELF_RPATH" != 1 ]; then export NIX_LDFLAGS="-rpath $out/lib $NIX_LDFLAGS" - if test -n "$NIX_LIB64_IN_SELF_RPATH"; then + if [ -n "$NIX_LIB64_IN_SELF_RPATH" ]; then export NIX_LDFLAGS="-rpath $out/lib64 $NIX_LDFLAGS" fi - if test -n "$NIX_LIB32_IN_SELF_RPATH"; then + if [ -n "$NIX_LIB32_IN_SELF_RPATH" ]; then export NIX_LDFLAGS="-rpath $out/lib32 $NIX_LDFLAGS" fi fi @@ -235,17 +235,17 @@ export TZ=UTC # Set the prefix. This is generally $out, but it can be overriden, # for instance if we just want to perform a test build/install to a # temporary location and write a build report to $out. -if test -z "$prefix"; then +if [ -z "$prefix" ]; then prefix="$out"; fi -if test "$useTempPrefix" = "1"; then +if [ "$useTempPrefix" = 1 ]; then prefix="$NIX_BUILD_TOP/tmp_prefix"; fi PATH=$_PATH${_PATH:+:}$PATH -if test "$NIX_DEBUG" = "1"; then +if [ "$NIX_DEBUG" = 1 ]; then echo "final path: $PATH" fi @@ -258,9 +258,9 @@ export NIX_INDENT_MAKE=1 # means that we're supposed to try and auto-detect the number of # available CPU cores at run-time. -if test -z "${NIX_BUILD_CORES:-}"; then +if [ -z "${NIX_BUILD_CORES:-}" ]; then NIX_BUILD_CORES="1" -elif test "$NIX_BUILD_CORES" -le 0; then +elif [ "$NIX_BUILD_CORES" -le 0 ]; then NIX_BUILD_CORES=$(nproc 2>/dev/null || true) if expr >/dev/null 2>&1 "$NIX_BUILD_CORES" : "^[0-9][0-9]*$"; then : @@ -281,13 +281,13 @@ stripDirs() { local dirsNew= for d in ${dirs}; do - if test -d "$prefix/$d"; then + if [ -d "$prefix/$d" ]; then dirsNew="${dirsNew} $prefix/$d " fi done dirs=${dirsNew} - if test -n "${dirs}"; then + if [ -n "${dirs}" ]; then header "stripping (with flags $stripFlags) in $dirs" find $dirs -type f -print0 | xargs -0 ${xargsFlags:--r} strip $stripFlags || true stopNest @@ -354,7 +354,7 @@ substituteAll() { # Select all environment variables that start with a lowercase character. for envVar in $(env | sed "s/^[^a-z].*//" | sed "s/^\([^=]*\)=.*/\1/"); do - if test "$NIX_DEBUG" = "1"; then + if [ "$NIX_DEBUG" = "1" ]; then echo "$envVar -> ${!envVar}" fi args="$args --subst-var $envVar" @@ -395,7 +395,7 @@ header() { # Make sure that even when we exit abnormally, the original nesting # level is properly restored. closeNest() { - while test $nestingLevel -gt 0; do + while [ $nestingLevel -gt 0 ]; do stopNest done } @@ -407,7 +407,7 @@ closeNest() { # then go to the build directory and source in `env-vars' to reproduce # the environment used for building. dumpVars() { - if test "$noDumpEnvVars" != "1"; then + if [ "$noDumpEnvVars" != 1 ]; then export > "$NIX_BUILD_TOP/env-vars" fi } @@ -439,11 +439,11 @@ unpackFile() { unzip $curSrc ;; *) - if test -d "$curSrc"; then + if [ -d "$curSrc" ]; then stripHash $curSrc cp -prvd $curSrc $strippedName else - if test -z "$unpackCmd"; then + if [ -z "$unpackCmd" ]; then echo "source archive $curSrc has unknown type" exit 1 fi @@ -459,8 +459,8 @@ unpackFile() { unpackPhase() { runHook preUnpack - if test -z "$srcs"; then - if test -z "$src"; then + if [ -z "$srcs" ]; then + if [ -z "$src" ]; then echo 'variable $src or $srcs should point to the source' exit 1 fi @@ -473,7 +473,7 @@ unpackPhase() { # it's rather hacky. local dirsBefore="" for i in *; do - if test -d "$i"; then + if [ -d "$i" ]; then dirsBefore="$dirsBefore $i " fi done @@ -484,17 +484,17 @@ unpackPhase() { done # Find the source directory. - if test -n "$setSourceRoot"; then + if [ -n "$setSourceRoot" ]; then runHook setSourceRoot - elif test -z "$sourceRoot"; then + elif [ -z "$sourceRoot" ]; then sourceRoot= for i in *; do - if test -d "$i"; then + if [ -d "$i" ]; then case $dirsBefore in *\ $i\ *) ;; *) - if test -n "$sourceRoot"; then + if [ -n "$sourceRoot" ]; then echo "unpacker produced multiple directories" exit 1 fi @@ -505,7 +505,7 @@ unpackPhase() { done fi - if test -z "$sourceRoot"; then + if [ -z "$sourceRoot" ]; then echo "unpacker appears to have produced no directories" exit 1 fi @@ -515,7 +515,7 @@ unpackPhase() { # By default, add write permission to the sources. This is often # necessary when sources have been copied from other store # locations. - if test "$dontMakeSourcesWritable" != 1; then + if [ "$dontMakeSourcesWritable" != 1 ]; then chmod -R u+w "$sourceRoot" fi @@ -526,7 +526,7 @@ unpackPhase() { patchPhase() { runHook prePatch - if test -z "$patchPhase" -a -z "$patches"; then return; fi + if [ -z "$patchPhase" -a -z "$patches" ]; then return; fi for i in $patches; do header "applying patch $i" 3 @@ -558,34 +558,34 @@ fixLibtool() { configurePhase() { runHook preConfigure - if test -z "$configureScript"; then + if [ -z "$configureScript" ]; then configureScript=./configure - if ! test -x $configureScript; then + if ! [ -x $configureScript ]; then echo "no configure script, doing nothing" return fi fi - if test -z "$dontFixLibtool"; then + if [ -z "$dontFixLibtool" ]; then for i in $(find . -name "ltmain.sh"); do echo "fixing libtool script $i" fixLibtool $i done fi - if test -z "$dontAddPrefix"; then + if [ -z "$dontAddPrefix" ]; then configureFlags="${prefixKey:---prefix=}$prefix $configureFlags" fi # Add --disable-dependency-tracking to speed up some builds. - if test -z "$dontAddDisableDepTrack"; then + if [ -z "$dontAddDisableDepTrack" ]; then if grep -q dependency-tracking $configureScript; then configureFlags="--disable-dependency-tracking $configureFlags" fi fi # By default, disable static builds. - if test -z "$dontDisableStatic"; then + if [ -z "$dontDisableStatic" ]; then if grep -q enable-static $configureScript; then configureFlags="--disable-static $configureFlags" fi @@ -601,7 +601,7 @@ configurePhase() { buildPhase() { runHook preBuild - if test -z "$makeFlags" && ! test -n "$makefile" -o -e "Makefile" -o -e "makefile" -o -e "GNUmakefile"; then + if [ -z "$makeFlags" ] && ! [ -n "$makefile" -o -e "Makefile" -o -e "makefile" -o -e "GNUmakefile" ]; then echo "no Makefile, doing nothing" return fi @@ -632,7 +632,7 @@ checkPhase() { patchELF() { # Patch all ELF executables and shared libraries. header "patching ELF executables and libraries" - if test -e "$prefix"; then + if [ -e "$prefix" ]; then find "$prefix" \( \ \( -type f -a -name "*.so*" \) -o \ \( -type f -a -perm +0100 \) \ @@ -652,9 +652,9 @@ patchShebangs() { local f for f in $(find "$dir" -type f -perm +0100); do local oldPath=$(sed -ne '1 s,^#![ ]*\([^ ]*\).*$,\1,p' "$f") - if test -n "$oldPath" -a "${oldPath:0:${#NIX_STORE}}" != "$NIX_STORE"; then + if [ -n "$oldPath" -a "${oldPath:0:${#NIX_STORE}}" != "$NIX_STORE" ]; then local newPath=$(type -P $(basename $oldPath) || true) - if test -n "$newPath" -a "$newPath" != "$oldPath"; then + if [ -n "$newPath" -a "$newPath" != "$oldPath" ]; then echo "$f: interpreter changed from $oldPath to $newPath" sed -i -e "1 s,$oldPath,$newPath," "$f" fi @@ -687,15 +687,15 @@ fixupPhase() { # Put man/doc/info under $out/share. forceShare=${forceShare:=man doc info} - if test -n "$forceShare"; then + if [ -n "$forceShare" ]; then for d in $forceShare; do - if test -d "$prefix/$d"; then - if test -d "$prefix/share/$d"; then + if [ -d "$prefix/$d" ]; then + if [ -d "$prefix/share/$d" ]; then echo "both $d/ and share/$d/ exists!" else echo "fixing location of $d/ subdirectory" mkdir -p $prefix/share - if test -w $prefix/share; then + if [ -w $prefix/share ]; then mv -v $prefix/$d $prefix/share ln -sv share/$d $prefix fi @@ -704,10 +704,10 @@ fixupPhase() { done; fi - if test -z "$dontGzipMan"; then + if [ -z "$dontGzipMan" ]; then GLOBIGNORE=.:..:*.gz:*.bz2 for f in $out/share/man/*/* $out/share/man/*/*/*; do - if test -f $f; then + if [ -f $f ]; then if gzip -c $f > $f.gz; then rm $f else @@ -719,37 +719,37 @@ fixupPhase() { fi # TODO: strip _only_ ELF executables, and return || fail here... - if test -z "$dontStrip"; then + if [ -z "$dontStrip" ]; then stripDebugList=${stripDebugList:-lib lib64 libexec bin sbin} - if test -n "$stripDebugList"; then + if [ -n "$stripDebugList" ]; then stripDirs "$stripDebugList" "${stripDebugFlags:--S}" fi stripAllList=${stripAllList:-} - if test -n "$stripAllList"; then + if [ -n "$stripAllList" ]; then stripDirs "$stripAllList" "${stripAllFlags:--s}" fi fi - if test "$havePatchELF" = 1 -a -z "$dontPatchELF"; then + if [ "$havePatchELF" = 1 -a -z "$dontPatchELF" ]; then patchELF "$prefix" fi - if test -z "$dontPatchShebangs"; then + if [ -z "$dontPatchShebangs" ]; then patchShebangs "$prefix" fi - if test -n "$propagatedBuildInputs"; then + if [ -n "$propagatedBuildInputs" ]; then mkdir -p "$out/nix-support" echo "$propagatedBuildInputs" > "$out/nix-support/propagated-build-inputs" fi - if test -n "$propagatedBuildNativeInputs"; then + if [ -n "$propagatedBuildNativeInputs" ]; then mkdir -p "$out/nix-support" echo "$propagatedBuildNativeInputs" > "$out/nix-support/propagated-build-native-inputs" fi - if test -n "$setupHook"; then + if [ -n "$setupHook" ]; then mkdir -p "$out/nix-support" substituteAll "$setupHook" "$out/nix-support/setup-hook" fi @@ -764,7 +764,7 @@ distPhase() { echo "dist flags: $distFlags ${distFlagsArray[@]}" make ${makefile:+-f $makefile} $distFlags "${distFlagsArray[@]}" ${distTarget:-dist} - if test "$dontCopyDist" != 1; then + if [ "$dontCopyDist" != 1 ]; then mkdir -p "$out/tarballs" # Note: don't quote $tarballs, since we explicitly permit @@ -794,12 +794,12 @@ showPhaseHeader() { genericBuild() { header "building $out" - if test -n "$buildCommand"; then + if [ -n "$buildCommand" ]; then eval "$buildCommand" return fi - if test -z "$phases"; then + if [ -z "$phases" ]; then phases="$prePhases unpackPhase patchPhase $preConfigurePhases \ configurePhase $preBuildPhases buildPhase checkPhase \ $preInstallPhases installPhase fixupPhase \ @@ -807,11 +807,11 @@ genericBuild() { fi for curPhase in $phases; do - if test "$curPhase" = buildPhase -a -n "$dontBuild"; then continue; fi - if test "$curPhase" = checkPhase -a -z "$doCheck"; then continue; fi - if test "$curPhase" = installPhase -a -n "$dontInstall"; then continue; fi - if test "$curPhase" = fixupPhase -a -n "$dontFixup"; then continue; fi - if test "$curPhase" = distPhase -a -z "$doDist"; then continue; fi + if [ "$curPhase" = buildPhase -a -n "$dontBuild" ]; then continue; fi + if [ "$curPhase" = checkPhase -a -z "$doCheck" ]; then continue; fi + if [ "$curPhase" = installPhase -a -n "$dontInstall" ]; then continue; fi + if [ "$curPhase" = fixupPhase -a -n "$dontFixup" ]; then continue; fi + if [ "$curPhase" = distPhase -a -z "$doDist" ]; then continue; fi if [ -n "$tracePhases" ]; then echo @@ -825,7 +825,7 @@ genericBuild() { # function named $curPhase. eval "${!curPhase:-$curPhase}" - if test "$curPhase" = unpackPhase; then + if [ "$curPhase" = unpackPhase ]; then cd "${sourceRoot:-.}" fi From 6b8e8bfedb3fee8ab413b5fbb94b57a08cdd30ca Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 19 Jan 2012 16:23:14 +0000 Subject: [PATCH 057/197] * "sed -i" isn't very portable, so don't use it here. svn path=/nixpkgs/branches/stdenv-updates/; revision=31705 --- pkgs/stdenv/generic/builder.sh | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/stdenv/generic/builder.sh b/pkgs/stdenv/generic/builder.sh index 98b90144611..fd4c17ca251 100644 --- a/pkgs/stdenv/generic/builder.sh +++ b/pkgs/stdenv/generic/builder.sh @@ -9,10 +9,11 @@ mkdir $out echo "$preHook" > $out/setup cat "$setup" >> $out/setup -sed -i "$out/setup" \ - -e "s^@initialPath@^$initialPath^g" \ +sed -e "s^@initialPath@^$initialPath^g" \ -e "s^@gcc@^$gcc^g" \ - -e "s^@shell@^$shell^g" + -e "s^@shell@^$shell^g" \ + < $out/setup > $out/setup.tmp +mv $out/setup.tmp $out/setup # Allow the user to install stdenv using nix-env and get the packages # in stdenv. From e1f901c117bcc82157a1bd3167909284cc7bf926 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 19 Jan 2012 16:50:09 +0000 Subject: [PATCH 058/197] =?UTF-8?q?*=20Build=20=E2=80=98xz=E2=80=99=20duri?= =?UTF-8?q?ng=20the=20stdenvNative=20bootstrap,=20since=20we=20really=20ca?= =?UTF-8?q?n't=20=20=20rely=20on=20it=20being=20present.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit svn path=/nixpkgs/branches/stdenv-updates/; revision=31707 --- pkgs/stdenv/native/default.nix | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/pkgs/stdenv/native/default.nix b/pkgs/stdenv/native/default.nix index 3319a0d9271..28f077aa8ef 100644 --- a/pkgs/stdenv/native/default.nix +++ b/pkgs/stdenv/native/default.nix @@ -83,7 +83,7 @@ rec { # A function that builds a "native" stdenv (one that uses tools in # /usr etc.). makeStdenv = - {gcc, fetchurl, extraPath ? []}: + { gcc, fetchurl, extraPath ? [], overrides ? (pkgs: { }) }: import ../generic { name = "stdenv-native"; @@ -100,7 +100,7 @@ rec { fetchurlBoot = fetchurl; - inherit system shell gcc; + inherit system shell gcc overrides; }; @@ -137,12 +137,13 @@ rec { }; - # Using that, build a stdenv that adds the `replace' command (which - # most systems don't have, so we mustn't rely on the native - # environment providing it). + # Using that, build a stdenv that adds the ‘xz’ command (which most + # systems don't have, so we mustn't rely on the native environment + # providing it). stdenvBoot2 = makeStdenv { inherit gcc fetchurl; - extraPath = [stdenvBoot1Pkgs.replace]; + extraPath = [ stdenvBoot1Pkgs.xz ]; + overrides = pkgs: { inherit (stdenvBoot1Pkgs) xz; }; }; From 61d0c5d931128e5471c6ed1e31cd0d6a2455fda0 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 19 Jan 2012 17:33:33 +0000 Subject: [PATCH 059/197] * Don't rely on tar knowing about .xz. svn path=/nixpkgs/branches/stdenv-updates/; revision=31708 --- pkgs/stdenv/generic/setup.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh index a967f81ece9..ee115aab609 100644 --- a/pkgs/stdenv/generic/setup.sh +++ b/pkgs/stdenv/generic/setup.sh @@ -430,6 +430,10 @@ unpackFile() { header "unpacking source archive $curSrc" 3 case "$curSrc" in + *.tar.xz | *.tar.lzma) + # Don't rely on tar knowing about .xz. + xz -d < $curSrc | tar xv - + ;; *.tar | *.tar.* | *.tgz | *.tbz2) # GNU tar can automatically select the decompression method # (info "(tar) gzip"). From 0894d407ce0cc73bbb74c2774a925f1525e7979c Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 19 Jan 2012 17:37:21 +0000 Subject: [PATCH 060/197] * Add the latest readline patch. svn path=/nixpkgs/branches/stdenv-updates/; revision=31709 --- pkgs/development/libraries/readline/readline-6.2-patches.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/readline/readline-6.2-patches.nix b/pkgs/development/libraries/readline/readline-6.2-patches.nix index ae1e67224af..4e0ff213527 100644 --- a/pkgs/development/libraries/readline/readline-6.2-patches.nix +++ b/pkgs/development/libraries/readline/readline-6.2-patches.nix @@ -2,4 +2,5 @@ patch: [ (patch "001" "1qxl74f4n0hv4a807byrgbk4ixd8m50apj3922q2ss9pfi0nra1q") +(patch "002" "1m670g2xzib6r81315q9r24nh9brmxkpq07acch1fwxmih94jqqy") ] From 3980444b2b918ef74ac7b9f1128f399767d06fa1 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 19 Jan 2012 18:25:35 +0000 Subject: [PATCH 061/197] * Reuse packages in the Darwin stdenv to prevent unnecessary rebuilds. svn path=/nixpkgs/branches/stdenv-updates/; revision=31710 --- pkgs/stdenv/nix/default.nix | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/pkgs/stdenv/nix/default.nix b/pkgs/stdenv/nix/default.nix index b7411290f9f..7eac0650003 100644 --- a/pkgs/stdenv/nix/default.nix +++ b/pkgs/stdenv/nix/default.nix @@ -1,6 +1,6 @@ -{stdenv, pkgs}: +{ stdenv, pkgs }: -import ../generic { +import ../generic rec { name = "stdenv-nix"; preHook = @@ -38,4 +38,12 @@ import ../generic { shell = pkgs.bash + "/bin/sh"; fetchurlBoot = stdenv.fetchurlBoot; + + overrides = pkgs_: { + inherit gcc; + inherit (gcc) binutils; + inherit (pkgs) + gzip bzip2 xz bash coreutils diffutils findutils gawk + gnumake gnused gnutar gnugrep gnupatch perl; + }; } From b27b5dfd753f956c5636164319d6fa8a81417c10 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 19 Jan 2012 22:18:34 +0000 Subject: [PATCH 062/197] * Doh. svn path=/nixpkgs/branches/stdenv-updates/; revision=31726 --- pkgs/stdenv/generic/setup.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh index ee115aab609..68e2ae4e260 100644 --- a/pkgs/stdenv/generic/setup.sh +++ b/pkgs/stdenv/generic/setup.sh @@ -432,7 +432,7 @@ unpackFile() { case "$curSrc" in *.tar.xz | *.tar.lzma) # Don't rely on tar knowing about .xz. - xz -d < $curSrc | tar xv - + xz -d < $curSrc | tar xvf - ;; *.tar | *.tar.* | *.tgz | *.tbz2) # GNU tar can automatically select the decompression method From 14aab94aefcfe5b6fd5f36137572b99d8f792d6c Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 20 Jan 2012 10:55:45 +0000 Subject: [PATCH 063/197] * Oops. svn path=/nixpkgs/branches/stdenv-updates/; revision=31734 --- pkgs/stdenv/linux/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/stdenv/linux/default.nix b/pkgs/stdenv/linux/default.nix index 90ce61b25c8..4fa9df8ddee 100644 --- a/pkgs/stdenv/linux/default.nix +++ b/pkgs/stdenv/linux/default.nix @@ -236,6 +236,7 @@ rec { gcc = stdenvLinuxBoot3Pkgs.gcc.gcc; name = ""; }; + extraPath = [ stdenvLinuxBoot3Pkgs.xz ]; overrides = pkgs: { inherit (stdenvLinuxBoot1Pkgs) perl; inherit (stdenvLinuxBoot3Pkgs) gettext gnum4 xz gmp; From 28780d27d1074f0adac168679fcbd40aa767a03b Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 20 Jan 2012 15:10:28 +0000 Subject: [PATCH 064/197] * cmake: don't use replace-literal. svn path=/nixpkgs/branches/stdenv-updates/; revision=31736 --- .../tools/build-managers/cmake/default.nix | 9 ++---- .../tools/build-managers/cmake/setup-hook.sh | 32 +++++++++---------- 2 files changed, 18 insertions(+), 23 deletions(-) diff --git a/pkgs/development/tools/build-managers/cmake/default.nix b/pkgs/development/tools/build-managers/cmake/default.nix index 53e27836d73..7e523654197 100644 --- a/pkgs/development/tools/build-managers/cmake/default.nix +++ b/pkgs/development/tools/build-managers/cmake/default.nix @@ -39,15 +39,12 @@ stdenv.mkDerivation rec { setupHook = ./setup-hook.sh; - postUnpack = - '' - dontUseCmakeConfigure=1 - source $setupHook - fixCmakeFiles $sourceRoot - ''; + dontUseCmakeConfigure = true; preConfigure = optionalString (stdenv ? glibc) '' + source $setupHook + fixCmakeFiles . substituteInPlace Modules/Platform/UnixPaths.cmake --subst-var-by glibc ${stdenv.glibc} ''; diff --git a/pkgs/development/tools/build-managers/cmake/setup-hook.sh b/pkgs/development/tools/build-managers/cmake/setup-hook.sh index c523e849fc1..8fdf64417dd 100755 --- a/pkgs/development/tools/build-managers/cmake/setup-hook.sh +++ b/pkgs/development/tools/build-managers/cmake/setup-hook.sh @@ -1,36 +1,34 @@ -addCMakeParams() -{ +addCMakeParams() { addToSearchPath CMAKE_PREFIX_PATH $1 } -fixCmakeFiles() -{ - local replaceArgs - echo "fixing cmake files" - replaceArgs="-e -f -L -T /usr /var/empty -a /opt /var/empty" - find $1 -type f -name "*.cmake" -o -name "*.cmake.in" -o -name CMakeLists.txt -print0 | - xargs -0 replace-literal ${replaceArgs} +fixCmakeFiles() { + echo "fixing cmake files..." + find "$1" \( -type f -name "*.cmake" -o -name "*.cmake.in" -o -name CMakeLists.txt \) -print | + while read fn; do + sed -e 's|/usr|/var/empty|g' -e 's|/opt|/var/empty|g' < "$fn" > "$fn.tmp" + mv "$fn.tmp" "$fn" + done } -cmakeConfigurePhase() -{ +cmakeConfigurePhase() { eval "$preConfigure" - if test -z "$dontFixCmake"; then + if [ -z "$dontFixCmake" ]; then fixCmakeFiles . fi - if test -z "$dontUseCmakeBuildDir"; then + if [ -z "$dontUseCmakeBuildDir" ]; then mkdir -p build cd build cmakeDir=.. fi - if test -z "$dontAddPrefix"; then + if [ -z "$dontAddPrefix" ]; then cmakeFlags="-DCMAKE_INSTALL_PREFIX=$prefix $cmakeFlags" fi - if test -n "$crossConfig"; then + if [ -n "$crossConfig" ]; then # By now it supports linux builds only. We should set the proper # CMAKE_SYSTEM_NAME otherwise. # http://www.cmake.org/Wiki/CMake_Cross_Compiling @@ -47,11 +45,11 @@ cmakeConfigurePhase() eval "$postConfigure" } -if test -z "$dontUseCmakeConfigure"; then +if [ -z "$dontUseCmakeConfigure" ]; then configurePhase=cmakeConfigurePhase fi -if test -n "$crossConfig"; then +if [ -n "$crossConfig" ]; then crossEnvHooks+=(addCMakeParams) else envHooks+=(addCMakeParams) From 1e7d074f1d15393d07281e1b36b8d6b3b6445b1c Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 20 Jan 2012 15:10:56 +0000 Subject: [PATCH 065/197] * builderDefs: don't use param1-5. svn path=/nixpkgs/branches/stdenv-updates/; revision=31737 --- pkgs/build-support/builder-defs/builder-defs.nix | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/pkgs/build-support/builder-defs/builder-defs.nix b/pkgs/build-support/builder-defs/builder-defs.nix index 50ab7b9a6c1..7d0f138880d 100644 --- a/pkgs/build-support/builder-defs/builder-defs.nix +++ b/pkgs/build-support/builder-defs/builder-defs.nix @@ -97,20 +97,13 @@ let inherit (builtins) head tail trace; in # changing this ? see [1] minInit = fullDepEntry (" + ${stdenv.preHook} + set -e NIX_GCC=${stdenv.gcc} export SHELL=${stdenv.shell} PATH_DELIMITER=':' - " + (if stdenv ? preHook && stdenv.preHook != null && toString stdenv.preHook != "" then - " - param1=${stdenv.param1} - param2=${stdenv.param2} - param3=${stdenv.param3} - param4=${stdenv.param4} - param5=${stdenv.param5} - source ${stdenv.preHook} - " + - " + # Set up the initial path. PATH= for i in \$NIX_GCC ${toString stdenv.initialPath}; do @@ -121,8 +114,7 @@ let inherit (builtins) head tail trace; in prefix=${if args ? prefix then (toString args.prefix) else "\$out"} - " - else "")) ["defNest" "defAddToSearchPath"]; + ") ["defNest" "defAddToSearchPath"]; # if you change this rewrite using '' instead of "" to get rid of indentation in builder scripts addInputs = fullDepEntry (" From 22f3ff8f0d265f49fe8830b931a10badfae17be5 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 20 Jan 2012 16:41:11 +0000 Subject: [PATCH 066/197] * OpenSSL updated to 1.0.0g. svn path=/nixpkgs/branches/stdenv-updates/; revision=31740 --- pkgs/development/libraries/openssl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix index fc3018b0ab2..372d705925f 100644 --- a/pkgs/development/libraries/openssl/default.nix +++ b/pkgs/development/libraries/openssl/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, perl }: let - name = "openssl-1.0.0e"; + name = "openssl-1.0.0g"; opensslCrossSystem = stdenv.lib.attrByPath [ "openssl" "system" ] (throw "openssl needs its platform name cross building" null) @@ -33,7 +33,7 @@ stdenv.mkDerivation { src = fetchurl { url = "http://www.openssl.org/source/${name}.tar.gz"; - sha256 = "1xw0ffzmr4wbnb0glywgks375dvq8x87pgxmwx6vhgvkflkxqqg3"; + sha1 = "2b517baada2338663c27314cb922f9755e73e07f"; }; patches = patchesCross false; From 25e0ae0f39e97b6986eccd1ffb7f3b31507e8f0f Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 20 Jan 2012 16:42:16 +0000 Subject: [PATCH 067/197] * Fix building Perl on FreeBSD. Its configure script was looking for libraries in /usr/local/lib, but the linker doesn't look there by default, so linking against libgdbm failed. So don't look in /usr/local/lib. svn path=/nixpkgs/branches/stdenv-updates/; revision=31741 --- .../interpreters/perl/5.14/no-sys-dirs.patch | 34 ++++++++++++++----- 1 file changed, 26 insertions(+), 8 deletions(-) diff --git a/pkgs/development/interpreters/perl/5.14/no-sys-dirs.patch b/pkgs/development/interpreters/perl/5.14/no-sys-dirs.patch index a7fa7725c89..54ffb28e206 100644 --- a/pkgs/development/interpreters/perl/5.14/no-sys-dirs.patch +++ b/pkgs/development/interpreters/perl/5.14/no-sys-dirs.patch @@ -1,6 +1,6 @@ -diff -ru perl-5.14.2-orig/Configure perl-5.14.2/Configure +diff -ru -x '*~' perl-5.14.2-orig/Configure perl-5.14.2/Configure --- perl-5.14.2-orig/Configure 2011-09-26 11:44:34.000000000 +0200 -+++ perl-5.14.2/Configure 2011-10-27 17:42:26.791103662 +0200 ++++ perl-5.14.2/Configure 2012-01-20 17:05:23.089223129 +0100 @@ -106,15 +106,7 @@ fi @@ -66,6 +66,15 @@ diff -ru perl-5.14.2-orig/Configure perl-5.14.2/Configure for file in $loclist; do eval xxx=\$$file case "$xxx" in +@@ -4785,7 +4768,7 @@ + : Set private lib path + case "$plibpth" in + '') if ./mips; then +- plibpth="$incpath/usr/lib /usr/local/lib /usr/ccs/lib" ++ plibpth="$incpath/usr/lib" + fi;; + esac + case "$libpth" in @@ -8390,13 +8373,8 @@ echo " " case "$sysman" in @@ -94,10 +103,9 @@ diff -ru perl-5.14.2-orig/Configure perl-5.14.2/Configure : see what type gids are declared as in the kernel echo " " -Only in perl-5.14.2-orig/cpan/Module-Pluggable/t/lib/EditorJunk/Plugin: Bar.pm~ -diff -ru perl-5.14.2-orig/ext/Errno/Errno_pm.PL perl-5.14.2/ext/Errno/Errno_pm.PL +diff -ru -x '*~' perl-5.14.2-orig/ext/Errno/Errno_pm.PL perl-5.14.2/ext/Errno/Errno_pm.PL --- perl-5.14.2-orig/ext/Errno/Errno_pm.PL 2011-09-26 11:44:34.000000000 +0200 -+++ perl-5.14.2/ext/Errno/Errno_pm.PL 2011-10-27 17:40:13.083352010 +0200 ++++ perl-5.14.2/ext/Errno/Errno_pm.PL 2012-01-20 17:02:07.938138311 +0100 @@ -137,11 +137,7 @@ if ($dep =~ /(\S+errno\.h)/) { $file{$1} = 1; @@ -111,10 +119,10 @@ diff -ru perl-5.14.2-orig/ext/Errno/Errno_pm.PL perl-5.14.2/ext/Errno/Errno_pm.P # Some Linuxes have weird errno.hs which generate # no #file or #line directives my $linux_errno_h = -e '/usr/include/errno.h' ? -diff -ru perl-5.14.2-orig/hints/freebsd.sh perl-5.14.2/hints/freebsd.sh +diff -ru -x '*~' perl-5.14.2-orig/hints/freebsd.sh perl-5.14.2/hints/freebsd.sh --- perl-5.14.2-orig/hints/freebsd.sh 2011-09-19 15:18:22.000000000 +0200 -+++ perl-5.14.2/hints/freebsd.sh 2011-10-27 17:40:13.083352010 +0200 -@@ -118,13 +118,13 @@ ++++ perl-5.14.2/hints/freebsd.sh 2012-01-20 17:10:37.267924044 +0100 +@@ -118,21 +118,21 @@ objformat=`/usr/bin/objformat` if [ x$objformat = xaout ]; then if [ -e /usr/lib/aout ]; then @@ -132,3 +140,13 @@ diff -ru perl-5.14.2-orig/hints/freebsd.sh perl-5.14.2/hints/freebsd.sh ldflags="-Wl,-E " lddlflags="-shared " fi + cccdlflags='-DPIC -fPIC' + ;; + *) +- libpth="/usr/lib /usr/local/lib" +- glibpth="/usr/lib /usr/local/lib" ++ libpth="" ++ glibpth="" + ldflags="-Wl,-E " + lddlflags="-shared " + cccdlflags='-DPIC -fPIC' From 94c7bec49dd0be92b10ae62967e11855cfa52d07 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 20 Jan 2012 16:47:54 +0000 Subject: [PATCH 068/197] * Call all the stdenvs "stdenv" (rather than e.g. "stdenv-linux") so that "nix-env -i stdenv" does the expected. svn path=/nixpkgs/branches/stdenv-updates/; revision=31742 --- pkgs/stdenv/generic/default.nix | 2 +- pkgs/stdenv/linux/default.nix | 2 -- pkgs/stdenv/native/default.nix | 2 -- pkgs/stdenv/nix/default.nix | 2 -- 4 files changed, 1 insertion(+), 7 deletions(-) diff --git a/pkgs/stdenv/generic/default.nix b/pkgs/stdenv/generic/default.nix index 91e6af01578..a20ebda4bad 100644 --- a/pkgs/stdenv/generic/default.nix +++ b/pkgs/stdenv/generic/default.nix @@ -1,4 +1,4 @@ -{ system, name, preHook ? "", initialPath, gcc, shell +{ system, name ? "stdenv", preHook ? "", initialPath, gcc, shell , extraAttrs ? {}, overrides ? (pkgs: {}) , # The `fetchurl' to use for downloading curl and its dependencies diff --git a/pkgs/stdenv/linux/default.nix b/pkgs/stdenv/linux/default.nix index 4fa9df8ddee..4a63d0bf95a 100644 --- a/pkgs/stdenv/linux/default.nix +++ b/pkgs/stdenv/linux/default.nix @@ -260,8 +260,6 @@ rec { # dependency (`nix-store -qR') on bootstrapTools or the # first binutils built. stdenvLinux = import ../generic rec { - name = "stdenv-linux"; - inherit system; preHook = commonPreHook; diff --git a/pkgs/stdenv/native/default.nix b/pkgs/stdenv/native/default.nix index 28f077aa8ef..c0da8f2b0c1 100644 --- a/pkgs/stdenv/native/default.nix +++ b/pkgs/stdenv/native/default.nix @@ -86,8 +86,6 @@ rec { { gcc, fetchurl, extraPath ? [], overrides ? (pkgs: { }) }: import ../generic { - name = "stdenv-native"; - preHook = if system == "i686-darwin" || system == "powerpc-darwin" || system == "x86_64-darwin" then prehookDarwin else if system == "i686-freebsd" then prehookFreeBSD else diff --git a/pkgs/stdenv/nix/default.nix b/pkgs/stdenv/nix/default.nix index 7eac0650003..473bb5af0af 100644 --- a/pkgs/stdenv/nix/default.nix +++ b/pkgs/stdenv/nix/default.nix @@ -1,8 +1,6 @@ { stdenv, pkgs }: import ../generic rec { - name = "stdenv-nix"; - preHook = '' export NIX_ENFORCE_PURITY=1 From c44e954bdcaae7ce6a1e5760be16e4dc9f528b09 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 20 Jan 2012 17:43:50 +0000 Subject: [PATCH 069/197] * Fix the squashfs build (it links against xz, so xz has to be in the buildInputs). While at it, update to version 4.2. "attr" is no longer needed as a dependency. svn path=/nixpkgs/branches/stdenv-updates/; revision=31744 --- pkgs/tools/filesystems/squashfs/default.nix | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/pkgs/tools/filesystems/squashfs/default.nix b/pkgs/tools/filesystems/squashfs/default.nix index 2fc0befb9aa..f66c54cc9e1 100644 --- a/pkgs/tools/filesystems/squashfs/default.nix +++ b/pkgs/tools/filesystems/squashfs/default.nix @@ -1,24 +1,23 @@ -{stdenv, fetchurl, zlib, attr, xz}: +{ stdenv, fetchurl, zlib, xz }: stdenv.mkDerivation rec { - name = "squashfs-4.1"; + name = "squashfs-4.2"; src = fetchurl { - url = mirror://sourceforge/squashfs/squashfs4.1.tar.gz; - sha256 = "0sh40r7gz81fg7ivgr7rld8spvqb6hsfvnf6gd3gbcr5b830v1rs"; + url = mirror://sourceforge/squashfs/squashfs4.2.tar.gz; + sha256 = "15if08j0pl5hmnz9pwshwrp4fjp0jsm9larjxmjvdnr2m5d1kq6r"; }; - buildInputs = [zlib attr]; - - preBuild = '' - cd squashfs-tools - ''; - IUSE="+gzip +lzma"; + buildInputs = [ zlib xz ]; + preBuild = "cd squashfs-tools"; + NIX_LDFLAGS = "-lgcc_s"; # for pthread_cancel installFlags = "INSTALL_DIR=\${out}/bin"; + makeFlags = "XZ_SUPPORT=1"; + meta = { homepage = http://squashfs.sourceforge.net/; description = "Tool for creating and unpacking squashfs filesystems"; From f5ddd22576c4a838aa96d82f22a9526f2d73dfe1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Sat, 21 Jan 2012 00:47:03 +0000 Subject: [PATCH 070/197] Updating pkgconfig. svn path=/nixpkgs/branches/stdenv-updates/; revision=31752 --- pkgs/development/tools/misc/pkgconfig/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/misc/pkgconfig/default.nix b/pkgs/development/tools/misc/pkgconfig/default.nix index 22035f6fee7..792207997f1 100644 --- a/pkgs/development/tools/misc/pkgconfig/default.nix +++ b/pkgs/development/tools/misc/pkgconfig/default.nix @@ -1,13 +1,13 @@ {stdenv, fetchurl}: stdenv.mkDerivation rec { - name = "pkg-config-0.23"; + name = "pkg-config-0.26"; setupHook = ./setup-hook.sh; src = fetchurl { url = "http://pkgconfig.freedesktop.org/releases/${name}.tar.gz"; - sha256 = "0lrvk17724mc2nzpaa0vwybarrl50r7qdnr4h6jijm50srrf1808"; + sha256 = "1by86fjr5i6l7l428bdk4axcls32bcb598g5wjrhz4vwg5m97hcl"; }; patches = [ From 3b4528fd7caf785c838df0826ed700c21414188b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Sat, 21 Jan 2012 09:05:43 +0000 Subject: [PATCH 071/197] Reverting the pkgconfig update. Eelco says it does not work. svn path=/nixpkgs/branches/stdenv-updates/; revision=31755 --- pkgs/development/tools/misc/pkgconfig/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/misc/pkgconfig/default.nix b/pkgs/development/tools/misc/pkgconfig/default.nix index 792207997f1..22035f6fee7 100644 --- a/pkgs/development/tools/misc/pkgconfig/default.nix +++ b/pkgs/development/tools/misc/pkgconfig/default.nix @@ -1,13 +1,13 @@ {stdenv, fetchurl}: stdenv.mkDerivation rec { - name = "pkg-config-0.26"; + name = "pkg-config-0.23"; setupHook = ./setup-hook.sh; src = fetchurl { url = "http://pkgconfig.freedesktop.org/releases/${name}.tar.gz"; - sha256 = "1by86fjr5i6l7l428bdk4axcls32bcb598g5wjrhz4vwg5m97hcl"; + sha256 = "0lrvk17724mc2nzpaa0vwybarrl50r7qdnr4h6jijm50srrf1808"; }; patches = [ From 3ac44bde7986463a6d15f409982f46da4f223bdb Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 23 Jan 2012 12:34:07 +0000 Subject: [PATCH 072/197] * Disable make check because it fails randomly due to a race. svn path=/nixpkgs/branches/stdenv-updates/; revision=31790 --- pkgs/tools/package-management/nix/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index c75fa1ed60c..64387d67839 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { doCheck = false; }; - doCheck = true; + #doCheck = true; meta = { description = "The Nix Deployment System"; From 91b19832c93ab4804e0887cd28c51fc851ee92d3 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 23 Jan 2012 12:59:18 +0000 Subject: [PATCH 073/197] * Fix the Darwin patch for OpenSSL. svn path=/nixpkgs/branches/stdenv-updates/; revision=31791 --- .../libraries/openssl/darwin-arch.patch | 22 +++++++++++-------- .../development/libraries/openssl/default.nix | 6 ++--- 2 files changed, 16 insertions(+), 12 deletions(-) diff --git a/pkgs/development/libraries/openssl/darwin-arch.patch b/pkgs/development/libraries/openssl/darwin-arch.patch index ad8e86c6791..5d5a3afdd1d 100644 --- a/pkgs/development/libraries/openssl/darwin-arch.patch +++ b/pkgs/development/libraries/openssl/darwin-arch.patch @@ -1,16 +1,20 @@ -The patch is specific to nix: MacOS gcc supports -arch. ---- a/Configure -+++ b/Configure -@@ -549,9 +549,9 @@ my %table=( +diff -ru openssl-1.0.0g-orig/Configure openssl-1.0.0g/Configure +--- openssl-1.0.0g-orig/Configure 2011-12-19 18:04:38.000000000 +0100 ++++ openssl-1.0.0g/Configure 2012-01-23 13:45:23.644170171 +0100 +@@ -549,11 +549,11 @@ + + ##### MacOS X (a.k.a. Rhapsody or Darwin) setup "rhapsody-ppc-cc","cc:-O3 -DB_ENDIAN::(unknown):MACOSX_RHAPSODY::BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${no_asm}::", - "darwin-ppc-cc","cc:-arch ppc -O3 -DB_ENDIAN::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${ppc32_asm}:osx32:dlfcn:darwin-shared:-fPIC -fno-common:-arch ppc -dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib", - "darwin64-ppc-cc","cc:-arch ppc64 -O3 -DB_ENDIAN::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${ppc64_asm}:osx64:dlfcn:darwin-shared:-fPIC -fno-common:-arch ppc64 -dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib", +-"darwin-ppc-cc","cc:-arch ppc -O3 -DB_ENDIAN -Wa,-force_cpusubtype_ALL::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${ppc32_asm}:osx32:dlfcn:darwin-shared:-fPIC -fno-common:-arch ppc -dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib", +-"darwin64-ppc-cc","cc:-arch ppc64 -O3 -DB_ENDIAN::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${ppc64_asm}:osx64:dlfcn:darwin-shared:-fPIC -fno-common:-arch ppc64 -dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib", -"darwin-i386-cc","cc:-arch i386 -O3 -fomit-frame-pointer -DL_ENDIAN::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:BN_LLONG RC4_INT RC4_CHUNK DES_UNROLL BF_PTR:${x86_asm}:macosx:dlfcn:darwin-shared:-fPIC -fno-common:-arch i386 -dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib", -"debug-darwin-i386-cc","cc:-arch i386 -g3 -DL_ENDIAN::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:BN_LLONG RC4_INT RC4_CHUNK DES_UNROLL BF_PTR:${x86_asm}:macosx:dlfcn:darwin-shared:-fPIC -fno-common:-arch i386 -dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib", --"darwin64-x86_64-cc","cc:-arch x86_64 -O3 -DL_ENDIAN -DMD32_REG_T=int -Wall::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL:${x86_64_asm}:macosx:dlfcn:darwin-shared:-fPIC -fno-common:-arch x86_64 -dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib", +-"darwin64-x86_64-cc","cc:-arch x86_64 -O3 -DL_ENDIAN -DMD32_REG_T=int -Wall::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL:".eval{my $asm=$x86_64_asm;$asm=~s/rc4\-[^:]+//;$asm}.":macosx:dlfcn:darwin-shared:-fPIC -fno-common:-arch x86_64 -dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib", ++"darwin-ppc-cc","cc:-O3 -DB_ENDIAN -Wa,-force_cpusubtype_ALL::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${ppc32_asm}:osx32:dlfcn:darwin-shared:-fPIC -fno-common:-dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib", ++"darwin64-ppc-cc","cc:-O3 -DB_ENDIAN::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${ppc64_asm}:osx64:dlfcn:darwin-shared:-fPIC -fno-common:-dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib", +"darwin-i386-cc","cc:-O3 -fomit-frame-pointer -DL_ENDIAN::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:BN_LLONG RC4_INT RC4_CHUNK DES_UNROLL BF_PTR:${x86_asm}:macosx:dlfcn:darwin-shared:-fPIC -fno-common:-dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib", +"debug-darwin-i386-cc","cc:-g3 -DL_ENDIAN::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:BN_LLONG RC4_INT RC4_CHUNK DES_UNROLL BF_PTR:${x86_asm}:macosx:dlfcn:darwin-shared:-fPIC -fno-common:-dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib", -+"darwin64-x86_64-cc","cc:-O3 -DL_ENDIAN -DMD32_REG_T=int -Wall::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL:${x86_64_asm}:macosx:dlfcn:darwin-shared:-fPIC -fno-common:-dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib", ++"darwin64-x86_64-cc","cc:-O3 -DL_ENDIAN -DMD32_REG_T=int -Wall::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL:".eval{my $asm=$x86_64_asm;$asm=~s/rc4\-[^:]+//;$asm}.":macosx:dlfcn:darwin-shared:-fPIC -fno-common:-dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib", "debug-darwin-ppc-cc","cc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DCRYPTO_MDEBUG -DB_ENDIAN -g -Wall -O::-D_REENTRANT:MACOSX::BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${ppc32_asm}:osx32:dlfcn:darwin-shared:-fPIC:-dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib", - + ##### A/UX diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix index 372d705925f..4df3b713e29 100644 --- a/pkgs/development/libraries/openssl/default.nix +++ b/pkgs/development/libraries/openssl/default.nix @@ -18,12 +18,12 @@ let ./cert-file.patch ] - ++ (stdenv.lib.optionals (isCross && opensslCrossSystem == "hurd-x86") + ++ stdenv.lib.optionals (isCross && opensslCrossSystem == "hurd-x86") [ ./cert-file-path-max.patch # merge with `cert-file.patch' eventually ./gnu.patch # submitted upstream - ]) + ] - ++ (stdenv.lib.optional stdenv.isDarwin ./darwin-arch.patch) + ++ stdenv.lib.optional stdenv.isDarwin ./darwin-arch.patch ++ stdenv.lib.optional (stdenv.system == "x86_64-freebsd") ./freebsd-x86_64-asm.patch; in From 3cf71dcfd11bf01c29953631851c81287676f80b Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 23 Jan 2012 13:06:01 +0000 Subject: [PATCH 074/197] * Curl is used during the bootstrap, so don't rely on pattern substitution being efficient. svn path=/nixpkgs/branches/stdenv-updates/; revision=31792 --- pkgs/tools/networking/curl/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/networking/curl/default.nix b/pkgs/tools/networking/curl/default.nix index 7aee342f4a3..cd83ede9df4 100644 --- a/pkgs/tools/networking/curl/default.nix +++ b/pkgs/tools/networking/curl/default.nix @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { }; preConfigure = '' - substituteInPlace configure --replace /usr/bin /no-such-path + sed -e 's|/usr/bin|/no-such-path|g' -i.bak configure ''; meta = { From 1e886749b5e3a8ad27ec4ddbebde47cd08183434 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 23 Jan 2012 13:16:51 +0000 Subject: [PATCH 075/197] * Don't replace /opt if it's followed by something other than whitespace or a /, otherwise strings such as /foo/opticaldrive.c will be broken. svn path=/nixpkgs/branches/stdenv-updates/; revision=31793 --- pkgs/development/tools/build-managers/cmake/setup-hook.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/tools/build-managers/cmake/setup-hook.sh b/pkgs/development/tools/build-managers/cmake/setup-hook.sh index 8fdf64417dd..802c7343a85 100755 --- a/pkgs/development/tools/build-managers/cmake/setup-hook.sh +++ b/pkgs/development/tools/build-managers/cmake/setup-hook.sh @@ -3,10 +3,11 @@ addCMakeParams() { } fixCmakeFiles() { + # Replace occurences of /usr and /opt by /var/empty. echo "fixing cmake files..." find "$1" \( -type f -name "*.cmake" -o -name "*.cmake.in" -o -name CMakeLists.txt \) -print | while read fn; do - sed -e 's|/usr|/var/empty|g' -e 's|/opt|/var/empty|g' < "$fn" > "$fn.tmp" + sed -e 's^/usr\([ /]\|$\)^/var/empty\1^g' -e 's^/opt\([ /]\|$\)^/var/empty\1^g' < "$fn" > "$fn.tmp" mv "$fn.tmp" "$fn" done } From f878980c8b78a639b3feabd1f8f9ed9f1b7c388c Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 23 Jan 2012 17:21:37 +0000 Subject: [PATCH 076/197] * Fix building Dosbox with GCC 4.6. svn path=/nixpkgs/branches/stdenv-updates/; revision=31796 --- pkgs/misc/emulators/dosbox/default.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pkgs/misc/emulators/dosbox/default.nix b/pkgs/misc/emulators/dosbox/default.nix index eff47c9c503..2525cafc28b 100644 --- a/pkgs/misc/emulators/dosbox/default.nix +++ b/pkgs/misc/emulators/dosbox/default.nix @@ -7,6 +7,16 @@ stdenv.mkDerivation rec { url = "mirror://sourceforge/dosbox/${name}.tar.gz"; sha256 = "01cfjc5bs08m4w79nbxyv7rnvzq2yckmgrbq36njn06lw8b4kxqk"; }; + + patches = + [ # Fix building with GCC 4.6. + (fetchurl { + url = "http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/games-emulation/dosbox/files/dosbox-0.74-gcc46.patch?revision=1.1"; + sha256 = "03iv1ph7fccfw327ngnhvzwyiix7fsbdb5mmpxivzkidhlrssxq9"; + }) + ]; + + patchFlags = "-p0"; buildInputs = [ SDL ]; From b31c67e24d56c90a6732d3a310ff13684b73e200 Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Fri, 27 Jan 2012 16:43:39 +0000 Subject: [PATCH 077/197] svn merge ^/nixpkgs/trunk svn path=/nixpkgs/branches/stdenv-updates/; revision=31887 --- .../kdeedu/kalzium-find-libfacile.patch | 88 ------------------- pkgs/desktops/kde-4.8/kdeedu/kalzium.nix | 2 - pkgs/development/tools/misc/gdb/default.nix | 6 +- pkgs/misc/tex/texlive/moderncv.nix | 2 +- .../tools/package-management/nix/unstable.nix | 6 +- pkgs/top-level/all-packages.nix | 2 - 6 files changed, 8 insertions(+), 98 deletions(-) delete mode 100644 pkgs/desktops/kde-4.8/kdeedu/kalzium-find-libfacile.patch diff --git a/pkgs/desktops/kde-4.8/kdeedu/kalzium-find-libfacile.patch b/pkgs/desktops/kde-4.8/kdeedu/kalzium-find-libfacile.patch deleted file mode 100644 index 0324ee74eab..00000000000 --- a/pkgs/desktops/kde-4.8/kdeedu/kalzium-find-libfacile.patch +++ /dev/null @@ -1,88 +0,0 @@ -diff --git a/cmake/modules/FindLibfacile.cmake b/cmake/modules/FindLibfacile.cmake -index bef726e..043c65f 100644 ---- a/cmake/modules/FindLibfacile.cmake -+++ b/cmake/modules/FindLibfacile.cmake -@@ -4,7 +4,6 @@ - # LIBFACILE_FOUND - system has Libfacile - # LIBFACILE_INCLUDE_DIR - the Libfacile include directory - # LIBFACILE_LIBRARIES - Link these to use Libfacile --# LIBFACILE_DEFINITIONS - Compiler switches required for using Libfacile - # - # Copyright (c) 2006, Carsten Niehaus, - # Copyright (c) 2006, Montel Laurent, -@@ -14,35 +13,20 @@ - - find_package(OCaml) - --set(LIBFACILE_FOUND FALSE) -- - if( OCAML_FOUND ) -- find_file(LIBFACILE_LIBRARIES NAMES facile.a -- PATHS -- ${OCAMLC_DIR}/facile/ -+ find_library(LIBFACILE_LIBRARIES NAMES facile.a -+ HINTS ${OCAMLC_DIR} -+ PATH_SUFFIXES facile ocaml/facile - ) -- #message(STATUS "LIBFACILE_LIBRARIES :<${LIBFACILE_LIBRARIES}>") -- find_path(LIBFACILE_INCLUDE_DIR NAMES facile.a -- PATHS -- ${OCAMLC_DIR}/ -- PATH_SUFFIXES facile -+ find_path(LIBFACILE_INCLUDE_DIR NAMES facile.cmi -+ HINTS ${OCAMLC_DIR} -+ PATH_SUFFIXES facile lib/ocaml/facile - ) -- #message(STATUS "LIBFACILE_INCLUDE_DIR <${LIBFACILE_INCLUDE_DIR}>") -- if(LIBFACILE_INCLUDE_DIR AND LIBFACILE_LIBRARIES) -- set(LIBFACILE_FOUND TRUE) -- endif(LIBFACILE_INCLUDE_DIR AND LIBFACILE_LIBRARIES) - endif(OCAML_FOUND) - -- --if(LIBFACILE_FOUND) -- if(NOT Libfacile_FIND_QUIETLY) -- message(STATUS "Found Libfacile: ${LIBFACILE_LIBRARIES}") -- endif(NOT Libfacile_FIND_QUIETLY) --else(LIBFACILE_FOUND) -- if(Libfacile_FIND_REQUIRED) -- message(FATAL_ERROR "Could not find Libfacile") -- endif(Libfacile_FIND_REQUIRED) --endif(LIBFACILE_FOUND) -+include(FindPackageHandleStandardArgs) -+find_package_handle_standard_args(Libfacile DEFAULT_MSG LIBFACILE_INCLUDE_DIR -+ LIBFACILE_LIBRARIES OCAML_FOUND) - - # show the LIBFACILE_INCLUDE_DIR and LIBFACILE_LIBRARIES variables only in the advanced view - mark_as_advanced(LIBFACILE_INCLUDE_DIR LIBFACILE_LIBRARIES ) -diff --git a/src/CMakeOCamlInstructions.cmake b/src/CMakeOCamlInstructions.cmake -index 40b6755..de89253 100644 ---- a/src/CMakeOCamlInstructions.cmake -+++ b/src/CMakeOCamlInstructions.cmake -@@ -2,7 +2,7 @@ link_directories (${OCAMLC_DIR}) - - macro(OCAML_MLI_TO_CMI _cmi _mli) - add_custom_command(OUTPUT ${_cmi} -- COMMAND ${OCAML_OCAMLC_EXECUTABLE} ARGS -o ${_cmi} -I +facile -c ${_mli} -+ COMMAND ${OCAML_OCAMLC_EXECUTABLE} ARGS -o ${_cmi} -I ${LIBFACILE_INCLUDE_DIR} -c ${_mli} - DEPENDS ${_mli} ${ARGN} - WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}) - set_directory_properties(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES ${_cmi}) -@@ -10,7 +10,7 @@ endmacro(OCAML_MLI_TO_CMI) - - macro(OCAML_ML_TO_CMX _cmx _ml) - add_custom_command(OUTPUT ${_cmx} -- COMMAND ${OCAML_OCAMLOPT_EXECUTABLE} ARGS -o ${_cmx} -I +facile -c ${_ml} -+ COMMAND ${OCAML_OCAMLOPT_EXECUTABLE} ARGS -o ${_cmx} -I ${LIBFACILE_INCLUDE_DIR} -c ${_ml} - DEPENDS ${_ml} ${ARGN} - WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}) - set_directory_properties(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES ${_cmx}) -@@ -58,7 +58,7 @@ ocaml_ml_to_cmx(${CMAKE_CURRENT_BINARY_DIR}/lexer.cmx ${CMAKE_CURRENT_SOURCE_DIR - # object files - - add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/modwrap.o -- COMMAND ${OCAML_OCAMLOPT_EXECUTABLE} -I +facile -c ${CMAKE_CURRENT_SOURCE_DIR}/solver/modwrap.c -o ${CMAKE_CURRENT_BINARY_DIR}/modwrap.o -+ COMMAND ${OCAML_OCAMLOPT_EXECUTABLE} -I ${LIBFACILE_INCLUDE_DIR} -c ${CMAKE_CURRENT_SOURCE_DIR}/solver/modwrap.c -o ${CMAKE_CURRENT_BINARY_DIR}/modwrap.o - DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/solver/modwrap.c ${CMAKE_CURRENT_BINARY_DIR}/solver.o - WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}) - set_directory_properties(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES ${CMAKE_CURRENT_BINARY_DIR}/modwrap.o) diff --git a/pkgs/desktops/kde-4.8/kdeedu/kalzium.nix b/pkgs/desktops/kde-4.8/kdeedu/kalzium.nix index 298aba06c8e..69ab5dfc473 100644 --- a/pkgs/desktops/kde-4.8/kdeedu/kalzium.nix +++ b/pkgs/desktops/kde-4.8/kdeedu/kalzium.nix @@ -2,8 +2,6 @@ kde { buildInputs = [ kdelibs facile ocaml eigen openbabel avogadro ]; - patches = [ ./kalzium-find-libfacile.patch ]; - meta = { description = "Periodic Table of Elements"; }; diff --git a/pkgs/development/tools/misc/gdb/default.nix b/pkgs/development/tools/misc/gdb/default.nix index cd2eb6cc02d..e9c424ccf11 100644 --- a/pkgs/development/tools/misc/gdb/default.nix +++ b/pkgs/development/tools/misc/gdb/default.nix @@ -14,7 +14,7 @@ let basename = if bleedingEdgeVersion then "gdb-7.3.20110726" - else "gdb-7.3.1"; + else "gdb-7.4"; # Whether (cross-)building for GNU/Hurd. This is an approximation since # having `stdenv ? cross' doesn't tell us if we're building `hostDrv' and @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { url = "mirror://gnu/gdb/${basename}.tar.bz2"; # md5 is provided by the annoucement page # http://www.gnu.org/s/gdb/download/ANNOUNCEMENT - md5 = "b89a5fac359c618dda97b88645ceab47"; + md5 = "95a9a8305fed4d30a30a6dc28ff9d060"; }; # I think python is not a native input, but I leave it @@ -75,6 +75,8 @@ stdenv.mkDerivation rec { rm -v $out/share/info/{standards,configure,bfd}.info ''; + enableParallelBuilding = true; + # TODO: Investigate & fix the test failures. doCheck = false; diff --git a/pkgs/misc/tex/texlive/moderncv.nix b/pkgs/misc/tex/texlive/moderncv.nix index f54800c7ccc..051d6c2d739 100644 --- a/pkgs/misc/tex/texlive/moderncv.nix +++ b/pkgs/misc/tex/texlive/moderncv.nix @@ -3,7 +3,7 @@ rec { name = "moderncv-2012.01.16"; src = fetchurl { url = "http://mirror.ctan.org/macros/latex/contrib/moderncv.zip"; - sha256 = "a9d2de7fc03c35c4084915b2788c8d7acfb695f9e27f6cd81427a7dd1a64cb54"; + sha256 = "1sfpj76p0z128rvxw0svh7dfrvf3zhmi3v7bkzfkll4byij34ni0"; }; buildInputs = [texLive unzip]; diff --git a/pkgs/tools/package-management/nix/unstable.nix b/pkgs/tools/package-management/nix/unstable.nix index de17381fec9..175ae069382 100644 --- a/pkgs/tools/package-management/nix/unstable.nix +++ b/pkgs/tools/package-management/nix/unstable.nix @@ -5,11 +5,11 @@ }: stdenv.mkDerivation rec { - name = "nix-1.0pre31729"; + name = "nix-1.0pre31851"; src = fetchurl { - url = "http://hydra.nixos.org/build/1867511/download/4/${name}.tar.bz2"; - sha256 = "c2e33d5837a686c42deaab1cfcf8ec0e13b0c841d936086d773a2415e4141d2d"; + url = "http://hydra.nixos.org/build/1937677/download/4/${name}.tar.bz2"; + sha256 = "36f07b6b701da74f07d8c8cc43044306e570b6837555ad523701d86e5f567568"; }; buildNativeInputs = [ perl pkgconfig ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3fee8f4b2fe..f5a8dd86df7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3131,13 +3131,11 @@ let uisp = callPackage ../development/tools/misc/uisp { }; gdb = callPackage ../development/tools/misc/gdb { - readline = readline5; hurd = gnu.hurdCross; inherit (gnu) mig; }; gdbCross = callPackage ../development/tools/misc/gdb { - readline = readline5; target = crossSystem; }; From a41d989a1ec77d56bc5ea2202a04b3089523bf44 Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Mon, 6 Feb 2012 23:08:11 +0000 Subject: [PATCH 078/197] svn merge ^/nixpkgs/trunk svn path=/nixpkgs/branches/stdenv-updates/; revision=32093 --- maintainers/scripts/test-eval-release.sh | 1 + pkgs/development/libraries/lcms2/default.nix | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/maintainers/scripts/test-eval-release.sh b/maintainers/scripts/test-eval-release.sh index 4ab3f9775a0..9ef531319e4 100755 --- a/maintainers/scripts/test-eval-release.sh +++ b/maintainers/scripts/test-eval-release.sh @@ -3,4 +3,5 @@ if [[ -z "$VERBOSE" ]]; then echo "You may set VERBOSE=1 to see debug output or to any other non-empty string to make this script completely silent" fi +unset HOME NIXPKGS_CONFIG # Force empty config nix-instantiate --strict --eval-only --xml --show-trace "$(dirname "$0")"/eval-release.nix 2>&1 > /dev/null diff --git a/pkgs/development/libraries/lcms2/default.nix b/pkgs/development/libraries/lcms2/default.nix index 75a7570201d..f3dcc7772e7 100644 --- a/pkgs/development/libraries/lcms2/default.nix +++ b/pkgs/development/libraries/lcms2/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl, libtiff, libjpeg, zlib}: stdenv.mkDerivation rec { - name = "lcms2-2.0a"; + name = "lcms2-2.3"; src = fetchurl { - url = "mirror://sf/lcms/${name}.tar.gz"; - sha256 = "0kq5imagri0l964nnj06f7xny2q7rwvzqpm8ibsqz5zm263ggskd"; + url = "mirror://sourceforge/lcms/${name}.tar.gz"; + sha256 = "1r5gmzhginzm90y70dcbamycdfcaz4f7v0bb4nwyaywlvsxpg89y"; }; propagatedBuildInputs = [ libtiff libjpeg zlib ]; From 1f3f0e6b652c67c8a14bfc457fd48a47c9d88500 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Tue, 7 Feb 2012 21:51:03 +0000 Subject: [PATCH 079/197] Updating zlib. The zlib.net site is down, but I could pick the file from a gentoo distfiles mirror. svn path=/nixpkgs/branches/stdenv-updates/; revision=32133 --- pkgs/development/libraries/zlib/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/zlib/default.nix b/pkgs/development/libraries/zlib/default.nix index a2f11bca87d..d3f1bfda456 100644 --- a/pkgs/development/libraries/zlib/default.nix +++ b/pkgs/development/libraries/zlib/default.nix @@ -1,11 +1,12 @@ { stdenv, fetchurl, static ? false }: stdenv.mkDerivation rec { - name = "zlib-1.2.5"; + name = "zlib-1.2.6"; src = fetchurl { - url = "http://www.zlib.net/${name}.tar.gz"; - sha256 = "0n7rlgvjn73pyil3s1l6p77m7wkc809n934rnzxv1b1za4pfar30"; + urls = [ "http://www.zlib.net/${name}.tar.gz" + "http://gentoo.netnitco.net/distfiles/${name}.tar.gz" ]; + sha256 = "06x6m33ls1606ni7275q5z392csvh18dgs55kshfnvrfal45w8r1"; }; patches = From 0de0994bc46f2d2fc265db20fc0885ce0ae73dd2 Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Wed, 8 Feb 2012 05:05:46 +0000 Subject: [PATCH 080/197] zlib: largefile_source problem fixed upstream svn path=/nixpkgs/branches/stdenv-updates/; revision=32135 --- pkgs/development/libraries/zlib/default.nix | 4 +- .../zlib/zlib-LARGEFILE64_SOURCE.patch | 69 ------------------- 2 files changed, 1 insertion(+), 72 deletions(-) delete mode 100644 pkgs/development/libraries/zlib/zlib-LARGEFILE64_SOURCE.patch diff --git a/pkgs/development/libraries/zlib/default.nix b/pkgs/development/libraries/zlib/default.nix index d3f1bfda456..1776e1349e6 100644 --- a/pkgs/development/libraries/zlib/default.nix +++ b/pkgs/development/libraries/zlib/default.nix @@ -9,9 +9,7 @@ stdenv.mkDerivation rec { sha256 = "06x6m33ls1606ni7275q5z392csvh18dgs55kshfnvrfal45w8r1"; }; - patches = - [ ./zlib-LARGEFILE64_SOURCE.patch ] - ++ stdenv.lib.optional (stdenv.system == "i686-cygwin") [ ./no-shared.patch ]; + patches = stdenv.lib.optional (stdenv.system == "i686-cygwin") [ ./no-shared.patch ]; configureFlags = if static then "" else "--shared"; diff --git a/pkgs/development/libraries/zlib/zlib-LARGEFILE64_SOURCE.patch b/pkgs/development/libraries/zlib/zlib-LARGEFILE64_SOURCE.patch deleted file mode 100644 index 6ddb0ad7066..00000000000 --- a/pkgs/development/libraries/zlib/zlib-LARGEFILE64_SOURCE.patch +++ /dev/null @@ -1,69 +0,0 @@ -http://mail.madler.net/pipermail/zlib-devel_madler.net/2011-June/002583.html - -[Zlib-devel] Possible typo in zlib.h - -Mark Adler madler at madler.net - -*** a/zlib.h 2010-04-19 21:12:48.000000000 -0700 ---- b/zlib.h 2011-02-26 21:23:30.000000000 -0800 -*************** -*** 1572,1584 **** - #endif - - #if !defined(ZLIB_INTERNAL) && _FILE_OFFSET_BITS-0 == 64 && _LFS64_LARGEFILE-0 -! # define gzopen gzopen64 -! # define gzseek gzseek64 -! # define gztell gztell64 -! # define gzoffset gzoffset64 -! # define adler32_combine adler32_combine64 -! # define crc32_combine crc32_combine64 -! # ifdef _LARGEFILE64_SOURCE - ZEXTERN gzFile ZEXPORT gzopen64 OF((const char *, const char *)); - ZEXTERN z_off_t ZEXPORT gzseek64 OF((gzFile, z_off_t, int)); - ZEXTERN z_off_t ZEXPORT gztell64 OF((gzFile)); ---- 1580,1601 ---- - #endif - - #if !defined(ZLIB_INTERNAL) && _FILE_OFFSET_BITS-0 == 64 && _LFS64_LARGEFILE-0 -! # ifdef Z_PREFIX_SET -! # define z_gzopen z_gzopen64 -! # define z_gzseek z_gzseek64 -! # define z_gztell z_gztell64 -! # define z_gzoffset z_gzoffset64 -! # define z_adler32_combine z_adler32_combine64 -! # define z_crc32_combine z_crc32_combine64 -! # else -! # define gzopen gzopen64 -! # define gzseek gzseek64 -! # define gztell gztell64 -! # define gzoffset gzoffset64 -! # define adler32_combine adler32_combine64 -! # define crc32_combine crc32_combine64 -! # endif -! # ifndef _LARGEFILE64_SOURCE - ZEXTERN gzFile ZEXPORT gzopen64 OF((const char *, const char *)); - ZEXTERN z_off_t ZEXPORT gzseek64 OF((gzFile, z_off_t, int)); - ZEXTERN z_off_t ZEXPORT gztell64 OF((gzFile)); -*** a/zconf.h.in 2010-04-18 10:58:06.000000000 -0700 ---- b/zconf.h.in 2010-07-18 09:05:49.000000000 -0700 -*************** -*** 374,380 **** - # undef _LARGEFILE64_SOURCE - #endif - -! #if defined(Z_HAVE_UNISTD_H) || defined(_LARGEFILE64_SOURCE) - # include /* for SEEK_* and off_t */ - # ifdef VMS - # include /* for off_t */ ---- 375,385 ---- - # undef _LARGEFILE64_SOURCE - #endif - -! #if defined(_LARGEFILE64_SOURCE) && _LFS64_LARGEFILE-0 -! # define Z_LARGE -! #endif -! -! #if defined(Z_HAVE_UNISTD_H) || defined(Z_LARGE) - # include /* for SEEK_* and off_t */ - # ifdef VMS - # include /* for off_t */ From f113fbb5ddf8559d45d737f36194253dce4ea8d0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Thu, 9 Feb 2012 09:35:54 +0000 Subject: [PATCH 081/197] Fixing the xine lib build, for problems building with zlib 1.2.6 svn path=/nixpkgs/branches/stdenv-updates/; revision=32153 --- .../libraries/xine-lib/default.nix | 1 + .../libraries/xine-lib/zlib126.patch | 52 +++++++++++++++++++ 2 files changed, 53 insertions(+) create mode 100644 pkgs/development/libraries/xine-lib/zlib126.patch diff --git a/pkgs/development/libraries/xine-lib/default.nix b/pkgs/development/libraries/xine-lib/default.nix index f8866e807a4..13b2fdce458 100644 --- a/pkgs/development/libraries/xine-lib/default.nix +++ b/pkgs/development/libraries/xine-lib/default.nix @@ -12,6 +12,7 @@ stdenv.mkDerivation rec { sha256 = "1yss9cxxkcb6dzrv78xvi845ls6lhhbv6g8yfm6zjjl07v7jbm6c"; }; + patches = [ ./zlib126.patch ]; # patches = # [ (fetchurl { # url = "http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/media-libs/xine-lib/files/xine-lib-1.1.19-ffmpeg.patch?revision=1.1"; diff --git a/pkgs/development/libraries/xine-lib/zlib126.patch b/pkgs/development/libraries/xine-lib/zlib126.patch new file mode 100644 index 00000000000..f48063e038b --- /dev/null +++ b/pkgs/development/libraries/xine-lib/zlib126.patch @@ -0,0 +1,52 @@ +http://anonscm.debian.org/hg/xine-lib/xine-lib/rev/24d09421ed09 + +# HG changeset patch +# User Ulrich Müller +# Date 1327945720 0 +# Node ID 24d09421ed09d3a78efeab5c9b8ab31daaaba4fd +# Parent da296856c52e654cf599248de3a01bb754363c79 +Compile failure in osd.c with sys-libs/zlib-1.2.6 + +diff -r da296856c52e -r 24d09421ed09 misc/xine-fontconv.c +--- a/misc/xine-fontconv.c Wed Jan 18 22:01:28 2012 +0000 ++++ b/misc/xine-fontconv.c Mon Jan 30 17:48:40 2012 +0000 +@@ -109,7 +109,7 @@ + osd_font_t font; + + +-static int gzwrite_i16(gzFile *fp, uint16_t number) { ++static int gzwrite_i16(gzFile fp, uint16_t number) { + return gzputc(fp, number & 0xFF) != -1 && + gzputc(fp, (number >> 8) & 0xFF) != -1; + } +@@ -341,7 +341,7 @@ + + char filename[1024]; + FT_Bitmap *out_bitmap; +- gzFile *fp; ++ gzFile fp; + int error; + int error_counter; + int glyph_index; +diff -r da296856c52e -r 24d09421ed09 src/xine-engine/osd.c +--- a/src/xine-engine/osd.c Wed Jan 18 22:01:28 2012 +0000 ++++ b/src/xine-engine/osd.c Mon Jan 30 17:48:40 2012 +0000 +@@ -650,7 +650,7 @@ + osd->display_y = y; + } + +-static uint16_t gzread_i16(gzFile *fp) { ++static uint16_t gzread_i16(gzFile fp) { + uint16_t ret; + ret = gzgetc(fp); + ret |= (gzgetc(fp)<<8); +@@ -663,7 +663,7 @@ + + static int osd_renderer_load_font(osd_renderer_t *this, char *filename) { + +- gzFile *fp; ++ gzFile fp; + osd_font_t *font = NULL; + int i, ret = 0; + + From ab93b3a03226d3f368f4e84085b593773b549e88 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Thu, 9 Feb 2012 19:45:31 +0000 Subject: [PATCH 082/197] Updating imagemagick; I think it's meant to build with the new zlib 1.2.6. I'll let hydra try it. I don't update this in trunk because a lot depends on this. svn path=/nixpkgs/branches/stdenv-updates/; revision=32166 --- pkgs/applications/graphics/ImageMagick/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/ImageMagick/default.nix b/pkgs/applications/graphics/ImageMagick/default.nix index 0b62ffdca5a..cbab2da551a 100644 --- a/pkgs/applications/graphics/ImageMagick/default.nix +++ b/pkgs/applications/graphics/ImageMagick/default.nix @@ -17,14 +17,14 @@ }: let - version = "6.6.9-4"; + version = "6.7.5-3"; in stdenv.mkDerivation rec { name = "ImageMagick-${version}"; src = fetchurl { url = "mirror://imagemagick/${name}.tar.xz"; - sha256 = "035j3i3cm29bwc9lipn838gznswrc69g7mwh8h9jj24ss2dmqrf1"; + sha256 = "0m0sa4jxsvm8pf9nfvkzlbzq13d1lj15lfz6jif12l6ywyh2c1cs"; }; configureFlags = '' From 232da3a29db13a09e98bddab17c88958027ed0e5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Thu, 9 Feb 2012 19:53:01 +0000 Subject: [PATCH 083/197] Adding a new url for isl.src. The current is only meant for the last version. svn path=/nixpkgs/branches/stdenv-updates/; revision=32167 --- pkgs/development/libraries/isl/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/isl/default.nix b/pkgs/development/libraries/isl/default.nix index b080064d393..aaec37eae8f 100644 --- a/pkgs/development/libraries/isl/default.nix +++ b/pkgs/development/libraries/isl/default.nix @@ -4,7 +4,10 @@ stdenv.mkDerivation rec { name = "isl-0.07"; # CLooG 0.16.3 fails to build with ISL 0.08. src = fetchurl { - url = "http://www.kotnet.org/~skimo/isl/${name}.tar.bz2"; + urls = [ + "http://www.kotnet.org/~skimo/isl/${name}.tar.bz2" + "ftp://ftp.linux.student.kuleuven.be/pub/people/skimo/isl/${name}.tar.bz2" + ]; sha256 = "0kpxmvhrwwdygqqafqzjf9xiksq7paac2x24g9jhr3f9ajj3zkyx"; }; From 02eaa57b562b0e2c43774ff8ffc247cabfaa5add Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 14 Feb 2012 13:47:27 +0000 Subject: [PATCH 084/197] merge latest changes from trunk svn path=/nixpkgs/branches/stdenv-updates/; revision=32270 --- pkgs/applications/networking/browsers/firefox/10.0.nix | 6 +++--- .../networking/instant-messengers/pidgin/default.nix | 4 ++-- pkgs/development/libraries/java/geoipjava/default.nix | 6 +++--- pkgs/top-level/all-packages.nix | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox/10.0.nix b/pkgs/applications/networking/browsers/firefox/10.0.nix index 79869b324b9..3a688cb6669 100644 --- a/pkgs/applications/networking/browsers/firefox/10.0.nix +++ b/pkgs/applications/networking/browsers/firefox/10.0.nix @@ -15,14 +15,14 @@ assert stdenv.gcc ? libc && stdenv.gcc.libc != null; rec { - firefoxVersion = "10.0"; + firefoxVersion = "10.0.1"; - xulVersion = "10.0"; # this attribute is used by other packages + xulVersion = "10.0.1"; # this attribute is used by other packages src = fetchurl { url = "http://releases.mozilla.org/pub/mozilla.org/firefox/releases/${firefoxVersion}/source/firefox-${firefoxVersion}.source.tar.bz2"; - sha1 = "cbf1fb0efe0a3a2b2dafaa324b136736e93de70c"; + sha1 = "8613957db84e6722ccf1ebf74fab927139614bfc"; }; commonConfigureFlags = diff --git a/pkgs/applications/networking/instant-messengers/pidgin/default.nix b/pkgs/applications/networking/instant-messengers/pidgin/default.nix index 89c3a10a45e..637744fc182 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin/default.nix @@ -23,8 +23,8 @@ stdenv.mkDerivation { name = "pidgin-2.9.0"; src = fetchurl { - url = mirror://sourceforge/pidgin/pidgin-2.9.0.tar.bz2; - sha256 = "1mygaap7cbak9n9zm4wshxnvb27a68w633d712vy2knr8z78xvi8"; + url = mirror://sourceforge/pidgin/pidgin-2.10.1.tar.bz2; + sha256 = "2f28bddc5edcd714d607d74126c8958ae7c258602b3929e3e6e783d3cb1beac8"; }; inherit nss ncurses; diff --git a/pkgs/development/libraries/java/geoipjava/default.nix b/pkgs/development/libraries/java/geoipjava/default.nix index 9cd61adf775..a924e2adfa6 100644 --- a/pkgs/development/libraries/java/geoipjava/default.nix +++ b/pkgs/development/libraries/java/geoipjava/default.nix @@ -1,10 +1,10 @@ {stdenv, fetchurl, jdk, unzip}: stdenv.mkDerivation { - name = "GeoIPJava-1.2.3"; + name = "GeoIPJava-1.2.5"; src = fetchurl { - url = http://geolite.maxmind.com/download/geoip/api/java/GeoIPJava-1.2.3.zip; - sha256 = "0l8vxan2xh0mp1vjxh39q05jyfw8gk5y77b7i8s1aw7ssyzd05vs"; + url = http://geolite.maxmind.com/download/geoip/api/java/GeoIPJava-1.2.5.zip; + sha256 = "1gb2d0qvvq7xankz7l7ymbr3qprwk9bifpy4hlgw0sq4i6a55ypd"; }; buildInputs = [ jdk unzip ]; buildPhase = diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 521ac8b2a66..b0774c0e2f7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6821,7 +6821,7 @@ let firefoxWrapper = wrapFirefox { browser = pkgs.firefox; }; - firefoxPkgs = pkgs.firefox90Pkgs; + firefoxPkgs = pkgs.firefox100Pkgs; firefox36Pkgs = callPackage ../applications/networking/browsers/firefox/3.6.nix { inherit (gtkLibs) gtk pango; From c81f618a343bbd8ee0473cbfd7217ee711b5ab58 Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Tue, 14 Feb 2012 14:33:10 +0000 Subject: [PATCH 085/197] svn merge ^/nixpkgs/trunk svn path=/nixpkgs/branches/stdenv-updates/; revision=32273 --- pkgs/desktops/kde-4.8/kdepim-runtime.nix | 7 +++++++ pkgs/tools/archivers/unzip/default.nix | 2 +- pkgs/top-level/release.nix | 1 - 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/kde-4.8/kdepim-runtime.nix b/pkgs/desktops/kde-4.8/kdepim-runtime.nix index ef637f3f075..f9280aad23a 100644 --- a/pkgs/desktops/kde-4.8/kdepim-runtime.nix +++ b/pkgs/desktops/kde-4.8/kdepim-runtime.nix @@ -5,6 +5,13 @@ kde { buildInputs = [ kdepimlibs akonadi boost shared_desktop_ontologies libxml2 libxslt ]; + patches = map fetchurl [ { + # See https://bugs.kde.org/show_bug.cgi?id=289932 + url = "http://bugsfiles.kde.org/attachment.cgi?id=68763"; + name = "delays-in-nepomuk-indexing.patch"; + sha256 = "0j3ndqwvi4bg789jb0wqsh2zpwi1gwdyng9gdmng189dx409jf85"; + } ]; + meta = { description = "KDE PIM runtime"; license = "GPL"; diff --git a/pkgs/tools/archivers/unzip/default.nix b/pkgs/tools/archivers/unzip/default.nix index 59ce1e397cf..8309a2102ab 100644 --- a/pkgs/tools/archivers/unzip/default.nix +++ b/pkgs/tools/archivers/unzip/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation ({ homepage = http://www.info-zip.org; description = "An extraction utility for archives compressed in .zip format"; license = "free"; # http://www.info-zip.org/license.html - meta.platforms = stdenv.lib.platforms.all; + platforms = stdenv.lib.platforms.all; }; } // (if enableNLS then { patches = diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix index 44419a040fd..c6b47005097 100644 --- a/pkgs/top-level/release.nix +++ b/pkgs/top-level/release.nix @@ -304,7 +304,6 @@ with (import ./release-lib.nix); udev = linux; uml = ["i686-linux"]; unrar = linux; - unzip = all; upstart = linux; usbutils = linux; utillinux = linux; From 35a4593277e82e3fc82db74687a3b448cc37c76a Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 14 Feb 2012 14:42:56 +0000 Subject: [PATCH 086/197] pkgs/development/compilers/gcc-4.6: strip trailing whitespace svn path=/nixpkgs/branches/stdenv-updates/; revision=32274 --- pkgs/development/compilers/gcc-4.6/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/gcc-4.6/default.nix b/pkgs/development/compilers/gcc-4.6/default.nix index 51985a8da20..ed8eff6b299 100644 --- a/pkgs/development/compilers/gcc-4.6/default.nix +++ b/pkgs/development/compilers/gcc-4.6/default.nix @@ -230,8 +230,8 @@ stdenv.mkDerivation ({ ${if enableMultilib then "" else "--disable-multilib"} ${if enableShared then "" else "--disable-shared"} ${if ppl != null then "--with-ppl=${ppl}" else ""} - ${if cloog != null then - "--with-cloog=${cloog} --enable-cloog-backend=isl" + ${if cloog != null then + "--with-cloog=${cloog} --enable-cloog-backend=isl" else ""} ${if langJava then "--with-ecj-jar=${javaEcj} " + @@ -319,7 +319,7 @@ stdenv.mkDerivation ({ --target=${stdenv.cross.config} ''; }; - + # Needed for the cross compilation to work AR = "ar"; From ebdb515865ec152c77bc58f4f568aa39bb38cff0 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 14 Feb 2012 14:42:59 +0000 Subject: [PATCH 087/197] pkgs/development/compilers/gcc-4.6: added 'enablePlugin' attribute (defaults to false) to add support for GCC plugins (such as melt) svn path=/nixpkgs/branches/stdenv-updates/; revision=32275 --- pkgs/development/compilers/gcc-4.6/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/compilers/gcc-4.6/default.nix b/pkgs/development/compilers/gcc-4.6/default.nix index ed8eff6b299..bd9ad426f45 100644 --- a/pkgs/development/compilers/gcc-4.6/default.nix +++ b/pkgs/development/compilers/gcc-4.6/default.nix @@ -19,6 +19,7 @@ , libXrandr ? null, libXi ? null, inputproto ? null, randrproto ? null , gnatboot ? null , enableMultilib ? false +, enablePlugin ? false , name ? "gcc" , cross ? null , binutilsCross ? null @@ -229,6 +230,7 @@ stdenv.mkDerivation ({ configureFlags = " ${if enableMultilib then "" else "--disable-multilib"} ${if enableShared then "" else "--disable-shared"} + ${if enablePlugin then "--enable-plugin" else ""} ${if ppl != null then "--with-ppl=${ppl}" else ""} ${if cloog != null then "--with-cloog=${cloog} --enable-cloog-backend=isl" From 31ebc5d950e4d7afd9ba384459e749911f6878ef Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 17 Feb 2012 14:34:42 +0000 Subject: [PATCH 088/197] * Get rid of Qt 4.6. It doesn't compile with GCC 4.6. There was only one application still using it (Caneda), but upgrading it allowed it to build with Qt 4.7. svn path=/nixpkgs/branches/stdenv-updates/; revision=32353 --- .../science/electronics/caneda/default.nix | 13 +-- .../libraries/qt-4.x/4.6/default.nix | 101 ------------------ .../libraries/qt-4.x/4.6/setup-hook.sh | 9 -- pkgs/top-level/all-packages.nix | 9 +- 4 files changed, 8 insertions(+), 124 deletions(-) delete mode 100644 pkgs/development/libraries/qt-4.x/4.6/default.nix delete mode 100644 pkgs/development/libraries/qt-4.x/4.6/setup-hook.sh diff --git a/pkgs/applications/science/electronics/caneda/default.nix b/pkgs/applications/science/electronics/caneda/default.nix index e1d6a886b67..6f930f84f7b 100644 --- a/pkgs/applications/science/electronics/caneda/default.nix +++ b/pkgs/applications/science/electronics/caneda/default.nix @@ -1,10 +1,11 @@ {stdenv, fetchgit, qt4, cmake, libxml2, libxslt}: let + srcComponents = fetchgit { - url = git://git.tuxfamily.org/gitroot/caneda/components.git; - rev = "9ff20b6ad1b8f639441123f195337121f3b02404"; - sha256 = "32f12e72eaadca7b8e409ee12c55fbbdbf43dfa9bc9675ac8458da6393ef3cad"; + url = git://caneda.git.sourceforge.net/gitroot/caneda/components; + rev = "34cd36b620e0dfc57ba2d2b6168734ea9a2cfa9a"; + sha256 = "840f07921eecbf10e38e44e5c61c716295a16c98fbb75016d9a44e7dfee40e59"; }; in @@ -13,9 +14,9 @@ stdenv.mkDerivation rec { name = "caneda-git-2010-10-24"; src = fetchgit { - url = git://git.tuxfamily.org/gitroot/caneda/caneda.git; - rev = "62fc0d8e248705ea51269dce8f291ff69924728e"; - sha256 = "8fa928b7dbd235eff3d938c5a1212ee360c6a90aab7b396eea2f5fe68aba7ab0"; + url = git://caneda.git.sourceforge.net/gitroot/caneda/caneda; + rev = "fff9e2f7988fe5d062548cafeda1e5cd660769d1"; + sha256 = "dfbcac97f5a1b41ad9a63392394f37fb294cbf78c576673c9bc4a5370957b2c8"; }; cmakeFlags = [ "-DCMAKE_BUILD_TYPE=Release" ]; diff --git a/pkgs/development/libraries/qt-4.x/4.6/default.nix b/pkgs/development/libraries/qt-4.x/4.6/default.nix deleted file mode 100644 index 904e29beae9..00000000000 --- a/pkgs/development/libraries/qt-4.x/4.6/default.nix +++ /dev/null @@ -1,101 +0,0 @@ -{ stdenv, fetchurl -, libXft, libXrender, randrproto, xextproto, libXinerama, xineramaproto, libXcursor, libXmu -, libXext, libXfixes, inputproto, fixesproto, libXrandr, freetype, fontconfig -, zlib, libjpeg, libpng, which, mesa, openssl, dbus, cups, pkgconfig, libtiff, glib -, mysql, postgresql -, perl, coreutils, libXi, sqlite, alsaLib -, buildDemos ? false, buildExamples ? false, useDocs ? true}: - -stdenv.mkDerivation rec { - name = "qt-4.6.3"; - - src = fetchurl { - url = ftp://ftp.qt.nokia.com/qt/source/qt-everywhere-opensource-src-4.6.3.tar.gz; - sha256 = "f4e0ada8d4d516bbb8600a3ee7d9046c9c79e38cd781df9ffc46d8f16acd1768"; - }; - - preConfigure = '' - export LD_LIBRARY_PATH="`pwd`/lib:$LD_LIBRARY_PATH" - configureFlags+=" - -docdir $out/share/doc/${name} - -plugindir $out/lib/qt4/plugins - -examplesdir $out/share/doc/${name}/examples - -demosdir $out/share/doc/${name}/demos - -datadir $out/share/qt4 - " - ''; - - propagatedBuildInputs = [ - alsaLib - sqlite - libXft - libXrender - libXrandr - libXi - randrproto - xextproto - libXinerama - xineramaproto - libXcursor - zlib - libjpeg - mysql - postgresql - libpng - which - mesa - libXmu - openssl - dbus.libs - cups - pkgconfig - libXext - freetype - fontconfig - inputproto - fixesproto - libXfixes - glib - libtiff - ]; - - buildInputs = [ perl ]; - - # libQtNetwork will call libQtCore for it to dlopen openssl. - NIX_LDFLAGS = "-rpath ${openssl}/lib"; - # Don't shrink the rpath, to keep ${openssl} in it. - dontPatchELF = 1; - - prefixKey = "-prefix "; - - configureFlags = '' - -v -no-separate-debug-info -release - -system-zlib -system-libpng -system-libjpeg -fast - -qt-gif -confirm-license -opensource - -opengl -xrender -xrandr -xinerama -xcursor -qt-sql-mysql -system-sqlite - -qdbus -cups -glib -xfixes -dbus-linked - -fontconfig -I${freetype}/include/freetype2 - -exceptions -xmlpatterns - ${if buildDemos == true then "" else "-nomake demos"} - ${if buildExamples == true then "" else "-nomake examples"} - ${if useDocs then "" else "-nomake docs"} - ''; - - patchPhase = '' - substituteInPlace configure --replace /bin/pwd pwd - substituteInPlace src/corelib/global/global.pri --replace /bin/ls ${coreutils}/bin/ls - sed -e 's@/usr@/FOO@' -i config.tests/*/*.test -i mkspecs/*/*.conf - ''; - - postInstall = if useDocs then "rm -rf $out/share/doc/${name}/{html,src}" else ""; - - enableParallelBuilding = true; - - meta = { - homepage = http://qt.nokia.com/products; - description = "A cross-platform application framework for C++"; - license = "GPL/LGPL"; - maintainers = with stdenv.lib.maintainers; [ sander urkud ]; - platforms = stdenv.lib.platforms.linux; - }; -} diff --git a/pkgs/development/libraries/qt-4.x/4.6/setup-hook.sh b/pkgs/development/libraries/qt-4.x/4.6/setup-hook.sh deleted file mode 100644 index f9ecacbbb7d..00000000000 --- a/pkgs/development/libraries/qt-4.x/4.6/setup-hook.sh +++ /dev/null @@ -1,9 +0,0 @@ -export QTDIR=@out@ - -if [ -n "$includeAllQtDirs" ]; then - # This helps for g++, but not for moc. And no qt4 package should expect - # having all qt4 header files dirs into -I. - for d in @out@/include/*; do - export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I$d" - done -fi diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9a1cff9f1a9..a77b45c1761 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4527,10 +4527,6 @@ let qt4 = pkgs.kde4.qt4; - qt46 = callPackage ../development/libraries/qt-4.x/4.6 { - inherit (gnome) glib; - }; - qt47 = callPackage ../development/libraries/qt-4.x/4.7 { inherit (pkgs.gnome) glib; }; @@ -8419,10 +8415,7 @@ let ### SCIENCE / ELECTRONICS - caneda = callPackage ../applications/science/electronics/caneda { - # At the time of writing, it fails to build with qt47 - qt4 = qt46; - }; + caneda = callPackage ../applications/science/electronics/caneda { }; gtkwave = callPackage ../applications/science/electronics/gtkwave { }; From d575666a1208c5b4b0fd852b48198bfb01012ad8 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 17 Feb 2012 17:02:18 +0000 Subject: [PATCH 089/197] * Fix building zlib on Cygwin. svn path=/nixpkgs/branches/stdenv-updates/; revision=32358 --- pkgs/development/libraries/zlib/default.nix | 8 +++++--- pkgs/development/libraries/zlib/no-shared.patch | 14 -------------- 2 files changed, 5 insertions(+), 17 deletions(-) delete mode 100644 pkgs/development/libraries/zlib/no-shared.patch diff --git a/pkgs/development/libraries/zlib/default.nix b/pkgs/development/libraries/zlib/default.nix index 1776e1349e6..7517b2e498a 100644 --- a/pkgs/development/libraries/zlib/default.nix +++ b/pkgs/development/libraries/zlib/default.nix @@ -4,12 +4,14 @@ stdenv.mkDerivation rec { name = "zlib-1.2.6"; src = fetchurl { - urls = [ "http://www.zlib.net/${name}.tar.gz" - "http://gentoo.netnitco.net/distfiles/${name}.tar.gz" ]; + urls = + [ "http://www.zlib.net/${name}.tar.gz" + "http://gentoo.netnitco.net/distfiles/${name}.tar.gz" + ]; sha256 = "06x6m33ls1606ni7275q5z392csvh18dgs55kshfnvrfal45w8r1"; }; - patches = stdenv.lib.optional (stdenv.system == "i686-cygwin") [ ./no-shared.patch ]; + patches = [ ]; configureFlags = if static then "" else "--shared"; diff --git a/pkgs/development/libraries/zlib/no-shared.patch b/pkgs/development/libraries/zlib/no-shared.patch deleted file mode 100644 index e26449ffd9f..00000000000 --- a/pkgs/development/libraries/zlib/no-shared.patch +++ /dev/null @@ -1,14 +0,0 @@ -Support building the static library only. - -diff -ru -x '*~' zlib-1.2.5-orig/Makefile.in zlib-1.2.5/Makefile.in ---- zlib-1.2.5-orig/Makefile.in 2010-04-20 06:12:21.000000000 +0200 -+++ zlib-1.2.5/Makefile.in 2010-07-27 13:25:02.176322291 +0200 -@@ -168,7 +168,7 @@ - -@if [ ! -d $(DESTDIR)$(man3dir) ]; then mkdir -p $(DESTDIR)$(man3dir); fi - -@if [ ! -d $(DESTDIR)$(pkgconfigdir) ]; then mkdir -p $(DESTDIR)$(pkgconfigdir); fi - cp $(STATICLIB) $(DESTDIR)$(libdir) -- cp $(SHAREDLIBV) $(DESTDIR)$(sharedlibdir) -+ test -z "$(SHAREDLIBV)" || cp $(SHAREDLIBV) $(DESTDIR)$(sharedlibdir) - cd $(DESTDIR)$(libdir); chmod u=rw,go=r $(STATICLIB) - -@(cd $(DESTDIR)$(libdir); $(RANLIB) libz.a || true) >/dev/null 2>&1 - -@cd $(DESTDIR)$(sharedlibdir); if test "$(SHAREDLIBV)" -a -f $(SHAREDLIBV); then \ From 9b4b40f05382b59b170451c930465e5cce1ead9a Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 17 Feb 2012 18:04:27 +0000 Subject: [PATCH 090/197] * Caneda: fix the version number. svn path=/nixpkgs/branches/stdenv-updates/; revision=32361 --- pkgs/applications/science/electronics/caneda/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/science/electronics/caneda/default.nix b/pkgs/applications/science/electronics/caneda/default.nix index 6f930f84f7b..d135fb09434 100644 --- a/pkgs/applications/science/electronics/caneda/default.nix +++ b/pkgs/applications/science/electronics/caneda/default.nix @@ -11,7 +11,7 @@ let in stdenv.mkDerivation rec { - name = "caneda-git-2010-10-24"; + name = "caneda-git-2012-02-16"; src = fetchgit { url = git://caneda.git.sourceforge.net/gitroot/caneda/caneda; From 0e6c77befa86dc9ed53d5ebd75b3a0897f90bca8 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 17 Feb 2012 19:32:15 +0000 Subject: [PATCH 091/197] * On Darwin, don't link Perl against /usr/lib/libutil.dylib. Libutil uses /usr/lib/libstdc++.dylib, and so we get segfaults when using Perl modules that depend on another libstdc++.dylib (like Nix's Perl bindings). It doesn't appear that libutil provides useful functionality for Perl on Darwin. svn path=/nixpkgs/branches/stdenv-updates/; revision=32364 --- pkgs/development/interpreters/perl/5.14/default.nix | 3 ++- .../interpreters/perl/5.14/no-libutil.patch | 12 ++++++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/interpreters/perl/5.14/no-libutil.patch diff --git a/pkgs/development/interpreters/perl/5.14/default.nix b/pkgs/development/interpreters/perl/5.14/default.nix index bdd3365b8b0..75b15da3efd 100644 --- a/pkgs/development/interpreters/perl/5.14/default.nix +++ b/pkgs/development/interpreters/perl/5.14/default.nix @@ -17,7 +17,8 @@ stdenv.mkDerivation rec { patches = [ # Do not look in /usr etc. for dependencies. ./no-sys-dirs.patch - ]; + ] + ++ stdenv.lib.optional stdenv.isDarwin ./no-libutil.patch; # Build a thread-safe Perl with a dynamic libperls.o. We need the # "installstyle" option to ensure that modules are put under diff --git a/pkgs/development/interpreters/perl/5.14/no-libutil.patch b/pkgs/development/interpreters/perl/5.14/no-libutil.patch new file mode 100644 index 00000000000..9b749bccf32 --- /dev/null +++ b/pkgs/development/interpreters/perl/5.14/no-libutil.patch @@ -0,0 +1,12 @@ +diff -ru -x '*~' perl-5.14.2-orig/Configure perl-5.14.2/Configure +--- perl-5.14.2-orig/Configure 2011-09-26 11:44:34.000000000 +0200 ++++ perl-5.14.2/Configure 2012-02-16 17:24:50.779839039 +0100 +@@ -1368,7 +1368,7 @@ + : List of libraries we want. + : If anyone needs extra -lxxx, put those in a hint file. + libswanted="sfio socket bind inet nsl nm ndbm gdbm dbm db malloc dl dld ld sun" +-libswanted="$libswanted m crypt sec util c cposix posix ucb bsd BSD" ++libswanted="$libswanted m crypt sec c cposix posix ucb bsd BSD" + : We probably want to search /usr/shlib before most other libraries. + : This is only used by the lib/ExtUtils/MakeMaker.pm routine extliblist. + glibpth=`echo " $glibpth " | sed -e 's! /usr/shlib ! !'` From da3ecd1256c4929845d954f3787d7ae2d08ee62b Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 17 Feb 2012 19:33:12 +0000 Subject: [PATCH 092/197] * gcc-apple: produce a libstdc++.dylib that doesn't depend on /usr/lib/libstdc++.dylib. svn path=/nixpkgs/branches/stdenv-updates/; revision=32365 --- .../compilers/gcc-apple64/builder.sh | 27 ++++++++++--------- .../compilers/gcc-apple64/default.nix | 26 +++++++++++------- .../gcc-apple64/fix-libstdc++-link.patch | 17 ++++++++++++ 3 files changed, 47 insertions(+), 23 deletions(-) create mode 100644 pkgs/development/compilers/gcc-apple64/fix-libstdc++-link.patch diff --git a/pkgs/development/compilers/gcc-apple64/builder.sh b/pkgs/development/compilers/gcc-apple64/builder.sh index 6072aef9d59..036678460d6 100644 --- a/pkgs/development/compilers/gcc-apple64/builder.sh +++ b/pkgs/development/compilers/gcc-apple64/builder.sh @@ -84,22 +84,32 @@ postInstall() { rm -rf $out/libexec/gcc/*/*/install-tools } + postUnpack() { - mv $libstdcxx/libstdcxx $sourceRoot/ + mv $libstdcxx/libstdcxx $sourceRoot/ } + STDCXX_INCDIR="$out/include/c++/4.2.1" genericBuild echo '-------------------------------------------------------------------------------------------------------------------------' -echo 'libstdcxx-16' +echo 'libstdcxx' echo '-------------------------------------------------------------------------------------------------------------------------' cd .. pwd +unpackPhase () { + true +} + +patchPhase() { + true +} + preConfigure() { # Perform the build in a different directory. mkdir ../build_libstdcxx @@ -111,18 +121,9 @@ preConfigure() { configureFlags="--disable-libstdcxx-pch --disable-libstdcxx-debug --disable-multilib --with-gxx-include-dir=${STDCXX_INCDIR}" } -unpackPhase () { - echo '-' -} - postInstall() { - echo '-' - echo "cp -v ${STDCXX_INCDIR}/*/bits/* ${STDCXX_INCDIR}/bits/" - cp -v ${STDCXX_INCDIR}/*/bits/* ${STDCXX_INCDIR}/bits/ -} - -patchPhase() { - echo '-' + echo "cp -v ${STDCXX_INCDIR}/*/bits/* ${STDCXX_INCDIR}/bits/" + cp -v ${STDCXX_INCDIR}/*/bits/* ${STDCXX_INCDIR}/bits/ } genericBuild diff --git a/pkgs/development/compilers/gcc-apple64/default.nix b/pkgs/development/compilers/gcc-apple64/default.nix index e2f70fbc1f5..9f46f1da1e4 100644 --- a/pkgs/development/compilers/gcc-apple64/default.nix +++ b/pkgs/development/compilers/gcc-apple64/default.nix @@ -1,10 +1,9 @@ { stdenv, fetchurl, noSysDirs -, langC ? true, langCC ? true, langObjC ? true, langF77 ? false +, langCC ? true, langObjC ? true, langF77 ? false , profiledCompiler ? false , gmp ? null, mpfr ? null, bison ? null, flex ? null }: -assert langC; assert stdenv.isDarwin; assert langF77 -> gmp != null; @@ -12,27 +11,34 @@ let version = "4.2.1"; # Upstream GCC version, from `gcc/BASE-VER'. revision = "5666.3"; # Apple's fork revision number. in -stdenv.mkDerivation ({ + +stdenv.mkDerivation { name = "gcc-apple-${version}.${revision}"; builder = ./builder.sh; src = - stdenv.lib.optional /*langC*/ true (fetchurl { + stdenv.lib.optional true (fetchurl { url = "http://www.opensource.apple.com/tarballs/gcc/gcc-${revision}.tar.gz"; sha256 = "0nq1szgqx9ryh1qsn5n6yd55gpvf56wr8f7w1jzabb8idlvz8ikc"; }) ++ stdenv.lib.optional langCC (fetchurl { - url = http://www.opensource.apple.com/tarballs/libstdcxx/libstdcxx-39.tar.gz ; + url = http://www.opensource.apple.com/tarballs/libstdcxx/libstdcxx-39.tar.gz; sha256 = "ccf4cf432c142778c766affbbf66b61001b6c4f1107bc2b2c77ce45598786b6d"; - }) ; + }); enableParallelBuilding = true; libstdcxx = "libstdcxx-39"; + sourceRoot = "gcc-${revision}/"; + patches = - [./pass-cxxcpp.patch ] - ++ (if noSysDirs then [./no-sys-dirs.patch] else []); - inherit noSysDirs langC langCC langF77 langObjC profiledCompiler; -} // (if langF77 then {buildInputs = [gmp mpfr bison flex];} else {})) + [ ./pass-cxxcpp.patch ./fix-libstdc++-link.patch ] + ++ stdenv.lib.optional noSysDirs [ ./no-sys-dirs.patch ]; + + inherit noSysDirs langCC langF77 langObjC; + langC = true; + + buildInputs = stdenv.lib.optionals langF77 [ gmp mpfr bison flex ]; +} diff --git a/pkgs/development/compilers/gcc-apple64/fix-libstdc++-link.patch b/pkgs/development/compilers/gcc-apple64/fix-libstdc++-link.patch new file mode 100644 index 00000000000..e7b8a55a29a --- /dev/null +++ b/pkgs/development/compilers/gcc-apple64/fix-libstdc++-link.patch @@ -0,0 +1,17 @@ +Prevent our libstdc++.dylib from having a runtime dependency on +/usr/lib/libstdc++.dylib. This is caused by the implicit -lstdc++ +passed by g++ when it links libstdc++.dylib. Adding "-nostdlib" to +the g++ invocation prevents this. + +diff -ru -x '*~' libstdcxx-39-orig/libstdcxx/libstdc++-v3/src/Makefile.in libstdcxx-39/libstdcxx/libstdc++-v3/src/Makefile.in +--- x/libstdcxx/libstdc++-v3/src/Makefile.in 2006-10-16 21:08:22.000000000 +0200 ++++ y/libstdcxx/libstdc++-v3/src/Makefile.in 2012-02-17 18:44:05.210570590 +0100 +@@ -388,7 +388,7 @@ + + libstdc___la_DEPENDENCIES = ${version_dep} $(libstdc___la_LIBADD) + libstdc___la_LDFLAGS = \ +- -version-info $(libtool_VERSION) ${version_arg} -lm ++ -version-info $(libtool_VERSION) ${version_arg} -lm -Wc,-nostdlib + + + # Use special rules for the deprecated source files so that they find From d4742ad714ae188b4ce6826dc7310456f532ec34 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Fri, 17 Feb 2012 20:37:31 +0000 Subject: [PATCH 093/197] GNU libc 2.14: Fix cross-GNU builds. svn path=/nixpkgs/branches/stdenv-updates/; revision=32367 --- pkgs/top-level/all-packages.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a77b45c1761..a73b2443999 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3576,15 +3576,18 @@ let in ({ inherit stdenv fetchurl; gccCross = gccCrossStageStatic; - kernelHeaders = if crossGNU then hurdHeaders else linuxHeadersCross; + kernelHeaders = if crossGNU then gnu.hurdHeaders else linuxHeadersCross; installLocales = getConfig [ "glibc" "locales" ] false; } // (if crossGNU - then { inherit machHeaders hurdHeaders mig fetchgit; } - else { })))); + then { + inherit (gnu) machHeaders hurdHeaders libpthreadHeaders mig; + inherit fetchgit; + } + else { }))); # We can choose: libcCrossChooser = name : if (name == "glibc") then glibcCross From a5d55a95140734ca3a171f2826ac23dbc769c978 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Fri, 17 Feb 2012 21:24:03 +0000 Subject: [PATCH 094/197] Fix typo in `all-packages.nix'. svn path=/nixpkgs/branches/stdenv-updates/; revision=32368 --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a73b2443999..05977e8fbcb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3587,7 +3587,7 @@ let inherit (gnu) machHeaders hurdHeaders libpthreadHeaders mig; inherit fetchgit; } - else { }))); + else { })))); # We can choose: libcCrossChooser = name : if (name == "glibc") then glibcCross From 483f094acb9a9be5953fd501c961decb93ba3c3e Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Fri, 17 Feb 2012 21:37:15 +0000 Subject: [PATCH 095/197] Honor propagatedUserEnvPackages in setup.sh svn path=/nixpkgs/branches/stdenv-updates/; revision=32369 --- pkgs/stdenv/generic/setup.sh | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh index 68e2ae4e260..655b7f94047 100644 --- a/pkgs/stdenv/generic/setup.sh +++ b/pkgs/stdenv/generic/setup.sh @@ -753,6 +753,11 @@ fixupPhase() { echo "$propagatedBuildNativeInputs" > "$out/nix-support/propagated-build-native-inputs" fi + if [ -n "$propagatedUserEnvPkgs" ]; then + mkdir -p "$out/nix-support" + echo "$propagatedUserEnvPkgs" > "$out/nix-support/propagated-user-env-packages" + fi + if [ -n "$setupHook" ]; then mkdir -p "$out/nix-support" substituteAll "$setupHook" "$out/nix-support/setup-hook" From 6c2de318ad40dc832c37b4b866a22b046151bc34 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 17 Feb 2012 21:47:08 +0000 Subject: [PATCH 096/197] * Move all gcc versions to development/compilers/gcc. svn path=/nixpkgs/branches/stdenv-updates/; revision=32371 --- .../compilers/gcc-upc-4.0/default.nix | 20 +++++----- .../{gcc-2.95 => gcc/2.95}/builder.sh | 0 .../{gcc-2.95 => gcc/2.95}/default.nix | 0 .../{gcc-2.95 => gcc/2.95}/no-sys-dirs.patch | 0 .../compilers/{gcc-3.3 => gcc/3.3}/builder.sh | 0 .../{gcc-3.3 => gcc/3.3}/default.nix | 0 .../compilers/{gcc-3.4 => gcc/3.4}/builder.sh | 0 .../{gcc-3.4 => gcc/3.4}/default.nix | 2 +- .../{gcc-3.4 => gcc/3.4}/no-sys-dirs.patch | 0 .../compilers/{gcc-4.0 => gcc/4.0}/builder.sh | 0 .../{gcc-4.0 => gcc/4.0}/default.nix | 2 +- .../{gcc-4.0 => gcc/4.0}/gcc-4.0.2-cxx.patch | 0 .../{gcc-4.0 => gcc/4.0}/no-sys-dirs.patch | 0 .../compilers/{gcc-4.1 => gcc/4.1}/builder.sh | 0 .../{gcc-4.1 => gcc/4.1}/default.nix | 2 +- .../{gcc-4.1 => gcc/4.1}/no-sys-dirs.patch | 0 .../{gcc-apple => gcc/4.2-apple32}/builder.sh | 0 .../4.2-apple32}/debug_list.patch | 0 .../4.2-apple32}/default.nix | 0 .../4.2-apple32}/no-sys-dirs.patch | 0 .../4.2-apple32}/pass-cxxcpp.patch | 0 .../4.2-apple64}/builder.sh | 0 .../4.2-apple64}/debug_list.patch | 0 .../4.2-apple64}/default.nix | 0 .../4.2-apple64}/fix-libstdc++-link.patch | 0 .../4.2-apple64}/no-sys-dirs.patch | 0 .../4.2-apple64}/pass-cxxcpp.patch | 0 .../compilers/{gcc-4.2 => gcc/4.2}/builder.sh | 0 .../{gcc-4.2 => gcc/4.2}/default.nix | 0 .../{gcc-4.2 => gcc/4.2}/no-sys-dirs.patch | 0 .../{gcc-4.2 => gcc/4.2}/pass-cxxcpp.patch | 0 .../compilers/{gcc-4.3 => gcc/4.3}/builder.sh | 0 .../{gcc-4.3 => gcc/4.3}/default.nix | 0 .../4.3}/ghdl-ortho-cflags.patch | 0 .../4.3}/java-jvgenmain-link.patch | 0 .../{gcc-4.3 => gcc/4.3}/libmudflap-cpp.patch | 0 .../4.3}/no-sys-dirs-fortran.patch | 0 .../{gcc-4.3 => gcc/4.3}/no-sys-dirs.patch | 0 .../{gcc-4.3 => gcc/4.3}/pass-cxxcpp.patch | 0 .../compilers/{gcc-4.4 => gcc/4.4}/builder.sh | 0 .../{gcc-4.4 => gcc/4.4}/default.nix | 0 .../4.4}/ghdl-ortho-cflags.patch | 0 .../{gcc-4.4 => gcc/4.4}/gnat-cflags.patch | 0 .../4.4}/java-jvgenmain-link.patch | 0 .../4.4}/libstdc++-target.patch | 0 .../{gcc-4.4 => gcc/4.4}/no-sys-dirs.patch | 0 .../{gcc-4.4 => gcc/4.4}/pass-cxxcpp.patch | 0 .../{gcc-4.4 => gcc/4.4}/pr41818.patch | 0 .../{gcc-4.4 => gcc/4.4}/sources.nix | 0 .../{gcc-4.4 => gcc/4.4}/target-cpp.patch | 0 .../{gcc-4.4 => gcc/4.4}/update-gcc.sh | 0 .../compilers/{gcc-4.5 => gcc/4.5}/builder.sh | 0 .../{gcc-4.5 => gcc/4.5}/default.nix | 0 .../4.5}/ghdl-ortho-cflags.patch | 0 .../{gcc-4.5 => gcc/4.5}/gnat-cflags.patch | 0 .../4.5}/java-jvgenmain-link.patch | 0 .../4.5}/libstdc++-target.patch | 0 .../{gcc-4.5 => gcc/4.5}/no-sys-dirs.patch | 0 .../{gcc-4.5 => gcc/4.5}/sources.nix | 0 .../{gcc-4.5 => gcc/4.5}/update-gcc.sh | 0 .../compilers/{gcc-4.6 => gcc/4.6}/builder.sh | 0 .../{gcc-4.6 => gcc/4.6}/default.nix | 0 .../4.6}/ghdl-ortho-cflags.patch | 0 .../{gcc-4.6 => gcc/4.6}/gnat-cflags.patch | 0 .../4.6}/java-jvgenmain-link.patch | 0 .../4.6}/libstdc++-target.patch | 0 .../{gcc-4.6 => gcc/4.6}/no-sys-dirs.patch | 0 .../{gcc-4.6 => gcc/4.6}/sources.nix | 0 .../{gcc-4.6 => gcc/4.6}/update-gcc.sh | 0 pkgs/top-level/all-packages.nix | 40 +++++++++---------- 70 files changed, 34 insertions(+), 32 deletions(-) rename pkgs/development/compilers/{gcc-2.95 => gcc/2.95}/builder.sh (100%) rename pkgs/development/compilers/{gcc-2.95 => gcc/2.95}/default.nix (100%) rename pkgs/development/compilers/{gcc-2.95 => gcc/2.95}/no-sys-dirs.patch (100%) rename pkgs/development/compilers/{gcc-3.3 => gcc/3.3}/builder.sh (100%) rename pkgs/development/compilers/{gcc-3.3 => gcc/3.3}/default.nix (100%) rename pkgs/development/compilers/{gcc-3.4 => gcc/3.4}/builder.sh (100%) rename pkgs/development/compilers/{gcc-3.4 => gcc/3.4}/default.nix (97%) rename pkgs/development/compilers/{gcc-3.4 => gcc/3.4}/no-sys-dirs.patch (100%) rename pkgs/development/compilers/{gcc-4.0 => gcc/4.0}/builder.sh (100%) rename pkgs/development/compilers/{gcc-4.0 => gcc/4.0}/default.nix (97%) rename pkgs/development/compilers/{gcc-4.0 => gcc/4.0}/gcc-4.0.2-cxx.patch (100%) rename pkgs/development/compilers/{gcc-4.0 => gcc/4.0}/no-sys-dirs.patch (100%) rename pkgs/development/compilers/{gcc-4.1 => gcc/4.1}/builder.sh (100%) rename pkgs/development/compilers/{gcc-4.1 => gcc/4.1}/default.nix (98%) rename pkgs/development/compilers/{gcc-4.1 => gcc/4.1}/no-sys-dirs.patch (100%) rename pkgs/development/compilers/{gcc-apple => gcc/4.2-apple32}/builder.sh (100%) rename pkgs/development/compilers/{gcc-apple => gcc/4.2-apple32}/debug_list.patch (100%) rename pkgs/development/compilers/{gcc-apple => gcc/4.2-apple32}/default.nix (100%) rename pkgs/development/compilers/{gcc-apple => gcc/4.2-apple32}/no-sys-dirs.patch (100%) rename pkgs/development/compilers/{gcc-apple => gcc/4.2-apple32}/pass-cxxcpp.patch (100%) rename pkgs/development/compilers/{gcc-apple64 => gcc/4.2-apple64}/builder.sh (100%) rename pkgs/development/compilers/{gcc-apple64 => gcc/4.2-apple64}/debug_list.patch (100%) rename pkgs/development/compilers/{gcc-apple64 => gcc/4.2-apple64}/default.nix (100%) rename pkgs/development/compilers/{gcc-apple64 => gcc/4.2-apple64}/fix-libstdc++-link.patch (100%) rename pkgs/development/compilers/{gcc-apple64 => gcc/4.2-apple64}/no-sys-dirs.patch (100%) rename pkgs/development/compilers/{gcc-apple64 => gcc/4.2-apple64}/pass-cxxcpp.patch (100%) rename pkgs/development/compilers/{gcc-4.2 => gcc/4.2}/builder.sh (100%) rename pkgs/development/compilers/{gcc-4.2 => gcc/4.2}/default.nix (100%) rename pkgs/development/compilers/{gcc-4.2 => gcc/4.2}/no-sys-dirs.patch (100%) rename pkgs/development/compilers/{gcc-4.2 => gcc/4.2}/pass-cxxcpp.patch (100%) rename pkgs/development/compilers/{gcc-4.3 => gcc/4.3}/builder.sh (100%) rename pkgs/development/compilers/{gcc-4.3 => gcc/4.3}/default.nix (100%) rename pkgs/development/compilers/{gcc-4.3 => gcc/4.3}/ghdl-ortho-cflags.patch (100%) rename pkgs/development/compilers/{gcc-4.3 => gcc/4.3}/java-jvgenmain-link.patch (100%) rename pkgs/development/compilers/{gcc-4.3 => gcc/4.3}/libmudflap-cpp.patch (100%) rename pkgs/development/compilers/{gcc-4.3 => gcc/4.3}/no-sys-dirs-fortran.patch (100%) rename pkgs/development/compilers/{gcc-4.3 => gcc/4.3}/no-sys-dirs.patch (100%) rename pkgs/development/compilers/{gcc-4.3 => gcc/4.3}/pass-cxxcpp.patch (100%) rename pkgs/development/compilers/{gcc-4.4 => gcc/4.4}/builder.sh (100%) rename pkgs/development/compilers/{gcc-4.4 => gcc/4.4}/default.nix (100%) rename pkgs/development/compilers/{gcc-4.4 => gcc/4.4}/ghdl-ortho-cflags.patch (100%) rename pkgs/development/compilers/{gcc-4.4 => gcc/4.4}/gnat-cflags.patch (100%) rename pkgs/development/compilers/{gcc-4.4 => gcc/4.4}/java-jvgenmain-link.patch (100%) rename pkgs/development/compilers/{gcc-4.4 => gcc/4.4}/libstdc++-target.patch (100%) rename pkgs/development/compilers/{gcc-4.4 => gcc/4.4}/no-sys-dirs.patch (100%) rename pkgs/development/compilers/{gcc-4.4 => gcc/4.4}/pass-cxxcpp.patch (100%) rename pkgs/development/compilers/{gcc-4.4 => gcc/4.4}/pr41818.patch (100%) rename pkgs/development/compilers/{gcc-4.4 => gcc/4.4}/sources.nix (100%) rename pkgs/development/compilers/{gcc-4.4 => gcc/4.4}/target-cpp.patch (100%) rename pkgs/development/compilers/{gcc-4.4 => gcc/4.4}/update-gcc.sh (100%) rename pkgs/development/compilers/{gcc-4.5 => gcc/4.5}/builder.sh (100%) rename pkgs/development/compilers/{gcc-4.5 => gcc/4.5}/default.nix (100%) rename pkgs/development/compilers/{gcc-4.5 => gcc/4.5}/ghdl-ortho-cflags.patch (100%) rename pkgs/development/compilers/{gcc-4.5 => gcc/4.5}/gnat-cflags.patch (100%) rename pkgs/development/compilers/{gcc-4.5 => gcc/4.5}/java-jvgenmain-link.patch (100%) rename pkgs/development/compilers/{gcc-4.5 => gcc/4.5}/libstdc++-target.patch (100%) rename pkgs/development/compilers/{gcc-4.5 => gcc/4.5}/no-sys-dirs.patch (100%) rename pkgs/development/compilers/{gcc-4.5 => gcc/4.5}/sources.nix (100%) rename pkgs/development/compilers/{gcc-4.5 => gcc/4.5}/update-gcc.sh (100%) rename pkgs/development/compilers/{gcc-4.6 => gcc/4.6}/builder.sh (100%) rename pkgs/development/compilers/{gcc-4.6 => gcc/4.6}/default.nix (100%) rename pkgs/development/compilers/{gcc-4.6 => gcc/4.6}/ghdl-ortho-cflags.patch (100%) rename pkgs/development/compilers/{gcc-4.6 => gcc/4.6}/gnat-cflags.patch (100%) rename pkgs/development/compilers/{gcc-4.6 => gcc/4.6}/java-jvgenmain-link.patch (100%) rename pkgs/development/compilers/{gcc-4.6 => gcc/4.6}/libstdc++-target.patch (100%) rename pkgs/development/compilers/{gcc-4.6 => gcc/4.6}/no-sys-dirs.patch (100%) rename pkgs/development/compilers/{gcc-4.6 => gcc/4.6}/sources.nix (100%) rename pkgs/development/compilers/{gcc-4.6 => gcc/4.6}/update-gcc.sh (100%) diff --git a/pkgs/development/compilers/gcc-upc-4.0/default.nix b/pkgs/development/compilers/gcc-upc-4.0/default.nix index 68ae49b152a..b3b458aae1f 100644 --- a/pkgs/development/compilers/gcc-upc-4.0/default.nix +++ b/pkgs/development/compilers/gcc-upc-4.0/default.nix @@ -6,14 +6,16 @@ , texinfo ? null }: -with import ../../../lib; +with stdenv.lib; # GCC-UPC apparently doesn't support GCov and friends. assert profiledCompiler == false; stdenv.mkDerivation { name = "gcc-upc-4.0.3.5"; - builder = ../gcc-4.0/builder.sh; + + builder = ../gcc/4.0/builder.sh; + src = fetchurl { url = "ftp://ftp.intrepid.com/pub/upc/rls/upc-4.0.3.5/upc-4.0.3.5.src.tar.gz"; sha256 = "0afnz1bz0kknhl18205bbwncyza08983ivfaagj5yl7x3nwy7prv"; @@ -30,13 +32,13 @@ stdenv.mkDerivation { langF77 = false; langUPC = true; # unused - buildInputs = [gmp mpfr texinfo - - # Bison is needed to build the parsers. - bison - - # For some reason, `autoheader' and `m4' are needed. - autoconf gnum4]; + buildInputs = + [ gmp mpfr texinfo + # Bison is needed to build the parsers. + bison + # For some reason, `autoheader' and `m4' are needed. + autoconf gnum4 + ]; # Note: We use `--enable-maintainer-mode' so that `bison' is actually # run when needed. diff --git a/pkgs/development/compilers/gcc-2.95/builder.sh b/pkgs/development/compilers/gcc/2.95/builder.sh similarity index 100% rename from pkgs/development/compilers/gcc-2.95/builder.sh rename to pkgs/development/compilers/gcc/2.95/builder.sh diff --git a/pkgs/development/compilers/gcc-2.95/default.nix b/pkgs/development/compilers/gcc/2.95/default.nix similarity index 100% rename from pkgs/development/compilers/gcc-2.95/default.nix rename to pkgs/development/compilers/gcc/2.95/default.nix diff --git a/pkgs/development/compilers/gcc-2.95/no-sys-dirs.patch b/pkgs/development/compilers/gcc/2.95/no-sys-dirs.patch similarity index 100% rename from pkgs/development/compilers/gcc-2.95/no-sys-dirs.patch rename to pkgs/development/compilers/gcc/2.95/no-sys-dirs.patch diff --git a/pkgs/development/compilers/gcc-3.3/builder.sh b/pkgs/development/compilers/gcc/3.3/builder.sh similarity index 100% rename from pkgs/development/compilers/gcc-3.3/builder.sh rename to pkgs/development/compilers/gcc/3.3/builder.sh diff --git a/pkgs/development/compilers/gcc-3.3/default.nix b/pkgs/development/compilers/gcc/3.3/default.nix similarity index 100% rename from pkgs/development/compilers/gcc-3.3/default.nix rename to pkgs/development/compilers/gcc/3.3/default.nix diff --git a/pkgs/development/compilers/gcc-3.4/builder.sh b/pkgs/development/compilers/gcc/3.4/builder.sh similarity index 100% rename from pkgs/development/compilers/gcc-3.4/builder.sh rename to pkgs/development/compilers/gcc/3.4/builder.sh diff --git a/pkgs/development/compilers/gcc-3.4/default.nix b/pkgs/development/compilers/gcc/3.4/default.nix similarity index 97% rename from pkgs/development/compilers/gcc-3.4/default.nix rename to pkgs/development/compilers/gcc/3.4/default.nix index de7f079b2d9..6cadf58d2ce 100644 --- a/pkgs/development/compilers/gcc-3.4/default.nix +++ b/pkgs/development/compilers/gcc/3.4/default.nix @@ -5,7 +5,7 @@ assert langC; -with import ../../../lib; +with stdenv.lib; stdenv.mkDerivation { name = "gcc-3.4.6"; diff --git a/pkgs/development/compilers/gcc-3.4/no-sys-dirs.patch b/pkgs/development/compilers/gcc/3.4/no-sys-dirs.patch similarity index 100% rename from pkgs/development/compilers/gcc-3.4/no-sys-dirs.patch rename to pkgs/development/compilers/gcc/3.4/no-sys-dirs.patch diff --git a/pkgs/development/compilers/gcc-4.0/builder.sh b/pkgs/development/compilers/gcc/4.0/builder.sh similarity index 100% rename from pkgs/development/compilers/gcc-4.0/builder.sh rename to pkgs/development/compilers/gcc/4.0/builder.sh diff --git a/pkgs/development/compilers/gcc-4.0/default.nix b/pkgs/development/compilers/gcc/4.0/default.nix similarity index 97% rename from pkgs/development/compilers/gcc-4.0/default.nix rename to pkgs/development/compilers/gcc/4.0/default.nix index 45c5bedd99b..4e51681a533 100644 --- a/pkgs/development/compilers/gcc-4.0/default.nix +++ b/pkgs/development/compilers/gcc/4.0/default.nix @@ -8,7 +8,7 @@ assert langC; -with import ../../../lib; +with stdenv.lib; stdenv.mkDerivation { name = "${name}-4.0.4"; diff --git a/pkgs/development/compilers/gcc-4.0/gcc-4.0.2-cxx.patch b/pkgs/development/compilers/gcc/4.0/gcc-4.0.2-cxx.patch similarity index 100% rename from pkgs/development/compilers/gcc-4.0/gcc-4.0.2-cxx.patch rename to pkgs/development/compilers/gcc/4.0/gcc-4.0.2-cxx.patch diff --git a/pkgs/development/compilers/gcc-4.0/no-sys-dirs.patch b/pkgs/development/compilers/gcc/4.0/no-sys-dirs.patch similarity index 100% rename from pkgs/development/compilers/gcc-4.0/no-sys-dirs.patch rename to pkgs/development/compilers/gcc/4.0/no-sys-dirs.patch diff --git a/pkgs/development/compilers/gcc-4.1/builder.sh b/pkgs/development/compilers/gcc/4.1/builder.sh similarity index 100% rename from pkgs/development/compilers/gcc-4.1/builder.sh rename to pkgs/development/compilers/gcc/4.1/builder.sh diff --git a/pkgs/development/compilers/gcc-4.1/default.nix b/pkgs/development/compilers/gcc/4.1/default.nix similarity index 98% rename from pkgs/development/compilers/gcc-4.1/default.nix rename to pkgs/development/compilers/gcc/4.1/default.nix index 66bf48cb6e1..b460ad813f8 100644 --- a/pkgs/development/compilers/gcc-4.1/default.nix +++ b/pkgs/development/compilers/gcc/4.1/default.nix @@ -10,7 +10,7 @@ assert langC || langFortran; -with import ../../../lib; +with stdenv.lib; stdenv.mkDerivation { name = "${name}-4.1.2"; diff --git a/pkgs/development/compilers/gcc-4.1/no-sys-dirs.patch b/pkgs/development/compilers/gcc/4.1/no-sys-dirs.patch similarity index 100% rename from pkgs/development/compilers/gcc-4.1/no-sys-dirs.patch rename to pkgs/development/compilers/gcc/4.1/no-sys-dirs.patch diff --git a/pkgs/development/compilers/gcc-apple/builder.sh b/pkgs/development/compilers/gcc/4.2-apple32/builder.sh similarity index 100% rename from pkgs/development/compilers/gcc-apple/builder.sh rename to pkgs/development/compilers/gcc/4.2-apple32/builder.sh diff --git a/pkgs/development/compilers/gcc-apple/debug_list.patch b/pkgs/development/compilers/gcc/4.2-apple32/debug_list.patch similarity index 100% rename from pkgs/development/compilers/gcc-apple/debug_list.patch rename to pkgs/development/compilers/gcc/4.2-apple32/debug_list.patch diff --git a/pkgs/development/compilers/gcc-apple/default.nix b/pkgs/development/compilers/gcc/4.2-apple32/default.nix similarity index 100% rename from pkgs/development/compilers/gcc-apple/default.nix rename to pkgs/development/compilers/gcc/4.2-apple32/default.nix diff --git a/pkgs/development/compilers/gcc-apple/no-sys-dirs.patch b/pkgs/development/compilers/gcc/4.2-apple32/no-sys-dirs.patch similarity index 100% rename from pkgs/development/compilers/gcc-apple/no-sys-dirs.patch rename to pkgs/development/compilers/gcc/4.2-apple32/no-sys-dirs.patch diff --git a/pkgs/development/compilers/gcc-apple/pass-cxxcpp.patch b/pkgs/development/compilers/gcc/4.2-apple32/pass-cxxcpp.patch similarity index 100% rename from pkgs/development/compilers/gcc-apple/pass-cxxcpp.patch rename to pkgs/development/compilers/gcc/4.2-apple32/pass-cxxcpp.patch diff --git a/pkgs/development/compilers/gcc-apple64/builder.sh b/pkgs/development/compilers/gcc/4.2-apple64/builder.sh similarity index 100% rename from pkgs/development/compilers/gcc-apple64/builder.sh rename to pkgs/development/compilers/gcc/4.2-apple64/builder.sh diff --git a/pkgs/development/compilers/gcc-apple64/debug_list.patch b/pkgs/development/compilers/gcc/4.2-apple64/debug_list.patch similarity index 100% rename from pkgs/development/compilers/gcc-apple64/debug_list.patch rename to pkgs/development/compilers/gcc/4.2-apple64/debug_list.patch diff --git a/pkgs/development/compilers/gcc-apple64/default.nix b/pkgs/development/compilers/gcc/4.2-apple64/default.nix similarity index 100% rename from pkgs/development/compilers/gcc-apple64/default.nix rename to pkgs/development/compilers/gcc/4.2-apple64/default.nix diff --git a/pkgs/development/compilers/gcc-apple64/fix-libstdc++-link.patch b/pkgs/development/compilers/gcc/4.2-apple64/fix-libstdc++-link.patch similarity index 100% rename from pkgs/development/compilers/gcc-apple64/fix-libstdc++-link.patch rename to pkgs/development/compilers/gcc/4.2-apple64/fix-libstdc++-link.patch diff --git a/pkgs/development/compilers/gcc-apple64/no-sys-dirs.patch b/pkgs/development/compilers/gcc/4.2-apple64/no-sys-dirs.patch similarity index 100% rename from pkgs/development/compilers/gcc-apple64/no-sys-dirs.patch rename to pkgs/development/compilers/gcc/4.2-apple64/no-sys-dirs.patch diff --git a/pkgs/development/compilers/gcc-apple64/pass-cxxcpp.patch b/pkgs/development/compilers/gcc/4.2-apple64/pass-cxxcpp.patch similarity index 100% rename from pkgs/development/compilers/gcc-apple64/pass-cxxcpp.patch rename to pkgs/development/compilers/gcc/4.2-apple64/pass-cxxcpp.patch diff --git a/pkgs/development/compilers/gcc-4.2/builder.sh b/pkgs/development/compilers/gcc/4.2/builder.sh similarity index 100% rename from pkgs/development/compilers/gcc-4.2/builder.sh rename to pkgs/development/compilers/gcc/4.2/builder.sh diff --git a/pkgs/development/compilers/gcc-4.2/default.nix b/pkgs/development/compilers/gcc/4.2/default.nix similarity index 100% rename from pkgs/development/compilers/gcc-4.2/default.nix rename to pkgs/development/compilers/gcc/4.2/default.nix diff --git a/pkgs/development/compilers/gcc-4.2/no-sys-dirs.patch b/pkgs/development/compilers/gcc/4.2/no-sys-dirs.patch similarity index 100% rename from pkgs/development/compilers/gcc-4.2/no-sys-dirs.patch rename to pkgs/development/compilers/gcc/4.2/no-sys-dirs.patch diff --git a/pkgs/development/compilers/gcc-4.2/pass-cxxcpp.patch b/pkgs/development/compilers/gcc/4.2/pass-cxxcpp.patch similarity index 100% rename from pkgs/development/compilers/gcc-4.2/pass-cxxcpp.patch rename to pkgs/development/compilers/gcc/4.2/pass-cxxcpp.patch diff --git a/pkgs/development/compilers/gcc-4.3/builder.sh b/pkgs/development/compilers/gcc/4.3/builder.sh similarity index 100% rename from pkgs/development/compilers/gcc-4.3/builder.sh rename to pkgs/development/compilers/gcc/4.3/builder.sh diff --git a/pkgs/development/compilers/gcc-4.3/default.nix b/pkgs/development/compilers/gcc/4.3/default.nix similarity index 100% rename from pkgs/development/compilers/gcc-4.3/default.nix rename to pkgs/development/compilers/gcc/4.3/default.nix diff --git a/pkgs/development/compilers/gcc-4.3/ghdl-ortho-cflags.patch b/pkgs/development/compilers/gcc/4.3/ghdl-ortho-cflags.patch similarity index 100% rename from pkgs/development/compilers/gcc-4.3/ghdl-ortho-cflags.patch rename to pkgs/development/compilers/gcc/4.3/ghdl-ortho-cflags.patch diff --git a/pkgs/development/compilers/gcc-4.3/java-jvgenmain-link.patch b/pkgs/development/compilers/gcc/4.3/java-jvgenmain-link.patch similarity index 100% rename from pkgs/development/compilers/gcc-4.3/java-jvgenmain-link.patch rename to pkgs/development/compilers/gcc/4.3/java-jvgenmain-link.patch diff --git a/pkgs/development/compilers/gcc-4.3/libmudflap-cpp.patch b/pkgs/development/compilers/gcc/4.3/libmudflap-cpp.patch similarity index 100% rename from pkgs/development/compilers/gcc-4.3/libmudflap-cpp.patch rename to pkgs/development/compilers/gcc/4.3/libmudflap-cpp.patch diff --git a/pkgs/development/compilers/gcc-4.3/no-sys-dirs-fortran.patch b/pkgs/development/compilers/gcc/4.3/no-sys-dirs-fortran.patch similarity index 100% rename from pkgs/development/compilers/gcc-4.3/no-sys-dirs-fortran.patch rename to pkgs/development/compilers/gcc/4.3/no-sys-dirs-fortran.patch diff --git a/pkgs/development/compilers/gcc-4.3/no-sys-dirs.patch b/pkgs/development/compilers/gcc/4.3/no-sys-dirs.patch similarity index 100% rename from pkgs/development/compilers/gcc-4.3/no-sys-dirs.patch rename to pkgs/development/compilers/gcc/4.3/no-sys-dirs.patch diff --git a/pkgs/development/compilers/gcc-4.3/pass-cxxcpp.patch b/pkgs/development/compilers/gcc/4.3/pass-cxxcpp.patch similarity index 100% rename from pkgs/development/compilers/gcc-4.3/pass-cxxcpp.patch rename to pkgs/development/compilers/gcc/4.3/pass-cxxcpp.patch diff --git a/pkgs/development/compilers/gcc-4.4/builder.sh b/pkgs/development/compilers/gcc/4.4/builder.sh similarity index 100% rename from pkgs/development/compilers/gcc-4.4/builder.sh rename to pkgs/development/compilers/gcc/4.4/builder.sh diff --git a/pkgs/development/compilers/gcc-4.4/default.nix b/pkgs/development/compilers/gcc/4.4/default.nix similarity index 100% rename from pkgs/development/compilers/gcc-4.4/default.nix rename to pkgs/development/compilers/gcc/4.4/default.nix diff --git a/pkgs/development/compilers/gcc-4.4/ghdl-ortho-cflags.patch b/pkgs/development/compilers/gcc/4.4/ghdl-ortho-cflags.patch similarity index 100% rename from pkgs/development/compilers/gcc-4.4/ghdl-ortho-cflags.patch rename to pkgs/development/compilers/gcc/4.4/ghdl-ortho-cflags.patch diff --git a/pkgs/development/compilers/gcc-4.4/gnat-cflags.patch b/pkgs/development/compilers/gcc/4.4/gnat-cflags.patch similarity index 100% rename from pkgs/development/compilers/gcc-4.4/gnat-cflags.patch rename to pkgs/development/compilers/gcc/4.4/gnat-cflags.patch diff --git a/pkgs/development/compilers/gcc-4.4/java-jvgenmain-link.patch b/pkgs/development/compilers/gcc/4.4/java-jvgenmain-link.patch similarity index 100% rename from pkgs/development/compilers/gcc-4.4/java-jvgenmain-link.patch rename to pkgs/development/compilers/gcc/4.4/java-jvgenmain-link.patch diff --git a/pkgs/development/compilers/gcc-4.4/libstdc++-target.patch b/pkgs/development/compilers/gcc/4.4/libstdc++-target.patch similarity index 100% rename from pkgs/development/compilers/gcc-4.4/libstdc++-target.patch rename to pkgs/development/compilers/gcc/4.4/libstdc++-target.patch diff --git a/pkgs/development/compilers/gcc-4.4/no-sys-dirs.patch b/pkgs/development/compilers/gcc/4.4/no-sys-dirs.patch similarity index 100% rename from pkgs/development/compilers/gcc-4.4/no-sys-dirs.patch rename to pkgs/development/compilers/gcc/4.4/no-sys-dirs.patch diff --git a/pkgs/development/compilers/gcc-4.4/pass-cxxcpp.patch b/pkgs/development/compilers/gcc/4.4/pass-cxxcpp.patch similarity index 100% rename from pkgs/development/compilers/gcc-4.4/pass-cxxcpp.patch rename to pkgs/development/compilers/gcc/4.4/pass-cxxcpp.patch diff --git a/pkgs/development/compilers/gcc-4.4/pr41818.patch b/pkgs/development/compilers/gcc/4.4/pr41818.patch similarity index 100% rename from pkgs/development/compilers/gcc-4.4/pr41818.patch rename to pkgs/development/compilers/gcc/4.4/pr41818.patch diff --git a/pkgs/development/compilers/gcc-4.4/sources.nix b/pkgs/development/compilers/gcc/4.4/sources.nix similarity index 100% rename from pkgs/development/compilers/gcc-4.4/sources.nix rename to pkgs/development/compilers/gcc/4.4/sources.nix diff --git a/pkgs/development/compilers/gcc-4.4/target-cpp.patch b/pkgs/development/compilers/gcc/4.4/target-cpp.patch similarity index 100% rename from pkgs/development/compilers/gcc-4.4/target-cpp.patch rename to pkgs/development/compilers/gcc/4.4/target-cpp.patch diff --git a/pkgs/development/compilers/gcc-4.4/update-gcc.sh b/pkgs/development/compilers/gcc/4.4/update-gcc.sh similarity index 100% rename from pkgs/development/compilers/gcc-4.4/update-gcc.sh rename to pkgs/development/compilers/gcc/4.4/update-gcc.sh diff --git a/pkgs/development/compilers/gcc-4.5/builder.sh b/pkgs/development/compilers/gcc/4.5/builder.sh similarity index 100% rename from pkgs/development/compilers/gcc-4.5/builder.sh rename to pkgs/development/compilers/gcc/4.5/builder.sh diff --git a/pkgs/development/compilers/gcc-4.5/default.nix b/pkgs/development/compilers/gcc/4.5/default.nix similarity index 100% rename from pkgs/development/compilers/gcc-4.5/default.nix rename to pkgs/development/compilers/gcc/4.5/default.nix diff --git a/pkgs/development/compilers/gcc-4.5/ghdl-ortho-cflags.patch b/pkgs/development/compilers/gcc/4.5/ghdl-ortho-cflags.patch similarity index 100% rename from pkgs/development/compilers/gcc-4.5/ghdl-ortho-cflags.patch rename to pkgs/development/compilers/gcc/4.5/ghdl-ortho-cflags.patch diff --git a/pkgs/development/compilers/gcc-4.5/gnat-cflags.patch b/pkgs/development/compilers/gcc/4.5/gnat-cflags.patch similarity index 100% rename from pkgs/development/compilers/gcc-4.5/gnat-cflags.patch rename to pkgs/development/compilers/gcc/4.5/gnat-cflags.patch diff --git a/pkgs/development/compilers/gcc-4.5/java-jvgenmain-link.patch b/pkgs/development/compilers/gcc/4.5/java-jvgenmain-link.patch similarity index 100% rename from pkgs/development/compilers/gcc-4.5/java-jvgenmain-link.patch rename to pkgs/development/compilers/gcc/4.5/java-jvgenmain-link.patch diff --git a/pkgs/development/compilers/gcc-4.5/libstdc++-target.patch b/pkgs/development/compilers/gcc/4.5/libstdc++-target.patch similarity index 100% rename from pkgs/development/compilers/gcc-4.5/libstdc++-target.patch rename to pkgs/development/compilers/gcc/4.5/libstdc++-target.patch diff --git a/pkgs/development/compilers/gcc-4.5/no-sys-dirs.patch b/pkgs/development/compilers/gcc/4.5/no-sys-dirs.patch similarity index 100% rename from pkgs/development/compilers/gcc-4.5/no-sys-dirs.patch rename to pkgs/development/compilers/gcc/4.5/no-sys-dirs.patch diff --git a/pkgs/development/compilers/gcc-4.5/sources.nix b/pkgs/development/compilers/gcc/4.5/sources.nix similarity index 100% rename from pkgs/development/compilers/gcc-4.5/sources.nix rename to pkgs/development/compilers/gcc/4.5/sources.nix diff --git a/pkgs/development/compilers/gcc-4.5/update-gcc.sh b/pkgs/development/compilers/gcc/4.5/update-gcc.sh similarity index 100% rename from pkgs/development/compilers/gcc-4.5/update-gcc.sh rename to pkgs/development/compilers/gcc/4.5/update-gcc.sh diff --git a/pkgs/development/compilers/gcc-4.6/builder.sh b/pkgs/development/compilers/gcc/4.6/builder.sh similarity index 100% rename from pkgs/development/compilers/gcc-4.6/builder.sh rename to pkgs/development/compilers/gcc/4.6/builder.sh diff --git a/pkgs/development/compilers/gcc-4.6/default.nix b/pkgs/development/compilers/gcc/4.6/default.nix similarity index 100% rename from pkgs/development/compilers/gcc-4.6/default.nix rename to pkgs/development/compilers/gcc/4.6/default.nix diff --git a/pkgs/development/compilers/gcc-4.6/ghdl-ortho-cflags.patch b/pkgs/development/compilers/gcc/4.6/ghdl-ortho-cflags.patch similarity index 100% rename from pkgs/development/compilers/gcc-4.6/ghdl-ortho-cflags.patch rename to pkgs/development/compilers/gcc/4.6/ghdl-ortho-cflags.patch diff --git a/pkgs/development/compilers/gcc-4.6/gnat-cflags.patch b/pkgs/development/compilers/gcc/4.6/gnat-cflags.patch similarity index 100% rename from pkgs/development/compilers/gcc-4.6/gnat-cflags.patch rename to pkgs/development/compilers/gcc/4.6/gnat-cflags.patch diff --git a/pkgs/development/compilers/gcc-4.6/java-jvgenmain-link.patch b/pkgs/development/compilers/gcc/4.6/java-jvgenmain-link.patch similarity index 100% rename from pkgs/development/compilers/gcc-4.6/java-jvgenmain-link.patch rename to pkgs/development/compilers/gcc/4.6/java-jvgenmain-link.patch diff --git a/pkgs/development/compilers/gcc-4.6/libstdc++-target.patch b/pkgs/development/compilers/gcc/4.6/libstdc++-target.patch similarity index 100% rename from pkgs/development/compilers/gcc-4.6/libstdc++-target.patch rename to pkgs/development/compilers/gcc/4.6/libstdc++-target.patch diff --git a/pkgs/development/compilers/gcc-4.6/no-sys-dirs.patch b/pkgs/development/compilers/gcc/4.6/no-sys-dirs.patch similarity index 100% rename from pkgs/development/compilers/gcc-4.6/no-sys-dirs.patch rename to pkgs/development/compilers/gcc/4.6/no-sys-dirs.patch diff --git a/pkgs/development/compilers/gcc-4.6/sources.nix b/pkgs/development/compilers/gcc/4.6/sources.nix similarity index 100% rename from pkgs/development/compilers/gcc-4.6/sources.nix rename to pkgs/development/compilers/gcc/4.6/sources.nix diff --git a/pkgs/development/compilers/gcc-4.6/update-gcc.sh b/pkgs/development/compilers/gcc/4.6/update-gcc.sh similarity index 100% rename from pkgs/development/compilers/gcc-4.6/update-gcc.sh rename to pkgs/development/compilers/gcc/4.6/update-gcc.sh diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 05977e8fbcb..38501c18e7c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1733,15 +1733,15 @@ let gcc = gcc46; - gcc295 = wrapGCC (import ../development/compilers/gcc-2.95 { + gcc295 = wrapGCC (import ../development/compilers/gcc/2.95 { inherit fetchurl stdenv noSysDirs; }); - gcc33 = wrapGCC (import ../development/compilers/gcc-3.3 { + gcc33 = wrapGCC (import ../development/compilers/gcc/3.3 { inherit fetchurl stdenv noSysDirs; }); - gcc34 = wrapGCC (import ../development/compilers/gcc-3.4 { + gcc34 = wrapGCC (import ../development/compilers/gcc/3.4 { inherit fetchurl stdenv noSysDirs; }); @@ -1750,30 +1750,30 @@ let # expects a single digit after the dot. As a workaround, we feed # GCC with Texinfo 4.9. Stupid bug, hackish workaround. - gcc40 = wrapGCC (makeOverridable (import ../development/compilers/gcc-4.0) { + gcc40 = wrapGCC (makeOverridable (import ../development/compilers/gcc/4.0) { inherit fetchurl stdenv noSysDirs; texinfo = texinfo49; profiledCompiler = true; }); - gcc41 = wrapGCC (makeOverridable (import ../development/compilers/gcc-4.1) { + gcc41 = wrapGCC (makeOverridable (import ../development/compilers/gcc/4.1) { inherit fetchurl noSysDirs gmp mpfr; stdenv = overrideGCC stdenv gcc42; texinfo = texinfo49; profiledCompiler = false; }); - gcc42 = wrapGCC (makeOverridable (import ../development/compilers/gcc-4.2) { + gcc42 = wrapGCC (makeOverridable (import ../development/compilers/gcc/4.2) { inherit fetchurl stdenv noSysDirs; profiledCompiler = false; }); - gcc43 = lowPrio (wrapGCC (makeOverridable (import ../development/compilers/gcc-4.3) { + gcc43 = lowPrio (wrapGCC (makeOverridable (import ../development/compilers/gcc/4.3) { inherit stdenv fetchurl texinfo gmp mpfr noSysDirs; profiledCompiler = true; })); - gcc43_realCross = makeOverridable (import ../development/compilers/gcc-4.3) { + gcc43_realCross = makeOverridable (import ../development/compilers/gcc/4.3) { inherit stdenv fetchurl texinfo gmp mpfr noSysDirs; binutilsCross = binutilsCross; libcCross = libcCross; @@ -1784,7 +1784,7 @@ let }; gcc44_realCross = lib.addMetaAttrs { platforms = []; } - (makeOverridable (import ../development/compilers/gcc-4.4) { + (makeOverridable (import ../development/compilers/gcc/4.4) { inherit stdenv fetchurl texinfo gmp mpfr /* ppl cloogppl */ noSysDirs gettext which; binutilsCross = binutilsCross; @@ -1800,7 +1800,7 @@ let gcc46 = gcc46_real; gcc45_realCross = lib.addMetaAttrs { platforms = []; } - (makeOverridable (import ../development/compilers/gcc-4.5) { + (makeOverridable (import ../development/compilers/gcc/4.5) { inherit fetchurl stdenv texinfo gmp mpfr mpc libelf zlib ppl cloogppl gettext which noSysDirs; binutilsCross = binutilsCross; @@ -1812,7 +1812,7 @@ let }); gcc46_realCross = lib.addMetaAttrs { platforms = []; } - (makeOverridable (import ../development/compilers/gcc-4.6) { + (makeOverridable (import ../development/compilers/gcc/4.6) { inherit fetchurl stdenv texinfo gmp mpfr mpc libelf zlib cloog ppl gettext which noSysDirs; binutilsCross = binutilsCross; @@ -1869,13 +1869,13 @@ let enableMultilib = true; })); - gcc44 = lowPrio (wrapGCC (makeOverridable (import ../development/compilers/gcc-4.4) { + gcc44 = lowPrio (wrapGCC (makeOverridable (import ../development/compilers/gcc/4.4) { inherit fetchurl stdenv texinfo gmp mpfr /* ppl cloogppl */ gettext which noSysDirs; profiledCompiler = true; })); - gcc45_real = lowPrio (wrapGCC (makeOverridable (import ../development/compilers/gcc-4.5) { + gcc45_real = lowPrio (wrapGCC (makeOverridable (import ../development/compilers/gcc/4.5) { inherit fetchurl stdenv texinfo gmp mpfr mpc libelf zlib perl ppl cloogppl gettext which noSysDirs; @@ -1895,7 +1895,7 @@ let })); # A non-stripped version of GCC. - gcc45_debug = lowPrio (wrapGCC (callPackage ../development/compilers/gcc-4.5 { + gcc45_debug = lowPrio (wrapGCC (callPackage ../development/compilers/gcc/4.5 { stripped = false; inherit noSysDirs; @@ -1908,7 +1908,7 @@ let profiledCompiler = if stdenv.system == "armv5tel-linux" then false else true; })); - gcc46_real = lowPrio (wrapGCC (callPackage ../development/compilers/gcc-4.6 { + gcc46_real = lowPrio (wrapGCC (callPackage ../development/compilers/gcc/4.6 { inherit noSysDirs; cross = null; libcCross = null; @@ -1920,7 +1920,7 @@ let })); # A non-stripped version of GCC. - gcc46_debug = lowPrio (wrapGCC (callPackage ../development/compilers/gcc-4.6 { + gcc46_debug = lowPrio (wrapGCC (callPackage ../development/compilers/gcc/4.6 { stripped = false; inherit noSysDirs; @@ -1930,10 +1930,10 @@ let })); gccApple = - wrapGCC ( (if stdenv.system == "i686-darwin" then import ../development/compilers/gcc-apple else import ../development/compilers/gcc-apple64) { + wrapGCC ( (if stdenv.system == "i686-darwin" then import ../development/compilers/gcc/4.2-apple32 else import ../development/compilers/gcc/4.2-apple64) { inherit fetchurl stdenv noSysDirs; profiledCompiler = true; - }) ; + }); gccupc40 = wrapGCCUPC (import ../development/compilers/gcc-upc-4.0 { inherit fetchurl stdenv bison autoconf gnum4 noSysDirs; @@ -2094,7 +2094,7 @@ let langGo = true; }); - ghdl = wrapGCC (import ../development/compilers/gcc-4.3 { + ghdl = wrapGCC (import ../development/compilers/gcc/4.3 { inherit stdenv fetchurl texinfo gmp mpfr noSysDirs gnat; name = "ghdl"; langVhdl = true; @@ -2105,7 +2105,7 @@ let }); # Not officially supported version for ghdl - ghdl_gcc44 = lowPrio (wrapGCC (import ../development/compilers/gcc-4.4 { + ghdl_gcc44 = lowPrio (wrapGCC (import ../development/compilers/gcc/4.4 { inherit stdenv fetchurl texinfo gmp mpfr noSysDirs gnat gettext which ppl cloogppl; name = "ghdl"; From 0811db080e8ee73d1df01bef19fb6fb1613afe8b Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 17 Feb 2012 22:02:37 +0000 Subject: [PATCH 097/197] * Move all glibc versions to development/libraries/glibc. svn path=/nixpkgs/branches/stdenv-updates/; revision=32373 --- .../{glibc-2.13 => glibc/2.13}/builder.sh | 0 .../{glibc-2.13 => glibc/2.13}/common.nix | 0 .../{glibc-2.13 => glibc/2.13}/default.nix | 0 .../2.13}/glibc-elf-localscope.patch | 0 .../{glibc-2.13 => glibc/2.13}/info.nix | 0 .../2.13}/locales-builder.sh | 0 .../{glibc-2.13 => glibc/2.13}/locales.nix | 0 .../2.13}/nix-locale-archive.patch | 0 .../2.13}/nss-skip-unavail.patch | 0 .../2.13}/rpcgen-path.patch | 0 .../{glibc-2.14 => glibc/2.14}/builder.sh | 0 .../{glibc-2.14 => glibc/2.14}/common.nix | 0 .../{glibc-2.14 => glibc/2.14}/default.nix | 0 .../2.14}/glibc-elf-localscope.patch | 0 .../{glibc-2.14 => glibc/2.14}/info.nix | 0 .../2.14}/locales-builder.sh | 0 .../{glibc-2.14 => glibc/2.14}/locales.nix | 0 .../2.14}/nix-locale-archive.patch | 0 .../2.14}/nss-skip-unavail.patch | 0 .../2.14}/rpcgen-path.patch | 0 .../2.5}/binutils-ld.patch | 0 .../{glibc-2.5 => glibc/2.5}/builder.sh | 0 .../{glibc-2.5 => glibc/2.5}/default.nix | 0 .../2.5}/glibc-getcwd-param-MAX.patch | 0 .../2.5}/glibc-inline.patch | 0 .../{glibc-2.5 => glibc/2.5}/glibc-pwd.patch | 0 .../2.5}/make-3-82-fix.patch | 0 .../{glibc-2.5 => glibc/2.5}/x86-fnstsw.patch | 0 .../{glibc-2.7 => glibc/2.7}/builder.sh | 0 .../{glibc-2.7 => glibc/2.7}/default.nix | 0 .../2.7}/nss-skip-unavail.patch | 0 .../2.9}/binutils-2.20.patch | 0 .../2.9}/binutils-ld.patch | 0 .../{glibc-2.9 => glibc/2.9}/builder.sh | 0 .../{glibc-2.9 => glibc/2.9}/default.nix | 0 .../{glibc-2.9 => glibc/2.9}/headers.nix | 0 .../2.9}/headersbuilder.sh | 0 .../{glibc-2.9 => glibc/2.9}/info.nix | 0 .../2.9}/locale-override.patch | 0 .../{glibc-2.9 => glibc/2.9}/locales.nix | 0 .../2.9}/localesbuilder.sh | 0 .../2.9}/nss-skip-unavail.patch | 0 .../2.9}/rpcgen-path.patch | 0 pkgs/top-level/all-packages.nix | 46 ++++++++----------- 44 files changed, 18 insertions(+), 28 deletions(-) rename pkgs/development/libraries/{glibc-2.13 => glibc/2.13}/builder.sh (100%) rename pkgs/development/libraries/{glibc-2.13 => glibc/2.13}/common.nix (100%) rename pkgs/development/libraries/{glibc-2.13 => glibc/2.13}/default.nix (100%) rename pkgs/development/libraries/{glibc-2.13 => glibc/2.13}/glibc-elf-localscope.patch (100%) rename pkgs/development/libraries/{glibc-2.13 => glibc/2.13}/info.nix (100%) rename pkgs/development/libraries/{glibc-2.13 => glibc/2.13}/locales-builder.sh (100%) rename pkgs/development/libraries/{glibc-2.13 => glibc/2.13}/locales.nix (100%) rename pkgs/development/libraries/{glibc-2.13 => glibc/2.13}/nix-locale-archive.patch (100%) rename pkgs/development/libraries/{glibc-2.13 => glibc/2.13}/nss-skip-unavail.patch (100%) rename pkgs/development/libraries/{glibc-2.13 => glibc/2.13}/rpcgen-path.patch (100%) rename pkgs/development/libraries/{glibc-2.14 => glibc/2.14}/builder.sh (100%) rename pkgs/development/libraries/{glibc-2.14 => glibc/2.14}/common.nix (100%) rename pkgs/development/libraries/{glibc-2.14 => glibc/2.14}/default.nix (100%) rename pkgs/development/libraries/{glibc-2.14 => glibc/2.14}/glibc-elf-localscope.patch (100%) rename pkgs/development/libraries/{glibc-2.14 => glibc/2.14}/info.nix (100%) rename pkgs/development/libraries/{glibc-2.14 => glibc/2.14}/locales-builder.sh (100%) rename pkgs/development/libraries/{glibc-2.14 => glibc/2.14}/locales.nix (100%) rename pkgs/development/libraries/{glibc-2.14 => glibc/2.14}/nix-locale-archive.patch (100%) rename pkgs/development/libraries/{glibc-2.14 => glibc/2.14}/nss-skip-unavail.patch (100%) rename pkgs/development/libraries/{glibc-2.14 => glibc/2.14}/rpcgen-path.patch (100%) rename pkgs/development/libraries/{glibc-2.5 => glibc/2.5}/binutils-ld.patch (100%) rename pkgs/development/libraries/{glibc-2.5 => glibc/2.5}/builder.sh (100%) rename pkgs/development/libraries/{glibc-2.5 => glibc/2.5}/default.nix (100%) rename pkgs/development/libraries/{glibc-2.5 => glibc/2.5}/glibc-getcwd-param-MAX.patch (100%) rename pkgs/development/libraries/{glibc-2.5 => glibc/2.5}/glibc-inline.patch (100%) rename pkgs/development/libraries/{glibc-2.5 => glibc/2.5}/glibc-pwd.patch (100%) rename pkgs/development/libraries/{glibc-2.5 => glibc/2.5}/make-3-82-fix.patch (100%) rename pkgs/development/libraries/{glibc-2.5 => glibc/2.5}/x86-fnstsw.patch (100%) rename pkgs/development/libraries/{glibc-2.7 => glibc/2.7}/builder.sh (100%) rename pkgs/development/libraries/{glibc-2.7 => glibc/2.7}/default.nix (100%) rename pkgs/development/libraries/{glibc-2.7 => glibc/2.7}/nss-skip-unavail.patch (100%) rename pkgs/development/libraries/{glibc-2.9 => glibc/2.9}/binutils-2.20.patch (100%) rename pkgs/development/libraries/{glibc-2.9 => glibc/2.9}/binutils-ld.patch (100%) rename pkgs/development/libraries/{glibc-2.9 => glibc/2.9}/builder.sh (100%) rename pkgs/development/libraries/{glibc-2.9 => glibc/2.9}/default.nix (100%) rename pkgs/development/libraries/{glibc-2.9 => glibc/2.9}/headers.nix (100%) rename pkgs/development/libraries/{glibc-2.9 => glibc/2.9}/headersbuilder.sh (100%) rename pkgs/development/libraries/{glibc-2.9 => glibc/2.9}/info.nix (100%) rename pkgs/development/libraries/{glibc-2.9 => glibc/2.9}/locale-override.patch (100%) rename pkgs/development/libraries/{glibc-2.9 => glibc/2.9}/locales.nix (100%) rename pkgs/development/libraries/{glibc-2.9 => glibc/2.9}/localesbuilder.sh (100%) rename pkgs/development/libraries/{glibc-2.9 => glibc/2.9}/nss-skip-unavail.patch (100%) rename pkgs/development/libraries/{glibc-2.9 => glibc/2.9}/rpcgen-path.patch (100%) diff --git a/pkgs/development/libraries/glibc-2.13/builder.sh b/pkgs/development/libraries/glibc/2.13/builder.sh similarity index 100% rename from pkgs/development/libraries/glibc-2.13/builder.sh rename to pkgs/development/libraries/glibc/2.13/builder.sh diff --git a/pkgs/development/libraries/glibc-2.13/common.nix b/pkgs/development/libraries/glibc/2.13/common.nix similarity index 100% rename from pkgs/development/libraries/glibc-2.13/common.nix rename to pkgs/development/libraries/glibc/2.13/common.nix diff --git a/pkgs/development/libraries/glibc-2.13/default.nix b/pkgs/development/libraries/glibc/2.13/default.nix similarity index 100% rename from pkgs/development/libraries/glibc-2.13/default.nix rename to pkgs/development/libraries/glibc/2.13/default.nix diff --git a/pkgs/development/libraries/glibc-2.13/glibc-elf-localscope.patch b/pkgs/development/libraries/glibc/2.13/glibc-elf-localscope.patch similarity index 100% rename from pkgs/development/libraries/glibc-2.13/glibc-elf-localscope.patch rename to pkgs/development/libraries/glibc/2.13/glibc-elf-localscope.patch diff --git a/pkgs/development/libraries/glibc-2.13/info.nix b/pkgs/development/libraries/glibc/2.13/info.nix similarity index 100% rename from pkgs/development/libraries/glibc-2.13/info.nix rename to pkgs/development/libraries/glibc/2.13/info.nix diff --git a/pkgs/development/libraries/glibc-2.13/locales-builder.sh b/pkgs/development/libraries/glibc/2.13/locales-builder.sh similarity index 100% rename from pkgs/development/libraries/glibc-2.13/locales-builder.sh rename to pkgs/development/libraries/glibc/2.13/locales-builder.sh diff --git a/pkgs/development/libraries/glibc-2.13/locales.nix b/pkgs/development/libraries/glibc/2.13/locales.nix similarity index 100% rename from pkgs/development/libraries/glibc-2.13/locales.nix rename to pkgs/development/libraries/glibc/2.13/locales.nix diff --git a/pkgs/development/libraries/glibc-2.13/nix-locale-archive.patch b/pkgs/development/libraries/glibc/2.13/nix-locale-archive.patch similarity index 100% rename from pkgs/development/libraries/glibc-2.13/nix-locale-archive.patch rename to pkgs/development/libraries/glibc/2.13/nix-locale-archive.patch diff --git a/pkgs/development/libraries/glibc-2.13/nss-skip-unavail.patch b/pkgs/development/libraries/glibc/2.13/nss-skip-unavail.patch similarity index 100% rename from pkgs/development/libraries/glibc-2.13/nss-skip-unavail.patch rename to pkgs/development/libraries/glibc/2.13/nss-skip-unavail.patch diff --git a/pkgs/development/libraries/glibc-2.13/rpcgen-path.patch b/pkgs/development/libraries/glibc/2.13/rpcgen-path.patch similarity index 100% rename from pkgs/development/libraries/glibc-2.13/rpcgen-path.patch rename to pkgs/development/libraries/glibc/2.13/rpcgen-path.patch diff --git a/pkgs/development/libraries/glibc-2.14/builder.sh b/pkgs/development/libraries/glibc/2.14/builder.sh similarity index 100% rename from pkgs/development/libraries/glibc-2.14/builder.sh rename to pkgs/development/libraries/glibc/2.14/builder.sh diff --git a/pkgs/development/libraries/glibc-2.14/common.nix b/pkgs/development/libraries/glibc/2.14/common.nix similarity index 100% rename from pkgs/development/libraries/glibc-2.14/common.nix rename to pkgs/development/libraries/glibc/2.14/common.nix diff --git a/pkgs/development/libraries/glibc-2.14/default.nix b/pkgs/development/libraries/glibc/2.14/default.nix similarity index 100% rename from pkgs/development/libraries/glibc-2.14/default.nix rename to pkgs/development/libraries/glibc/2.14/default.nix diff --git a/pkgs/development/libraries/glibc-2.14/glibc-elf-localscope.patch b/pkgs/development/libraries/glibc/2.14/glibc-elf-localscope.patch similarity index 100% rename from pkgs/development/libraries/glibc-2.14/glibc-elf-localscope.patch rename to pkgs/development/libraries/glibc/2.14/glibc-elf-localscope.patch diff --git a/pkgs/development/libraries/glibc-2.14/info.nix b/pkgs/development/libraries/glibc/2.14/info.nix similarity index 100% rename from pkgs/development/libraries/glibc-2.14/info.nix rename to pkgs/development/libraries/glibc/2.14/info.nix diff --git a/pkgs/development/libraries/glibc-2.14/locales-builder.sh b/pkgs/development/libraries/glibc/2.14/locales-builder.sh similarity index 100% rename from pkgs/development/libraries/glibc-2.14/locales-builder.sh rename to pkgs/development/libraries/glibc/2.14/locales-builder.sh diff --git a/pkgs/development/libraries/glibc-2.14/locales.nix b/pkgs/development/libraries/glibc/2.14/locales.nix similarity index 100% rename from pkgs/development/libraries/glibc-2.14/locales.nix rename to pkgs/development/libraries/glibc/2.14/locales.nix diff --git a/pkgs/development/libraries/glibc-2.14/nix-locale-archive.patch b/pkgs/development/libraries/glibc/2.14/nix-locale-archive.patch similarity index 100% rename from pkgs/development/libraries/glibc-2.14/nix-locale-archive.patch rename to pkgs/development/libraries/glibc/2.14/nix-locale-archive.patch diff --git a/pkgs/development/libraries/glibc-2.14/nss-skip-unavail.patch b/pkgs/development/libraries/glibc/2.14/nss-skip-unavail.patch similarity index 100% rename from pkgs/development/libraries/glibc-2.14/nss-skip-unavail.patch rename to pkgs/development/libraries/glibc/2.14/nss-skip-unavail.patch diff --git a/pkgs/development/libraries/glibc-2.14/rpcgen-path.patch b/pkgs/development/libraries/glibc/2.14/rpcgen-path.patch similarity index 100% rename from pkgs/development/libraries/glibc-2.14/rpcgen-path.patch rename to pkgs/development/libraries/glibc/2.14/rpcgen-path.patch diff --git a/pkgs/development/libraries/glibc-2.5/binutils-ld.patch b/pkgs/development/libraries/glibc/2.5/binutils-ld.patch similarity index 100% rename from pkgs/development/libraries/glibc-2.5/binutils-ld.patch rename to pkgs/development/libraries/glibc/2.5/binutils-ld.patch diff --git a/pkgs/development/libraries/glibc-2.5/builder.sh b/pkgs/development/libraries/glibc/2.5/builder.sh similarity index 100% rename from pkgs/development/libraries/glibc-2.5/builder.sh rename to pkgs/development/libraries/glibc/2.5/builder.sh diff --git a/pkgs/development/libraries/glibc-2.5/default.nix b/pkgs/development/libraries/glibc/2.5/default.nix similarity index 100% rename from pkgs/development/libraries/glibc-2.5/default.nix rename to pkgs/development/libraries/glibc/2.5/default.nix diff --git a/pkgs/development/libraries/glibc-2.5/glibc-getcwd-param-MAX.patch b/pkgs/development/libraries/glibc/2.5/glibc-getcwd-param-MAX.patch similarity index 100% rename from pkgs/development/libraries/glibc-2.5/glibc-getcwd-param-MAX.patch rename to pkgs/development/libraries/glibc/2.5/glibc-getcwd-param-MAX.patch diff --git a/pkgs/development/libraries/glibc-2.5/glibc-inline.patch b/pkgs/development/libraries/glibc/2.5/glibc-inline.patch similarity index 100% rename from pkgs/development/libraries/glibc-2.5/glibc-inline.patch rename to pkgs/development/libraries/glibc/2.5/glibc-inline.patch diff --git a/pkgs/development/libraries/glibc-2.5/glibc-pwd.patch b/pkgs/development/libraries/glibc/2.5/glibc-pwd.patch similarity index 100% rename from pkgs/development/libraries/glibc-2.5/glibc-pwd.patch rename to pkgs/development/libraries/glibc/2.5/glibc-pwd.patch diff --git a/pkgs/development/libraries/glibc-2.5/make-3-82-fix.patch b/pkgs/development/libraries/glibc/2.5/make-3-82-fix.patch similarity index 100% rename from pkgs/development/libraries/glibc-2.5/make-3-82-fix.patch rename to pkgs/development/libraries/glibc/2.5/make-3-82-fix.patch diff --git a/pkgs/development/libraries/glibc-2.5/x86-fnstsw.patch b/pkgs/development/libraries/glibc/2.5/x86-fnstsw.patch similarity index 100% rename from pkgs/development/libraries/glibc-2.5/x86-fnstsw.patch rename to pkgs/development/libraries/glibc/2.5/x86-fnstsw.patch diff --git a/pkgs/development/libraries/glibc-2.7/builder.sh b/pkgs/development/libraries/glibc/2.7/builder.sh similarity index 100% rename from pkgs/development/libraries/glibc-2.7/builder.sh rename to pkgs/development/libraries/glibc/2.7/builder.sh diff --git a/pkgs/development/libraries/glibc-2.7/default.nix b/pkgs/development/libraries/glibc/2.7/default.nix similarity index 100% rename from pkgs/development/libraries/glibc-2.7/default.nix rename to pkgs/development/libraries/glibc/2.7/default.nix diff --git a/pkgs/development/libraries/glibc-2.7/nss-skip-unavail.patch b/pkgs/development/libraries/glibc/2.7/nss-skip-unavail.patch similarity index 100% rename from pkgs/development/libraries/glibc-2.7/nss-skip-unavail.patch rename to pkgs/development/libraries/glibc/2.7/nss-skip-unavail.patch diff --git a/pkgs/development/libraries/glibc-2.9/binutils-2.20.patch b/pkgs/development/libraries/glibc/2.9/binutils-2.20.patch similarity index 100% rename from pkgs/development/libraries/glibc-2.9/binutils-2.20.patch rename to pkgs/development/libraries/glibc/2.9/binutils-2.20.patch diff --git a/pkgs/development/libraries/glibc-2.9/binutils-ld.patch b/pkgs/development/libraries/glibc/2.9/binutils-ld.patch similarity index 100% rename from pkgs/development/libraries/glibc-2.9/binutils-ld.patch rename to pkgs/development/libraries/glibc/2.9/binutils-ld.patch diff --git a/pkgs/development/libraries/glibc-2.9/builder.sh b/pkgs/development/libraries/glibc/2.9/builder.sh similarity index 100% rename from pkgs/development/libraries/glibc-2.9/builder.sh rename to pkgs/development/libraries/glibc/2.9/builder.sh diff --git a/pkgs/development/libraries/glibc-2.9/default.nix b/pkgs/development/libraries/glibc/2.9/default.nix similarity index 100% rename from pkgs/development/libraries/glibc-2.9/default.nix rename to pkgs/development/libraries/glibc/2.9/default.nix diff --git a/pkgs/development/libraries/glibc-2.9/headers.nix b/pkgs/development/libraries/glibc/2.9/headers.nix similarity index 100% rename from pkgs/development/libraries/glibc-2.9/headers.nix rename to pkgs/development/libraries/glibc/2.9/headers.nix diff --git a/pkgs/development/libraries/glibc-2.9/headersbuilder.sh b/pkgs/development/libraries/glibc/2.9/headersbuilder.sh similarity index 100% rename from pkgs/development/libraries/glibc-2.9/headersbuilder.sh rename to pkgs/development/libraries/glibc/2.9/headersbuilder.sh diff --git a/pkgs/development/libraries/glibc-2.9/info.nix b/pkgs/development/libraries/glibc/2.9/info.nix similarity index 100% rename from pkgs/development/libraries/glibc-2.9/info.nix rename to pkgs/development/libraries/glibc/2.9/info.nix diff --git a/pkgs/development/libraries/glibc-2.9/locale-override.patch b/pkgs/development/libraries/glibc/2.9/locale-override.patch similarity index 100% rename from pkgs/development/libraries/glibc-2.9/locale-override.patch rename to pkgs/development/libraries/glibc/2.9/locale-override.patch diff --git a/pkgs/development/libraries/glibc-2.9/locales.nix b/pkgs/development/libraries/glibc/2.9/locales.nix similarity index 100% rename from pkgs/development/libraries/glibc-2.9/locales.nix rename to pkgs/development/libraries/glibc/2.9/locales.nix diff --git a/pkgs/development/libraries/glibc-2.9/localesbuilder.sh b/pkgs/development/libraries/glibc/2.9/localesbuilder.sh similarity index 100% rename from pkgs/development/libraries/glibc-2.9/localesbuilder.sh rename to pkgs/development/libraries/glibc/2.9/localesbuilder.sh diff --git a/pkgs/development/libraries/glibc-2.9/nss-skip-unavail.patch b/pkgs/development/libraries/glibc/2.9/nss-skip-unavail.patch similarity index 100% rename from pkgs/development/libraries/glibc-2.9/nss-skip-unavail.patch rename to pkgs/development/libraries/glibc/2.9/nss-skip-unavail.patch diff --git a/pkgs/development/libraries/glibc-2.9/rpcgen-path.patch b/pkgs/development/libraries/glibc/2.9/rpcgen-path.patch similarity index 100% rename from pkgs/development/libraries/glibc-2.9/rpcgen-path.patch rename to pkgs/development/libraries/glibc/2.9/rpcgen-path.patch diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 38501c18e7c..58812453961 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3515,29 +3515,29 @@ let glibcCross = glibc214Cross; - glibc25 = callPackage ../development/libraries/glibc-2.5 { + glibc25 = callPackage ../development/libraries/glibc/2.5 { kernelHeaders = linuxHeaders_2_6_28; installLocales = false; }; - glibc27 = callPackage ../development/libraries/glibc-2.7 { + glibc27 = callPackage ../development/libraries/glibc/2.7 { kernelHeaders = linuxHeaders; #installLocales = false; }; - glibc29 = callPackage ../development/libraries/glibc-2.9 { + glibc29 = callPackage ../development/libraries/glibc/2.9 { kernelHeaders = linuxHeaders; installLocales = getConfig [ "glibc" "locales" ] false; }; - glibc29Cross = forceBuildDrv (makeOverridable (import ../development/libraries/glibc-2.9) { + glibc29Cross = forceBuildDrv (makeOverridable (import ../development/libraries/glibc/2.9) { inherit stdenv fetchurl; gccCross = gccCrossStageStatic; kernelHeaders = linuxHeadersCross; installLocales = getConfig [ "glibc" "locales" ] false; }); - glibc213 = (callPackage ../development/libraries/glibc-2.13 { + glibc213 = (callPackage ../development/libraries/glibc/2.13 { kernelHeaders = linuxHeaders; installLocales = getConfig [ "glibc" "locales" ] false; machHeaders = null; @@ -3545,49 +3545,39 @@ let gccCross = null; }) // (if crossSystem != null then { hostDrv = glibc213Cross; } else {}); - glibc213Cross = forceBuildDrv (makeOverridable (import ../development/libraries/glibc-2.13) - (let crossGNU = (crossSystem != null && crossSystem.config == "i586-pc-gnu"); - in ({ + glibc213Cross = forceBuildDrv (makeOverridable (import ../development/libraries/glibc/2.13) + (let crossGNU = crossSystem != null && crossSystem.config == "i586-pc-gnu"; + in { inherit stdenv fetchurl; gccCross = gccCrossStageStatic; kernelHeaders = if crossGNU then gnu.hurdHeaders else linuxHeadersCross; installLocales = getConfig [ "glibc" "locales" ] false; } - - // - - (if crossGNU - then { + // lib.optionalAttrs crossGNU { inherit (gnu) machHeaders hurdHeaders libpthreadHeaders mig; inherit fetchgit; - } - else { })))); + })); - glibc214 = (callPackage ../development/libraries/glibc-2.14 { + glibc214 = (callPackage ../development/libraries/glibc/2.14 { kernelHeaders = linuxHeaders; installLocales = getConfig [ "glibc" "locales" ] false; machHeaders = null; hurdHeaders = null; gccCross = null; - }) // (if crossSystem != null then { hostDrv = glibc214Cross; } else {}); + }) // (lib.optionalAttrs (crossSystem != null) { hostDrv = glibc214Cross; }); - glibc214Cross = forceBuildDrv (makeOverridable (import ../development/libraries/glibc-2.14) + glibc214Cross = forceBuildDrv (makeOverridable (import ../development/libraries/glibc/2.14) (let crossGNU = (crossSystem != null && crossSystem.config == "i586-pc-gnu"); - in ({ + in { inherit stdenv fetchurl; gccCross = gccCrossStageStatic; kernelHeaders = if crossGNU then gnu.hurdHeaders else linuxHeadersCross; installLocales = getConfig [ "glibc" "locales" ] false; } - - // - - (if crossGNU - then { + // lib.optionalAttrs crossGNU { inherit (gnu) machHeaders hurdHeaders libpthreadHeaders mig; inherit fetchgit; - } - else { })))); + })); # We can choose: libcCrossChooser = name : if (name == "glibc") then glibcCross @@ -3602,9 +3592,9 @@ let installLocales = getConfig [ "glibc" "locales" ] false; }; - glibcLocales = callPackage ../development/libraries/glibc-2.14/locales.nix { }; + glibcLocales = callPackage ../development/libraries/glibc/2.14/locales.nix { }; - glibcInfo = callPackage ../development/libraries/glibc-2.14/info.nix { }; + glibcInfo = callPackage ../development/libraries/glibc/2.14/info.nix { }; glibc_multi = runCommand "${glibc.name}-multi" From 5481e67e2349a2cf159d4369b07d6fd11098d425 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Fri, 17 Feb 2012 22:12:40 +0000 Subject: [PATCH 098/197] GNU libc: Backport Hurd-related changes from glibc 2.12 in trunk. svn path=/nixpkgs/branches/stdenv-updates/; revision=32374 --- .../libraries/glibc/2.13/common.nix | 18 ++++++++++----- .../libraries/glibc/2.13/default.nix | 22 +++++++++++++++---- .../libraries/glibc/2.14/common.nix | 18 ++++++++++----- .../libraries/glibc/2.14/default.nix | 22 +++++++++++++++---- 4 files changed, 60 insertions(+), 20 deletions(-) diff --git a/pkgs/development/libraries/glibc/2.13/common.nix b/pkgs/development/libraries/glibc/2.13/common.nix index d63e7e99e48..1c8f142553f 100644 --- a/pkgs/development/libraries/glibc/2.13/common.nix +++ b/pkgs/development/libraries/glibc/2.13/common.nix @@ -5,13 +5,14 @@ cross : { name, fetchurl, stdenv, installLocales ? false , gccCross ? null, kernelHeaders ? null -, machHeaders ? null, hurdHeaders ? null, mig ? null, fetchgit ? null +, machHeaders ? null, hurdHeaders ? null, libpthreadHeaders ? null +, mig ? null, fetchgit ? null , profilingLibraries ? false, meta , preConfigure ? "", ... }@args : let # For GNU/Hurd, see below. - version = if hurdHeaders != null then "20100512" else "2.13"; + version = if hurdHeaders != null then "20111025" else "2.13"; needsPortsNative = stdenv.isMips || stdenv.isArm; needsPortsCross = cross.arch == "mips" || cross.arch == "arm"; @@ -30,6 +31,7 @@ assert (cross != null) -> (gccCross != null); assert (mig != null) -> (machHeaders != null); assert (machHeaders != null) -> (hurdHeaders != null); +assert (hurdHeaders != null) -> (libpthreadHeaders != null); assert (hurdHeaders != null) -> (fetchgit != null); stdenv.mkDerivation ({ @@ -146,8 +148,8 @@ stdenv.mkDerivation ({ # maintained by the Hurd folks, `tschwinge/Roger_Whittaker' branch. # See . url = "git://git.sv.gnu.org/hurd/glibc.git"; - sha256 = "f3590a54a9d897d121f91113949edbaaf3e30cdeacbb8d0a44de7b6564f6643e"; - rev = "df4c3faf0ccc848b5a8086c222bdb42679a9798f"; + sha256 = "3fb3dd7030a4b6d3e144fa94c32a0c4f46f17f94e2dfbc6bef41cfc3198725ca"; + rev = "d740cf9d201dc9ecb0335b0a585828dea9cce793"; } else fetchurl { url = "mirror://gnu/glibc/glibc-${version}.tar.bz2"; @@ -203,11 +205,15 @@ stdenv.mkDerivation ({ then { # Work around the fact that the configure snippet that looks for # does not honor `--with-headers=$sysheaders' and that - # glibc expects both Mach and Hurd headers to be in the same place. - CPATH = "${hurdHeaders}/include:${machHeaders}/include"; + # glibc expects Mach, Hurd, and pthread headers to be in the same place. + CPATH = "${hurdHeaders}/include:${machHeaders}/include:${libpthreadHeaders}/include"; # `fetchgit' is a function and thus should not be passed to the # `derivation' primitive. fetchgit = null; + + # Install NSS stuff in the right place. + # XXX: This will be needed for all new glibcs and isn't Hurd-specific. + makeFlags = ''vardbdir="$out/var/db"''; } else { })) diff --git a/pkgs/development/libraries/glibc/2.13/default.nix b/pkgs/development/libraries/glibc/2.13/default.nix index 95778b50b70..1b4e43b1013 100644 --- a/pkgs/development/libraries/glibc/2.13/default.nix +++ b/pkgs/development/libraries/glibc/2.13/default.nix @@ -1,8 +1,10 @@ { stdenv, fetchurl, kernelHeaders -, machHeaders ? null, hurdHeaders ? null, mig ? null, fetchgit ? null +, machHeaders ? null, hurdHeaders ? null, libpthreadHeaders ? null +, mig ? null, fetchgit ? null , installLocales ? true , profilingLibraries ? false , gccCross ? null +, debugSymbols ? false }: assert stdenv.gcc.gcc != null; @@ -12,7 +14,7 @@ let cross = if gccCross != null then gccCross.target else null; in build cross ({ - name = "glibc"; + name = "glibc${if debugSymbols then "-debug" else ""}"; inherit fetchurl stdenv kernelHeaders installLocales profilingLibraries gccCross; @@ -38,11 +40,23 @@ in // + (if debugSymbols + then { + # Build with debugging symbols, but leave optimizations on and don't + # attempt to keep the build tree. + dontStrip = true; + dontCrossStrip = true; + NIX_STRIP_DEBUG = 0; + } + else {}) + + // + (if hurdHeaders != null then rec { - inherit machHeaders hurdHeaders mig fetchgit; + inherit machHeaders hurdHeaders libpthreadHeaders mig fetchgit; - propagatedBuildInputs = [ machHeaders hurdHeaders ]; + propagatedBuildInputs = [ machHeaders hurdHeaders libpthreadHeaders ]; passthru = { # When building GCC itself `propagatedBuildInputs' above is not diff --git a/pkgs/development/libraries/glibc/2.14/common.nix b/pkgs/development/libraries/glibc/2.14/common.nix index e24089fd192..488503d9012 100644 --- a/pkgs/development/libraries/glibc/2.14/common.nix +++ b/pkgs/development/libraries/glibc/2.14/common.nix @@ -5,13 +5,14 @@ cross : { name, fetchurl, stdenv, installLocales ? false , gccCross ? null, kernelHeaders ? null -, machHeaders ? null, hurdHeaders ? null, mig ? null, fetchgit ? null +, machHeaders ? null, hurdHeaders ? null, libpthreadHeaders ? null +, mig ? null, fetchgit ? null , profilingLibraries ? false, meta , preConfigure ? "", ... }@args : let # For GNU/Hurd, see below. - version = if hurdHeaders != null then "20100512" else "2.14.1"; + version = if hurdHeaders != null then "20111025" else "2.14.1"; needsPortsNative = stdenv.isMips || stdenv.isArm; needsPortsCross = cross.arch == "mips" || cross.arch == "arm"; @@ -30,6 +31,7 @@ assert (cross != null) -> (gccCross != null); assert (mig != null) -> (machHeaders != null); assert (machHeaders != null) -> (hurdHeaders != null); +assert (hurdHeaders != null) -> (libpthreadHeaders != null); assert (hurdHeaders != null) -> (fetchgit != null); stdenv.mkDerivation ({ @@ -146,8 +148,8 @@ stdenv.mkDerivation ({ # maintained by the Hurd folks, `tschwinge/Roger_Whittaker' branch. # See . url = "git://git.sv.gnu.org/hurd/glibc.git"; - sha256 = "f3590a54a9d897d121f91113949edbaaf3e30cdeacbb8d0a44de7b6564f6643e"; - rev = "df4c3faf0ccc848b5a8086c222bdb42679a9798f"; + sha256 = "3fb3dd7030a4b6d3e144fa94c32a0c4f46f17f94e2dfbc6bef41cfc3198725ca"; + rev = "d740cf9d201dc9ecb0335b0a585828dea9cce793"; } else fetchurl { url = "mirror://gnu/glibc/glibc-${version}.tar.bz2"; @@ -203,11 +205,15 @@ stdenv.mkDerivation ({ then { # Work around the fact that the configure snippet that looks for # does not honor `--with-headers=$sysheaders' and that - # glibc expects both Mach and Hurd headers to be in the same place. - CPATH = "${hurdHeaders}/include:${machHeaders}/include"; + # glibc expects Mach, Hurd, and pthread headers to be in the same place. + CPATH = "${hurdHeaders}/include:${machHeaders}/include:${libpthreadHeaders}/include"; # `fetchgit' is a function and thus should not be passed to the # `derivation' primitive. fetchgit = null; + + # Install NSS stuff in the right place. + # XXX: This will be needed for all new glibcs and isn't Hurd-specific. + makeFlags = ''vardbdir="$out/var/db"''; } else { })) diff --git a/pkgs/development/libraries/glibc/2.14/default.nix b/pkgs/development/libraries/glibc/2.14/default.nix index 95778b50b70..1b4e43b1013 100644 --- a/pkgs/development/libraries/glibc/2.14/default.nix +++ b/pkgs/development/libraries/glibc/2.14/default.nix @@ -1,8 +1,10 @@ { stdenv, fetchurl, kernelHeaders -, machHeaders ? null, hurdHeaders ? null, mig ? null, fetchgit ? null +, machHeaders ? null, hurdHeaders ? null, libpthreadHeaders ? null +, mig ? null, fetchgit ? null , installLocales ? true , profilingLibraries ? false , gccCross ? null +, debugSymbols ? false }: assert stdenv.gcc.gcc != null; @@ -12,7 +14,7 @@ let cross = if gccCross != null then gccCross.target else null; in build cross ({ - name = "glibc"; + name = "glibc${if debugSymbols then "-debug" else ""}"; inherit fetchurl stdenv kernelHeaders installLocales profilingLibraries gccCross; @@ -38,11 +40,23 @@ in // + (if debugSymbols + then { + # Build with debugging symbols, but leave optimizations on and don't + # attempt to keep the build tree. + dontStrip = true; + dontCrossStrip = true; + NIX_STRIP_DEBUG = 0; + } + else {}) + + // + (if hurdHeaders != null then rec { - inherit machHeaders hurdHeaders mig fetchgit; + inherit machHeaders hurdHeaders libpthreadHeaders mig fetchgit; - propagatedBuildInputs = [ machHeaders hurdHeaders ]; + propagatedBuildInputs = [ machHeaders hurdHeaders libpthreadHeaders ]; passthru = { # When building GCC itself `propagatedBuildInputs' above is not From acee1c4e5a7c77feae613cf1addcc6cd2bd512bc Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 17 Feb 2012 22:31:37 +0000 Subject: [PATCH 099/197] * Latest 2.6.27 and 2.6.32 kernels. svn path=/nixpkgs/branches/stdenv-updates/; revision=32376 --- pkgs/os-specific/linux/kernel/linux-2.6.27.nix | 4 ++-- pkgs/os-specific/linux/kernel/linux-2.6.32.nix | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-2.6.27.nix b/pkgs/os-specific/linux/kernel/linux-2.6.27.nix index 083948fd345..046b07b9e64 100644 --- a/pkgs/os-specific/linux/kernel/linux-2.6.27.nix +++ b/pkgs/os-specific/linux/kernel/linux-2.6.27.nix @@ -3,11 +3,11 @@ args @ { stdenv, fetchurl, userModeLinux ? false, extraConfig ? "", ... }: import ./generic.nix ( rec { - version = "2.6.27.59"; + version = "2.6.27.61"; src = fetchurl { url = "mirror://kernel/linux/kernel/v2.6/longterm/v2.6.27/linux-${version}.tar.bz2"; - sha256 = "0gvp9djj3s8h1375xdjv6ycd0mgmcbvfmswxkpwxdlplly5hr1kf"; + sha256 = "1lian4fj84fry3yanammawzsqi7ix9pvic6qfr578xnvsbf5pbi7"; }; features.iwlwifi = true; diff --git a/pkgs/os-specific/linux/kernel/linux-2.6.32.nix b/pkgs/os-specific/linux/kernel/linux-2.6.32.nix index d47ad8f65ce..a7cb499a993 100644 --- a/pkgs/os-specific/linux/kernel/linux-2.6.32.nix +++ b/pkgs/os-specific/linux/kernel/linux-2.6.32.nix @@ -198,11 +198,11 @@ in import ./generic.nix ( rec { - version = "2.6.32.52"; + version = "2.6.32.57"; src = fetchurl { url = "mirror://kernel/linux/kernel/v2.6/longterm/v2.6.32/linux-${version}.tar.bz2"; - sha256 = "0a3ws6m8942p972jjlixr5v0sh6ll0hlzxwdikb666nppjcgqiz7"; + sha256 = "1pbwjdignv5qdzpiv3ijs5g95l86ss7jrslak12jfxly13lanzzh"; }; config = configWithPlatform stdenv.platform; From eae4c3afab5be5a7d0f6a36c3a591c5e578de9b1 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 17 Feb 2012 23:47:00 +0000 Subject: [PATCH 100/197] * Get rid of some old kernels that no longer compile. svn path=/nixpkgs/branches/stdenv-updates/; revision=32378 --- .../os-specific/linux/kernel/linux-2.6.25.nix | 163 ----------- .../os-specific/linux/kernel/linux-2.6.26.nix | 177 ------------ .../os-specific/linux/kernel/linux-2.6.28.nix | 227 --------------- .../os-specific/linux/kernel/linux-2.6.29.nix | 230 --------------- .../os-specific/linux/kernel/linux-2.6.31.nix | 214 -------------- .../os-specific/linux/kernel/linux-2.6.33.nix | 214 -------------- .../os-specific/linux/kernel/linux-2.6.34.nix | 211 -------------- .../os-specific/linux/kernel/linux-2.6.36.nix | 209 -------------- .../os-specific/linux/kernel/linux-2.6.37.nix | 208 -------------- .../linux/zen-kernel/2.6.32-zen4.nix | 75 ----- .../linux/zen-kernel/2.6.33-zen1.nix | 78 ------ .../linux/zen-kernel/config-blocks.nix | 263 ------------------ pkgs/top-level/all-packages.nix | 159 +---------- 13 files changed, 12 insertions(+), 2416 deletions(-) delete mode 100644 pkgs/os-specific/linux/kernel/linux-2.6.25.nix delete mode 100644 pkgs/os-specific/linux/kernel/linux-2.6.26.nix delete mode 100644 pkgs/os-specific/linux/kernel/linux-2.6.28.nix delete mode 100644 pkgs/os-specific/linux/kernel/linux-2.6.29.nix delete mode 100644 pkgs/os-specific/linux/kernel/linux-2.6.31.nix delete mode 100644 pkgs/os-specific/linux/kernel/linux-2.6.33.nix delete mode 100644 pkgs/os-specific/linux/kernel/linux-2.6.34.nix delete mode 100644 pkgs/os-specific/linux/kernel/linux-2.6.36.nix delete mode 100644 pkgs/os-specific/linux/kernel/linux-2.6.37.nix delete mode 100644 pkgs/os-specific/linux/zen-kernel/2.6.32-zen4.nix delete mode 100644 pkgs/os-specific/linux/zen-kernel/2.6.33-zen1.nix delete mode 100644 pkgs/os-specific/linux/zen-kernel/config-blocks.nix diff --git a/pkgs/os-specific/linux/kernel/linux-2.6.25.nix b/pkgs/os-specific/linux/kernel/linux-2.6.25.nix deleted file mode 100644 index 69e5ef64139..00000000000 --- a/pkgs/os-specific/linux/kernel/linux-2.6.25.nix +++ /dev/null @@ -1,163 +0,0 @@ -args @ { stdenv, fetchurl, userModeLinux ? false, extraConfig ? "", ... }: - -import ./generic.nix ( - - rec { - version = "2.6.25.20"; - - src = fetchurl { - url = "mirror://kernel/linux/kernel/v2.6/linux-${version}.tar.bz2"; - sha256 = "07knyjhvanvclk6xdwi07vfvsmiqciqaj26cn78ayiqqqr9d4f6y"; - }; - - features.iwlwifi = true; - - config = - '' - # Don't include any debug features. - DEBUG_KERNEL n - - # Support drivers that need external firmware. - STANDALONE n - - # Make /proc/config.gz available. - IKCONFIG_PROC y - - # Optimize with -O2, not -Os. - CC_OPTIMIZE_FOR_SIZE n - - # Include the CFQ I/O scheduler in the kernel, rather than as a - # module, so that the initrd gets a good I/O scheduler. - IOSCHED_CFQ y - - # Disable some expensive (?) features. - MARKERS n - KPROBES n - NUMA? n - - # Enable various subsystems. - AUXDISPLAY y # Auxiliary Display support - DONGLE y # Serial dongle support - HIPPI y - MTD_COMPLEX_MAPPINGS y # needed for many devices - NET_POCKET y # enable pocket and portable adapters - SCSI_LOWLEVEL y # enable lots of SCSI devices - SCSI_LOWLEVEL_PCMCIA y - SPI y # needed for many devices - SPI_MASTER y - WAN y - - # Networking options. - IP_PNP n - IPV6_PRIVACY y - IP_DCCP_CCID3 n # experimental - - # Some settings to make sure that fbcondecor works - in particular, - # disable tileblitting and the drivers that need it. - - # Enable various FB devices. - FB_EFI y - FB_NVIDIA_I2C y # Enable DDC Support - FB_RIVA_I2C y - FB_ATY_CT y # Mach64 CT/VT/GT/LT (incl. 3D RAGE) support - FB_ATY_GX y # Mach64 GX support - FB_SAVAGE_I2C y - FB_SAVAGE_ACCEL y - FB_SIS_300 y - FB_SIS_315 y - FB_3DFX_ACCEL y - FB_TRIDENT_ACCEL y - FB_GEODE y - - # Sound. - SND_AC97_POWER_SAVE y # AC97 Power-Saving Mode - SND_USB_CAIAQ_INPUT y - PSS_MIXER y # Enable PSS mixer (Beethoven ADSP-16 and other compatible) - - # Enable a bunch of USB storage devices. - USB_STORAGE_DATAFAB y - USB_STORAGE_FREECOM y - USB_STORAGE_ISD200 y - USB_STORAGE_USBAT y - USB_STORAGE_SDDR09 y - USB_STORAGE_SDDR55 y - USB_STORAGE_JUMPSHOT y - USB_STORAGE_KARMA y - - # USB serial devices. - USB_SERIAL_GENERIC y # USB Generic Serial Driver - USB_SERIAL_KEYSPAN_MPR y # include firmware for various USB serial devices - USB_SERIAL_KEYSPAN_USA28 y - USB_SERIAL_KEYSPAN_USA28X y - USB_SERIAL_KEYSPAN_USA28XA y - USB_SERIAL_KEYSPAN_USA28XB y - USB_SERIAL_KEYSPAN_USA19 y - USB_SERIAL_KEYSPAN_USA18X y - USB_SERIAL_KEYSPAN_USA19W y - USB_SERIAL_KEYSPAN_USA19QW y - USB_SERIAL_KEYSPAN_USA19QI y - USB_SERIAL_KEYSPAN_USA49W y - USB_SERIAL_KEYSPAN_USA49WLC y - - # Filesystem options - in particular, enable extended attributes and - # ACLs for all filesystems that support them. - EXT2_FS_XATTR y # Ext2 extended attributes - EXT2_FS_POSIX_ACL y # Ext2 POSIX Access Control Lists - EXT2_FS_SECURITY y # Ext2 Security Labels - EXT2_FS_XIP y # Ext2 execute in place support - REISERFS_FS_XATTR y - REISERFS_FS_POSIX_ACL y - REISERFS_FS_SECURITY y - JFS_POSIX_ACL y - JFS_SECURITY y - XFS_QUOTA y - XFS_POSIX_ACL y - XFS_RT y # XFS Realtime subvolume support - OCFS2_DEBUG_MASKLOG n - NFSD_V2_ACL y - NFSD_V3 y - NFSD_V3_ACL y - NFSD_V4 y - CIFS_XATTR y - CIFS_POSIX y - - # Misc. options. - 8139TOO_8129 y - 8139TOO_PIO n # PIO is slower - AIC79XX_DEBUG_ENABLE n - AIC7XXX_DEBUG_ENABLE n - AIC94XX_DEBUG n - BLK_DEV_BSG n - BLK_DEV_CMD640_ENHANCED y # CMD640 enhanced support - BLK_DEV_IDEACPI y # IDE ACPI support - BLK_DEV_IO_TRACE n - BT_HCIUART_BCSP y - BT_HCIUART_H4 y # UART (H4) protocol support - BT_HCIUART_LL y - BT_RFCOMM_TTY y # RFCOMM TTY support - CPU_FREQ_DEBUG n - CRASH_DUMP n - DMAR? n # experimental - FUSION y # Fusion MPT device support - IRDA_ULTRA y # Ultra (connectionless) protocol - KALLSYMS_EXTRA_PASS n - LOGO n # not needed - MEGARAID_NEWGEN y - MODVERSIONS y - NET_FC y # Fibre Channel driver support - PCI_LEGACY y - PPP_MULTILINK y # PPP multilink support - SCSI_LOGGING y # SCSI logging facility - SERIAL_8250 y # 8250/16550 and compatible serial support - SLIP_COMPRESSED y # CSLIP compressed headers - SLIP_SMART y - USB_DEBUG n - USB_EHCI_ROOT_HUB_TT y # Root Hub Transaction Translators - X86_MCE y - - ${extraConfig} - ''; - } - - // args -) diff --git a/pkgs/os-specific/linux/kernel/linux-2.6.26.nix b/pkgs/os-specific/linux/kernel/linux-2.6.26.nix deleted file mode 100644 index b402cdea742..00000000000 --- a/pkgs/os-specific/linux/kernel/linux-2.6.26.nix +++ /dev/null @@ -1,177 +0,0 @@ -{ stdenv, fetchurl, extraConfig ? "", ... } @ args: - -let - configWithPlatform = kernelPlatform : - '' - # Don't include any debug features. - DEBUG_KERNEL n - - # Activate /proc/sys/kernel/modprobe - KMOD y - - # Support drivers that need external firmware. - STANDALONE n - - # Make /proc/config.gz available. - IKCONFIG_PROC y - - # Optimize with -O2, not -Os. - CC_OPTIMIZE_FOR_SIZE n - - # Virtualisation (KVM, Xen...). - PARAVIRT_GUEST y - KVM_CLOCK y - KVM_GUEST y - - # Include the CFQ I/O scheduler in the kernel, rather than as a - # module, so that the initrd gets a good I/O scheduler. - IOSCHED_CFQ y - - # Disable some expensive (?) features. - MARKERS n - KPROBES n - NUMA? n - - # Enable various subsystems. - ACCESSIBILITY y # Accessibility support - AUXDISPLAY y # Auxiliary Display support - DONGLE y # Serial dongle support - HIPPI y - MTD_COMPLEX_MAPPINGS y # needed for many devices - NET_POCKET y # enable pocket and portable adapters - SCSI_LOWLEVEL y # enable lots of SCSI devices - SCSI_LOWLEVEL_PCMCIA y - SPI y # needed for many devices - SPI_MASTER y - WAN y - - # Networking options. - IP_PNP n - IPV6_PRIVACY y - - # Some settings to make sure that fbcondecor works - in particular, - # disable tileblitting and the drivers that need it. - - # Enable various FB devices. - FB_EFI y - FB_NVIDIA_I2C y # Enable DDC Support - FB_RIVA_I2C y - FB_ATY_CT y # ach64 CT/VT/GT/LT (incl. 3D RAGE) support - FB_ATY_GX y # Mach64 GX support - FB_SAVAGE_I2C y - FB_SAVAGE_ACCEL y - FB_SIS_300 y - FB_SIS_315 y - FB_3DFX_ACCEL y - FB_TRIDENT_ACCEL y - FB_GEODE y - - # Sound. - SND_AC97_POWER_SAVE y # AC97 Power-Saving Mode - SND_USB_CAIAQ_INPUT y - PSS_MIXER y # Enable PSS mixer (Beethoven ADSP-16 and other compatible) - - # Enable a bunch of USB storage devices. - USB_STORAGE_DATAFAB y - USB_STORAGE_FREECOM y - USB_STORAGE_ISD200 y - USB_STORAGE_USBAT y - USB_STORAGE_SDDR09 y - USB_STORAGE_SDDR55 y - USB_STORAGE_JUMPSHOT y - USB_STORAGE_ONETOUCH y - USB_STORAGE_KARMA y - USB_STORAGE_CYPRESS_ATACB y - - # USB serial devices. - USB_SERIAL_GENERIC y # USB Generic Serial Driver - USB_SERIAL_KEYSPAN_MPR y # include firmware for various USB serial devices - USB_SERIAL_KEYSPAN_USA28 y - USB_SERIAL_KEYSPAN_USA28X y - USB_SERIAL_KEYSPAN_USA28XA y - USB_SERIAL_KEYSPAN_USA28XB y - USB_SERIAL_KEYSPAN_USA19 y - USB_SERIAL_KEYSPAN_USA18X y - USB_SERIAL_KEYSPAN_USA19W y - USB_SERIAL_KEYSPAN_USA19QW y - USB_SERIAL_KEYSPAN_USA19QI y - USB_SERIAL_KEYSPAN_USA49W y - USB_SERIAL_KEYSPAN_USA49WLC y - - # Filesystem options - in particular, enable extended attributes and - # ACLs for all filesystems that support them. - EXT2_FS_XATTR y # Ext2 extended attributes - EXT2_FS_POSIX_ACL y # Ext2 POSIX Access Control Lists - EXT2_FS_SECURITY y # Ext2 Security Labels - EXT2_FS_XIP y # Ext2 execute in place support - REISERFS_FS_XATTR y - REISERFS_FS_POSIX_ACL y - REISERFS_FS_SECURITY y - JFS_POSIX_ACL y - JFS_SECURITY y - XFS_QUOTA y - XFS_POSIX_ACL y - XFS_RT y # XFS Realtime subvolume support - OCFS2_DEBUG_MASKLOG n - NFSD_V2_ACL y - NFSD_V3 y - NFSD_V3_ACL y - NFSD_V4 y - CIFS_XATTR y - CIFS_POSIX y - - # Misc. options. - 8139TOO_8129 y - 8139TOO_PIO n # PIO is slower - AIC79XX_DEBUG_ENABLE n - AIC7XXX_DEBUG_ENABLE n - AIC94XX_DEBUG n - BLK_DEV_BSG n - BLK_DEV_IDEACPI y # IDE ACPI support - BLK_DEV_IO_TRACE n - BT_HCIUART_BCSP y - BT_HCIUART_H4 y # UART (H4) protocol support - BT_HCIUART_LL y - BT_RFCOMM_TTY y # RFCOMM TTY support - CPU_FREQ_DEBUG n - CRASH_DUMP n - DMAR? n # experimental - FUSION y # Fusion MPT device support - IRDA_ULTRA y # Ultra (connectionless) protocol - KALLSYMS_EXTRA_PASS n - LOGO n # not needed - MEDIA_ATTACH y - MEGARAID_NEWGEN y - MODVERSIONS y - NET_FC y # Fibre Channel driver support - PCI_LEGACY y - PPP_MULTILINK y # PPP multilink support - SCSI_LOGGING y # SCSI logging facility - SERIAL_8250 y # 8250/16550 and compatible serial support - SLIP_COMPRESSED y # CSLIP compressed headers - SLIP_SMART y - THERMAL_HWMON y # Hardware monitoring support - USB_DEBUG n - USB_EHCI_ROOT_HUB_TT y # Root Hub Transaction Translators - X86_MCE y - - ${extraConfig} - ''; -in - -import ./generic.nix ( - - rec { - version = "2.6.26.8"; - - src = fetchurl { - url = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-${version}.tar.bz2"; - sha256 = "4f2991378a09bd4ba916236cba200052c18e52e44c9d7e4100337f7df2788dc9"; - }; - - config = configWithPlatform stdenv.platform; - configCross = configWithPlatform stdenv.cross.platform; - } - - // removeAttrs args ["extraConfig"] -) diff --git a/pkgs/os-specific/linux/kernel/linux-2.6.28.nix b/pkgs/os-specific/linux/kernel/linux-2.6.28.nix deleted file mode 100644 index d8e051a529c..00000000000 --- a/pkgs/os-specific/linux/kernel/linux-2.6.28.nix +++ /dev/null @@ -1,227 +0,0 @@ -args @ { stdenv, fetchurl, userModeLinux ? false, extraConfig ? "", ... }: - -import ./generic.nix ( - - rec { - version = "2.6.28.10"; - - src = fetchurl { - url = "mirror://kernel/linux/kernel/v2.6/linux-${version}.tar.bz2"; - sha256 = "10vryshzpgk7vqmb3f0z981r5nci722kfqbjd274qwjyanxlj60b"; - }; - - features.iwlwifi = true; - - config = - '' - # Don't include any debug features. - DEBUG_KERNEL n - - # Support drivers that need external firmware. - STANDALONE n - - # Make /proc/config.gz available. - IKCONFIG_PROC y - - # Optimize with -O2, not -Os. - CC_OPTIMIZE_FOR_SIZE n - - # Virtualisation (KVM, Xen...). - PARAVIRT_GUEST y - KVM_CLOCK y - KVM_GUEST y - XEN n - - # We need 64 GB (PAE) support for Xen guest support. - HIGHMEM64G? y - - # Enable the kernel's built-in memory tester. - MEMTEST y - - # Include the CFQ I/O scheduler in the kernel, rather than as a - # module, so that the initrd gets a good I/O scheduler. - IOSCHED_CFQ y - - # Disable some expensive (?) features. - MARKERS n - KPROBES n - NUMA? n - PM_TRACE_RTC n - - # Enable various subsystems. - ACCESSIBILITY y # Accessibility support - AUXDISPLAY y # Auxiliary Display support - DONGLE y # Serial dongle support - HIPPI y - MTD_COMPLEX_MAPPINGS y # needed for many devices - NET_POCKET y # enable pocket and portable adapters - SCSI_LOWLEVEL y # enable lots of SCSI devices - SCSI_LOWLEVEL_PCMCIA y - SPI y # needed for many devices - SPI_MASTER y - WAN y - - # Networking options. - IP_PNP n - IPV6_PRIVACY y - NETFILTER_ADVANCED y - IP_VS_PROTO_TCP y - IP_VS_PROTO_UDP y - IP_VS_PROTO_ESP y - IP_VS_PROTO_AH y - IP_DCCP_CCID3 n # experimental - CLS_U32_PERF y - CLS_U32_MARK y - - # Wireless networking. - IPW2100_MONITOR y # support promiscuous mode - IPW2200_MONITOR y # support promiscuous mode - IWLWIFI_LEDS? y - IWLWIFI_RFKILL y - IWLAGN_SPECTRUM_MEASUREMENT y - IWLAGN_LEDS y - IWL4965 y # Intel Wireless WiFi 4965AGN - IWL5000 y # Intel Wireless WiFi 5000AGN - IWL3945_RFKILL y - IWL3945_LEDS y - HOSTAP_FIRMWARE y # Support downloading firmware images with Host AP driver - HOSTAP_FIRMWARE_NVRAM y - - # Some settings to make sure that fbcondecor works - in particular, - # disable tileblitting and the drivers that need it. - - # Enable various FB devices. - FB_EFI y - FB_NVIDIA_I2C y # Enable DDC Support - FB_RIVA_I2C y - FB_ATY_CT y # Mach64 CT/VT/GT/LT (incl. 3D RAGE) support - FB_ATY_GX y # Mach64 GX support - FB_SAVAGE_I2C y - FB_SAVAGE_ACCEL y - FB_SIS_300 y - FB_SIS_315 y - FB_3DFX_ACCEL y - FB_TRIDENT_ACCEL y - FB_GEODE y - - # Sound. - SND_AC97_POWER_SAVE y # AC97 Power-Saving Mode - SND_HDA_INPUT_BEEP y # Support digital beep via input layer - SND_USB_CAIAQ_INPUT y - PSS_MIXER y # Enable PSS mixer (Beethoven ADSP-16 and other compatible) - - # Enable a bunch of USB storage devices. - USB_STORAGE_DATAFAB y - USB_STORAGE_FREECOM y - USB_STORAGE_ISD200 y - USB_STORAGE_USBAT y - USB_STORAGE_SDDR09 y - USB_STORAGE_SDDR55 y - USB_STORAGE_JUMPSHOT y - USB_STORAGE_ONETOUCH y - USB_STORAGE_KARMA y - USB_STORAGE_CYPRESS_ATACB y - - # USB serial devices. - USB_SERIAL_GENERIC y # USB Generic Serial Driver - USB_SERIAL_KEYSPAN_MPR y # include firmware for various USB serial devices - USB_SERIAL_KEYSPAN_USA28 y - USB_SERIAL_KEYSPAN_USA28X y - USB_SERIAL_KEYSPAN_USA28XA y - USB_SERIAL_KEYSPAN_USA28XB y - USB_SERIAL_KEYSPAN_USA19 y - USB_SERIAL_KEYSPAN_USA18X y - USB_SERIAL_KEYSPAN_USA19W y - USB_SERIAL_KEYSPAN_USA19QW y - USB_SERIAL_KEYSPAN_USA19QI y - USB_SERIAL_KEYSPAN_USA49W y - USB_SERIAL_KEYSPAN_USA49WLC y - - # Filesystem options - in particular, enable extended attributes and - # ACLs for all filesystems that support them. - EXT2_FS_XATTR y # Ext2 extended attributes - EXT2_FS_POSIX_ACL y # Ext2 POSIX Access Control Lists - EXT2_FS_SECURITY y # Ext2 Security Labels - EXT2_FS_XIP y # Ext2 execute in place support - EXT4_FS_POSIX_ACL y - EXT4_FS_SECURITY y - REISERFS_FS_XATTR y - REISERFS_FS_POSIX_ACL y - REISERFS_FS_SECURITY y - JFS_POSIX_ACL y - JFS_SECURITY y - XFS_QUOTA y - XFS_POSIX_ACL y - XFS_RT y # XFS Realtime subvolume support - OCFS2_DEBUG_MASKLOG n - UBIFS_FS_XATTR y - UBIFS_FS_ADVANCED_COMPR y - NFSD_V2_ACL y - NFSD_V3 y - NFSD_V3_ACL y - NFSD_V4 y - CIFS_XATTR y - CIFS_POSIX y - - # Security related features. - STRICT_DEVMEM y # Filter access to /dev/mem - SECURITY_SELINUX_BOOTPARAM_VALUE 0 # disable SELinux by default - - # Misc. options. - 8139TOO_8129 y - 8139TOO_PIO n # PIO is slower - AIC79XX_DEBUG_ENABLE n - AIC7XXX_DEBUG_ENABLE n - AIC94XX_DEBUG n - B43_PCMCIA y - BLK_DEV_BSG n - BLK_DEV_CMD640_ENHANCED y # CMD640 enhanced support - BLK_DEV_IDEACPI y # IDE ACPI support - BLK_DEV_INTEGRITY y - BLK_DEV_IO_TRACE n - BSD_PROCESS_ACCT_V3 y - BT_HCIUART_BCSP y - BT_HCIUART_H4 y # UART (H4) protocol support - BT_HCIUART_LL y - BT_RFCOMM_TTY y # RFCOMM TTY support - CPU_FREQ_DEBUG n - CRASH_DUMP n - DMAR? n # experimental - FUSION y # Fusion MPT device support - IDE_GD_ATAPI y # ATAPI floppy support - IRDA_ULTRA y # Ultra (connectionless) protocol - JOYSTICK_IFORCE_232 y # I-Force Serial joysticks and wheels - JOYSTICK_IFORCE_USB y # I-Force USB joysticks and wheels - JOYSTICK_XPAD_FF y # X-Box gamepad rumble support - JOYSTICK_XPAD_LEDS y # LED Support for Xbox360 controller 'BigX' LED - KALLSYMS_EXTRA_PASS n - LDM_PARTITION y # Windows Logical Disk Manager (Dynamic Disk) support - LEDS_TRIGGER_IDE_DISK y # LED IDE Disk Trigger - LOGIRUMBLEPAD2_FF y # Logitech Rumblepad 2 force feedback - LOGO n # not needed - MEDIA_ATTACH y - MEGARAID_NEWGEN y - MICROCODE_AMD y - MODVERSIONS y - MOUSE_PS2_ELANTECH y # Elantech PS/2 protocol extension - MTRR_SANITIZER y - NET_FC y # Fibre Channel driver support - PCI_LEGACY y - PPP_MULTILINK y # PPP multilink support - REGULATOR y # Voltage and Current Regulator Support - SCSI_LOGGING y # SCSI logging facility - SERIAL_8250 y # 8250/16550 and compatible serial support - SLIP_COMPRESSED y # CSLIP compressed headers - SLIP_SMART y - THERMAL_HWMON y # Hardware monitoring support - USB_DEBUG n - USB_EHCI_ROOT_HUB_TT y # Root Hub Transaction Translators - X86_CHECK_BIOS_CORRUPTION y - X86_MCE y - - ${extraConfig} - ''; - } - - // args -) diff --git a/pkgs/os-specific/linux/kernel/linux-2.6.29.nix b/pkgs/os-specific/linux/kernel/linux-2.6.29.nix deleted file mode 100644 index 99354c23045..00000000000 --- a/pkgs/os-specific/linux/kernel/linux-2.6.29.nix +++ /dev/null @@ -1,230 +0,0 @@ -args @ { stdenv, fetchurl, userModeLinux ? false, extraConfig ? "", ... }: - -import ./generic.nix ( - - rec { - version = "2.6.29.6"; - - src = fetchurl { - url = "mirror://kernel/linux/kernel/v2.6/linux-${version}.tar.bz2"; - sha256 = "1yf5xhdnpcyhw4y78v35wyidlsyzxvbbnzw6jd31zni7ira6jvjk"; - }; - - features.iwlwifi = true; - - config = - '' - # Don't include any debug features. - DEBUG_KERNEL n - - # Support drivers that need external firmware. - STANDALONE n - - # Make /proc/config.gz available. - IKCONFIG_PROC y - - # Optimize with -O2, not -Os. - CC_OPTIMIZE_FOR_SIZE n - - # Virtualisation (KVM, Xen...). - PARAVIRT_GUEST y - KVM_CLOCK y - KVM_GUEST y - XEN n - - # We need 64 GB (PAE) support for Xen guest support. - HIGHMEM64G? y - - # Enable the kernel's built-in memory tester. - MEMTEST y - - # Include the CFQ I/O scheduler in the kernel, rather than as a - # module, so that the initrd gets a good I/O scheduler. - IOSCHED_CFQ y - - # Disable some expensive (?) features. - MARKERS n - KPROBES n - NUMA? n - PM_TRACE_RTC n - - # Enable various subsystems. - ACCESSIBILITY y # Accessibility support - AUXDISPLAY y # Auxiliary Display support - DONGLE y # Serial dongle support - HIPPI y - MTD_COMPLEX_MAPPINGS y # needed for many devices - NET_POCKET y # enable pocket and portable adapters - SCSI_LOWLEVEL y # enable lots of SCSI devices - SCSI_LOWLEVEL_PCMCIA y - SPI y # needed for many devices - SPI_MASTER y - WAN y - - # Networking options. - IP_PNP n - IPV6_PRIVACY y - NETFILTER_ADVANCED y - IP_VS_PROTO_TCP y - IP_VS_PROTO_UDP y - IP_VS_PROTO_ESP y - IP_VS_PROTO_AH y - IP_DCCP_CCID3 n # experimental - CLS_U32_PERF y - CLS_U32_MARK y - - # Wireless networking. - IPW2100_MONITOR y # support promiscuous mode - IPW2200_MONITOR y # support promiscuous mode - IWLWIFI_LEDS? y - IWLWIFI_RFKILL y - IWLAGN_SPECTRUM_MEASUREMENT y - IWLAGN_LEDS y - IWL4965 y # Intel Wireless WiFi 4965AGN - IWL5000 y # Intel Wireless WiFi 5000AGN - IWL3945_RFKILL y - IWL3945_LEDS y - HOSTAP_FIRMWARE y # Support downloading firmware images with Host AP driver - HOSTAP_FIRMWARE_NVRAM y - - # Some settings to make sure that fbcondecor works - in particular, - # disable tileblitting and the drivers that need it. - - # Enable various FB devices. - FB_EFI y - FB_NVIDIA_I2C y # Enable DDC Support - FB_RIVA_I2C y - FB_ATY_CT y # Mach64 CT/VT/GT/LT (incl. 3D RAGE) support - FB_ATY_GX y # Mach64 GX support - FB_SAVAGE_I2C y - FB_SAVAGE_ACCEL y - FB_SIS_300 y - FB_SIS_315 y - FB_3DFX_ACCEL y - FB_TRIDENT_ACCEL y - FB_GEODE y - - # Sound. - SND_AC97_POWER_SAVE y # AC97 Power-Saving Mode - SND_HDA_INPUT_BEEP y # Support digital beep via input layer - SND_USB_CAIAQ_INPUT y - PSS_MIXER y # Enable PSS mixer (Beethoven ADSP-16 and other compatible) - - # Enable a bunch of USB storage devices. - USB_STORAGE_DATAFAB y - USB_STORAGE_FREECOM y - USB_STORAGE_ISD200 y - USB_STORAGE_USBAT y - USB_STORAGE_SDDR09 y - USB_STORAGE_SDDR55 y - USB_STORAGE_JUMPSHOT y - USB_STORAGE_ONETOUCH y - USB_STORAGE_KARMA y - USB_STORAGE_CYPRESS_ATACB y - - # USB serial devices. - USB_SERIAL_GENERIC y # USB Generic Serial Driver - USB_SERIAL_KEYSPAN_MPR y # include firmware for various USB serial devices - USB_SERIAL_KEYSPAN_USA28 y - USB_SERIAL_KEYSPAN_USA28X y - USB_SERIAL_KEYSPAN_USA28XA y - USB_SERIAL_KEYSPAN_USA28XB y - USB_SERIAL_KEYSPAN_USA19 y - USB_SERIAL_KEYSPAN_USA18X y - USB_SERIAL_KEYSPAN_USA19W y - USB_SERIAL_KEYSPAN_USA19QW y - USB_SERIAL_KEYSPAN_USA19QI y - USB_SERIAL_KEYSPAN_USA49W y - USB_SERIAL_KEYSPAN_USA49WLC y - - # Filesystem options - in particular, enable extended attributes and - # ACLs for all filesystems that support them. - EXT2_FS_XATTR y # Ext2 extended attributes - EXT2_FS_POSIX_ACL y # Ext2 POSIX Access Control Lists - EXT2_FS_SECURITY y # Ext2 Security Labels - EXT2_FS_XIP y # Ext2 execute in place support - EXT4_FS_POSIX_ACL y - EXT4_FS_SECURITY y - REISERFS_FS_XATTR y - REISERFS_FS_POSIX_ACL y - REISERFS_FS_SECURITY y - JFS_POSIX_ACL y - JFS_SECURITY y - XFS_QUOTA y - XFS_POSIX_ACL y - XFS_RT y # XFS Realtime subvolume support - OCFS2_DEBUG_MASKLOG n - OCFS2_FS_POSIX_ACL y - BTRFS_FS_POSIX_ACL y - UBIFS_FS_XATTR y - UBIFS_FS_ADVANCED_COMPR y - NFSD_V2_ACL y - NFSD_V3 y - NFSD_V3_ACL y - NFSD_V4 y - CIFS_XATTR y - CIFS_POSIX y - - # Security related features. - STRICT_DEVMEM y # Filter access to /dev/mem - SECURITY_SELINUX_BOOTPARAM_VALUE 0 # disable SELinux by default - - # Misc. options. - 8139TOO_8129 y - 8139TOO_PIO n # PIO is slower - AIC79XX_DEBUG_ENABLE n - AIC7XXX_DEBUG_ENABLE n - AIC94XX_DEBUG n - B43_PCMCIA y - BLK_DEV_BSG n - BLK_DEV_CMD640_ENHANCED y # CMD640 enhanced support - BLK_DEV_IDEACPI y # IDE ACPI support - BLK_DEV_INTEGRITY y - BLK_DEV_IO_TRACE n - BSD_PROCESS_ACCT_V3 y - BT_HCIUART_BCSP y - BT_HCIUART_H4 y # UART (H4) protocol support - BT_HCIUART_LL y - BT_RFCOMM_TTY y # RFCOMM TTY support - CPU_FREQ_DEBUG n - CRASH_DUMP n - DMAR? n # experimental - DVB_DYNAMIC_MINORS y # we use udev - FUSION y # Fusion MPT device support - IDE_GD_ATAPI y # ATAPI floppy support - IRDA_ULTRA y # Ultra (connectionless) protocol - JOYSTICK_IFORCE_232 y # I-Force Serial joysticks and wheels - JOYSTICK_IFORCE_USB y # I-Force USB joysticks and wheels - JOYSTICK_XPAD_FF y # X-Box gamepad rumble support - JOYSTICK_XPAD_LEDS y # LED Support for Xbox360 controller 'BigX' LED - KALLSYMS_EXTRA_PASS n - LDM_PARTITION y # Windows Logical Disk Manager (Dynamic Disk) support - LEDS_TRIGGER_IDE_DISK y # LED IDE Disk Trigger - LOGIRUMBLEPAD2_FF y # Logitech Rumblepad 2 force feedback - LOGO n # not needed - MEDIA_ATTACH y - MEGARAID_NEWGEN y - MICROCODE_AMD y - MODVERSIONS y - MOUSE_PS2_ELANTECH y # Elantech PS/2 protocol extension - MTRR_SANITIZER y - NET_FC y # Fibre Channel driver support - PCI_LEGACY y - PPP_MULTILINK y # PPP multilink support - REGULATOR y # Voltage and Current Regulator Support - SCSI_LOGGING y # SCSI logging facility - SERIAL_8250 y # 8250/16550 and compatible serial support - SLIP_COMPRESSED y # CSLIP compressed headers - SLIP_SMART y - THERMAL_HWMON y # Hardware monitoring support - USB_DEBUG n - USB_EHCI_ROOT_HUB_TT y # Root Hub Transaction Translators - X86_CHECK_BIOS_CORRUPTION y - X86_MCE y - - ${extraConfig} - ''; - } - - // args -) diff --git a/pkgs/os-specific/linux/kernel/linux-2.6.31.nix b/pkgs/os-specific/linux/kernel/linux-2.6.31.nix deleted file mode 100644 index 523f3c9ceb5..00000000000 --- a/pkgs/os-specific/linux/kernel/linux-2.6.31.nix +++ /dev/null @@ -1,214 +0,0 @@ -{ stdenv, fetchurl, extraConfig ? "", ... } @ args: - -let - configWithPlatform = kernelPlatform: - '' - # Don't include any debug features. - DEBUG_KERNEL n - - # Support drivers that need external firmware. - STANDALONE n - - # Make /proc/config.gz available. - IKCONFIG_PROC y - - # Optimize with -O2, not -Os. - CC_OPTIMIZE_FOR_SIZE n - - # Enable the kernel's built-in memory tester. - MEMTEST y - - # Include the CFQ I/O scheduler in the kernel, rather than as a - # module, so that the initrd gets a good I/O scheduler. - IOSCHED_CFQ y - - # Disable some expensive (?) features. - FTRACE n - KPROBES n - NUMA? n - PM_TRACE_RTC n - - # Enable various subsystems. - ACCESSIBILITY y # Accessibility support - AUXDISPLAY y # Auxiliary Display support - DONGLE y # Serial dongle support - HIPPI y - MTD_COMPLEX_MAPPINGS y # needed for many devices - NET_POCKET y # enable pocket and portable adapters - SCSI_LOWLEVEL y # enable lots of SCSI devices - SCSI_LOWLEVEL_PCMCIA y - SPI y # needed for many devices - SPI_MASTER y - WAN y - - # Networking options. - IP_PNP n - IPV6_PRIVACY y - NETFILTER_ADVANCED y - IP_VS_PROTO_TCP y - IP_VS_PROTO_UDP y - IP_VS_PROTO_ESP y - IP_VS_PROTO_AH y - IP_DCCP_CCID3 n # experimental - CLS_U32_PERF y - CLS_U32_MARK y - - # Wireless networking. - IPW2100_MONITOR y # support promiscuous mode - IPW2200_MONITOR y # support promiscuous mode - IWLWIFI_LEDS? y - IWLWIFI_SPECTRUM_MEASUREMENT y - IWL3945_SPECTRUM_MEASUREMENT y - IWL4965 y # Intel Wireless WiFi 4965AGN - IWL5000 y # Intel Wireless WiFi 5000AGN - HOSTAP_FIRMWARE y # Support downloading firmware images with Host AP driver - HOSTAP_FIRMWARE_NVRAM y - - # Some settings to make sure that fbcondecor works - in particular, - # disable tileblitting and the drivers that need it. - - # Enable various FB devices. - FB y - FB_EFI y - FB_NVIDIA_I2C y # Enable DDC Support - FB_RIVA_I2C y - FB_ATY_CT y # Mach64 CT/VT/GT/LT (incl. 3D RAGE) support - FB_ATY_GX y # Mach64 GX support - FB_SAVAGE_I2C y - FB_SAVAGE_ACCEL y - FB_SIS_300 y - FB_SIS_315 y - FB_3DFX_ACCEL y - FB_GEODE y - - # Video configuration - # The intel drivers already require KMS - DRM_I915_KMS y - - # Sound. - SND_AC97_POWER_SAVE y # AC97 Power-Saving Mode - SND_HDA_INPUT_BEEP y # Support digital beep via input layer - SND_USB_CAIAQ_INPUT y - PSS_MIXER y # Enable PSS mixer (Beethoven ADSP-16 and other compatible) - - # USB serial devices. - USB_SERIAL_GENERIC y # USB Generic Serial Driver - USB_SERIAL_KEYSPAN_MPR y # include firmware for various USB serial devices - USB_SERIAL_KEYSPAN_USA28 y - USB_SERIAL_KEYSPAN_USA28X y - USB_SERIAL_KEYSPAN_USA28XA y - USB_SERIAL_KEYSPAN_USA28XB y - USB_SERIAL_KEYSPAN_USA19 y - USB_SERIAL_KEYSPAN_USA18X y - USB_SERIAL_KEYSPAN_USA19W y - USB_SERIAL_KEYSPAN_USA19QW y - USB_SERIAL_KEYSPAN_USA19QI y - USB_SERIAL_KEYSPAN_USA49W y - USB_SERIAL_KEYSPAN_USA49WLC y - - # Filesystem options - in particular, enable extended attributes and - # ACLs for all filesystems that support them. - EXT2_FS_XATTR y # Ext2 extended attributes - EXT2_FS_POSIX_ACL y # Ext2 POSIX Access Control Lists - EXT2_FS_SECURITY y # Ext2 Security Labels - EXT2_FS_XIP y # Ext2 execute in place support - EXT4_FS_POSIX_ACL y - EXT4_FS_SECURITY y - REISERFS_FS_XATTR y - REISERFS_FS_POSIX_ACL y - REISERFS_FS_SECURITY y - JFS_POSIX_ACL y - JFS_SECURITY y - XFS_QUOTA y - XFS_POSIX_ACL y - XFS_RT y # XFS Realtime subvolume support - OCFS2_DEBUG_MASKLOG n - OCFS2_FS_POSIX_ACL y - BTRFS_FS_POSIX_ACL y - UBIFS_FS_XATTR y - UBIFS_FS_ADVANCED_COMPR y - NFSD_V2_ACL y - NFSD_V3 y - NFSD_V3_ACL y - NFSD_V4 y - CIFS_XATTR y - CIFS_POSIX y - - # Security related features. - STRICT_DEVMEM y # Filter access to /dev/mem - SECURITY_SELINUX_BOOTPARAM_VALUE 0 # disable SELinux by default - - # Misc. options. - 8139TOO_8129 y - 8139TOO_PIO n # PIO is slower - AIC79XX_DEBUG_ENABLE n - AIC7XXX_DEBUG_ENABLE n - AIC94XX_DEBUG n - B43_PCMCIA y - BLK_DEV_BSG n - BLK_DEV_CMD640_ENHANCED y # CMD640 enhanced support - BLK_DEV_IDEACPI y # IDE ACPI support - BLK_DEV_INTEGRITY y - BSD_PROCESS_ACCT_V3 y - BT_HCIUART_BCSP y - BT_HCIUART_H4 y # UART (H4) protocol support - BT_HCIUART_LL y - BT_RFCOMM_TTY y # RFCOMM TTY support - CPU_FREQ_DEBUG n - CRASH_DUMP n - DMAR? n # experimental - DVB_DYNAMIC_MINORS y # we use udev - FUSION y # Fusion MPT device support - IDE_GD_ATAPI y # ATAPI floppy support - IRDA_ULTRA y # Ultra (connectionless) protocol - JOYSTICK_IFORCE_232 y # I-Force Serial joysticks and wheels - JOYSTICK_IFORCE_USB y # I-Force USB joysticks and wheels - JOYSTICK_XPAD_FF y # X-Box gamepad rumble support - JOYSTICK_XPAD_LEDS y # LED Support for Xbox360 controller 'BigX' LED - KALLSYMS_EXTRA_PASS n - LDM_PARTITION y # Windows Logical Disk Manager (Dynamic Disk) support - LEDS_TRIGGER_IDE_DISK y # LED IDE Disk Trigger - LOGIRUMBLEPAD2_FF y # Logitech Rumblepad 2 force feedback - LOGO n # not needed - MEDIA_ATTACH y - MEGARAID_NEWGEN y - MICROCODE_AMD y - MODVERSIONS y - MOUSE_PS2_ELANTECH y # Elantech PS/2 protocol extension - MTRR_SANITIZER y - NET_FC y # Fibre Channel driver support - PCI_LEGACY y - PPP_MULTILINK y # PPP multilink support - REGULATOR y # Voltage and Current Regulator Support - SCSI_LOGGING y # SCSI logging facility - SERIAL_8250 y # 8250/16550 and compatible serial support - SLIP_COMPRESSED y # CSLIP compressed headers - SLIP_SMART y - THERMAL_HWMON y # Hardware monitoring support - USB_DEBUG n - USB_EHCI_ROOT_HUB_TT y # Root Hub Transaction Translators - X86_CHECK_BIOS_CORRUPTION y - X86_MCE y - - ${extraConfig} - ''; -in - -import ./generic.nix ( - - rec { - version = "2.6.31.14"; - - src = fetchurl { - url = "mirror://kernel/linux/kernel/v2.6/linux-${version}.tar.bz2"; - sha256 = "1c6ivcjgns4gbx04mhnhndqikm3prqhhfm2a5zrb1mfyvvishqpp"; - }; - - config = configWithPlatform stdenv.platform; - configCross = configWithPlatform stdenv.cross.platform; - - features.iwlwifi = true; - } - - // removeAttrs args ["extraConfig"] -) diff --git a/pkgs/os-specific/linux/kernel/linux-2.6.33.nix b/pkgs/os-specific/linux/kernel/linux-2.6.33.nix deleted file mode 100644 index e473faa16a8..00000000000 --- a/pkgs/os-specific/linux/kernel/linux-2.6.33.nix +++ /dev/null @@ -1,214 +0,0 @@ -args @ { stdenv, fetchurl, userModeLinux ? false, extraConfig ? "" -, ... }: - -let - configWithPlatform = kernelPlatform : - '' - # Don't include any debug features. - DEBUG_KERNEL n - - # Support drivers that need external firmware. - STANDALONE n - - # Make /proc/config.gz available. - IKCONFIG_PROC y - - # Optimize with -O2, not -Os. - CC_OPTIMIZE_FOR_SIZE n - - # Enable the kernel's built-in memory tester. - MEMTEST y - - # Include the CFQ I/O scheduler in the kernel, rather than as a - # module, so that the initrd gets a good I/O scheduler. - IOSCHED_CFQ y - - # Disable some expensive (?) features. - FTRACE n - KPROBES n - NUMA? n - PM_TRACE_RTC n - - # Enable various subsystems. - ACCESSIBILITY y # Accessibility support - AUXDISPLAY y # Auxiliary Display support - DONGLE y # Serial dongle support - HIPPI y - MTD_COMPLEX_MAPPINGS y # needed for many devices - NET_POCKET y # enable pocket and portable adapters - SCSI_LOWLEVEL y # enable lots of SCSI devices - SCSI_LOWLEVEL_PCMCIA y - SPI y # needed for many devices - SPI_MASTER y - WAN y - - # Networking options. - IP_PNP n - IPV6_PRIVACY y - NETFILTER_ADVANCED y - IP_VS_PROTO_TCP y - IP_VS_PROTO_UDP y - IP_VS_PROTO_ESP y - IP_VS_PROTO_AH y - IP_DCCP_CCID3 n # experimental - CLS_U32_PERF y - CLS_U32_MARK y - - # Wireless networking. - IPW2100_MONITOR y # support promiscuous mode - IPW2200_MONITOR y # support promiscuous mode - IWLWIFI_SPECTRUM_MEASUREMENT y - IWL3945_SPECTRUM_MEASUREMENT y - IWL4965 y # Intel Wireless WiFi 4965AGN - IWL5000 y # Intel Wireless WiFi 5000AGN - HOSTAP_FIRMWARE y # Support downloading firmware images with Host AP driver - HOSTAP_FIRMWARE_NVRAM y - - # Some settings to make sure that fbcondecor works - in particular, - # disable tileblitting and the drivers that need it. - - # Enable various FB devices. - FB y - FB_EFI y - FB_NVIDIA_I2C y # Enable DDC Support - FB_RIVA_I2C y - FB_ATY_CT y # Mach64 CT/VT/GT/LT (incl. 3D RAGE) support - FB_ATY_GX y # Mach64 GX support - FB_SAVAGE_I2C y - FB_SAVAGE_ACCEL y - FB_SIS_300 y - FB_SIS_315 y - FB_3DFX_ACCEL y - FB_GEODE y - - # Video configuration - # The intel drivers already require KMS - DRM_I915_KMS y - - # Sound. - SND_AC97_POWER_SAVE y # AC97 Power-Saving Mode - SND_HDA_INPUT_BEEP y # Support digital beep via input layer - SND_USB_CAIAQ_INPUT y - PSS_MIXER y # Enable PSS mixer (Beethoven ADSP-16 and other compatible) - - # USB serial devices. - USB_SERIAL_GENERIC y # USB Generic Serial Driver - USB_SERIAL_KEYSPAN_MPR y # include firmware for various USB serial devices - USB_SERIAL_KEYSPAN_USA28 y - USB_SERIAL_KEYSPAN_USA28X y - USB_SERIAL_KEYSPAN_USA28XA y - USB_SERIAL_KEYSPAN_USA28XB y - USB_SERIAL_KEYSPAN_USA19 y - USB_SERIAL_KEYSPAN_USA18X y - USB_SERIAL_KEYSPAN_USA19W y - USB_SERIAL_KEYSPAN_USA19QW y - USB_SERIAL_KEYSPAN_USA19QI y - USB_SERIAL_KEYSPAN_USA49W y - USB_SERIAL_KEYSPAN_USA49WLC y - - # Filesystem options - in particular, enable extended attributes and - # ACLs for all filesystems that support them. - EXT2_FS_XATTR y # Ext2 extended attributes - EXT2_FS_POSIX_ACL y # Ext2 POSIX Access Control Lists - EXT2_FS_SECURITY y # Ext2 Security Labels - EXT2_FS_XIP y # Ext2 execute in place support - EXT4_FS_POSIX_ACL y - EXT4_FS_SECURITY y - REISERFS_FS_XATTR y - REISERFS_FS_POSIX_ACL y - REISERFS_FS_SECURITY y - JFS_POSIX_ACL y - JFS_SECURITY y - XFS_QUOTA y - XFS_POSIX_ACL y - XFS_RT y # XFS Realtime subvolume support - OCFS2_DEBUG_MASKLOG n - BTRFS_FS_POSIX_ACL y - UBIFS_FS_XATTR y - UBIFS_FS_ADVANCED_COMPR y - NFSD_V2_ACL y - NFSD_V3 y - NFSD_V3_ACL y - NFSD_V4 y - CIFS_XATTR y - CIFS_POSIX y - - # Security related features. - STRICT_DEVMEM y # Filter access to /dev/mem - SECURITY_SELINUX_BOOTPARAM_VALUE 0 # disable SELinux by default - - # Misc. options. - 8139TOO_8129 y - 8139TOO_PIO n # PIO is slower - AIC79XX_DEBUG_ENABLE n - AIC7XXX_DEBUG_ENABLE n - AIC94XX_DEBUG n - B43_PCMCIA y - BLK_DEV_BSG n - BLK_DEV_CMD640_ENHANCED y # CMD640 enhanced support - BLK_DEV_IDEACPI y # IDE ACPI support - BLK_DEV_INTEGRITY y - BSD_PROCESS_ACCT_V3 y - BT_HCIUART_BCSP y - BT_HCIUART_H4 y # UART (H4) protocol support - BT_HCIUART_LL y - BT_RFCOMM_TTY y # RFCOMM TTY support - CPU_FREQ_DEBUG n - CRASH_DUMP n - DMAR? n # experimental - DVB_DYNAMIC_MINORS y # we use udev - FUSION y # Fusion MPT device support - IDE_GD_ATAPI y # ATAPI floppy support - IRDA_ULTRA y # Ultra (connectionless) protocol - JOYSTICK_IFORCE_232 y # I-Force Serial joysticks and wheels - JOYSTICK_IFORCE_USB y # I-Force USB joysticks and wheels - JOYSTICK_XPAD_FF y # X-Box gamepad rumble support - JOYSTICK_XPAD_LEDS y # LED Support for Xbox360 controller 'BigX' LED - KALLSYMS_EXTRA_PASS n - LDM_PARTITION y # Windows Logical Disk Manager (Dynamic Disk) support - LEDS_TRIGGER_IDE_DISK y # LED IDE Disk Trigger - LOGIRUMBLEPAD2_FF y # Logitech Rumblepad 2 force feedback - LOGO n # not needed - MEDIA_ATTACH y - MEGARAID_NEWGEN y - MICROCODE_AMD y - MODVERSIONS y - MOUSE_PS2_ELANTECH y # Elantech PS/2 protocol extension - MTRR_SANITIZER y - NET_FC y # Fibre Channel driver support - PCI_LEGACY y - PPP_MULTILINK y # PPP multilink support - REGULATOR y # Voltage and Current Regulator Support - SCSI_LOGGING y # SCSI logging facility - SERIAL_8250 y # 8250/16550 and compatible serial support - SLIP_COMPRESSED y # CSLIP compressed headers - SLIP_SMART y - THERMAL_HWMON y # Hardware monitoring support - USB_DEBUG n - USB_EHCI_ROOT_HUB_TT y # Root Hub Transaction Translators - X86_CHECK_BIOS_CORRUPTION y - X86_MCE y - - ${if kernelPlatform ? kernelExtraConfig then kernelPlatform.kernelExtraConfig else ""} - ${extraConfig} - ''; -in - -import ./generic.nix ( - - rec { - version = "2.6.33.17"; - - src = fetchurl { - url = "mirror://kernel/linux/kernel/v2.6/longterm/v2.6.33/linux-${version}.tar.bz2"; - sha256 = "06z6r2jip781bxvrfc12gkckzig9s65pnhb3cg2c7c637phc6ky0"; - }; - - config = configWithPlatform stdenv.platform; - configCross = configWithPlatform stdenv.cross.platform; - - features.iwlwifi = true; - } - - // removeAttrs args ["extraConfig"] -) diff --git a/pkgs/os-specific/linux/kernel/linux-2.6.34.nix b/pkgs/os-specific/linux/kernel/linux-2.6.34.nix deleted file mode 100644 index d36a7686483..00000000000 --- a/pkgs/os-specific/linux/kernel/linux-2.6.34.nix +++ /dev/null @@ -1,211 +0,0 @@ -args @ { stdenv, fetchurl, userModeLinux ? false, extraConfig ? "" -, ... }: - -let - configWithPlatform = kernelPlatform : - '' - # Don't include any debug features. - DEBUG_KERNEL n - - # Support drivers that need external firmware. - STANDALONE n - - # Make /proc/config.gz available. - IKCONFIG_PROC y - - # Optimize with -O2, not -Os. - CC_OPTIMIZE_FOR_SIZE n - - # Enable the kernel's built-in memory tester. - MEMTEST y - - # Include the CFQ I/O scheduler in the kernel, rather than as a - # module, so that the initrd gets a good I/O scheduler. - IOSCHED_CFQ y - - # Disable some expensive (?) features. - FTRACE n - KPROBES n - NUMA? n - PM_TRACE_RTC n - - # Enable various subsystems. - ACCESSIBILITY y # Accessibility support - AUXDISPLAY y # Auxiliary Display support - DONGLE y # Serial dongle support - HIPPI y - MTD_COMPLEX_MAPPINGS y # needed for many devices - NET_POCKET y # enable pocket and portable adapters - SCSI_LOWLEVEL y # enable lots of SCSI devices - SCSI_LOWLEVEL_PCMCIA y - SPI y # needed for many devices - SPI_MASTER y - WAN y - - # Networking options. - IP_PNP n - IPV6_PRIVACY y - NETFILTER_ADVANCED y - IP_VS_PROTO_TCP y - IP_VS_PROTO_UDP y - IP_VS_PROTO_ESP y - IP_VS_PROTO_AH y - IP_DCCP_CCID3 n # experimental - CLS_U32_PERF y - CLS_U32_MARK y - - # Wireless networking. - IPW2100_MONITOR y # support promiscuous mode - IPW2200_MONITOR y # support promiscuous mode - IWL4965 y # Intel Wireless WiFi 4965AGN - IWL5000 y # Intel Wireless WiFi 5000AGN - HOSTAP_FIRMWARE y # Support downloading firmware images with Host AP driver - HOSTAP_FIRMWARE_NVRAM y - - # Some settings to make sure that fbcondecor works - in particular, - # disable tileblitting and the drivers that need it. - - # Enable various FB devices. - FB y - FB_EFI y - FB_NVIDIA_I2C y # Enable DDC Support - FB_RIVA_I2C y - FB_ATY_CT y # Mach64 CT/VT/GT/LT (incl. 3D RAGE) support - FB_ATY_GX y # Mach64 GX support - FB_SAVAGE_I2C y - FB_SAVAGE_ACCEL y - FB_SIS_300 y - FB_SIS_315 y - FB_3DFX_ACCEL y - FB_GEODE y - - # Video configuration - # The intel drivers already require KMS - DRM_I915_KMS y - - # Sound. - SND_AC97_POWER_SAVE y # AC97 Power-Saving Mode - SND_HDA_INPUT_BEEP y # Support digital beep via input layer - SND_USB_CAIAQ_INPUT y - PSS_MIXER y # Enable PSS mixer (Beethoven ADSP-16 and other compatible) - - # USB serial devices. - USB_SERIAL_GENERIC y # USB Generic Serial Driver - USB_SERIAL_KEYSPAN_MPR y # include firmware for various USB serial devices - USB_SERIAL_KEYSPAN_USA28 y - USB_SERIAL_KEYSPAN_USA28X y - USB_SERIAL_KEYSPAN_USA28XA y - USB_SERIAL_KEYSPAN_USA28XB y - USB_SERIAL_KEYSPAN_USA19 y - USB_SERIAL_KEYSPAN_USA18X y - USB_SERIAL_KEYSPAN_USA19W y - USB_SERIAL_KEYSPAN_USA19QW y - USB_SERIAL_KEYSPAN_USA19QI y - USB_SERIAL_KEYSPAN_USA49W y - USB_SERIAL_KEYSPAN_USA49WLC y - - # Filesystem options - in particular, enable extended attributes and - # ACLs for all filesystems that support them. - EXT2_FS_XATTR y # Ext2 extended attributes - EXT2_FS_POSIX_ACL y # Ext2 POSIX Access Control Lists - EXT2_FS_SECURITY y # Ext2 Security Labels - EXT2_FS_XIP y # Ext2 execute in place support - EXT4_FS_POSIX_ACL y - EXT4_FS_SECURITY y - REISERFS_FS_XATTR y - REISERFS_FS_POSIX_ACL y - REISERFS_FS_SECURITY y - JFS_POSIX_ACL y - JFS_SECURITY y - XFS_QUOTA y - XFS_POSIX_ACL y - XFS_RT y # XFS Realtime subvolume support - OCFS2_DEBUG_MASKLOG n - BTRFS_FS_POSIX_ACL y - UBIFS_FS_XATTR y - UBIFS_FS_ADVANCED_COMPR y - NFSD_V2_ACL y - NFSD_V3 y - NFSD_V3_ACL y - NFSD_V4 y - CIFS_XATTR y - CIFS_POSIX y - - # Security related features. - STRICT_DEVMEM y # Filter access to /dev/mem - SECURITY_SELINUX_BOOTPARAM_VALUE 0 # disable SELinux by default - - # Misc. options. - 8139TOO_8129 y - 8139TOO_PIO n # PIO is slower - AIC79XX_DEBUG_ENABLE n - AIC7XXX_DEBUG_ENABLE n - AIC94XX_DEBUG n - B43_PCMCIA y - BLK_DEV_BSG n - BLK_DEV_CMD640_ENHANCED y # CMD640 enhanced support - BLK_DEV_IDEACPI y # IDE ACPI support - BLK_DEV_INTEGRITY y - BSD_PROCESS_ACCT_V3 y - BT_HCIUART_BCSP y - BT_HCIUART_H4 y # UART (H4) protocol support - BT_HCIUART_LL y - BT_RFCOMM_TTY y # RFCOMM TTY support - CPU_FREQ_DEBUG n - CRASH_DUMP n - DMAR? n # experimental - DVB_DYNAMIC_MINORS y # we use udev - FUSION y # Fusion MPT device support - IDE_GD_ATAPI y # ATAPI floppy support - IRDA_ULTRA y # Ultra (connectionless) protocol - JOYSTICK_IFORCE_232 y # I-Force Serial joysticks and wheels - JOYSTICK_IFORCE_USB y # I-Force USB joysticks and wheels - JOYSTICK_XPAD_FF y # X-Box gamepad rumble support - JOYSTICK_XPAD_LEDS y # LED Support for Xbox360 controller 'BigX' LED - KALLSYMS_EXTRA_PASS n - LDM_PARTITION y # Windows Logical Disk Manager (Dynamic Disk) support - LEDS_TRIGGER_IDE_DISK y # LED IDE Disk Trigger - LOGIRUMBLEPAD2_FF y # Logitech Rumblepad 2 force feedback - LOGO n # not needed - MEDIA_ATTACH y - MEGARAID_NEWGEN y - MICROCODE_AMD y - MODVERSIONS y - MOUSE_PS2_ELANTECH y # Elantech PS/2 protocol extension - MTRR_SANITIZER y - NET_FC y # Fibre Channel driver support - PPP_MULTILINK y # PPP multilink support - REGULATOR y # Voltage and Current Regulator Support - SCSI_LOGGING y # SCSI logging facility - SERIAL_8250 y # 8250/16550 and compatible serial support - SLIP_COMPRESSED y # CSLIP compressed headers - SLIP_SMART y - THERMAL_HWMON y # Hardware monitoring support - USB_DEBUG n - USB_EHCI_ROOT_HUB_TT y # Root Hub Transaction Translators - X86_CHECK_BIOS_CORRUPTION y - X86_MCE y - - ${if kernelPlatform ? kernelExtraConfig then kernelPlatform.kernelExtraConfig else ""} - ${extraConfig} - ''; -in - -import ./generic.nix ( - - rec { - version = "2.6.34.10"; - - src = fetchurl { - url = "mirror://kernel/linux/kernel/v2.6/longterm/v2.6.34/linux-${version}.tar.bz2"; - sha256 = "1sm3n5wxz1amql0ini5mspiaa4kvw9macsp5qyq1dhhfv06i2j31"; - }; - - config = configWithPlatform stdenv.platform; - configCross = configWithPlatform stdenv.cross.platform; - - features.iwlwifi = true; - } - - // removeAttrs args ["extraConfig"] -) diff --git a/pkgs/os-specific/linux/kernel/linux-2.6.36.nix b/pkgs/os-specific/linux/kernel/linux-2.6.36.nix deleted file mode 100644 index 4fa11413cab..00000000000 --- a/pkgs/os-specific/linux/kernel/linux-2.6.36.nix +++ /dev/null @@ -1,209 +0,0 @@ -args @ { stdenv, fetchurl, userModeLinux ? false, extraConfig ? "" -, ... }: - -let - configWithPlatform = kernelPlatform : - '' - # Don't include any debug features. - DEBUG_KERNEL n - - # Support drivers that need external firmware. - STANDALONE n - - # Make /proc/config.gz available. - IKCONFIG_PROC y - - # Optimize with -O2, not -Os. - CC_OPTIMIZE_FOR_SIZE n - - # Enable the kernel's built-in memory tester. - MEMTEST y - - # Disable some expensive (?) features. - FTRACE n - KPROBES n - NUMA? n - PM_TRACE_RTC n - - # Enable various subsystems. - ACCESSIBILITY y # Accessibility support - AUXDISPLAY y # Auxiliary Display support - DONGLE y # Serial dongle support - HIPPI y - MTD_COMPLEX_MAPPINGS y # needed for many devices - NET_POCKET y # enable pocket and portable adapters - SCSI_LOWLEVEL y # enable lots of SCSI devices - SCSI_LOWLEVEL_PCMCIA y - SPI y # needed for many devices - SPI_MASTER y - WAN y - - # Networking options. - IP_PNP n - IPV6_PRIVACY y - NETFILTER_ADVANCED y - IP_VS_PROTO_TCP y - IP_VS_PROTO_UDP y - IP_VS_PROTO_ESP y - IP_VS_PROTO_AH y - IP_DCCP_CCID3 n # experimental - CLS_U32_PERF y - CLS_U32_MARK y - - # Wireless networking. - IPW2100_MONITOR y # support promiscuous mode - IPW2200_MONITOR y # support promiscuous mode - IWL4965 y # Intel Wireless WiFi 4965AGN - IWL5000 y # Intel Wireless WiFi 5000AGN - HOSTAP_FIRMWARE y # Support downloading firmware images with Host AP driver - HOSTAP_FIRMWARE_NVRAM y - - # Some settings to make sure that fbcondecor works - in particular, - # disable tileblitting and the drivers that need it. - - # Enable various FB devices. - FB y - FB_EFI y - FB_NVIDIA_I2C y # Enable DDC Support - FB_RIVA_I2C y - FB_ATY_CT y # Mach64 CT/VT/GT/LT (incl. 3D RAGE) support - FB_ATY_GX y # Mach64 GX support - FB_SAVAGE_I2C y - FB_SAVAGE_ACCEL y - FB_SIS_300 y - FB_SIS_315 y - FB_3DFX_ACCEL y - FB_GEODE y - - # Video configuration - # The intel drivers already require KMS - DRM_I915_KMS y - # Hybrid graphics support - VGA_SWITCHEROO y - - # Sound. - SND_AC97_POWER_SAVE y # AC97 Power-Saving Mode - SND_HDA_INPUT_BEEP y # Support digital beep via input layer - SND_USB_CAIAQ_INPUT y - PSS_MIXER y # Enable PSS mixer (Beethoven ADSP-16 and other compatible) - - # USB serial devices. - USB_SERIAL_GENERIC y # USB Generic Serial Driver - USB_SERIAL_KEYSPAN_MPR y # include firmware for various USB serial devices - USB_SERIAL_KEYSPAN_USA28 y - USB_SERIAL_KEYSPAN_USA28X y - USB_SERIAL_KEYSPAN_USA28XA y - USB_SERIAL_KEYSPAN_USA28XB y - USB_SERIAL_KEYSPAN_USA19 y - USB_SERIAL_KEYSPAN_USA18X y - USB_SERIAL_KEYSPAN_USA19W y - USB_SERIAL_KEYSPAN_USA19QW y - USB_SERIAL_KEYSPAN_USA19QI y - USB_SERIAL_KEYSPAN_USA49W y - USB_SERIAL_KEYSPAN_USA49WLC y - - # Filesystem options - in particular, enable extended attributes and - # ACLs for all filesystems that support them. - EXT2_FS_XATTR y # Ext2 extended attributes - EXT2_FS_POSIX_ACL y # Ext2 POSIX Access Control Lists - EXT2_FS_SECURITY y # Ext2 Security Labels - EXT2_FS_XIP y # Ext2 execute in place support - EXT4_FS_POSIX_ACL y - EXT4_FS_SECURITY y - REISERFS_FS_XATTR y - REISERFS_FS_POSIX_ACL y - REISERFS_FS_SECURITY y - JFS_POSIX_ACL y - JFS_SECURITY y - XFS_QUOTA y - XFS_POSIX_ACL y - XFS_RT y # XFS Realtime subvolume support - OCFS2_DEBUG_MASKLOG n - BTRFS_FS_POSIX_ACL y - UBIFS_FS_XATTR y - UBIFS_FS_ADVANCED_COMPR y - NFSD_V2_ACL y - NFSD_V3 y - NFSD_V3_ACL y - NFSD_V4 y - CIFS_XATTR y - CIFS_POSIX y - - # Security related features. - STRICT_DEVMEM y # Filter access to /dev/mem - SECURITY_SELINUX_BOOTPARAM_VALUE 0 # disable SELinux by default - - # Misc. options. - 8139TOO_8129 y - 8139TOO_PIO n # PIO is slower - AIC79XX_DEBUG_ENABLE n - AIC7XXX_DEBUG_ENABLE n - AIC94XX_DEBUG n - B43_PCMCIA y - BLK_DEV_BSG n - BLK_DEV_CMD640_ENHANCED y # CMD640 enhanced support - BLK_DEV_IDEACPI y # IDE ACPI support - BLK_DEV_INTEGRITY y - BSD_PROCESS_ACCT_V3 y - BT_HCIUART_BCSP y - BT_HCIUART_H4 y # UART (H4) protocol support - BT_HCIUART_LL y - BT_RFCOMM_TTY y # RFCOMM TTY support - CPU_FREQ_DEBUG n - CRASH_DUMP n - DMAR? n # experimental - DVB_DYNAMIC_MINORS y # we use udev - FUSION y # Fusion MPT device support - IDE_GD_ATAPI y # ATAPI floppy support - IRDA_ULTRA y # Ultra (connectionless) protocol - JOYSTICK_IFORCE_232 y # I-Force Serial joysticks and wheels - JOYSTICK_IFORCE_USB y # I-Force USB joysticks and wheels - JOYSTICK_XPAD_FF y # X-Box gamepad rumble support - JOYSTICK_XPAD_LEDS y # LED Support for Xbox360 controller 'BigX' LED - KALLSYMS_EXTRA_PASS n - LDM_PARTITION y # Windows Logical Disk Manager (Dynamic Disk) support - LEDS_TRIGGER_IDE_DISK y # LED IDE Disk Trigger - LOGIRUMBLEPAD2_FF y # Logitech Rumblepad 2 force feedback - LOGO n # not needed - MEDIA_ATTACH y - MEGARAID_NEWGEN y - MICROCODE_AMD y - MODVERSIONS y - MOUSE_PS2_ELANTECH y # Elantech PS/2 protocol extension - MTRR_SANITIZER y - NET_FC y # Fibre Channel driver support - PPP_MULTILINK y # PPP multilink support - REGULATOR y # Voltage and Current Regulator Support - SCSI_LOGGING y # SCSI logging facility - SERIAL_8250 y # 8250/16550 and compatible serial support - SLIP_COMPRESSED y # CSLIP compressed headers - SLIP_SMART y - THERMAL_HWMON y # Hardware monitoring support - USB_DEBUG n - USB_EHCI_ROOT_HUB_TT y # Root Hub Transaction Translators - X86_CHECK_BIOS_CORRUPTION y - X86_MCE y - - ${if kernelPlatform ? kernelExtraConfig then kernelPlatform.kernelExtraConfig else ""} - ${extraConfig} - ''; -in - -import ./generic.nix ( - - rec { - version = "2.6.36.4"; - - src = fetchurl { - url = "mirror://kernel/linux/kernel/v2.6/linux-${version}.tar.bz2"; - sha256 = "16pqjz3dgvaghfi0jqp2d0nqyz5fgbbxzs914vxslh2xxdxql0cg"; - }; - - config = configWithPlatform stdenv.platform; - configCross = configWithPlatform stdenv.cross.platform; - - features.iwlwifi = true; - } - - // removeAttrs args ["extraConfig"] -) diff --git a/pkgs/os-specific/linux/kernel/linux-2.6.37.nix b/pkgs/os-specific/linux/kernel/linux-2.6.37.nix deleted file mode 100644 index 3da1e27eb24..00000000000 --- a/pkgs/os-specific/linux/kernel/linux-2.6.37.nix +++ /dev/null @@ -1,208 +0,0 @@ -args @ { stdenv, fetchurl, userModeLinux ? false, extraConfig ? "" -, ... }: - -let - configWithPlatform = kernelPlatform : - '' - # Don't include any debug features. - DEBUG_KERNEL n - - # Support drivers that need external firmware. - STANDALONE n - - # Make /proc/config.gz available. - IKCONFIG_PROC y - - # Optimize with -O2, not -Os. - CC_OPTIMIZE_FOR_SIZE n - - # Enable the kernel's built-in memory tester. - MEMTEST y - - # Disable some expensive (?) features. - FTRACE n - KPROBES n - NUMA? n - PM_TRACE_RTC n - - # Enable various subsystems. - ACCESSIBILITY y # Accessibility support - AUXDISPLAY y # Auxiliary Display support - DONGLE y # Serial dongle support - HIPPI y - MTD_COMPLEX_MAPPINGS y # needed for many devices - NET_POCKET y # enable pocket and portable adapters - SCSI_LOWLEVEL y # enable lots of SCSI devices - SCSI_LOWLEVEL_PCMCIA y - SPI y # needed for many devices - SPI_MASTER y - WAN y - - # Networking options. - IP_PNP n - IPV6_PRIVACY y - NETFILTER_ADVANCED y - IP_VS_PROTO_TCP y - IP_VS_PROTO_UDP y - IP_VS_PROTO_ESP y - IP_VS_PROTO_AH y - IP_DCCP_CCID3 n # experimental - CLS_U32_PERF y - CLS_U32_MARK y - - # Wireless networking. - IPW2100_MONITOR y # support promiscuous mode - IPW2200_MONITOR y # support promiscuous mode - IWL4965 y # Intel Wireless WiFi 4965AGN - IWL5000 y # Intel Wireless WiFi 5000AGN - HOSTAP_FIRMWARE y # Support downloading firmware images with Host AP driver - HOSTAP_FIRMWARE_NVRAM y - - # Some settings to make sure that fbcondecor works - in particular, - # disable tileblitting and the drivers that need it. - - # Enable various FB devices. - FB y - FB_EFI y - FB_NVIDIA_I2C y # Enable DDC Support - FB_RIVA_I2C y - FB_ATY_CT y # Mach64 CT/VT/GT/LT (incl. 3D RAGE) support - FB_ATY_GX y # Mach64 GX support - FB_SAVAGE_I2C y - FB_SAVAGE_ACCEL y - FB_SIS_300 y - FB_SIS_315 y - FB_3DFX_ACCEL y - FB_GEODE y - - # Video configuration - # The intel drivers already require KMS - DRM_I915_KMS y - # Hybrid graphics support - VGA_SWITCHEROO y - - # Sound. - SND_AC97_POWER_SAVE y # AC97 Power-Saving Mode - SND_HDA_INPUT_BEEP y # Support digital beep via input layer - SND_USB_CAIAQ_INPUT y - PSS_MIXER y # Enable PSS mixer (Beethoven ADSP-16 and other compatible) - - # USB serial devices. - USB_SERIAL_GENERIC y # USB Generic Serial Driver - USB_SERIAL_KEYSPAN_MPR y # include firmware for various USB serial devices - USB_SERIAL_KEYSPAN_USA28 y - USB_SERIAL_KEYSPAN_USA28X y - USB_SERIAL_KEYSPAN_USA28XA y - USB_SERIAL_KEYSPAN_USA28XB y - USB_SERIAL_KEYSPAN_USA19 y - USB_SERIAL_KEYSPAN_USA18X y - USB_SERIAL_KEYSPAN_USA19W y - USB_SERIAL_KEYSPAN_USA19QW y - USB_SERIAL_KEYSPAN_USA19QI y - USB_SERIAL_KEYSPAN_USA49W y - USB_SERIAL_KEYSPAN_USA49WLC y - - # Filesystem options - in particular, enable extended attributes and - # ACLs for all filesystems that support them. - EXT2_FS_XATTR y # Ext2 extended attributes - EXT2_FS_POSIX_ACL y # Ext2 POSIX Access Control Lists - EXT2_FS_SECURITY y # Ext2 Security Labels - EXT2_FS_XIP y # Ext2 execute in place support - EXT4_FS_POSIX_ACL y - EXT4_FS_SECURITY y - REISERFS_FS_XATTR y - REISERFS_FS_POSIX_ACL y - REISERFS_FS_SECURITY y - JFS_POSIX_ACL y - JFS_SECURITY y - XFS_QUOTA y - XFS_POSIX_ACL y - XFS_RT y # XFS Realtime subvolume support - OCFS2_DEBUG_MASKLOG n - BTRFS_FS_POSIX_ACL y - UBIFS_FS_XATTR y - UBIFS_FS_ADVANCED_COMPR y - NFSD_V2_ACL y - NFSD_V3 y - NFSD_V3_ACL y - NFSD_V4 y - CIFS_XATTR y - CIFS_POSIX y - - # Security related features. - STRICT_DEVMEM y # Filter access to /dev/mem - SECURITY_SELINUX_BOOTPARAM_VALUE 0 # disable SELinux by default - - # Misc. options. - 8139TOO_8129 y - 8139TOO_PIO n # PIO is slower - AIC79XX_DEBUG_ENABLE n - AIC7XXX_DEBUG_ENABLE n - AIC94XX_DEBUG n - B43_PCMCIA y - BLK_DEV_CMD640_ENHANCED y # CMD640 enhanced support - BLK_DEV_IDEACPI y # IDE ACPI support - BLK_DEV_INTEGRITY y - BSD_PROCESS_ACCT_V3 y - BT_HCIUART_BCSP y - BT_HCIUART_H4 y # UART (H4) protocol support - BT_HCIUART_LL y - BT_RFCOMM_TTY y # RFCOMM TTY support - CPU_FREQ_DEBUG n - CRASH_DUMP n - DMAR? n # experimental - DVB_DYNAMIC_MINORS y # we use udev - FUSION y # Fusion MPT device support - IDE_GD_ATAPI y # ATAPI floppy support - IRDA_ULTRA y # Ultra (connectionless) protocol - JOYSTICK_IFORCE_232 y # I-Force Serial joysticks and wheels - JOYSTICK_IFORCE_USB y # I-Force USB joysticks and wheels - JOYSTICK_XPAD_FF y # X-Box gamepad rumble support - JOYSTICK_XPAD_LEDS y # LED Support for Xbox360 controller 'BigX' LED - KALLSYMS_EXTRA_PASS n - LDM_PARTITION y # Windows Logical Disk Manager (Dynamic Disk) support - LEDS_TRIGGER_IDE_DISK y # LED IDE Disk Trigger - LOGIRUMBLEPAD2_FF y # Logitech Rumblepad 2 force feedback - LOGO n # not needed - MEDIA_ATTACH y - MEGARAID_NEWGEN y - MICROCODE_AMD y - MODVERSIONS y - MOUSE_PS2_ELANTECH y # Elantech PS/2 protocol extension - MTRR_SANITIZER y - NET_FC y # Fibre Channel driver support - PPP_MULTILINK y # PPP multilink support - REGULATOR y # Voltage and Current Regulator Support - SCSI_LOGGING y # SCSI logging facility - SERIAL_8250 y # 8250/16550 and compatible serial support - SLIP_COMPRESSED y # CSLIP compressed headers - SLIP_SMART y - THERMAL_HWMON y # Hardware monitoring support - USB_DEBUG n - USB_EHCI_ROOT_HUB_TT y # Root Hub Transaction Translators - X86_CHECK_BIOS_CORRUPTION y - X86_MCE y - - ${if kernelPlatform ? kernelExtraConfig then kernelPlatform.kernelExtraConfig else ""} - ${extraConfig} - ''; -in - -import ./generic.nix ( - - rec { - version = "2.6.37.6"; - - src = fetchurl { - url = "mirror://kernel/linux/kernel/v2.6/linux-${version}.tar.bz2"; - sha256 = "07khv9z27l5ny37c7malgkg4q65r1g83i4m9rb74p17y15rsv8ad"; - }; - - config = configWithPlatform stdenv.platform; - configCross = configWithPlatform stdenv.cross.platform; - - features.iwlwifi = true; - } - - // removeAttrs args ["extraConfig"] -) diff --git a/pkgs/os-specific/linux/zen-kernel/2.6.32-zen4.nix b/pkgs/os-specific/linux/zen-kernel/2.6.32-zen4.nix deleted file mode 100644 index 9d1f710c415..00000000000 --- a/pkgs/os-specific/linux/zen-kernel/2.6.32-zen4.nix +++ /dev/null @@ -1,75 +0,0 @@ -args @ {stdenv, fetchurl, runCommand, userModeLinux ? false, extraConfig ? "", - kernelPatches ? [], extraMeta ? {}, - features ? {}, preConfigure ? "", - ...}: - -let - conf = import ./config-blocks.nix; - -in - -import ../kernel/generic.nix ( - rec { - version = "2.6.32-zen4"; - - src = fetchurl { - url = "mirror://kernel/linux/kernel/v2.6/linux-2.6.32.tar.bz2"; - sha256 = "0kjhnkf2ldivagczs16q49zm2lr3khh01pqrlsc7sh5qh1npi6ah"; - }; - - kernelPatches = [ - { - name = "zen4"; - patch = runCommand "2.6.32-zen4.patch" {} "lzma -d < ${ fetchurl { - name = "2.6.32-zen4"; - url = "http://downloads.zen-kernel.org/2.6.32/2.6.32-zen4.patch.lzma"; - sha256 = "1dyp9sfigqjfqw1c94010c521bhcy1xnzp91kkhg3dwgzfpsp2k2"; - } } > $out"; - } - ] - ++ - stdenv.lib.attrByPath ["kernelPatches"] [] args; - - features = { - iwlwifi = true; - zen = true; - fbConDecor = true; - aufs = true; - } // (stdenv.lib.attrByPath ["features"] {} args); - - config = with conf; - '' - ${generalOptions} - ${noDebug} - ${virtualisation} - ${if stdenv.lib.attrByPath ["features" "oldI686"] false args then noPAE else ""} - ${usefulSubsystems} - ${cfq} - ${noNUMA} - ${networking} - ${wireless} - ${fb} - ${fbConDecor} - ${sound} - ${usbserial} - ${fsXattr} - ${security} - ${blockDevices} - ${bluetooth} - ${misc} - ${if stdenv.lib.attrByPath ["features" "ckSched"] false args then bfsched else forceCFSched} - ''; - - preConfigure = '' - mv README.zen README-zen - '' + stdenv.lib.attrByPath ["preConfigure"] "" args; - - extraMeta = { - maintainers = [stdenv.lib.maintainers.raskin]; - platforms = with stdenv.lib.platforms; - linux; - } // stdenv.lib.attrByPath ["extraMeta"] {} args; - } - // removeAttrs args ["extraConfig" "extraMeta" "features" "kernelPatches" - "xz" "runCommand" "preConfigure"] -) diff --git a/pkgs/os-specific/linux/zen-kernel/2.6.33-zen1.nix b/pkgs/os-specific/linux/zen-kernel/2.6.33-zen1.nix deleted file mode 100644 index ab7a0059bbe..00000000000 --- a/pkgs/os-specific/linux/zen-kernel/2.6.33-zen1.nix +++ /dev/null @@ -1,78 +0,0 @@ -args @ {stdenv, fetchurl, runCommand, userModeLinux ? false, extraConfig ? "", - kernelPatches ? [], extraMeta ? {}, - features ? {}, preConfigure ? "", - ...}: - -let - conf = import ./config-blocks.nix; - - baseKernelVersion = "2.6.33"; - ZenSuffix = "zen1"; - -in - -import ../kernel/generic.nix ( - rec { - version = "${baseKernelVersion}-${ZenSuffix}"; - - src = fetchurl { - url = "mirror://kernel/linux/kernel/v2.6/linux-${baseKernelVersion}.tar.bz2"; - sha256 = "1inmam21w13nyf5imgdb5palhiap41zcxf9k32i4ck1w7gg3gqk3"; - }; - - kernelPatches = [ - { - name = "${ZenSuffix}"; - patch = runCommand "${baseKernelVersion}-${ZenSuffix}.patch" {} "lzma -d < ${ fetchurl { - name = "${baseKernelVersion}-${ZenSuffix}.patch.lzma"; - url = "http://downloads.zen-kernel.org/${baseKernelVersion}/${baseKernelVersion}-${ZenSuffix}.patch.lzma"; - sha256 = "0a72d8allr4qi4p6hbbjh33kmcgbg84as0dfb50gsffvaj2d3kwf"; - } } > $out"; - } - ] - ++ - stdenv.lib.attrByPath ["kernelPatches"] [] args; - - features = { - iwlwifi = true; - zen = true; - fbConDecor = true; - aufs = true; - } // (stdenv.lib.attrByPath ["features"] {} args); - - config = with conf; - '' - ${generalOptions} - ${noDebug} - ${virtualisation} - ${if stdenv.lib.attrByPath ["features" "oldI686"] false args then noPAE else ""} - ${usefulSubsystems} - ${cfq} - ${noNUMA} - ${networking} - ${wireless} - ${fb} - ${fbConDecor} - ${sound} - ${usbserial} - ${fsXattr} - ${security} - ${blockDevices} - ${bluetooth} - ${misc} - ${if stdenv.lib.attrByPath ["features" "ckSched"] false args then bfsched else forceCFSched} - ''; - - preConfigure = '' - mv README.zen README-zen - '' + stdenv.lib.attrByPath ["preConfigure"] "" args; - - extraMeta = { - maintainers = [stdenv.lib.maintainers.raskin]; - platforms = with stdenv.lib.platforms; - linux; - } // stdenv.lib.attrByPath ["extraMeta"] {} args; - } - // removeAttrs args ["extraConfig" "extraMeta" "features" "kernelPatches" - "xz" "runCommand" "preConfigure"] -) diff --git a/pkgs/os-specific/linux/zen-kernel/config-blocks.nix b/pkgs/os-specific/linux/zen-kernel/config-blocks.nix deleted file mode 100644 index f330325c91b..00000000000 --- a/pkgs/os-specific/linux/zen-kernel/config-blocks.nix +++ /dev/null @@ -1,263 +0,0 @@ -rec { - generalOptions = '' - # Don't include any debug features. - DEBUG_KERNEL n - - # Support drivers that need external firmware. - STANDALONE n - - # Make /proc/config.gz available. - IKCONFIG_PROC y - - # Optimize with -O2, not -Os. - CC_OPTIMIZE_FOR_SIZE n - - # Enable the kernel's built-in memory tester. - MEMTEST y - - KALLSYMS_EXTRA_PASS n - ''; - - virtualisation = '' - # Virtualisation (KVM, Xen...). - PARAVIRT_GUEST y - KVM_CLOCK y - KVM_GUEST y - XEN? y - KSM y - - # We need 64 GB (PAE) support for Xen guest support. - HIGHMEM64G? y - ''; - - noPAE = '' - HIGHMEM64G? n - PAE? n - ''; - - usefulSubsystems = '' - # Enable various subsystems. - ACCESSIBILITY y # Accessibility support - AUXDISPLAY y # Auxiliary Display support - DONGLE y # Serial dongle support - HIPPI y - MTD_COMPLEX_MAPPINGS y # needed for many devices - NET_POCKET y # enable pocket and portable adapters - SCSI_LOWLEVEL y # enable lots of SCSI devices - SCSI_LOWLEVEL_PCMCIA y - SPI y # needed for many devices - SPI_MASTER y - WAN y - ''; - - cfq = '' - # Include the CFQ I/O scheduler in the kernel, rather than as a - # module, so that the initrd gets a good I/O scheduler. - IOSCHED_CFQ y - ''; - - noDebug = '' - # Disable some expensive (?) features. - FTRACE n - KPROBES n - PM_TRACE_RTC n - - AIC79XX_DEBUG_ENABLE n - AIC7XXX_DEBUG_ENABLE n - AIC94XX_DEBUG n - USB_DEBUG n - CPU_FREQ_DEBUG n - ''; - - noNUMA = '' - NUMA? n - ''; - - networking = '' - # Networking options. - IP_PNP n - IPV6_PRIVACY y - NETFILTER_ADVANCED y - IP_VS_PROTO_TCP y - IP_VS_PROTO_UDP y - IP_VS_PROTO_ESP y - IP_VS_PROTO_AH y - IP_DCCP_CCID3 n # experimental - CLS_U32_PERF y - CLS_U32_MARK y - ''; - - wireless = '' - # Wireless networking. - IPW2100_MONITOR y # support promiscuous mode - IPW2200_MONITOR y # support promiscuous mode - IWLWIFI_LEDS? y - IWLWIFI_SPECTRUM_MEASUREMENT y - IWL3945_SPECTRUM_MEASUREMENT y - IWL4965 y # Intel Wireless WiFi 4965AGN - IWL5000 y # Intel Wireless WiFi 5000AGN - HOSTAP_FIRMWARE y # Support downloading firmware images with Host AP driver - HOSTAP_FIRMWARE_NVRAM y - ''; - - fb = '' - # Enable various FB devices. - FB y - FB_EFI y - FB_NVIDIA_I2C y # Enable DDC Support - FB_RIVA_I2C y - FB_ATY_CT y # Mach64 CT/VT/GT/LT (incl. 3D RAGE) support - FB_ATY_GX y # Mach64 GX support - FB_SAVAGE_I2C y - FB_SAVAGE_ACCEL y - FB_SIS_300 y - FB_SIS_315 y - FB_3DFX_ACCEL y - FB_GEODE y - ''; - - fbNoTileBlit = '' - # Disable tileblitting - FB_TILEBLITTING n - FB_S3 n - FB_VT8623 n - FB_ARK n - ''; - - fbConDecor = '' - ${fb} - ${fbNoTileBlit} - FRAMEBUFFER_CONSOLE y - FB_VESA y - FB_CON_DECOR y - ''; - - sound = '' - # Sound. - SND_AC97_POWER_SAVE y # AC97 Power-Saving Mode - SND_HDA_INPUT_BEEP y # Support digital beep via input layer - SND_USB_CAIAQ_INPUT y - PSS_MIXER y # Enable PSS mixer (Beethoven ADSP-16 and other compatible) - ''; - - usbserial = '' - # USB serial devices. - USB_SERIAL_GENERIC y # USB Generic Serial Driver - USB_SERIAL_KEYSPAN_MPR y # include firmware for various USB serial devices - USB_SERIAL_KEYSPAN_USA28 y - USB_SERIAL_KEYSPAN_USA28X y - USB_SERIAL_KEYSPAN_USA28XA y - USB_SERIAL_KEYSPAN_USA28XB y - USB_SERIAL_KEYSPAN_USA19 y - USB_SERIAL_KEYSPAN_USA18X y - USB_SERIAL_KEYSPAN_USA19W y - USB_SERIAL_KEYSPAN_USA19QW y - USB_SERIAL_KEYSPAN_USA19QI y - USB_SERIAL_KEYSPAN_USA49W y - USB_SERIAL_KEYSPAN_USA49WLC y - ''; - - fsXattr = '' - # Filesystem options - in particular, enable extended attributes and - # ACLs for all filesystems that support them. - EXT2_FS_XATTR y # Ext2 extended attributes - EXT2_FS_POSIX_ACL y # Ext2 POSIX Access Control Lists - EXT2_FS_SECURITY y # Ext2 Security Labels - EXT2_FS_XIP y # Ext2 execute in place support - EXT4_FS_POSIX_ACL y - EXT4_FS_SECURITY y - REISERFS_FS_XATTR y - REISERFS_FS_POSIX_ACL y - REISERFS_FS_SECURITY y - JFS_POSIX_ACL y - JFS_SECURITY y - XFS_QUOTA y - XFS_POSIX_ACL y - XFS_RT y # XFS Realtime subvolume support - OCFS2_DEBUG_MASKLOG n - OCFS2_FS_POSIX_ACL? y - BTRFS_FS_POSIX_ACL y - UBIFS_FS_XATTR y - UBIFS_FS_ADVANCED_COMPR y - NFSD_V2_ACL y - NFSD_V3 y - NFSD_V3_ACL y - NFSD_V4 y - CIFS_XATTR y - CIFS_POSIX y - ''; - - security = '' - # Security related features. - STRICT_DEVMEM y # Filter access to /dev/mem - SECURITY_SELINUX_BOOTPARAM_VALUE 0 # disable SELinux by default - ''; - - blockDevices = '' - BLK_DEV_BSG n - BLK_DEV_CMD640_ENHANCED y # CMD640 enhanced support - BLK_DEV_IDEACPI y # IDE ACPI support - BLK_DEV_INTEGRITY y - ''; - - bluetooth = '' - BT_HCIUART_BCSP y - BT_HCIUART_H4 y # UART (H4) protocol support - BT_HCIUART_LL y - BT_RFCOMM_TTY y # RFCOMM TTY support - ''; - - misc = '' - # Misc. options. - 8139TOO_8129 y - 8139TOO_PIO n # PIO is slower - B43_PCMCIA y - BSD_PROCESS_ACCT_V3 y - CRASH_DUMP n - DMAR? n # experimental - DVB_DYNAMIC_MINORS y # we use udev - FUSION y # Fusion MPT device support - IDE_GD_ATAPI y # ATAPI floppy support - IRDA_ULTRA y # Ultra (connectionless) protocol - JOYSTICK_IFORCE_232 y # I-Force Serial joysticks and wheels - JOYSTICK_IFORCE_USB y # I-Force USB joysticks and wheels - JOYSTICK_XPAD_FF y # X-Box gamepad rumble support - JOYSTICK_XPAD_LEDS y # LED Support for Xbox360 controller 'BigX' LED - LDM_PARTITION y # Windows Logical Disk Manager (Dynamic Disk) support - LEDS_TRIGGER_IDE_DISK y # LED IDE Disk Trigger - LOGIRUMBLEPAD2_FF y # Logitech Rumblepad 2 force feedback - LOGO n # not needed - MEDIA_ATTACH y - MEGARAID_NEWGEN y - MICROCODE_AMD y - MODVERSIONS y - MOUSE_PS2_ELANTECH y # Elantech PS/2 protocol extension - MTRR_SANITIZER y - NET_FC y # Fibre Channel driver support - PCI_LEGACY y - PPP_MULTILINK y # PPP multilink support - REGULATOR y # Voltage and Current Regulator Support - SCSI_LOGGING y # SCSI logging facility - SERIAL_8250 y # 8250/16550 and compatible serial support - SLIP_COMPRESSED y # CSLIP compressed headers - SLIP_SMART y - THERMAL_HWMON y # Hardware monitoring support - USB_EHCI_ROOT_HUB_TT y # Root Hub Transaction Translators - X86_CHECK_BIOS_CORRUPTION y - X86_MCE y - ''; - - bfsched = '' - SCHED_BFS y - NO_HZ n - HZ_1000 n - HZ_300 y - HZ 300 - ''; - - forceCFSched = '' - SCHED_CFS? y - SCHED_BFS? n - NO_HZ? y - ''; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 58812453961..8b845d03c7f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1427,7 +1427,7 @@ let tcpdump = callPackage ../tools/networking/tcpdump { }; tcng = callPackage ../tools/networking/tcng { - kernel = linux_2_6_28; + kernel = linux_2_6_27; }; telnet = callPackage ../tools/networking/telnet { }; @@ -5435,38 +5435,15 @@ let linux_2_6_15 = makeOverridable (import ../os-specific/linux/kernel/linux-2.6.15.nix) { inherit fetchurl perl mktemp module_init_tools; - stdenv = overrideInStdenv stdenv [gcc34 gnumake381]; + stdenv = overrideInStdenv stdenv [ gcc34 gnumake381 ]; kernelPatches = [ kernelPatches.cifs_timeout_2_6_15 ]; }; - linux_2_6_25 = makeOverridable (import ../os-specific/linux/kernel/linux-2.6.25.nix) { - inherit fetchurl perl mktemp module_init_tools; - extraConfig = "KMOD y"; - stdenv = overrideInStdenv stdenv [gnumake381]; - kernelPatches = - [ kernelPatches.fbcondecor_2_6_25 - kernelPatches.sec_perm_2_6_24 - kernelPatches.glibc_getline - kernelPatches.cifs_timeout_2_6_25 - ]; - }; - - linux_2_6_26 = makeOverridable (import ../os-specific/linux/kernel/linux-2.6.26.nix) { - inherit fetchurl perl mktemp module_init_tools; - stdenv = overrideInStdenv stdenv [gnumake381]; - kernelPatches = - [ kernelPatches.fbcondecor_2_6_25 - kernelPatches.sec_perm_2_6_24 - kernelPatches.glibc_getline - kernelPatches.cifs_timeout_2_6_25 - ]; - }; - linux_2_6_27 = makeOverridable (import ../os-specific/linux/kernel/linux-2.6.27.nix) { inherit fetchurl perl mktemp module_init_tools; - stdenv = overrideInStdenv stdenv [gnumake381]; + stdenv = overrideGCC (overrideInStdenv stdenv [ gnumake381 ]) gcc45; kernelPatches = [ kernelPatches.fbcondecor_2_6_27 kernelPatches.sec_perm_2_6_24 @@ -5474,34 +5451,6 @@ let ]; }; - linux_2_6_28 = makeOverridable (import ../os-specific/linux/kernel/linux-2.6.28.nix) { - inherit fetchurl perl mktemp module_init_tools; - stdenv = overrideInStdenv stdenv [gnumake381]; - kernelPatches = - [ kernelPatches.fbcondecor_2_6_28 - kernelPatches.sec_perm_2_6_24 - kernelPatches.ext4_softlockups_2_6_28 - kernelPatches.glibc_getline - kernelPatches.cifs_timeout_2_6_25 - ]; - }; - - linux_2_6_29 = makeOverridable (import ../os-specific/linux/kernel/linux-2.6.29.nix) { - inherit fetchurl stdenv perl mktemp module_init_tools; - kernelPatches = - [ kernelPatches.fbcondecor_2_6_29 - kernelPatches.sec_perm_2_6_24 - kernelPatches.cifs_timeout_2_6_29 - ]; - }; - - linux_2_6_31 = makeOverridable (import ../os-specific/linux/kernel/linux-2.6.31.nix) { - inherit fetchurl stdenv perl mktemp module_init_tools platform; - kernelPatches = - [ kernelPatches.cifs_timeout_2_6_29 - ]; - }; - linux_2_6_32 = makeOverridable (import ../os-specific/linux/kernel/linux-2.6.32.nix) { inherit fetchurl stdenv perl mktemp module_init_tools ubootChooser; kernelPatches = @@ -5546,58 +5495,6 @@ let ]; }; - linux_2_6_32_zen4 = makeOverridable (import ../os-specific/linux/zen-kernel/2.6.32-zen4.nix) { - inherit fetchurl stdenv perl mktemp module_init_tools runCommand xz; - }; - - linux_2_6_32_zen4_oldi686 = linux_2_6_32_zen4.override { - features = { - oldI686 = true; - }; - }; - - linux_2_6_32_zen4_bfs = linux_2_6_32_zen4.override { - features = { - ckSched = true; - }; - }; - - linux_2_6_33 = makeOverridable (import ../os-specific/linux/kernel/linux-2.6.33.nix) { - inherit fetchurl stdenv perl mktemp module_init_tools ubootChooser; - kernelPatches = - [ kernelPatches.fbcondecor_2_6_33 - kernelPatches.aufs2_2_6_33 - kernelPatches.sec_perm_2_6_24 - kernelPatches.cifs_timeout_2_6_29 - ]; - }; - - linux_2_6_33_zen1 = makeOverridable (import ../os-specific/linux/zen-kernel/2.6.33-zen1.nix) { - inherit fetchurl stdenv perl mktemp module_init_tools runCommand xz; - }; - - linux_2_6_33_zen1_oldi686 = linux_2_6_33_zen1.override { - features = { - oldI686 = true; - }; - }; - - linux_2_6_33_zen1_bfs = linux_2_6_33_zen1.override { - features = { - ckSched = true; - }; - }; - - linux_2_6_34 = makeOverridable (import ../os-specific/linux/kernel/linux-2.6.34.nix) { - inherit fetchurl stdenv perl mktemp module_init_tools ubootChooser; - kernelPatches = - [ /*kernelPatches.fbcondecor_2_6_33*/ - kernelPatches.sec_perm_2_6_24 - kernelPatches.aufs2_2_6_34 - kernelPatches.cifs_timeout_2_6_29 - ]; - }; - linux_2_6_35 = makeOverridable (import ../os-specific/linux/kernel/linux-2.6.35.nix) { inherit fetchurl stdenv perl mktemp module_init_tools ubootChooser; kernelPatches = @@ -5638,37 +5535,14 @@ let }; linux_2_6_35_oldI686 = linux_2_6_35.override { - extraConfig = '' - HIGHMEM64G? n - XEN? n - ''; - extraMeta = { - platforms = ["i686-linux"]; - maintainers = [lib.maintainers.raskin]; - }; - }; - - linux_2_6_36 = makeOverridable (import ../os-specific/linux/kernel/linux-2.6.36.nix) { - inherit fetchurl stdenv perl mktemp module_init_tools ubootChooser; - kernelPatches = - [ #kernelPatches.fbcondecor_2_6_35 - kernelPatches.sec_perm_2_6_24 - kernelPatches.aufs2_2_6_36 - kernelPatches.mips_restart_2_6_36 - kernelPatches.cifs_timeout_2_6_35 - kernelPatches.mips_restart_2_6_36 - ]; - }; - - linux_2_6_37 = makeOverridable (import ../os-specific/linux/kernel/linux-2.6.37.nix) { - inherit fetchurl stdenv perl mktemp module_init_tools ubootChooser; - kernelPatches = - [ kernelPatches.fbcondecor_2_6_37 - kernelPatches.sec_perm_2_6_24 - kernelPatches.aufs2_1_2_6_37 - kernelPatches.cifs_timeout_2_6_35 - #kernelPatches.mips_restart_2_6_36 - ]; + extraConfig = '' + HIGHMEM64G? n + XEN? n + ''; + extraMeta = { + platforms = ["i686-linux"]; + maintainers = [lib.maintainers.raskin]; + }; }; linux_2_6_38 = makeOverridable (import ../os-specific/linux/kernel/linux-2.6.38.nix) { @@ -5912,21 +5786,13 @@ let }; # Build the kernel modules for the some of the kernels. - linuxPackages_2_6_25 = recurseIntoAttrs (linuxPackagesFor linux_2_6_25 pkgs.linuxPackages_2_6_25); linuxPackages_2_6_27 = recurseIntoAttrs (linuxPackagesFor linux_2_6_27 pkgs.linuxPackages_2_6_27); - linuxPackages_2_6_28 = recurseIntoAttrs (linuxPackagesFor linux_2_6_28 pkgs.linuxPackages_2_6_28); - linuxPackages_2_6_29 = recurseIntoAttrs (linuxPackagesFor linux_2_6_29 pkgs.linuxPackages_2_6_29); - linuxPackages_2_6_31 = recurseIntoAttrs (linuxPackagesFor linux_2_6_31 pkgs.linuxPackages_2_6_31); linuxPackages_2_6_32 = recurseIntoAttrs (linuxPackagesFor linux_2_6_32 pkgs.linuxPackages_2_6_32); linuxPackages_2_6_32_systemtap = recurseIntoAttrs (linuxPackagesFor linux_2_6_32_systemtap pkgs.linuxPackages_2_6_32_systemtap); linuxPackages_2_6_32_xen = recurseIntoAttrs (linuxPackagesFor linux_2_6_32_xen pkgs.linuxPackages_2_6_32_xen); - linuxPackages_2_6_33 = recurseIntoAttrs (linuxPackagesFor linux_2_6_33 pkgs.linuxPackages_2_6_33); - linuxPackages_2_6_34 = recurseIntoAttrs (linuxPackagesFor linux_2_6_34 pkgs.linuxPackages_2_6_34); linuxPackages_2_6_35 = recurseIntoAttrs (linuxPackagesFor linux_2_6_35 pkgs.linuxPackages_2_6_35); - linuxPackages_2_6_36 = recurseIntoAttrs (linuxPackagesFor linux_2_6_36 pkgs.linuxPackages_2_6_36); - linuxPackages_2_6_37 = recurseIntoAttrs (linuxPackagesFor linux_2_6_37 pkgs.linuxPackages_2_6_37); linuxPackages_2_6_38 = recurseIntoAttrs (linuxPackagesFor linux_2_6_38 pkgs.linuxPackages_2_6_38); linuxPackages_2_6_38_ati = recurseIntoAttrs (linuxPackagesFor linux_2_6_38_ati pkgs.linuxPackages_2_6_38); linuxPackages_2_6_39 = recurseIntoAttrs (linuxPackagesFor linux_2_6_39 pkgs.linuxPackages_2_6_39); @@ -6171,8 +6037,7 @@ let inherit (gnome) gtkdoc; }; - uml = import ../os-specific/linux/kernel/linux-2.6.29.nix { - inherit fetchurl stdenv perl mktemp module_init_tools; + uml = linux.override { userModeLinux = true; }; From 0beb6c626652729d66f961cd26f4206baba264d2 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 17 Feb 2012 23:53:49 +0000 Subject: [PATCH 101/197] * Remove some obsolete patches. svn path=/nixpkgs/branches/stdenv-updates/; revision=32379 --- pkgs/os-specific/linux/kernel/aufs2-33.patch | 82 ---- .../os-specific/linux/kernel/aufs2.1-37.patch | 368 ------------------ pkgs/os-specific/linux/kernel/getline.patch | 34 -- pkgs/os-specific/linux/kernel/patches.nix | 78 ---- 4 files changed, 562 deletions(-) delete mode 100644 pkgs/os-specific/linux/kernel/aufs2-33.patch delete mode 100644 pkgs/os-specific/linux/kernel/aufs2.1-37.patch delete mode 100644 pkgs/os-specific/linux/kernel/getline.patch diff --git a/pkgs/os-specific/linux/kernel/aufs2-33.patch b/pkgs/os-specific/linux/kernel/aufs2-33.patch deleted file mode 100644 index 49a660b0c9e..00000000000 --- a/pkgs/os-specific/linux/kernel/aufs2-33.patch +++ /dev/null @@ -1,82 +0,0 @@ -ufs2 base patch for linux-2.6.33 - -diff --git a/fs/namei.c b/fs/namei.c -index a4855af..1d12d37 100644 ---- a/fs/namei.c -+++ b/fs/namei.c -@@ -1207,7 +1207,7 @@ out: - * needs parent already locked. Doesn't follow mounts. - * SMP-safe. - */ --static struct dentry *lookup_hash(struct nameidata *nd) -+struct dentry *lookup_hash(struct nameidata *nd) - { - int err; - -@@ -1217,7 +1217,7 @@ static struct dentry *lookup_hash(struct nameidata *nd) - return __lookup_hash(&nd->last, nd->path.dentry, nd); - } - --static int __lookup_one_len(const char *name, struct qstr *this, -+int __lookup_one_len(const char *name, struct qstr *this, - struct dentry *base, int len) - { - unsigned long hash; -diff --git a/fs/splice.c b/fs/splice.c -index 3920866..b13a9a2 100644 ---- a/fs/splice.c -+++ b/fs/splice.c -@@ -1053,8 +1053,8 @@ EXPORT_SYMBOL(generic_splice_sendpage); - /* - * Attempt to initiate a splice from pipe to file. - */ --static long do_splice_from(struct pipe_inode_info *pipe, struct file *out, -- loff_t *ppos, size_t len, unsigned int flags) -+long do_splice_from(struct pipe_inode_info *pipe, struct file *out, -+ loff_t *ppos, size_t len, unsigned int flags) - { - ssize_t (*splice_write)(struct pipe_inode_info *, struct file *, - loff_t *, size_t, unsigned int); -@@ -1081,9 +1081,9 @@ static long do_splice_from(struct pipe_inode_info *pipe, struct file *out, - /* - * Attempt to initiate a splice from a file to a pipe. - */ --static long do_splice_to(struct file *in, loff_t *ppos, -- struct pipe_inode_info *pipe, size_t len, -- unsigned int flags) -+long do_splice_to(struct file *in, loff_t *ppos, -+ struct pipe_inode_info *pipe, size_t len, -+ unsigned int flags) - { - ssize_t (*splice_read)(struct file *, loff_t *, - struct pipe_inode_info *, size_t, unsigned int); -diff --git a/include/linux/namei.h b/include/linux/namei.h -index 05b441d..91bc74e 100644 ---- a/include/linux/namei.h -+++ b/include/linux/namei.h -@@ -73,6 +73,9 @@ extern int vfs_path_lookup(struct dentry *, struct vfsmount *, - extern struct file *lookup_instantiate_filp(struct nameidata *nd, struct dentry *dentry, - int (*open)(struct inode *, struct file *)); - -+extern struct dentry *lookup_hash(struct nameidata *nd); -+extern int __lookup_one_len(const char *name, struct qstr *this, -+ struct dentry *base, int len); - extern struct dentry *lookup_one_len(const char *, struct dentry *, int); - - extern int follow_down(struct path *); -diff --git a/include/linux/splice.h b/include/linux/splice.h -index 18e7c7c..8393b5c 100644 ---- a/include/linux/splice.h -+++ b/include/linux/splice.h -@@ -82,4 +82,10 @@ extern ssize_t splice_to_pipe(struct pipe_inode_info *, - extern ssize_t splice_direct_to_actor(struct file *, struct splice_desc *, - splice_direct_actor *); - -+extern long do_splice_from(struct pipe_inode_info *pipe, struct file *out, -+ loff_t *ppos, size_t len, unsigned int flags); -+extern long do_splice_to(struct file *in, loff_t *ppos, -+ struct pipe_inode_info *pipe, size_t len, -+ unsigned int flags); -+ - #endif - diff --git a/pkgs/os-specific/linux/kernel/aufs2.1-37.patch b/pkgs/os-specific/linux/kernel/aufs2.1-37.patch deleted file mode 100644 index 4cb58ad8a57..00000000000 --- a/pkgs/os-specific/linux/kernel/aufs2.1-37.patch +++ /dev/null @@ -1,368 +0,0 @@ -aufs2.1 base patch for linux-2.6.37 - -diff --git a/fs/namei.c b/fs/namei.c -index 4ff7ca5..a8c583f 100644 ---- a/fs/namei.c -+++ b/fs/namei.c -@@ -1161,12 +1161,12 @@ out: - * needs parent already locked. Doesn't follow mounts. - * SMP-safe. - */ --static struct dentry *lookup_hash(struct nameidata *nd) -+struct dentry *lookup_hash(struct nameidata *nd) - { - return __lookup_hash(&nd->last, nd->path.dentry, nd); - } - --static int __lookup_one_len(const char *name, struct qstr *this, -+int __lookup_one_len(const char *name, struct qstr *this, - struct dentry *base, int len) - { - unsigned long hash; -diff --git a/fs/splice.c b/fs/splice.c -index ce2f025..ff0ae69 100644 ---- a/fs/splice.c -+++ b/fs/splice.c -@@ -1092,8 +1092,8 @@ EXPORT_SYMBOL(generic_splice_sendpage); - /* - * Attempt to initiate a splice from pipe to file. - */ --static long do_splice_from(struct pipe_inode_info *pipe, struct file *out, -- loff_t *ppos, size_t len, unsigned int flags) -+long do_splice_from(struct pipe_inode_info *pipe, struct file *out, -+ loff_t *ppos, size_t len, unsigned int flags) - { - ssize_t (*splice_write)(struct pipe_inode_info *, struct file *, - loff_t *, size_t, unsigned int); -@@ -1120,9 +1120,9 @@ static long do_splice_from(struct pipe_inode_info *pipe, struct file *out, - /* - * Attempt to initiate a splice from a file to a pipe. - */ --static long do_splice_to(struct file *in, loff_t *ppos, -- struct pipe_inode_info *pipe, size_t len, -- unsigned int flags) -+long do_splice_to(struct file *in, loff_t *ppos, -+ struct pipe_inode_info *pipe, size_t len, -+ unsigned int flags) - { - ssize_t (*splice_read)(struct file *, loff_t *, - struct pipe_inode_info *, size_t, unsigned int); -diff --git a/include/linux/namei.h b/include/linux/namei.h -index 05b441d..91bc74e 100644 ---- a/include/linux/namei.h -+++ b/include/linux/namei.h -@@ -73,6 +73,9 @@ extern int vfs_path_lookup(struct dentry *, struct vfsmount *, - extern struct file *lookup_instantiate_filp(struct nameidata *nd, struct dentry *dentry, - int (*open)(struct inode *, struct file *)); - -+extern struct dentry *lookup_hash(struct nameidata *nd); -+extern int __lookup_one_len(const char *name, struct qstr *this, -+ struct dentry *base, int len); - extern struct dentry *lookup_one_len(const char *, struct dentry *, int); - - extern int follow_down(struct path *); -diff --git a/include/linux/splice.h b/include/linux/splice.h -index 997c3b4..be9a153 100644 ---- a/include/linux/splice.h -+++ b/include/linux/splice.h -@@ -89,4 +89,10 @@ extern int splice_grow_spd(struct pipe_inode_info *, struct splice_pipe_desc *); - extern void splice_shrink_spd(struct pipe_inode_info *, - struct splice_pipe_desc *); - -+extern long do_splice_from(struct pipe_inode_info *pipe, struct file *out, -+ loff_t *ppos, size_t len, unsigned int flags); -+extern long do_splice_to(struct file *in, loff_t *ppos, -+ struct pipe_inode_info *pipe, size_t len, -+ unsigned int flags); -+ - #endif -aufs2.1 standalone patch for linux-2.6.37 - -diff --git a/fs/file_table.c b/fs/file_table.c -index c3dee38..f529e4d 100644 ---- a/fs/file_table.c -+++ b/fs/file_table.c -@@ -393,6 +393,8 @@ void file_sb_list_del(struct file *file) - } - } - -+EXPORT_SYMBOL(file_sb_list_del); -+ - #ifdef CONFIG_SMP - - /* -diff --git a/fs/inode.c b/fs/inode.c -index ae2727a..2c8071a 100644 ---- a/fs/inode.c -+++ b/fs/inode.c -@@ -82,6 +82,7 @@ static struct hlist_head *inode_hashtable __read_mostly; - * the i_state of an inode while it is in use.. - */ - DEFINE_SPINLOCK(inode_lock); -+EXPORT_SYMBOL(inode_lock); - - /* - * iprune_sem provides exclusion between the kswapd or try_to_free_pages -diff --git a/fs/namei.c b/fs/namei.c -index a8c583f..b020c45 100644 ---- a/fs/namei.c -+++ b/fs/namei.c -@@ -347,6 +347,7 @@ int deny_write_access(struct file * file) - - return 0; - } -+EXPORT_SYMBOL(deny_write_access); - - /** - * path_get - get a reference to a path -@@ -1165,6 +1166,7 @@ struct dentry *lookup_hash(struct nameidata *nd) - { - return __lookup_hash(&nd->last, nd->path.dentry, nd); - } -+EXPORT_SYMBOL(lookup_hash); - - int __lookup_one_len(const char *name, struct qstr *this, - struct dentry *base, int len) -@@ -1187,6 +1189,7 @@ int __lookup_one_len(const char *name, struct qstr *this, - this->hash = end_name_hash(hash); - return 0; - } -+EXPORT_SYMBOL(__lookup_one_len); - - /** - * lookup_one_len - filesystem helper to lookup single pathname component -diff --git a/fs/namespace.c b/fs/namespace.c -index 3dbfc07..3998762 100644 ---- a/fs/namespace.c -+++ b/fs/namespace.c -@@ -1321,6 +1321,7 @@ int iterate_mounts(int (*f)(struct vfsmount *, void *), void *arg, - } - return 0; - } -+EXPORT_SYMBOL(iterate_mounts); - - static void cleanup_group_ids(struct vfsmount *mnt, struct vfsmount *end) - { -diff --git a/fs/notify/group.c b/fs/notify/group.c -index d309f38..f0e9568 100644 ---- a/fs/notify/group.c -+++ b/fs/notify/group.c -@@ -22,6 +22,7 @@ - #include - #include - #include -+#include - - #include - #include "fsnotify.h" -@@ -70,6 +71,7 @@ void fsnotify_put_group(struct fsnotify_group *group) - if (atomic_dec_and_test(&group->refcnt)) - fsnotify_destroy_group(group); - } -+EXPORT_SYMBOL(fsnotify_put_group); - - /* - * Create a new fsnotify_group and hold a reference for the group returned. -@@ -102,3 +104,4 @@ struct fsnotify_group *fsnotify_alloc_group(const struct fsnotify_ops *ops) - - return group; - } -+EXPORT_SYMBOL(fsnotify_alloc_group); -diff --git a/fs/notify/mark.c b/fs/notify/mark.c -index 325185e..adede09 100644 ---- a/fs/notify/mark.c -+++ b/fs/notify/mark.c -@@ -113,6 +113,7 @@ void fsnotify_put_mark(struct fsnotify_mark *mark) - if (atomic_dec_and_test(&mark->refcnt)) - mark->free_mark(mark); - } -+EXPORT_SYMBOL(fsnotify_put_mark); - - /* - * Any time a mark is getting freed we end up here. -@@ -190,6 +191,7 @@ void fsnotify_destroy_mark(struct fsnotify_mark *mark) - if (unlikely(atomic_dec_and_test(&group->num_marks))) - fsnotify_final_destroy_group(group); - } -+EXPORT_SYMBOL(fsnotify_destroy_mark); - - void fsnotify_set_mark_mask_locked(struct fsnotify_mark *mark, __u32 mask) - { -@@ -277,6 +279,7 @@ err: - - return ret; - } -+EXPORT_SYMBOL(fsnotify_add_mark); - - /* - * clear any marks in a group in which mark->flags & flags is true -@@ -332,6 +335,7 @@ void fsnotify_init_mark(struct fsnotify_mark *mark, - atomic_set(&mark->refcnt, 1); - mark->free_mark = free_mark; - } -+EXPORT_SYMBOL(fsnotify_init_mark); - - static int fsnotify_mark_destroy(void *ignored) - { -diff --git a/fs/open.c b/fs/open.c -index 4197b9e..912817a 100644 ---- a/fs/open.c -+++ b/fs/open.c -@@ -60,6 +60,7 @@ int do_truncate(struct dentry *dentry, loff_t length, unsigned int time_attrs, - mutex_unlock(&dentry->d_inode->i_mutex); - return ret; - } -+EXPORT_SYMBOL(do_truncate); - - static long do_sys_truncate(const char __user *pathname, loff_t length) - { -diff --git a/fs/splice.c b/fs/splice.c -index ff0ae69..1c9e9b0 100644 ---- a/fs/splice.c -+++ b/fs/splice.c -@@ -1116,6 +1116,7 @@ long do_splice_from(struct pipe_inode_info *pipe, struct file *out, - - return splice_write(pipe, out, ppos, len, flags); - } -+EXPORT_SYMBOL(do_splice_from); - - /* - * Attempt to initiate a splice from a file to a pipe. -@@ -1142,6 +1143,7 @@ long do_splice_to(struct file *in, loff_t *ppos, - - return splice_read(in, ppos, pipe, len, flags); - } -+EXPORT_SYMBOL(do_splice_to); - - /** - * splice_direct_to_actor - splices data directly between two non-pipes -diff --git a/security/commoncap.c b/security/commoncap.c -index 64c2ed9..e58b5d8 100644 ---- a/security/commoncap.c -+++ b/security/commoncap.c -@@ -929,3 +929,4 @@ int cap_file_mmap(struct file *file, unsigned long reqprot, - } - return ret; - } -+EXPORT_SYMBOL(cap_file_mmap); -diff --git a/security/device_cgroup.c b/security/device_cgroup.c -index 8d9c48f..29108aa 100644 ---- a/security/device_cgroup.c -+++ b/security/device_cgroup.c -@@ -515,6 +515,7 @@ found: - - return -EPERM; - } -+EXPORT_SYMBOL(devcgroup_inode_permission); - - int devcgroup_inode_mknod(int mode, dev_t dev) - { -diff --git a/security/security.c b/security/security.c -index 1b798d3..3b7d2ca 100644 ---- a/security/security.c -+++ b/security/security.c -@@ -360,6 +360,7 @@ int security_path_mkdir(struct path *dir, struct dentry *dentry, int mode) - return 0; - return security_ops->path_mkdir(dir, dentry, mode); - } -+EXPORT_SYMBOL(security_path_mkdir); - - int security_path_rmdir(struct path *dir, struct dentry *dentry) - { -@@ -367,6 +368,7 @@ int security_path_rmdir(struct path *dir, struct dentry *dentry) - return 0; - return security_ops->path_rmdir(dir, dentry); - } -+EXPORT_SYMBOL(security_path_rmdir); - - int security_path_unlink(struct path *dir, struct dentry *dentry) - { -@@ -374,6 +376,7 @@ int security_path_unlink(struct path *dir, struct dentry *dentry) - return 0; - return security_ops->path_unlink(dir, dentry); - } -+EXPORT_SYMBOL(security_path_unlink); - - int security_path_symlink(struct path *dir, struct dentry *dentry, - const char *old_name) -@@ -382,6 +385,7 @@ int security_path_symlink(struct path *dir, struct dentry *dentry, - return 0; - return security_ops->path_symlink(dir, dentry, old_name); - } -+EXPORT_SYMBOL(security_path_symlink); - - int security_path_link(struct dentry *old_dentry, struct path *new_dir, - struct dentry *new_dentry) -@@ -390,6 +394,7 @@ int security_path_link(struct dentry *old_dentry, struct path *new_dir, - return 0; - return security_ops->path_link(old_dentry, new_dir, new_dentry); - } -+EXPORT_SYMBOL(security_path_link); - - int security_path_rename(struct path *old_dir, struct dentry *old_dentry, - struct path *new_dir, struct dentry *new_dentry) -@@ -400,6 +405,7 @@ int security_path_rename(struct path *old_dir, struct dentry *old_dentry, - return security_ops->path_rename(old_dir, old_dentry, new_dir, - new_dentry); - } -+EXPORT_SYMBOL(security_path_rename); - - int security_path_truncate(struct path *path) - { -@@ -407,6 +413,7 @@ int security_path_truncate(struct path *path) - return 0; - return security_ops->path_truncate(path); - } -+EXPORT_SYMBOL(security_path_truncate); - - int security_path_chmod(struct dentry *dentry, struct vfsmount *mnt, - mode_t mode) -@@ -415,6 +422,7 @@ int security_path_chmod(struct dentry *dentry, struct vfsmount *mnt, - return 0; - return security_ops->path_chmod(dentry, mnt, mode); - } -+EXPORT_SYMBOL(security_path_chmod); - - int security_path_chown(struct path *path, uid_t uid, gid_t gid) - { -@@ -422,6 +430,7 @@ int security_path_chown(struct path *path, uid_t uid, gid_t gid) - return 0; - return security_ops->path_chown(path, uid, gid); - } -+EXPORT_SYMBOL(security_path_chown); - - int security_path_chroot(struct path *path) - { -@@ -498,6 +507,7 @@ int security_inode_readlink(struct dentry *dentry) - return 0; - return security_ops->inode_readlink(dentry); - } -+EXPORT_SYMBOL(security_inode_readlink); - - int security_inode_follow_link(struct dentry *dentry, struct nameidata *nd) - { -@@ -512,6 +522,7 @@ int security_inode_permission(struct inode *inode, int mask) - return 0; - return security_ops->inode_permission(inode, mask); - } -+EXPORT_SYMBOL(security_inode_permission); - - int security_inode_setattr(struct dentry *dentry, struct iattr *attr) - { -@@ -611,6 +622,7 @@ int security_file_permission(struct file *file, int mask) - - return fsnotify_perm(file, mask); - } -+EXPORT_SYMBOL(security_file_permission); - - int security_file_alloc(struct file *file) - { -@@ -638,6 +650,7 @@ int security_file_mmap(struct file *file, unsigned long reqprot, - return ret; - return ima_file_mmap(file, prot); - } -+EXPORT_SYMBOL(security_file_mmap); - - int security_file_mprotect(struct vm_area_struct *vma, unsigned long reqprot, - unsigned long prot) - diff --git a/pkgs/os-specific/linux/kernel/getline.patch b/pkgs/os-specific/linux/kernel/getline.patch deleted file mode 100644 index 6ac768b9d86..00000000000 --- a/pkgs/os-specific/linux/kernel/getline.patch +++ /dev/null @@ -1,34 +0,0 @@ -Allow compilation with recent versions of Glibc. -From https://patchwork.kernel.org/patch/11166/. - -diff --git a/scripts/unifdef.c b/scripts/unifdef.c -index 552025e..977e682 100644 ---- a/scripts/unifdef.c -+++ b/scripts/unifdef.c -@@ -206,7 +206,7 @@ static void done(void); - static void error(const char *); - static int findsym(const char *); - static void flushline(bool); --static Linetype getline(void); -+static Linetype parseline(void); - static Linetype ifeval(const char **); - static void ignoreoff(void); - static void ignoreon(void); -@@ -512,7 +512,7 @@ process(void) - - for (;;) { - linenum++; -- lineval = getline(); -+ lineval = parseline(); - trans_table[ifstate[depth]][lineval](); - debug("process %s -> %s depth %d", - linetype_name[lineval], -@@ -526,7 +526,7 @@ process(void) - * help from skipcomment(). - */ - static Linetype --getline(void) -+parseline(void) - { - const char *cp; - int cursym; diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix index 9fb597be72c..fd5a27e0eac 100644 --- a/pkgs/os-specific/linux/kernel/patches.nix +++ b/pkgs/os-specific/linux/kernel/patches.nix @@ -84,26 +84,6 @@ rec { features.fbConDecor = true; }; - fbcondecor_2_6_28 = - { name = "fbcondecor-0.9.5-2.6.28"; - patch = fetchurl { - url = http://dev.gentoo.org/~spock/projects/fbcondecor/archive/fbcondecor-0.9.5-2.6.28.patch; - sha256 = "105q2dwrwi863r7nhlrvljim37aqv67mjc3lgg529jzqgny3fjds"; - }; - extraConfig = fbcondecorConfig; - features.fbConDecor = true; - }; - - fbcondecor_2_6_29 = - { name = "fbcondecor-0.9.6-2.6.29.2"; - patch = fetchurl { - url = http://dev.gentoo.org/~spock/projects/fbcondecor/archive/fbcondecor-0.9.6-2.6.29.2.patch; - sha256 = "1yppvji13sgnql62h4wmskzl9l198pp1pbixpbymji7mr4a0ylx1"; - }; - extraConfig = fbcondecorConfig; - features.fbConDecor = true; - }; - fbcondecor_2_6_31 = { name = "fbcondecor-0.9.6-2.6.31.2"; patch = fetchurl { @@ -114,16 +94,6 @@ rec { features.fbConDecor = true; }; - fbcondecor_2_6_33 = - { name = "fbcondecor-0.9.6-2.6.33-rc7"; - patch = fetchurl { - url = http://dev.gentoo.org/~spock/projects/fbcondecor/archive/fbcondecor-0.9.6-2.6.33-rc7.patch; - sha256 = "1v9lg3bgva0xry0s09drpw3n139s8hln8slayaf6i26vg4l4xdz6"; - }; - extraConfig = fbcondecorConfig; - features.fbConDecor = true; - }; - fbcondecor_2_6_35 = rec { name = "fbcondecor-0.9.6-2.6.35-rc4"; @@ -135,17 +105,6 @@ rec { features.fbConDecor = true; }; - fbcondecor_2_6_37 = - rec { - name = "fbcondecor-0.9.6-2.6.37"; - patch = fetchurl { - url = "http://dev.gentoo.org/~spock/projects/fbcondecor/archive/${name}.patch"; - sha256 = "1yap9q6mp15jhsysry4x17cpm5dj35g8l2d0p0vn1xq25x3jfkqk"; - }; - extraConfig = fbcondecorConfig; - features.fbConDecor = true; - }; - fbcondecor_2_6_38 = rec { name = "fbcondecor-0.9.6-2.6.38"; @@ -157,15 +116,6 @@ rec { features.fbConDecor = true; }; - # From http://patchwork.kernel.org/patch/19495/ - ext4_softlockups_2_6_28 = - { name = "ext4-softlockups-fix"; - patch = fetchurl { - url = http://patchwork.kernel.org/patch/19495/raw; - sha256 = "0vqcj9qs7jajlvmwm97z8cljr4vb277aqhsjqrakbxfdiwlhrzzf"; - }; - }; - gcov_2_6_28 = { name = "gcov"; patch = fetchurl { @@ -214,16 +164,6 @@ rec { features.aufs2 = true; }; - aufs2_2_6_33 = - { # From http://git.c3sl.ufpr.br/gitweb?p=aufs/aufs2-standalone.git;a=tree;h=refs/heads/aufs2-33;hb=aufs2-33 - # Note that this merely the patch needed to build AUFS2 as a - # standalone package. - name = "aufs2"; - patch = ./aufs2-33.patch; - features.aufsBase = true; - features.aufs2 = true; - }; - aufs2_2_6_34 = { # From http://git.c3sl.ufpr.br/gitweb?p=aufs/aufs2-standalone.git;a=tree;h=refs/heads/aufs2-34;hb=aufs2-34 # Note that this merely the patch needed to build AUFS2 as a @@ -254,16 +194,6 @@ rec { features.aufs2_1 = true; }; - aufs2_1_2_6_37 = - { # From http://git.c3sl.ufpr.br/gitweb?p=aufs/aufs2-standalone.git;a=tree;h=refs/heads/aufs2.1-37;hb=refs/heads/aufs2.1-37 - # Note that this merely the patch needed to build AUFS2.1 as a - # standalone package. - name = "aufs2.1"; - patch = ./aufs2.1-37.patch; - features.aufsBase = true; - features.aufs2_1 = true; - }; - aufs2_1_2_6_38 = { # From http://aufs.git.sourceforge.net/git/gitweb.cgi?p=aufs/aufs2-standalone.git;a=tree;h=refs/heads/aufs2.1-38;hb=refs/heads/aufs2.1-38 # Note that this merely the patch needed to build AUFS2.1 as a @@ -396,12 +326,4 @@ rec { name = "guruplug-arch-number"; patch = ./guruplug-mach-type.patch; }; - - glibc_getline = - { - # Patch to work around conflicting types for the `getline' function - # with recent Glibcs (2009). - name = "glibc-getline"; - patch = ./getline.patch; - }; } From a0bc4419809c3baa2891b21942668408eac4cbd6 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Sat, 18 Feb 2012 00:18:26 +0000 Subject: [PATCH 102/197] * Updated Xen to 4.0.3 (mostly to get it to build with GCC 4.6). svn path=/nixpkgs/branches/stdenv-updates/; revision=32380 --- pkgs/applications/virtualization/xen/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/virtualization/xen/default.nix b/pkgs/applications/virtualization/xen/default.nix index 9b8cff7d9c6..ce799242e12 100644 --- a/pkgs/applications/virtualization/xen/default.nix +++ b/pkgs/applications/virtualization/xen/default.nix @@ -6,7 +6,7 @@ with stdenv.lib; let - version = "4.0.1"; + version = "4.0.3"; libDir = if stdenv.is64bit then "lib64" else "lib"; @@ -37,7 +37,7 @@ stdenv.mkDerivation { src = fetchurl { url = "http://bits.xensource.com/oss-xen/release/${version}/xen-${version}.tar.gz"; - sha256 = "0ww8j5fa2jxg0zyx7d7z9jyv2j47m8w420sy16w3rf8d80lisvbf"; + sha256 = "0p4i7mm8cdsr8i9z3dij6nriyvz6la2rhm7jkyk2n8h62nnxi1b5"; }; patches = From ce544df56120c33ad92100a15de24c3bb0662bac Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Sat, 18 Feb 2012 01:30:22 +0000 Subject: [PATCH 103/197] * Revert r31596 (which changes the Qt for KDE 4.7). This doesn't belong in the stdenv branch and breaks KDE (http://hydra.nixos.org/build/2068311). svn path=/nixpkgs/branches/stdenv-updates/; revision=32381 --- pkgs/desktops/kde-4.7/default.nix | 4 ++-- pkgs/desktops/kde-4.7/kde-workspace.nix | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/desktops/kde-4.7/default.nix b/pkgs/desktops/kde-4.7/default.nix index 6abcc02139d..3bdf825410c 100644 --- a/pkgs/desktops/kde-4.7/default.nix +++ b/pkgs/desktops/kde-4.7/default.nix @@ -1,4 +1,4 @@ -{ callPackage, callPackageOrig, stdenv, qt48 }: +{ callPackage, callPackageOrig, stdenv, qt47 }: let release = "4.7.4"; @@ -44,7 +44,7 @@ kde.modules // kde.individual // akonadi = callPackage ./support/akonadi { }; - qt4 = qt48; + qt4 = qt47; kdebase_workspace = kde.modules.kde_workspace; diff --git a/pkgs/desktops/kde-4.7/kde-workspace.nix b/pkgs/desktops/kde-4.7/kde-workspace.nix index 55c243f60dd..277bdd62634 100644 --- a/pkgs/desktops/kde-4.7/kde-workspace.nix +++ b/pkgs/desktops/kde-4.7/kde-workspace.nix @@ -1,7 +1,7 @@ -{ kde, kdelibs, qimageblitz, libdbusmenu_qt, xorg, shared_desktop_ontologies, - lm_sensors, pciutils, libraw1394, libusb, libxklavier, python, libqalculate, - consolekit, xkeyboard_config, kdepimlibs, pam, boost, gpsd, prison, akonadi, - pykde4 +{ kde, kdelibs, qimageblitz, libdbusmenu_qt, xorg, shared_desktop_ontologies +, lm_sensors, pciutils, libraw1394, libusb, libxklavier, python, libqalculate +, consolekit, xkeyboard_config, kdepimlibs, pam, boost, gpsd, prison, akonadi +, pykde4 }: kde { From 60f8478fde26a43b37bbfee513d61eb5551a71fe Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Sat, 18 Feb 2012 16:35:04 +0000 Subject: [PATCH 104/197] * ioquake: fix building on GCC 4.6. svn path=/nixpkgs/branches/stdenv-updates/; revision=32383 --- pkgs/games/quake3/game/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/games/quake3/game/default.nix b/pkgs/games/quake3/game/default.nix index e1a78750535..6a05ab7f2bd 100644 --- a/pkgs/games/quake3/game/default.nix +++ b/pkgs/games/quake3/game/default.nix @@ -24,6 +24,9 @@ stdenv.mkDerivation { buildInputs = [x11 SDL mesa openal]; + # Fix building on GCC 4.6. + NIX_CFLAGS_COMPILE = "-Wno-error"; + preInstall = '' mkdir -p $out/baseq3 installTargets=copyfiles From 8dc12887e1a597fbcf171849359c8d49cb59c73a Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Sat, 18 Feb 2012 17:23:17 +0000 Subject: [PATCH 105/197] * Fix building VLC with zlib 1.2.6. svn path=/nixpkgs/branches/stdenv-updates/; revision=32385 --- pkgs/applications/video/vlc/default.nix | 6 +++-- pkgs/applications/video/vlc/zlib.patch | 35 +++++++++++++++++++++++++ 2 files changed, 39 insertions(+), 2 deletions(-) create mode 100644 pkgs/applications/video/vlc/zlib.patch diff --git a/pkgs/applications/video/vlc/default.nix b/pkgs/applications/video/vlc/default.nix index 02000ffeb21..2a5e98a5687 100644 --- a/pkgs/applications/video/vlc/default.nix +++ b/pkgs/applications/video/vlc/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { name = "vlc-${version}"; version = "1.1.13"; - patchPhase = ''sed -e "s@/bin/echo@echo@g" -i configure''; - src = fetchurl { url = "http://download.videolan.org/pub/videolan/vlc/${version}/${name}.tar.bz2"; sha256 = "1h93jdx89dfgxlnw66lfcdk9kisadm689zanvgkzbfb3si2frv83"; }; + patches = [ ./zlib.patch ]; + buildInputs = [ perl zlib a52dec libmad faad2 ffmpeg alsaLib libdvdnav libdvdnav.libdvdread dbus fribidi qt4 libvorbis libtheora speex lua5 libgcrypt @@ -35,6 +35,8 @@ stdenv.mkDerivation rec { "--with-kde-solid=$out/share/apps/solid/actions" ]; + preConfigure = ''sed -e "s@/bin/echo@echo@g" -i configure''; + enableParallelBuilding = true; preBuild = '' diff --git a/pkgs/applications/video/vlc/zlib.patch b/pkgs/applications/video/vlc/zlib.patch new file mode 100644 index 00000000000..b94f7de9332 --- /dev/null +++ b/pkgs/applications/video/vlc/zlib.patch @@ -0,0 +1,35 @@ +From https://401629.bugs.gentoo.org/attachment.cgi?id=300539 +Fix building VLC against zlib 1.2.6. + +http://bugs.gentoo.org/401629 +http://trac.videolan.org/vlc/ticket/5964 + +--- a/modules/gui/skins2/src/theme_loader.cpp ++++ b/modules/gui/skins2/src/theme_loader.cpp +@@ -768,7 +768,7 @@ + { + void *toClose = currentGzVp; + currentGzVp = NULL; currentGzFd = -1; +- return gzclose( toClose ); ++ return gzclose( (gzFile) toClose ); + } + return -1; + } +@@ -777,7 +777,7 @@ + { + if( currentGzVp != NULL && fd != -1 ) + { +- return gzread( currentGzVp, p_buffer, i_length ); ++ return gzread( (gzFile) currentGzVp, p_buffer, i_length ); + } + return -1; + } +@@ -786,7 +786,7 @@ + { + if( currentGzVp != NULL && fd != -1 ) + { +- return gzwrite( currentGzVp, const_cast(p_buffer), i_length ); ++ return gzwrite( (gzFile) currentGzVp, const_cast(p_buffer), i_length ); + } + return -1; + } From 81fa68da99fd515ad366d6da95b817d110d9b534 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Sat, 18 Feb 2012 17:45:10 +0000 Subject: [PATCH 106/197] svn path=/nixpkgs/branches/stdenv-updates/; revision=32386 --- pkgs/top-level/release.nix | 52 -------------------------------------- 1 file changed, 52 deletions(-) diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix index c6b47005097..a8b6e50d608 100644 --- a/pkgs/top-level/release.nix +++ b/pkgs/top-level/release.nix @@ -409,58 +409,6 @@ with (import ./release-lib.nix); }; */ - linuxPackages_2_6_25 = { - kernel = linux; - }; - - linuxPackages_2_6_27 = { - kernel = linux; - virtualbox = linux; - virtualboxGuestAdditions = linux; - }; - - linuxPackages_2_6_28 = { - kernel = linux; - }; - - linuxPackages_2_6_29 = { - kernel = linux; - }; - - linuxPackages_2_6_31 = { - kernel = linux; - }; - - linuxPackages_2_6_32 = { - kernel = linux; - virtualbox = linux; - virtualboxGuestAdditions = linux; - }; - - linuxPackages_2_6_35 = { - kernel = linux; - virtualbox = linux; - virtualboxGuestAdditions = linux; - }; - - linuxPackages_2_6_36 = { - kernel = linux; - virtualbox = linux; - virtualboxGuestAdditions = linux; - }; - - linuxPackages_2_6_37 = { - kernel = linux; - virtualbox = linux; - virtualboxGuestAdditions = linux; - }; - - linuxPackages_2_6_38 = { - kernel = linux; - virtualbox = linux; - virtualboxGuestAdditions = linux; - }; - strategoPackages = { sdf = all; strategoxt = all; From cdece697738e65c95183ae248fd4ef2e9ed4b439 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Sat, 18 Feb 2012 18:07:22 +0000 Subject: [PATCH 107/197] * Fix building Firefox 3.6 with GCC 4.6. svn path=/nixpkgs/branches/stdenv-updates/; revision=32387 --- .../networking/browsers/firefox/3.6.nix | 9 ++++++--- .../networking/browsers/firefox/gcc-4.6.patch | 13 +++++++++++++ 2 files changed, 19 insertions(+), 3 deletions(-) create mode 100644 pkgs/applications/networking/browsers/firefox/gcc-4.6.patch diff --git a/pkgs/applications/networking/browsers/firefox/3.6.nix b/pkgs/applications/networking/browsers/firefox/3.6.nix index 47754d67f3c..40b7959139d 100644 --- a/pkgs/applications/networking/browsers/firefox/3.6.nix +++ b/pkgs/applications/networking/browsers/firefox/3.6.nix @@ -12,14 +12,14 @@ rec { - firefoxVersion = "3.6.21"; + firefoxVersion = "3.6.27"; - xulVersion = "1.9.2.21"; # this attribute is used by other packages + xulVersion = "1.9.2.27"; # this attribute is used by other packages src = fetchurl { url = "http://releases.mozilla.org/pub/mozilla.org/firefox/releases/${firefoxVersion}/source/firefox-${firefoxVersion}.source.tar.bz2"; - sha1 = "3c1f001ad22d93b48e191999f548b4382db3d36c"; + sha1 = "dd472a10e4ef5b017f00074d0325be13e832d610"; }; @@ -50,6 +50,9 @@ rec { ./xulrunner-chromium-mips.patch ./xulrunner-mips-n32.patch ./xulrunner-1.9.2_beta4-mips-bus-error.patch + + # Fix building on GCC 4.6. + ./gcc-4.6.patch ]; buildInputs = diff --git a/pkgs/applications/networking/browsers/firefox/gcc-4.6.patch b/pkgs/applications/networking/browsers/firefox/gcc-4.6.patch new file mode 100644 index 00000000000..f5f685951ef --- /dev/null +++ b/pkgs/applications/networking/browsers/firefox/gcc-4.6.patch @@ -0,0 +1,13 @@ +https://346825.bugs.gentoo.org/attachment.cgi?id=270163 + +--- a/gfx/ots/src/os2.cc ++++ b/gfx/ots/src/os2.cc +@@ -2,6 +2,8 @@ + // Use of this source code is governed by a BSD-style license that can be + // found in the LICENSE file. + ++#include ++ + #include "os2.h" + + #include "head.h" From e07a111edc614009e55476c4df31137e2dbeb76f Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Sun, 19 Feb 2012 11:19:11 +0000 Subject: [PATCH 108/197] kdelibs depend on xz. Really. svn path=/nixpkgs/branches/stdenv-updates/; revision=32397 --- pkgs/desktops/kde-4.7/kdelibs.nix | 4 ++-- pkgs/desktops/kde-4.8/kdelibs.nix | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/desktops/kde-4.7/kdelibs.nix b/pkgs/desktops/kde-4.7/kdelibs.nix index bb6e9a84665..31df83e5ee9 100644 --- a/pkgs/desktops/kde-4.7/kdelibs.nix +++ b/pkgs/desktops/kde-4.7/kdelibs.nix @@ -3,14 +3,14 @@ , openexr, avahi, kerberos, acl, attr, shared_desktop_ontologies, libXScrnSaver , automoc4, strigi, soprano, qca2, attica, enchant, libdbusmenu_qt , docbook_xml_dtd_42, docbook_xsl, polkit_qt_1 -, getopt, udev, herqq, phonon, libjpeg +, getopt, udev, herqq, phonon, libjpeg, xz }: kde { buildInputs = [ acl attr attica avahi bzip2 enchant fam getopt giflib herqq jasper libdbusmenu_qt libXScrnSaver libxslt pcre polkit_qt_1 qca2 - shared_desktop_ontologies udev libxml2 libjpeg kerberos + shared_desktop_ontologies xz udev libxml2 libjpeg kerberos ]; propagatedBuildInputs = [ qt4 soprano strigi phonon ]; diff --git a/pkgs/desktops/kde-4.8/kdelibs.nix b/pkgs/desktops/kde-4.8/kdelibs.nix index bb6e9a84665..31df83e5ee9 100644 --- a/pkgs/desktops/kde-4.8/kdelibs.nix +++ b/pkgs/desktops/kde-4.8/kdelibs.nix @@ -3,14 +3,14 @@ , openexr, avahi, kerberos, acl, attr, shared_desktop_ontologies, libXScrnSaver , automoc4, strigi, soprano, qca2, attica, enchant, libdbusmenu_qt , docbook_xml_dtd_42, docbook_xsl, polkit_qt_1 -, getopt, udev, herqq, phonon, libjpeg +, getopt, udev, herqq, phonon, libjpeg, xz }: kde { buildInputs = [ acl attr attica avahi bzip2 enchant fam getopt giflib herqq jasper libdbusmenu_qt libXScrnSaver libxslt pcre polkit_qt_1 qca2 - shared_desktop_ontologies udev libxml2 libjpeg kerberos + shared_desktop_ontologies xz udev libxml2 libjpeg kerberos ]; propagatedBuildInputs = [ qt4 soprano strigi phonon ]; From 5baef98dd955be75af207e0dad8073bcbc049e19 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Sun, 19 Feb 2012 16:58:40 +0000 Subject: [PATCH 109/197] * Cromfs updated to 1.5.10 (to get it to build with GCC 4.6). svn path=/nixpkgs/branches/stdenv-updates/; revision=32400 --- pkgs/tools/archivers/cromfs/default.nix | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/pkgs/tools/archivers/cromfs/default.nix b/pkgs/tools/archivers/cromfs/default.nix index 943525d3853..3512d62223f 100644 --- a/pkgs/tools/archivers/cromfs/default.nix +++ b/pkgs/tools/archivers/cromfs/default.nix @@ -1,20 +1,14 @@ -{stdenv, fetchurl, pkgconfig, fuse, perl}: +{ stdenv, fetchurl, pkgconfig, fuse, perl }: stdenv.mkDerivation rec { - name = "cromfs-1.5.9.1"; + name = "cromfs-1.5.10"; + src = fetchurl { url = "http://bisqwit.iki.fi/src/arch/${name}.tar.bz2"; - sha256 = "02k0nd7zvcksn7vjxlynsdgdvkayfzzhv622n9zkka94756lr0fk"; + sha256 = "1w079zb5scv6bj919ndr0fkiirq2bkyjrnmwqrr9yzwbyinzg73j"; }; - patchPhase = ''sed -i 's@/bin/bash@/bin/sh@g' configure; set -x''; - - meta = { - description = "FUSE Compressed ROM filesystem with lzma" ; - homepage = http://bisqwit.iki.fi/source/cromfs.html; - maintainers = with stdenv.lib.maintainers; [viric]; - platforms = with stdenv.lib.platforms; linux; - }; + patchPhase = ''sed -i 's@/bin/bash@/bin/sh@g' configure''; # Removing the static linking, as it doesn't compile in x86_64. makeFlags = "cromfs-driver util/mkcromfs util/unmkcromfs util/cvcromfs"; @@ -27,5 +21,12 @@ stdenv.mkDerivation rec { install util/unmkcromfs $out/bin ''; - buildInputs = [pkgconfig fuse perl]; + buildInputs = [ pkgconfig fuse perl ]; + + meta = { + description = "FUSE Compressed ROM filesystem with lzma"; + homepage = http://bisqwit.iki.fi/source/cromfs.html; + maintainers = [ stdenv.lib.maintainers.viric ]; + platforms = stdenv.lib.platforms.linux; + }; } From a50d32e4db6c6c9c2fe9c4cd9863a4ba213fd264 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Sun, 19 Feb 2012 17:03:38 +0000 Subject: [PATCH 110/197] * Fix oprofile. svn path=/nixpkgs/branches/stdenv-updates/; revision=32402 --- .../development/tools/profiling/oprofile/default.nix | 12 ++++++------ pkgs/top-level/all-packages.nix | 11 ++--------- 2 files changed, 8 insertions(+), 15 deletions(-) diff --git a/pkgs/development/tools/profiling/oprofile/default.nix b/pkgs/development/tools/profiling/oprofile/default.nix index 143704126f4..56d72294177 100644 --- a/pkgs/development/tools/profiling/oprofile/default.nix +++ b/pkgs/development/tools/profiling/oprofile/default.nix @@ -1,16 +1,16 @@ { stdenv, fetchurl, binutils, popt, makeWrapper, gawk, which, gnugrep, zlib -, qt ? null, libX11 ? null, libXext ? null, libpng ? null }: +, qt3 ? null, libX11 ? null, libXext ? null, libpng ? null }: # libX11 is needed because the Qt build stuff automatically adds `-lX11'. -assert (qt != null) -> ((libX11 != null) && (libXext != null) +assert (qt3 != null) -> ((libX11 != null) && (libXext != null) && (libpng != null)); stdenv.mkDerivation rec { - name = "oprofile-0.9.6"; + name = "oprofile-0.9.7"; src = fetchurl { url = "mirror://sourceforge/oprofile/${name}.tar.gz"; - sha256 = "103q0w4wr5lnhg1yfdhc67dvdwzqpzml57fp4l6nbz29fw5d839z"; + sha256 = "09ymfgcvp6372xnxdbq664ba8f4nzz4cxlya7wi8s1gabmym0nyb"; }; patchPhase = '' @@ -21,13 +21,13 @@ stdenv.mkDerivation rec { ''; buildInputs = [ binutils zlib popt makeWrapper gawk which gnugrep ] - ++ stdenv.lib.optionals (qt != null) [ qt libX11 libXext libpng ]; + ++ stdenv.lib.optionals (qt3 != null) [ qt3 libX11 libXext libpng ]; configureFlags = [ "--with-kernel-support" "--disable-shared" # needed because only the static libbfd is available ] - ++ stdenv.lib.optional (qt != null) "--with-qt-dir=${qt}"; + ++ stdenv.lib.optional (qt3 != null) "--with-qt-dir=${qt3}"; postInstall = '' wrapProgram "$out/bin/opcontrol" \ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d405b01bcc3..1478dccdbd5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3079,15 +3079,8 @@ let openocd = callPackage ../development/tools/misc/openocd { }; - oprofile = import ../development/tools/profiling/oprofile { - inherit fetchurl stdenv binutils popt makeWrapper gawk which gnugrep zlib; - - # Optional build inputs for the (useless) GUI. - /* - qt = qt3; - inherit (xlibs) libX11 libXext; - inherit libpng; - */ + oprofile = callPackage ../development/tools/profiling/oprofile { + qt3 = null; }; patchelf = callPackage ../development/tools/misc/patchelf { }; From 0922e0fb71d9ddd0e63b5def33bb1dbbee76e1eb Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Sun, 19 Feb 2012 17:12:37 +0000 Subject: [PATCH 111/197] * Remove ocaml 3.11.1. It doesn't build anymore and isn't used anywhere. svn path=/nixpkgs/branches/stdenv-updates/; revision=32403 --- pkgs/development/compilers/ocaml/3.11.1.nix | 68 --------------------- pkgs/top-level/all-packages.nix | 3 - 2 files changed, 71 deletions(-) delete mode 100644 pkgs/development/compilers/ocaml/3.11.1.nix diff --git a/pkgs/development/compilers/ocaml/3.11.1.nix b/pkgs/development/compilers/ocaml/3.11.1.nix deleted file mode 100644 index f7db9231bd4..00000000000 --- a/pkgs/development/compilers/ocaml/3.11.1.nix +++ /dev/null @@ -1,68 +0,0 @@ -{ stdenv, fetchurl, ncurses, x11 }: - -let - useX11 = stdenv.isi686 || stdenv.isx86_64; - useNativeCompilers = stdenv.isi686 || stdenv.isx86_64 || stdenv.isMips; - inherit (stdenv.lib) optionals optionalString; -in - -stdenv.mkDerivation rec { - - name = "ocaml-3.11.1"; - - src = fetchurl { - url = "http://caml.inria.fr/pub/distrib/ocaml-3.11/${name}.tar.bz2"; - sha256 = "8c36a28106d4b683a15c547dfe4cb757a53fa9247579d1cc25bd06a22cc62e50"; - }; - - # Needed to avoid a SIGBUS on the final executable on mips - NIX_CFLAGS_COMPILE = if stdenv.isMips then "-fPIC" else ""; - - patches = optionals stdenv.isDarwin [ ./gnused-on-osx-fix.patch ]; - - prefixKey = "-prefix "; - configureFlags = ["-no-tk"] ++ optionals useX11 [ "-x11lib" x11 ]; - buildFlags = "world" + optionalString useNativeCompilers " bootstrap world.opt"; - buildInputs = [ncurses] ++ optionals useX11 [ x11 ]; - installTargets = "install" + optionalString useNativeCompilers " installopt"; - prePatch = '' - CAT=$(type -tp cat) - sed -e "s@/bin/cat@$CAT@" -i config/auto-aux/sharpbang - patch -p0 < ${./mips64.patch} - ''; - postBuild = '' - mkdir -p $out/include - ln -sv $out/lib/ocaml/caml $out/include/caml - ''; - - meta = { - homepage = http://caml.inria.fr/ocaml; - licenses = [ "QPL" /* compiler */ "LGPLv2" /* library */ ]; - description = "Objective Caml, the most popular variant of the Caml language"; - - longDescription = - '' Objective Caml is the most popular variant of the Caml language. - From a language standpoint, it extends the core Caml language with a - fully-fledged object-oriented layer, as well as a powerful module - system, all connected by a sound, polymorphic type system featuring - type inference. - - The Objective Caml system is an industrial-strength implementation - of this language, featuring a high-performance native-code compiler - (ocamlopt) for 9 processor architectures (IA32, PowerPC, AMD64, - Alpha, Sparc, Mips, IA64, HPPA, StrongArm), as well as a bytecode - compiler (ocamlc) and an interactive read-eval-print loop (ocaml) - for quick development and portability. The Objective Caml - distribution includes a comprehensive standard library, a replay - debugger (ocamldebug), lexer (ocamllex) and parser (ocamlyacc) - generators, a pre-processor pretty-printer (camlp4) and a - documentation generator (ocamldoc). - ''; - - platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; - maintainers = [ - stdenv.lib.maintainers.z77z - ]; - }; - -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1478dccdbd5..700058082aa 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2376,8 +2376,6 @@ let ocaml_3_10_0 = callPackage ../development/compilers/ocaml/3.10.0.nix { }; - ocaml_3_11_1 = callPackage ../development/compilers/ocaml/3.11.1.nix { }; - ocaml_3_12_1 = lowPrio (callPackage ../development/compilers/ocaml/3.12.1.nix { }); metaocaml_3_09 = callPackage ../development/compilers/ocaml/metaocaml-3.09.nix { }; @@ -2473,7 +2471,6 @@ let ocamlPackages = recurseIntoAttrs ocamlPackages_3_12_1; ocamlPackages_3_10_0 = mkOcamlPackages ocaml_3_10_0 pkgs.ocamlPackages_3_10_0; - ocamlPackages_3_11_1 = mkOcamlPackages ocaml_3_11_1 pkgs.ocamlPackages_3_11_1; ocamlPackages_3_12_1 = mkOcamlPackages ocaml_3_12_1 pkgs.ocamlPackages_3_12_1; ocaml_make = callPackage ../development/ocaml-modules/ocamlmake { }; From 1133387eb19eaeabee22a8ce229d21a59064ffd6 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Sun, 19 Feb 2012 17:20:20 +0000 Subject: [PATCH 112/197] * Fix rubberband. svn path=/nixpkgs/branches/stdenv-updates/; revision=32404 --- pkgs/development/libraries/rubberband/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/rubberband/default.nix b/pkgs/development/libraries/rubberband/default.nix index c8e3c53885c..9e606967ab1 100644 --- a/pkgs/development/libraries/rubberband/default.nix +++ b/pkgs/development/libraries/rubberband/default.nix @@ -2,11 +2,11 @@ , vampSDK, ladspaH }: stdenv.mkDerivation { - name = "rubberband-1.6.0"; + name = "rubberband-1.7.0"; src = fetchurl { - url = http://code.breakfastquay.com/attachments/download/16/rubberband-1.6.0.tar.bz2; - sha256 = "15n875x3bbg7nbnqbl33v5jp2p6yw779124xz4la8ysclvikklsv"; + url = http://code.breakfastquay.com/attachments/download/23/rubberband-1.7.0.tar.bz2; + sha256 = "10pnfzaiws6bi17qlyj3r0alj2nvm11pkd14nms6yxas8c7gwdw0"; }; buildInputs = [ pkgconfig libsamplerate libsndfile fftw vampSDK ladspaH ]; From 578847f8b37a02234a80875ef5d589170e7c046d Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Tue, 21 Feb 2012 14:04:51 +0000 Subject: [PATCH 113/197] Let hydra build kdesvn svn path=/nixpkgs/branches/stdenv-updates/; revision=32455 --- pkgs/applications/version-management/kdesvn/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/version-management/kdesvn/default.nix b/pkgs/applications/version-management/kdesvn/default.nix index 10a590e941b..bf8f71eb5d3 100644 --- a/pkgs/applications/version-management/kdesvn/default.nix +++ b/pkgs/applications/version-management/kdesvn/default.nix @@ -22,5 +22,6 @@ stdenv.mkDerivation { license = "GPL"; homepage = http://kdesvn.alwins-world.de; maintainers = [ lib.maintainers.sander ]; + inherit (kdelibs.meta) platforms; }; } From 9a48e47d600354b6e115f6511087cc1ffe82fb57 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 21 Feb 2012 14:13:16 +0000 Subject: [PATCH 114/197] * It's important to inherit packages from "pkgs" rather than the lexical scope for package overrides to work properly. svn path=/nixpkgs/branches/stdenv-updates/; revision=32456 --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 769e4ad3f9c..566b2b052ae 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -241,7 +241,7 @@ let }; buildEnv = import ../build-support/buildenv { - inherit runCommand perl; + inherit (pkgs) runCommand perl; }; dotnetenv = import ../build-support/dotnetenv { From f71dd91a438f8777c90b3df27b1509d2508e580d Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 21 Feb 2012 23:35:35 +0000 Subject: [PATCH 115/197] * Apply r32435 from the trunk (always build Python with SSL support). Remove .ssl references from some packages missed in that commit. svn path=/nixpkgs/branches/stdenv-updates/; revision=32469 --- pkgs/applications/networking/p2p/tribler/default.nix | 2 +- .../applications/version-management/bazaar/default.nix | 2 +- .../version-management/mercurial/default.nix | 6 +++--- pkgs/applications/virtualization/nova/client.nix | 2 +- pkgs/development/interpreters/python/2.7/default.nix | 7 +------ pkgs/tools/networking/getmail/default.nix | 4 +--- pkgs/tools/networking/offlineimap/default.nix | 4 +--- pkgs/tools/networking/p2p/bit-tornado/default.nix | 5 ++--- pkgs/tools/networking/s3cmd/default.nix | 2 -- pkgs/tools/virtualization/euca2ools/default.nix | 2 +- pkgs/top-level/all-packages.nix | 10 +++------- pkgs/top-level/python-packages.nix | 2 +- 12 files changed, 16 insertions(+), 32 deletions(-) diff --git a/pkgs/applications/networking/p2p/tribler/default.nix b/pkgs/applications/networking/p2p/tribler/default.nix index 4e02eb9f1e6..a834c443bf7 100644 --- a/pkgs/applications/networking/p2p/tribler/default.nix +++ b/pkgs/applications/networking/p2p/tribler/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation { buildInputs = [ pythonPackages.python pythonPackages.wrapPython makeWrapper ]; pythonPath = - [ pythonPackages.wxPython pythonPackages.ssl pythonPackages.curses pythonPackages.apsw + [ pythonPackages.wxPython pythonPackages.curses pythonPackages.apsw pythonPackages.setuptools pythonPackages.m2crypto pythonPackages.sqlite3 ]; diff --git a/pkgs/applications/version-management/bazaar/default.nix b/pkgs/applications/version-management/bazaar/default.nix index 8eb28ea04c7..462aede3b1c 100644 --- a/pkgs/applications/version-management/bazaar/default.nix +++ b/pkgs/applications/version-management/bazaar/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { buildInputs = [ pythonPackages.python pythonPackages.wrapPython ]; # Readline support is needed by bzrtools. - pythonPath = [ pythonPackages.ssl pythonPackages.readline ]; + pythonPath = [ pythonPackages.readline ]; installPhase = '' python setup.py install --prefix=$out diff --git a/pkgs/applications/version-management/mercurial/default.nix b/pkgs/applications/version-management/mercurial/default.nix index 8381196196e..19c7c0e9f91 100644 --- a/pkgs/applications/version-management/mercurial/default.nix +++ b/pkgs/applications/version-management/mercurial/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, python, makeWrapper, docutils, unzip -, guiSupport ? false, tk ? null, ssl, curses }: +, guiSupport ? false, tk ? null, curses }: let name = "mercurial-2.0.2"; @@ -13,7 +13,7 @@ stdenv.mkDerivation { }; inherit python; # pass it so that the same version can be used in hg2git - pythonPackages = [ ssl curses ]; + pythonPackages = [ curses ]; buildInputs = [ python makeWrapper docutils unzip ]; @@ -35,7 +35,7 @@ stdenv.mkDerivation { '' for i in $(cd $out/bin && ls); do wrapProgram $out/bin/$i \ - --prefix PYTHONPATH : "$(toPythonPath "$out ${ssl} ${curses}")" \ + --prefix PYTHONPATH : "$(toPythonPath "$out ${curses}")" \ $WRAP_TK done diff --git a/pkgs/applications/virtualization/nova/client.nix b/pkgs/applications/virtualization/nova/client.nix index 84858c416c8..a05466f6b45 100644 --- a/pkgs/applications/virtualization/nova/client.nix +++ b/pkgs/applications/virtualization/nova/client.nix @@ -9,7 +9,7 @@ pythonPackages.buildPythonPackage rec { md5 = "c4be4adf371d1a84ce1581af365a53d0"; }; - pythonPath = [ pythonPackages.prettytable pythonPackages.argparse pythonPackages.httplib2 pythonPackages.ssl ]; + pythonPath = [ pythonPackages.prettytable pythonPackages.argparse pythonPackages.httplib2 ]; buildInputs = [ pythonPackages.mock pythonPackages.nose ]; diff --git a/pkgs/development/interpreters/python/2.7/default.nix b/pkgs/development/interpreters/python/2.7/default.nix index 1c8ae0cf171..635d50dc5b3 100644 --- a/pkgs/development/interpreters/python/2.7/default.nix +++ b/pkgs/development/interpreters/python/2.7/default.nix @@ -38,7 +38,7 @@ let buildInputs = optional (stdenv ? gcc && stdenv.gcc.libc != null) stdenv.gcc.libc ++ - [ bzip2 ] + [ bzip2 openssl ] ++ optional zlibSupport zlib ++ optionals stdenv.isDarwin [ darwinArchUtility darwinSwVersUtility ]; @@ -172,11 +172,6 @@ let deps = [ sqlite ]; }; - ssl = buildInternalPythonModule { - moduleName = "ssl"; - deps = [ openssl ]; - }; - tkinter = buildInternalPythonModule { moduleName = "tkinter"; deps = [ tcl tk x11 ]; diff --git a/pkgs/tools/networking/getmail/default.nix b/pkgs/tools/networking/getmail/default.nix index 23fe3ad3674..147a9673abf 100644 --- a/pkgs/tools/networking/getmail/default.nix +++ b/pkgs/tools/networking/getmail/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, buildPythonPackage, pythonPackages }: +{ stdenv, fetchurl, buildPythonPackage }: buildPythonPackage rec { name = "getmail-4.20.0"; @@ -9,8 +9,6 @@ buildPythonPackage rec { sha256 = "17cpyra61virk1d223w8pdwhv2qzhbwdbnrr1ab1znf4cv9m3knn"; }; - pythonPath = [ pythonPackages.ssl ]; - doCheck = false; installCommand = "python setup.py install --prefix=\"\$prefix\""; diff --git a/pkgs/tools/networking/offlineimap/default.nix b/pkgs/tools/networking/offlineimap/default.nix index 8f0dd8e9a6c..007c8f7c6e0 100644 --- a/pkgs/tools/networking/offlineimap/default.nix +++ b/pkgs/tools/networking/offlineimap/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, buildPythonPackage, ssl }: +{ fetchurl, buildPythonPackage }: buildPythonPackage { name = "offlineimap-6.2.0.2"; @@ -8,8 +8,6 @@ buildPythonPackage { sha256 = "1w69qv1dm37m53k8cd068lk5z3qjlscnjxr397gs8kdsfds67v7c"; }; - propagatedBuildInputs = [ ssl ]; - doCheck = false; meta = { diff --git a/pkgs/tools/networking/p2p/bit-tornado/default.nix b/pkgs/tools/networking/p2p/bit-tornado/default.nix index 52f4e0d7138..14e13a17559 100644 --- a/pkgs/tools/networking/p2p/bit-tornado/default.nix +++ b/pkgs/tools/networking/p2p/bit-tornado/default.nix @@ -1,5 +1,4 @@ -{stdenv,fetchurl,python, wxPython, makeWrapper, - ssl}: +{ stdenv,fetchurl,python, wxPython, makeWrapper }: stdenv.mkDerivation { name = "bit-tornado-0.3.18"; @@ -8,7 +7,7 @@ stdenv.mkDerivation { sha256 = "1q6rapidnizy8wawasirgyjl9s4lrm7mm740mc5q5sdjyl5svrnr"; }; - buildInputs = [python wxPython makeWrapper ssl]; + buildInputs = [ python wxPython makeWrapper ]; buildPhase = '' ''; installPhase = '' diff --git a/pkgs/tools/networking/s3cmd/default.nix b/pkgs/tools/networking/s3cmd/default.nix index 4b12ce4c598..83a8b4cafef 100644 --- a/pkgs/tools/networking/s3cmd/default.nix +++ b/pkgs/tools/networking/s3cmd/default.nix @@ -10,8 +10,6 @@ stdenv.mkDerivation rec { buildInputs = [ pythonPackages.python pythonPackages.wrapPython ]; - pythonPath = [ pythonPackages.ssl ]; - installPhase = '' python setup.py install --prefix=$out diff --git a/pkgs/tools/virtualization/euca2ools/default.nix b/pkgs/tools/virtualization/euca2ools/default.nix index b82f7de1b2a..7992ced6d0c 100644 --- a/pkgs/tools/virtualization/euca2ools/default.nix +++ b/pkgs/tools/virtualization/euca2ools/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { buildInputs = [ which pythonPackages.python pythonPackages.wrapPython ]; # We need boto 1.9 for now. See https://bugs.launchpad.net/euca2ools/devel/+bug/623888 - pythonPath = [ pythonPackages.setuptools pythonPackages.boto_1_9 pythonPackages.m2crypto pythonPackages.ssl ]; + pythonPath = [ pythonPackages.setuptools pythonPackages.boto_1_9 pythonPackages.m2crypto ]; preBuild = '' diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 99e565bb00a..ddaf60985a5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -458,9 +458,7 @@ let gui = true; }; - bittornado = callPackage ../tools/networking/p2p/bit-tornado { - inherit (pythonPackages) ssl; - }; + bittornado = callPackage ../tools/networking/p2p/bit-tornado { }; blueman = callPackage ../tools/bluetooth/blueman { inherit (pythonPackages) notify; @@ -1110,9 +1108,7 @@ let odt2txt = callPackage ../tools/text/odt2txt { }; - offlineimap = callPackage ../tools/networking/offlineimap { - ssl = pythonPackages.ssl; - }; + offlineimap = callPackage ../tools/networking/offlineimap { }; opendbx = callPackage ../development/libraries/opendbx { }; @@ -7005,7 +7001,7 @@ let }; mercurial = callPackage ../applications/version-management/mercurial { - inherit (pythonPackages) ssl curses; + inherit (pythonPackages) curses; guiSupport = false; # use mercurialFull to get hgk GUI }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 8f912ce4abb..ec80fd58a02 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -554,7 +554,7 @@ let pythonPackages = python.modules // rec { buildInputs = [ nose mox ]; - propagatedBuildInputs = [ gflags sqlalchemy webob routes eventlet python.modules.ssl ]; + propagatedBuildInputs = [ gflags sqlalchemy webob routes eventlet ]; PYTHON_EGG_CACHE = "`pwd`/.egg-cache"; From 5fb49018862dc3107ac2cc6ea0b4634dddfbc40b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Thu, 23 Feb 2012 00:47:17 +0000 Subject: [PATCH 116/197] GCC 4.6: Really disable stripping when `stripped' is false. svn path=/nixpkgs/branches/stdenv-updates/; revision=32501 --- pkgs/development/compilers/gcc/4.6/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/compilers/gcc/4.6/default.nix b/pkgs/development/compilers/gcc/4.6/default.nix index bd9ad426f45..30b6476c553 100644 --- a/pkgs/development/compilers/gcc/4.6/default.nix +++ b/pkgs/development/compilers/gcc/4.6/default.nix @@ -412,7 +412,7 @@ stdenv.mkDerivation ({ installTargets = "install-gcc install-target-libgcc"; } -// optionalAttrs (!stripped) { dontStrip = true; } +// optionalAttrs (!stripped) { dontStrip = true; NIX_STRIP_DEBUG = 0; } // optionalAttrs langVhdl rec { name = "ghdl-0.29"; From 79232c5f54c47e8359262601243d2878e2ab5512 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Thu, 23 Feb 2012 00:47:31 +0000 Subject: [PATCH 117/197] GCC 4.6: Enable plug-in support by default. svn path=/nixpkgs/branches/stdenv-updates/; revision=32502 --- pkgs/development/compilers/gcc/4.6/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/compilers/gcc/4.6/default.nix b/pkgs/development/compilers/gcc/4.6/default.nix index 30b6476c553..09f5396216d 100644 --- a/pkgs/development/compilers/gcc/4.6/default.nix +++ b/pkgs/development/compilers/gcc/4.6/default.nix @@ -19,7 +19,7 @@ , libXrandr ? null, libXi ? null, inputproto ? null, randrproto ? null , gnatboot ? null , enableMultilib ? false -, enablePlugin ? false +, enablePlugin ? true # whether to support user-supplied plug-ins , name ? "gcc" , cross ? null , binutilsCross ? null From 584ccabaac181f1f01c39bff5291612e111baf4e Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Sat, 25 Feb 2012 20:52:15 +0000 Subject: [PATCH 118/197] svn merge ^/nixpkgs/trunk svn path=/nixpkgs/branches/stdenv-updates/; revision=32569 --- .../tools/package-management/nix/unstable.nix | 6 +- .../amazon-ec2-ami-tools/default.nix | 4 +- .../amazon-ec2-ami-tools/writable.patch | 56 ++++++++----------- 3 files changed, 29 insertions(+), 37 deletions(-) diff --git a/pkgs/tools/package-management/nix/unstable.nix b/pkgs/tools/package-management/nix/unstable.nix index 175ae069382..7ad69e8353a 100644 --- a/pkgs/tools/package-management/nix/unstable.nix +++ b/pkgs/tools/package-management/nix/unstable.nix @@ -4,7 +4,7 @@ , stateDir ? "/nix/var" }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (rec { name = "nix-1.0pre31851"; src = fetchurl { @@ -51,4 +51,6 @@ stdenv.mkDerivation rec { homepage = http://nixos.org/; license = "LGPLv2+"; }; -} +} // stdenv.lib.optionalAttrs stdenv.isDarwin { + phases = "$prePhases unpackPhase patchPhase $preConfigurePhases configurePhase $preBuildPhases buildPhase $preInstallPhases installPhase checkPhase fixupPhase $preDistPhases distPhase $postPhases"; +}) diff --git a/pkgs/tools/virtualization/amazon-ec2-ami-tools/default.nix b/pkgs/tools/virtualization/amazon-ec2-ami-tools/default.nix index d582609478b..d40fec073a7 100644 --- a/pkgs/tools/virtualization/amazon-ec2-ami-tools/default.nix +++ b/pkgs/tools/virtualization/amazon-ec2-ami-tools/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, unzip, ruby, openssl, makeWrapper }: stdenv.mkDerivation { - name = "ec2-ami-tools-1.4.0.1"; + name = "ec2-ami-tools-1.4.0.5"; buildInputs = [ unzip makeWrapper ]; src = fetchurl { url = http://s3.amazonaws.com/ec2-downloads/ec2-ami-tools.zip; - sha256 = "1fjg3gx5k0z8r4apg5whz3yxc3xnz7z5g6j93hf765lfriz1rccz"; + sha256 = "0vhdqmi076ipqj05dd7fn0drbhcvzccdcdhy8br9sp684scg9a75"; }; # Amazon EC2 requires that disk images are writable. If they're diff --git a/pkgs/tools/virtualization/amazon-ec2-ami-tools/writable.patch b/pkgs/tools/virtualization/amazon-ec2-ami-tools/writable.patch index c8d0597b479..54c2228911e 100644 --- a/pkgs/tools/virtualization/amazon-ec2-ami-tools/writable.patch +++ b/pkgs/tools/virtualization/amazon-ec2-ami-tools/writable.patch @@ -1,33 +1,23 @@ -diff -rc --exclude '*~' ec2-ami-tools-1.3-45758-orig/lib/ec2/amitools/bundle.rb ec2-ami-tools-1.3-45758/lib/ec2/amitools/bundle.rb -*** ec2-ami-tools-1.3-45758-orig/lib/ec2/amitools/bundle.rb 2009-12-02 22:28:44.000000000 +0100 ---- ec2-ami-tools-1.3-45758/lib/ec2/amitools/bundle.rb 2010-01-22 16:16:13.000000000 +0100 -*************** -*** 80,86 **** - # piped via several processes. The tee is used to allow a - # digest of the file to be calculated without having to re-read - # it from disk. -! tar = EC2::Platform::Current::Tar::Command.new.create.dereference.sparse - tar.add(File::basename( image_file ), File::dirname( image_file )) - openssl = EC2::Platform::Current::Constants::Utility::OPENSSL - pipeline = EC2::Platform::Current::Pipeline.new('image-bundle-pipeline', debug) ---- 80,86 ---- - # piped via several processes. The tee is used to allow a - # digest of the file to be calculated without having to re-read - # it from disk. -! tar = EC2::Platform::Current::Tar::Command.new.create.dereference.sparse.writable - tar.add(File::basename( image_file ), File::dirname( image_file )) - openssl = EC2::Platform::Current::Constants::Utility::OPENSSL - pipeline = EC2::Platform::Current::Pipeline.new('image-bundle-pipeline', debug) -diff -rc --exclude '*~' ec2-ami-tools-1.3-45758-orig/lib/ec2/platform/linux/tar.rb ec2-ami-tools-1.3-45758/lib/ec2/platform/linux/tar.rb -*** ec2-ami-tools-1.3-45758-orig/lib/ec2/platform/linux/tar.rb 2009-12-02 22:28:44.000000000 +0100 ---- ec2-ami-tools-1.3-45758/lib/ec2/platform/linux/tar.rb 2010-01-22 16:16:11.000000000 +0100 -*************** -*** 31,36 **** ---- 31,37 ---- - def update; @options << '-u'; self; end - def sparse; @options << '-S'; self; end - def dereference; @options << '-h'; self; end -+ def writable; @options << '--mode=0755'; self; end - - def archive(filename) - filename = '-' if filename.nil? +diff -ru ec2-ami-tools-1.4.0.5-orig/lib/ec2/amitools/bundle.rb ec2-ami-tools-1.4.0.5/lib/ec2/amitools/bundle.rb +--- ec2-ami-tools-1.4.0.5-orig/lib/ec2/amitools/bundle.rb 2011-12-06 14:57:28.000000000 +0100 ++++ ec2-ami-tools-1.4.0.5/lib/ec2/amitools/bundle.rb 2012-02-25 21:24:57.682427268 +0100 +@@ -80,7 +80,7 @@ + # piped via several processes. The tee is used to allow a + # digest of the file to be calculated without having to re-read + # it from disk. +- tar = EC2::Platform::Current::Tar::Command.new.create.dereference.sparse ++ tar = EC2::Platform::Current::Tar::Command.new.create.dereference.sparse.writable + tar.owner(0).group(0) + tar.add(File::basename( image_file ), File::dirname( image_file )) + openssl = EC2::Platform::Current::Constants::Utility::OPENSSL +diff -ru ec2-ami-tools-1.4.0.5-orig/lib/ec2/platform/linux/tar.rb ec2-ami-tools-1.4.0.5/lib/ec2/platform/linux/tar.rb +--- ec2-ami-tools-1.4.0.5-orig/lib/ec2/platform/linux/tar.rb 2011-12-06 14:57:28.000000000 +0100 ++++ ec2-ami-tools-1.4.0.5/lib/ec2/platform/linux/tar.rb 2012-02-25 21:23:36.342716403 +0100 +@@ -31,6 +31,7 @@ + def update; @options << '-u'; self; end + def sparse; @options << '-S'; self; end + def dereference; @options << '-h'; self; end ++ def writable; @options << '--mode=0755'; self; end + + def archive(filename) + filename = '-' if filename.nil? From 183d05a0d7a563218de37a983f68c8efb6b858dc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Sun, 26 Feb 2012 11:27:45 +0000 Subject: [PATCH 119/197] Setting the cmake build type Release in its setup-hook, for all cmake projects to be built in Release by default. Some packages were not getting optimisation flags, like rigsofrods. svn path=/nixpkgs/branches/stdenv-updates/; revision=32574 --- pkgs/development/tools/build-managers/cmake/setup-hook.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/tools/build-managers/cmake/setup-hook.sh b/pkgs/development/tools/build-managers/cmake/setup-hook.sh index 802c7343a85..32e0b76f608 100755 --- a/pkgs/development/tools/build-managers/cmake/setup-hook.sh +++ b/pkgs/development/tools/build-managers/cmake/setup-hook.sh @@ -37,7 +37,8 @@ cmakeConfigurePhase() { fi # Avoid cmake resetting the rpath of binaries, on make install - cmakeFlags="-DCMAKE_SKIP_BUILD_RPATH=ON $cmakeFlags" + # And build always Release, to ensure optimisation flags + cmakeFlags="-DCMAKE_BUILD_TYPE=Release -DCMAKE_SKIP_BUILD_RPATH=ON $cmakeFlags" echo "cmake flags: $cmakeFlags ${cmakeFlagsArray[@]}" From e1c8ab095cf6272fa82906cd5cfab3e6c029ac25 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Sun, 26 Feb 2012 16:04:57 +0000 Subject: [PATCH 120/197] Removing a duplicated line so the hydra stdenv evaluation can go. svn path=/nixpkgs/branches/stdenv-updates/; revision=32576 --- pkgs/applications/version-management/kdesvn/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/applications/version-management/kdesvn/default.nix b/pkgs/applications/version-management/kdesvn/default.nix index 6a00d76383c..7761c45850e 100644 --- a/pkgs/applications/version-management/kdesvn/default.nix +++ b/pkgs/applications/version-management/kdesvn/default.nix @@ -25,6 +25,5 @@ stdenv.mkDerivation rec { homepage = http://kdesvn.alwins-world.de; maintainers = [ stdenv.lib.maintainers.sander ]; inherit (kdelibs.meta) platforms; - inherit (kdelibs.meta) platforms; }; } From be815e7639d819f2d899367c09356c30603ed2f7 Mon Sep 17 00:00:00 2001 From: Florian Friesdorf Date: Sun, 26 Feb 2012 17:22:50 +0000 Subject: [PATCH 121/197] add an openssl mirror url as primary is currently down svn path=/nixpkgs/branches/stdenv-updates/; revision=32578 --- pkgs/development/libraries/openssl/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix index 4df3b713e29..1a4767916f8 100644 --- a/pkgs/development/libraries/openssl/default.nix +++ b/pkgs/development/libraries/openssl/default.nix @@ -32,7 +32,10 @@ stdenv.mkDerivation { inherit name; src = fetchurl { - url = "http://www.openssl.org/source/${name}.tar.gz"; + urls = [ + "http://www.openssl.org/source/${name}.tar.gz" + "http://openssl.linux-mirror.org/source/${name}.tar.gz" + ]; sha1 = "2b517baada2338663c27314cb922f9755e73e07f"; }; From cb1009a3fbede346c44aabd2d16444f8c1a03f62 Mon Sep 17 00:00:00 2001 From: Florian Friesdorf Date: Sun, 26 Feb 2012 17:22:55 +0000 Subject: [PATCH 122/197] python site.py that loads pth files anywhere on PYTHONPATH This file is normally created by easy_install / distutils, but removed and packaged separately to avoid collisions and allow for more use cases. svn path=/nixpkgs/branches/stdenv-updates/; revision=32579 --- .../python-modules/site/default.nix | 33 ++++++++ pkgs/development/python-modules/site/site.py | 82 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 6 ++ 3 files changed, 121 insertions(+) create mode 100644 pkgs/development/python-modules/site/default.nix create mode 100644 pkgs/development/python-modules/site/site.py diff --git a/pkgs/development/python-modules/site/default.nix b/pkgs/development/python-modules/site/default.nix new file mode 100644 index 00000000000..98a14850dbe --- /dev/null +++ b/pkgs/development/python-modules/site/default.nix @@ -0,0 +1,33 @@ +{ stdenv, python }: + +stdenv.mkDerivation rec { + name = "site-1.0"; + + unpackPhase = "true"; + + buildInputs = [ python ]; + + installPhase = + '' + dst=$out/lib/${python.libPrefix}/site-packages + mkdir -p $dst + cat ${./site.py} >> $dst/site.py + ''; + + meta = { + description = "Enable processing of pth files anywhere in PYTHONPATH"; + longDescription = '' + This file is normally created by easy_install / distutils in + site-packages and overrides python's default site.py. It adds + all parts of PYTHONPATH as site directories, which means pth + files are processed in them. We remove the normally created + site.py's and package it separately instead as it would cause + collisions. + + For each module we have a pth file listing the module and all + its dependencies and we include python-site into the + PYTHONPATH of wrapped python programs so they can find their + dependencies. + ''; + }; +} diff --git a/pkgs/development/python-modules/site/site.py b/pkgs/development/python-modules/site/site.py new file mode 100644 index 00000000000..b233222e1f6 --- /dev/null +++ b/pkgs/development/python-modules/site/site.py @@ -0,0 +1,82 @@ +def __boot(): + import sys, imp, os, os.path + PYTHONPATH = os.environ.get('PYTHONPATH') + if PYTHONPATH is None or (sys.platform=='win32' and not PYTHONPATH): + PYTHONPATH = [] + else: + PYTHONPATH = PYTHONPATH.split(os.pathsep) + + pic = getattr(sys,'path_importer_cache',{}) + stdpath = sys.path[len(PYTHONPATH):] + mydir = os.path.dirname(__file__) + #print "searching",stdpath,sys.path + + for item in stdpath: + if item==mydir or not item: + continue # skip if current dir. on Windows, or my own directory + importer = pic.get(item) + if importer is not None: + loader = importer.find_module('site') + if loader is not None: + # This should actually reload the current module + loader.load_module('site') + break + else: + try: + stream, path, descr = imp.find_module('site',[item]) + except ImportError: + continue + if stream is None: + continue + try: + # This should actually reload the current module + imp.load_module('site',stream,path,descr) + finally: + stream.close() + break + else: + raise ImportError("Couldn't find the real 'site' module") + + #print "loaded", __file__ + + known_paths = dict([(makepath(item)[1],1) for item in sys.path]) # 2.2 comp + + oldpos = getattr(sys,'__egginsert',0) # save old insertion position + sys.__egginsert = 0 # and reset the current one + + for item in PYTHONPATH: + addsitedir(item) + + sys.__egginsert += oldpos # restore effective old position + + d,nd = makepath(stdpath[0]) + insert_at = None + new_path = [] + + for item in sys.path: + p,np = makepath(item) + + if np==nd and insert_at is None: + # We've hit the first 'system' path entry, so added entries go here + insert_at = len(new_path) + + if np in known_paths or insert_at is None: + new_path.append(item) + else: + # new path after the insert point, back-insert it + new_path.insert(insert_at, item) + insert_at += 1 + + sys.path[:] = new_path + +if __name__=='site': + __boot() + del __boot + + + + + + + + diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index ec80fd58a02..cb33d056418 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -19,6 +19,12 @@ let pythonPackages = python.modules // rec { }; + site = import ../development/python-modules/site { + inherit (pkgs) stdenv; + inherit python; + }; + + ipython = import ../shells/ipython { inherit (pkgs) stdenv fetchurl; inherit buildPythonPackage pythonPackages; From 6ccd671e5b8423d4af66c83447b4190fa51562e9 Mon Sep 17 00:00:00 2001 From: Florian Friesdorf Date: Sun, 26 Feb 2012 17:22:59 +0000 Subject: [PATCH 123/197] pth file with deps, only current package's scripts, no colliding files svn path=/nixpkgs/branches/stdenv-updates/; revision=32580 --- .../python-modules/generic/default.nix | 28 +++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/pkgs/development/python-modules/generic/default.nix b/pkgs/development/python-modules/generic/default.nix index 4e0b6100231..210c75accee 100644 --- a/pkgs/development/python-modules/generic/default.nix +++ b/pkgs/development/python-modules/generic/default.nix @@ -17,9 +17,33 @@ # pollute the user environment. pythonPath ? [] + # distutils registers dependencies in .pth (good) but also creates + # console_scripts for dependencies in bin/ (bad). easy_install + # creates no scripts for dependencies (good) but does not register + # them in pth neither (bad) - the combination gives us a pth with + # dependencies and scripts only for the package we are currently + # installing. , installCommand ? '' + # install the current package with easy_install.pth including dependencies + python setup.py install --prefix="$out" + + # remove console_scripts again, because they were created for deps, too + rm -Rf "$out"/bin + + # run easy_install to generate scripts for the current package, + # it won't reinstall easy_install --prefix="$out" . + + # move colliding easy_install.pth to specifically named one + mv "$out/lib/${python.libPrefix}/site-packages/"{easy-install.pth,${name}.pth} + + # These cause collisions and our output is not a site anyway + # If you need a site, install python-site + rm -f "$out/lib/${python.libPrefix}/site-packages/"site.py* + + # If setuptools is a dependency, it is included in $(name}.pth + rm -f "$out/lib/${python.libPrefix}/site-packages/setuptools.pth" '' , buildPhase ? "true" @@ -67,6 +91,10 @@ python.stdenv.mkDerivation (attrs // { # dependencies in the user environment (since Python modules don't # have something like an RPATH, so the only way to find the # dependencies is to have them in the PYTHONPATH variable). + # + # XXX: this is not needed for things to work (pth pulls in deps) + # but would be nice to have anyway - However, python deps end up + # in propagated-build-native-inputs if test -e $out/nix-support/propagated-build-inputs; then ln -s $out/nix-support/propagated-build-inputs $out/nix-support/propagated-user-env-packages fi From 8adcbec448ba0ae081f127992fc076ec9a8d6027 Mon Sep 17 00:00:00 2001 From: Florian Friesdorf Date: Sun, 26 Feb 2012 17:23:02 +0000 Subject: [PATCH 124/197] clean setuptools from colliding files - it is not using buildPythonPkg svn path=/nixpkgs/branches/stdenv-updates/; revision=32581 --- pkgs/development/python-modules/setuptools/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/python-modules/setuptools/default.nix b/pkgs/development/python-modules/setuptools/default.nix index 50b73aaf8f6..97e77a279d3 100644 --- a/pkgs/development/python-modules/setuptools/default.nix +++ b/pkgs/development/python-modules/setuptools/default.nix @@ -18,6 +18,9 @@ stdenv.mkDerivation rec { mkdir -p $dst PYTHONPATH=$dst:$PYTHONPATH python setup.py install --prefix=$out + # remove generic files, leave setuptools.pth + rm $dst/site.py* + rm $dst/easy-install.pth wrapPythonPrograms ''; From ccb34b093fd370d8886d9325ca81f84e720112f2 Mon Sep 17 00:00:00 2001 From: Florian Friesdorf Date: Sun, 26 Feb 2012 17:23:05 +0000 Subject: [PATCH 125/197] include site for python wrappers to enable deps via pth files svn path=/nixpkgs/branches/stdenv-updates/; revision=32582 --- pkgs/development/python-modules/generic/default.nix | 5 +++-- pkgs/development/python-modules/setuptools/default.nix | 6 +++--- pkgs/top-level/python-packages.nix | 4 ++-- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/generic/default.nix b/pkgs/development/python-modules/generic/default.nix index 210c75accee..781fc273de4 100644 --- a/pkgs/development/python-modules/generic/default.nix +++ b/pkgs/development/python-modules/generic/default.nix @@ -3,7 +3,7 @@ (http://pypi.python.org/pypi/setuptools/), which represents a large number of Python packages nowadays. */ -{ python, setuptools, wrapPython, lib }: +{ python, setuptools, wrapPython, lib, site }: { name, namePrefix ? "python-" @@ -69,7 +69,8 @@ python.stdenv.mkDerivation (attrs // { buildInputs = [ python wrapPython setuptools ] ++ buildInputs ++ pythonPath; - pythonPath = [ setuptools] ++ pythonPath; + # XXX: I think setuptools is not needed here + pythonPath = [ setuptools site ] ++ pythonPath; # XXX: Should we run `easy_install --always-unzip'? It doesn't seem # to have a noticeable impact on small scripts. diff --git a/pkgs/development/python-modules/setuptools/default.nix b/pkgs/development/python-modules/setuptools/default.nix index 97e77a279d3..c478c25a2fa 100644 --- a/pkgs/development/python-modules/setuptools/default.nix +++ b/pkgs/development/python-modules/setuptools/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, python, wrapPython }: +{ stdenv, fetchurl, python, wrapPython, site }: stdenv.mkDerivation rec { name = "setuptools-0.6c11"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "1lx1hwxkhipyh206bgl90ddnfcnb68bzcvyawczbf833fadyl3v3"; }; - buildInputs = [ python wrapPython ]; + buildInputs = [ python wrapPython site ]; buildPhase = "python setup.py build --build-base $out"; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { # remove generic files, leave setuptools.pth rm $dst/site.py* rm $dst/easy-install.pth - wrapPythonPrograms + pythonPath=${site} wrapPythonPrograms ''; doCheck = false; # doesn't work with Python 2.7 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index cb33d056418..5abc9bc8020 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -9,13 +9,13 @@ let pythonPackages = python.modules // rec { buildPythonPackage = import ../development/python-modules/generic { inherit (pkgs) lib; - inherit python wrapPython setuptools; + inherit python wrapPython setuptools site; }; setuptools = import ../development/python-modules/setuptools { inherit (pkgs) stdenv fetchurl; - inherit python wrapPython; + inherit python wrapPython site; }; From d52e2c7c4133ddeb53600330e4313030c4ac232a Mon Sep 17 00:00:00 2001 From: Florian Friesdorf Date: Sun, 26 Feb 2012 17:23:09 +0000 Subject: [PATCH 126/197] prevent distutils during module install from downloading and load pth files MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit based on a patch by Cillian de Róiste svn path=/nixpkgs/branches/stdenv-updates/; revision=32583 --- .../python-modules/generic/default.nix | 11 +++++++++- .../offline-distutils/default.nix | 21 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 6 +++++- 3 files changed, 36 insertions(+), 2 deletions(-) create mode 100644 pkgs/development/python-modules/offline-distutils/default.nix diff --git a/pkgs/development/python-modules/generic/default.nix b/pkgs/development/python-modules/generic/default.nix index 781fc273de4..50653d1abc4 100644 --- a/pkgs/development/python-modules/generic/default.nix +++ b/pkgs/development/python-modules/generic/default.nix @@ -3,7 +3,7 @@ (http://pypi.python.org/pypi/setuptools/), which represents a large number of Python packages nowadays. */ -{ python, setuptools, wrapPython, lib, site }: +{ python, setuptools, wrapPython, lib, site, offlineDistutils }: { name, namePrefix ? "python-" @@ -69,6 +69,15 @@ python.stdenv.mkDerivation (attrs // { buildInputs = [ python wrapPython setuptools ] ++ buildInputs ++ pythonPath; + configurePhase = '' + # do not allow distutils to make downloads, whatever install command is used + export PYTHONPATH="${setuptools}/lib/${python.libPrefix}:$PYTHONPATH" + export PYTHONPATH="${offlineDistutils}/lib/${python.libPrefix}:$PYTHONPATH" + + # enable pth files for dependencies + export PYTHONPATH="${site}/lib/${python.libPrefix}/site-packages:$PYTHONPATH" + ''; + # XXX: I think setuptools is not needed here pythonPath = [ setuptools site ] ++ pythonPath; diff --git a/pkgs/development/python-modules/offline-distutils/default.nix b/pkgs/development/python-modules/offline-distutils/default.nix new file mode 100644 index 00000000000..2ed41b08bb7 --- /dev/null +++ b/pkgs/development/python-modules/offline-distutils/default.nix @@ -0,0 +1,21 @@ +# Used during module installation to prevent easy_install and python +# setup.py install/test from downloading + +{ stdenv, python }: + +stdenv.mkDerivation { + name = "python-offline-distutils-${python.version}"; + + buildInputs = [ python ]; + + unpackPhase = "true"; + installPhase = '' + dst="$out/lib/${python.libPrefix}" + ensureDir $dst/distutils + ln -s ${python}/lib/${python.libPrefix}/distutils/* $dst/distutils/ + cat < $dst/distutils/distutils.cfg +[easy_install] +allow-hosts = None +EOF + ''; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 5abc9bc8020..b8d26e94a9a 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -9,7 +9,7 @@ let pythonPackages = python.modules // rec { buildPythonPackage = import ../development/python-modules/generic { inherit (pkgs) lib; - inherit python wrapPython setuptools site; + inherit python wrapPython setuptools site offlineDistutils; }; @@ -24,6 +24,10 @@ let pythonPackages = python.modules // rec { inherit python; }; + offlineDistutils = import ../development/python-modules/offline-distutils { + inherit (pkgs) stdenv; + inherit python; + }; ipython = import ../shells/ipython { inherit (pkgs) stdenv fetchurl; From 59d4678e8319320b9b5ccd304b1034188c02ae61 Mon Sep 17 00:00:00 2001 From: Florian Friesdorf Date: Sun, 26 Feb 2012 17:23:13 +0000 Subject: [PATCH 127/197] insert pth eggs at index of site-packages they come from thx Rok Garbas! svn path=/nixpkgs/branches/stdenv-updates/; revision=32584 --- pkgs/development/python-modules/site/site.py | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/site/site.py b/pkgs/development/python-modules/site/site.py index b233222e1f6..073484727db 100644 --- a/pkgs/development/python-modules/site/site.py +++ b/pkgs/development/python-modules/site/site.py @@ -45,6 +45,7 @@ def __boot(): sys.__egginsert = 0 # and reset the current one for item in PYTHONPATH: + sys.__egginsert = sys.path.index(os.path.abspath(item)) addsitedir(item) sys.__egginsert += oldpos # restore effective old position From 8e32380a79eba3c55bdc97e3f0296f08a3d49d0e Mon Sep 17 00:00:00 2001 From: Florian Friesdorf Date: Sun, 26 Feb 2012 17:23:16 +0000 Subject: [PATCH 128/197] add PSFL, update python meta (license, maintainers, unify description) svn path=/nixpkgs/branches/stdenv-updates/; revision=32585 --- pkgs/development/interpreters/python/2.6/default.nix | 6 +++--- pkgs/development/interpreters/python/2.7/default.nix | 6 +++--- pkgs/development/interpreters/python/3.1/default.nix | 5 +++-- pkgs/development/interpreters/python/3.2/default.nix | 4 ++-- pkgs/lib/licenses.nix | 6 ++++++ 5 files changed, 17 insertions(+), 10 deletions(-) diff --git a/pkgs/development/interpreters/python/2.6/default.nix b/pkgs/development/interpreters/python/2.6/default.nix index 4a3c292412f..3ae16d26d61 100644 --- a/pkgs/development/interpreters/python/2.6/default.nix +++ b/pkgs/development/interpreters/python/2.6/default.nix @@ -75,7 +75,7 @@ let meta = { homepage = "http://python.org"; - description = "Python -- a high-level dynamically-typed programming language"; + description = "a high-level dynamically-typed programming language"; longDescription = '' Python is a remarkably powerful dynamic programming language that is used in a wide variety of application domains. Some of its key @@ -85,9 +85,9 @@ let hierarchical packages; exception-based error handling; and very high level dynamic data types. ''; - license = "GPLv2"; + license = stdenv.lib.licenses.psfl; platforms = stdenv.lib.platforms.all; - maintainers = [ stdenv.lib.maintainers.simons ]; + maintainers = with stdenv.lib.maintainers; [ simons chaoflow ]; }; }; diff --git a/pkgs/development/interpreters/python/2.7/default.nix b/pkgs/development/interpreters/python/2.7/default.nix index 635d50dc5b3..968a4859aed 100644 --- a/pkgs/development/interpreters/python/2.7/default.nix +++ b/pkgs/development/interpreters/python/2.7/default.nix @@ -89,7 +89,7 @@ let meta = { homepage = "http://python.org"; - description = "Python -- a high-level dynamically-typed programming language"; + description = "a high-level dynamically-typed programming language"; longDescription = '' Python is a remarkably powerful dynamic programming language that is used in a wide variety of application domains. Some of its key @@ -99,9 +99,9 @@ let hierarchical packages; exception-based error handling; and very high level dynamic data types. ''; - license = "GPLv2"; + license = stdenv.lib.licenses.psfl; platforms = stdenv.lib.platforms.all; - maintainers = [ stdenv.lib.maintainers.simons ]; + maintainers = with stdenv.lib.maintainers; [ simons chaoflow ]; }; }; diff --git a/pkgs/development/interpreters/python/3.1/default.nix b/pkgs/development/interpreters/python/3.1/default.nix index e0c8ac0e1c3..892af52a919 100644 --- a/pkgs/development/interpreters/python/3.1/default.nix +++ b/pkgs/development/interpreters/python/3.1/default.nix @@ -80,8 +80,9 @@ stdenv.mkDerivation { hierarchical packages; exception-based error handling; and very high level dynamic data types. ''; - license = "GPLv2"; + license = stdenv.lib.licenses.psfl; platforms = stdenv.lib.platforms.all; - maintainers = [ stdenv.lib.maintainers.simons ]; + maintainers = with stdenv.lib.maintainers; [ simons chaoflow ]; }; + } diff --git a/pkgs/development/interpreters/python/3.2/default.nix b/pkgs/development/interpreters/python/3.2/default.nix index c0c2a6e422a..1ab115f0469 100644 --- a/pkgs/development/interpreters/python/3.2/default.nix +++ b/pkgs/development/interpreters/python/3.2/default.nix @@ -79,8 +79,8 @@ stdenv.mkDerivation { hierarchical packages; exception-based error handling; and very high level dynamic data types. ''; - license = "GPLv2"; + license = stdenv.lib.licenses.psfl; platforms = stdenv.lib.platforms.all; - maintainers = [ stdenv.lib.maintainers.simons ]; + maintainers = with stdenv.lib.maintainers; [ simons chaoflow ]; }; } diff --git a/pkgs/lib/licenses.nix b/pkgs/lib/licenses.nix index edfa057be7b..dc88f887cc7 100644 --- a/pkgs/lib/licenses.nix +++ b/pkgs/lib/licenses.nix @@ -165,6 +165,12 @@ fullname = "Public Domain"; }; + psfl = { + shortName = "PSFL"; + fullName = "Python Software Foundation License"; + url = http://docs.python.org/license.html; + }; + proprietary = { shortName = "Proprietary"; fullName = "Proprietary (non redistributable) license"; From 0f81888e091f3e5788bdb711809abd7acde080a3 Mon Sep 17 00:00:00 2001 From: Florian Friesdorf Date: Sun, 26 Feb 2012 17:23:20 +0000 Subject: [PATCH 129/197] meta for offline-distutils svn path=/nixpkgs/branches/stdenv-updates/; revision=32586 --- .../python-modules/offline-distutils/default.nix | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/pkgs/development/python-modules/offline-distutils/default.nix b/pkgs/development/python-modules/offline-distutils/default.nix index 2ed41b08bb7..d325e23a9d6 100644 --- a/pkgs/development/python-modules/offline-distutils/default.nix +++ b/pkgs/development/python-modules/offline-distutils/default.nix @@ -18,4 +18,17 @@ stdenv.mkDerivation { allow-hosts = None EOF ''; + + meta = { + description = "distutils configured to disallow downloads"; + longDescription = '' + A normal distutils with added distutils.cfg to set allow-hosts + to None. This dissallows easy_install to download any packages. + It is used by buildPythonPackage to ensure that no packages are + downloaded during build/test/install. + ''; + license = stdenv.lib.licenses.psfl; + platforms = stdenv.lib.platforms.all; + maintainers = with stdenv.lib.maintainers; [ simons chaoflow ]; + }; } From 09ae58fcd71b988e797b136818b65a64b430426c Mon Sep 17 00:00:00 2001 From: Florian Friesdorf Date: Sun, 26 Feb 2012 17:23:22 +0000 Subject: [PATCH 130/197] python wrapper comment svn path=/nixpkgs/branches/stdenv-updates/; revision=32587 --- pkgs/development/interpreters/python/wrapper.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/interpreters/python/wrapper.nix b/pkgs/development/interpreters/python/wrapper.nix index 727b9cbc676..fec07c0aff5 100644 --- a/pkgs/development/interpreters/python/wrapper.nix +++ b/pkgs/development/interpreters/python/wrapper.nix @@ -1,3 +1,6 @@ +# Create a python that knows about additional python packages via +# PYTHONPATH + {stdenv, python, makeWrapper, extraLibs ? []}: stdenv.mkDerivation { From fe9d9530bab40f07fbad31bcaa671dcddb3a8123 Mon Sep 17 00:00:00 2001 From: Florian Friesdorf Date: Sun, 26 Feb 2012 17:23:25 +0000 Subject: [PATCH 131/197] symlink python manpage for pythonXYFull svn path=/nixpkgs/branches/stdenv-updates/; revision=32588 --- pkgs/development/interpreters/python/wrapper.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/interpreters/python/wrapper.nix b/pkgs/development/interpreters/python/wrapper.nix index fec07c0aff5..e8e343976bc 100644 --- a/pkgs/development/interpreters/python/wrapper.nix +++ b/pkgs/development/interpreters/python/wrapper.nix @@ -14,6 +14,8 @@ stdenv.mkDerivation { for prg in 2to3 idle pydoc python python-config python${python.majorVersion} python${python.majorVersion}-config smtpd.py; do makeWrapper "$python/bin/$prg" "$out/bin/$prg" --suffix PYTHONPATH : "$PYTHONPATH" done + ensureDir "$out/share" + ln "$python/share/man" "$out/share/man" -s ''; inherit python; From 95f0b6119caa8b811c8bad2cc32091c1459602bd Mon Sep 17 00:00:00 2001 From: Florian Friesdorf Date: Sun, 26 Feb 2012 17:23:28 +0000 Subject: [PATCH 132/197] do not propagate makeWrapper via pythonXYFull svn path=/nixpkgs/branches/stdenv-updates/; revision=32589 --- pkgs/development/interpreters/python/wrapper.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/interpreters/python/wrapper.nix b/pkgs/development/interpreters/python/wrapper.nix index e8e343976bc..0522a47d17b 100644 --- a/pkgs/development/interpreters/python/wrapper.nix +++ b/pkgs/development/interpreters/python/wrapper.nix @@ -6,7 +6,8 @@ stdenv.mkDerivation { name = "python-${python.version}-wrapper"; - propagatedBuildInputs = [python makeWrapper] ++ extraLibs; + buildInputs = [ makeWrapper ]; + propagatedBuildInputs = [ python ] ++ extraLibs; unpackPhase = "true"; installPhase = '' From 1c504b49b486e0dd3ae15a2066618cc283e5aed2 Mon Sep 17 00:00:00 2001 From: Florian Friesdorf Date: Sun, 26 Feb 2012 17:23:31 +0000 Subject: [PATCH 133/197] remove empty readonly site-packages svn path=/nixpkgs/branches/stdenv-updates/; revision=32590 --- pkgs/development/interpreters/python/2.6/default.nix | 2 ++ pkgs/development/interpreters/python/2.7/default.nix | 2 ++ pkgs/development/interpreters/python/3.1/default.nix | 2 ++ pkgs/development/interpreters/python/3.2/default.nix | 2 ++ 4 files changed, 8 insertions(+) diff --git a/pkgs/development/interpreters/python/2.6/default.nix b/pkgs/development/interpreters/python/2.6/default.nix index 3ae16d26d61..b46c2902558 100644 --- a/pkgs/development/interpreters/python/2.6/default.nix +++ b/pkgs/development/interpreters/python/2.6/default.nix @@ -64,6 +64,8 @@ let postInstall = '' rm -rf "$out/lib/python${majorVersion}/test" + rm "$out/lib/python${majorVersion}/site-packages/README" + rmdir "$out/lib/python${majorVersion}/site-packages/" ''; passthru = { diff --git a/pkgs/development/interpreters/python/2.7/default.nix b/pkgs/development/interpreters/python/2.7/default.nix index 968a4859aed..58a70c5f60c 100644 --- a/pkgs/development/interpreters/python/2.7/default.nix +++ b/pkgs/development/interpreters/python/2.7/default.nix @@ -78,6 +78,8 @@ let postInstall = '' rm -rf "$out/lib/python${majorVersion}/test" + rm "$out/lib/python${majorVersion}/site-packages/README" + rmdir "$out/lib/python${majorVersion}/site-packages/" ''; passthru = { diff --git a/pkgs/development/interpreters/python/3.1/default.nix b/pkgs/development/interpreters/python/3.1/default.nix index 892af52a919..2eed78cb49f 100644 --- a/pkgs/development/interpreters/python/3.1/default.nix +++ b/pkgs/development/interpreters/python/3.1/default.nix @@ -54,6 +54,8 @@ stdenv.mkDerivation { postInstall = '' rm -rf "$out/lib/python${majorVersion}/test" + rm "$out/lib/python${majorVersion}/site-packages/README" + rmdir "$out/lib/python${majorVersion}/site-packages/" ''; passthru = { diff --git a/pkgs/development/interpreters/python/3.2/default.nix b/pkgs/development/interpreters/python/3.2/default.nix index 1ab115f0469..501db22c8d3 100644 --- a/pkgs/development/interpreters/python/3.2/default.nix +++ b/pkgs/development/interpreters/python/3.2/default.nix @@ -53,6 +53,8 @@ stdenv.mkDerivation { postInstall = '' rm -rf "$out/lib/python${majorVersion}/test" + rm "$out/lib/python${majorVersion}/site-packages/README" + rmdir "$out/lib/python${majorVersion}/site-packages/" ''; passthru = { From c6893a14df4159ec85ddce4f7a944dcc305febed Mon Sep 17 00:00:00 2001 From: Florian Friesdorf Date: Sun, 26 Feb 2012 17:23:35 +0000 Subject: [PATCH 134/197] removal of deps' scripts only if easy-install.pth exists solves duplicate installation for packages that do not use setuptools svn path=/nixpkgs/branches/stdenv-updates/; revision=32591 --- .../python-modules/generic/default.nix | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/generic/default.nix b/pkgs/development/python-modules/generic/default.nix index 50653d1abc4..6eaa67562d2 100644 --- a/pkgs/development/python-modules/generic/default.nix +++ b/pkgs/development/python-modules/generic/default.nix @@ -28,15 +28,19 @@ # install the current package with easy_install.pth including dependencies python setup.py install --prefix="$out" - # remove console_scripts again, because they were created for deps, too - rm -Rf "$out"/bin + # plain distutils knows no dependencies + eapth="$out"/lib/${python.libPrefix}/site-packages/easy-install.pth + if [ -e "$eapth" ]; then + # remove console_scripts again, because they were created for deps, too + rm -Rf "$out"/bin - # run easy_install to generate scripts for the current package, - # it won't reinstall - easy_install --prefix="$out" . + # run easy_install to generate scripts for the current package, + # it won't reinstall + easy_install --prefix="$out" . - # move colliding easy_install.pth to specifically named one - mv "$out/lib/${python.libPrefix}/site-packages/"{easy-install.pth,${name}.pth} + # move colliding easy_install.pth to specifically named one + mv "$eapth" $(dirname "$eapth")/${name}.pth + fi # These cause collisions and our output is not a site anyway # If you need a site, install python-site From d670c0e45cf411823b6a13ef012eea28786dc9d5 Mon Sep 17 00:00:00 2001 From: Florian Friesdorf Date: Sun, 26 Feb 2012 17:23:38 +0000 Subject: [PATCH 135/197] include site in pythonpath of wrapped scripts, if python-site is installed svn path=/nixpkgs/branches/stdenv-updates/; revision=32592 --- pkgs/development/python-modules/generic/wrap.sh | 10 +++++++++- pkgs/development/python-modules/site/default.nix | 10 ++++++++++ pkgs/development/python-modules/site/pysite | 13 +++++++++++++ 3 files changed, 32 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/python-modules/site/pysite diff --git a/pkgs/development/python-modules/generic/wrap.sh b/pkgs/development/python-modules/generic/wrap.sh index 65f3229ca7c..9f3803f791b 100644 --- a/pkgs/development/python-modules/generic/wrap.sh +++ b/pkgs/development/python-modules/generic/wrap.sh @@ -15,6 +15,14 @@ wrapPythonProgramsIn() { _addToPythonPath $i done + program_PYTHONPATH='$( + # activate site if installed + bindir=$(dirname "$0") + pysite="$bindir/pysite" + relpath=$(test -x "$pysite" && "$pysite" path) + echo -n ${relpath:+"$relpath":} +)'"$program_PYTHONPATH" + for i in $(find "$dir" -type f -perm +0100); do # Rewrite "#! .../env python" to "#! /nix/store/.../python". @@ -25,7 +33,7 @@ wrapPythonProgramsIn() { if head -n1 "$i" | grep -q /python; then echo "wrapping \`$i'..." wrapProgram "$i" \ - --prefix PYTHONPATH ":" $program_PYTHONPATH \ + --prefix PYTHONPATH ":" "$program_PYTHONPATH" \ --prefix PATH ":" $program_PATH fi done diff --git a/pkgs/development/python-modules/site/default.nix b/pkgs/development/python-modules/site/default.nix index 98a14850dbe..c2dc99d5a43 100644 --- a/pkgs/development/python-modules/site/default.nix +++ b/pkgs/development/python-modules/site/default.nix @@ -12,6 +12,16 @@ stdenv.mkDerivation rec { dst=$out/lib/${python.libPrefix}/site-packages mkdir -p $dst cat ${./site.py} >> $dst/site.py + + # by providing content for bin/ we make sure, that python or + # some other script is linked instead of the bin/ directory + # itself. This is needed for the wrappers to make all site + # packages available if site is installed. + mkdir $out/bin + cat ${./pysite} >> $out/bin/pysite + substituteInPlace $out/bin/pysite \ + --replace PYTHON_LIB_PREFIX ${python.libPrefix} + chmod +x $out/bin/pysite ''; meta = { diff --git a/pkgs/development/python-modules/site/pysite b/pkgs/development/python-modules/site/pysite new file mode 100644 index 00000000000..b10a24014ce --- /dev/null +++ b/pkgs/development/python-modules/site/pysite @@ -0,0 +1,13 @@ +#!/bin/bash + +python=PYTHON_LIB_PREFIX + +case "$1" in + path) + echo $(dirname $0)/../lib/$python/site-packages + ;; + *) + echo Usage: + echo " $(basename $0) path" + exit 1 +esac From 1d2e06e068521f3f42ae100241d1ef206f0a14e1 Mon Sep 17 00:00:00 2001 From: Florian Friesdorf Date: Sun, 26 Feb 2012 17:23:42 +0000 Subject: [PATCH 136/197] pysite support for pythonXYFull wrapper svn path=/nixpkgs/branches/stdenv-updates/; revision=32593 --- .../interpreters/python/wrapper-builder.sh | 13 +++++++++++++ pkgs/development/interpreters/python/wrapper.nix | 1 + 2 files changed, 14 insertions(+) create mode 100644 pkgs/development/interpreters/python/wrapper-builder.sh diff --git a/pkgs/development/interpreters/python/wrapper-builder.sh b/pkgs/development/interpreters/python/wrapper-builder.sh new file mode 100644 index 00000000000..f3353c32ef1 --- /dev/null +++ b/pkgs/development/interpreters/python/wrapper-builder.sh @@ -0,0 +1,13 @@ +source $stdenv/setup + +preConfigure() { + PYTHONPATH='$( + # activate site if installed + bindir=$(dirname "$0") + pysite="$bindir/pysite" + relpath=$(test -x "$pysite" && "$pysite" path) + echo -n ${relpath:+"$relpath":} +)'"$PYTHONPATH" +} + +genericBuild diff --git a/pkgs/development/interpreters/python/wrapper.nix b/pkgs/development/interpreters/python/wrapper.nix index 0522a47d17b..f1d2471c942 100644 --- a/pkgs/development/interpreters/python/wrapper.nix +++ b/pkgs/development/interpreters/python/wrapper.nix @@ -7,6 +7,7 @@ stdenv.mkDerivation { name = "python-${python.version}-wrapper"; buildInputs = [ makeWrapper ]; + builder = ./wrapper-builder.sh; propagatedBuildInputs = [ python ] ++ extraLibs; unpackPhase = "true"; From eb35e3bd130cc8b80ece0164135b0cca66aab05c Mon Sep 17 00:00:00 2001 From: Florian Friesdorf Date: Sun, 26 Feb 2012 17:23:44 +0000 Subject: [PATCH 137/197] suffix pythonpath this is already the case for the pythonXYFull svn path=/nixpkgs/branches/stdenv-updates/; revision=32594 --- pkgs/development/python-modules/generic/wrap.sh | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/generic/wrap.sh b/pkgs/development/python-modules/generic/wrap.sh index 9f3803f791b..756faaa13c0 100644 --- a/pkgs/development/python-modules/generic/wrap.sh +++ b/pkgs/development/python-modules/generic/wrap.sh @@ -30,10 +30,16 @@ wrapPythonProgramsIn() { sed -i "$i" -e "1 s^.*/env[ ]*python^#! $python^" fi + # PYTHONPATH is suffixed, PATH is prefixed. Reasoning: + # PATH is set in the environment and our packages' bin need to + # be chosen over the default PATH. PYTHONPATH is usually not + # set, so we can use it to override the modules chosen at + # install time. If we would want the same for PATH we could + # introduce PATH_OVERWRITE or similar. if head -n1 "$i" | grep -q /python; then echo "wrapping \`$i'..." wrapProgram "$i" \ - --prefix PYTHONPATH ":" "$program_PYTHONPATH" \ + --suffix PYTHONPATH ":" "$program_PYTHONPATH" \ --prefix PATH ":" $program_PATH fi done From 6d7dfd14154d1dae7a2be027d5518b8ff8944482 Mon Sep 17 00:00:00 2001 From: Florian Friesdorf Date: Sun, 26 Feb 2012 17:23:47 +0000 Subject: [PATCH 138/197] PYTHONPATH in preConfigure instead of configurePhase enables a normal configurePhase also for python packages (e.g. libxml2 python bindings) authored by: chaoflow, goibhniu svn path=/nixpkgs/branches/stdenv-updates/; revision=32595 --- pkgs/development/python-modules/generic/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/generic/default.nix b/pkgs/development/python-modules/generic/default.nix index 6eaa67562d2..5f85d837c3c 100644 --- a/pkgs/development/python-modules/generic/default.nix +++ b/pkgs/development/python-modules/generic/default.nix @@ -73,7 +73,7 @@ python.stdenv.mkDerivation (attrs // { buildInputs = [ python wrapPython setuptools ] ++ buildInputs ++ pythonPath; - configurePhase = '' + preConfigure = '' # do not allow distutils to make downloads, whatever install command is used export PYTHONPATH="${setuptools}/lib/${python.libPrefix}:$PYTHONPATH" export PYTHONPATH="${offlineDistutils}/lib/${python.libPrefix}:$PYTHONPATH" From 09cfb46f583195ee2c7af34d3cc96113d9c8997a Mon Sep 17 00:00:00 2001 From: Florian Friesdorf Date: Sun, 26 Feb 2012 17:23:50 +0000 Subject: [PATCH 139/197] separate libxml2 python bindings, added libconvOrLibC dependency authored by: chaoflow, goibhniu svn path=/nixpkgs/branches/stdenv-updates/; revision=32596 --- .../development/libraries/libxml2/default.nix | 12 ++------ pkgs/top-level/all-packages.nix | 8 ++--- pkgs/top-level/python-packages.nix | 29 +++++++++++++++++++ 3 files changed, 34 insertions(+), 15 deletions(-) diff --git a/pkgs/development/libraries/libxml2/default.nix b/pkgs/development/libraries/libxml2/default.nix index fe3b6bd6487..1907a470b68 100644 --- a/pkgs/development/libraries/libxml2/default.nix +++ b/pkgs/development/libraries/libxml2/default.nix @@ -1,6 +1,4 @@ -{stdenv, fetchurl, zlib, python ? null, pythonSupport ? true }: - -assert pythonSupport -> python != null; +{ stdenv, fetchurl, libiconvOrLibc, zlib }: stdenv.mkDerivation { name = "libxml2-2.7.7"; @@ -10,15 +8,11 @@ stdenv.mkDerivation { sha256 = "03kkknm7xl77qfdig8mzalsi8ljsyblzin18gy3h8zranffrpyzs"; }; - configureFlags = '' - ${if pythonSupport then "--with-python=${python}" else ""} - ''; - - propagatedBuildInputs = [zlib]; + propagatedBuildInputs = [ libiconvOrLibc zlib ]; setupHook = ./setup-hook.sh; - passthru = {inherit pythonSupport;}; + passthru = { libiconv = libiconvOrLibc; }; meta = { homepage = http://xmlsoft.org/; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 315a23387ee..30318d527ca 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4234,13 +4234,9 @@ let libxmi = callPackage ../development/libraries/libxmi { }; - libxml2 = callPackage ../development/libraries/libxml2 { - pythonSupport = false; - }; + libxml2 = callPackage ../development/libraries/libxml2 { }; - libxml2Python = libxml2.override { - pythonSupport = true; - }; + libxml2Python = pythonPackages.libxml2; libxmlxx = callPackage ../development/libraries/libxmlxx { inherit (gtkLibs) glibmm; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b8d26e94a9a..49e3901aa7b 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -665,6 +665,35 @@ let pythonPackages = python.modules // rec { }); + libxml2 = buildPythonPackage (rec { + name = pkgs.libxml2.name; + src = pkgs.libxml2.src; + + buildInputs = [ python ]; + propagatedBuildInputs = [ pkgs.libxml2 ]; + + configureFlags = "--with-python=${python}"; + + postConfigure = '' + cd python + sed -i setup.py \ + -e "s:^ROOT.*:ROOT = r'${pkgs.libxml2}':" \ + -e "s:^iconv_includes.*:iconv_includes= r'${pkgs.libxml2.libiconv}':" + ''; + + # has no tests + doCheck = false; + + passthru = { lib = pkgs.libxml2; }; + + meta = { + homepage = http://xmlsoft.org/; + description = "Python bindings for libxml2"; + license = "bsd"; + }; + }); + + lockfile = buildPythonPackage rec { name = "lockfile-0.9.1"; From c0dcbb912c4b1a60122da2b316969945071c017a Mon Sep 17 00:00:00 2001 From: Florian Friesdorf Date: Sun, 26 Feb 2012 17:23:54 +0000 Subject: [PATCH 140/197] adapted xpf to new libxml2Python authored by: chaoflow, goibhniu svn path=/nixpkgs/branches/stdenv-updates/; revision=32597 --- pkgs/tools/text/xml/xpf/default.nix | 10 ++++++---- pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/tools/text/xml/xpf/default.nix b/pkgs/tools/text/xml/xpf/default.nix index fa8e8078362..f17a47e6be3 100644 --- a/pkgs/tools/text/xml/xpf/default.nix +++ b/pkgs/tools/text/xml/xpf/default.nix @@ -1,6 +1,4 @@ -{stdenv, fetchurl, python, libxml2}: - -assert libxml2.pythonSupport == true; +{ stdenv, fetchurl, python, libxml2Python }: stdenv.mkDerivation { name = "xpf-0.2"; @@ -10,7 +8,11 @@ stdenv.mkDerivation { md5 = "d92658828139e1495e052d0cfe25d312"; }; - buildInputs = [python libxml2]; + buildInputs = [ python libxml2Python ]; + + preConfigure = '' + sed -i configure -e 's:test -e .*/libxml2.py":python -c "import libxml2":' + ''; meta = { description = "XML Pipes and Filters - command line tools for manipulating and querying XML data"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 30318d527ca..092ce2bc636 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1629,9 +1629,7 @@ let xorriso = callPackage ../tools/cd-dvd/xorriso { }; - xpf = callPackage ../tools/text/xml/xpf { - libxml2 = libxml2Python; - }; + xpf = callPackage ../tools/text/xml/xpf { }; xsel = callPackage ../tools/misc/xsel { }; From b7f1724543327d097e19f16fc46bce8ec050ba45 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Sun, 26 Feb 2012 21:02:03 +0000 Subject: [PATCH 141/197] Gtkwave needs the xz libraries to build. svn path=/nixpkgs/branches/stdenv-updates/; revision=32601 --- pkgs/applications/science/electronics/gtkwave/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/electronics/gtkwave/default.nix b/pkgs/applications/science/electronics/gtkwave/default.nix index ddffc6ee34b..697d0e925cd 100644 --- a/pkgs/applications/science/electronics/gtkwave/default.nix +++ b/pkgs/applications/science/electronics/gtkwave/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, gtk, gperf, pkgconfig, bzip2, tcl, tk, judy} : +{stdenv, fetchurl, gtk, gperf, pkgconfig, bzip2, tcl, tk, judy, xz}: stdenv.mkDerivation rec { name = "gtkwave-3.3.28"; @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { sha256 = "0y3dmx39xwc3m23fwjkxvp9gqxpckk8s5814nhs8fnxa384z5cz0"; }; - buildInputs = [ gtk gperf pkgconfig bzip2 tcl tk judy]; + buildInputs = [ gtk gperf pkgconfig bzip2 tcl tk judy xz ]; configureFlags = [ "--with-tcl=${tcl}/lib" "--with-tk=${tk}/lib" "--enable-judy" ]; From bcbe60782bbfb118bdf5305ab2e733b960d9c679 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Sun, 26 Feb 2012 21:27:15 +0000 Subject: [PATCH 142/197] Trying to make qt3 build, with a patch related to the new gcc 4.6. svn path=/nixpkgs/branches/stdenv-updates/; revision=32604 --- pkgs/development/libraries/qt-3/default.nix | 3 +++ .../libraries/qt-3/qt3-gcc4.6.0.patch | 23 +++++++++++++++++++ 2 files changed, 26 insertions(+) create mode 100644 pkgs/development/libraries/qt-3/qt3-gcc4.6.0.patch diff --git a/pkgs/development/libraries/qt-3/default.nix b/pkgs/development/libraries/qt-3/default.nix index e023235b936..c9cb14030a5 100644 --- a/pkgs/development/libraries/qt-3/default.nix +++ b/pkgs/development/libraries/qt-3/default.nix @@ -62,6 +62,9 @@ stdenv.mkDerivation { # randr.h and Xrandr.h need not be in the same prefix. ./xrandr.patch + + # Make it build with gcc 4.6.0 + ./qt3-gcc4.6.0.patch ]; passthru = {inherit mysqlSupport;}; diff --git a/pkgs/development/libraries/qt-3/qt3-gcc4.6.0.patch b/pkgs/development/libraries/qt-3/qt3-gcc4.6.0.patch new file mode 100644 index 00000000000..c1a903c130c --- /dev/null +++ b/pkgs/development/libraries/qt-3/qt3-gcc4.6.0.patch @@ -0,0 +1,23 @@ +I picked it here: +https://bugs.archlinux.org/task/23915 + +--- qt-x11-free-3.3.8b/src/tools/qmap.h~ 2008-01-15 19:09:13.000000000 +0000 ++++ qt-x11-free-3.3.8b/src/tools/qmap.h 2011-04-11 00:16:04.000000000 +0100 +@@ -50,6 +50,7 @@ + #endif // QT_H + + #ifndef QT_NO_STL ++#include + #include + #include + #endif +--- qt-x11-free-3.3.8b/src/tools/qvaluelist.h~ 2008-01-15 19:09:13.000000000 +0000 ++++ qt-x11-free-3.3.8b/src/tools/qvaluelist.h 2011-04-11 00:16:49.000000000 +0100 +@@ -48,6 +48,7 @@ + #endif // QT_H + + #ifndef QT_NO_STL ++#include + #include + #include + #endif From e7c662337227a764e5aef7d2a9ee11f3c7995b5f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Sun, 26 Feb 2012 21:32:29 +0000 Subject: [PATCH 143/197] I think this may make irrlicht build, and thus, supertuxkart. svn path=/nixpkgs/branches/stdenv-updates/; revision=32605 --- pkgs/development/libraries/irrlicht/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/libraries/irrlicht/default.nix b/pkgs/development/libraries/irrlicht/default.nix index ccc088816c6..760ad096fd0 100644 --- a/pkgs/development/libraries/irrlicht/default.nix +++ b/pkgs/development/libraries/irrlicht/default.nix @@ -11,6 +11,10 @@ stdenv.mkDerivation rec { sha256 = "0v31l3k0fzy7isdsx2sh0baaixzlml1m7vgz6cd0015d9f5n99vl"; }; + patchPhase = '' + sed -i /stdcall-alias/d source/Irrlicht/Makefile + ''; + preConfigure = '' cd source/Irrlicht ''; From fc9f42487eefad89df7ff2509c197a4568bacf4a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Sun, 26 Feb 2012 21:40:37 +0000 Subject: [PATCH 144/197] Trying to fix the tarball, related to a problem introduced in 32596. svn path=/nixpkgs/branches/stdenv-updates/; revision=32606 --- pkgs/top-level/python-packages.nix | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 49e3901aa7b..6cd2c4cb61b 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -674,12 +674,15 @@ let pythonPackages = python.modules // rec { configureFlags = "--with-python=${python}"; - postConfigure = '' - cd python - sed -i setup.py \ - -e "s:^ROOT.*:ROOT = r'${pkgs.libxml2}':" \ - -e "s:^iconv_includes.*:iconv_includes= r'${pkgs.libxml2.libiconv}':" - ''; + postConfigure = let + changeIconv = "-e s:^iconv_includes.*:iconv_includes=r'${pkgs.libxml2.libiconv}':"; + in + '' + cd python + sed -i setup.py \ + -e "s:^ROOT.*:ROOT = r'${pkgs.libxml2}':" \ + ${if pkgs.libxml2.libiconv != null then changeIconv else ""} + ''; # has no tests doCheck = false; From b2ff0f484ed26cd7fef8318df5bb6f6060896786 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Sun, 26 Feb 2012 21:45:08 +0000 Subject: [PATCH 145/197] Blind commit trying to fix zziplib, with a little patch. svn path=/nixpkgs/branches/stdenv-updates/; revision=32607 --- pkgs/development/libraries/zziplib/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/libraries/zziplib/default.nix b/pkgs/development/libraries/zziplib/default.nix index a7d246d34fb..e9de92fb3ce 100644 --- a/pkgs/development/libraries/zziplib/default.nix +++ b/pkgs/development/libraries/zziplib/default.nix @@ -8,6 +8,10 @@ stdenv.mkDerivation rec { sha256 = "13j9f6i8rx0qd5m96iwrcha78h34qpfk5qzi7cv098pms6gq022m"; }; + patchPhase = '' + sed -i -e s,--export-dynamic,, configure + ''; + buildInputs = [ perl python zip xmlto zlib ]; doCheck = true; From dd09aa6929f1d856c0a33cb5e5b7a91bc427a049 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Sun, 26 Feb 2012 21:53:18 +0000 Subject: [PATCH 146/197] I'd remain with glibc 2.13 on cross building too, as we do on native builds, due to the lack of rpc (and therefore, lack of linux pam). svn path=/nixpkgs/branches/stdenv-updates/; revision=32608 --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 092ce2bc636..76d89d5df88 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3498,7 +3498,7 @@ let glibc = glibc213; - glibcCross = glibc214Cross; + glibcCross = glibc213Cross; glibc25 = callPackage ../development/libraries/glibc/2.5 { kernelHeaders = linuxHeaders_2_6_28; From ec05ab990b787501f3cb09d264d650e12167d72d Mon Sep 17 00:00:00 2001 From: Florian Friesdorf Date: Mon, 27 Feb 2012 00:43:07 +0000 Subject: [PATCH 147/197] fix python libxml2 svn path=/nixpkgs/branches/stdenv-updates/; revision=32610 --- pkgs/top-level/python-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 6cd2c4cb61b..a5ba0d99600 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -675,7 +675,7 @@ let pythonPackages = python.modules // rec { configureFlags = "--with-python=${python}"; postConfigure = let - changeIconv = "-e s:^iconv_includes.*:iconv_includes=r'${pkgs.libxml2.libiconv}':"; + changeIconv = ''-e "s:^iconv_includes.*:iconv_includes=r'${pkgs.libxml2.libiconv}':"''; in '' cd python From c8dc35ac72ea327397984a5b26e6f3a6cb65287c Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Mon, 27 Feb 2012 08:18:11 +0000 Subject: [PATCH 148/197] Trying to fix geoclue build with fresher GCC svn path=/nixpkgs/branches/stdenv-updates/; revision=32614 --- pkgs/development/libraries/geoclue/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/geoclue/default.nix b/pkgs/development/libraries/geoclue/default.nix index 076c821ca95..c5c8b694ba9 100644 --- a/pkgs/development/libraries/geoclue/default.nix +++ b/pkgs/development/libraries/geoclue/default.nix @@ -30,8 +30,12 @@ rec { propagatedBuildInputs = [a.dbus a.glib a.dbus_glib]; /* doConfigure should be removed if not needed */ - phaseNames = ["doConfigure" "doMakeInstall"]; + phaseNames = ["fixConfigure" "doConfigure" "doMakeInstall"]; + fixConfigure = a.fullDepEntry '' + sed -e 's@-Werror@@' -i configure + '' ["minInit" "doUnpack"]; + meta = { description = "Geolocation framework and some data providers"; maintainers = with a.lib.maintainers; From 944083026b8dda09c62a1db3c20a2a4b0fc8263e Mon Sep 17 00:00:00 2001 From: Florian Friesdorf Date: Mon, 27 Feb 2012 17:33:44 +0000 Subject: [PATCH 149/197] fix typos: beautifulSoup instead of beautifulSoap authored by: chaoflow, goibhniu svn path=/nixpkgs/branches/stdenv-updates/; revision=32622 --- pkgs/top-level/python-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index a5ba0d99600..075ebaeb729 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -136,8 +136,8 @@ let pythonPackages = python.modules // rec { propagatedBuildInputs = [logilabCommon]; }; - beautifulsoap = buildPythonPackage (rec { - name = "beautifulsoap-3.0.8"; + beautifulsoup = buildPythonPackage (rec { + name = "beautifulsoup-3.0.8"; src = fetchurl { url = "http://www.crummy.com/software/BeautifulSoup/download/3.x/BeautifulSoup-3.0.8.tar.gz"; From 2a6597f5cbc019758bd3017a6e043f33a7c8d552 Mon Sep 17 00:00:00 2001 From: Florian Friesdorf Date: Mon, 27 Feb 2012 17:33:49 +0000 Subject: [PATCH 150/197] logilabComman and astng fixes authored by: chaoflow, goibhniu svn path=/nixpkgs/branches/stdenv-updates/; revision=32623 --- pkgs/top-level/python-packages.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 075ebaeb729..7e5a880c027 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -130,10 +130,10 @@ let pythonPackages = python.modules // rec { name = "logilab-astng-0.21.1"; src = fetchurl { - url = "http://ftp.logilab.org/pub/astng/${name}.tar.gz"; + url = "ftp://ftp.logilab.org/pub/astng/${name}.tar.gz"; sha256 = "0rqp2vwrnv6gkzdd96j078h1sz26plh49cmnyswy2wb6l4wans67"; }; - propagatedBuildInputs = [logilabCommon]; + buildInputs = [ logilabCommon ]; }; beautifulsoup = buildPythonPackage (rec { @@ -717,10 +717,10 @@ let pythonPackages = python.modules // rec { name = "logilab-common-0.56.0"; src = fetchurl { - url = "http://ftp.logilab.org/pub/common/${name}.tar.gz"; + url = "ftp://ftp.logilab.org/pub/common/${name}.tar.gz"; sha256 = "14p557nqypbd10d8k7qs6jlm58pksiwh86wvvl0axyki00hj6971"; }; - propagatedBuildInputs = [unittest2]; + buildInputs = [ unittest2 ]; }; lxml = buildPythonPackage ( rec { From 9e646d4689139e200bc399b7855633899ab5cc99 Mon Sep 17 00:00:00 2001 From: Florian Friesdorf Date: Mon, 27 Feb 2012 17:33:55 +0000 Subject: [PATCH 151/197] added unzip to buildPythonPackage's buildInputs - used quite often authored by: chaoflow, goibhniu svn path=/nixpkgs/branches/stdenv-updates/; revision=32624 --- pkgs/development/python-modules/generic/default.nix | 4 ++-- pkgs/top-level/python-packages.nix | 12 +++--------- 2 files changed, 5 insertions(+), 11 deletions(-) diff --git a/pkgs/development/python-modules/generic/default.nix b/pkgs/development/python-modules/generic/default.nix index 5f85d837c3c..c208c0bcff2 100644 --- a/pkgs/development/python-modules/generic/default.nix +++ b/pkgs/development/python-modules/generic/default.nix @@ -3,7 +3,7 @@ (http://pypi.python.org/pypi/setuptools/), which represents a large number of Python packages nowadays. */ -{ python, setuptools, wrapPython, lib, site, offlineDistutils }: +{ python, setuptools, wrapPython, lib, site, offlineDistutils, unzip }: { name, namePrefix ? "python-" @@ -71,7 +71,7 @@ python.stdenv.mkDerivation (attrs // { name = namePrefix + name; - buildInputs = [ python wrapPython setuptools ] ++ buildInputs ++ pythonPath; + buildInputs = [ python wrapPython setuptools unzip ] ++ buildInputs ++ pythonPath; preConfigure = '' # do not allow distutils to make downloads, whatever install command is used diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 7e5a880c027..81f3783eadf 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -8,7 +8,7 @@ let pythonPackages = python.modules // rec { buildPythonPackage = import ../development/python-modules/generic { - inherit (pkgs) lib; + inherit (pkgs) lib unzip; inherit python wrapPython setuptools site offlineDistutils; }; @@ -84,7 +84,7 @@ let pythonPackages = python.modules // rec { sha1 = "fa4aec08e59fa5964197f59ba42408d64031675b"; }; - buildInputs = [ pkgs.unzip pkgs.sqlite ]; + buildInputs = [ pkgs.sqlite ]; doCheck = false; @@ -103,8 +103,6 @@ let pythonPackages = python.modules // rec { sha256 = "ee6da1aaad8b08a74a33eb82264b1a2bf12a7d5aefc7e9d7d40a8f8fa9912e62"; }; - buildInputs = [ pkgs.unzip ]; - # How do we run the tests? doCheck = false; @@ -288,8 +286,6 @@ let pythonPackages = python.modules // rec { sha256 = "1i5n97l20kn2w9v6x8ybcdnl323vy8lcc5qlxz5l89di36a2skgw"; }; - buildInputs = [ pkgs.unzip ]; - # The tests fail - I don't know why doCheck = false; @@ -1641,7 +1637,7 @@ let pythonPackages = python.modules // rec { sha256 = "204aca8b42dbe90e460794d743dd16182011da85507bfd4f092f9f76e0688040"; }; - buildInputs = [ pkgs.unzip pkgs.pyrex ]; + buildInputs = [ pkgs.pyrex ]; propagatedBuildInputs = [ pkgs.libyaml ]; meta = { @@ -2117,8 +2113,6 @@ let pythonPackages = python.modules // rec { md5 = "8e46dd755f6998d471bfbcb4def897ff"; }; - buildInputs = [ pkgs.unzip ]; - # The test requires "webtest", which is a cyclic dependency. (WTF?) doCheck = false; From d16a15c0a5ca4bc879fbb3796aca0589f42923cf Mon Sep 17 00:00:00 2001 From: Florian Friesdorf Date: Mon, 27 Feb 2012 17:34:02 +0000 Subject: [PATCH 152/197] move checkPhase after fixupPhase for python packages authored by: chaoflow, goibhniu svn path=/nixpkgs/branches/stdenv-updates/; revision=32625 --- pkgs/development/python-modules/generic/builder.sh | 9 +++++++++ pkgs/development/python-modules/generic/default.nix | 4 ++++ 2 files changed, 13 insertions(+) create mode 100644 pkgs/development/python-modules/generic/builder.sh diff --git a/pkgs/development/python-modules/generic/builder.sh b/pkgs/development/python-modules/generic/builder.sh new file mode 100644 index 00000000000..6cad5e99aa3 --- /dev/null +++ b/pkgs/development/python-modules/generic/builder.sh @@ -0,0 +1,9 @@ +source $stdenv/setup + +# move checkPhase from after buildPhase to after fixupPhase +phases="$prePhases unpackPhase patchPhase $preConfigurePhases \ + configurePhase $preBuildPhases buildPhase \ + $preInstallPhases installPhase fixupPhase checkPhase \ + $preDistPhases distPhase $postPhases"; + +genericBuild diff --git a/pkgs/development/python-modules/generic/default.nix b/pkgs/development/python-modules/generic/default.nix index c208c0bcff2..8197e5e7431 100644 --- a/pkgs/development/python-modules/generic/default.nix +++ b/pkgs/development/python-modules/generic/default.nix @@ -54,6 +54,7 @@ , doCheck ? true +# run after fixupPhase , checkPhase ? '' runHook preCheck @@ -69,6 +70,9 @@ python.stdenv.mkDerivation (attrs // { inherit doCheck buildPhase checkPhase; + # moves checkPhase from after buildPhase to after fixupPhase + builder = ./builder.sh; + name = namePrefix + name; buildInputs = [ python wrapPython setuptools unzip ] ++ buildInputs ++ pythonPath; From 3c512359209224045386f5352f0cb9a380c55e9d Mon Sep 17 00:00:00 2001 From: Florian Friesdorf Date: Mon, 27 Feb 2012 17:34:08 +0000 Subject: [PATCH 153/197] enable preConfigure for python packages again authored by: chaoflow, goibhniu svn path=/nixpkgs/branches/stdenv-updates/; revision=32626 --- pkgs/development/python-modules/generic/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/generic/default.nix b/pkgs/development/python-modules/generic/default.nix index 8197e5e7431..a00699a4bbd 100644 --- a/pkgs/development/python-modules/generic/default.nix +++ b/pkgs/development/python-modules/generic/default.nix @@ -17,6 +17,8 @@ # pollute the user environment. pythonPath ? [] +, preConfigure ? "true" + # distutils registers dependencies in .pth (good) but also creates # console_scripts for dependencies in bin/ (bad). easy_install # creates no scripts for dependencies (good) but does not register @@ -84,7 +86,7 @@ python.stdenv.mkDerivation (attrs // { # enable pth files for dependencies export PYTHONPATH="${site}/lib/${python.libPrefix}/site-packages:$PYTHONPATH" - ''; + '' + preConfigure; # XXX: I think setuptools is not needed here pythonPath = [ setuptools site ] ++ pythonPath; From b653b3c55967682288932ba6d51796c1d43a13dc Mon Sep 17 00:00:00 2001 From: Florian Friesdorf Date: Mon, 27 Feb 2012 17:34:13 +0000 Subject: [PATCH 154/197] python packages cleanup authored by: chaoflow, goibhniu svn path=/nixpkgs/branches/stdenv-updates/; revision=32627 --- pkgs/top-level/python-packages.nix | 161 +++++++++++++++++------------ 1 file changed, 93 insertions(+), 68 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 81f3783eadf..bdd366f7a5f 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6,12 +6,18 @@ let pythonPackages = python.modules // rec { inherit (pkgs) fetchurl fetchsvn stdenv; - buildPythonPackage = import ../development/python-modules/generic { inherit (pkgs) lib unzip; inherit python wrapPython setuptools site offlineDistutils; }; + wrapPython = pkgs.makeSetupHook + { deps = pkgs.makeWrapper; + substitutions.libPrefix = python.libPrefix; + } + ../development/python-modules/generic/wrap.sh; + + ### real packages below here setuptools = import ../development/python-modules/setuptools { inherit (pkgs) stdenv fetchurl; @@ -24,24 +30,19 @@ let pythonPackages = python.modules // rec { inherit python; }; + offlineDistutils = import ../development/python-modules/offline-distutils { inherit (pkgs) stdenv; inherit python; }; + ipython = import ../shells/ipython { inherit (pkgs) stdenv fetchurl; inherit buildPythonPackage pythonPackages; }; - wrapPython = pkgs.makeSetupHook - { deps = pkgs.makeWrapper; - substitutions.libPrefix = python.libPrefix; - } - ../development/python-modules/generic/wrap.sh; - - anyjson = buildPythonPackage rec { name = "anyjson-0.3.1"; @@ -67,7 +68,7 @@ let pythonPackages = python.modules // rec { sha1 = "f124e5e4a6644bf6d1734032a01ac44db1b25a29"; }; - doCheck = false; + checkPhase = "cd tests/client_0_8/ && python run_all.py"; meta = { homepage = http://code.google.com/p/py-amqplib/; @@ -86,7 +87,9 @@ let pythonPackages = python.modules // rec { buildInputs = [ pkgs.sqlite ]; + # XXX: currently fails doCheck = false; + checkPhase = "python setup.py test"; meta = { description = "A Python wrapper for the SQLite embedded relational database engine"; @@ -103,8 +106,7 @@ let pythonPackages = python.modules // rec { sha256 = "ee6da1aaad8b08a74a33eb82264b1a2bf12a7d5aefc7e9d7d40a8f8fa9912e62"; }; - # How do we run the tests? - doCheck = false; + checkPhase = "python test/test_argparse.py"; meta = { homepage = http://code.google.com/p/argparse/; @@ -142,8 +144,7 @@ let pythonPackages = python.modules // rec { sha256 = "1gasiy5lwbhsxw27g36d88n36xbj52434klisvqhljgckd4xqcy7"; }; - # No tests implemented - doCheck = false; + checkPhase = "python BeautifulSoupTests.py"; meta = { homepage = http://www.crummy.com/software/BeautifulSoup/; @@ -214,9 +215,7 @@ let pythonPackages = python.modules // rec { md5 = "530a0614de3a669314c3acd4995c54d5"; }; - buildInputs = [ nose ]; - - propagatedBuildInputs = [ amqplib anyjson ]; + buildInputs = [ nose amqplib anyjson ]; doCheck = false; # depends on the network @@ -227,6 +226,22 @@ let pythonPackages = python.modules // rec { }; + chardet = buildPythonPackage rec { + version = "1.0.1"; + name = "chardet-${version}"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/c/chardet/${name}.tar.gz"; + md5 = "7c28b02bca7847c13bebedaf4df6c5a3"; + }; + + meta = { + homepage = http://pypi.python.org/pypi/chardet; + description = "Universal encoding detector"; + }; + }; + + cheetah = buildPythonPackage rec { version = "2.4.4"; name = "cheetah-${version}"; @@ -236,7 +251,7 @@ let pythonPackages = python.modules // rec { md5 = "853917116e731afbc8c8a43c37e6ddba"; }; - propagatedBuildInputs = [ markdown ]; + buildInputs = [ markdown ]; meta = { homepage = http://www.cheetahtemplate.org/; @@ -246,14 +261,18 @@ let pythonPackages = python.modules // rec { cherrypy = buildPythonPackage (rec { - name = "cherrypy-3.1.2"; + name = "cherrypy-3.2.2"; src = fetchurl { - url = "http://download.cherrypy.org/cherrypy/3.1.2/CherryPy-3.1.2.tar.gz"; - sha256 = "1xlvanhnxgvwd7vvypbafyl6yqfkpnwa9rs9k3058z84gd86bz8d"; + url = "http://download.cherrypy.org/cherrypy/3.2.2/CherryPy-3.2.2.tar.gz"; + sha256 = "14dn129h69wj0h8yr0bjwbrk8kygl6mkfnxc5m3fxhlm4xb8hnnw"; }; + buildInputs = [ markdown nose ]; + + # XXX: tests hang doCheck = false; + checkPhase = "cd cherrypy && nosetests -s test/"; meta = { homepage = "http://www.cherrypy.org"; @@ -279,13 +298,15 @@ let pythonPackages = python.modules // rec { }); cssutils = buildPythonPackage (rec { - name = "cssutils-0.9.7a6"; + name = "cssutils-0.9.9"; src = fetchurl { - url = http://cssutils.googlecode.com/files/cssutils-0.9.7a6.zip; - sha256 = "1i5n97l20kn2w9v6x8ybcdnl323vy8lcc5qlxz5l89di36a2skgw"; + url = "http://pypi.python.org/packages/source/c/cssutils/${name}.zip"; + md5 = "5f8ea824cc0e0518b574da20e895be08"; }; + buildInputs = [ chardet mock ]; + # The tests fail - I don't know why doCheck = false; @@ -299,11 +320,11 @@ let pythonPackages = python.modules // rec { }); darcsver = buildPythonPackage (rec { - name = "darcsver-1.7.2"; + name = "darcsver-1.7.4"; src = fetchurl { url = "http://pypi.python.org/packages/source/d/darcsver/${name}.tar.gz"; - md5 = "94ca7e8c9ea0f69c0f3fc6f9fc88f65a"; + md5 = "e38aecd1343ab8447888a479ab12cb59"; }; buildInputs = [ mock ]; @@ -313,7 +334,7 @@ let pythonPackages = python.modules // rec { # http://thread.gmane.org/gmane.comp.file-systems.tahoe.devel/3200 for a # discussion. - # Gives "ValueError: Empty module name" with no clue as to why. + # Gives: AttributeError: 'module' object has no attribute 'test_darcsver' doCheck = false; meta = { @@ -380,7 +401,8 @@ let pythonPackages = python.modules // rec { sha256 = "0wfz4nxl95jcr2f2mc5gijgighavcghg33plzbz5jyi531jpffss"; }; - doCheck = false; + doCheck = false; # has two failing tests + checkPhase = "./test/alltests.py"; meta = { homepage = http://docutils.sourceforge.net/; @@ -412,10 +434,6 @@ let pythonPackages = python.modules // rec { md5 = "ce75c7c3c86741175a84456cc5bd531e"; }; - buildInputs = [ ]; - - propagatedBuildInputs = [ ]; - meta = { homepage = http://pypi.python.org/pypi/enum/; description = "Robust enumerated type support in Python."; @@ -431,9 +449,7 @@ let pythonPackages = python.modules // rec { md5 = "4728e3bd7f72763c1e5dccac0296f8ea"; }; - buildInputs = [ nose httplib2 ]; - - propagatedBuildInputs = [ greenlet ]; + buildInputs = [ nose httplib2 greenlet ]; PYTHON_EGG_CACHE = "`pwd`/.egg-cache"; @@ -468,10 +484,11 @@ let pythonPackages = python.modules // rec { sha256 = "8b3e4fc678c5c41483b3130666583a1c3909713adcd325204daded7b67171ed5"; }; - propagatedBuildInputs = [ twisted pkgs.pyopenssl ]; + buildInputs = [ twisted ]; + propagatedBuildInputs = [ pkgs.pyopenssl ]; # For some reason "python setup.py test" doesn't work with Python 2.6. - doCheck = false; + #doCheck = false; meta = { homepage = http://foolscap.lothar.com/; @@ -643,14 +660,14 @@ let pythonPackages = python.modules // rec { libcloud = buildPythonPackage (rec { - name = "libcloud-0.3.1"; + name = "libcloud-0.8.0"; src = fetchurl { - url = mirror://apache/incubator/libcloud/apache-libcloud-incubating-0.3.1.tar.bz2; - sha256 = "11qilrs4sd4c1mkd64ikrjsc2vwrshhc54n5mh4xrark9c7ayp0y"; + url = "http://pypi.python.org/packages/source/a/apache-libcloud/apache-${name}.tar.bz2"; + md5 = "b0ed4698b2be329f2339a77fd40ca7ff"; }; - buildInputs = [ zopeInterface ]; + buildInputs = [ mock zopeInterface ]; preConfigure = "cp test/secrets.py-dist test/secrets.py"; @@ -835,6 +852,24 @@ let pythonPackages = python.modules // rec { }); + # minimock = buildPythonPackage (rec { + # name = "minimock-1.2.7"; + + # src = fetchurl { + # url = "http://pypi.python.org/packages/source/M/MiniMock/MiniMock-1.2.7.tar.gz"; + # md5 = "31e813667ed46b6990630a0f5bd62d94"; + # }; + + # meta = { + # description = "The simplest possible mock library"; + + # homepage = http://pypi.python.org/pypi/MiniMock/; + + # license = "MIT-style"; + # }; + # }); + + mock = buildPythonPackage (rec { name = "mock-0.7.0"; @@ -1333,7 +1368,7 @@ let pythonPackages = python.modules // rec { name = "pycurl-7.19.0"; src = fetchurl { - url = "http://pypi.python.org/packages/source/p/pycryptopp/${name}.tar.gz"; + url = "http://pycurl.sourceforge.net/download/pycurl-7.19.0.tar.gz"; sha256 = "0hh6icdbp7svcq0p57zf520ifzhn7jw64x07k99j7h57qpy2sy7b"; }; @@ -1341,11 +1376,6 @@ let pythonPackages = python.modules // rec { doCheck = false; - postInstall = '' - find $out -name easy-install.pth | xargs rm -v - find $out -name 'site.py*' | xargs rm -v - ''; - meta = { homepage = http://pycurl.sourceforge.net/; @@ -1411,13 +1441,13 @@ let pythonPackages = python.modules // rec { }; pylint = buildPythonPackage rec { - name = "pylint-0.23.0"; + name = "pylint-0.25.1"; src = fetchurl { - url = "http://ftp.logilab.org/pub/pylint/${name}.tar.gz"; - sha256 = "07091avcc2b374i5f3blszmawjcin8xssjfryz91qbxybb8r7c6d"; + url = "http://pypi.python.org/packages/source/p/pylint/${name}.tar.gz"; + md5 = "728bbc2b339bc3749af013709a7f87a5"; }; - propagatedBuildInputs = [astng]; + propagatedBuildInputs = [ astng ]; }; pymacs = pkgs.stdenv.mkDerivation rec { @@ -1548,13 +1578,13 @@ let pythonPackages = python.modules // rec { }; }); - + # XXX: currently fails to build pysvn = pkgs.stdenv.mkDerivation { - name = "pysvn-1.7.2"; + name = "pysvn-1.7.5"; src = fetchurl { - url = "http://pysvn.barrys-emacs.org/source_kits/pysvn-1.7.2.tar.gz"; - sha256 = "2b2980d200515e754e00a12d99dbce25c1ea90fddf8cba2bfa354c9305c5e455"; + url = "http://pysvn.barrys-emacs.org/source_kits/pysvn-1.7.5.tar.gz"; + sha256 = "cb9664de62a85adba8471eda1894c3831d3400131feeea0e7b9cdd7c15d671ef"; }; buildInputs = [ python pkgs.subversion pkgs.apr pkgs.aprutil pkgs.expat pkgs.neon pkgs.openssl ] @@ -1563,9 +1593,9 @@ let pythonPackages = python.modules // rec { # There seems to be no way to pass that path to configure. NIX_CFLAGS_COMPILE="-I${pkgs.aprutil}/include/apr-1"; + # XXX: sort out setting of PYTHONPATH with custom configurePhase configurePhase = '' cd Source - python setup.py backport python setup.py configure \ --apr-inc-dir=${pkgs.apr}/include/apr-1 \ --apr-lib-dir=${pkgs.apr}/lib \ @@ -1674,12 +1704,9 @@ let pythonPackages = python.modules // rec { sha256 = "1c7ipk5vwqnln83rmai5jzyxkjdajdzbk5cgy1z83nyr5hbkgkqr"; }; - doCheck = false; - - postInstall = '' - find $out -name easy-install.pth | xargs rm -v - find $out -name 'site.py*' | xargs rm -v - ''; + buildInputs = [ python.modules.bsddb nose ]; + doCheck = false; # failing tests involving network + checkPhase = "python run_tests.py"; meta = { description = "RDFLib is a Python library for working with RDF, a simple yet powerful language for representing information."; @@ -2240,15 +2267,13 @@ let pythonPackages = python.modules // rec { }; hgsvn = buildPythonPackage rec { - name = "hgsvn-0.1.8"; - src = fetchurl rec { - name = "hgsvn-0.1.8.tar.gz"; - url = "http://pypi.python.org/packages/source/h/hgsvn/${name}.tar.gz#md5=56209eae48b955754e09185712123428"; - sha256 = "18a7bj1i0m4shkxmdvw1ci5i0isq5vqf0bpwgrhnk305rijvbpch"; + name = "hgsvn-0.1.9"; + src = fetchurl { + url = "http://pypi.python.org/packages/source/h/hgsvn/${name}.tar.gz"; + md5 = "901f2fb04faad5a1e7cf84abfad564fd"; }; - buildInputs = [ pkgs.setuptools ]; - doCheck = false; + buildInputs = [ nose pkgs.subversion pkgs.mercurial ]; meta = { description = "HgSVN"; From 5afbf9075e38709d89b84ff05ce3b6cf2b38100e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Mon, 27 Feb 2012 20:10:10 +0000 Subject: [PATCH 155/197] GNU Guile 1.8: Build without `-Werror'. svn path=/nixpkgs/branches/stdenv-updates/; revision=32631 --- pkgs/development/interpreters/guile/1.8.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/interpreters/guile/1.8.nix b/pkgs/development/interpreters/guile/1.8.nix index 7cb5d3e5364..bf1efbbb1a9 100644 --- a/pkgs/development/interpreters/guile/1.8.nix +++ b/pkgs/development/interpreters/guile/1.8.nix @@ -11,6 +11,9 @@ stdenv.mkDerivation rec { patches = [ ./cpp-4.5.patch ]; + # GCC 4.6 raises a number of set-but-unused warnings. + configureFlags = [ "--disable-error-on-warning" ]; + buildNativeInputs = [ makeWrapper gawk ]; propagatedBuildInputs = [ readline gmp libtool ]; selfBuildNativeInput = true; From 998c1a34698ae8ac330bdfea3cd9544b5f7d4ef4 Mon Sep 17 00:00:00 2001 From: Florian Friesdorf Date: Mon, 27 Feb 2012 21:26:59 +0000 Subject: [PATCH 156/197] fix python optfunc svn path=/nixpkgs/branches/stdenv-updates/; revision=32633 --- pkgs/top-level/python-packages.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index bdd366f7a5f..c4ee437489b 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1102,8 +1102,9 @@ let pythonPackages = python.modules // rec { name = "optfunc-git"; src = pkgs.fetchgit { - url = "http://github.com/simonw/optfunc.git"; + url = "git://github.com/simonw/optfunc.git"; rev = "e3fa034a545ed94ac5a039cf5b170c7d0ee21b7b"; + sha256 = "916f8d998529aaf1bc450462820af7bf3b0eb0e0a513e4db69781321dcd28151"; }; installCommand = '' @@ -1112,7 +1113,7 @@ let pythonPackages = python.modules // rec { cp * $dest/ ''; - doCheck = false; + checkPhase = "python test.py"; meta = { description = "A new experimental interface to optparse which works by introspecting a function definition"; From 2eb54f5062f171fbb686b900fbb347dcfe8958a2 Mon Sep 17 00:00:00 2001 From: Florian Friesdorf Date: Mon, 27 Feb 2012 22:53:44 +0000 Subject: [PATCH 157/197] fix bittorrent by using buildPythonPackage svn path=/nixpkgs/branches/stdenv-updates/; revision=32636 --- .../networking/p2p/bittorrent/builder.sh | 27 ------------------- .../networking/p2p/bittorrent/default.nix | 13 ++++++--- 2 files changed, 9 insertions(+), 31 deletions(-) delete mode 100644 pkgs/tools/networking/p2p/bittorrent/builder.sh diff --git a/pkgs/tools/networking/p2p/bittorrent/builder.sh b/pkgs/tools/networking/p2p/bittorrent/builder.sh deleted file mode 100644 index 3f30aa5c851..00000000000 --- a/pkgs/tools/networking/p2p/bittorrent/builder.sh +++ /dev/null @@ -1,27 +0,0 @@ -source $stdenv/setup - - -# Workaround for: -# File "...-python-2.4.4/lib/python2.4/posixpath.py", line 62, in join -# elif path == '' or path.endswith('/'): -# AttributeError: 'NoneType' object has no attribute 'endswith' -export HOME=$TMP - - -buildPhase() { - python setup.py build -} - - -installPhase() { - python setup.py install --prefix=$out - - # Create wrappers that set the environment correctly. - for i in $(cd $out/bin && ls); do - wrapProgram $out/bin/$i \ - --set PYTHONPATH "$(toPythonPath $out):$PYTHONPATH" - done -} - - -genericBuild diff --git a/pkgs/tools/networking/p2p/bittorrent/default.nix b/pkgs/tools/networking/p2p/bittorrent/default.nix index 1d4f43445bf..42d4236ecc1 100644 --- a/pkgs/tools/networking/p2p/bittorrent/default.nix +++ b/pkgs/tools/networking/p2p/bittorrent/default.nix @@ -1,20 +1,25 @@ { gui ? false , stdenv, fetchurl, makeWrapper -, python, wxPython ? null, pycrypto, twisted +, python, wxPython ? null, pycrypto, twisted, buildPythonPackage }: assert gui -> wxPython != null; -stdenv.mkDerivation { +buildPythonPackage rec { name = "bittorrent-5.2.2"; - builder = ./builder.sh; - src = fetchurl { url = http://download.bittorrent.com/dl/archive/BitTorrent-5.2.2.tar.gz; sha256 = "05k803hbwsyn51j4aibzdsnqxz24kw4rvr60v2c0wji8gcvy3kx9"; }; + preConfigure = '' + export HOME=$TMP + ''; + + # accesses network + doCheck = false; + buildInputs = [ python pycrypto twisted makeWrapper ] ++ stdenv.lib.optional gui wxPython; From 350edcbb9de0d3782890ccc560c761244c67ef32 Mon Sep 17 00:00:00 2001 From: Florian Friesdorf Date: Mon, 27 Feb 2012 23:49:11 +0000 Subject: [PATCH 158/197] include upstream patch for salsa validation with gcc4.6 http://sourceforge.net/apps/trac/cryptopp/changeset/529 svn path=/nixpkgs/branches/stdenv-updates/; revision=32638 --- .../libraries/crypto++/default.nix | 6 +- .../libraries/crypto++/salsa-gcc4.6.patch | 62 +++++++++++++++++++ 2 files changed, 66 insertions(+), 2 deletions(-) create mode 100644 pkgs/development/libraries/crypto++/salsa-gcc4.6.patch diff --git a/pkgs/development/libraries/crypto++/default.nix b/pkgs/development/libraries/crypto++/default.nix index 138ee6eb27f..8f39de41e55 100644 --- a/pkgs/development/libraries/crypto++/default.nix +++ b/pkgs/development/libraries/crypto++/default.nix @@ -8,8 +8,10 @@ stdenv.mkDerivation rec { sha256 = "0s7jhvnfihikqp1iwpdz03fad62xkjxci6jiahrh6f3sn664vrwq"; }; - patches = [ ./pic.patch ] - ++ stdenv.lib.optional (stdenv.system != "i686-cygwin") ./dll.patch; + patches = [ + ./pic.patch + ./salsa-gcc4.6.patch + ] ++ stdenv.lib.optional (stdenv.system != "i686-cygwin") ./dll.patch; buildInputs = [ unzip ] diff --git a/pkgs/development/libraries/crypto++/salsa-gcc4.6.patch b/pkgs/development/libraries/crypto++/salsa-gcc4.6.patch new file mode 100644 index 00000000000..609d2f55d22 --- /dev/null +++ b/pkgs/development/libraries/crypto++/salsa-gcc4.6.patch @@ -0,0 +1,62 @@ +From fbccde3578feddb16f07be981da1d0f26209fd04 Mon Sep 17 00:00:00 2001 +From: weidai +Date: Sun, 5 Jun 2011 21:07:11 +0000 +Subject: [PATCH 1/4] fix Salsa validation failure when compiling with GCC 4.6 + (https://sourceforge.net/apps/trac/cryptopp/ticket/12) + +git-svn-id: https://cryptopp.svn.sourceforge.net/svnroot/cryptopp/trunk@529 57ff6487-cd31-0410-9ec3-f628ee90f5f0 +--- + c5/salsa.cpp | 21 +++++++++++---------- + 1 file changed, 11 insertions(+), 10 deletions(-) + +# NOTE: remove the c5 path component + +diff --git a/salsa.cpp b/salsa.cpp +index bd216ee..bdc5d75 100755 +--- a/salsa.cpp ++++ b/salsa.cpp +@@ -122,17 +122,17 @@ void Salsa20_Policy::OperateKeystream(KeystreamOperation operation, byte *output + if (HasSSE2()) + { + #if CRYPTOPP_BOOL_X64 +- #define REG_output %4 +- #define REG_input %1 ++ #define REG_output %1 ++ #define REG_input %0 + #define REG_iterationCount %2 +- #define REG_state %3 +- #define REG_rounds %0 ++ #define REG_state %4 /* constant */ ++ #define REG_rounds %3 /* constant */ + #define REG_roundsLeft eax + #define REG_temp32 edx + #define REG_temp rdx +- #define SSE2_WORKSPACE %5 ++ #define SSE2_WORKSPACE %5 /* constant */ + +- FixedSizeAlignedSecBlock workspace; ++ CRYPTOPP_ALIGN_DATA(16) byte workspace[16*32]; + #else + #define REG_output edi + #define REG_input eax +@@ -457,12 +457,13 @@ void Salsa20_Policy::OperateKeystream(KeystreamOperation operation, byte *output + #ifdef __GNUC__ + AS_POP_IF86( bx) + ".att_syntax prefix;" +- : + #if CRYPTOPP_BOOL_X64 +- : "r" (m_rounds), "r" (input), "r" (iterationCount), "r" (m_state.data()), "r" (output), "r" (workspace.m_ptr) +- : "%eax", "%edx", "memory", "cc", "%xmm0", "%xmm1", "%xmm2", "%xmm3", "%xmm4", "%xmm5", "%xmm6", "%xmm7", "%xmm8", "%xmm9", "%xmm10", "%xmm11", "%xmm12", "%xmm13", "%xmm14", "%xmm15" ++ : "+r" (input), "+r" (output), "+r" (iterationCount) ++ : "r" (m_rounds), "r" (m_state.m_ptr), "r" (workspace) ++ : "%eax", "%rdx", "memory", "cc", "%xmm0", "%xmm1", "%xmm2", "%xmm3", "%xmm4", "%xmm5", "%xmm6", "%xmm7", "%xmm8", "%xmm9", "%xmm10", "%xmm11", "%xmm12", "%xmm13", "%xmm14", "%xmm15" + #else +- : "d" (m_rounds), "a" (input), "c" (iterationCount), "S" (m_state.data()), "D" (output) ++ : "+a" (input), "+D" (output), "+c" (iterationCount) ++ : "d" (m_rounds), "S" (m_state.m_ptr) + : "memory", "cc" + #endif + ); +-- +1.7.9.2 + From ee15dc232784394f95d3f3076af1ed016639abd2 Mon Sep 17 00:00:00 2001 From: Florian Friesdorf Date: Tue, 28 Feb 2012 00:06:36 +0000 Subject: [PATCH 159/197] Revert "fix bittorrent by using buildPythonPackage" This reverts commit c029f9f7fe86867cfd94461996dc6a6415e0e8d0. svn path=/nixpkgs/branches/stdenv-updates/; revision=32639 --- .../networking/p2p/bittorrent/builder.sh | 27 +++++++++++++++++++ .../networking/p2p/bittorrent/default.nix | 13 +++------ 2 files changed, 31 insertions(+), 9 deletions(-) create mode 100644 pkgs/tools/networking/p2p/bittorrent/builder.sh diff --git a/pkgs/tools/networking/p2p/bittorrent/builder.sh b/pkgs/tools/networking/p2p/bittorrent/builder.sh new file mode 100644 index 00000000000..3f30aa5c851 --- /dev/null +++ b/pkgs/tools/networking/p2p/bittorrent/builder.sh @@ -0,0 +1,27 @@ +source $stdenv/setup + + +# Workaround for: +# File "...-python-2.4.4/lib/python2.4/posixpath.py", line 62, in join +# elif path == '' or path.endswith('/'): +# AttributeError: 'NoneType' object has no attribute 'endswith' +export HOME=$TMP + + +buildPhase() { + python setup.py build +} + + +installPhase() { + python setup.py install --prefix=$out + + # Create wrappers that set the environment correctly. + for i in $(cd $out/bin && ls); do + wrapProgram $out/bin/$i \ + --set PYTHONPATH "$(toPythonPath $out):$PYTHONPATH" + done +} + + +genericBuild diff --git a/pkgs/tools/networking/p2p/bittorrent/default.nix b/pkgs/tools/networking/p2p/bittorrent/default.nix index 42d4236ecc1..1d4f43445bf 100644 --- a/pkgs/tools/networking/p2p/bittorrent/default.nix +++ b/pkgs/tools/networking/p2p/bittorrent/default.nix @@ -1,25 +1,20 @@ { gui ? false , stdenv, fetchurl, makeWrapper -, python, wxPython ? null, pycrypto, twisted, buildPythonPackage +, python, wxPython ? null, pycrypto, twisted }: assert gui -> wxPython != null; -buildPythonPackage rec { +stdenv.mkDerivation { name = "bittorrent-5.2.2"; + builder = ./builder.sh; + src = fetchurl { url = http://download.bittorrent.com/dl/archive/BitTorrent-5.2.2.tar.gz; sha256 = "05k803hbwsyn51j4aibzdsnqxz24kw4rvr60v2c0wji8gcvy3kx9"; }; - preConfigure = '' - export HOME=$TMP - ''; - - # accesses network - doCheck = false; - buildInputs = [ python pycrypto twisted makeWrapper ] ++ stdenv.lib.optional gui wxPython; From 899f37d6b22415600db8a97ed6d4a5effcecc73a Mon Sep 17 00:00:00 2001 From: Florian Friesdorf Date: Tue, 28 Feb 2012 00:06:39 +0000 Subject: [PATCH 160/197] Revert "fix python optfunc" This reverts commit abf16535e7aa5b97bc084dd2953c3525d8f4b9aa. svn path=/nixpkgs/branches/stdenv-updates/; revision=32640 --- pkgs/top-level/python-packages.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index c4ee437489b..bdd366f7a5f 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1102,9 +1102,8 @@ let pythonPackages = python.modules // rec { name = "optfunc-git"; src = pkgs.fetchgit { - url = "git://github.com/simonw/optfunc.git"; + url = "http://github.com/simonw/optfunc.git"; rev = "e3fa034a545ed94ac5a039cf5b170c7d0ee21b7b"; - sha256 = "916f8d998529aaf1bc450462820af7bf3b0eb0e0a513e4db69781321dcd28151"; }; installCommand = '' @@ -1113,7 +1112,7 @@ let pythonPackages = python.modules // rec { cp * $dest/ ''; - checkPhase = "python test.py"; + doCheck = false; meta = { description = "A new experimental interface to optparse which works by introspecting a function definition"; From 762049e5038df3b46aee82879f28598cbd4d4393 Mon Sep 17 00:00:00 2001 From: Florian Friesdorf Date: Tue, 28 Feb 2012 00:06:42 +0000 Subject: [PATCH 161/197] Revert "python packages cleanup" This reverts commit 632873d81fcf9b1f85d4b2f990f92bc65dcd261a. svn path=/nixpkgs/branches/stdenv-updates/; revision=32641 --- pkgs/top-level/python-packages.nix | 161 ++++++++++++----------------- 1 file changed, 68 insertions(+), 93 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index bdd366f7a5f..81f3783eadf 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6,18 +6,12 @@ let pythonPackages = python.modules // rec { inherit (pkgs) fetchurl fetchsvn stdenv; + buildPythonPackage = import ../development/python-modules/generic { inherit (pkgs) lib unzip; inherit python wrapPython setuptools site offlineDistutils; }; - wrapPython = pkgs.makeSetupHook - { deps = pkgs.makeWrapper; - substitutions.libPrefix = python.libPrefix; - } - ../development/python-modules/generic/wrap.sh; - - ### real packages below here setuptools = import ../development/python-modules/setuptools { inherit (pkgs) stdenv fetchurl; @@ -30,19 +24,24 @@ let pythonPackages = python.modules // rec { inherit python; }; - offlineDistutils = import ../development/python-modules/offline-distutils { inherit (pkgs) stdenv; inherit python; }; - ipython = import ../shells/ipython { inherit (pkgs) stdenv fetchurl; inherit buildPythonPackage pythonPackages; }; + wrapPython = pkgs.makeSetupHook + { deps = pkgs.makeWrapper; + substitutions.libPrefix = python.libPrefix; + } + ../development/python-modules/generic/wrap.sh; + + anyjson = buildPythonPackage rec { name = "anyjson-0.3.1"; @@ -68,7 +67,7 @@ let pythonPackages = python.modules // rec { sha1 = "f124e5e4a6644bf6d1734032a01ac44db1b25a29"; }; - checkPhase = "cd tests/client_0_8/ && python run_all.py"; + doCheck = false; meta = { homepage = http://code.google.com/p/py-amqplib/; @@ -87,9 +86,7 @@ let pythonPackages = python.modules // rec { buildInputs = [ pkgs.sqlite ]; - # XXX: currently fails doCheck = false; - checkPhase = "python setup.py test"; meta = { description = "A Python wrapper for the SQLite embedded relational database engine"; @@ -106,7 +103,8 @@ let pythonPackages = python.modules // rec { sha256 = "ee6da1aaad8b08a74a33eb82264b1a2bf12a7d5aefc7e9d7d40a8f8fa9912e62"; }; - checkPhase = "python test/test_argparse.py"; + # How do we run the tests? + doCheck = false; meta = { homepage = http://code.google.com/p/argparse/; @@ -144,7 +142,8 @@ let pythonPackages = python.modules // rec { sha256 = "1gasiy5lwbhsxw27g36d88n36xbj52434klisvqhljgckd4xqcy7"; }; - checkPhase = "python BeautifulSoupTests.py"; + # No tests implemented + doCheck = false; meta = { homepage = http://www.crummy.com/software/BeautifulSoup/; @@ -215,7 +214,9 @@ let pythonPackages = python.modules // rec { md5 = "530a0614de3a669314c3acd4995c54d5"; }; - buildInputs = [ nose amqplib anyjson ]; + buildInputs = [ nose ]; + + propagatedBuildInputs = [ amqplib anyjson ]; doCheck = false; # depends on the network @@ -226,22 +227,6 @@ let pythonPackages = python.modules // rec { }; - chardet = buildPythonPackage rec { - version = "1.0.1"; - name = "chardet-${version}"; - - src = fetchurl { - url = "http://pypi.python.org/packages/source/c/chardet/${name}.tar.gz"; - md5 = "7c28b02bca7847c13bebedaf4df6c5a3"; - }; - - meta = { - homepage = http://pypi.python.org/pypi/chardet; - description = "Universal encoding detector"; - }; - }; - - cheetah = buildPythonPackage rec { version = "2.4.4"; name = "cheetah-${version}"; @@ -251,7 +236,7 @@ let pythonPackages = python.modules // rec { md5 = "853917116e731afbc8c8a43c37e6ddba"; }; - buildInputs = [ markdown ]; + propagatedBuildInputs = [ markdown ]; meta = { homepage = http://www.cheetahtemplate.org/; @@ -261,18 +246,14 @@ let pythonPackages = python.modules // rec { cherrypy = buildPythonPackage (rec { - name = "cherrypy-3.2.2"; + name = "cherrypy-3.1.2"; src = fetchurl { - url = "http://download.cherrypy.org/cherrypy/3.2.2/CherryPy-3.2.2.tar.gz"; - sha256 = "14dn129h69wj0h8yr0bjwbrk8kygl6mkfnxc5m3fxhlm4xb8hnnw"; + url = "http://download.cherrypy.org/cherrypy/3.1.2/CherryPy-3.1.2.tar.gz"; + sha256 = "1xlvanhnxgvwd7vvypbafyl6yqfkpnwa9rs9k3058z84gd86bz8d"; }; - buildInputs = [ markdown nose ]; - - # XXX: tests hang doCheck = false; - checkPhase = "cd cherrypy && nosetests -s test/"; meta = { homepage = "http://www.cherrypy.org"; @@ -298,15 +279,13 @@ let pythonPackages = python.modules // rec { }); cssutils = buildPythonPackage (rec { - name = "cssutils-0.9.9"; + name = "cssutils-0.9.7a6"; src = fetchurl { - url = "http://pypi.python.org/packages/source/c/cssutils/${name}.zip"; - md5 = "5f8ea824cc0e0518b574da20e895be08"; + url = http://cssutils.googlecode.com/files/cssutils-0.9.7a6.zip; + sha256 = "1i5n97l20kn2w9v6x8ybcdnl323vy8lcc5qlxz5l89di36a2skgw"; }; - buildInputs = [ chardet mock ]; - # The tests fail - I don't know why doCheck = false; @@ -320,11 +299,11 @@ let pythonPackages = python.modules // rec { }); darcsver = buildPythonPackage (rec { - name = "darcsver-1.7.4"; + name = "darcsver-1.7.2"; src = fetchurl { url = "http://pypi.python.org/packages/source/d/darcsver/${name}.tar.gz"; - md5 = "e38aecd1343ab8447888a479ab12cb59"; + md5 = "94ca7e8c9ea0f69c0f3fc6f9fc88f65a"; }; buildInputs = [ mock ]; @@ -334,7 +313,7 @@ let pythonPackages = python.modules // rec { # http://thread.gmane.org/gmane.comp.file-systems.tahoe.devel/3200 for a # discussion. - # Gives: AttributeError: 'module' object has no attribute 'test_darcsver' + # Gives "ValueError: Empty module name" with no clue as to why. doCheck = false; meta = { @@ -401,8 +380,7 @@ let pythonPackages = python.modules // rec { sha256 = "0wfz4nxl95jcr2f2mc5gijgighavcghg33plzbz5jyi531jpffss"; }; - doCheck = false; # has two failing tests - checkPhase = "./test/alltests.py"; + doCheck = false; meta = { homepage = http://docutils.sourceforge.net/; @@ -434,6 +412,10 @@ let pythonPackages = python.modules // rec { md5 = "ce75c7c3c86741175a84456cc5bd531e"; }; + buildInputs = [ ]; + + propagatedBuildInputs = [ ]; + meta = { homepage = http://pypi.python.org/pypi/enum/; description = "Robust enumerated type support in Python."; @@ -449,7 +431,9 @@ let pythonPackages = python.modules // rec { md5 = "4728e3bd7f72763c1e5dccac0296f8ea"; }; - buildInputs = [ nose httplib2 greenlet ]; + buildInputs = [ nose httplib2 ]; + + propagatedBuildInputs = [ greenlet ]; PYTHON_EGG_CACHE = "`pwd`/.egg-cache"; @@ -484,11 +468,10 @@ let pythonPackages = python.modules // rec { sha256 = "8b3e4fc678c5c41483b3130666583a1c3909713adcd325204daded7b67171ed5"; }; - buildInputs = [ twisted ]; - propagatedBuildInputs = [ pkgs.pyopenssl ]; + propagatedBuildInputs = [ twisted pkgs.pyopenssl ]; # For some reason "python setup.py test" doesn't work with Python 2.6. - #doCheck = false; + doCheck = false; meta = { homepage = http://foolscap.lothar.com/; @@ -660,14 +643,14 @@ let pythonPackages = python.modules // rec { libcloud = buildPythonPackage (rec { - name = "libcloud-0.8.0"; + name = "libcloud-0.3.1"; src = fetchurl { - url = "http://pypi.python.org/packages/source/a/apache-libcloud/apache-${name}.tar.bz2"; - md5 = "b0ed4698b2be329f2339a77fd40ca7ff"; + url = mirror://apache/incubator/libcloud/apache-libcloud-incubating-0.3.1.tar.bz2; + sha256 = "11qilrs4sd4c1mkd64ikrjsc2vwrshhc54n5mh4xrark9c7ayp0y"; }; - buildInputs = [ mock zopeInterface ]; + buildInputs = [ zopeInterface ]; preConfigure = "cp test/secrets.py-dist test/secrets.py"; @@ -852,24 +835,6 @@ let pythonPackages = python.modules // rec { }); - # minimock = buildPythonPackage (rec { - # name = "minimock-1.2.7"; - - # src = fetchurl { - # url = "http://pypi.python.org/packages/source/M/MiniMock/MiniMock-1.2.7.tar.gz"; - # md5 = "31e813667ed46b6990630a0f5bd62d94"; - # }; - - # meta = { - # description = "The simplest possible mock library"; - - # homepage = http://pypi.python.org/pypi/MiniMock/; - - # license = "MIT-style"; - # }; - # }); - - mock = buildPythonPackage (rec { name = "mock-0.7.0"; @@ -1368,7 +1333,7 @@ let pythonPackages = python.modules // rec { name = "pycurl-7.19.0"; src = fetchurl { - url = "http://pycurl.sourceforge.net/download/pycurl-7.19.0.tar.gz"; + url = "http://pypi.python.org/packages/source/p/pycryptopp/${name}.tar.gz"; sha256 = "0hh6icdbp7svcq0p57zf520ifzhn7jw64x07k99j7h57qpy2sy7b"; }; @@ -1376,6 +1341,11 @@ let pythonPackages = python.modules // rec { doCheck = false; + postInstall = '' + find $out -name easy-install.pth | xargs rm -v + find $out -name 'site.py*' | xargs rm -v + ''; + meta = { homepage = http://pycurl.sourceforge.net/; @@ -1441,13 +1411,13 @@ let pythonPackages = python.modules // rec { }; pylint = buildPythonPackage rec { - name = "pylint-0.25.1"; + name = "pylint-0.23.0"; src = fetchurl { - url = "http://pypi.python.org/packages/source/p/pylint/${name}.tar.gz"; - md5 = "728bbc2b339bc3749af013709a7f87a5"; + url = "http://ftp.logilab.org/pub/pylint/${name}.tar.gz"; + sha256 = "07091avcc2b374i5f3blszmawjcin8xssjfryz91qbxybb8r7c6d"; }; - propagatedBuildInputs = [ astng ]; + propagatedBuildInputs = [astng]; }; pymacs = pkgs.stdenv.mkDerivation rec { @@ -1578,13 +1548,13 @@ let pythonPackages = python.modules // rec { }; }); - # XXX: currently fails to build + pysvn = pkgs.stdenv.mkDerivation { - name = "pysvn-1.7.5"; + name = "pysvn-1.7.2"; src = fetchurl { - url = "http://pysvn.barrys-emacs.org/source_kits/pysvn-1.7.5.tar.gz"; - sha256 = "cb9664de62a85adba8471eda1894c3831d3400131feeea0e7b9cdd7c15d671ef"; + url = "http://pysvn.barrys-emacs.org/source_kits/pysvn-1.7.2.tar.gz"; + sha256 = "2b2980d200515e754e00a12d99dbce25c1ea90fddf8cba2bfa354c9305c5e455"; }; buildInputs = [ python pkgs.subversion pkgs.apr pkgs.aprutil pkgs.expat pkgs.neon pkgs.openssl ] @@ -1593,9 +1563,9 @@ let pythonPackages = python.modules // rec { # There seems to be no way to pass that path to configure. NIX_CFLAGS_COMPILE="-I${pkgs.aprutil}/include/apr-1"; - # XXX: sort out setting of PYTHONPATH with custom configurePhase configurePhase = '' cd Source + python setup.py backport python setup.py configure \ --apr-inc-dir=${pkgs.apr}/include/apr-1 \ --apr-lib-dir=${pkgs.apr}/lib \ @@ -1704,9 +1674,12 @@ let pythonPackages = python.modules // rec { sha256 = "1c7ipk5vwqnln83rmai5jzyxkjdajdzbk5cgy1z83nyr5hbkgkqr"; }; - buildInputs = [ python.modules.bsddb nose ]; - doCheck = false; # failing tests involving network - checkPhase = "python run_tests.py"; + doCheck = false; + + postInstall = '' + find $out -name easy-install.pth | xargs rm -v + find $out -name 'site.py*' | xargs rm -v + ''; meta = { description = "RDFLib is a Python library for working with RDF, a simple yet powerful language for representing information."; @@ -2267,13 +2240,15 @@ let pythonPackages = python.modules // rec { }; hgsvn = buildPythonPackage rec { - name = "hgsvn-0.1.9"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/h/hgsvn/${name}.tar.gz"; - md5 = "901f2fb04faad5a1e7cf84abfad564fd"; + name = "hgsvn-0.1.8"; + src = fetchurl rec { + name = "hgsvn-0.1.8.tar.gz"; + url = "http://pypi.python.org/packages/source/h/hgsvn/${name}.tar.gz#md5=56209eae48b955754e09185712123428"; + sha256 = "18a7bj1i0m4shkxmdvw1ci5i0isq5vqf0bpwgrhnk305rijvbpch"; }; - buildInputs = [ nose pkgs.subversion pkgs.mercurial ]; + buildInputs = [ pkgs.setuptools ]; + doCheck = false; meta = { description = "HgSVN"; From 013c915777d2c0580a11cbfee902e1d8676da9c1 Mon Sep 17 00:00:00 2001 From: Florian Friesdorf Date: Tue, 28 Feb 2012 00:06:46 +0000 Subject: [PATCH 162/197] Revert "enable preConfigure for python packages again" This reverts commit a513314290ba0d78400ea4902301f421e0fecdd2. svn path=/nixpkgs/branches/stdenv-updates/; revision=32642 --- pkgs/development/python-modules/generic/default.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/generic/default.nix b/pkgs/development/python-modules/generic/default.nix index a00699a4bbd..8197e5e7431 100644 --- a/pkgs/development/python-modules/generic/default.nix +++ b/pkgs/development/python-modules/generic/default.nix @@ -17,8 +17,6 @@ # pollute the user environment. pythonPath ? [] -, preConfigure ? "true" - # distutils registers dependencies in .pth (good) but also creates # console_scripts for dependencies in bin/ (bad). easy_install # creates no scripts for dependencies (good) but does not register @@ -86,7 +84,7 @@ python.stdenv.mkDerivation (attrs // { # enable pth files for dependencies export PYTHONPATH="${site}/lib/${python.libPrefix}/site-packages:$PYTHONPATH" - '' + preConfigure; + ''; # XXX: I think setuptools is not needed here pythonPath = [ setuptools site ] ++ pythonPath; From 178b5b9c5b9650e2f8244d524b45f4eff783ae2c Mon Sep 17 00:00:00 2001 From: Florian Friesdorf Date: Tue, 28 Feb 2012 00:06:49 +0000 Subject: [PATCH 163/197] Revert "move checkPhase after fixupPhase for python packages" This reverts commit 413c44da228754018a2920cb556303e803a9d488. svn path=/nixpkgs/branches/stdenv-updates/; revision=32643 --- pkgs/development/python-modules/generic/builder.sh | 9 --------- pkgs/development/python-modules/generic/default.nix | 4 ---- 2 files changed, 13 deletions(-) delete mode 100644 pkgs/development/python-modules/generic/builder.sh diff --git a/pkgs/development/python-modules/generic/builder.sh b/pkgs/development/python-modules/generic/builder.sh deleted file mode 100644 index 6cad5e99aa3..00000000000 --- a/pkgs/development/python-modules/generic/builder.sh +++ /dev/null @@ -1,9 +0,0 @@ -source $stdenv/setup - -# move checkPhase from after buildPhase to after fixupPhase -phases="$prePhases unpackPhase patchPhase $preConfigurePhases \ - configurePhase $preBuildPhases buildPhase \ - $preInstallPhases installPhase fixupPhase checkPhase \ - $preDistPhases distPhase $postPhases"; - -genericBuild diff --git a/pkgs/development/python-modules/generic/default.nix b/pkgs/development/python-modules/generic/default.nix index 8197e5e7431..c208c0bcff2 100644 --- a/pkgs/development/python-modules/generic/default.nix +++ b/pkgs/development/python-modules/generic/default.nix @@ -54,7 +54,6 @@ , doCheck ? true -# run after fixupPhase , checkPhase ? '' runHook preCheck @@ -70,9 +69,6 @@ python.stdenv.mkDerivation (attrs // { inherit doCheck buildPhase checkPhase; - # moves checkPhase from after buildPhase to after fixupPhase - builder = ./builder.sh; - name = namePrefix + name; buildInputs = [ python wrapPython setuptools unzip ] ++ buildInputs ++ pythonPath; From e545a9944a1e25fd45db99f684ba8c7035ce13da Mon Sep 17 00:00:00 2001 From: Florian Friesdorf Date: Tue, 28 Feb 2012 00:06:52 +0000 Subject: [PATCH 164/197] Revert "added unzip to buildPythonPackage's buildInputs - used quite often" This reverts commit f067ecb4911f154fe2c64434abdc5a8b79625f5a. svn path=/nixpkgs/branches/stdenv-updates/; revision=32644 --- pkgs/development/python-modules/generic/default.nix | 4 ++-- pkgs/top-level/python-packages.nix | 12 +++++++++--- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/generic/default.nix b/pkgs/development/python-modules/generic/default.nix index c208c0bcff2..5f85d837c3c 100644 --- a/pkgs/development/python-modules/generic/default.nix +++ b/pkgs/development/python-modules/generic/default.nix @@ -3,7 +3,7 @@ (http://pypi.python.org/pypi/setuptools/), which represents a large number of Python packages nowadays. */ -{ python, setuptools, wrapPython, lib, site, offlineDistutils, unzip }: +{ python, setuptools, wrapPython, lib, site, offlineDistutils }: { name, namePrefix ? "python-" @@ -71,7 +71,7 @@ python.stdenv.mkDerivation (attrs // { name = namePrefix + name; - buildInputs = [ python wrapPython setuptools unzip ] ++ buildInputs ++ pythonPath; + buildInputs = [ python wrapPython setuptools ] ++ buildInputs ++ pythonPath; preConfigure = '' # do not allow distutils to make downloads, whatever install command is used diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 81f3783eadf..7e5a880c027 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -8,7 +8,7 @@ let pythonPackages = python.modules // rec { buildPythonPackage = import ../development/python-modules/generic { - inherit (pkgs) lib unzip; + inherit (pkgs) lib; inherit python wrapPython setuptools site offlineDistutils; }; @@ -84,7 +84,7 @@ let pythonPackages = python.modules // rec { sha1 = "fa4aec08e59fa5964197f59ba42408d64031675b"; }; - buildInputs = [ pkgs.sqlite ]; + buildInputs = [ pkgs.unzip pkgs.sqlite ]; doCheck = false; @@ -103,6 +103,8 @@ let pythonPackages = python.modules // rec { sha256 = "ee6da1aaad8b08a74a33eb82264b1a2bf12a7d5aefc7e9d7d40a8f8fa9912e62"; }; + buildInputs = [ pkgs.unzip ]; + # How do we run the tests? doCheck = false; @@ -286,6 +288,8 @@ let pythonPackages = python.modules // rec { sha256 = "1i5n97l20kn2w9v6x8ybcdnl323vy8lcc5qlxz5l89di36a2skgw"; }; + buildInputs = [ pkgs.unzip ]; + # The tests fail - I don't know why doCheck = false; @@ -1637,7 +1641,7 @@ let pythonPackages = python.modules // rec { sha256 = "204aca8b42dbe90e460794d743dd16182011da85507bfd4f092f9f76e0688040"; }; - buildInputs = [ pkgs.pyrex ]; + buildInputs = [ pkgs.unzip pkgs.pyrex ]; propagatedBuildInputs = [ pkgs.libyaml ]; meta = { @@ -2113,6 +2117,8 @@ let pythonPackages = python.modules // rec { md5 = "8e46dd755f6998d471bfbcb4def897ff"; }; + buildInputs = [ pkgs.unzip ]; + # The test requires "webtest", which is a cyclic dependency. (WTF?) doCheck = false; From 457aabfad80d6aeecf4fba6050e065acaee095fd Mon Sep 17 00:00:00 2001 From: Florian Friesdorf Date: Tue, 28 Feb 2012 00:06:56 +0000 Subject: [PATCH 165/197] Revert "logilabComman and astng fixes" This reverts commit 7f08e8d98e43fe57b68a751d77a52574cf139e04. svn path=/nixpkgs/branches/stdenv-updates/; revision=32645 --- pkgs/top-level/python-packages.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 7e5a880c027..075ebaeb729 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -130,10 +130,10 @@ let pythonPackages = python.modules // rec { name = "logilab-astng-0.21.1"; src = fetchurl { - url = "ftp://ftp.logilab.org/pub/astng/${name}.tar.gz"; + url = "http://ftp.logilab.org/pub/astng/${name}.tar.gz"; sha256 = "0rqp2vwrnv6gkzdd96j078h1sz26plh49cmnyswy2wb6l4wans67"; }; - buildInputs = [ logilabCommon ]; + propagatedBuildInputs = [logilabCommon]; }; beautifulsoup = buildPythonPackage (rec { @@ -717,10 +717,10 @@ let pythonPackages = python.modules // rec { name = "logilab-common-0.56.0"; src = fetchurl { - url = "ftp://ftp.logilab.org/pub/common/${name}.tar.gz"; + url = "http://ftp.logilab.org/pub/common/${name}.tar.gz"; sha256 = "14p557nqypbd10d8k7qs6jlm58pksiwh86wvvl0axyki00hj6971"; }; - buildInputs = [ unittest2 ]; + propagatedBuildInputs = [unittest2]; }; lxml = buildPythonPackage ( rec { From c444dd1df0d682aa3781904e328c9aedcdb8da30 Mon Sep 17 00:00:00 2001 From: Florian Friesdorf Date: Tue, 28 Feb 2012 00:06:59 +0000 Subject: [PATCH 166/197] Revert "fix typos: beautifulSoup instead of beautifulSoap" This reverts commit 679936bfcf8519321087d1ba06bdf91444c3c55f. svn path=/nixpkgs/branches/stdenv-updates/; revision=32646 --- pkgs/top-level/python-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 075ebaeb729..a5ba0d99600 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -136,8 +136,8 @@ let pythonPackages = python.modules // rec { propagatedBuildInputs = [logilabCommon]; }; - beautifulsoup = buildPythonPackage (rec { - name = "beautifulsoup-3.0.8"; + beautifulsoap = buildPythonPackage (rec { + name = "beautifulsoap-3.0.8"; src = fetchurl { url = "http://www.crummy.com/software/BeautifulSoup/download/3.x/BeautifulSoup-3.0.8.tar.gz"; From 5f3d291001dc28bf366de2ee62e63cc336d44a7e Mon Sep 17 00:00:00 2001 From: Florian Friesdorf Date: Tue, 28 Feb 2012 00:07:02 +0000 Subject: [PATCH 167/197] Revert "fix python libxml2" This reverts commit 60a68234014b282804a1d434807d912949ea79ac. svn path=/nixpkgs/branches/stdenv-updates/; revision=32647 --- pkgs/top-level/python-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index a5ba0d99600..6cd2c4cb61b 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -675,7 +675,7 @@ let pythonPackages = python.modules // rec { configureFlags = "--with-python=${python}"; postConfigure = let - changeIconv = ''-e "s:^iconv_includes.*:iconv_includes=r'${pkgs.libxml2.libiconv}':"''; + changeIconv = "-e s:^iconv_includes.*:iconv_includes=r'${pkgs.libxml2.libiconv}':"; in '' cd python From 0d8bea54e069c916858f1f57403819e2dacc0b09 Mon Sep 17 00:00:00 2001 From: Florian Friesdorf Date: Tue, 28 Feb 2012 00:07:05 +0000 Subject: [PATCH 168/197] Revert "Trying to fix the tarball, related to a problem introduced in 32596." This reverts commit d5172b093cb152e150620eee36141dcf7feb259d. svn path=/nixpkgs/branches/stdenv-updates/; revision=32648 --- pkgs/top-level/python-packages.nix | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 6cd2c4cb61b..49e3901aa7b 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -674,15 +674,12 @@ let pythonPackages = python.modules // rec { configureFlags = "--with-python=${python}"; - postConfigure = let - changeIconv = "-e s:^iconv_includes.*:iconv_includes=r'${pkgs.libxml2.libiconv}':"; - in - '' - cd python - sed -i setup.py \ - -e "s:^ROOT.*:ROOT = r'${pkgs.libxml2}':" \ - ${if pkgs.libxml2.libiconv != null then changeIconv else ""} - ''; + postConfigure = '' + cd python + sed -i setup.py \ + -e "s:^ROOT.*:ROOT = r'${pkgs.libxml2}':" \ + -e "s:^iconv_includes.*:iconv_includes= r'${pkgs.libxml2.libiconv}':" + ''; # has no tests doCheck = false; From 360ec296a64c8ec397a340d33873862854f69031 Mon Sep 17 00:00:00 2001 From: Florian Friesdorf Date: Tue, 28 Feb 2012 00:07:08 +0000 Subject: [PATCH 169/197] Revert "adapted xpf to new libxml2Python" This reverts commit b1f634f3d384a39e015d69e348cf220855457049. svn path=/nixpkgs/branches/stdenv-updates/; revision=32649 --- pkgs/tools/text/xml/xpf/default.nix | 10 ++++------ pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/tools/text/xml/xpf/default.nix b/pkgs/tools/text/xml/xpf/default.nix index f17a47e6be3..fa8e8078362 100644 --- a/pkgs/tools/text/xml/xpf/default.nix +++ b/pkgs/tools/text/xml/xpf/default.nix @@ -1,4 +1,6 @@ -{ stdenv, fetchurl, python, libxml2Python }: +{stdenv, fetchurl, python, libxml2}: + +assert libxml2.pythonSupport == true; stdenv.mkDerivation { name = "xpf-0.2"; @@ -8,11 +10,7 @@ stdenv.mkDerivation { md5 = "d92658828139e1495e052d0cfe25d312"; }; - buildInputs = [ python libxml2Python ]; - - preConfigure = '' - sed -i configure -e 's:test -e .*/libxml2.py":python -c "import libxml2":' - ''; + buildInputs = [python libxml2]; meta = { description = "XML Pipes and Filters - command line tools for manipulating and querying XML data"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 76d89d5df88..68537248710 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1629,7 +1629,9 @@ let xorriso = callPackage ../tools/cd-dvd/xorriso { }; - xpf = callPackage ../tools/text/xml/xpf { }; + xpf = callPackage ../tools/text/xml/xpf { + libxml2 = libxml2Python; + }; xsel = callPackage ../tools/misc/xsel { }; From c5a2f289f68f62d018bf605456e6c67149e5f0ec Mon Sep 17 00:00:00 2001 From: Florian Friesdorf Date: Tue, 28 Feb 2012 00:07:12 +0000 Subject: [PATCH 170/197] Revert "separate libxml2 python bindings, added libconvOrLibC dependency" This reverts commit 614b18668433329cc5686c34b51a63e51c86c9f4. svn path=/nixpkgs/branches/stdenv-updates/; revision=32650 --- .../development/libraries/libxml2/default.nix | 12 ++++++-- pkgs/top-level/all-packages.nix | 8 +++-- pkgs/top-level/python-packages.nix | 29 ------------------- 3 files changed, 15 insertions(+), 34 deletions(-) diff --git a/pkgs/development/libraries/libxml2/default.nix b/pkgs/development/libraries/libxml2/default.nix index 1907a470b68..fe3b6bd6487 100644 --- a/pkgs/development/libraries/libxml2/default.nix +++ b/pkgs/development/libraries/libxml2/default.nix @@ -1,4 +1,6 @@ -{ stdenv, fetchurl, libiconvOrLibc, zlib }: +{stdenv, fetchurl, zlib, python ? null, pythonSupport ? true }: + +assert pythonSupport -> python != null; stdenv.mkDerivation { name = "libxml2-2.7.7"; @@ -8,11 +10,15 @@ stdenv.mkDerivation { sha256 = "03kkknm7xl77qfdig8mzalsi8ljsyblzin18gy3h8zranffrpyzs"; }; - propagatedBuildInputs = [ libiconvOrLibc zlib ]; + configureFlags = '' + ${if pythonSupport then "--with-python=${python}" else ""} + ''; + + propagatedBuildInputs = [zlib]; setupHook = ./setup-hook.sh; - passthru = { libiconv = libiconvOrLibc; }; + passthru = {inherit pythonSupport;}; meta = { homepage = http://xmlsoft.org/; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 68537248710..30f2532abdd 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4234,9 +4234,13 @@ let libxmi = callPackage ../development/libraries/libxmi { }; - libxml2 = callPackage ../development/libraries/libxml2 { }; + libxml2 = callPackage ../development/libraries/libxml2 { + pythonSupport = false; + }; - libxml2Python = pythonPackages.libxml2; + libxml2Python = libxml2.override { + pythonSupport = true; + }; libxmlxx = callPackage ../development/libraries/libxmlxx { inherit (gtkLibs) glibmm; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 49e3901aa7b..b8d26e94a9a 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -665,35 +665,6 @@ let pythonPackages = python.modules // rec { }); - libxml2 = buildPythonPackage (rec { - name = pkgs.libxml2.name; - src = pkgs.libxml2.src; - - buildInputs = [ python ]; - propagatedBuildInputs = [ pkgs.libxml2 ]; - - configureFlags = "--with-python=${python}"; - - postConfigure = '' - cd python - sed -i setup.py \ - -e "s:^ROOT.*:ROOT = r'${pkgs.libxml2}':" \ - -e "s:^iconv_includes.*:iconv_includes= r'${pkgs.libxml2.libiconv}':" - ''; - - # has no tests - doCheck = false; - - passthru = { lib = pkgs.libxml2; }; - - meta = { - homepage = http://xmlsoft.org/; - description = "Python bindings for libxml2"; - license = "bsd"; - }; - }); - - lockfile = buildPythonPackage rec { name = "lockfile-0.9.1"; From 92da3fd865675422776db0dc1f0196c8043a982d Mon Sep 17 00:00:00 2001 From: Florian Friesdorf Date: Tue, 28 Feb 2012 00:07:16 +0000 Subject: [PATCH 171/197] Revert "PYTHONPATH in preConfigure instead of configurePhase" This reverts commit a9873e9412d5ffb333baaf33502c8dff62548fa6. svn path=/nixpkgs/branches/stdenv-updates/; revision=32651 --- pkgs/development/python-modules/generic/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/generic/default.nix b/pkgs/development/python-modules/generic/default.nix index 5f85d837c3c..6eaa67562d2 100644 --- a/pkgs/development/python-modules/generic/default.nix +++ b/pkgs/development/python-modules/generic/default.nix @@ -73,7 +73,7 @@ python.stdenv.mkDerivation (attrs // { buildInputs = [ python wrapPython setuptools ] ++ buildInputs ++ pythonPath; - preConfigure = '' + configurePhase = '' # do not allow distutils to make downloads, whatever install command is used export PYTHONPATH="${setuptools}/lib/${python.libPrefix}:$PYTHONPATH" export PYTHONPATH="${offlineDistutils}/lib/${python.libPrefix}:$PYTHONPATH" From 2ea5e2b5766ae77f8b5db010f0d6aaf8b8cff02b Mon Sep 17 00:00:00 2001 From: Florian Friesdorf Date: Tue, 28 Feb 2012 00:07:19 +0000 Subject: [PATCH 172/197] Revert "suffix pythonpath" This reverts commit a9a2b1e0dd8cdbb1dff3253d303b35d41f29b0f9. svn path=/nixpkgs/branches/stdenv-updates/; revision=32652 --- pkgs/development/python-modules/generic/wrap.sh | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/generic/wrap.sh b/pkgs/development/python-modules/generic/wrap.sh index 756faaa13c0..9f3803f791b 100644 --- a/pkgs/development/python-modules/generic/wrap.sh +++ b/pkgs/development/python-modules/generic/wrap.sh @@ -30,16 +30,10 @@ wrapPythonProgramsIn() { sed -i "$i" -e "1 s^.*/env[ ]*python^#! $python^" fi - # PYTHONPATH is suffixed, PATH is prefixed. Reasoning: - # PATH is set in the environment and our packages' bin need to - # be chosen over the default PATH. PYTHONPATH is usually not - # set, so we can use it to override the modules chosen at - # install time. If we would want the same for PATH we could - # introduce PATH_OVERWRITE or similar. if head -n1 "$i" | grep -q /python; then echo "wrapping \`$i'..." wrapProgram "$i" \ - --suffix PYTHONPATH ":" "$program_PYTHONPATH" \ + --prefix PYTHONPATH ":" "$program_PYTHONPATH" \ --prefix PATH ":" $program_PATH fi done From bf1fe3aa09e4bb33ee08e21ddef7c0dfa75c6858 Mon Sep 17 00:00:00 2001 From: Florian Friesdorf Date: Tue, 28 Feb 2012 00:07:23 +0000 Subject: [PATCH 173/197] Revert "pysite support for pythonXYFull wrapper" This reverts commit f77b9a16a9ef52951a601997593dc557a42660b9. svn path=/nixpkgs/branches/stdenv-updates/; revision=32653 --- .../interpreters/python/wrapper-builder.sh | 13 ------------- pkgs/development/interpreters/python/wrapper.nix | 1 - 2 files changed, 14 deletions(-) delete mode 100644 pkgs/development/interpreters/python/wrapper-builder.sh diff --git a/pkgs/development/interpreters/python/wrapper-builder.sh b/pkgs/development/interpreters/python/wrapper-builder.sh deleted file mode 100644 index f3353c32ef1..00000000000 --- a/pkgs/development/interpreters/python/wrapper-builder.sh +++ /dev/null @@ -1,13 +0,0 @@ -source $stdenv/setup - -preConfigure() { - PYTHONPATH='$( - # activate site if installed - bindir=$(dirname "$0") - pysite="$bindir/pysite" - relpath=$(test -x "$pysite" && "$pysite" path) - echo -n ${relpath:+"$relpath":} -)'"$PYTHONPATH" -} - -genericBuild diff --git a/pkgs/development/interpreters/python/wrapper.nix b/pkgs/development/interpreters/python/wrapper.nix index f1d2471c942..0522a47d17b 100644 --- a/pkgs/development/interpreters/python/wrapper.nix +++ b/pkgs/development/interpreters/python/wrapper.nix @@ -7,7 +7,6 @@ stdenv.mkDerivation { name = "python-${python.version}-wrapper"; buildInputs = [ makeWrapper ]; - builder = ./wrapper-builder.sh; propagatedBuildInputs = [ python ] ++ extraLibs; unpackPhase = "true"; From 2d2c8b3e599149b60602f28e7f47c176cc95abad Mon Sep 17 00:00:00 2001 From: Florian Friesdorf Date: Tue, 28 Feb 2012 00:07:27 +0000 Subject: [PATCH 174/197] Revert "include site in pythonpath of wrapped scripts, if python-site is installed" This reverts commit 1ac12b0d4b64936104cb6031b02c92c3d1845ae5. svn path=/nixpkgs/branches/stdenv-updates/; revision=32654 --- pkgs/development/python-modules/generic/wrap.sh | 10 +--------- pkgs/development/python-modules/site/default.nix | 10 ---------- pkgs/development/python-modules/site/pysite | 13 ------------- 3 files changed, 1 insertion(+), 32 deletions(-) delete mode 100644 pkgs/development/python-modules/site/pysite diff --git a/pkgs/development/python-modules/generic/wrap.sh b/pkgs/development/python-modules/generic/wrap.sh index 9f3803f791b..65f3229ca7c 100644 --- a/pkgs/development/python-modules/generic/wrap.sh +++ b/pkgs/development/python-modules/generic/wrap.sh @@ -15,14 +15,6 @@ wrapPythonProgramsIn() { _addToPythonPath $i done - program_PYTHONPATH='$( - # activate site if installed - bindir=$(dirname "$0") - pysite="$bindir/pysite" - relpath=$(test -x "$pysite" && "$pysite" path) - echo -n ${relpath:+"$relpath":} -)'"$program_PYTHONPATH" - for i in $(find "$dir" -type f -perm +0100); do # Rewrite "#! .../env python" to "#! /nix/store/.../python". @@ -33,7 +25,7 @@ wrapPythonProgramsIn() { if head -n1 "$i" | grep -q /python; then echo "wrapping \`$i'..." wrapProgram "$i" \ - --prefix PYTHONPATH ":" "$program_PYTHONPATH" \ + --prefix PYTHONPATH ":" $program_PYTHONPATH \ --prefix PATH ":" $program_PATH fi done diff --git a/pkgs/development/python-modules/site/default.nix b/pkgs/development/python-modules/site/default.nix index c2dc99d5a43..98a14850dbe 100644 --- a/pkgs/development/python-modules/site/default.nix +++ b/pkgs/development/python-modules/site/default.nix @@ -12,16 +12,6 @@ stdenv.mkDerivation rec { dst=$out/lib/${python.libPrefix}/site-packages mkdir -p $dst cat ${./site.py} >> $dst/site.py - - # by providing content for bin/ we make sure, that python or - # some other script is linked instead of the bin/ directory - # itself. This is needed for the wrappers to make all site - # packages available if site is installed. - mkdir $out/bin - cat ${./pysite} >> $out/bin/pysite - substituteInPlace $out/bin/pysite \ - --replace PYTHON_LIB_PREFIX ${python.libPrefix} - chmod +x $out/bin/pysite ''; meta = { diff --git a/pkgs/development/python-modules/site/pysite b/pkgs/development/python-modules/site/pysite deleted file mode 100644 index b10a24014ce..00000000000 --- a/pkgs/development/python-modules/site/pysite +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/bash - -python=PYTHON_LIB_PREFIX - -case "$1" in - path) - echo $(dirname $0)/../lib/$python/site-packages - ;; - *) - echo Usage: - echo " $(basename $0) path" - exit 1 -esac From 4b4f6ece3edd36e0d35bd41e00750cea24294ef2 Mon Sep 17 00:00:00 2001 From: Florian Friesdorf Date: Tue, 28 Feb 2012 00:07:30 +0000 Subject: [PATCH 175/197] Revert "removal of deps' scripts only if easy-install.pth exists" This reverts commit a74507f63e2af67cf64dc3e67bfbf2771120f67e. svn path=/nixpkgs/branches/stdenv-updates/; revision=32655 --- .../python-modules/generic/default.nix | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/pkgs/development/python-modules/generic/default.nix b/pkgs/development/python-modules/generic/default.nix index 6eaa67562d2..50653d1abc4 100644 --- a/pkgs/development/python-modules/generic/default.nix +++ b/pkgs/development/python-modules/generic/default.nix @@ -28,19 +28,15 @@ # install the current package with easy_install.pth including dependencies python setup.py install --prefix="$out" - # plain distutils knows no dependencies - eapth="$out"/lib/${python.libPrefix}/site-packages/easy-install.pth - if [ -e "$eapth" ]; then - # remove console_scripts again, because they were created for deps, too - rm -Rf "$out"/bin + # remove console_scripts again, because they were created for deps, too + rm -Rf "$out"/bin - # run easy_install to generate scripts for the current package, - # it won't reinstall - easy_install --prefix="$out" . + # run easy_install to generate scripts for the current package, + # it won't reinstall + easy_install --prefix="$out" . - # move colliding easy_install.pth to specifically named one - mv "$eapth" $(dirname "$eapth")/${name}.pth - fi + # move colliding easy_install.pth to specifically named one + mv "$out/lib/${python.libPrefix}/site-packages/"{easy-install.pth,${name}.pth} # These cause collisions and our output is not a site anyway # If you need a site, install python-site From 4956884de5bda0f1861d018a7492ed6e0dbba16e Mon Sep 17 00:00:00 2001 From: Florian Friesdorf Date: Tue, 28 Feb 2012 00:07:33 +0000 Subject: [PATCH 176/197] Revert "do not propagate makeWrapper via pythonXYFull" This reverts commit 3ee2667e4c60c2ed850da8538cf135fe7f716f30. svn path=/nixpkgs/branches/stdenv-updates/; revision=32656 --- pkgs/development/interpreters/python/wrapper.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/python/wrapper.nix b/pkgs/development/interpreters/python/wrapper.nix index 0522a47d17b..e8e343976bc 100644 --- a/pkgs/development/interpreters/python/wrapper.nix +++ b/pkgs/development/interpreters/python/wrapper.nix @@ -6,8 +6,7 @@ stdenv.mkDerivation { name = "python-${python.version}-wrapper"; - buildInputs = [ makeWrapper ]; - propagatedBuildInputs = [ python ] ++ extraLibs; + propagatedBuildInputs = [python makeWrapper] ++ extraLibs; unpackPhase = "true"; installPhase = '' From e20d04408ead4439c2454b036ed2d63f5cdb7603 Mon Sep 17 00:00:00 2001 From: Florian Friesdorf Date: Tue, 28 Feb 2012 00:07:36 +0000 Subject: [PATCH 177/197] Revert "meta for offline-distutils" This reverts commit 8fcf025e5f80519a6f06c0b36aee007fe16a6e31. svn path=/nixpkgs/branches/stdenv-updates/; revision=32657 --- .../python-modules/offline-distutils/default.nix | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/pkgs/development/python-modules/offline-distutils/default.nix b/pkgs/development/python-modules/offline-distutils/default.nix index d325e23a9d6..2ed41b08bb7 100644 --- a/pkgs/development/python-modules/offline-distutils/default.nix +++ b/pkgs/development/python-modules/offline-distutils/default.nix @@ -18,17 +18,4 @@ stdenv.mkDerivation { allow-hosts = None EOF ''; - - meta = { - description = "distutils configured to disallow downloads"; - longDescription = '' - A normal distutils with added distutils.cfg to set allow-hosts - to None. This dissallows easy_install to download any packages. - It is used by buildPythonPackage to ensure that no packages are - downloaded during build/test/install. - ''; - license = stdenv.lib.licenses.psfl; - platforms = stdenv.lib.platforms.all; - maintainers = with stdenv.lib.maintainers; [ simons chaoflow ]; - }; } From 9159a788076d88cdb0c3a2e18522ce60c77e527f Mon Sep 17 00:00:00 2001 From: Florian Friesdorf Date: Tue, 28 Feb 2012 00:07:39 +0000 Subject: [PATCH 178/197] Revert "insert pth eggs at index of site-packages they come from" This reverts commit daa626efe76d8602c7892aaa338d526ea88bfe1b. svn path=/nixpkgs/branches/stdenv-updates/; revision=32658 --- pkgs/development/python-modules/site/site.py | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/development/python-modules/site/site.py b/pkgs/development/python-modules/site/site.py index 073484727db..b233222e1f6 100644 --- a/pkgs/development/python-modules/site/site.py +++ b/pkgs/development/python-modules/site/site.py @@ -45,7 +45,6 @@ def __boot(): sys.__egginsert = 0 # and reset the current one for item in PYTHONPATH: - sys.__egginsert = sys.path.index(os.path.abspath(item)) addsitedir(item) sys.__egginsert += oldpos # restore effective old position From 43e16d04b9194539b7fa996518194236b2f316b1 Mon Sep 17 00:00:00 2001 From: Florian Friesdorf Date: Tue, 28 Feb 2012 00:07:42 +0000 Subject: [PATCH 179/197] Revert "prevent distutils during module install from downloading and load pth files" This reverts commit 2a151d9df99f68c555a9f1fd2c80b8889561e9e3. svn path=/nixpkgs/branches/stdenv-updates/; revision=32659 --- .../python-modules/generic/default.nix | 11 +--------- .../offline-distutils/default.nix | 21 ------------------- pkgs/top-level/python-packages.nix | 6 +----- 3 files changed, 2 insertions(+), 36 deletions(-) delete mode 100644 pkgs/development/python-modules/offline-distutils/default.nix diff --git a/pkgs/development/python-modules/generic/default.nix b/pkgs/development/python-modules/generic/default.nix index 50653d1abc4..781fc273de4 100644 --- a/pkgs/development/python-modules/generic/default.nix +++ b/pkgs/development/python-modules/generic/default.nix @@ -3,7 +3,7 @@ (http://pypi.python.org/pypi/setuptools/), which represents a large number of Python packages nowadays. */ -{ python, setuptools, wrapPython, lib, site, offlineDistutils }: +{ python, setuptools, wrapPython, lib, site }: { name, namePrefix ? "python-" @@ -69,15 +69,6 @@ python.stdenv.mkDerivation (attrs // { buildInputs = [ python wrapPython setuptools ] ++ buildInputs ++ pythonPath; - configurePhase = '' - # do not allow distutils to make downloads, whatever install command is used - export PYTHONPATH="${setuptools}/lib/${python.libPrefix}:$PYTHONPATH" - export PYTHONPATH="${offlineDistutils}/lib/${python.libPrefix}:$PYTHONPATH" - - # enable pth files for dependencies - export PYTHONPATH="${site}/lib/${python.libPrefix}/site-packages:$PYTHONPATH" - ''; - # XXX: I think setuptools is not needed here pythonPath = [ setuptools site ] ++ pythonPath; diff --git a/pkgs/development/python-modules/offline-distutils/default.nix b/pkgs/development/python-modules/offline-distutils/default.nix deleted file mode 100644 index 2ed41b08bb7..00000000000 --- a/pkgs/development/python-modules/offline-distutils/default.nix +++ /dev/null @@ -1,21 +0,0 @@ -# Used during module installation to prevent easy_install and python -# setup.py install/test from downloading - -{ stdenv, python }: - -stdenv.mkDerivation { - name = "python-offline-distutils-${python.version}"; - - buildInputs = [ python ]; - - unpackPhase = "true"; - installPhase = '' - dst="$out/lib/${python.libPrefix}" - ensureDir $dst/distutils - ln -s ${python}/lib/${python.libPrefix}/distutils/* $dst/distutils/ - cat < $dst/distutils/distutils.cfg -[easy_install] -allow-hosts = None -EOF - ''; -} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b8d26e94a9a..5abc9bc8020 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -9,7 +9,7 @@ let pythonPackages = python.modules // rec { buildPythonPackage = import ../development/python-modules/generic { inherit (pkgs) lib; - inherit python wrapPython setuptools site offlineDistutils; + inherit python wrapPython setuptools site; }; @@ -24,10 +24,6 @@ let pythonPackages = python.modules // rec { inherit python; }; - offlineDistutils = import ../development/python-modules/offline-distutils { - inherit (pkgs) stdenv; - inherit python; - }; ipython = import ../shells/ipython { inherit (pkgs) stdenv fetchurl; From 3b39dff90683ae9d652c34afcd19c88887eb33ba Mon Sep 17 00:00:00 2001 From: Florian Friesdorf Date: Tue, 28 Feb 2012 00:07:48 +0000 Subject: [PATCH 180/197] Revert "include site for python wrappers to enable deps via pth files" This reverts commit dca280ab0b668553c50506ab7b31284e8477a803. svn path=/nixpkgs/branches/stdenv-updates/; revision=32660 --- pkgs/development/python-modules/generic/default.nix | 5 ++--- pkgs/development/python-modules/setuptools/default.nix | 6 +++--- pkgs/top-level/python-packages.nix | 4 ++-- 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/generic/default.nix b/pkgs/development/python-modules/generic/default.nix index 781fc273de4..210c75accee 100644 --- a/pkgs/development/python-modules/generic/default.nix +++ b/pkgs/development/python-modules/generic/default.nix @@ -3,7 +3,7 @@ (http://pypi.python.org/pypi/setuptools/), which represents a large number of Python packages nowadays. */ -{ python, setuptools, wrapPython, lib, site }: +{ python, setuptools, wrapPython, lib }: { name, namePrefix ? "python-" @@ -69,8 +69,7 @@ python.stdenv.mkDerivation (attrs // { buildInputs = [ python wrapPython setuptools ] ++ buildInputs ++ pythonPath; - # XXX: I think setuptools is not needed here - pythonPath = [ setuptools site ] ++ pythonPath; + pythonPath = [ setuptools] ++ pythonPath; # XXX: Should we run `easy_install --always-unzip'? It doesn't seem # to have a noticeable impact on small scripts. diff --git a/pkgs/development/python-modules/setuptools/default.nix b/pkgs/development/python-modules/setuptools/default.nix index c478c25a2fa..97e77a279d3 100644 --- a/pkgs/development/python-modules/setuptools/default.nix +++ b/pkgs/development/python-modules/setuptools/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, python, wrapPython, site }: +{ stdenv, fetchurl, python, wrapPython }: stdenv.mkDerivation rec { name = "setuptools-0.6c11"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "1lx1hwxkhipyh206bgl90ddnfcnb68bzcvyawczbf833fadyl3v3"; }; - buildInputs = [ python wrapPython site ]; + buildInputs = [ python wrapPython ]; buildPhase = "python setup.py build --build-base $out"; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { # remove generic files, leave setuptools.pth rm $dst/site.py* rm $dst/easy-install.pth - pythonPath=${site} wrapPythonPrograms + wrapPythonPrograms ''; doCheck = false; # doesn't work with Python 2.7 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 5abc9bc8020..cb33d056418 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -9,13 +9,13 @@ let pythonPackages = python.modules // rec { buildPythonPackage = import ../development/python-modules/generic { inherit (pkgs) lib; - inherit python wrapPython setuptools site; + inherit python wrapPython setuptools; }; setuptools = import ../development/python-modules/setuptools { inherit (pkgs) stdenv fetchurl; - inherit python wrapPython site; + inherit python wrapPython; }; From 363579bc09496e3e0ea0b2366b32ceca630df509 Mon Sep 17 00:00:00 2001 From: Florian Friesdorf Date: Tue, 28 Feb 2012 00:07:53 +0000 Subject: [PATCH 181/197] Revert "clean setuptools from colliding files - it is not using buildPythonPkg" This reverts commit 9bc390eb7b9bcbe8b4951797010efd27afbe7afd. svn path=/nixpkgs/branches/stdenv-updates/; revision=32661 --- pkgs/development/python-modules/setuptools/default.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/pkgs/development/python-modules/setuptools/default.nix b/pkgs/development/python-modules/setuptools/default.nix index 97e77a279d3..50b73aaf8f6 100644 --- a/pkgs/development/python-modules/setuptools/default.nix +++ b/pkgs/development/python-modules/setuptools/default.nix @@ -18,9 +18,6 @@ stdenv.mkDerivation rec { mkdir -p $dst PYTHONPATH=$dst:$PYTHONPATH python setup.py install --prefix=$out - # remove generic files, leave setuptools.pth - rm $dst/site.py* - rm $dst/easy-install.pth wrapPythonPrograms ''; From 833023d85a2d0c6fd8eed7f6be5be6c247c8bbc3 Mon Sep 17 00:00:00 2001 From: Florian Friesdorf Date: Tue, 28 Feb 2012 00:07:56 +0000 Subject: [PATCH 182/197] Revert "pth file with deps, only current package's scripts, no colliding files" This reverts commit 3a37caa6a278fb244eac4a6bb1452d1914159be8. svn path=/nixpkgs/branches/stdenv-updates/; revision=32662 --- .../python-modules/generic/default.nix | 28 ------------------- 1 file changed, 28 deletions(-) diff --git a/pkgs/development/python-modules/generic/default.nix b/pkgs/development/python-modules/generic/default.nix index 210c75accee..4e0b6100231 100644 --- a/pkgs/development/python-modules/generic/default.nix +++ b/pkgs/development/python-modules/generic/default.nix @@ -17,33 +17,9 @@ # pollute the user environment. pythonPath ? [] - # distutils registers dependencies in .pth (good) but also creates - # console_scripts for dependencies in bin/ (bad). easy_install - # creates no scripts for dependencies (good) but does not register - # them in pth neither (bad) - the combination gives us a pth with - # dependencies and scripts only for the package we are currently - # installing. , installCommand ? '' - # install the current package with easy_install.pth including dependencies - python setup.py install --prefix="$out" - - # remove console_scripts again, because they were created for deps, too - rm -Rf "$out"/bin - - # run easy_install to generate scripts for the current package, - # it won't reinstall easy_install --prefix="$out" . - - # move colliding easy_install.pth to specifically named one - mv "$out/lib/${python.libPrefix}/site-packages/"{easy-install.pth,${name}.pth} - - # These cause collisions and our output is not a site anyway - # If you need a site, install python-site - rm -f "$out/lib/${python.libPrefix}/site-packages/"site.py* - - # If setuptools is a dependency, it is included in $(name}.pth - rm -f "$out/lib/${python.libPrefix}/site-packages/setuptools.pth" '' , buildPhase ? "true" @@ -91,10 +67,6 @@ python.stdenv.mkDerivation (attrs // { # dependencies in the user environment (since Python modules don't # have something like an RPATH, so the only way to find the # dependencies is to have them in the PYTHONPATH variable). - # - # XXX: this is not needed for things to work (pth pulls in deps) - # but would be nice to have anyway - However, python deps end up - # in propagated-build-native-inputs if test -e $out/nix-support/propagated-build-inputs; then ln -s $out/nix-support/propagated-build-inputs $out/nix-support/propagated-user-env-packages fi From 962e6fb704fe8707ff7ce893b4a614f69486fe5f Mon Sep 17 00:00:00 2001 From: Florian Friesdorf Date: Tue, 28 Feb 2012 00:08:00 +0000 Subject: [PATCH 183/197] Revert "python site.py that loads pth files anywhere on PYTHONPATH" This reverts commit fac80449abd57c271dfb98d392e49e4135dfc50c. svn path=/nixpkgs/branches/stdenv-updates/; revision=32663 --- .../python-modules/site/default.nix | 33 -------- pkgs/development/python-modules/site/site.py | 82 ------------------- pkgs/top-level/python-packages.nix | 6 -- 3 files changed, 121 deletions(-) delete mode 100644 pkgs/development/python-modules/site/default.nix delete mode 100644 pkgs/development/python-modules/site/site.py diff --git a/pkgs/development/python-modules/site/default.nix b/pkgs/development/python-modules/site/default.nix deleted file mode 100644 index 98a14850dbe..00000000000 --- a/pkgs/development/python-modules/site/default.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ stdenv, python }: - -stdenv.mkDerivation rec { - name = "site-1.0"; - - unpackPhase = "true"; - - buildInputs = [ python ]; - - installPhase = - '' - dst=$out/lib/${python.libPrefix}/site-packages - mkdir -p $dst - cat ${./site.py} >> $dst/site.py - ''; - - meta = { - description = "Enable processing of pth files anywhere in PYTHONPATH"; - longDescription = '' - This file is normally created by easy_install / distutils in - site-packages and overrides python's default site.py. It adds - all parts of PYTHONPATH as site directories, which means pth - files are processed in them. We remove the normally created - site.py's and package it separately instead as it would cause - collisions. - - For each module we have a pth file listing the module and all - its dependencies and we include python-site into the - PYTHONPATH of wrapped python programs so they can find their - dependencies. - ''; - }; -} diff --git a/pkgs/development/python-modules/site/site.py b/pkgs/development/python-modules/site/site.py deleted file mode 100644 index b233222e1f6..00000000000 --- a/pkgs/development/python-modules/site/site.py +++ /dev/null @@ -1,82 +0,0 @@ -def __boot(): - import sys, imp, os, os.path - PYTHONPATH = os.environ.get('PYTHONPATH') - if PYTHONPATH is None or (sys.platform=='win32' and not PYTHONPATH): - PYTHONPATH = [] - else: - PYTHONPATH = PYTHONPATH.split(os.pathsep) - - pic = getattr(sys,'path_importer_cache',{}) - stdpath = sys.path[len(PYTHONPATH):] - mydir = os.path.dirname(__file__) - #print "searching",stdpath,sys.path - - for item in stdpath: - if item==mydir or not item: - continue # skip if current dir. on Windows, or my own directory - importer = pic.get(item) - if importer is not None: - loader = importer.find_module('site') - if loader is not None: - # This should actually reload the current module - loader.load_module('site') - break - else: - try: - stream, path, descr = imp.find_module('site',[item]) - except ImportError: - continue - if stream is None: - continue - try: - # This should actually reload the current module - imp.load_module('site',stream,path,descr) - finally: - stream.close() - break - else: - raise ImportError("Couldn't find the real 'site' module") - - #print "loaded", __file__ - - known_paths = dict([(makepath(item)[1],1) for item in sys.path]) # 2.2 comp - - oldpos = getattr(sys,'__egginsert',0) # save old insertion position - sys.__egginsert = 0 # and reset the current one - - for item in PYTHONPATH: - addsitedir(item) - - sys.__egginsert += oldpos # restore effective old position - - d,nd = makepath(stdpath[0]) - insert_at = None - new_path = [] - - for item in sys.path: - p,np = makepath(item) - - if np==nd and insert_at is None: - # We've hit the first 'system' path entry, so added entries go here - insert_at = len(new_path) - - if np in known_paths or insert_at is None: - new_path.append(item) - else: - # new path after the insert point, back-insert it - new_path.insert(insert_at, item) - insert_at += 1 - - sys.path[:] = new_path - -if __name__=='site': - __boot() - del __boot - - - - - - - - diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index cb33d056418..ec80fd58a02 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -19,12 +19,6 @@ let pythonPackages = python.modules // rec { }; - site = import ../development/python-modules/site { - inherit (pkgs) stdenv; - inherit python; - }; - - ipython = import ../shells/ipython { inherit (pkgs) stdenv fetchurl; inherit buildPythonPackage pythonPackages; From ff37a57373b085579ba823e058a150a957b40e38 Mon Sep 17 00:00:00 2001 From: Florian Friesdorf Date: Tue, 28 Feb 2012 10:31:28 +0000 Subject: [PATCH 184/197] Revert "remove empty readonly site-packages" This reverts commit 92b56e5686b06237c23ba41b6b8918ea643781dc. svn path=/nixpkgs/branches/stdenv-updates/; revision=32674 --- pkgs/development/interpreters/python/2.6/default.nix | 2 -- pkgs/development/interpreters/python/2.7/default.nix | 2 -- pkgs/development/interpreters/python/3.1/default.nix | 2 -- pkgs/development/interpreters/python/3.2/default.nix | 2 -- 4 files changed, 8 deletions(-) diff --git a/pkgs/development/interpreters/python/2.6/default.nix b/pkgs/development/interpreters/python/2.6/default.nix index b46c2902558..3ae16d26d61 100644 --- a/pkgs/development/interpreters/python/2.6/default.nix +++ b/pkgs/development/interpreters/python/2.6/default.nix @@ -64,8 +64,6 @@ let postInstall = '' rm -rf "$out/lib/python${majorVersion}/test" - rm "$out/lib/python${majorVersion}/site-packages/README" - rmdir "$out/lib/python${majorVersion}/site-packages/" ''; passthru = { diff --git a/pkgs/development/interpreters/python/2.7/default.nix b/pkgs/development/interpreters/python/2.7/default.nix index 58a70c5f60c..968a4859aed 100644 --- a/pkgs/development/interpreters/python/2.7/default.nix +++ b/pkgs/development/interpreters/python/2.7/default.nix @@ -78,8 +78,6 @@ let postInstall = '' rm -rf "$out/lib/python${majorVersion}/test" - rm "$out/lib/python${majorVersion}/site-packages/README" - rmdir "$out/lib/python${majorVersion}/site-packages/" ''; passthru = { diff --git a/pkgs/development/interpreters/python/3.1/default.nix b/pkgs/development/interpreters/python/3.1/default.nix index 2eed78cb49f..892af52a919 100644 --- a/pkgs/development/interpreters/python/3.1/default.nix +++ b/pkgs/development/interpreters/python/3.1/default.nix @@ -54,8 +54,6 @@ stdenv.mkDerivation { postInstall = '' rm -rf "$out/lib/python${majorVersion}/test" - rm "$out/lib/python${majorVersion}/site-packages/README" - rmdir "$out/lib/python${majorVersion}/site-packages/" ''; passthru = { diff --git a/pkgs/development/interpreters/python/3.2/default.nix b/pkgs/development/interpreters/python/3.2/default.nix index 501db22c8d3..1ab115f0469 100644 --- a/pkgs/development/interpreters/python/3.2/default.nix +++ b/pkgs/development/interpreters/python/3.2/default.nix @@ -53,8 +53,6 @@ stdenv.mkDerivation { postInstall = '' rm -rf "$out/lib/python${majorVersion}/test" - rm "$out/lib/python${majorVersion}/site-packages/README" - rmdir "$out/lib/python${majorVersion}/site-packages/" ''; passthru = { From b14a737a4d86608bd61acf08cfc479bf262e9d99 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 28 Feb 2012 11:09:36 +0000 Subject: [PATCH 185/197] * Since we're rebuilding everything that depends on Python anyway, we may as well update Python to the latest stable version. svn path=/nixpkgs/branches/stdenv-updates/; revision=32675 --- pkgs/development/interpreters/python/2.6/default.nix | 4 ++-- pkgs/development/interpreters/python/2.7/default.nix | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/interpreters/python/2.6/default.nix b/pkgs/development/interpreters/python/2.6/default.nix index 3ae16d26d61..5df2322d4f6 100644 --- a/pkgs/development/interpreters/python/2.6/default.nix +++ b/pkgs/development/interpreters/python/2.6/default.nix @@ -12,11 +12,11 @@ with stdenv.lib; let majorVersion = "2.6"; - version = "${majorVersion}.6"; + version = "${majorVersion}.7"; src = fetchurl { url = "http://www.python.org/ftp/python/${version}/Python-${version}.tar.bz2"; - md5 = "cf4e6881bb84a7ce6089e4a307f71f14"; + md5 = "0p0fd8i533zsdm6gc0jmhmdifccx4v064mh0i1hl2s6fcjhc20j5"; }; patches = diff --git a/pkgs/development/interpreters/python/2.7/default.nix b/pkgs/development/interpreters/python/2.7/default.nix index 968a4859aed..98693737676 100644 --- a/pkgs/development/interpreters/python/2.7/default.nix +++ b/pkgs/development/interpreters/python/2.7/default.nix @@ -12,11 +12,11 @@ with stdenv.lib; let majorVersion = "2.7"; - version = "${majorVersion}.1"; + version = "${majorVersion}.2"; src = fetchurl { url = "http://www.python.org/ftp/python/${version}/Python-${version}.tar.bz2"; - sha256 = "14i2c7yqa7ljmx2i2bb827n61q33zn23ax96czi8rbkyyny8gqw0"; + sha256 = "1axx9h1r157fanldmnj1q2gdw2sm0sg8h3mx1l2adddmgq3fnmsh"; }; patches = From 5a39444e7636135e26497a8654e14050028ec739 Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Thu, 1 Mar 2012 07:16:34 +0000 Subject: [PATCH 186/197] Fix wrong merge svn path=/nixpkgs/branches/stdenv-updates/; revision=32714 --- pkgs/top-level/all-packages.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a65b00f053a..b28154e7213 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1900,9 +1900,6 @@ let gcc46_real = lowPrio (wrapGCC (callPackage ../development/compilers/gcc/4.6 { inherit noSysDirs; - cross = null; - libcCross = null; - binutilsCross = null; # bootstrapping a profiled compiler does not work in the sheevaplug: # http://gcc.gnu.org/bugzilla/show_bug.cgi?id=43944 From 92f1b06907723bce3611b9c0a9849447a0cd8ccf Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Thu, 1 Mar 2012 07:19:01 +0000 Subject: [PATCH 187/197] This is sha256, not md5 svn path=/nixpkgs/branches/stdenv-updates/; revision=32715 --- pkgs/development/interpreters/python/2.6/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/interpreters/python/2.6/default.nix b/pkgs/development/interpreters/python/2.6/default.nix index 5df2322d4f6..4e36bfa1742 100644 --- a/pkgs/development/interpreters/python/2.6/default.nix +++ b/pkgs/development/interpreters/python/2.6/default.nix @@ -16,7 +16,7 @@ let src = fetchurl { url = "http://www.python.org/ftp/python/${version}/Python-${version}.tar.bz2"; - md5 = "0p0fd8i533zsdm6gc0jmhmdifccx4v064mh0i1hl2s6fcjhc20j5"; + sha256 = "0p0fd8i533zsdm6gc0jmhmdifccx4v064mh0i1hl2s6fcjhc20j5"; }; patches = From 1ef47d19cef6e9af9fbe541d06d720c4dc04517a Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Thu, 1 Mar 2012 15:09:53 +0000 Subject: [PATCH 188/197] udisks: avoid autoreconf svn path=/nixpkgs/branches/stdenv-updates/; revision=32720 --- pkgs/os-specific/linux/udisks/default.nix | 27 +++++++++------------- pkgs/os-specific/linux/udisks/purity.patch | 23 +++--------------- pkgs/top-level/all-packages.nix | 4 +--- 3 files changed, 15 insertions(+), 39 deletions(-) diff --git a/pkgs/os-specific/linux/udisks/default.nix b/pkgs/os-specific/linux/udisks/default.nix index 30353be390c..4987e90429c 100644 --- a/pkgs/os-specific/linux/udisks/default.nix +++ b/pkgs/os-specific/linux/udisks/default.nix @@ -1,7 +1,6 @@ { stdenv, fetchurl, pkgconfig, sg3_utils, udev, glib, dbus, dbus_glib , polkit, parted, lvm2, libatasmart, intltool, libuuid, mdadm -, libxslt, docbook_xsl, utillinux -, automake, autoconf, libtool, gtkdoc }: +, libxslt, docbook_xsl, utillinux }: stdenv.mkDerivation rec { name = "udisks-1.0.4"; @@ -11,33 +10,29 @@ stdenv.mkDerivation rec { sha256 = "1xgqifddwaavmjc8c30i0mdffyirsld7c6qhfyjw7f9khwv8jjw5"; }; - # Move 80-udisks.rules manually to make the patch smaller - prePatch = "mv -v data/80-udisks.rules{,.in}"; - - # Not written a patch that can be accepted upstream yet - postPatch = "sed -e 's@/sbin/mdadm@${mdadm}&@' -i data/80-udisks.rules.in"; - patches = [ ./purity.patch ]; + postPatch = + '' + sed -e 's,/sbin/mdadm,${mdadm}&,g' -e "s,@slashlibdir@,$out/lib,g" -i data/80-udisks.rules + + substituteInPlace src/main.c --replace \ + "/sbin:/bin:/usr/sbin:/usr/bin" \ + "${utillinux}/bin:${mdadm}/sbin:/var/run/current-system/sw/bin:/var/run/current-system/sw/sbin" + ''; + buildInputs = [ sg3_utils udev glib dbus dbus_glib polkit parted lvm2 libatasmart intltool libuuid libxslt docbook_xsl ]; - buildNativeInputs = [ automake autoconf libtool gtkdoc pkgconfig ]; + buildNativeInputs = [ pkgconfig ]; configureFlags = "--localstatedir=/var --enable-lvm2"; preConfigure = '' # Ensure that udisks can find the necessary programs. - substituteInPlace src/main.c --replace \ - "/sbin:/bin:/usr/sbin:/usr/bin" \ - "${utillinux}/bin:${mdadm}/sbin:/var/run/current-system/sw/bin:/var/run/current-system/sw/sbin" - - # The patch above modifies Makefile.am, so redo the whole thing. - # FIXME: Remove that ASAP---e.g., by writing the patch differently. - autoreconf -vfi ''; meta = { diff --git a/pkgs/os-specific/linux/udisks/purity.patch b/pkgs/os-specific/linux/udisks/purity.patch index 1896c757557..bf1121ddb65 100644 --- a/pkgs/os-specific/linux/udisks/purity.patch +++ b/pkgs/os-specific/linux/udisks/purity.patch @@ -1,7 +1,7 @@ -diff --git a/data/80-udisks.rules.in b/data/80-udisks.rules.in +diff --git a/data/80-udisks.rules b/data/80-udisks.rules index 6720394..60b67ed 100644 ---- a/data/80-udisks.rules.in -+++ b/data/80-udisks.rules.in +--- a/data/80-udisks.rules ++++ b/data/80-udisks.rules @@ -23,7 +23,7 @@ LABEL="ata_port_cardbus_end" # this is the case we can trigger a 'change' on the sas_expander device # when the bsg device appears) @@ -55,20 +55,3 @@ index 6720394..60b67ed 100644 # Example rule for tagging a device with a specific media type. Where and -diff --git a/data/Makefile.am b/data/Makefile.am -index ca6d8ac..ed9faa3 100644 ---- a/data/Makefile.am -+++ b/data/Makefile.am -@@ -25,7 +25,11 @@ $(dbusconf_DATA): $(dbusconf_in_files) Makefile - cp $< $@ - - udevrulesdir = $(slashlibdir)/udev/rules.d --udevrules_DATA = 80-udisks.rules -+udevrules_in_files = 80-udisks.rules.in -+udevrules_DATA = $(udevrules_in_files:.rules.in=.rules) -+ -+$(udevrules_DATA): $(udevrules_in_files) Makefile -+ @sed -e "s|\@slashlibdir\@|$(slashlibdir)|g" $< > $@ - - pkgconfigdir = $(datadir)/pkgconfig - pkgconfig_DATA = udisks.pc diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b28154e7213..ca320691c58 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5983,9 +5983,7 @@ let udev173 = callPackage ../os-specific/linux/udev/173.nix { }; udev = pkgs.udev173; - udisks = callPackage ../os-specific/linux/udisks { - inherit (gnome) gtkdoc; - }; + udisks = callPackage ../os-specific/linux/udisks { }; uml = linux.override { userModeLinux = true; From 148e234aaba0901329b83404e0356ef3d7426094 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 1 Mar 2012 21:40:46 +0000 Subject: [PATCH 189/197] * Fix broken symlink. svn path=/nixpkgs/branches/stdenv-updates/; revision=32727 --- pkgs/development/compilers/gcc/4.5/update-gcc.sh | 2 +- pkgs/development/compilers/gcc/4.6/update-gcc.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/gcc/4.5/update-gcc.sh b/pkgs/development/compilers/gcc/4.5/update-gcc.sh index dd7bcd60c1b..907772b2af8 120000 --- a/pkgs/development/compilers/gcc/4.5/update-gcc.sh +++ b/pkgs/development/compilers/gcc/4.5/update-gcc.sh @@ -1 +1 @@ -../gcc-4.4/update-gcc.sh \ No newline at end of file +../4.4/update-gcc.sh \ No newline at end of file diff --git a/pkgs/development/compilers/gcc/4.6/update-gcc.sh b/pkgs/development/compilers/gcc/4.6/update-gcc.sh index dd7bcd60c1b..907772b2af8 120000 --- a/pkgs/development/compilers/gcc/4.6/update-gcc.sh +++ b/pkgs/development/compilers/gcc/4.6/update-gcc.sh @@ -1 +1 @@ -../gcc-4.4/update-gcc.sh \ No newline at end of file +../4.4/update-gcc.sh \ No newline at end of file From 0b6223cff2ae782bcbddafac7a958197662be86c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Thu, 1 Mar 2012 21:48:25 +0000 Subject: [PATCH 190/197] GNU Ncurses: Remove patch that no longer applies. svn path=/nixpkgs/branches/stdenv-updates/; revision=32728 --- pkgs/development/libraries/ncurses/default.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pkgs/development/libraries/ncurses/default.nix b/pkgs/development/libraries/ncurses/default.nix index 93126d51135..0278f62f65d 100644 --- a/pkgs/development/libraries/ncurses/default.nix +++ b/pkgs/development/libraries/ncurses/default.nix @@ -18,10 +18,6 @@ stdenv.mkDerivation (rec { sha256 = "0fsn7xis81za62afan0vvm38bvgzg5wfmv1m86flqcj0nj7jjilh"; }; - crossAttrs = { - patches = [ ./wint_t.patch ]; - }; - configureFlags = '' --with-shared --includedir=''${out}/include --without-debug ${if unicode then "--enable-widec" else ""}${if cxx then "" else "--without-cxx-binding"} From a55fac1a8704d20acf8eccc6fb9d86beae02f400 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Thu, 1 Mar 2012 21:48:29 +0000 Subject: [PATCH 191/197] util-linux: Use `--disable-partx' when cross-building for GNU. svn path=/nixpkgs/branches/stdenv-updates/; revision=32729 --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ca320691c58..cc8e07a65d0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5330,7 +5330,7 @@ let # `libblkid' fails to build on GNU/Hurd. configureFlags = args.configureFlags + " --disable-libblkid --disable-mount --disable-libmount" - + " --disable-fsck --enable-static"; + + " --disable-fsck --enable-static --disable-partx"; doCheck = false; CPPFLAGS = # ugly hack for ugly software! lib.concatStringsSep " " From 11d1104a885bebce1b4ec226cfad648422d9669d Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 1 Mar 2012 22:22:24 +0000 Subject: [PATCH 192/197] * Sync with the trunk. svn path=/nixpkgs/branches/stdenv-updates/; revision=32731 --- .../libraries/haskell/yesod/default.nix | 4 ++-- pkgs/development/libraries/zlib/default.nix | 10 ++++++---- pkgs/tools/networking/openresolv/default.nix | 2 +- pkgs/tools/package-management/nix/unstable.nix | 16 +++++++++------- 4 files changed, 18 insertions(+), 14 deletions(-) diff --git a/pkgs/development/libraries/haskell/yesod/default.nix b/pkgs/development/libraries/haskell/yesod/default.nix index 2ab9b568313..c8e719b90e8 100644 --- a/pkgs/development/libraries/haskell/yesod/default.nix +++ b/pkgs/development/libraries/haskell/yesod/default.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "yesod"; - version = "0.10.1.1"; - sha256 = "1d64kx0jfk1d1r4k8r57y5wz84pjxs481qdnzgjfv279y467fki6"; + version = "0.10.1.3"; + sha256 = "01r9b88gsj7f1mn56nm5dyzj2s46l9pg9p7fjwkf0l8zdfmrbflw"; isLibrary = true; isExecutable = true; buildDepends = [ diff --git a/pkgs/development/libraries/zlib/default.nix b/pkgs/development/libraries/zlib/default.nix index 7517b2e498a..f3c1684fa3f 100644 --- a/pkgs/development/libraries/zlib/default.nix +++ b/pkgs/development/libraries/zlib/default.nix @@ -1,12 +1,14 @@ { stdenv, fetchurl, static ? false }: +let version = "1.2.6"; in + stdenv.mkDerivation rec { - name = "zlib-1.2.6"; + name = "zlib-${version}"; src = fetchurl { - urls = - [ "http://www.zlib.net/${name}.tar.gz" - "http://gentoo.netnitco.net/distfiles/${name}.tar.gz" + urls = + [ "http://www.zlib.net/${name}.tar.gz" # old versions vanish from here + "mirror://sourceforge/libpng/zlib/${version}/${name}.tar.gz" ]; sha256 = "06x6m33ls1606ni7275q5z392csvh18dgs55kshfnvrfal45w8r1"; }; diff --git a/pkgs/tools/networking/openresolv/default.nix b/pkgs/tools/networking/openresolv/default.nix index b2831fd4d7b..3aa818db728 100644 --- a/pkgs/tools/networking/openresolv/default.nix +++ b/pkgs/tools/networking/openresolv/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { LIBEXECDIR=$out/libexec/resolvconf VARDIR=/var/run/resolvconf MANDIR=$out/share/man - RESTARTCMD="initctl restart \1" + RESTARTCMD="false \1" EOF ''; diff --git a/pkgs/tools/package-management/nix/unstable.nix b/pkgs/tools/package-management/nix/unstable.nix index 7ad69e8353a..235f85dc51a 100644 --- a/pkgs/tools/package-management/nix/unstable.nix +++ b/pkgs/tools/package-management/nix/unstable.nix @@ -4,12 +4,12 @@ , stateDir ? "/nix/var" }: -stdenv.mkDerivation (rec { - name = "nix-1.0pre31851"; +stdenv.mkDerivation rec { + name = "nix-1.0pre2606_8afd28a"; src = fetchurl { - url = "http://hydra.nixos.org/build/1937677/download/4/${name}.tar.bz2"; - sha256 = "36f07b6b701da74f07d8c8cc43044306e570b6837555ad523701d86e5f567568"; + url = "http://hydra.nixos.org/build/2183656/download/4/${name}.tar.bz2"; + sha256 = "4f21d01563ab9e949e09997ddaa89066c40a13b27e028a6fdffc67b97dd90dcb"; }; buildNativeInputs = [ perl pkgconfig ]; @@ -46,11 +46,13 @@ stdenv.mkDerivation (rec { doCheck = true; + # Hack to get the check to succeed on Darwin. + phases = stdenv.lib.optionalString stdenv.isDarwin + "$prePhases unpackPhase patchPhase $preConfigurePhases configurePhase $preBuildPhases buildPhase $preInstallPhases installPhase checkPhase fixupPhase $preDistPhases distPhase $postPhases"; + meta = { description = "The Nix Deployment System"; homepage = http://nixos.org/; license = "LGPLv2+"; }; -} // stdenv.lib.optionalAttrs stdenv.isDarwin { - phases = "$prePhases unpackPhase patchPhase $preConfigurePhases configurePhase $preBuildPhases buildPhase $preInstallPhases installPhase checkPhase fixupPhase $preDistPhases distPhase $postPhases"; -}) +} From a753c4a170b12f6522337bc1f18d47f22cb7d277 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 1 Mar 2012 23:15:21 +0000 Subject: [PATCH 193/197] * GCC 4.6.3 and 4.5.3. svn path=/nixpkgs/branches/stdenv-updates/; revision=32734 --- pkgs/development/compilers/gcc/4.5/sources.nix | 14 +++++++------- pkgs/development/compilers/gcc/4.6/sources.nix | 16 ++++++++-------- pkgs/development/libraries/zlib/default.nix | 6 ++---- 3 files changed, 17 insertions(+), 19 deletions(-) diff --git a/pkgs/development/compilers/gcc/4.5/sources.nix b/pkgs/development/compilers/gcc/4.5/sources.nix index 6e702f79ed0..acf1ec2971c 100644 --- a/pkgs/development/compilers/gcc/4.5/sources.nix +++ b/pkgs/development/compilers/gcc/4.5/sources.nix @@ -1,26 +1,26 @@ /* Automatically generated by `update-gcc.sh', do not edit. - For GCC 4.5.2. */ + For GCC 4.5.3. */ { fetchurl, optional, version, langC, langCC, langFortran, langJava, langAda }: -assert version == "4.5.2"; +assert version == "4.5.3"; optional /* langC */ true (fetchurl { url = "mirror://gcc/releases/gcc-${version}/gcc-core-${version}.tar.bz2"; - sha256 = "d1099165702ccdfd65f2411ed8d1015452190fe6bc7b87baf124794e5c8e7464"; + sha256 = "fef7ef1396d41f4af2dacbea8826a895060a8a72d9f05546c091085b036f1f87"; }) ++ optional langCC (fetchurl { url = "mirror://gcc/releases/gcc-${version}/gcc-g++-${version}.tar.bz2"; - sha256 = "fdd45dc9158d1d5a1c2ef0054b353d5f403e29ec360c1f8e058dc7e4531fe83b"; + sha256 = "e088b9fe0016070da921f353ef8c0c2f81fd11d21e3aeb09210ab7bad080804b"; }) ++ optional langFortran (fetchurl { url = "mirror://gcc/releases/gcc-${version}/gcc-fortran-${version}.tar.bz2"; - sha256 = "19c3c8a4b23c880a369d3229ef65406fde6af47f5127d494a87f19e1de3d9a13"; + sha256 = "618e8a2334eb3e2baf00891e9b2da47f32e797520e230acddb5f02fada0006cd"; }) ++ optional langJava (fetchurl { url = "mirror://gcc/releases/gcc-${version}/gcc-java-${version}.tar.bz2"; - sha256 = "c120e2dc39dd707a3d5461744b879e41f5e642661d7b8a023fc620b24bb7a2ab"; + sha256 = "c687198d4882c9d505eeb406595dad041602a5b6c67da5cf15d4941b34d20144"; }) ++ optional langAda (fetchurl { url = "mirror://gcc/releases/gcc-${version}/gcc-ada-${version}.tar.bz2"; - sha256 = "7ed5bb26b72dfbfaf533d09e3d34df96305c09f57f5da67939087fb2726cc771"; + sha256 = "686a6d2453bc325f32ddc90edf86502dc68320c7cd6948d60d93d0b0f5965b8f"; }) ++ [] diff --git a/pkgs/development/compilers/gcc/4.6/sources.nix b/pkgs/development/compilers/gcc/4.6/sources.nix index dc85ff10b51..fd347aa8bda 100644 --- a/pkgs/development/compilers/gcc/4.6/sources.nix +++ b/pkgs/development/compilers/gcc/4.6/sources.nix @@ -1,31 +1,31 @@ /* Automatically generated by `update-gcc.sh', do not edit. - For GCC 4.6.2. */ + For GCC 4.6.3. */ { fetchurl, optional, version, langC, langCC, langFortran, langJava, langAda, langGo }: -assert version == "4.6.2"; +assert version == "4.6.3"; optional /* langC */ true (fetchurl { url = "mirror://gcc/releases/gcc-${version}/gcc-core-${version}.tar.bz2"; - sha256 = "dcbf391f05277b7e09d14d54f3bdaba5515a3a8e7dd1d8af93af3f6f68455e10"; + sha256 = "283e00881c0de258fafc5170843e4d9b14ee2a7dc4426f0d426e6be0400251c1"; }) ++ optional langCC (fetchurl { url = "mirror://gcc/releases/gcc-${version}/gcc-g++-${version}.tar.bz2"; - sha256 = "5470bea8093438cf5840fbbef3546b6dba7b0153ef6a16e142c1fba1fac6e598"; + sha256 = "b3e0c733e900e99096b0c5480f57e22e3e583ec3d83596cc2cb9986bd64b29e8"; }) ++ optional langFortran (fetchurl { url = "mirror://gcc/releases/gcc-${version}/gcc-fortran-${version}.tar.bz2"; - sha256 = "492becd732662349eaa5e7c4e458ac009df0ccb8904df54ae295d277c4d6be6f"; + sha256 = "fe1bdf3485f33e6d0a998ff7bcb42526fbf3083dbfc107c3d95a88c00739eadb"; }) ++ optional langJava (fetchurl { url = "mirror://gcc/releases/gcc-${version}/gcc-java-${version}.tar.bz2"; - sha256 = "d021a16816daeb5db9a3280909d846b38cbdb4cc0d9aa47714c49b08a81d11f1"; + sha256 = "d0f9aafbd8fe95fdee5797cd02a9a734de0078aa62a9a249b0752adabf76d6e6"; }) ++ optional langAda (fetchurl { url = "mirror://gcc/releases/gcc-${version}/gcc-ada-${version}.tar.bz2"; - sha256 = "9ac26821ad900d02ed251b62e6a0506ee12417b506a7bb9b02ec9f09e5d9c84f"; + sha256 = "7bb213ec3948646df72720580fcba3489c84aa452bd0e4238712607ef83cbdf6"; }) ++ optional langGo (fetchurl { url = "mirror://gcc/releases/gcc-${version}/gcc-go-${version}.tar.bz2"; - sha256 = "1cafbb254d70f60c39a62a39a3b236674e02c875a1775057ddd33ffafe0fd4e1"; + sha256 = "7589c16f33ad383769510bb5b9c1aeb7f865f3ae0b89b07b2370d988a4c1fe6d"; }) ++ [] diff --git a/pkgs/development/libraries/zlib/default.nix b/pkgs/development/libraries/zlib/default.nix index f3c1684fa3f..eecdc80da5e 100644 --- a/pkgs/development/libraries/zlib/default.nix +++ b/pkgs/development/libraries/zlib/default.nix @@ -13,8 +13,6 @@ stdenv.mkDerivation rec { sha256 = "06x6m33ls1606ni7275q5z392csvh18dgs55kshfnvrfal45w8r1"; }; - patches = [ ]; - configureFlags = if static then "" else "--shared"; preConfigure = '' @@ -30,7 +28,7 @@ stdenv.mkDerivation rec { crossAttrs = { dontStrip = if static then true else false; - } // (if stdenv.cross.libc == "msvcrt" then { + } // stdenv.lib.optionalAttrs (stdenv.cross.libc == "msvcrt") { configurePhase='' installFlags="BINARY_PATH=$out/bin INCLUDE_PATH=$out/include LIBRARY_PATH=$out/lib" ''; @@ -38,7 +36,7 @@ stdenv.mkDerivation rec { "-f" "win32/Makefile.gcc" "PREFIX=${stdenv.cross.config}-" ] ++ (if static then [] else [ "SHARED_MODE=1" ]); - } else {}); + }; # zlib doesn't like the automatic --disable-shared from the Cygwin stdenv. cygwinConfigureEnableShared = true; From a88fdf8ef7cd09efb795b2b3a7e41ec95bdc457f Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 2 Mar 2012 09:35:51 +0000 Subject: [PATCH 194/197] * Oops. svn path=/nixpkgs/branches/stdenv-updates/; revision=32737 --- pkgs/development/compilers/gcc/4.5/default.nix | 2 +- pkgs/development/compilers/gcc/4.6/default.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/gcc/4.5/default.nix b/pkgs/development/compilers/gcc/4.5/default.nix index 4c449fc781f..b3c639c6f0a 100644 --- a/pkgs/development/compilers/gcc/4.5/default.nix +++ b/pkgs/development/compilers/gcc/4.5/default.nix @@ -40,7 +40,7 @@ assert libelf != null -> zlib != null; with stdenv.lib; with builtins; -let version = "4.5.2"; +let version = "4.5.3"; javaEcj = fetchurl { # The `$(top_srcdir)/ecj.jar' file is automatically picked up at # `configure' time. diff --git a/pkgs/development/compilers/gcc/4.6/default.nix b/pkgs/development/compilers/gcc/4.6/default.nix index 09f5396216d..d630f5562c5 100644 --- a/pkgs/development/compilers/gcc/4.6/default.nix +++ b/pkgs/development/compilers/gcc/4.6/default.nix @@ -42,7 +42,7 @@ assert libelf != null -> zlib != null; with stdenv.lib; with builtins; -let version = "4.6.2"; +let version = "4.6.3"; javaEcj = fetchurl { # The `$(top_srcdir)/ecj.jar' file is automatically picked up at # `configure' time. From f99db3674858244a5dcedeccdc71b46821e30436 Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Mon, 5 Mar 2012 10:00:57 +0000 Subject: [PATCH 195/197] Remove unused patch Ncurses does not reference this patch since r32728. svn path=/nixpkgs/branches/stdenv-updates/; revision=32793 --- pkgs/development/libraries/ncurses/wint_t.patch | 14 -------------- 1 file changed, 14 deletions(-) delete mode 100644 pkgs/development/libraries/ncurses/wint_t.patch diff --git a/pkgs/development/libraries/ncurses/wint_t.patch b/pkgs/development/libraries/ncurses/wint_t.patch deleted file mode 100644 index c9b34efd0bd..00000000000 --- a/pkgs/development/libraries/ncurses/wint_t.patch +++ /dev/null @@ -1,14 +0,0 @@ -http://www.mail-archive.com/freewrt-developers@freewrt.org/msg01326.html ---- ncurses-5.6.orig/ncurses/curses.priv.h 2006-12-10 01:55:14.000000000 0100 -+++ ncurses-5.6/ncurses/curses.priv.h 2008-02-11 13:12:04.000000000 +0100 -@@ -253,6 +253,10 @@ color_t; - #include - #include - -+#ifndef _WINT_T -+#include -+#endif -+ - #if NCURSES_EXT_COLORS && USE_WIDEC_SUPPORT - #define if_EXT_COLORS(stmt) stmt - #define NetPair(value,p) (value).ext_color = (p), \ From b57e0d8829f08f66b1120f80de2cd3ac7c0c3042 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 6 Mar 2012 10:10:56 +0000 Subject: [PATCH 196/197] * man: Work around a bug in substituteInPlace. It loses the final newline, and man requires every line in man.conf to be terminated by a newline. We should fix the bug eventually though. * man updated to 1.6g. svn path=/nixpkgs/branches/stdenv-updates/; revision=32811 --- pkgs/tools/misc/man/default.nix | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/pkgs/tools/misc/man/default.nix b/pkgs/tools/misc/man/default.nix index 9e80cc69179..0e4568c2cd3 100644 --- a/pkgs/tools/misc/man/default.nix +++ b/pkgs/tools/misc/man/default.nix @@ -1,14 +1,14 @@ -{stdenv, fetchurl, groff, less}: +{ stdenv, fetchurl, groff, less }: -stdenv.mkDerivation { - name = "man-1.6f"; - +stdenv.mkDerivation rec { + name = "man-1.6g"; + src = fetchurl { - url = http://primates.ximian.com/~flucifredi/man/man-1.6f.tar.gz; - sha256 = "0v2z6ywhy8kd2fa3ywkqayhjdivbaqn6qvhx93a1ldw135z8q84z"; + url = "http://primates.ximian.com/~flucifredi/man/${name}.tar.gz"; + sha256 = "17wmp2ahkhl72cvfzshmck22dnq2lbjg0678swihj270yk1vip6c"; }; - buildInputs = [groff less]; + buildInputs = [ groff less ]; preBuild = '' makeFlagsArray=(bindir=$out/bin sbindir=$out/sbin libdir=$out/lib mandir=$out/share/man) @@ -30,6 +30,11 @@ stdenv.mkDerivation { substituteInPlace $out/lib/man.conf \ --replace "nroff -Tlatin1" "nroff" \ --replace "eqn -Tlatin1" "eqn -Tutf8" + + # Work around a bug in substituteInPlace. It loses the final + # newline, and man requires every line in man.conf to be + # terminated by a newline. + echo >> $out/lib/man.conf ''; meta = { From 17fe5f329af13cbeed61774e6eaded595d2d3560 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 6 Mar 2012 10:14:00 +0000 Subject: [PATCH 197/197] * man: Prefer /etc/man.conf over $out/lib/man.conf. Man only reads the first file that exists, so this is necessary to allow the builtin config to be overriden. svn path=/nixpkgs/branches/stdenv-updates/; revision=32812 --- pkgs/tools/misc/man/conf.patch | 14 ++++++++++++++ pkgs/tools/misc/man/default.nix | 5 +++++ 2 files changed, 19 insertions(+) create mode 100644 pkgs/tools/misc/man/conf.patch diff --git a/pkgs/tools/misc/man/conf.patch b/pkgs/tools/misc/man/conf.patch new file mode 100644 index 00000000000..43e8642fb34 --- /dev/null +++ b/pkgs/tools/misc/man/conf.patch @@ -0,0 +1,14 @@ +diff -ru -x '*~' man-1.6g-orig/src/man-config.c man-1.6g/src/man-config.c +--- man-1.6g-orig/src/man-config.c 2005-08-21 01:26:06.000000000 +0200 ++++ man-1.6g/src/man-config.c 2012-03-06 11:11:28.159050524 +0100 +@@ -214,8 +214,9 @@ + const char *configuration_file = "[no configuration file]"; + + char *default_config_files[] = { ++ "/etc/man.conf", + CONFIG_FILE, /* compiled-in default */ +- "/etc/man.conf", "/etc/man.config", ++ "/etc/man.config", + "/usr/lib/man.conf", "/usr/lib/man.config", + "/usr/share/misc/man.conf", "/usr/share/misc/man.config" + }; diff --git a/pkgs/tools/misc/man/default.nix b/pkgs/tools/misc/man/default.nix index 0e4568c2cd3..12e888813fb 100644 --- a/pkgs/tools/misc/man/default.nix +++ b/pkgs/tools/misc/man/default.nix @@ -17,6 +17,11 @@ stdenv.mkDerivation rec { patches = [ # Search in "share/man" relative to each path in $PATH (in addition to "man"). ./share.patch + + # Prefer /etc/man.conf over $out/lib/man.conf. Man only reads the + # first file that exists, so this is necessary to allow the + # builtin config to be overriden. + ./conf.patch ]; preConfigure = ''