* Mark stable release.

svn path=/nixpkgs/branches/0.8-release/; revision=2529
* Evacuate tarballs.
2026-06-07 13:53:42 +00:00 · 2005-04-11 13:19:41 +00:00 · 2005-04-11 13:09:01 +00:00 · 2005-04-11 09:01:27 +00:00 · 2005-04-11 08:55:05 +00:00 · 2005-04-11 08:54:32 +00:00
60 changed files with 231 additions and 202 deletions
--- a/13
+++ b/13
@@ -1,4 +1,15 @@
-Nix Packages 0.7
+Nix Packages 0.8 (April 11, 2005)
+
+* This release is mostly to remain synchronised with the changed
+  hashing scheme in Nix 0.8.
+
+* Notable updates:
+
+  - Adobe Reader 7.0
+  - Various security updates (zlib 1.2.2, etc.)
+
+
+Nix Packages 0.7 (March 14, 2005)

 * The bootstrap process for the standard build environment on Linux
  (stdenv-linux) has been improved.  It is no longer dependent in its
--- a/2
+++ b/2
@@ -1 +1 @@
-0
+1
--- a/2
+++ b/2
@@ -1 +1 @@
-0.7
+0.8
--- a/maintainers/docs/classification.txt
+++ b/maintainers/docs/classification.txt
@@ -53,6 +53,9 @@ ELSE IF it's a TOOL (or set of):
  ELSE IF it's a COMPRESSION program:
    ./tools/compression
    (e.g., gzip, bzip2)
+  ELSE IF it's a SECURITY program:
+    ./tools/security
+    (e.g., nmap, gnupg)
  ELSE
    ./tools/misc

--- a/maintainers/scripts/evacuate-urls.sh
+++ b/maintainers/scripts/evacuate-urls.sh
@@ -6,7 +6,7 @@ find . -name "*.nix" | while read fn; 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"; then
+            if ! echo "$oldURL" | grep -q -E ".cs.uu.nl|.stratego-language.org|java.sun.com|ut2004|linuxq3a|RealPlayer|Adbe"; then
                base=$(basename $oldURL)
                newURL="http://catamaran.labs.cs.uu.nl/dist/tarballs/$base"
                newPath="/mnt/scratchy/eelco/public_html/tarballs/$base"
--- a/pkgs/applications/editors/monodoc/default.nix
+++ b/pkgs/applications/editors/monodoc/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation {

  builder = ./builder.sh;
  src = fetchurl {
-    url = http://www.go-mono.com/archive/1.0.6/monodoc-1.0.6.tar.gz;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/monodoc-1.0.6.tar.gz;
    md5 = "f2fc27e8e4717d90dc7efa2450625693";
  };

--- a/pkgs/applications/graphics/f-spot/default.nix
+++ b/pkgs/applications/graphics/f-spot/default.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation {
  makeWrapper = ../../../build-support/make-wrapper/make-wrapper.sh;
  
  src = fetchurl {
-    url = http://ftp.gnome.org/pub/gnome/sources/f-spot/0.0/f-spot-0.0.10.tar.bz2;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/f-spot-0.0.10.tar.bz2;
    md5 = "19cc6e067ccc261b0502ff6189b79832";
  };

--- a/pkgs/applications/graphics/gqview/default.nix
+++ b/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-2.0.0";

  src = fetchurl {
-    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/gqview-1.4.5.tar.gz;
-    md5 = "b196935767c2d3dc61243d9ed0801c2e";
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/gqview-2.0.0.tar.gz;
+    md5 = "421c9a79827e91e394bdfc924071d66f";
  };

  buildInputs = [pkgconfig gtk libpng];
--- a/pkgs/applications/misc/acrobat-reader/builder.sh
+++ b/pkgs/applications/misc/acrobat-reader/builder.sh
@@ -6,16 +6,23 @@ tar xvfz $src
 mkdir $out

 echo "unpacking reader..."
-tar xvf ./COMMON.TAR -C $out
-tar xvf ./LINUXRDR.TAR -C $out
+tar xvf AdobeReader/COMMON.TAR -C $out
+tar xvf AdobeReader/ILINXR.TAR -C $out
+
+# Disable this plugin for now (it needs LDAP, and I'm too lazy to add it).
+rm $out/Reader/intellinux/plug_ins/PPKLite.api

 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
+fullPath=
+for i in $libPath; do
+    fullPath=$fullPath${fullPath:+:}$i/lib
+done
+
+echo "#! $SHELL" > $out/bin/acroread.tmp
+echo "LD_LIBRARY_PATH=$fullPath\${LD_LIBRARY_PATH:+:}\$LD_LIBRARY_PATH" >> $out/bin/acroread.tmp
+cat $out/bin/acroread >> $out/bin/acroread.tmp
+chmod 755 $out/bin/acroread.tmp
+mv $out/bin/acroread.tmp $out/bin/acroread
--- a/pkgs/applications/misc/acrobat-reader/default.nix
+++ b/pkgs/applications/misc/acrobat-reader/default.nix
@@ -1,12 +1,12 @@
-{stdenv, fetchurl, patchelf, libXt, libXp, libXext, libX11}:
+{stdenv, fetchurl, libXt, libXp, libXext, libX11, glib, pango, atk, gtk, libstdcpp5, zlib}:

 stdenv.mkDerivation {
-  name = "acrobat-reader-5.0.9";
+  name = "acrobat-reader-7.0";
  builder = ./builder.sh;
  src = fetchurl {
-    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/linux-509.tar.gz;
-    md5 = "53b7ca0fc83ab81214ba82050ce89c64";
+    url = ftp://ftp.adobe.com/pub/adobe/reader/unix/7x/7.0/enu/AdbeRdr70_linux_enu.tar.gz;
+    md5 = "f847ce21e5d871837f2dc1d2f1baf9a9";
  };
-  buildInputs = [patchelf];
-  inherit libXt libXp libXext libX11;
+  
+  libPath = [libXt libXp libXext libX11 glib pango atk gtk libstdcpp5 zlib];
 }
--- a/pkgs/applications/networking/browsers/firefox/default.nix
+++ b/pkgs/applications/networking/browsers/firefox/default.nix
@@ -3,12 +3,12 @@
 # !!! assert libIDL.glib == gtk.glib;

 (stdenv.mkDerivation {
-  name = "firefox-1.0.1";
+  name = "firefox-1.0.2";

  builder = ./builder.sh;
  src = fetchurl {
-    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/firefox-1.0.1-source.tar.bz2;
-    md5 = "ebaea974fea9460ab7050fff76b41cb1";
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/firefox-1.0.2-source.tar.bz2;
+    md5 = "fd1a0dec3e763e93eb45c0c34b399712";
  };

  buildInputs = [pkgconfig gtk perl zip libIDL libXi];
--- a/pkgs/applications/networking/browsers/mozilla-plugins/mplayerplug-in/default.nix
+++ b/pkgs/applications/networking/browsers/mozilla-plugins/mplayerplug-in/default.nix
@@ -9,7 +9,7 @@

  builder = ./builder.sh;
  src = fetchurl {
-    url = http://heanet.dl.sourceforge.net/sourceforge/mplayerplug-in/mplayerplug-in-2.80.tar.gz;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/mplayerplug-in-2.80.tar.gz;
    md5 = "ce3235ff7d46fae416cfb175193a5f25";
  };

--- a/pkgs/applications/version-management/subversion-1.1.x/default.nix
+++ b/pkgs/applications/version-management/subversion-1.1.x/default.nix
@@ -19,12 +19,12 @@ assert javahlBindings -> j2sdk != null;
 assert compressionSupport -> zlib != null;

 stdenv.mkDerivation {
-  name = "subversion-1.1.3";
+  name = "subversion-1.1.4";

  builder = ./builder.sh;
  src = fetchurl {
-    url = http://subversion.tigris.org/tarballs/subversion-1.1.3.tar.bz2;
-    md5 = "a09c2b2fa1a09566c024547954a48478";
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/subversion-1.1.4.tar.bz2;
+    md5 = "6e557ae65b6b8d7577cc7704ede85a23";
  };

  # This is a hopefully temporary fix for the problem that
--- a/pkgs/applications/video/mythtv/default.nix
+++ b/pkgs/applications/video/mythtv/default.nix
@@ -7,7 +7,7 @@ stdenv.mkDerivation {

  builder = ./builder.sh;
  src = fetchurl {
-    url = http://www.mythtv.org/mc/mythtv-0.17.tar.bz2;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/mythtv-0.17.tar.bz2;
    md5 = "c996dc690d36e946396fc5cd4b715e3b";
  };

--- a/pkgs/data/sgml+xml/stylesheets/xslt/docbook/default.nix
+++ b/pkgs/data/sgml+xml/stylesheets/xslt/docbook/default.nix
@@ -1,10 +1,10 @@
 {stdenv, fetchurl}:

 stdenv.mkDerivation {
-  name = "docbook-xsl-1.65.1";
+  name = "docbook-xsl-1.68.1";
  builder = ./builder.sh;
  src = fetchurl {
-    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/docbook-xsl-1.65.1.tar.gz;
-    md5 = "2f7d446de5523ec34a19ccbe8caf387f";
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/docbook-xsl-1.68.1.tar.bz2;
+    md5 = "f4985efbc0f3411af8106928f8752fc5";
  };
 }
--- a/pkgs/development/compilers/mono/default.nix
+++ b/pkgs/development/compilers/mono/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
  name = "mono-1.1.4";
  src = fetchurl {
-    url = http://www.go-mono.com/archive/1.1.4/mono-1.1.4.tar.gz;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/mono-1.1.4.tar.gz;
    md5 = "66755e5f201e912cecdd19807ba62487";
  };

--- a/pkgs/development/interpreters/guile/default.nix
+++ b/pkgs/development/interpreters/guile/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
  name = "guile-1.6.7";
  src = fetchurl {
-    url = http://ftp.gnu.org/pub/gnu/guile/guile-1.6.7.tar.gz;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/guile-1.6.7.tar.gz;
    md5 = "c2ff2a2231f0cbb2e838dd8701a587c5";
  };

--- a/pkgs/development/interpreters/octave/default.nix
+++ b/pkgs/development/interpreters/octave/default.nix
@@ -1,14 +1,14 @@
-{stdenv, fetchurl, g77, readline, ncurses, perl}:
+{stdenv, fetchurl, g77, readline, ncurses, perl, flex}:

-assert readline != null && ncurses != null;
+assert readline != null && ncurses != null && flex != null;
 assert g77.langF77;

 stdenv.mkDerivation {
-  name = "octave-2.1.64";
+  name = "octave-2.9.0";
  src = fetchurl {
-    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/octave-2.1.64.tar.bz2;
-    md5 = "01ec8b13bd850123b190129be93adc1f";
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/octave-2.9.0.tar.bz2;
+    md5 = "687a09033bc68f09810e947010bc8f29";
  };
-  buildInputs = [g77 readline ncurses perl];
+  buildInputs = [g77 readline ncurses perl flex];
  configureFlags = "--enable-readline --enable-dl --disable-static --enable-shared";
 }
--- a/pkgs/development/interpreters/perl/default.nix
+++ b/pkgs/development/interpreters/perl/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation {

  builder = ./builder.sh;
  src = fetchurl {
-    url = ftp://ftp.cpan.org/pub/CPAN/src/5.0/perl-5.8.6.tar.bz2;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/perl-5.8.6.tar.bz2;
    md5 = "3d030b6ff2a433840edb1a407d18dc0a";
  };

--- a/pkgs/development/libraries/glibc/default.nix
+++ b/pkgs/development/libraries/glibc/default.nix
@@ -6,12 +6,12 @@ stdenv.mkDerivation {
  substitute = ../../../build-support/substitute/substitute.sh;

  src = fetchurl {
-    url = http://ftp.gnu.org/gnu/glibc/glibc-2.3.4.tar.bz2;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/glibc-2.3.4.tar.bz2;
    md5 = "174ac5ed4f2851fcc866a3bac1e4a6a5";
  };

  linuxthreadsSrc = fetchurl {
-    url = http://ftp.gnu.org/gnu/glibc/glibc-linuxthreads-2.3.4.tar.bz2;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/glibc-linuxthreads-2.3.4.tar.bz2;
    md5 = "7a199cd4965eb5622163756ae64358fe";
  };

--- a/pkgs/development/libraries/gnome/src-gnome-desktop-2.8.3.nix
+++ b/pkgs/development/libraries/gnome/src-gnome-desktop-2.8.3.nix
@@ -3,7 +3,7 @@
  gnomeicontheme = {
    name = "gnome-icon-theme-2.8.0";
    src = fetchurl {
-      url = ftp://ftp.gnome.org/Public/gnome/desktop/2.8/2.8.3/sources/gnome-icon-theme-2.8.0.tar.bz2;
+      url = http://catamaran.labs.cs.uu.nl/dist/tarballs/gnome-icon-theme-2.8.0.tar.bz2;
      md5 = "7be016337c44c024fb22f7b94b689d7b";
    };
  };
@@ -11,7 +11,7 @@
  gnomekeyring = {
    name = "gnome-keyring-0.4.1";
    src = fetchurl {
-      url = ftp://ftp.gnome.org/Public/gnome/desktop/2.8/2.8.3/sources/gnome-keyring-0.4.1.tar.bz2;
+      url = http://catamaran.labs.cs.uu.nl/dist/tarballs/gnome-keyring-0.4.1.tar.bz2;
      md5 = "031901a50273cc5a39b1305924613a1b";
    };
  };
@@ -19,7 +19,7 @@
  gtkhtml = {
    name = "gtkhtml-3.2.5";
    src = fetchurl {
-      url = ftp://ftp.gnome.org/Public/gnome/desktop/2.8/2.8.3/sources/gtkhtml-3.2.5.tar.bz2;
+      url = http://catamaran.labs.cs.uu.nl/dist/tarballs/gtkhtml-3.2.5.tar.bz2;
      md5 = "86e1ce32fed536bce5b2d6e8d41b0c65";
    };
  };
@@ -27,7 +27,7 @@
  libgtkhtml = {
    name = "libgtkhtml-2.6.3";
    src = fetchurl {
-      url = ftp://ftp.gnome.org/Public/gnome/desktop/2.8/2.8.3/sources/libgtkhtml-2.6.3.tar.bz2;
+      url = http://catamaran.labs.cs.uu.nl/dist/tarballs/libgtkhtml-2.6.3.tar.bz2;
      md5 = "c77789241d725e189ffc0391eda94361";
    };
  };
@@ -35,7 +35,7 @@
  gtksourceview = {
    name = "gtksourceview-1.1.1";
    src = fetchurl {
-      url = ftp://ftp.gnome.org/Public/gnome/desktop/2.8/2.8.3/sources/gtksourceview-1.1.1.tar.bz2;
+      url = http://catamaran.labs.cs.uu.nl/dist/tarballs/gtksourceview-1.1.1.tar.bz2;
      md5 = "2e59c8748594181d4bf452320c8c3b5c";
    };
  };
@@ -51,7 +51,7 @@
  gnomedesktop = {
    name = "gnome-desktop-2.8.3";
    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.8/2.8.3/sources/gnome-desktop-2.8.3.tar.bz2;
+      url = http://catamaran.labs.cs.uu.nl/dist/tarballs/gnome-desktop-2.8.3.tar.bz2;
      md5 = "607f8689f931336ad9a1f3f41d98a9c7";
    };
  };
@@ -59,7 +59,7 @@
  libwnck = {
    name = "libwnck-2.8.1";
    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.8/2.8.3/sources/libwnck-2.8.1.tar.bz2;
+      url = http://catamaran.labs.cs.uu.nl/dist/tarballs/libwnck-2.8.1.tar.bz2;
      md5 = "c0a5a8478064287e167c15e3ec0e82a1";
    };
  };
@@ -67,7 +67,7 @@
  gnomepanel = {
    name = "gnome-panel-2.8.3";
    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.8/2.8.3/sources/gnome-panel-2.8.3.tar.bz2;
+      url = http://catamaran.labs.cs.uu.nl/dist/tarballs/gnome-panel-2.8.3.tar.bz2;
      md5 = "d76a09c321e02c18e0fdecb86677550d";
    };
  };
--- a/pkgs/development/libraries/gnome/src-gnome-platform-2.8.3.nix
+++ b/pkgs/development/libraries/gnome/src-gnome-platform-2.8.3.nix
@@ -4,7 +4,7 @@
  gconf = {
    name = "GConf-2.8.1";
    src = fetchurl {
-      url = ftp://ftp.gnome.org/Public/gnome/platform/2.8/2.8.3/sources/GConf-2.8.1.tar.bz2;
+      url = http://catamaran.labs.cs.uu.nl/dist/tarballs/GConf-2.8.1.tar.bz2;
      md5 = "b1173cbe33404bcbcc15710ce2a28f67";
    };
  };
@@ -12,7 +12,7 @@
  ORBit2 = {
    name = "ORBit2-2.12.1";
    src = fetchurl {
-      url = ftp://ftp.gnome.org/Public/gnome/platform/2.8/2.8.3/sources/ORBit2-2.12.1.tar.bz2;
+      url = http://catamaran.labs.cs.uu.nl/dist/tarballs/ORBit2-2.12.1.tar.bz2;
      md5 = "30ede62e194f692f2dd3daa09c752196";
    };
  };
@@ -20,7 +20,7 @@
  atk = {
    name = "atk-1.8.0";
    src = fetchurl {
-      url = ftp://ftp.gnome.org/Public/gnome/platform/2.8/2.8.3/sources/atk-1.8.0.tar.bz2;
+      url = http://catamaran.labs.cs.uu.nl/dist/tarballs/atk-1.8.0.tar.bz2;
      md5 = "fc46940febb0e91427b77457e6356f3d";
    };
  };
@@ -28,7 +28,7 @@
  audiofile = {
    name = "audiofile-0.2.6";
    src = fetchurl {
-      url = ftp://ftp.gnome.org/Public/gnome/platform/2.8/2.8.3/sources/audiofile-0.2.6.tar.bz2;
+      url = http://catamaran.labs.cs.uu.nl/dist/tarballs/audiofile-0.2.6.tar.bz2;
      md5 = "3d01302834660850b6141cac1e6f5501";
    };
  };
@@ -36,7 +36,7 @@
  esound = {
    name = "esound-0.2.35";
    src = fetchurl {
-      url = ftp://ftp.gnome.org/Public/gnome/platform/2.8/2.8.3/sources/esound-0.2.35.tar.bz2;
+      url = http://catamaran.labs.cs.uu.nl/dist/tarballs/esound-0.2.35.tar.bz2;
      md5 = "1566344f80a8909b5e6e4d6b6520c2c1";
    };
  };
@@ -44,7 +44,7 @@
  gail = {
    name = "gail-1.8.2";
    src = fetchurl {
-      url = ftp://ftp.gnome.org/Public/gnome/platform/2.8/2.8.3/sources/gail-1.8.2.tar.bz2;
+      url = http://catamaran.labs.cs.uu.nl/dist/tarballs/gail-1.8.2.tar.bz2;
      md5 = "3b8be198ccb8a0d92cfb0c3cdd519c1f";
    };
  };
@@ -52,7 +52,7 @@
  glib = {
    name = "glib-2.4.8";
    src = fetchurl {
-      url = ftp://ftp.gnome.org/Public/gnome/platform/2.8/2.8.3/sources/glib-2.4.8.tar.bz2;
+      url = http://catamaran.labs.cs.uu.nl/dist/tarballs/glib-2.4.8.tar.bz2;
      md5 = "e160a5feecf46e0fbb36db09c356953c";
    };
  };
@@ -60,7 +60,7 @@
  gnomemimedata = {
    name = "gnome-mime-data-2.4.2";
    src = fetchurl {
-      url = ftp://ftp.gnome.org/Public/gnome/platform/2.8/2.8.3/sources/gnome-mime-data-2.4.2.tar.bz2;
+      url = http://catamaran.labs.cs.uu.nl/dist/tarballs/gnome-mime-data-2.4.2.tar.bz2;
      md5 = "37242776b08625fa10c73c18b790e552";
    };
  };
@@ -68,7 +68,7 @@
  gnomevfs = {
    name = "gnome-vfs-2.8.4";
    src = fetchurl {
-      url = ftp://ftp.gnome.org/Public/gnome/platform/2.8/2.8.3/sources/gnome-vfs-2.8.4.tar.bz2;
+      url = http://catamaran.labs.cs.uu.nl/dist/tarballs/gnome-vfs-2.8.4.tar.bz2;
      md5 = "42d3505e9ef9c26a7aae4e511b9b4c34";
    };
  };
@@ -76,7 +76,7 @@
  gtk = {
    name = "gtk+-2.4.14";
    src = fetchurl {
-      url = ftp://ftp.gnome.org/Public/gnome/platform/2.8/2.8.3/sources/gtk+-2.4.14.tar.bz2;
+      url = http://catamaran.labs.cs.uu.nl/dist/tarballs/gtk+-2.4.14.tar.bz2;
      md5 = "10470d574933460809e4ac488e579e26";
    };
  };
@@ -84,7 +84,7 @@
  libIDL = {
    name = "libIDL-0.8.5.tar.bz2";
    src = fetchurl {
-      url = ftp://ftp.gnome.org/Public/gnome/platform/2.8/2.8.3/sources/libIDL-0.8.5.tar.bz2;
+      url = http://catamaran.labs.cs.uu.nl/dist/tarballs/libIDL-0.8.5.tar.bz2;
      md5 = "c63f6513dc7789d0575bea02d62d58d7";
    };
  };
@@ -92,7 +92,7 @@
  libart_lgpl = {
    name = "libart_lgpl-2.3.17";
    src = fetchurl {
-      url = ftp://ftp.gnome.org/Public/gnome/platform/2.8/2.8.3/sources/libart_lgpl-2.3.17.tar.bz2;
+      url = http://catamaran.labs.cs.uu.nl/dist/tarballs/libart_lgpl-2.3.17.tar.bz2;
      md5 = "dfca42529393c8a8f59dc4dc10675a46";
    };
  };
@@ -100,7 +100,7 @@
  libbonobo = {
    name = "libbonobo-2.8.1";
    src = fetchurl {
-      url = ftp://ftp.gnome.org/Public/gnome/platform/2.8/2.8.3/sources/libbonobo-2.8.1.tar.bz2;
+      url = http://catamaran.labs.cs.uu.nl/dist/tarballs/libbonobo-2.8.1.tar.bz2;
      md5 = "54f863c20016cf8a2cf25056f6c7cda7";
    };
  };
@@ -108,7 +108,7 @@
  libbonoboui = {
    name = "libbonoboui-2.8.1";
    src = fetchurl {
-      url = ftp://ftp.gnome.org/Public/gnome/platform/2.8/2.8.3/sources/libbonoboui-2.8.1.tar.bz2;
+      url = http://catamaran.labs.cs.uu.nl/dist/tarballs/libbonoboui-2.8.1.tar.bz2;
      md5 = "b23daafa8344a88696d497f20285ef55";
    };
  };
@@ -116,7 +116,7 @@
  libglade = {
    name = "libglade-2.4.2";
    src = fetchurl {
-      url = ftp://ftp.gnome.org/Public/gnome/platform/2.8/2.8.3/sources/libglade-2.4.2.tar.bz2;
+      url = http://catamaran.labs.cs.uu.nl/dist/tarballs/libglade-2.4.2.tar.bz2;
      md5 = "83d08f9ab485a10454bd5171d2d53fb0";
    };
  };
@@ -124,7 +124,7 @@
  libgnome = {
    name = "libgnome-2.8.1";
    src = fetchurl {
-      url = ftp://ftp.gnome.org/Public/gnome/platform/2.8/2.8.3/sources/libgnome-2.8.1.tar.bz2;
+      url = http://catamaran.labs.cs.uu.nl/dist/tarballs/libgnome-2.8.1.tar.bz2;
      md5 = "17577198f5086c48f69c361be2f4806c";
    };
  };
@@ -132,7 +132,7 @@
  libgnomecanvas = {
    name = "libgnomecanvas-2.8.0";
    src = fetchurl {
-      url = ftp://ftp.gnome.org/Public/gnome/platform/2.8/2.8.3/sources/libgnomecanvas-2.8.0.tar.bz2;
+      url = http://catamaran.labs.cs.uu.nl/dist/tarballs/libgnomecanvas-2.8.0.tar.bz2;
      md5 = "2bf10396a92777e7b64b6052a8a232f1";
    };
  };
@@ -140,7 +140,7 @@
  libgnomeprint = {
    name = "libgnomeprint-2.8.2";
    src = fetchurl {
-      url = ftp://ftp.gnome.org/Public/gnome/platform/2.8/2.8.3/sources/libgnomeprint-2.8.2.tar.bz2;
+      url = http://catamaran.labs.cs.uu.nl/dist/tarballs/libgnomeprint-2.8.2.tar.bz2;
      md5 = "8361c4e1bc3d87b91435807d0c06a3e4";
    };
  };
@@ -148,7 +148,7 @@
  libgnomeprintui = {
    name = "libgnomeprintui-2.8.2";
    src = fetchurl {
-      url = ftp://ftp.gnome.org/Public/gnome/platform/2.8/2.8.3/sources/libgnomeprintui-2.8.2.tar.bz2;
+      url = http://catamaran.labs.cs.uu.nl/dist/tarballs/libgnomeprintui-2.8.2.tar.bz2;
      md5 = "b38d1f6813dd52879ba4174ddc3f1b1c";
    };
  };
@@ -156,7 +156,7 @@
  libgnomeui = {
    name = "libgnomeui-2.8.1";
    src = fetchurl {
-      url = ftp://ftp.gnome.org/Public/gnome/platform/2.8/2.8.3/sources/libgnomeui-2.8.1.tar.bz2;
+      url = http://catamaran.labs.cs.uu.nl/dist/tarballs/libgnomeui-2.8.1.tar.bz2;
      md5 = "d46a2b34bdfbc1b36464176fa8bef03c";
    };
  };
@@ -164,7 +164,7 @@
  pango = {
    name = "pango-1.6.0";
    src = fetchurl {
-      url = ftp://ftp.gnome.org/Public/gnome/platform/2.8/2.8.3/sources/pango-1.6.0.tar.bz2;
+      url = http://catamaran.labs.cs.uu.nl/dist/tarballs/pango-1.6.0.tar.bz2;
      md5 = "6c732bbc5fba5a0f1f8086e8aa4f490d";
    };
  };
@@ -172,7 +172,7 @@
  intltool = {
    name = "intltool-0.33";
    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/platform/2.8/2.8.3/sources/intltool-0.33.tar.bz2;
+      url = http://catamaran.labs.cs.uu.nl/dist/tarballs/intltool-0.33.tar.bz2;
      md5 = "7d3b6d421b0fb9beee7faf97daab45e6";
    };
  };
--- a/pkgs/development/libraries/gtk-libs-2.6/glib/default.nix
+++ b/pkgs/development/libraries/gtk-libs-2.6/glib/default.nix
@@ -3,10 +3,10 @@
 assert pkgconfig != null && gettext != null && perl != null;

 stdenv.mkDerivation {
-  name = "glib-2.6.3";
+  name = "glib-2.6.4";
  src = fetchurl {
-    url = ftp://ftp.gtk.org/pub/gtk/v2.6/glib-2.6.3.tar.bz2;
-    md5 = "8f69ad5387197114b356efc64ce88d77";
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/glib-2.6.4.tar.bz2;
+    md5 = "af7eeb8aae764ff763418471ed6eb93d";
  };
  buildInputs = [pkgconfig gettext perl];
 }
--- a/pkgs/development/libraries/gtk-libs-2.6/gtk+/default.nix
+++ b/pkgs/development/libraries/gtk-libs-2.6/gtk+/default.nix
@@ -10,10 +10,10 @@ assert x11.buildClientLibs;
 #assert x11 == pango.x11;

 stdenv.mkDerivation {
-  name = "gtk+-2.6.4";
+  name = "gtk+-2.6.6";
  src = fetchurl {
-    url = http://ftp.gnome.org/pub/GNOME/sources/gtk+/2.6/gtk+-2.6.4.tar.bz2;
-    md5 = "4749fce7b082b784a71a076aa586dc25";
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/gtk+-2.6.6.tar.bz2;
+    md5 = "6bf5a71a7ea6a02821fd0c9edab25904";
  };
  buildInputs = [pkgconfig perl libtiff libjpeg libpng];
  propagatedBuildInputs = [x11 glib atk pango];
--- a/pkgs/development/libraries/gtk-libs-2.6/pango/default.nix
+++ b/pkgs/development/libraries/gtk-libs-2.6/pango/default.nix
@@ -6,7 +6,7 @@ assert x11.buildClientLibs;
 stdenv.mkDerivation {
  name = "pango-1.8.1";
  src = fetchurl {
-    url = ftp://ftp.gtk.org/pub/gtk/v2.6/pango-1.8.1.tar.bz2;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/pango-1.8.1.tar.bz2;
    md5 = "88aa6bf1876766db6864f3b93577887c";
  };
  buildInputs = [pkgconfig];
--- a/pkgs/development/libraries/gtk-sharp-1/default.nix
+++ b/pkgs/development/libraries/gtk-sharp-1/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation {

  builder = ./builder.sh;
  src = fetchurl {
-    url = http://www.go-mono.com/archive/1.0.6/gtk-sharp-1.0.6.tar.gz;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/gtk-sharp-1.0.6.tar.gz;
    md5 = "2651d14fe77174ab20b8af53d150ee11";
  };

--- a/pkgs/development/libraries/gtk-sharp-2/default.nix
+++ b/pkgs/development/libraries/gtk-sharp-2/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation {

  builder = ./builder.sh;
  src = fetchurl {
-    url = http://heanet.dl.sourceforge.net/sourceforge/gtk-sharp/gtk-sharp-1.9.2.tar.gz;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/gtk-sharp-1.9.2.tar.gz;
    md5 = "b7c5afab5f736ffa4011974302831363";
  };

--- a/pkgs/development/libraries/java/jjtraveler/default.nix
+++ b/pkgs/development/libraries/java/jjtraveler/default.nix
@@ -1,7 +1,7 @@
 {stdenv, fetchurl, j2sdk}:

 stdenv.mkDerivation {
-  name = "jjtraveler-0.4.3.tar.gz";
+  name = "jjtraveler-0.4.3";
  src = fetchurl {
    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/JJTraveler-0.4.3.tar.gz;
    md5 = "35bf801ee61f042513ae88247fe1bf1d";
--- a/pkgs/development/libraries/lcms/default.nix
+++ b/pkgs/development/libraries/lcms/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
  name = "lcms-1.14";

  src = fetchurl {
-    url = http://www.littlecms.com/lcms-1.14.tar.gz;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/lcms-1.14.tar.gz;
    md5 = "5a803460aeb10e762d97e11a37462a69";
  };
 }
--- a/pkgs/development/libraries/libexif/default.nix
+++ b/pkgs/development/libraries/libexif/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
  name = "libexif-0.6.11";

  src = fetchurl {
-    url = http://heanet.dl.sourceforge.net/sourceforge/libexif/libexif-0.6.11.tar.bz2;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/libexif-0.6.11.tar.bz2;
    md5 = "211996a336f1b1a06def5a6d5c94284e";
  };

--- a/pkgs/development/libraries/libgphoto2/default.nix
+++ b/pkgs/development/libraries/libgphoto2/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
  name = "libgphoto2-2.1.5";

  src = fetchurl {
-    url = http://heanet.dl.sourceforge.net/sourceforge/gphoto/libgphoto2-2.1.5.tar.gz;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/libgphoto2-2.1.5.tar.gz;
    md5 = "210844f0d88f58842917af6eaff06382";
  };
 }
--- a/pkgs/development/libraries/libtheora/default.nix
+++ b/pkgs/development/libraries/libtheora/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
  name = "libtheora-1.0alpha4";
  src = fetchurl {
-    url = http://downloads.xiph.org/releases/theora/libtheora-1.0alpha4.tar.bz2;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/libtheora-1.0alpha4.tar.bz2;
    md5 = "a71ac42ec0f848da327930841a80ff2b";
  };
  propagatedBuildInputs = [libogg libvorbis];
--- a/pkgs/development/libraries/libtiff/default.nix
+++ b/pkgs/development/libraries/libtiff/default.nix
@@ -3,11 +3,11 @@
 assert zlib != null && libjpeg != null;

 stdenv.mkDerivation {
-  name = "libtiff-3.7.1";
+  name = "libtiff-3.7.2";
  builder = ./builder.sh;
  src = fetchurl {
-    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/tiff-3.7.1.tar.gz;
-    md5 = "37d222df12eb23691614cd40b7b1f215";
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/tiff-3.7.2.tar.gz;
+    md5 = "9d7123bd0dbde2a3853fb758346adb78";
  };
  propagatedBuildInputs = [zlib libjpeg];
  inherit zlib libjpeg;
--- a/pkgs/development/libraries/openssl/default.nix
+++ b/pkgs/development/libraries/openssl/default.nix
@@ -1,9 +1,9 @@
 {stdenv, fetchurl, perl}: stdenv.mkDerivation {
-  name = "openssl-0.9.7d";
+  name = "openssl-0.9.7f";
  builder = ./builder.sh;
  src = fetchurl {
-    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/openssl-0.9.7d.tar.gz;
-    md5 = "1b49e90fc8a75c3a507c0a624529aca5";
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/openssl-0.9.7f.tar.gz;
+    md5 = "b2d37d7eb8a5a5040d834105d5ae1a50";
  };
  inherit perl;
 }
--- a/pkgs/development/libraries/sqlite/default.nix
+++ b/pkgs/development/libraries/sqlite/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
  name = "sqlite-2.8.16";

  src = fetchurl {
-    url = http://www.sqlite.org/sqlite-2.8.16.tar.gz;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/sqlite-2.8.16.tar.gz;
    md5 = "9c79b461ff30240a6f9d70dd67f8faea";
  };
 }
--- a/pkgs/development/libraries/zlib/darwin.patch
+++ b/pkgs/development/libraries/zlib/darwin.patch
@@ -1,22 +0,0 @@
-diff -rc zlib-1.2.1/configure zlib-patched/configure
-*** zlib-1.2.1/configure	2003-11-17 04:50:39.000000000 +0100
--- zlib-patched/configure	2004-08-05 19:18:59.000000000 +0200
-***************
-*** 89,97 ****
-               SHAREDLIB=libz$shared_ext
-               SHAREDLIBV=libz.$VER$shared_ext
-               SHAREDLIBM=libz.$VER1$shared_ext
-!              LDSHARED=${LDSHARED-"$cc -dynamiclib -install_name /usr/lib/$SHAREDLIBV -compatibility_version $VER2 -current_version $VER"}
-!              libdir='/usr/lib'
-!              includedir='/usr/include';;
-    *)             LDSHARED=${LDSHARED-"$cc -shared"};;
-    esac
-  else
--- 89,95 ----
-               SHAREDLIB=libz$shared_ext
-               SHAREDLIBV=libz.$VER$shared_ext
-               SHAREDLIBM=libz.$VER1$shared_ext
-!              LDSHARED=${LDSHARED-"$cc -dynamiclib -install_name \${libdir}/$SHAREDLIBV -compatibility_version $VER2 -current_version $VER"};;
-    *)             LDSHARED=${LDSHARED-"$cc -shared"};;
-    esac
-  else
--- a/pkgs/development/libraries/zlib/default.nix
+++ b/pkgs/development/libraries/zlib/default.nix
@@ -1,11 +1,10 @@
 {stdenv, fetchurl}:

 stdenv.mkDerivation {
-  name = "zlib-1.2.1";
+  name = "zlib-1.2.2";
  src = fetchurl {
-    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/zlib-1.2.1.tar.gz;
-    md5 = "ef1cb003448b4a53517b8f25adb12452";
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/zlib-1.2.2.tar.gz;
+    md5 = "68bd51aaa6558c3bc3fd4890e53413de";
  };
  configureFlags = "--shared";
-  patches = [./darwin.patch];
 }
--- a/pkgs/development/perl-modules/BerkeleyDB/default.nix
+++ b/pkgs/development/perl-modules/BerkeleyDB/default.nix
@@ -7,6 +7,5 @@ import ../generic perl {
    md5 = "6e9882f4e4bac48b24079d082af30e6c";
  };
  perlPreHook = ./hook.sh;
-  buildInputs = [db4];
-#  inherit db4;
+  inherit db4;
 }
--- a/pkgs/development/tools/misc/autoconf/default.nix
+++ b/pkgs/development/tools/misc/autoconf/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
  name = "autoconf-2.59";
  src = fetchurl {
-    url = http://ftp.gnu.org/gnu/autoconf/autoconf-2.59.tar.bz2;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/autoconf-2.59.tar.bz2;
    md5 = "1ee40f7a676b3cfdc0e3f7cd81551b5f";
  };
  buildInputs = [m4 perl];
--- a/pkgs/development/tools/misc/automake/automake-1.9.x.nix
+++ b/pkgs/development/tools/misc/automake/automake-1.9.x.nix
--- a/pkgs/development/tools/misc/libtool/default.nix
+++ b/pkgs/development/tools/misc/libtool/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
  name = "libtool-1.5.14";
  src = fetchurl {
-    url = http://ftp.gnu.org/gnu/libtool/libtool-1.5.14.tar.gz;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/libtool-1.5.14.tar.gz;
    md5 = "049bf67de9b0eb75cd943dafe3d749ec";
  };
  buildInputs = [m4 perl];
--- a/pkgs/development/tools/misc/valgrind/default.nix
+++ b/pkgs/development/tools/misc/valgrind/default.nix
@@ -3,23 +3,13 @@
 # Note: I added the Perl dependency for Valgrind 2.1.1.  It's needed
 # to generate some files.  Maybe in stable releases we won't need
 # Perl.
-# Update: 2.2.0 still needs it.
+# Update: 2.4.0 still needs it.

 stdenv.mkDerivation {
-  name = "valgrind-2.2.0";
+  name = "valgrind-2.4.0";
  src = fetchurl {
-    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/valgrind-2.2.0.tar.bz2;
-    md5 = "30dc51f6fc94751b90b04af9c2e2c656";
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/valgrind-2.4.0.tar.bz2;
+    md5 = "1d0bd81d368789946d32d18a468ea0cf";
  };
  buildInputs = [perl];
-
-  # Hack to get Valgrind to compile with Linux 2.6.10 headers.  The
-  # file `include/asm/processor.h' indirectly needs
-  # CONFIG_X86_L1_CACHE_SHIFT (for the alignment of some type that
-  # probably isn't relevant here anyway).
-  # !!! maybe this should be done in linux-headers?
-  NIX_CFLAGS_COMPILE = "-DCONFIG_X86_L1_CACHE_SHIFT=7";
-
-  # Another kernel header problem.
-  patches = [./pgoff_t.patch];
 }
--- a/pkgs/development/tools/misc/valgrind/pgoff_t.patch
+++ b/pkgs/development/tools/misc/valgrind/pgoff_t.patch
@@ -1,34 +0,0 @@
-diff -rc valgrind-orig/coregrind/vg_unsafe.h valgrind-2.2.0/coregrind/vg_unsafe.h
-*** valgrind-orig/coregrind/vg_unsafe.h	2004-08-29 23:02:28.000000000 +0200
--- valgrind-2.2.0/coregrind/vg_unsafe.h	2005-02-23 21:39:25.000000000 +0100
-***************
-*** 31,36 ****
--- 31,40 ----
-  */
-  
-  
-+ #ifndef pgoff_t
-+ #define pgoff_t unsigned long
-+ #endif
-+ 
-  /* These includes are only used for making sense of the args for
-     system calls. */
-  #include "vg_unistd.h"    /* for system call numbers */
-***************
-*** 47,53 ****
-  #include <sys/socket.h>   /* for struct msghdr */
-  #include <linux/sockios.h>/* for SIOCOUTQ */
-  #include <sys/un.h>       /* for sockaddr_un */
-! #include <net/if.h>       /* for struct ifreq et al */
-  #include <net/if_arp.h>   /* for struct arpreq */
-  #include <net/route.h>    /* for struct rtentry */
-  #ifdef HAVE_LINUX_COMPILER_H
--- 51,58 ----
-  #include <sys/socket.h>   /* for struct msghdr */
-  #include <linux/sockios.h>/* for SIOCOUTQ */
-  #include <sys/un.h>       /* for sockaddr_un */
-! /* hack - should be fixed in CVS */
-! //#include <net/if.h>       /* for struct ifreq et al */
-  #include <net/if_arp.h>   /* for struct arpreq */
-  #include <net/route.h>    /* for struct rtentry */
-  #ifdef HAVE_LINUX_COMPILER_H
--- a/pkgs/os-specific/linux/alsa/library/default.nix
+++ b/pkgs/os-specific/linux/alsa/library/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
  name = "alsa-lib-1.0.8";
  src = fetchurl {
-    url = ftp://ftp.alsa-project.org/pub/lib/alsa-lib-1.0.8.tar.bz2;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/alsa-lib-1.0.8.tar.bz2;
    md5 = "c677299ed39d069c9a4b6a999e34ffe7";
  };
 }
--- a/pkgs/os-specific/linux/e2fsprogs/default.nix
+++ b/pkgs/os-specific/linux/e2fsprogs/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
  name = "e2fsprogs-1.36";
  src = fetchurl {
-    url = http://heanet.dl.sourceforge.net/sourceforge/e2fsprogs/e2fsprogs-1.36.tar.gz;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/e2fsprogs-1.36.tar.gz;
    md5 = "1804ee96b76e5e7113fe3cecd6fe582b";
  };
  configureFlags = "--enable-dynamic-e2fsck";
--- a/pkgs/os-specific/linux/kernel-headers/default.nix
+++ b/pkgs/os-specific/linux/kernel-headers/default.nix
@@ -6,7 +6,7 @@ stdenv.mkDerivation {
  name = "linux-headers-2.6.10-i386";
  builder = ./builder.sh;
  src = fetchurl {
-    url = ftp://ftp.nluug.nl/pub/os/Linux/system/kernel/v2.6/linux-2.6.10.tar.bz2;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/linux-2.6.10.tar.bz2;
    md5 = "cffcd2919d9c8ef793ce1ac07a440eda";
  };
 }
--- a/pkgs/os-specific/linux/modutils/default.nix
+++ b/pkgs/os-specific/linux/modutils/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
  name = "modutils-2.4.25";
  src = fetchurl {
-    url = ftp://ftp.nl.kernel.org/pub/linux/utils/kernel/modutils/v2.4/modutils-2.4.25.tar.bz2;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/modutils-2.4.25.tar.bz2;
    md5 = "2c0cca3ef6330a187c6ef4fe41ecaa4d";
  };
  buildInputs = [bison flex];
--- a/pkgs/os-specific/linux/util-linux/default.nix
+++ b/pkgs/os-specific/linux/util-linux/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
  name = "util-linux-2.12q";
  builder = ./builder.sh;
  src = fetchurl {
-    url = http://www.kernel.org/pub/linux/utils/util-linux/util-linux-2.12q.tar.bz2;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/util-linux-2.12q.tar.bz2;
    md5 = "54320aa1abbce00c0dc030e2c3afe5d7";
  };
  patches = [./MCONFIG.patch];
--- a/pkgs/servers/http/apache-httpd/default.nix
+++ b/pkgs/servers/http/apache-httpd/default.nix
@@ -7,12 +7,12 @@ assert db4Support -> db4 != null;
 assert expat != null && perl != null;

 stdenv.mkDerivation {
-  name = "apache-httpd-2.0.52";
+  name = "apache-httpd-2.0.53";

  builder = ./builder.sh;
  src = fetchurl {
-    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/httpd-2.0.52.tar.bz2;
-    md5 = "0e1b47c53921a1fc8fb006effdb3bf1c";
+    url = ftp://ftp.cs.uu.nl/mirror/apache.org/dist/httpd/httpd-2.0.53.tar.bz2;
+    md5 = "94f3a793fb1665365724943206cce23f";
  };

  inherit sslSupport db4Support;
--- a/pkgs/system/all-packages-generic.nix
+++ b/pkgs/system/all-packages-generic.nix
@@ -90,7 +90,7 @@ rec {
    inherit fetchurl stdenv;
  };

-  unzip = (import ../tools/archivers/unzip) {
+  unzip = import ../tools/archivers/unzip {
    inherit fetchurl stdenv;
  };

@@ -182,7 +182,11 @@ rec {
    inherit fetchurl stdenv;
  };

-  
+  mjpegtools = (import ../tools/video/mjpegtools) {
+    inherit fetchurl stdenv libjpeg;
+    inherit (xlibs) libX11;
+  };
+ 
  ### SHELLS

  bash = (import ../shells/bash) {
@@ -213,7 +217,7 @@ rec {
    inherit fetchurl stdenv perl autoconf;
  };

-  automake194 = (import ../development/tools/misc/automake/automake-1.9.4.nix) {
+  automake19x = (import ../development/tools/misc/automake/automake-1.9.x.nix) {
    inherit fetchurl stdenv perl autoconf;
  };

@@ -262,7 +266,7 @@ rec {
  };

  octave = (import ../development/interpreters/octave) {
-    inherit fetchurl stdenv readline ncurses g77 perl;
+    inherit fetchurl stdenv readline ncurses g77 perl flex;
  };

  gnumake = (import ../development/tools/build-managers/gnumake) {
@@ -499,7 +503,7 @@ rec {
  apacheAntBlackdown14 = (import ../development/tools/build-managers/apache-ant) {
    inherit fetchurl stdenv;
    j2sdk = blackdown;
-     name = "ant-blackdown-1.4.2";
+    name = "ant-blackdown-1.4.2";
  };

  apacheAnt15 = (import ../development/tools/build-managers/apache-ant) {
@@ -774,7 +778,7 @@ rec {
  perlXMLLibXML = import ../development/perl-modules/generic perl {
    name = "XML-LibXML-1.58";
    src = fetchurl {
-      url = http://search.cpan.org/CPAN/authors/id/P/PH/PHISH/XML-LibXML-1.58.tar.gz;
+      url = http://catamaran.labs.cs.uu.nl/dist/tarballs/XML-LibXML-1.58.tar.gz;
      md5 = "4691fc436e5c0f22787f5b4a54fc56b0";
    };
    buildInputs = [libxml2];
@@ -784,7 +788,7 @@ rec {
  perlXMLLibXMLCommon = import ../development/perl-modules/generic perl {
    name = "XML-LibXML-Common-0.13";
    src = fetchurl {
-      url = http://search.cpan.org/CPAN/authors/id/P/PH/PHISH/XML-LibXML-Common-0.13.tar.gz;
+      url = http://catamaran.labs.cs.uu.nl/dist/tarballs/XML-LibXML-Common-0.13.tar.gz;
      md5 = "13b6d93f53375d15fd11922216249659";
    };
    buildInputs = [libxml2];
@@ -793,7 +797,7 @@ rec {
  perlXMLSAX = import ../development/perl-modules/generic perl {
    name = "XML-SAX-0.12";
    src = fetchurl {
-      url = http://search.cpan.org/CPAN/authors/id/M/MS/MSERGEANT/XML-SAX-0.12.tar.gz;
+      url = http://catamaran.labs.cs.uu.nl/dist/tarballs/XML-SAX-0.12.tar.gz;
      md5 = "bff58bd077a9693fc8cf32e2b95f571f";
    };
    propagatedBuildInputs = [perlXMLNamespaceSupport];
@@ -802,7 +806,7 @@ rec {
  perlXMLNamespaceSupport = import ../development/perl-modules/generic perl {
    name = "XML-NamespaceSupport-1.08";
    src = fetchurl {
-      url = http://search.cpan.org/CPAN/authors/id/R/RB/RBERJON/XML-NamespaceSupport-1.08.tar.gz;
+      url = http://catamaran.labs.cs.uu.nl/dist/tarballs/XML-NamespaceSupport-1.08.tar.gz;
      md5 = "81bd5ae772906d0579c10061ed735dc8";
    };
    buildInputs = [];
@@ -828,7 +832,7 @@ rec {
  perlXMLSimple = import ../development/perl-modules/generic perl {
    name = "XML-Simple-2.14";
    src = fetchurl {
-      url = http://search.cpan.org/CPAN/authors/id/G/GR/GRANTM/XML-Simple-2.14.tar.gz;
+      url = http://catamaran.labs.cs.uu.nl/dist/tarballs/XML-Simple-2.14.tar.gz;
      md5 = "f321058271815de28d214c8efb9091f9";
    };
    propagatedBuildInputs = [perlXMLParser];
@@ -1171,8 +1175,10 @@ rec {
  };

  acroread = (import ../applications/misc/acrobat-reader) {
-    inherit fetchurl stdenv patchelf;
+    inherit fetchurl stdenv zlib;
    inherit (xlibs) libXt libXp libXext libX11;
+    inherit (gtkLibs) glib pango atk gtk;
+    libstdcpp5 = gcc33.gcc;
  };

  eclipse = (import ../applications/editors/eclipse) {
--- a/pkgs/system/populate-cache.nix
+++ b/pkgs/system/populate-cache.nix
@@ -25,7 +25,7 @@ let {
    binutils
    gnum4
    autoconf
-    automake194
+    automake19x
    libtool
    pkgconfig
    valgrind
@@ -92,13 +92,23 @@ let {
  ;};

  powerpcDarwinPkgs = {inherit (import ./powerpc-darwin.nix)
+    unzip
    aterm
    subversion
+    bisonnew
+#    flexnew
+    libxml2
+    libxslt
+    docbook_xml_dtd_42
+    docbook_xml_dtd_43
+    docbook_xml_ebnf_dtd
+    docbook_xml_xslt
+    nxml
  ;};


  body = [
    i686LinuxPkgs
-#    powerpcDarwinPkgs
+    powerpcDarwinPkgs
  ];
 }
--- a/pkgs/system/stdenvs.nix
+++ b/pkgs/system/stdenvs.nix
@@ -58,7 +58,7 @@
  # (essentially it's just the native environment).
  stdenvDarwin = (import ../stdenv/darwin) {
    stdenv = stdenvInitial;
-    genericStdenv = import ../stdenv/generic-branch;
+    genericStdenv = import ../stdenv/generic;
    inherit gccWrapper;
  };

--- a/pkgs/tools/archivers/unzip/default.nix
+++ b/pkgs/tools/archivers/unzip/default.nix
@@ -1,10 +1,10 @@
 {stdenv, fetchurl}:

 stdenv.mkDerivation {
-  name = "unzip-5.50";
+  name = "unzip-5.52";
  builder = ./builder.sh;
  src = fetchurl {
-    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/unzip550.tar.gz;
-    md5 = "798592d62e37f92571184236947122ed";
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/unzip552.tar.gz;
+    md5 = "9d23919999d6eac9217d1f41472034a9";
  };
 }
--- a/pkgs/tools/graphics/exif/default.nix
+++ b/pkgs/tools/graphics/exif/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
  name = "exif-0.6.9";

  src = fetchurl {
-    url = http://heanet.dl.sourceforge.net/sourceforge/libexif/exif-0.6.9.tar.gz;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/exif-0.6.9.tar.gz;
    md5 = "555029098386fa677c461eb249d852d7";
  };

--- a/pkgs/tools/graphics/graphviz/default.nix
+++ b/pkgs/tools/graphics/graphviz/default.nix
@@ -7,7 +7,7 @@ stdenv.mkDerivation {

  builder = ./builder.sh;
  src = fetchurl {
-    url = http://www.graphviz.org/pub/graphviz/ARCHIVE/graphviz-2.2.tar.gz;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/graphviz-2.2.tar.gz;
    md5 = "9275d30695a5c22f360acbef7b85acd3";
  };

--- a/pkgs/tools/misc/file/default.nix
+++ b/pkgs/tools/misc/file/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
  name = "file-4.13";
  src = fetchurl {
-    url = ftp://ftp.astron.com/pub/file/file-4.13.tar.gz;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/file-4.13.tar.gz;
    md5 = "2bfc0f878ee22e50441b68df2ccbb984";
  };
 }
--- a/pkgs/tools/security/gnupg/builder.sh
+++ b/pkgs/tools/security/gnupg/builder.sh
@@ -0,0 +1,3 @@
+. $stdenv/setup
+
+genericBuild
--- a/pkgs/tools/security/gnupg/default.nix
+++ b/pkgs/tools/security/gnupg/default.nix
@@ -0,0 +1,10 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation {
+  name = "gnupg-1.4.0";
+  builder = ./builder.sh;
+  src = fetchurl {
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/gnupg_1.4.0.orig.tar.gz;
+    md5 = "74e407a8dcb09866555f79ae797555da";
+  };
+}
--- a/pkgs/tools/video/mjpegtools/default.nix
+++ b/pkgs/tools/video/mjpegtools/default.nix
@@ -0,0 +1,11 @@
+{stdenv, fetchurl, libjpeg, libX11}:
+
+stdenv.mkDerivation {
+  name = "mjpegtools-1.6.2";
+  src = fetchurl {
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/mjpegtools-1.6.2.tar.gz;
+    md5 = "01c0120b0182de67f182ef99ad855daa" ;
+  };
+  buildInputs = [libjpeg libX11];
+  patches = [./fix.patch];
+}
--- a/pkgs/tools/video/mjpegtools/fix.patch
+++ b/pkgs/tools/video/mjpegtools/fix.patch
@@ -0,0 +1,36 @@
+*** /tmp/mjpegtools-1.6.2/lavtools/lavpipe.c	Mon Sep 23 19:46:43 2002
+--- mjpegtools-1.6.2/lavtools/lavpipe.c	Thu Mar 17 10:24:10 2005
+***************
+*** 582,587 ****
+--- 582,588 ----
+        mjpeg_info( "closing input %d (source %d)", i, current_index);
+        decommission_pipe_source(source);
+      KEEP_SOURCE:
+       ;
+      }
+    }
+  }
+*** /tmp/mjpegtools-1.6.2/mpeg2enc/picture.cc	Sat Oct 25 17:36:32 2003
+--- mjpegtools-1.6.2/mpeg2enc/picture.cc	Fri Mar 18 07:55:36 2005
+***************
+*** 83,91 ****
+      }
+  
+  
+! 	curref = new (uint8_t *)[5];
+! 	curorg = new (uint8_t *)[5];
+! 	pred   = new (uint8_t *)[5];
+  
+  	for( i = 0 ; i<3; i++)
+  	{
+--- 83,91 ----
+      }
+  
+  
+! 	curref = new uint8_t *[5];
+! 	curorg = new uint8_t *[5];
+! 	pred   = new uint8_t *[5];
+  
+  	for( i = 0 ; i<3; i++)
+  	{
+
Author	SHA1	Message	Date
Eelco Dolstra	187d0a22eb	* Mark stable release. svn path=/nixpkgs/branches/0.8-release/; revision=2529	2005-04-11 13:19:41 +00:00
Eelco Dolstra	7775caaa35	* Evacuate tarballs. svn path=/nixpkgs/trunk/; revision=2527	2005-04-11 13:09:01 +00:00
Eelco Dolstra	bf985e6d6e	* NEWS. svn path=/nixpkgs/trunk/; revision=2521	2005-04-11 09:01:27 +00:00
Eelco Dolstra	5c72ac8252	* Valgrind updated to 2.4.0. svn path=/nixpkgs/trunk/; revision=2520	2005-04-11 08:55:05 +00:00
Eelco Dolstra	013300cb0e	* Libtiff updated to 3.7.2. svn path=/nixpkgs/trunk/; revision=2519	2005-04-11 08:54:32 +00:00
Eelco Dolstra	c4ca7db276	* OpenSSL updated to 0.9.7f. svn path=/nixpkgs/trunk/; revision=2518	2005-04-11 08:54:10 +00:00
Eelco Dolstra	67140c410f	* Zlib updated to 1.2.2. svn path=/nixpkgs/trunk/; revision=2517	2005-04-11 08:53:48 +00:00
Eelco Dolstra	fc20bd6518	* GTK updates. svn path=/nixpkgs/trunk/; revision=2516	2005-04-11 08:27:14 +00:00
Eelco Dolstra	1af17b9d7f	* Rename new unzip. svn path=/nixpkgs/trunk/; revision=2515	2005-04-11 08:26:36 +00:00
Eelco Dolstra	d8a0bdebf2	* Get rid of the old unzip. svn path=/nixpkgs/trunk/; revision=2514	2005-04-11 08:22:23 +00:00
Eelco Dolstra	42fa9be439	* Apache Httpd 2.0.53. svn path=/nixpkgs/trunk/; revision=2492	2005-04-05 14:19:25 +00:00
Eelco Dolstra	94ba0a0995	* Fix Berkeley DB Perl bindings. svn path=/nixpkgs/trunk/; revision=2491	2005-04-05 14:10:16 +00:00
Eelco Dolstra	3269efcb28	* Subversion 1.1.4. svn path=/nixpkgs/trunk/; revision=2490	2005-04-05 12:12:18 +00:00
Eelco Dolstra	cb751bd5c0	* Adobe Reader 7.0. The PPKLite module (whatever that is) is disabled because it needs the LDAP libraries, and I'm too lazy to add them now. svn path=/nixpkgs/trunk/; revision=2457	2005-03-25 15:13:46 +00:00
Eelco Dolstra	a2feafba4f	* Firefox 1.0.2. svn path=/nixpkgs/trunk/; revision=2449	2005-03-24 11:32:46 +00:00
Eelco Dolstra	bf571aef78	* Skip flex on Mac OS X, use the right unzip. svn path=/nixpkgs/trunk/; revision=2446	2005-03-23 15:50:11 +00:00
Rob Vermaas	160511bb5b	removed '.tar.gz' from name of package svn path=/nixpkgs/trunk/; revision=2438	2005-03-23 10:24:37 +00:00
Armijn Hemel	3d1f4bc4e8	security tools in ./tools/security svn path=/nixpkgs/trunk/; revision=2437	2005-03-22 15:24:34 +00:00
Armijn Hemel	0aba140013	add gnupg svn path=/nixpkgs/trunk/; revision=2436	2005-03-22 15:23:20 +00:00
Eelco Dolstra	55a02efa5b	* Mac needs Unzip 5.52. svn path=/nixpkgs/trunk/; revision=2434	2005-03-21 14:48:48 +00:00
Eelco Dolstra	b13b00afe2	* Gqview 2.0.0. svn path=/nixpkgs/trunk/; revision=2432	2005-03-18 09:59:41 +00:00
Eelco Dolstra	0d5afd95c8	* Docbook XSL 1.68.1. svn path=/nixpkgs/trunk/; revision=2431	2005-03-18 09:59:25 +00:00
Rob Vermaas	421d6ac92a	* mjpegtools 1.6.2 svn path=/nixpkgs/trunk/; revision=2429	2005-03-18 08:10:35 +00:00
Eelco Dolstra	10e4887e50	* Filename fix. svn path=/nixpkgs/trunk/; revision=2427	2005-03-17 09:18:49 +00:00
Rob Vermaas	c517847eab	* octave: 2.9.0 needs flex anyway svn path=/nixpkgs/trunk/; revision=2425	2005-03-16 15:13:30 +00:00
Eelco Dolstra	cae1a161e2	* Automake 1.9.5. svn path=/nixpkgs/trunk/; revision=2422	2005-03-16 10:44:39 +00:00
Rob Vermaas	305f12283a	octave: corrected hash svn path=/nixpkgs/trunk/; revision=2421	2005-03-16 08:17:02 +00:00
Rob Vermaas	d27be2a586	new octave version svn path=/nixpkgs/trunk/; revision=2420	2005-03-16 07:49:07 +00:00
Eelco Dolstra	47d7e060a5	* Acrobat Reader upgraded to 5.0.10. * Removed acroread dependency on patchelf (it's in stdenv). svn path=/nixpkgs/trunk/; revision=2418	2005-03-15 15:16:40 +00:00
Eelco Dolstra	be8f1e37a3	* Bump version number. svn path=/nixpkgs/trunk/; revision=2403	2005-03-14 14:30:10 +00:00
Eelco Dolstra	f6e91bc9c9	* Merge r2396. svn path=/nixpkgs/trunk/; revision=2397	2005-03-14 09:22:26 +00:00
@@ -1 +1 @@
 .7
 .8