* Sync with the trunk.

svn path=/nixpkgs/branches/stdenv-updates/; revision=14057

pkgs/misc/cups/default.nix

@@ -24,9 +24,6 @@ stdenv.mkDerivation {
     installFlagsArray=(BUILDROOT=$out/destdir)
   '';
 
-  # !!! Ideally, we wouldn't have Samba as a dependency of CUPS.
-  # Rather, the backend directory should be treated as configuration
-  # data generated in some other Nix expression in NixOS.
   postInstall = ''
     mv $out/destdir/$out/* $out
     rm -rf $out/destdir

pkgs/misc/my-env/default.nix

@@ -69,7 +69,40 @@ mkDerivation {
       phases=
       # only do all the setup stuff in nix-support/*
       set +e
-      source "$s"
+      if [[ -z "\$ZSH_VERSION" ]]; then
+        source "$s"
+      else
+        setopt interactivecomments
+        # fix bash indirection
+        # let's hope the bash arrays aren't used
+        # substitute is using bash array, so skip it
+        echo '
+            setopt NO_BAD_PATTERN
+            setopt NO_BANG_HIST
+            setopt NO_BG_NICE
+            setopt NO_EQUALS
+            setopt NO_FUNCTION_ARGZERO
+            setopt GLOB_SUBST
+            setopt NO_HUP
+            setopt INTERACTIVE_COMMENTS
+            setopt KSH_ARRAYS
+            setopt NO_MULTIOS
+            setopt NO_NOMATCH
+            setopt RM_STAR_SILENT
+            setopt POSIX_BUILTINS
+            setopt SH_FILE_EXPANSION
+            setopt SH_GLOB
+            setopt SH_OPTION_LETTERS
+            setopt SH_WORD_SPLIT
+          ' >> "\$tmp/script"
+        sed -e 's/\''${!\([^}]*\)}/\''${(P)\1}/g' \
+            -e 's/[[]\*\]//' \
+            -e 's/substitute() {/ substitute() { return; /' \
+            -e 's@PATH=\$@PATH=${pkgs.coreutils}/bin@' \
+            "$s" >> "\$tmp/script"
+        echo "\$tmp/script";
+        source "\$tmp/script";
+      fi
       rm -fr "\$tmp"
       ${extraCmds}
       export PATH

pkgs/misc/ntfs-3g/default.nix

@@ -2,12 +2,12 @@
 
 stdenv.mkDerivation rec {
   pname = "ntfs-3g";
-  version = "1.5012";
+  version = "2009.1.1";
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "${meta.homepage}/${name}.tgz";
-    sha256 = "e79102fdb5948f209d25432f8f5127965877fe47bed68b9270b23fc1d187735a";
+    sha256 = "0e02ff891645658c1801ba7d665c0ff3a4231e5570b974a803ffc2974ef68e45";
   };
 
   preConfigure = ''

pkgs/misc/tex/nix/find-includes.pl

@@ -82,7 +82,7 @@ while (scalar @workset > 0) {
 	} elsif (/\\includegraphics(\[.*\])?\{(.*)\}/) {
 	    my $fn2 = $2;
             die "absolute path! $fn2" if substr($fn2, 0, 1) eq "/";
-            addToWorkSetExts("$path/$fn2", ".pdf", ".png", ".ps");
+            addToWorkSetExts("$path/$fn2", ".pdf", ".png", ".ps", ".jpg");
 	} elsif (/\\pgfdeclareimage(\[.*\])?\{.*\}\{(.*)\}/) {
 	    my $fn2 = $2;
             die "absolute path! $fn2" if substr($fn2, 0, 1) eq "/";