From 53c56afcfe0600ecf582114f7da2e21eaa2dbd11 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 30 Jan 2006 15:52:15 +0000 Subject: [PATCH] * Fix some broken URLs. svn path=/nixpkgs/trunk/; revision=4622 --- .../networking/sniffers/ethereal/default.nix | 6 +++--- pkgs/applications/version-management/cvs/default.nix | 2 +- pkgs/development/interpreters/ruby/default.nix | 6 +++--- .../java/jakarta-commons/file-upload/default.nix | 2 +- pkgs/development/libraries/java/swt/default.nix | 2 +- pkgs/servers/sql/mysql/default.nix | 6 +++--- pkgs/servers/sql/postgresql/default.nix | 6 +++--- pkgs/system/all-packages-generic.nix | 9 --------- pkgs/tools/misc/jdiskreport/default.nix | 2 +- 9 files changed, 16 insertions(+), 25 deletions(-) diff --git a/pkgs/applications/networking/sniffers/ethereal/default.nix b/pkgs/applications/networking/sniffers/ethereal/default.nix index b52d44fbd2b1..7f473d8c2404 100644 --- a/pkgs/applications/networking/sniffers/ethereal/default.nix +++ b/pkgs/applications/networking/sniffers/ethereal/default.nix @@ -1,10 +1,10 @@ {stdenv, fetchurl, perl, pkgconfig, glib, libpcap}: stdenv.mkDerivation { - name = "ethereal-0.10.13"; + name = "ethereal-0.10.14"; src = fetchurl { - url = ftp://ftp.sunet.se/pub/network/monitoring/ethereal/ethereal-0.10.13.tar.bz2; - md5 = "08d277951ff6f6a93c752abebd85d5bc"; + url = ftp://ftp.sunet.se/pub/network/monitoring/ethereal/ethereal-0.10.14.tar.bz2; + md5 = "297f678c037f88429250830e924b8fa0"; }; buildInputs = [perl pkgconfig glib libpcap]; } diff --git a/pkgs/applications/version-management/cvs/default.nix b/pkgs/applications/version-management/cvs/default.nix index 34d44e87d302..cb6a4dbf6f81 100644 --- a/pkgs/applications/version-management/cvs/default.nix +++ b/pkgs/applications/version-management/cvs/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "cvs-1.12.13"; src = fetchurl { - url = ftp://ftp.nluug.nl/pub/gnu/non-gnu/cvs/cvs-1.12.13.tar.bz2; + url = http://ftp.gnu.org/non-gnu/cvs/source/feature/1.12.13/cvs-1.12.13.tar.bz2; md5 = "956ab476ce276c2d19d583e227dbdbea"; }; buildInputs = [vim]; diff --git a/pkgs/development/interpreters/ruby/default.nix b/pkgs/development/interpreters/ruby/default.nix index 59b9c3511b8d..fa5375297852 100644 --- a/pkgs/development/interpreters/ruby/default.nix +++ b/pkgs/development/interpreters/ruby/default.nix @@ -1,9 +1,9 @@ {stdenv, fetchurl}: stdenv.mkDerivation { - name = "ruby-1.8.2"; + name = "ruby-1.8.4"; src = fetchurl { - url = ftp://ftp.ruby-lang.org/pub/ruby/ruby-1.8.2.tar.gz; - md5 = "8ffc79d96f336b80f2690a17601dea9b"; + url = ftp://ftp.ruby-lang.org/pub/ruby/1.8/ruby-1.8.4.tar.gz; + md5 = "bd8c2e593e1fa4b01fd98eaf016329bb"; }; } diff --git a/pkgs/development/libraries/java/jakarta-commons/file-upload/default.nix b/pkgs/development/libraries/java/jakarta-commons/file-upload/default.nix index 0e495e551df6..a609532f2825 100644 --- a/pkgs/development/libraries/java/jakarta-commons/file-upload/default.nix +++ b/pkgs/development/libraries/java/jakarta-commons/file-upload/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation { builder = ./builder.sh; src = fetchurl { - url = http://apache.mirror.rokscom.nl/jakarta/commons/fileupload/binaries/commons-fileupload-1.0.tar.gz; + url = http://archive.apache.org/dist/jakarta/commons/fileupload/binaries/commons-fileupload-1.0.tar.gz; md5 = "5618b26b1a5c006d7236fb4465e907b6"; }; } \ No newline at end of file diff --git a/pkgs/development/libraries/java/swt/default.nix b/pkgs/development/libraries/java/swt/default.nix index aa9ee965bc7f..f06f9ff5be9d 100644 --- a/pkgs/development/libraries/java/swt/default.nix +++ b/pkgs/development/libraries/java/swt/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation { # releases of SWT. So we just grab a binary release and extract # "src.zip" from that. src = fetchurl { - url = ftp://ftp.tu-clausthal.de/pub/eclipse/downloads/drops/R-3.1.1-200509290840/swt-3.1.1-gtk-linux-x86.zip; + url = http://sunsite.informatik.rwth-aachen.de/eclipse/downloads/drops/R-3.1.1-200509290840/swt-3.1.1-gtk-linux-x86.zip; md5 = "23dfe5a4a566439c5f526d9ea3b3db1c"; }; diff --git a/pkgs/servers/sql/mysql/default.nix b/pkgs/servers/sql/mysql/default.nix index 6c715e41a869..20e32d49c05f 100644 --- a/pkgs/servers/sql/mysql/default.nix +++ b/pkgs/servers/sql/mysql/default.nix @@ -3,11 +3,11 @@ # Note: zlib is not required; MySQL can use an internal zlib. stdenv.mkDerivation { - name = "mysql-4.1.12"; + name = "mysql-4.1.16"; src = fetchurl { - url = http://mysql.mirror.nedlinux.nl/Downloads/MySQL-4.1/mysql-4.1.12.tar.gz; - md5 = "56a6f5cacd97ae290e07bbe19f279af1"; + url = http://ftp.snt.utwente.nl/pub/software/mysql/Downloads/MySQL-4.1/mysql-4.1.16.tar.gz; + md5 = "13c5fdd05e28863db3a1261635890b5f"; }; buildInputs = [ps ncurses zlib perl]; diff --git a/pkgs/servers/sql/postgresql/default.nix b/pkgs/servers/sql/postgresql/default.nix index ac0b2d601d91..b9ed02ffd206 100644 --- a/pkgs/servers/sql/postgresql/default.nix +++ b/pkgs/servers/sql/postgresql/default.nix @@ -5,12 +5,12 @@ assert ncurses != null; assert readline != null; stdenv.mkDerivation { - name = "postgresql-8.0.3"; + name = "postgresql-8.0.6"; builder = ./builder.sh; src = fetchurl { - url = ftp://ftp2.nl.postgresql.org/mirror/postgresql/source/v8.0.3/postgresql-8.0.3.tar.bz2; - md5 = "c0914a133ce6c1e0f1d8b93982d6e881"; + url = ftp://ftp2.nl.postgresql.org/mirror/postgresql/source/v8.0.6/postgresql-8.0.6.tar.bz2; + md5 = "f3b27b8171267f9a87592f931c09f0ee"; }; inherit readline; diff --git a/pkgs/system/all-packages-generic.nix b/pkgs/system/all-packages-generic.nix index eddd317c0c28..752198fd7267 100644 --- a/pkgs/system/all-packages-generic.nix +++ b/pkgs/system/all-packages-generic.nix @@ -1742,15 +1742,6 @@ rec { inherit fetchurl stdenv vim; }; - subversion11x = (import ../applications/version-management/subversion-1.1.x) { - inherit fetchurl stdenv openssl db4 expat swig zlib; - localServer = true; - httpServer = false; - sslSupport = true; - compressionSupport = true; - httpd = apacheHttpd; - }; - subversion = (import ../applications/version-management/subversion-1.3.x) { inherit fetchurl stdenv openssl db4 expat swig zlib; localServer = true; diff --git a/pkgs/tools/misc/jdiskreport/default.nix b/pkgs/tools/misc/jdiskreport/default.nix index 92b99834b0af..6229ca60d4c1 100644 --- a/pkgs/tools/misc/jdiskreport/default.nix +++ b/pkgs/tools/misc/jdiskreport/default.nix @@ -1,6 +1,6 @@ {stdenv, fetchurl, unzip, jdk}: -assert jdk.swingSupport; +#assert jdk.swingSupport; stdenv.mkDerivation { name = "jdiskreport-1.2.3";