* This is a stable release.

svn path=/nixpkgs/branches/0.5-release/; revision=988

NEWS

@@ -1,37 +0,0 @@
-Nix Packages 0.7
-
-* The bootstrap process for the standard build environment on Linux
-  (stdenv-linux) has been improved.  It is no longer dependent in its
-  initial bootstrap stages on the system Glibc, GCC, and other tools.
-  Rather, Nixpkgs contains a statically linked bash and curl, and uses
-  that to download other statically linked tools.  These are then used
-  to build a Glibc and dynamically linked versions of all other
-  tools.
-
-  This change also makes the bootstrap process faster.  For instance,
-  GCC is built only once instead of three times.
-
-  (Contributed by Armijn Hemel.)
-
-* Tarballs used by Nixpkgs are now obtained from the same server that
-  hosts Nixpkgs (catamaran.labs.cs.uu.nl).  This reduces the risk of
-  packages being unbuildable due to moved or deleted files on various
-  servers.
-
-* There now is a generic mechanism for building Perl modules.  See the
-  various Perl modules defined in pkgs/system/all-packages-generic.nix.
-    
-* Notable new packages:
-
-  - Qt 3
-  - MySQL
-  - MythTV
-  - Mono
-  - MonoDevelop (alpha)
-  - Xine
-
-* Notable updates:
-
-  - GCC 3.4.3
-  - Glibc 2.3.4
-  - GTK 2.6

STABLE

@@ -1 +0,0 @@
-1

VERSION

@@ -1 +0,0 @@
-0.7

maintainers/scripts/evacuate-urls.sh

@@ -1,28 +0,0 @@
-#! /bin/sh -e
-
-find . -name "*.nix" | while read fn; do
-
-    grep -E '^ *url = ' "$fn" | while read line; do
-
-        if oldURL=$(echo "$line" | sed 's^url = \(.*\);^\1^'); then
-
-            if ! echo "$oldURL" | grep -q -E ".cs.uu.nl|.stratego-language.org|java.sun.com|ut2004|linuxq3a|RealPlayer"; then
-                base=$(basename $oldURL)
-                newURL="http://catamaran.labs.cs.uu.nl/dist/tarballs/$base"
-                newPath="/mnt/scratchy/eelco/public_html/tarballs/$base"
-                echo "$fn: $oldURL -> $newURL"
-
-                if ! test -e "$newPath"; then
-                    curl --fail --location --max-redirs 20 "$oldURL" > "$newPath".tmp
-                    mv -f "$newPath".tmp "$newPath"
-                fi
-
-                sed "s^$oldURL^$newURL^" < "$fn" > "$fn".tmp
-                mv -f "$fn".tmp "$fn"
-            fi
-            
-        fi
-    
-    done
-
-done

pkgs/BUGS

@@ -14,6 +14,22 @@
     ...
 
 
+* Subtle problems can occur if the Nix store directory or one of its
+  parents is a symlink.  E.g., purity checks can barf:
+
+    impure path `/data/nix/store/099cd9aee7d056a9922fd6dd116a3f5c-gcc-3.3.3/bin/../lib/gcc-lib/i686-pc-linux-gnu/3.3.3/crtbegin.o' used in link
+
+  (This happened because /nix was a symlink to /data/nix.)  Maybe we
+  should disallow this entirely, since, exactly because it is
+  perfectly legal for a builder to expand a symlink, we can end up
+  with derivates referring to paths that existed in the build
+  environment but not in the target environment.
+
+  Disallowing this can be highly inconvenient, since it makes it
+  harder to move the Nix store to a different file system.  (On Linux,
+  `bind' mounts can help here.) 
+
+
 * In libXt:
 
 /bin/sh ./libtool --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.     -DXTHREADS -DXUSE_MTSAFE_API -I/nix/store/aadf0bd4a908da11d14f6538503b8408-libX11-6.2.1/include -I/nix/store/ba366e3b944ead64ec9b0490bb615874-xproto-6.6.1/include   -I./include/X11 -g -O2 -c -o ActionHook.lo `test -f 'ActionHook.c' || echo './'`ActionHook.c
@@ -31,25 +47,4 @@ In file included from IntrinsicI.h:55,
                  from ActionHook.c:69:
 include/X11/IntrinsicP.h:202:25: X11/ObjectP.h: No such file or directory
 
-(moved to include/X11; should edit include/Makefile.am)
-
-
-* `ld' on Mac OS X barfs if the timestamp on static libraries has
-  changed (which happens if they are installed through a substitute).
-
-  Typical error:
-
-  /usr/bin/ld: table of contents for archive: libATerm.a is out of
-  date; rerun ranlib(1) (can't load from it)
-
-  Solution: patch ld.
-
-  Non-solution: extend NAR file format to include timestamps.  We
-  don't want that because they introduce a source of non-determinism.
-  To catch problems like this one determistically, we should change
-  the timestamp on store objects to 0.
-
-
-* In gtksourceview-sharp: does the prefix patch cause problems (e.g.,
-  makefile.am says "mimeinfodir should be the same as the gnome
-  prefix")?
+(moved to include/X11; should edit include/Makefile.am)

pkgs/STABLE

@@ -0,0 +1 @@
+1

pkgs/TODO

@@ -10,3 +10,7 @@
 
 * After building gcc, filter out references to /tmp/nix... in
   .../lib/libsupc++.la and .../lib/libstdc++.la
+
+* diffutils retains a dependency on coreutils/bin/pr; causes stdenv to
+  depend on 2 copies of coreutils (the first one impure in
+  stdenv-nix-linux!)

pkgs/VERSION

@@ -0,0 +1 @@
+0.5

pkgs/applications/audio/cdparanoia/default.nix

@@ -1,11 +0,0 @@
-{stdenv, fetchurl}:
-
-stdenv.mkDerivation {
-  name = "cdparanoia-III-alpha9.8";
-  src = fetchurl {
-    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/cdparanoia-III-alpha9.8.src.tgz;
-    md5 = "7218e778b5970a86c958e597f952f193" ;
-  };
-  
-  patches = [./fix.patch];
-}

pkgs/applications/audio/cdparanoia/fix.patch

@@ -1,46 +0,0 @@
-*** cdparanoia-III-alpha9.8/interface/utils.h	Thu Apr 20 00:41:04 2000
---- cdparanoia-III-alpha9.8-old/interface/utils.h	Wed Jan 19 21:44:08 2005
-***************
-*** 110,117 ****
-      case CDDA_MESSAGE_LOGIT:
-        d->errorbuf=catstring(d->errorbuf,s);
-        break;
--     case CDDA_MESSAGE_FORGETIT:
--     default:
-      }
-    }
-  }
---- 110,115 ----
-***************
-*** 125,132 ****
-      case CDDA_MESSAGE_LOGIT:
-        d->messagebuf=catstring(d->messagebuf,s);
-        break;
--     case CDDA_MESSAGE_FORGETIT:
--     default:
-      }
-    }
-  }
---- 123,128 ----
-***************
-*** 167,174 ****
-  	}
-        }
-        break;
--     case CDDA_MESSAGE_FORGETIT:
--     default:
-      }
-    }
-    if(malloced)free(buffer);
---- 163,168 ----
-***************
-*** 203,210 ****
-  	if(!malloced)*messages=catstring(*messages,"\n");
-  	}
-        break;
--     case CDDA_MESSAGE_FORGETIT:
--     default:
-      }
-    }
-    if(malloced)free(buffer);
---- 197,202 ----

pkgs/applications/audio/flac/default.nix

@@ -1,11 +0,0 @@
-{stdenv, fetchurl, libogg}:
-
-stdenv.mkDerivation {
-  name = "flac-1.1.1";
-  src = fetchurl {
-    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/flac-1.1.1.tar.gz;
-    md5 = "c6ccddccf8ad344065698047c2fc7280" ;
-  };
-
-  buildInputs = [libogg] ;
-}

pkgs/applications/audio/lame/default.nix

@@ -1,9 +0,0 @@
-{stdenv, fetchurl}:
-
-stdenv.mkDerivation {
-  name = "lame-3.96.1";
-  src = fetchurl {
-    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/lame-3.96.1.tar.gz;
-    md5 = "e1206c46a5e276feca11a7149e2fc6ac" ;
-  };
-}

pkgs/applications/editors/eclipse/builder.sh

@@ -1,7 +0,0 @@
-set -e
-
-. $stdenv/setup
-
-$unzip/bin/unzip $src 
-mkdir $out
-mv eclipse $out/

pkgs/applications/editors/eclipse/default.nix

@@ -1,17 +0,0 @@
-{fetchurl, stdenv, unzip}:
-
-let {
-  body =
-    stdenv.mkDerivation {
-      name = "eclipse-sdk-3.0.1";
-      builder = ./builder.sh;
-      src = bindist;
-      inherit unzip;
-   };
-
-  bindist = 
-    fetchurl {
-      url = http://catamaran.labs.cs.uu.nl/dist/tarballs/eclipse-SDK-3.0.1-linux-gtk.zip;
-      md5 = "d0f743c972adf13e71a43b2dc6c9c55b";
-    };
-}

pkgs/applications/editors/emacs/builder.sh

@@ -1,13 +0,0 @@
-. $stdenv/setup
-
-myglibc=`cat ${NIX_GCC}/nix-support/orig-glibc`
-echo "glibc: $myglibc" 
-
-postConfigure() {
-  cp $myglibc/lib/crt1.o src
-  cp $myglibc/lib/crti.o src
-  cp $myglibc/lib/crtn.o src
-}
-postConfigure=postConfigure
-
-genericBuild

pkgs/applications/editors/emacs/default.nix

@@ -1,14 +0,0 @@
-{stdenv, fetchurl, xlibs}:
-
-stdenv.mkDerivation {
-  name = "emacs-21.3";
-  builder = ./builder.sh;
-  src = fetchurl {
-    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/emacs-21.3.tar.gz;
-    md5 = "a0bab457cbf5b4f8eb99d1d0a3ada420";
-  };
-  patches = [./patchfile];
-  inherit (xlibs) libXaw libX11;
-
-  buildInputs = [xlibs.libXaw xlibs.libX11];
-}

pkgs/applications/editors/emacs/modes/cua/builder.sh

@@ -1,4 +0,0 @@
-. $stdenv/setup
-
-mkdir -p $out/emacs/site-lisp
-cp $src $out/emacs/site-lisp/cua.el

pkgs/applications/editors/emacs/modes/cua/default.nix

@@ -1,8 +0,0 @@
-{stdenv, fetchurl}: stdenv.mkDerivation {
-  name = "cua-mode-2.10";
-  builder = ./builder.sh;
-  src = fetchurl {
-    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/cua-mode-2.10.el;
-    md5 = "5bf5e43f5f38c8383868c7c6c5baca09";
-  };
-}

pkgs/applications/editors/emacs/modes/haskell/builder.sh

@@ -1,6 +0,0 @@
-. $stdenv/setup
-
-mkdir -p $out/emacs/site-lisp
-tar zxvf $src
-cp haskell-mode*/*.el $out/emacs/site-lisp
-cp haskell-mode*/*.hs $out/emacs/site-lisp

pkgs/applications/editors/emacs/modes/haskell/default.nix

@@ -1,8 +0,0 @@
-{stdenv, fetchurl}: stdenv.mkDerivation {
-  name = "haskell-mode-1.45";
-  builder = ./builder.sh;
-  src = fetchurl {
-    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/haskell-mode-1.45.tar.gz;
-    md5 = "c609998580cdb9ca8888c7d47d22ca3b";
-  };
-}

pkgs/applications/editors/emacs/modes/nxml/builder.sh

@@ -1,7 +1,9 @@
-. $stdenv/setup
+. $stdenv/setup || exit 1
 
-mkdir -p $out/emacs/site-lisp
-cd $out/emacs/site-lisp
-tar xvfz $src
-mv nxml-mode-*/* .
+mkdir -p $out/emacs/site-lisp || exit 1
+cd $out/emacs/site-lisp || exit 1
+tar xvfz $src || exit 1
+mv nxml-mode-*/* . || exit 1
 rmdir nxml-mode-*
+
+exit 0

pkgs/applications/editors/emacs/modes/nxml/default.nix

@@ -1,8 +1,8 @@
 {stdenv, fetchurl}: stdenv.mkDerivation {
-  name = "nxml-mode-20041004";
+  name = "nxml-mode-20031031";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/nxml-mode-20041004.tar.gz;
-    md5 = "ac137024cf337d6f11d8ab278d39b4db";
+    url = http://www.thaiopensource.com/download/nxml-mode-20031031.tar.gz;
+    md5 = "4cbc32047183e6cc1b7a2757d1078bd2";
   };
 }

pkgs/applications/editors/emacs/patchfile

@@ -1,41 +0,0 @@
-Only in emacs-21.3: configure.in~
-Only in emacs-21.3: patchfile
-Only in emacs-21.3/src: Makefile.in~
-diff -rc emacs-orig/src/s/gnu-linux.h emacs-21.3/src/s/gnu-linux.h
-*** emacs-orig/src/s/gnu-linux.h	2001-09-28 17:50:04.000000000 +0200
---- emacs-21.3/src/s/gnu-linux.h	2004-10-06 13:13:19.000000000 +0200
-***************
-*** 173,179 ****
-  /* GNU/Linux usually has crt0.o in a non-standard place */
-  #define START_FILES pre-crt0.o /usr/lib/crt0.o
-  #else
-! #define START_FILES pre-crt0.o /usr/lib/crt1.o /usr/lib/crti.o
-  #endif
-  
-  #ifdef __ELF__
---- 173,179 ----
-  /* GNU/Linux usually has crt0.o in a non-standard place */
-  #define START_FILES pre-crt0.o /usr/lib/crt0.o
-  #else
-! #define START_FILES pre-crt0.o crt1.o crti.o
-  #endif
-  
-  #ifdef __ELF__
-***************
-*** 225,231 ****
-  #else
-  #undef LIB_GCC
-  #define LIB_GCC
-! #define LIB_STANDARD -lgcc -lc -lgcc /usr/lib/crtn.o
-  #endif
-  
-  /* Don't use -g in test compiles in configure.
---- 225,231 ----
-  #else
-  #undef LIB_GCC
-  #define LIB_GCC
-! #define LIB_STANDARD -lgcc -lc -lgcc crtn.o
-  #endif
-  
-  /* Don't use -g in test compiles in configure.
-Only in emacs-21.3/src/s: gnu-linux.h~

pkgs/applications/editors/monodevelop/builder.sh

@@ -1,29 +0,0 @@
-. $stdenv/setup
-. $makeWrapper
-
-export MONO_GAC_PREFIX=$monodoc:$gtksharp
-
-postInstall=postInstall
-postInstall() {
-    mv $out/bin $out/bin-orig
-    mkdir $out/bin
-
-    moz=$(ls $mozilla/lib/*/libgtkembedmoz.so)
-
-    for i in $out/bin-orig/*; do
-        echo "wrapping $(basename $i)"
-        # !!! TODO: figure out the MONO_GAC_PREFIX automatically
-        makeWrapper "$i" "$out/bin/$(basename $i)" \
-            --suffix PATH ':' "$(dirname $(type -p mono))" \
-            --suffix PATH ':' "$(dirname $(type -p mono))" \
-            --suffix LD_LIBRARY_PATH ':' "$gtksharp/lib" \
-            --suffix MONO_GAC_PREFIX ':' "$gtksharp" \
-            --suffix MONO_GAC_PREFIX ':' "$gtkmozembedsharp" \
-            --suffix MONO_GAC_PREFIX ':' "$gtksourceviewsharp" \
-            --suffix MONO_GAC_PREFIX ':' "$monodoc" \
-            --set MOZILLA_FIVE_HOME "$(dirname $moz)"
-    done
-}
-
-genericBuild
-

pkgs/applications/editors/monodevelop/default.nix

@@ -1,28 +0,0 @@
-{ stdenv, fetchurl, file, mono, gtksharp, gtksourceviewsharp
-, gtkmozembedsharp, monodoc
-, perl, perlXMLParser, pkgconfig
-, glib, gtk, gconf, gnomevfs, libbonobo, libglade, libgnome
-, mozilla
-}:
-
-stdenv.mkDerivation {
-  name = "monodevelop-0.6-pre2315";
-  builder = ./builder.sh;
-
-  src = fetchurl {
-    url = http://losser.labs.cs.uu.nl/~eelco/mono-tmp/monodevelop-0.6-pre2315.tar.bz2;
-    md5 = "8c33df5629b0676b7ab552854c1de6fd";
-  };
-
-  makeWrapper = ../../../build-support/make-wrapper/make-wrapper.sh;
-  
-  patches = [./prefix.patch];
-  
-  buildInputs = [
-    file mono gtksharp gtksourceviewsharp perl perlXMLParser pkgconfig
-    glib gtk gconf gnomevfs libbonobo libglade libgnome
-    gtkmozembedsharp monodoc
-  ];
-  
-  inherit mozilla monodoc gtksharp gtkmozembedsharp gtksourceviewsharp;
-}

pkgs/applications/editors/monodevelop/prefix.patch

@@ -1,44 +0,0 @@
-diff -rc MonoDevelop-orig/Makefile.in MonoDevelop/Makefile.in
-*** MonoDevelop-orig/Makefile.in	2005-03-09 17:43:58.000000000 +0100
---- MonoDevelop/Makefile.in	2005-03-09 18:10:20.000000000 +0100
-***************
-*** 298,304 ****
-  # (mkdir ../../build/bin/ hack)
-  SUBDIRS = Core build po Extras
-  bin_SCRIPTS = monodevelop
-! gnome_data = @gnome_prefix@/share
-  desktopdir = $(gnome_data)/applications
-  desktop_DATA = monodevelop.desktop
-  pixmapdir = $(gnome_data)/pixmaps
---- 298,304 ----
-  # (mkdir ../../build/bin/ hack)
-  SUBDIRS = Core build po Extras
-  bin_SCRIPTS = monodevelop
-! gnome_data = @prefix@/share
-  desktopdir = $(gnome_data)/applications
-  desktop_DATA = monodevelop.desktop
-  pixmapdir = $(gnome_data)/pixmaps
-***************
-*** 809,818 ****
-  all:
-  
-  install-data-hook:
-! 	$(UPDATE_MIME_DB) $(gnome_data)/mime
-  
-  uninstall-hook:
-! 	$(UPDATE_MIME_DB) $(gnome_data)/mime
-  
-  run: runmd
-  
---- 809,818 ----
-  all:
-  
-  install-data-hook:
-! #	$(UPDATE_MIME_DB) $(gnome_data)/mime
-  
-  uninstall-hook:
-! #	$(UPDATE_MIME_DB) $(gnome_data)/mime
-  
-  run: runmd
-  
-Only in MonoDevelop: Makefile.in~

pkgs/applications/editors/monodoc/builder.sh

@@ -1,21 +0,0 @@
-. $stdenv/setup
-. $makeWrapper
-
-postInstall=postInstall
-postInstall() {
-    mv $out/bin $out/bin-orig
-    mkdir $out/bin
-
-    for i in $out/bin-orig/*; do
-        echo "wrapping $(basename $i)"
-        # !!! TODO: figure out the MONO_GAC_PREFIX automatically
-        makeWrapper "$i" "$out/bin/$(basename $i)" \
-            --suffix PATH ':' "$(dirname $(type -p mono))" \
-            --suffix MONO_GAC_PREFIX ':' "$gtksharp" \
-            --suffix MONO_GAC_PREFIX ':' "$out"
-    done
-}
-
-genericBuild
-
-

pkgs/applications/editors/monodoc/default.nix

@@ -1,17 +0,0 @@
-{stdenv, fetchurl, mono, gtksharp, pkgconfig}:
-
-stdenv.mkDerivation {
-  name = "monodoc-1.0.6";
-
-  builder = ./builder.sh;
-  src = fetchurl {
-    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/monodoc-1.0.6.tar.gz;
-    md5 = "f2fc27e8e4717d90dc7efa2450625693";
-  };
-
-  makeWrapper = ../../../build-support/make-wrapper/make-wrapper.sh;
-
-  buildInputs = [mono gtksharp pkgconfig];
-
-  inherit gtksharp;
-}

pkgs/applications/editors/nano/builder.sh

@@ -1,4 +0,0 @@
-. $stdenv/setup
-
-export CFLAGS="$CFLAGS -I$ncurses/include/ncurses"
-genericBuild

pkgs/applications/editors/nano/default.nix

@@ -1,13 +0,0 @@
-{stdenv, fetchurl, ncurses}:
-
-stdenv.mkDerivation {
-  name = "nano-1.2.4";
-  builder = ./builder.sh;
-  src = fetchurl {
-    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/nano-1.2.4.tar.gz;
-    md5 = "2c513310ec5e8b63abaecaf48670ac7a";
-  };
-
-  inherit ncurses;
-  buildInputs = [ncurses];
-}

pkgs/applications/editors/vim/builder.sh

@@ -1,3 +0,0 @@
-. $stdenv/setup
-
-genericBuild

pkgs/applications/editors/vim/default.nix

@@ -1,14 +0,0 @@
-{stdenv, fetchurl, ncurses}:
- 
-stdenv.mkDerivation {
-  name = "vim-6.3";
- 
-  builder = ./builder.sh;
-  src = fetchurl {
-    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/vim-6.3.tar.bz2;
-    md5 = "821fda8f14d674346b87e3ef9cb96389";
-  };
- 
-  inherit ncurses;
-  buildInputs = [ncurses];
-}

pkgs/applications/graphics/f-spot/builder.sh

@@ -1,28 +0,0 @@
-. $stdenv/setup
-. $makeWrapper
-
-postInstall=postInstall
-postInstall() {
-    mv $out/bin $out/bin-orig
-    mkdir $out/bin
-
-    for i in $out/bin-orig/*; do
-        echo "wrapping $(basename $i)"
-        # !!! TODO: figure out the MONO_GAC_PREFIX automatically
-        makeWrapper "$i" "$out/bin/$(basename $i)" \
-            --prefix PATH ':' "$(dirname $(type -p mono))" \
-            --prefix LD_LIBRARY_PATH ':' "$sqlite/lib" \
-            --prefix LD_LIBRARY_PATH ':' "$libgnomeui/lib/libglade/2.0" \
-            --prefix MONO_GAC_PREFIX ':' "$gtksharp"
-    done
-    
-    # !!! hack
-    export ALL_INPUTS="$out $pkgs"
-
-    find $out -name "*.dll.config" -o -name "*.exe.config" | while read configFile; do
-        echo "modifying config file $configFile"
-        $monoDLLFixer "$configFile"
-    done
-}
-
-genericBuild

pkgs/applications/graphics/f-spot/default.nix

@@ -1,26 +0,0 @@
-{ stdenv, fetchurl, perl, perlXMLParser, pkgconfig, mono, libexif
-, libgnome, libgnomeui, gtksharp, libjpeg, sqlite, lcms, libgphoto2
-, monoDLLFixer
-}:
-
-stdenv.mkDerivation {
-  name = "f-spot-0.0.10";
-
-  builder = ./builder.sh;
-  makeWrapper = ../../../build-support/make-wrapper/make-wrapper.sh;
-  
-  src = fetchurl {
-    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/f-spot-0.0.10.tar.bz2;
-    md5 = "19cc6e067ccc261b0502ff6189b79832";
-  };
-
-  patches = [./dllmap.patch];
-
-  buildInputs = [
-    perl perlXMLParser pkgconfig mono libexif
-    libgnome libgnomeui gtksharp libjpeg sqlite
-    lcms libgphoto2
-  ];
-
-  inherit monoDLLFixer gtksharp sqlite libgnomeui;
-}

pkgs/applications/graphics/f-spot/dllmap.patch

@@ -1,28 +0,0 @@
-diff -rc f-spot-0.0.10-orig/libgphoto2-sharp/libgphoto2-sharp.dll.config f-spot-0.0.10/libgphoto2-sharp/libgphoto2-sharp.dll.config
-*** f-spot-0.0.10-orig/libgphoto2-sharp/libgphoto2-sharp.dll.config	2005-02-27 19:25:09.000000000 +0100
---- f-spot-0.0.10/libgphoto2-sharp/libgphoto2-sharp.dll.config	2005-03-11 12:13:12.000000000 +0100
-***************
-*** 1,3 ****
-  <configuration>
-!   <dllmap dll="libgphoto2.so" target="/usr/lib/libgphoto2.so.2"/>
-  </configuration>
---- 1,3 ----
-  <configuration>
-!   <dllmap dll="libgphoto2.so" target="libgphoto2.so.2"/>
-  </configuration>
-diff -rc f-spot-0.0.10-orig/src/f-spot.exe.config.in f-spot-0.0.10/src/f-spot.exe.config.in
-*** f-spot-0.0.10-orig/src/f-spot.exe.config.in	2005-02-27 18:03:02.000000000 +0100
---- f-spot-0.0.10/src/f-spot.exe.config.in	2005-03-11 12:48:03.000000000 +0100
-***************
-*** 9,13 ****
-    <dllmap dll="libfspoteog" target="@prefix@/lib/f-spot/libfspoteog.so.0"/>
-    <dllmap dll="libfspotjpeg" target="@prefix@/lib/f-spot/libfspotjpg.so.0"/>
-    <dllmap dll="liblcms-1.0.0.dll" target="liblcms.so.1"/>
-!   <dllmap dll="libexif.dll" target="libexif.so.@EXIF_SOVERSION@"/>
-  </configuration>
---- 9,13 ----
-    <dllmap dll="libfspoteog" target="@prefix@/lib/f-spot/libfspoteog.so.0"/>
-    <dllmap dll="libfspotjpeg" target="@prefix@/lib/f-spot/libfspotjpg.so.0"/>
-    <dllmap dll="liblcms-1.0.0.dll" target="liblcms.so.1"/>
-!   <dllmap dll="libexif.dll" target="libexif.so"/>
-  </configuration>

pkgs/applications/graphics/gqview/default.nix

@@ -6,11 +6,11 @@ assert pkgconfig != null && gtk != null && libpng != null;
 # !!! assert libpng == gtk.libpng;
 
 stdenv.mkDerivation {
-  name = "gqview-1.4.5";
+  name = "gqview-1.4.1";
 
   src = fetchurl {
-    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/gqview-1.4.5.tar.gz;
-    md5 = "b196935767c2d3dc61243d9ed0801c2e";
+    url = http://heanet.dl.sourceforge.net/sourceforge/gqview/gqview-1.4.1.tar.gz;
+    md5 = "d963fbb878d78e8ebf78ea8c18caa72f";
   };
 
   buildInputs = [pkgconfig gtk libpng];

pkgs/applications/misc/acrobat-reader/builder.sh

@@ -1,21 +0,0 @@
-. $stdenv/setup
-
-echo "unpacking $src..."
-tar xvfz $src
-
-mkdir $out
-
-echo "unpacking reader..."
-tar xvf ./COMMON.TAR -C $out
-tar xvf ./LINUXRDR.TAR -C $out
-
-glibc=$(cat $NIX_GCC/nix-support/orig-glibc)
-
-patchelf --interpreter $glibc/lib/ld-linux.so.* $out/Reader/intellinux/bin/acroread
-
-sed "s^REPLACE_ME^$out/Reader^" $out/bin/acroread.sh > $out/bin/acroread.sh.tmp
-echo "#! /bin/sh" > $out/bin/acroread.sh
-echo "LD_LIBRARY_PATH=$libXt/lib:$libXp/lib:$libXext/lib:$libX11/lib" >> $out/bin/acroread.sh
-cat $out/bin/acroread.sh.tmp >> $out/bin/acroread.sh
-chmod 755 $out/bin/acroread.sh
-mv $out/bin/acroread.sh $out/bin/acroread

pkgs/applications/misc/acrobat-reader/default.nix

@@ -1,12 +0,0 @@
-{stdenv, fetchurl, patchelf, libXt, libXp, libXext, libX11}:
-
-stdenv.mkDerivation {
-  name = "acrobat-reader-5.0.9";
-  builder = ./builder.sh;
-  src = fetchurl {
-    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/linux-509.tar.gz;
-    md5 = "53b7ca0fc83ab81214ba82050ce89c64";
-  };
-  buildInputs = [patchelf];
-  inherit libXt libXp libXext libX11;
-}

pkgs/applications/misc/hello/builder.sh

@@ -0,0 +1,8 @@
+buildinputs="$perl"
+. $stdenv/setup || exit 1
+
+tar xvfz $src || exit 1
+cd hello-* || exit 1
+./configure --prefix=$out || exit 1
+make || exit 1
+make install || exit 1

pkgs/applications/misc/hello/default.nix

@@ -4,8 +4,8 @@ stdenv.mkDerivation {
   name = "hello-2.1.1";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/hello-2.1.1.tar.gz;
+    url = ftp://ftp.nluug.nl/pub/gnu/hello/hello-2.1.1.tar.gz;
     md5 = "70c9ccf9fac07f762c24f2df2290784d";
   };
-  inherit perl;
+  perl = perl;
 }

pkgs/applications/misc/hello/ex-1/builder.sh

@@ -1,9 +0,0 @@
-. $stdenv/setup
-
-PATH=$perl/bin:$PATH
-
-tar xvfz $src
-cd hello-*
-./configure --prefix=$out
-make
-make install

pkgs/applications/misc/hello/ex-2/default.nix

@@ -1,10 +0,0 @@
-{stdenv, fetchurl, perl}:
-
-stdenv.mkDerivation {
-  name = "hello-2.1.1";
-  src = fetchurl {
-    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/hello-2.1.1.tar.gz;
-    md5 = "70c9ccf9fac07f762c24f2df2290784d";
-  };
-  buildInputs = [perl];
-}

pkgs/applications/misc/xchm/default.nix

@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "xchm-0.9.1";
   src = fetchurl {
-    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/xchm-0.9.1.tar.gz;
+    url = http://belnet.dl.sourceforge.net/sourceforge/xchm/xchm-0.9.1.tar.gz;
     md5 = "5ba671e09e4c3ac46ffb5ce9d2c985eb";
   };
   buildInputs = [wxGTK chmlib];

pkgs/applications/networking/browsers/firefox-wrapper/builder.sh

@@ -1,7 +0,0 @@
-. $stdenv/setup
-. $makeWrapper
-
-makeWrapper "$firefox/bin/firefox" "$out/bin/firefox" \
-    --suffix-each MOZ_PLUGIN_PATH ':' "$plugins" \
-    --suffix-contents LD_LIBRARY_PATH ':' "$(filterExisting $(addSuffix /extra-library-path $plugins))" \
-    --suffix-contents PATH ':' "$(filterExisting $(addSuffix /extra-bin-path $plugins))"

pkgs/applications/networking/browsers/firefox-wrapper/default.nix

@@ -1,14 +0,0 @@
-{stdenv, firefox, plugins}:
-
-stdenv.mkDerivation {
-  name = firefox.name;
-
-  builder = ./builder.sh;
-  makeWrapper = ../../../../build-support/make-wrapper/make-wrapper.sh;
-
-  inherit firefox;
-
-  # Let each plugin tell us (through its `mozillaPlugin') attribute
-  # where to find the plugin in its tree.
-  plugins = map (x: x ~ x.mozillaPlugin) plugins;
-}

pkgs/applications/networking/browsers/firefox/builder.sh

@@ -1,52 +1,28 @@
 . $stdenv/setup
 
-preConfigure=preConfigure
+
 preConfigure() {
     cat > .mozconfig <<EOF
-. \$topsrcdir/browser/config/mozconfig
-ac_add_options --prefix=$out
-ac_add_options --enable-optimize
+export MOZ_PHOENIX=1
+mk_add_options MOZ_PHOENIX=1
+ac_add_options --enable-crypto
+ac_add_options --disable-tests
 ac_add_options --disable-debug
+ac_add_options --disable-mailnews
+ac_add_options --disable-composer
+ac_add_options --enable-optimize=-O2
+ac_add_options --disable-ldap
+ac_add_options --disable-mailnews
+ac_add_options --enable-extensions=default,-inspector,-irc,-venkman,-content-packs,-help
 ac_add_options --enable-xft
-ac_add_options --disable-freetype2
-#ac_add_options --enable-swg
+ac_add_options --enable-swg
 ac_add_options --enable-strip
 ac_add_options --enable-default-toolkit=gtk2
-#ac_add_options --disable-shared
-#ac_add_options --enable-static
-#ac_add_options --with-system-jpeg
-#ac_add_options --with-system-png
-#ac_add_options --with-system-zlib
 EOF
+    echo "ac_add_options --prefix=$out" >> .mozconfig
 }
+preConfigure=preConfigure
 
-postInstall=postInstall
-postInstall() {
-
-    # Strip some more stuff
-    strip -S $out/lib/*/* || true
-
-    # We don't need this (do we?)
-#    rm -rf $out/include
-
-    # This fixes starting Firefox when there already is a running
-    # instance.  The `firefox' wrapper script actually expects to be
-    # in the same directory as `run-mozilla.sh', apparently.
-    cd $out/bin
-    mv firefox ../lib/firefox-*/
-    ln -s ../lib/firefox-*/firefox .
-
-    # Register extension etc.
-    echo "running firefox -register..."
-    (cd $out/lib/firefox-* && LD_LIBRARY_PATH=. ./firefox-bin -register) || false
-
-    echo "running regxpcom..."
-    (cd $out/lib/firefox-* && LD_LIBRARY_PATH=. ./regxpcom) || false
-    
-    echo "running regchrome..."
-    (cd $out/lib/firefox-* && LD_LIBRARY_PATH=. ./regchrome) || false
-    
-}
 
 makeFlags="-f client.mk build"
 

pkgs/applications/networking/browsers/firefox/default.nix

@@ -1,17 +1,19 @@
-{stdenv, fetchurl, pkgconfig, gtk, perl, zip, libIDL, libXi}:
+{ stdenv, fetchurl, pkgconfig, gtk, perl, zip, libIDL
+}:
+
+assert pkgconfig != null && gtk != null && perl != null
+  && zip != null && libIDL != null;
 
 # !!! assert libIDL.glib == gtk.glib;
 
-(stdenv.mkDerivation {
-  name = "firefox-1.0.1";
+stdenv.mkDerivation {
+  name = "firefox-0.8";
 
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/firefox-1.0.1-source.tar.bz2;
-    md5 = "ebaea974fea9460ab7050fff76b41cb1";
+    url = ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/0.8/firefox-source-0.8.tar.bz2;
+    md5 = "cdc85152f4219bf3e3f1a8dc46e04654";
   };
 
-  buildInputs = [pkgconfig gtk perl zip libIDL libXi];
-
-  patches = [./writable-copies.patch];
-}) // {inherit gtk;}
+  buildInputs = [pkgconfig gtk perl zip libIDL];
+}

pkgs/applications/networking/browsers/firefox/writable-copies.patch

@@ -1,23 +0,0 @@
-diff -rc mozilla-orig/xpcom/io/nsLocalFileUnix.cpp mozilla/xpcom/io/nsLocalFileUnix.cpp
-*** mozilla-orig/xpcom/io/nsLocalFileUnix.cpp	2004-04-03 01:48:18.000000000 +0200
---- mozilla/xpcom/io/nsLocalFileUnix.cpp	2004-10-05 19:48:04.000000000 +0200
-***************
-*** 634,639 ****
---- 634,640 ----
-          // get the dirs old permissions
-          if (NS_FAILED(rv = GetPermissions(&oldPerms)))
-              return rv;
-+         oldPerms |= 0200;
-          if (NS_FAILED(rv = newParent->Create(DIRECTORY_TYPE, oldPerms)))
-              return rv;
-      } else {    // dir exists lets try to use leaf
-***************
-*** 758,763 ****
---- 759,765 ----
-          // get the old permissions
-          PRUint32 myPerms;
-          GetPermissions(&myPerms);
-+         myPerms |= 0200;
-  
-          // Create the new file with the old file's permissions, even if write
-          // permission is missing.  We can't create with write permission and

pkgs/applications/networking/browsers/lynx/builder.sh

@@ -1,5 +0,0 @@
-. $stdenv/setup
-
-export CFLAGS="-I$ncurses/include/ncurses"
-
-genericBuild

pkgs/applications/networking/browsers/lynx/default.nix

@@ -1,17 +0,0 @@
-{ stdenv, fetchurl, ncurses
-, sslSupport ? true, openssl ? null
-}:
-
-assert sslSupport -> openssl != null;
-
-stdenv.mkDerivation {
-  name = "lynx-2.8.5";
-  builder = ./builder.sh;
-  src = fetchurl {
-    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/lynx2.8.5.tar.bz2;
-    md5 = "d1e5134e5d175f913c16cb6768bc30eb";
-  };
-  inherit ncurses;
-  configureFlags = (if sslSupport then "--with-ssl" else "");
-  buildInputs = [ncurses (if sslSupport then openssl else null)];
-}

pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/builder.sh

@@ -1,13 +0,0 @@
-. $stdenv/setup
-
-dontBuild=1
-dontMakeInstall=1
-
-postInstall=postInstall
-postInstall() {
-    mkdir -p $out/lib/mozilla/plugins
-    cp -p flashplayer.xpt libflashplayer.so $out/lib/mozilla/plugins
-    echo "$zlib/lib:$libXmu/lib" > $out/lib/mozilla/plugins/extra-library-path
-}
-
-genericBuild

pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix

@@ -1,13 +0,0 @@
-{stdenv, fetchurl, zlib, libXmu}:
-
-(stdenv.mkDerivation {
-  name = "flashplayer-7.0r25";
-
-  builder = ./builder.sh;
-  src = fetchurl {
-    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/install_flash_player_7_linux.tar.gz;
-    md5 = "79c59a5ea29347e01c8e6575dd054cd1";
-  };
-
-  inherit zlib libXmu;
-}) // {mozillaPlugin = "/lib/mozilla/plugins";}

pkgs/applications/networking/browsers/mozilla-plugins/mplayerplug-in/builder.sh

@@ -1,24 +0,0 @@
-. $stdenv/setup
-
-# The Firefox pkgconfig files are buggy; they are called firefox-*.pc,
-# but they refer to mozilla-*.pc.  Also, mplayerplug-in requires
-# mozilla-*.pc.
-mkdir pkgconfig
-for i in $firefox/lib/pkgconfig/*.pc; do
-    ln -s $i pkgconfig/$(echo $(basename $i) | sed s/firefox/mozilla/)
-done
-PKG_CONFIG_PATH=$NIX_BUILD_TOP/pkgconfig:$PKG_CONFIG_PATH
-
-firefoxIncl=$(echo $firefox/include/firefox-*)
-export NIX_CFLAGS_COMPILE="-I$firefoxIncl $NIX_CFLAGS_COMPILE"
-
-dontMakeInstall=1
-
-postInstall=postInstall
-postInstall() {
-    mkdir -p $out/lib/mozilla/plugins
-    cp -p mplayerplug-in.so mplayerplug-in.xpt $out/lib/mozilla/plugins
-}
-
-genericBuild
-

pkgs/applications/networking/browsers/mozilla-plugins/mplayerplug-in/default.nix

@@ -1,19 +0,0 @@
-{stdenv, fetchurl, pkgconfig, firefox, libXpm}:
-
-# Note: we shouldn't be dependent on Firefox.  The only thing we need
-# are the include files so that we can access the plugin API (I
-# think).
-
-(stdenv.mkDerivation {
-  name = "mplayerplug-in-2.80";
-
-  builder = ./builder.sh;
-  src = fetchurl {
-    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/mplayerplug-in-2.80.tar.gz;
-    md5 = "ce3235ff7d46fae416cfb175193a5f25";
-  };
-
-  buildInputs = [pkgconfig firefox (firefox.gtk) libXpm];
-  
-  inherit firefox;
-}) // {mozillaPlugin = "/lib/mozilla/plugins";}

pkgs/applications/networking/mailreaders/sylpheed/builder.sh

@@ -1,14 +1,14 @@
 buildInputs="$gtk $gdkpixbuf $openssl"
 . $stdenv/setup
 
-if test "$sslSupport" = 1; then
-    configureFlags="--enable-ssl $configureFlags"
+if test $sslSupport; then
+    configureFlags="--enable-ssl $extraflags"
 fi
 
-if test "$imageSupport" = 1; then
-    configureFlags="--enable-gdk-pixbuf $configureFlags"
+if test $imageSupport; then
+    configureFlags="--enable-gdk-pixbuf $extraflags"
 else
-    configureFlags="--disable-gdk-pixbuf --disable-imlibtest $configureFlags"
+    configureFlags="--disable-gdk-pixbuf --disable-imlibtest $extraflags"
 fi
 
 genericBuild

pkgs/applications/networking/mailreaders/sylpheed/default.nix

@@ -8,12 +8,12 @@ assert sslSupport -> openssl != null;
 assert imageSupport -> gdkpixbuf != null;
 
 stdenv.mkDerivation {
-  name = "sylpheed-1.0.0";
+  name = "sylpheed-0.9.10";
 
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/sylpheed-1.0.0.tar.bz2;
-    md5 = "864c4fc581a5ab1c7af5e06153c76769";
+    url = http://sylpheed.good-day.net/sylpheed/sylpheed-0.9.10.tar.bz2;
+    md5 = "4e2242436de3cf3977a1b25b1ddc4930";
   };
 
   inherit sslSupport imageSupport;

pkgs/applications/networking/mailreaders/thunderbird/builder.sh

@@ -1,22 +0,0 @@
-. $stdenv/setup
-
-preConfigure() {
-    cat mail/config/mozconfig > .mozconfig
-    cat >> .mozconfig <<EOF
-ac_add_options --disable-debug
-ac_add_options --enable-optimize=-O2
-ac_add_options --disable-ldap
-ac_add_options --enable-xft
-ac_add_options --enable-swg
-ac_add_options --enable-strip
-ac_add_options --enable-default-toolkit=gtk2
-ac_add_options --enable-single-profile
-ac_add_options --prefix=$out
-EOF
-}
-
-preConfigure=preConfigure
-
-makeFlags="-f client.mk build"
-
-genericBuild

pkgs/applications/networking/mailreaders/thunderbird/default.nix

@@ -1,18 +0,0 @@
-{stdenv, fetchurl, pkgconfig, gtk, perl, zip, libIDL}:
-
-assert pkgconfig != null && gtk != null && perl != null
-  && zip != null && libIDL != null;
-
-# !!! assert libIDL.glib == gtk.glib;
-
-stdenv.mkDerivation {
-  name = "thunderbird-0.8";
-
-  builder = ./builder.sh;
-  src = fetchurl {
-    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/thunderbird-source-0.8.tar.bz2;
-    md5 = "76de1827d66ac482cfc4dd32e7b1e257";
-  };
-
-  buildInputs = [pkgconfig gtk perl zip libIDL];
-}

pkgs/applications/networking/newsreaders/pan/default.nix

@@ -12,7 +12,7 @@ stdenv.mkDerivation {
   name = "pan-0.14.2.91";
 
   src = fetchurl {
-    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/pan-0.14.2.91.tar.bz2;
+    url = http://pan.rebelbase.com/download/releases/0.14.2.91/SOURCE/pan-0.14.2.91.tar.bz2;
     md5 = "4770d899a1c1ba968ce96bc5aeb07b62";
   };
 

pkgs/applications/version-management/rcs/default.nix

@@ -1,10 +0,0 @@
-{stdenv, fetchurl}:
-
-stdenv.mkDerivation {
-  name = "rcs-5.7";
-  # builder = ./builder.sh;
-  src = fetchurl {
-    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/rcs-5.7.tar;
-    md5 = "f7b3f106bf87ff6344df38490f6a02c5";
-  };
-}

pkgs/applications/version-management/subversion-1.1.x/builder.sh

@@ -1,60 +0,0 @@
-buildInputs="$openssl $zlib $db4 $httpd $swig $python $j2sdk $expat $patch"
-. $stdenv/setup
-
-configureFlags="--without-gdbm --disable-static"
-
-if test "$localServer"; then
-    configureFlags="--with-berkeley-db=$db4 $configureFlags"
-fi
-
-if test "$sslSupport"; then
-    configureFlags="--with-ssl --with-libs=$openssl $configureFlags"
-fi
-
-if test "$httpServer"; then
-    configureFlags="--with-apxs=$httpd/bin/apxs --with-apr=$httpd --with-apr-util=$httpd $configureFlags"
-    makeFlags="APACHE_LIBEXECDIR=$out/modules $makeFlags"
-fi
-
-if test -n "$pythonBindings" -o -n "$javaSwigBindings"; then
-    configureFlags="--with-swig=$swig $configureFlags"
-fi
-
-if test "$javahlBindings"; then
-    configureFlags="--enable-javahl --with-jdk=$j2sdk $configureFlags"
-fi
-
-installFlags="$makeFlags"
-
-
-postInstall() {
-    if test "$pythonBindings"; then
-        make swig-py
-        make install-swig-py
-    fi
-    if test "$javaSwigBindings"; then
-        # Hack to get Java-Swig bindings to build if Python is not in
-        # scope (this fails because Subversion's configure script does
-        # something silly like `SWIG_JAVA_COMPILE="$SWIG_PY_COMPILE"').
-        FL1='SWIG_JAVA_COMPILE=gcc'
-        FL2='SWIG_JAVA_LINK=gcc -L$(SWIG_BUILD_DIR)/.libs'
-        make swig-java "$FL1" "$FL2"
-        make swig-java-api "$FL1" "$FL2"
-        make swig-java-java "$FL1" "$FL2"
-        make install-swig-java "$FL1" "$FL2"
-    fi
-    if test "$javahlBindings"; then
-        mkdir -p subversion/bindings/java/javahl/classes # bug fix
-        make javahl
-        make install-javahl
-        mkdir -p $out/share/doc/$name
-        $j2sdk/bin/javadoc -d $out/share/doc/$name \
-            -windowtitle "JavaHL Subversion Bindings" \
-            -link http://java.sun.com/j2se/1.4.2/docs/api/ \
-            subversion/bindings/java/javahl/src/org/tigris/subversion/javahl/*.java
-    fi
-}
-postInstall=postInstall
-
-
-genericBuild

pkgs/applications/version-management/subversion-1.1.x/default.nix

@@ -1,46 +0,0 @@
-{ localServer ? false
-, httpServer ? false
-, sslSupport ? false
-, compressionSupport ? false
-, pythonBindings ? false
-, javaSwigBindings ? false
-, javahlBindings ? false
-, stdenv, fetchurl
-, openssl ? null, httpd ? null, db4 ? null, expat, swig ? null, j2sdk ? null, zlib ? null
-}:
-
-assert expat != null;
-assert localServer -> db4 != null;
-assert httpServer -> httpd != null && httpd.expat == expat;
-assert sslSupport -> openssl != null && (httpServer -> httpd.openssl == openssl);
-assert pythonBindings -> swig != null && swig.pythonSupport;
-assert javaSwigBindings -> swig != null && swig.javaSupport;
-assert javahlBindings -> j2sdk != null;
-assert compressionSupport -> zlib != null;
-
-stdenv.mkDerivation {
-  name = "subversion-1.1.3";
-
-  builder = ./builder.sh;
-  src = fetchurl {
-    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/subversion-1.1.3.tar.bz2;
-    md5 = "a09c2b2fa1a09566c024547954a48478";
-  };
-
-  # This is a hopefully temporary fix for the problem that
-  # libsvnjavahl.so isn't linked against libstdc++, which causes
-  # loading the library into the JVM to fail.
-  patches = if javahlBindings then [./javahl.patch] else [];
-
-  openssl = if sslSupport then openssl else null;
-  zlib = if compressionSupport then zlib else null;
-  httpd = if httpServer then httpd else null;
-  db4 = if localServer then db4 else null;
-  swig = if pythonBindings || javaSwigBindings then swig else null;
-  python = if pythonBindings then swig.python else null;
-  j2sdk = if javaSwigBindings then swig.j2sdk else
-          if javahlBindings then j2sdk else null;
-
-  inherit expat localServer httpServer sslSupport
-          pythonBindings javaSwigBindings javahlBindings;
-}

pkgs/applications/version-management/subversion-1.1.x/javahl.patch

@@ -1,20 +0,0 @@
-diff -rc subversion-orig/build-outputs.mk subversion-1.1.0-rc2/build-outputs.mk
-*** subversion-orig/build-outputs.mk	2004-08-10 20:17:32.000000000 +0200
---- subversion-1.1.0-rc2/build-outputs.mk	2004-08-23 21:04:35.000000000 +0200
-***************
-*** 200,206 ****
-  libsvnjavahl_DEPS =  subversion/bindings/java/javahl/native/BlameCallback.lo subversion/bindings/java/javahl/native/CommitMessage.lo subversion/bindings/java/javahl/native/Inputer.lo subversion/bindings/java/javahl/native/JNIByteArray.lo subversion/bindings/java/javahl/native/JNICriticalSection.lo subversion/bindings/java/javahl/native/JNIMutex.lo subversion/bindings/java/javahl/native/JNIStackElement.lo subversion/bindings/java/javahl/native/JNIStringHolder.lo subversion/bindings/java/javahl/native/JNIThreadData.lo subversion/bindings/java/javahl/native/JNIUtil.lo subversion/bindings/java/javahl/native/MessageReceiver.lo subversion/bindings/java/javahl/native/Notify.lo subversion/bindings/java/javahl/native/Outputer.lo subversion/bindings/java/javahl/native/Path.lo subversion/bindings/java/javahl/native/Pool.lo subversion/bindings/java/javahl/native/Prompter.lo subversion/bindings/java/javahl/native/Revision.lo subversion/bindings/java/javahl/native/SVNAdmin.lo subversion/bindings/java/javahl/native/SVNBase.lo subversion/bindings/java/javahl/native/SVNClient.lo subversion/bindings/java/javahl/native/Targets.lo subversion/bindings/java/javahl/native/libsvnjavahl.la.lo subversion/bindings/java/javahl/native/org_tigris_subversion_javahl_SVNAdmin.lo subversion/bindings/java/javahl/native/org_tigris_subversion_javahl_SVNClient.lo subversion/libsvn_client/libsvn_client-1.la subversion/libsvn_wc/libsvn_wc-1.la subversion/libsvn_ra/libsvn_ra-1.la subversion/libsvn_delta/libsvn_delta-1.la subversion/libsvn_subr/libsvn_subr-1.la
-  libsvnjavahl_OBJECTS = BlameCallback.lo CommitMessage.lo Inputer.lo JNIByteArray.lo JNICriticalSection.lo JNIMutex.lo JNIStackElement.lo JNIStringHolder.lo JNIThreadData.lo JNIUtil.lo MessageReceiver.lo Notify.lo Outputer.lo Path.lo Pool.lo Prompter.lo Revision.lo SVNAdmin.lo SVNBase.lo SVNClient.lo Targets.lo libsvnjavahl.la.lo org_tigris_subversion_javahl_SVNAdmin.lo org_tigris_subversion_javahl_SVNClient.lo
-  subversion/bindings/java/javahl/native/libsvnjavahl-1.la: $(libsvnjavahl_DEPS)
-! 	cd subversion/bindings/java/javahl/native && $(LINK_JAVAHL_CXX) -o libsvnjavahl-1.la $(LT_NO_UNDEFINED) $(libsvnjavahl_OBJECTS) ../../../../../subversion/libsvn_client/libsvn_client-1.la ../../../../../subversion/libsvn_wc/libsvn_wc-1.la ../../../../../subversion/libsvn_ra/libsvn_ra-1.la ../../../../../subversion/libsvn_delta/libsvn_delta-1.la ../../../../../subversion/libsvn_subr/libsvn_subr-1.la $(SVN_APRUTIL_LIBS) $(SVN_APR_LIBS) $(NEON_LIBS) $(LIBS)
-  
-  locale_DEPS =  subversion/po/de.mo subversion/po/es.mo subversion/po/ja.mo subversion/po/nb.mo subversion/po/pl.mo subversion/po/sv.mo
-  locale: $(locale_DEPS)
---- 200,206 ----
-  libsvnjavahl_DEPS =  subversion/bindings/java/javahl/native/BlameCallback.lo subversion/bindings/java/javahl/native/CommitMessage.lo subversion/bindings/java/javahl/native/Inputer.lo subversion/bindings/java/javahl/native/JNIByteArray.lo subversion/bindings/java/javahl/native/JNICriticalSection.lo subversion/bindings/java/javahl/native/JNIMutex.lo subversion/bindings/java/javahl/native/JNIStackElement.lo subversion/bindings/java/javahl/native/JNIStringHolder.lo subversion/bindings/java/javahl/native/JNIThreadData.lo subversion/bindings/java/javahl/native/JNIUtil.lo subversion/bindings/java/javahl/native/MessageReceiver.lo subversion/bindings/java/javahl/native/Notify.lo subversion/bindings/java/javahl/native/Outputer.lo subversion/bindings/java/javahl/native/Path.lo subversion/bindings/java/javahl/native/Pool.lo subversion/bindings/java/javahl/native/Prompter.lo subversion/bindings/java/javahl/native/Revision.lo subversion/bindings/java/javahl/native/SVNAdmin.lo subversion/bindings/java/javahl/native/SVNBase.lo subversion/bindings/java/javahl/native/SVNClient.lo subversion/bindings/java/javahl/native/Targets.lo subversion/bindings/java/javahl/native/libsvnjavahl.la.lo subversion/bindings/java/javahl/native/org_tigris_subversion_javahl_SVNAdmin.lo subversion/bindings/java/javahl/native/org_tigris_subversion_javahl_SVNClient.lo subversion/libsvn_client/libsvn_client-1.la subversion/libsvn_wc/libsvn_wc-1.la subversion/libsvn_ra/libsvn_ra-1.la subversion/libsvn_delta/libsvn_delta-1.la subversion/libsvn_subr/libsvn_subr-1.la
-  libsvnjavahl_OBJECTS = BlameCallback.lo CommitMessage.lo Inputer.lo JNIByteArray.lo JNICriticalSection.lo JNIMutex.lo JNIStackElement.lo JNIStringHolder.lo JNIThreadData.lo JNIUtil.lo MessageReceiver.lo Notify.lo Outputer.lo Path.lo Pool.lo Prompter.lo Revision.lo SVNAdmin.lo SVNBase.lo SVNClient.lo Targets.lo libsvnjavahl.la.lo org_tigris_subversion_javahl_SVNAdmin.lo org_tigris_subversion_javahl_SVNClient.lo
-  subversion/bindings/java/javahl/native/libsvnjavahl-1.la: $(libsvnjavahl_DEPS)
-! 	cd subversion/bindings/java/javahl/native && $(LINK_JAVAHL_CXX) -o libsvnjavahl-1.la $(LT_NO_UNDEFINED) $(libsvnjavahl_OBJECTS) ../../../../../subversion/libsvn_client/libsvn_client-1.la ../../../../../subversion/libsvn_wc/libsvn_wc-1.la ../../../../../subversion/libsvn_ra/libsvn_ra-1.la ../../../../../subversion/libsvn_delta/libsvn_delta-1.la ../../../../../subversion/libsvn_subr/libsvn_subr-1.la $(SVN_APRUTIL_LIBS) $(SVN_APR_LIBS) $(NEON_LIBS) $(LIBS) -lstdc++
-  
-  locale_DEPS =  subversion/po/de.mo subversion/po/es.mo subversion/po/ja.mo subversion/po/nb.mo subversion/po/pl.mo subversion/po/sv.mo
-  locale: $(locale_DEPS)

pkgs/applications/version-management/subversion/builder.sh

@@ -0,0 +1,35 @@
+buildInputs="$openssl $db4 $httpd $swig $python $expat"
+. $stdenv/setup
+
+configureFlags="--without-gdbm --disable-static"
+
+if test "$localServer"; then
+    configureFlags="--with-berkeley-db=$db4 $configureFlags"
+fi
+
+if test "$sslSupport"; then
+    configureFlags="--with-ssl --with-libs=$openssl $configureFlags"
+fi
+
+if test "$httpServer"; then
+    configureFlags="--with-apxs=$httpd/bin/apxs --with-apr=$httpd --with-apr-util=$httpd $configureFlags"
+    makeFlags="APACHE_LIBEXECDIR=$out/modules $makeFlags"
+fi
+
+if test "$swigBindings"; then
+    configureFlags="--with-swig=$swig $configureFlags"
+fi
+
+installFlags="$makeFlags"
+
+
+postInstall() {
+    if test "$swigBindings"; then
+        make swig-py
+        make install-swig-py
+    fi
+}
+postInstall=postInstall
+
+
+genericBuild

pkgs/applications/version-management/subversion/default.nix

@@ -0,0 +1,31 @@
+{ localServer ? false
+, httpServer ? false
+, sslSupport ? false
+, swigBindings ? false
+, stdenv, fetchurl
+, openssl ? null, httpd ? null, db4 ? null, expat, swig ? null
+}:
+
+assert expat != null;
+assert localServer -> db4 != null;
+assert httpServer -> httpd != null && httpd.expat == expat;
+assert sslSupport -> openssl != null && (httpServer -> httpd.openssl == openssl);
+assert swigBindings -> swig != null && swig.pythonSupport;
+
+stdenv.mkDerivation {
+  name = "subversion-1.0.2";
+
+  builder = ./builder.sh;
+  src = fetchurl {
+    url = http://subversion.tigris.org/tarballs/subversion-1.0.2.tar.bz2;
+    md5 = "246ffcc67ca629ae523956c4c1a67cce";
+  };
+
+  openssl = if sslSupport then openssl else null;
+  httpd = if httpServer then httpd else null;
+  db4 = if localServer then db4 else null;
+  swig = if swigBindings then swig else null;
+  python = if swigBindings then swig.python else null;
+
+  inherit expat localServer httpServer sslSupport swigBindings;
+}

pkgs/applications/video/MPlayer/builder.sh

@@ -1,8 +1,6 @@
+buildInputs="$x11 $freetype $zlib $alsa"
 . $stdenv/setup
 
-# !!! Remove eventually.
-export _POSIX2_VERSION=199209
-
 postUnpack() {
     unpackFile $fonts
 }
@@ -11,6 +9,9 @@ postUnpack=postUnpack
 configureFlags="\
  --with-win32libdir=$win32codecs \
  --with-reallibdir=$win32codecs \
+ --disable-sdl --disable-esd --disable-xanim --disable-cdparanoia --disable-directfb \
+ --disable-lirc --disable-svga --disable-libdv \
+ --disable-vorbis --disable-png --disable-jpeg --disable-gif \
  --enable-runtime-cpudetection"
 
 postInstall() {

pkgs/applications/video/MPlayer/default.nix

@@ -1,21 +1,19 @@
-{ alsaSupport ? false, xvSupport ? true, theoraSupport ? false
-, stdenv, fetchurl, x11, freetype, zlib
-, alsa ? null, libXv ? null, libtheora ? null}:
+{ alsaSupport ? false
+, stdenv, fetchurl, x11, freetype, zlib, alsa ? null}:
 
+assert x11 != null && freetype != null;
 assert alsaSupport -> alsa != null;
-assert xvSupport -> libXv != null;
-assert theoraSupport -> libtheora != null;
 
 stdenv.mkDerivation {
-  name = "MPlayer-1.0pre6";
+  name = "MPlayer-1.0pre3";
 
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/MPlayer-1.0pre6a.tar.bz2;
-    md5 = "a812d945b884c2e2fa7f90c57cd76bff";
+    url = http://www2.mplayerhq.hu/MPlayer/releases/MPlayer-1.0pre3.tar.bz2;
+    md5 = "998becb79417c6a14d15c07e85188b82";
   };
   fonts = fetchurl {
-    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/font-arial-iso-8859-1.tar.bz2;
+    url = http://www2.mplayerhq.hu/MPlayer/releases/fonts/font-arial-iso-8859-1.tar.bz2;
     md5 = "1ecd31d17b51f16332b1fcc7da36b312";
   };
 
@@ -23,10 +21,6 @@ stdenv.mkDerivation {
     inherit stdenv fetchurl;
   };
 
-  buildInputs = [
-    x11 libXv freetype zlib
-    (if alsaSupport then alsa else null)
-    (if xvSupport then libXv else null)
-    (if theoraSupport then libtheora else null)
-  ];
+  alsa = if alsaSupport then alsa else null;
+  inherit alsaSupport x11 freetype zlib;
 }

pkgs/applications/video/MPlayer/win32codecs/builder.sh

@@ -1,11 +1,7 @@
 . $stdenv/setup
 
-buildPhase=true
-
-installPhase() {
-    mkdir $out
-    cp -prv * $out
-}
-installPhase=installPhase
-
-genericBuild
+mkdir $out
+cd $out
+tar xvfj $src
+mv extralite/* .
+rmdir extralite

pkgs/applications/video/MPlayer/win32codecs/default.nix

@@ -1,8 +1,8 @@
 {stdenv, fetchurl}: stdenv.mkDerivation {
-  name = "MPlayer-codecs-essential-20050115";
+  name = "win32codecs-1";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/essential-20050115.tar.bz2;
-    md5 = "b627e5710c6f2bf38fc2a6ef81c13be8";
+    url = http://www2.mplayerhq.hu/MPlayer/releases/codecs/extralite.tar.bz2;
+    md5 = "4748ecae87f71e8bda9cb2e2a9bd30b4";
   };
 }

pkgs/applications/video/RealPlayer/builder.sh

@@ -1,21 +0,0 @@
-. $stdenv/setup
-. $makeWrapper
-
-ensureDir $out/real
-
-skip=143209
-
-(dd bs=1 count=$skip of=/dev/null && dd) < $src | (cd $out/real && tar xvfj -)
-
-rm -rf $out/real/Bin $out/real/postinst
-
-glibc=$(cat $NIX_GCC/nix-support/orig-glibc)
-patchelf --interpreter $glibc/lib/ld-linux.so.* $out/real/realplay.bin
-
-ensureDir $out/bin
-makeWrapper "$out/real/realplay.bin" "$out/bin/realplay" \
-    --set HELIX_LIBS "$out/real" \
-    --suffix-each LD_LIBRARY_PATH ':' "$(addSuffix /lib $libPath)"
-
-echo "$libstdcpp5/lib" > $out/real/mozilla/extra-library-path
-echo "$out/bin" > $out/real/mozilla/extra-bin-path

pkgs/applications/video/RealPlayer/default.nix

@@ -1,21 +0,0 @@
-{stdenv, fetchurl, libstdcpp5, glib, pango, atk, gtk, libX11}:
-
-# Note that RealPlayer 10 need libstdc++.so.5, i.e., GCC 3.3, not 3.4.
-
-assert stdenv.system == "i686-linux";
-
-(stdenv.mkDerivation {
-  name = "RealPlayer-10.0.3.748-GOLD";
-
-  builder = ./builder.sh;
-  src = fetchurl {
-    url = http://software-dl.real.com/12ae5c4cc79d437fa106/unix/RealPlayer10GOLD.bin;
-    md5 = "70a88bcae0ab3e177e6fadecd6b8be24";
-  };
-
-  makeWrapper = ../../../build-support/make-wrapper/make-wrapper.sh;
-
-  inherit libstdcpp5;
-  libPath = [libstdcpp5 glib pango atk gtk libX11];
-  
-}) // {mozillaPlugin = "/real/mozilla";}

pkgs/applications/video/mplayerplug-in/builder.sh

@@ -0,0 +1,9 @@
+buildinputs="$x11"
+. $stdenv/setup || exit 1
+
+tar xvfz $src || exit 1
+cd mplayer* || exit 1
+./configure || exit 1
+make || exit 1
+mkdir -p $out/lib/mozilla/plugins || exit 1
+cp mplayerplug-in.so $out/lib/mozilla/plugins || exit 1

pkgs/applications/video/mplayerplug-in/default.nix

@@ -0,0 +1,15 @@
+{stdenv, fetchurl, x11}:
+
+assert x11 != null;
+
+stdenv.mkDerivation {
+  name = "mplayerplug-in-1.0pre2";
+
+  builder = ./builder.sh;
+  src = fetchurl {
+    url = http://heanet.dl.sourceforge.net/sourceforge/mplayerplug-in/mplayerplug-in-1.0pre2.tar.gz;
+    md5 = "1a6eb243989c143984bb1aac63b5282e";
+  };
+
+  x11 = x11;
+}

pkgs/applications/video/mythtv/builder.sh

@@ -1,20 +0,0 @@
-. $stdenv/setup
-
-
-buildPhase=myBuilder
-myBuilder() {
-    qmake mythtv.pro || fail
-    make || fail
-}
-
-
-postInstall=postInstall
-postInstall() {
-    sqlDir="$out/share/mythtv/sql"
-    ensureDir $sqlDir
-    cp -p ./database/mc.sql $sqlDir/
-    cp -p ./setup/setup $out/bin/mythsetup
-}
-
-
-genericBuild

pkgs/applications/video/mythtv/default.nix

@@ -1,18 +0,0 @@
-{stdenv, fetchurl, which, qt3, x11, libXinerama, libXv, libXxf86vm, lame}:
-
-assert qt3.mysqlSupport;
-
-stdenv.mkDerivation {
-  name = "mythtv-0.17";
-
-  builder = ./builder.sh;
-  src = fetchurl {
-    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/mythtv-0.17.tar.bz2;
-    md5 = "c996dc690d36e946396fc5cd4b715e3b";
-  };
-
-  patches = [./settings.patch];
-
-  buildInputs = [which qt3 x11 libXinerama libXv libXxf86vm lame];
-  inherit qt3;
-}

pkgs/applications/video/mythtv/settings.patch

@@ -1,13 +0,0 @@
-diff -rc mythtv-0.17-orig/settings.pro mythtv-0.17/settings.pro
-*** mythtv-0.17-orig/settings.pro	2005-02-11 05:02:39.000000000 +0100
---- mythtv-0.17/settings.pro	2005-02-16 13:38:46.351279092 +0100
-***************
-*** 1,6 ****
---- 1,7 ----
-  #CONFIG += debug
-  CONFIG += release
-  
-+ PREFIX = $$(out)
-  isEmpty( PREFIX ) {
-      PREFIX = /usr/local
-  }

pkgs/applications/video/vlc/default.nix

@@ -1,22 +1,22 @@
-{ xvSupport ? true
-, stdenv, fetchurl, x11, libXv, wxGTK, libdvdcss, libdvdplay
+{ stdenv, fetchurl, x11, wxGTK, libdvdcss, libdvdplay
 , mpeg2dec, a52dec, libmad, alsa}:
 
+assert x11 != null && wxGTK != null && libdvdcss != null
+  && libdvdplay != null && mpeg2dec != null && a52dec != null
+  && libmad != null && alsa != null;
 assert libdvdplay.libdvdread.libdvdcss == libdvdcss;
-assert xvSupport -> libXv != null;
 
 stdenv.mkDerivation {
-  name = "vlc-0.7.2";
+  name = "vlc-0.7.1";
 
   src = fetchurl {
-    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/vlc-0.7.2.tar.gz;
-    md5 = "25dfcc804cb92f46c0b64ce1466515cc";
+    url = http://download.videolan.org/pub/videolan/vlc/0.7.1/vlc-0.7.1.tar.gz;
+    md5 = "faa5e3162a3e9b3a3d8c3dcc06f70911";
   };
 
   buildInputs = [
     x11 wxGTK libdvdcss libdvdplay libdvdplay.libdvdread
     mpeg2dec a52dec libmad alsa
-    (if xvSupport then libXv else null)
   ];
 
   configureFlags = "--disable-ffmpeg --enable-alsa";

pkgs/applications/video/xine-ui/default.nix

@@ -1,11 +0,0 @@
-{stdenv, fetchurl, x11, xineLib, libpng}:
-
-stdenv.mkDerivation {
-  name = "xine-ui-0.99.3";
-  src = fetchurl {
-    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/xine-ui-0.99.3.tar.gz;
-    md5 = "aa7805a93e511e3d67dc1bf09a71fcdd";
-  };
-  buildInputs = [x11 xineLib libpng];
-  configureFlags = "--without-readline";
-}

pkgs/applications/video/zapping/builder.sh

@@ -1,8 +1,5 @@
 . $stdenv/setup
 
-# !!! hack
-NIX_LDFLAGS="$NIX_LDFLAGS -rpath $libXext/lib"
-
 # !!! hack - `make install' tries to setuid to root
 installFlags="ZSFB_OWNER=`id -u` ZSFB_GROUP=`id -g`"
 

pkgs/applications/video/zapping/default.nix

@@ -1,16 +1,13 @@
 { teletextSupport ? true
 , jpegSupport ? true
 , pngSupport ? true
-, recordingSupport ? true
-# !!! libXext shouldn't be necessary (it's in x11); but the builder needs it.
-, stdenv, fetchurl, pkgconfig, perl, python, x11, libXv, libXmu, libXext, libgnomeui
-, libglade, scrollkeeper, esound, gettext, perlXMLParser
-, zvbi ? null, libjpeg ? null, libpng ? null, rte ? null }:
+, stdenv, fetchurl, pkgconfig, perl, python, x11, libgnomeui
+, libglade, scrollkeeper, esound, gettext
+, zvbi ? null, libjpeg ? null, libpng ? null }:
 
-assert pkgconfig != null && perl != null && python != null
-  && x11 != null && libXv != null && libXmu != null && libgnomeui != null && libglade != null
-  && scrollkeeper != null && esound != null && gettext != null
-  && perlXMLParser != null;
+assert pkgconfig != null && perl != null && python != null &&
+  x11 != null && libgnomeui != null && libglade != null &&
+  scrollkeeper != null && esound != null && gettext != null;
 
 assert teletextSupport -> zvbi != null && zvbi.pngSupport
   /* !!! && pngSupport && zvbi.libpng == libpng */;
@@ -18,25 +15,22 @@ assert teletextSupport -> zvbi != null && zvbi.pngSupport
 assert jpegSupport -> libjpeg != null;
 assert pngSupport -> libpng != null;
 
-assert recordingSupport -> rte != null;
-
 stdenv.mkDerivation {
-  name = "zapping-0.7";
+  name = "zapping-0.7cvs6";
 
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/zapping-0.7.tar.bz2;
-    md5 = "dd7b3d920509709692c41c9c6c767746";
+    url = http://heanet.dl.sourceforge.net/sourceforge/zapping/zapping-0.7cvs6.tar.bz2;
+    md5 = "cdedc0088c70f4520c37066ec05cb996";
   };
 
-  inherit teletextSupport jpegSupport pngSupport libXext;
+  inherit teletextSupport jpegSupport pngSupport;
 
   buildInputs = [
-    pkgconfig perl perlXMLParser python x11 libXv libXmu libgnomeui
+    pkgconfig perl python x11 libgnomeui
     libglade scrollkeeper esound gettext
     (if teletextSupport then zvbi else null)
     (if jpegSupport then libjpeg else null)
     (if pngSupport then libpng else null)
-    (if recordingSupport then rte else null)
   ];
 }

pkgs/build-support/fetchsvn/builder.sh

@@ -2,7 +2,7 @@
 
 header "exporting $url (r$rev) into $out"
 
-prefetch=$(dirname $out)/svn-checkout-tmp-$outputHash
+prefetch=$(dirname $out)/svn-checkout-tmp-$md5
 echo $prefetch
 if test -e "$prefetch"; then
     mv $prefetch $out
@@ -11,8 +11,8 @@ else
 fi
 
 actual=$(nix-hash $out)
-if test "$actual" != "$outputHash"; then
-    echo "hash is $actual, expected $outputHash" >&2
+if test "$actual" != "$md5"; then
+    echo "hash is $actual, expected $md5" >&2
     exit 1
 fi
 

pkgs/build-support/fetchsvn/default.nix

@@ -4,13 +4,6 @@ stdenv.mkDerivation {
   name = "svn-export";
   builder = ./builder.sh;
   buildInputs = [subversion nix];
-
-  # Nix <= 0.7 compatibility.
   id = md5;
-
-  outputHashAlgo = "md5";
-  outputHashMode = "recursive";
-  outputHash = md5;
-  
-  inherit url rev;
+  inherit url rev md5;
 }

pkgs/build-support/fetchsvn/nix-prefetch-svn

@@ -2,7 +2,6 @@
 
 url=$1
 rev=$2
-hash=$3
 
 if test -z "$url"; then
     echo "syntax: nix-prefetch-svn URL [REVISION]" >&2
@@ -11,42 +10,27 @@ fi
 
 test -n "$rev" || rev="HEAD"
 
-# Determine the hash, unless it was given.
-if test -z "$hash"; then
-
-    # !!! hacky; we should have a way to query the location of the store.
-    if storeDir=$(which nix-store); then
-        storeDir=$(dirname $(dirname "$storeDir"))/store
-    else
-        storeDir=/nix/store
-    fi
-
-    # !!! race? should be relatively safe, `svn export' barfs if $tmpPath exists.
-    tmpPath1=$storeDir/svn-checkout-tmp-$$
-
-    # Test whether we have write permission in the store.  If not,
-    # fetch to /tmp and don't copy to the store.  This is a hack to
-    # make this script at least work somewhat in setuid installations.
-    if ! touch $tmpPath1 2> /dev/null; then
-        echo "(cannot write to the store, result won't be cached)" >&2
-        dummyMode=1
-        tmpPath1=/tmp/nix-prefetch-svn-$$ # !!! security?
-    fi
-
-    # Perform the checkout.
-    svn export -r "$rev" "$url" $tmpPath1 >&2
-
-    # Compute the hash.
-    hash=$(nix-hash $tmpPath1)
-    echo "hash is $hash" >&2
-
-    # Rename it so that the fetchsvn builder can find it.
-    if test "$dummyMode" != 1; then
-        tmpPath2=$storeDir/svn-checkout-tmp-$hash
-        test -e $tmpPath2 || mv $tmpPath1 $tmpPath2 # !!! race
-    fi
+# !!! hacky; we should have a way to query the location of the store.
+if storeDir=$(which nix-store); then
+    storeDir=$(dirname $(dirname "$storeDir"))/store
+else
+    storeDir=/nix/store
 fi
 
+# !!! race? should be relatively safe, `svn export' barfs if $tmpPath exists.
+tmpPath1=$storeDir/svn-checkout-tmp-$$
+
+# Perform the checkout.
+svn export -r "$rev" "$url" $tmpPath1 >&2
+
+# Compute the hash.
+hash=$(nix-hash $tmpPath1)
+echo "hash is $hash" >&2
+
+# Rename it so that the fetchsvn builder can find it.
+tmpPath2=$storeDir/svn-checkout-tmp-$hash
+test -e $tmpPath2 || mv $tmpPath1 $tmpPath2 # !!! race
+
 # Create a Nix expression that does a fetchsvn.
 nixExpr=$(dirname $(readlink -f $0))/../../system/i686-linux.nix
 storeExpr=$( \
@@ -54,16 +38,10 @@ storeExpr=$( \
   | nix-instantiate -)
 
 # Realise it.
-finalPath=$(nix-store -r $storeExpr)
+finalPath=$(nix-store -qnB --force-realise $storeExpr)
 
 echo "path is $finalPath" >&2
 
-if test -n "$tmpPath1" -o -n "$tmpPath2"; then
-    rm -rf $tmpPath1 $tmpPath2 || true
-fi
+rm -rf $tmpPath2 || true
 
 echo $hash
-
-if test -n "$PRINT_PATH"; then
-    echo $finalPath
-fi

pkgs/build-support/fetchurl/builder.sh

@@ -4,16 +4,10 @@ header "downloading $out from $url"
 
 curl --fail --location --max-redirs 20 "$url" > "$out"
 
-if test "$NIX_OUTPUT_CHECKED" != "1"; then
-    if test "$outputHashAlgo" != "md5"; then
-        echo "hashes other than md5 are unsupported in Nix <= 0.7, upgrade to Nix 0.8"
-        exit 1
-    fi
-    actual=$(md5sum -b "$out" | cut -c1-32)
-    if test "$actual" != "$id"; then
-        echo "hash is $actual, expected $id"
-        exit 1
-    fi
+actual=$(md5sum -b "$out" | cut -c1-32)
+if test "$actual" != "$md5"; then
+    echo "hash is $actual, expected $md5"
+    exit 1
 fi
 
 stopNest

pkgs/build-support/fetchurl/default.nix

@@ -1,26 +1,11 @@
-# Argh, this thing is duplicated (more-or-less) in Nix (in corepkgs).
-# Need to find a way to combine them.
+{stdenv, curl}: {url, md5}:
 
-{stdenv, curl}: # Note that `curl' may be `null', in case of the native stdenv.
-
-{url, outputHash ? "", outputHashAlgo ? "", md5 ? "", sha1 ? "", sha256 ? ""}:
-
-assert (outputHash != "" && outputHashAlgo != "")
-    || md5 != "" || sha1 != "" || sha256 != "";
+# Note that `curl' may be `null', in case of the native stdenv.
 
 stdenv.mkDerivation {
   name = baseNameOf (toString url);
   builder = ./builder.sh;
   buildInputs = [curl];
-
-  # Compatibility with Nix <= 0.7.
   id = md5;
-
-  # New-style output content requirements.
-  outputHashAlgo = if outputHashAlgo != "" then outputHashAlgo else
-      if sha256 != "" then "sha256" else if sha1 != "" then "sha1" else "md5";
-  outputHash = if outputHash != "" then outputHash else
-      if sha256 != "" then sha256 else if sha1 != "" then sha1 else md5;
-  
-  inherit url;
+  inherit url md5;
 }

pkgs/build-support/gcc-wrapper/add-flags

@@ -1,5 +0,0 @@
-export NIX_CFLAGS_COMPILE="@cflagsCompile@ $NIX_CFLAGS_COMPILE"
-export NIX_CFLAGS_LINK="@cflagsLink@ $NIX_CFLAGS_LINK"
-export NIX_LDFLAGS="@ldflags@ $NIX_LDFLAGS"
-export NIX_LDFLAGS_BEFORE="@ldflagsBefore@ $NIX_LDFLAGS_BEFORE"
-export NIX_GLIBC_FLAGS_SET=1

pkgs/build-support/gcc-wrapper/builder.sh

@@ -1,5 +1,4 @@
 . $stdenv/setup
-. $substitute
 
 
 # Force gcc to use ld-wrapper.sh when calling ld.
@@ -10,12 +9,8 @@ if test -z "$nativeGlibc"; then
     # against the crt1.o from our own glibc, rather than the one in
     # /usr/lib.  The real solution is of course to prevent those paths
     # from being used by gcc in the first place.
-    # The dynamic linker is passed in `ldflagsBefore' to allow
-    # explicit overrides of the dynamic linker by callers to gcc/ld
-    # (the *last* value counts, so ours should come first).
     cflagsCompile="$cflagsCompile -B$glibc/lib -isystem $glibc/include"
-    ldflags="$ldflags -L$glibc/lib"
-    ldflagsBefore="-dynamic-linker $glibc/lib/ld-linux.so.2"
+    ldflags="$ldflags -L$glibc/lib -dynamic-linker $glibc/lib/ld-linux.so.2"
 fi
 
 if test -n "$nativeTools"; then
@@ -30,30 +25,9 @@ fi
 
 mkdir $out
 mkdir $out/bin
-mkdir $out/nix-support
 
 
-doSubstitute() {
-    local src=$1
-    local dst=$2
-    substitute "$src" "$dst" \
-        --subst-var "out" \
-        --subst-var "shell" \
-        --subst-var "gcc" \
-        --subst-var "gccProg" \
-        --subst-var "binutils" \
-        --subst-var "glibc" \
-        --subst-var "cflagsCompile" \
-        --subst-var "cflagsLink" \
-        --subst-var "ldflags" \
-        --subst-var "ldflagsBefore" \
-        --subst-var-by "ld" "$ldPath/ld"
-}
-
-
-# Make wrapper scripts around gcc, g++, and g77.  Also make symlinks
-# cc, c++, and f77.
-mkGccWrapper() {
+mkGccWrapper () {
     local dst=$1
     local src=$2
 
@@ -62,9 +36,12 @@ mkGccWrapper() {
         return
     fi
 
-    gccProg="$src"
-    doSubstitute "$gccWrapper" "$dst"
-    chmod +x "$dst"
+    sed \
+        -e "s^@gcc@^$src^g" \
+        -e "s^@out@^$out^g" \
+        -e "s^@shell@^$shell^g" \
+        < $gccWrapper > $dst
+    chmod +x $dst
 }
 
 mkGccWrapper $out/bin/gcc $gccPath/gcc
@@ -77,18 +54,30 @@ mkGccWrapper $out/bin/g77 $gccPath/g77
 ln -s g77 $out/bin/f77
 
 
-# Make a wrapper around the linker.
-doSubstitute "$ldWrapper" "$out/bin/ld"
-chmod +x "$out/bin/ld"
+sed \
+    -e "s^@out@^$out^g" \
+    -e "s^@ldflags@^$ldflags^g" \
+    -e "s^@ld@^$ldPath/ld^g" \
+    -e "s^@shell@^$shell^g" \
+    < $ldWrapper > $out/bin/ld
+chmod +x $out/bin/ld
 
 
-# Emit a setup hook.  Also store the path to the original GCC and
-# Glibc.
+mkdir $out/nix-support
 test -n "$gcc" && echo $gcc > $out/nix-support/orig-gcc
 test -n "$glibc" && echo $glibc > $out/nix-support/orig-glibc
 
-doSubstitute "$addFlags" "$out/nix-support/add-flags"
+cat > $out/nix-support/add-flags <<EOF
+export NIX_CFLAGS_COMPILE="$cflagsCompile \$NIX_CFLAGS_COMPILE"
+export NIX_CFLAGS_LINK="$cflagsLink \$NIX_CFLAGS_LINK"
+export NIX_LDFLAGS="$ldflags \$NIX_LDFLAGS"
+export NIX_GLIBC_FLAGS_SET=1
+EOF
 
-doSubstitute "$setupHook" "$out/nix-support/setup-hook"
+sed \
+    -e "s^@gcc@^$gcc^g" \
+    -e "s^@binutils@^$binutils^g" \
+    -e "s^@glibc@^$glibc^g" \
+    < $setupHook > $out/nix-support/setup-hook
 
 cp -p $utils $out/nix-support/utils

pkgs/build-support/gcc-wrapper/default.nix

@@ -5,7 +5,7 @@
 # stdenv.mkDerivation provides a wrapper that sets up the right environment
 # variables so that the compiler and the linker just "work".
 
-{ name ? "", stdenv, nativeTools, nativeGlibc, nativePrefix ? ""
+{ name, stdenv, nativeTools, nativeGlibc, nativePrefix ? ""
 , gcc ? null, glibc ? null, binutils ? null, shell ? ""
 }:
 
@@ -15,14 +15,11 @@ assert !nativeGlibc -> glibc != null;
 
 stdenv.mkDerivation {
   builder = ./builder.sh;
-  substitute = ../substitute/substitute.sh;
   setupHook = ./setup-hook.sh;
   gccWrapper = ./gcc-wrapper.sh;
   ldWrapper = ./ld-wrapper.sh;
   utils = ./utils.sh;
-  addFlags = ./add-flags;
-  inherit nativeTools nativeGlibc nativePrefix gcc glibc binutils;
-  name = if name == "" then gcc.name else name;
+  inherit name nativeTools nativeGlibc nativePrefix gcc glibc binutils;
   langC = if nativeTools then true else gcc.langC;
   langCC = if nativeTools then true else gcc.langCC;
   langF77 = if nativeTools then false else gcc.langF77;

pkgs/build-support/gcc-wrapper/gcc-wrapper.sh

@@ -63,43 +63,35 @@ fi
 
 
 # Add the flags for the C compiler proper.
-extraAfter=($NIX_CFLAGS_COMPILE)
-extraBefore=()
+extra=($NIX_CFLAGS_COMPILE)
 
 if test "$dontLink" != "1"; then
 
     # Add the flags that should only be passed to the compiler when
     # linking.
-    extraAfter=(${extraAfter[@]} $NIX_CFLAGS_LINK)
+    extra=(${extra[@]} $NIX_CFLAGS_LINK)
 
     # Add the flags that should be passed to the linker (and prevent
     # `ld-wrapper' from adding NIX_LDFLAGS again).
-    for i in $NIX_LDFLAGS_BEFORE; do
-        extraBefore=(${extraBefore[@]} "-Wl,$i")
-    done
     for i in $NIX_LDFLAGS; do
-        extraAfter=(${extraAfter[@]} "-Wl,$i")
+        extra=(${extra[@]} "-Wl,$i")
     done
     export NIX_LDFLAGS_SET=1
 
     if test "$NIX_STRIP_DEBUG" = "1"; then
         # Add executable-stripping flags.
-        extraAfter=(${extraAfter[@]} $NIX_CFLAGS_STRIP)
+        extra=(${extra[@]} $NIX_CFLAGS_STRIP)
     fi
 fi
 
 # Optionally print debug info.
 if test "$NIX_DEBUG" = "1"; then
-  echo "original flags to @gccProg@:" >&2
+  echo "original flags to @gcc@:" >&2
   for i in "${params[@]}"; do
       echo "  $i" >&2
   done
-  echo "extraBefore flags to @gccProg@:" >&2
-  for i in ${extraBefore[@]}; do
-      echo "  $i" >&2
-  done
-  echo "extraAfter flags to @gccProg@:" >&2
-  for i in ${extraAfter[@]}; do
+  echo "extra flags to @gcc@:" >&2
+  for i in ${extra[@]}; do
       echo "  $i" >&2
   done
 fi
@@ -108,4 +100,4 @@ if test -n "$NIX_GCC_WRAPPER_EXEC_HOOK"; then
     . "$NIX_GCC_WRAPPER_EXEC_HOOK"
 fi
 
-exec @gccProg@ ${extraBefore[@]} "${params[@]}" ${extraAfter[@]}
+exec @gcc@ "${params[@]}" ${extra[@]}

pkgs/build-support/gcc-wrapper/ld-wrapper.sh

@@ -42,11 +42,9 @@ fi
 
 
 extra=()
-extraBefore=()
 
 if test -z "$NIX_LDFLAGS_SET"; then
     extra=(${extra[@]} $NIX_LDFLAGS)
-    extraBefore=(${extraBefore[@]} $NIX_LDFLAGS_BEFORE)
 fi
 
 
@@ -123,6 +121,7 @@ if test "$NIX_DONT_SET_RPATH" != "1"; then
     for i in $rpath; do
         extra=(${extra[@]} -rpath $i)
     done
+
 fi
 
 
@@ -142,4 +141,4 @@ if test -n "$NIX_LD_WRAPPER_EXEC_HOOK"; then
     . "$NIX_LD_WRAPPER_EXEC_HOOK"
 fi
 
-exec @ld@ ${extraBefore[@]} "${params[@]}" ${extra[@]}
+exec @ld@ "${params[@]}" ${extra[@]}

pkgs/build-support/make-symlinks/builder.sh

@@ -1,9 +0,0 @@
-. $stdenv/setup
-
-mkdir $out
-for file in $files
-do
-  subdir=`dirname $file`
-  mkdir -p $out/$subdir
-  ln -s $dir/$file $out/$file
-done

pkgs/build-support/make-symlinks/default.nix

@@ -1,7 +0,0 @@
-{name ? "", stdenv, dir, files}:
-
-stdenv.mkDerivation {
-  inherit dir files;
-  name = if name == "" then dir.name else name;
-  builder = ./builder.sh;
-}

pkgs/build-support/make-wrapper/make-wrapper.sh

@@ -1,74 +0,0 @@
-makeWrapper() {
-    original=$1
-    wrapper=$2
-
-    ensureDir "$(dirname $wrapper)"
-
-    echo "#! $SHELL -e" > $wrapper
-
-    params=("$@")
-    for ((n = 2; n < ${#params[*]}; n += 1)); do
-        p=${params[$n]}
-
-        if test "$p" = "--set"; then
-            varName=${params[$((n + 1))]}
-            value=${params[$((n + 2))]}
-            n=$((n + 2))
-            echo "export $varName=$value" >> $wrapper
-        fi
-
-        if test "$p" = "--suffix" -o "$p" = "--prefix"; then
-            varName=${params[$((n + 1))]}
-            separator=${params[$((n + 2))]}
-            value=${params[$((n + 3))]}
-            n=$((n + 3))
-            if test -n "$value"; then
-                if test "$p" = "--suffix"; then
-                    echo "export $varName=\$$varName\${$varName:+$separator}$value" >> $wrapper
-                else
-                    echo "export $varName=$value\${$varName:+$separator}\$$varName" >> $wrapper
-                fi
-            fi
-        fi
-
-        if test "$p" = "--suffix-each"; then
-            varName=${params[$((n + 1))]}
-            separator=${params[$((n + 2))]}
-            values=${params[$((n + 3))]}
-            n=$((n + 3))
-            for value in $values; do
-                echo "export $varName=\$$varName\${$varName:+$separator}$value" >> $wrapper
-            done
-        fi
-
-        if test "$p" = "--suffix-contents"; then
-            varName=${params[$((n + 1))]}
-            separator=${params[$((n + 2))]}
-            fileNames=${params[$((n + 3))]}
-            n=$((n + 3))
-            for fileName in $fileNames; do
-                echo "export $varName=\$$varName\${$varName:+$separator}$(cat $fileName)" >> $wrapper
-            done
-        fi
-    done
-
-    echo "exec \"$original\" \"\$@\"" >> $wrapper
-    
-    chmod +x $wrapper
-}
-
-addSuffix() {
-    suffix=$1
-    shift
-    for name in "$@"; do
-        echo "$name$suffix"
-    done
-}
-
-filterExisting() {
-    for fn in "$@"; do
-        if test -e "$fn"; then
-            echo "$fn"
-        fi
-    done
-}

pkgs/build-support/mono-dll-fixer/builder.sh

@@ -1,5 +0,0 @@
-. $stdenv/setup
-. $substituter
-
-substitute $dllFixer $out --subst-var-by perl $perl/bin/perl
-chmod +x $out

pkgs/build-support/mono-dll-fixer/default.nix

@@ -1,9 +0,0 @@
-{stdenv, perl}:
-
-stdenv.mkDerivation {
-  name = "mono-dll-fixer";
-  builder = ./builder.sh;
-  substituter = ../substitute/substitute.sh;
-  dllFixer = ./dll-fixer.pl;
-  inherit perl;
-}

pkgs/build-support/mono-dll-fixer/dll-fixer.pl

@@ -1,32 +0,0 @@
-#! @perl@ -w
-
-use strict;
-
-my @paths = split ' ', $ENV{"ALL_INPUTS"};
-
-open IN, "<$ARGV[0]" or die;
-open OUT, ">$ARGV[0].tmp" or die;
-
-while (<IN>) {
-    # !!! should use a real XML library here.
-    if (!/<dllmap dll="(.*)" target="(.*)"\/>/) {
-        print OUT;
-        next;
-    }
-    my $dll = $1;
-    my $target = $2;
-
-    foreach my $path (@paths) {
-        my $fullPath = "$path/lib/$target";
-        if (-e "$fullPath") {
-            $target = $fullPath;
-            last;
-        }
-    }
-
-    print OUT "  <dllmap dll=\"$dll\" target=\"$target\"/>\n";
-}
-
-close IN;
-
-rename "$ARGV[0].tmp", "$ARGV[0]" or die "cannot rename $ARGV[0]";

pkgs/build-support/substitute/substitute.sh

@@ -1,46 +0,0 @@
-substitute() {
-    input=$1
-    output=$2
-
-    params=("$@")
-
-    sedArgs=()
-    
-    for ((n = 2; n < ${#params[*]}; n += 1)); do
-        p=${params[$n]}
-
-        if test "$p" = "--replace"; then
-            pattern=${params[$((n + 1))]}
-            replacement=${params[$((n + 2))]}
-            n=$((n + 2))
-            sedArgs=("${sedArgs[@]}" "-e" "s^$pattern^$replacement^g")
-        fi
-
-        if test "$p" = "--subst-var"; then
-            varName=${params[$((n + 1))]}
-            n=$((n + 1))
-            sedArgs=("${sedArgs[@]}" "-e" "s^@${varName}@^${!varName}^g")
-        fi
-
-        if test "$p" = "--subst-var-by"; then
-            varName=${params[$((n + 1))]}
-            replacement=${params[$((n + 2))]}
-            n=$((n + 2))
-            sedArgs=("${sedArgs[@]}" "-e" "s^@${varName}@^$replacement^g")
-        fi
-
-    done
-
-    sed "${sedArgs[@]}" < "$input" > "$output".tmp
-    if test -x "$output"; then
-        chmod +x "$output".tmp
-    fi
-    mv -f "$output".tmp "$output"
-}
-
-
-substituteInPlace() {
-    fileName="$1"
-    shift
-    substitute "$fileName" "$fileName" "$@"
-}

pkgs/data/sgml+xml/schemas/xml-dtd/docbook-4.2/default.nix

@@ -6,7 +6,7 @@ stdenv.mkDerivation {
   name = "docbook-xml-4.2";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/docbook-xml-4.2.zip;
+    url = http://www.docbook.org/xml/4.2/docbook-xml-4.2.zip;
     md5 = "73fe50dfe74ca631c1602f558ed8961f";
   };
   buildInputs = [unzip];

pkgs/data/sgml+xml/schemas/xml-dtd/docbook-4.3/default.nix

@@ -6,7 +6,7 @@ stdenv.mkDerivation {
   name = "docbook-xml-4.3";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/docbook-xml-4.3.zip;
+    url = http://www.docbook.org/xml/4.3/docbook-xml-4.3.zip;
     md5 = "ab200202b9e136a144db1e0864c45074";
   };
   buildInputs = [unzip];