From fd473913f596400e8a2bcd69ad677af37b2ffee3 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun, 19 Apr 2009 08:55:27 +0000
Subject: [PATCH] * Removed some obsolete nullglobs.

svn path=/nixpkgs/branches/stdenv-updates/; revision=15140
---
 pkgs/build-support/release/debian-build.nix              | 1 -
 pkgs/build-support/release/rpm-build.nix                 | 1 -
 pkgs/build-support/release/source-tarball.nix            | 1 -
 pkgs/development/interpreters/python-new/2.5/default.nix | 1 -
 4 files changed, 4 deletions(-)

diff --git a/pkgs/build-support/release/debian-build.nix b/pkgs/build-support/release/debian-build.nix
index b352e993b94..94a1508441d 100644
--- a/pkgs/build-support/release/debian-build.nix
+++ b/pkgs/build-support/release/debian-build.nix
@@ -57,7 +57,6 @@ vmTools.runInLinuxImage (stdenv.mkDerivation (
       ensureDir $out/debs
       find . -name "*.deb" -exec cp {} $out/debs \;
 
-      shopt -s nullglob
       for i in $out/debs/*.deb; do
         header "Generated DEB package: $i"
         dpkg-deb --info "$i"
diff --git a/pkgs/build-support/release/rpm-build.nix b/pkgs/build-support/release/rpm-build.nix
index 97e86dd3c68..3e12eaccba9 100644
--- a/pkgs/build-support/release/rpm-build.nix
+++ b/pkgs/build-support/release/rpm-build.nix
@@ -26,7 +26,6 @@ vmTools.buildRPM (
     ''; # */
 
     postInstall = ''
-      shopt -s nullglob
       for i in $out/rpms/*/*.rpm; do
         echo "file rpm $i" >> $out/nix-support/hydra-build-products
       done
diff --git a/pkgs/build-support/release/source-tarball.nix b/pkgs/build-support/release/source-tarball.nix
index be0345df939..579127f3a4d 100644
--- a/pkgs/build-support/release/source-tarball.nix
+++ b/pkgs/build-support/release/source-tarball.nix
@@ -49,7 +49,6 @@ stdenv.mkDerivation (
     
     postHook = ''
       ensureDir $out/nix-support
-      shopt -s nullglob
     '';  
 
     postUnpack = ''
diff --git a/pkgs/development/interpreters/python-new/2.5/default.nix b/pkgs/development/interpreters/python-new/2.5/default.nix
index 1287c1e5946..1da3b52b84f 100644
--- a/pkgs/development/interpreters/python-new/2.5/default.nix
+++ b/pkgs/development/interpreters/python-new/2.5/default.nix
@@ -543,7 +543,6 @@ in
       sed -i 's/$PYTHON/true/' istanbul-0.2.2/configure
       mkdir -p $out/bin
       export DESTDIR="$out"
-      shopt -s nullglob
     '';
     src = fetchurl {
       url = http://zaheer.merali.org/istanbul-0.2.2.tar.bz2;