alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

* Fix various broken URLs / mirrors.

Browse source 
* Updated tcpdump, ImageMagick, lsof.

svn path=/nixpkgs/trunk/; revision=19847
This commit is contained in:
Eelco Dolstra 2010-02-05 22:00:51 +00:00
parent 8c8631d974
commit aee659e1e2
10 changed files with 39 additions and 72 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkgs/applications/graphics/ImageMagick/default.nix
View file

@ -1,13 +1,13 @@
args: with args;
let version = "6.5.5-6"; in
let version = "6.5.9-1"; in
stdenv.mkDerivation (rec {
name = "ImageMagick-${version}";
src = fetchurl {
url = "mirror://imagemagick/${name}.tar.bz2";
sha256 = "1037nsvfpw7wdgsvvzvi0bn1n5d667d8aj1xam7zgmf7xi6xha3q";
sha256 = "0a4yhhfqagz28yccydngi31050101jfmq5ljln61g69yy6m47ifg";
};
configureFlags = ''

37
pkgs/build-support/fetchurl/mirrors.nix
View file

@ -141,31 +141,12 @@ rec {
http://bitlbee.intergenia.de/
];
# ImageMagick mirrors, see http://www.imagemagick.org/script/download.php .
# ImageMagick mirrors, see http://www.imagemagick.org/script/download.php.
imagemagick = [
ftp://gd.tuwien.ac.at/pub/graphics/ImageMagick/
ftp://ftp.carnet.hr/pub/misc/imagemagick/
ftp://ftp.fu-berlin.de/unix/X11/graphics/ImageMagick
http://imagemagick.linux-mirror.org/download
http://image_magick.veidrodis.com/image_magick/
http://imagemagick.oss-mirror.org/download
ftp://ftp.kddlabs.co.jp/graphics/ImageMagick/
ftp://ftp.u-aizu.ac.jp/pub/graphics/image/ImageMagick/imagemagick.org
ftp://zoffy.asahi-net.or.jp/pub/graphics/ImageMagick
http://ftp.nluug.nl/pub/ImageMagick
http://ftp.surfnet.nl/pub/ImageMagick/
ftp://sunsite.icm.edu.pl/packages/ImageMagick/
ftp://ftp.chg.ru/packages/ImageMagick
http://ftp.chg.ru/packages/ImageMagick
http://ftp.efair.ru/pub/software/graphics/ImageMagick/
ftp://ftp.efair.ru/pub/software/graphics/ImageMagick/
ftp://ftp.sunet.se/pub/multimedia/graphics/ImageMagick
http://www.smudge-it.co.uk/pub/imagemagick/
ftp://www.rx-host.net/pub/graphics/ImageMagick
ftp://ftp.fifi.org/pub/ImageMagick/
ftp://ftp.imagemagick.org/pub/ImageMagick
ftp://ftp.imagemagick.net/pub/ImageMagick
http://imagemagick.site2nd.org/imagemagick
http://ftp.nluug.nl/pub/ImageMagick/
ftp://ftp.sunet.se/pub/multimedia/graphics/ImageMagick/
ftp://ftp.imagemagick.org/pub/ImageMagick/
ftp://ftp.imagemagick.net/pub/ImageMagick/
];
# CPAN mirrors.
@ -238,14 +219,6 @@ rec {
ftp://ftp.nara.wide.ad.jp/pub/X11/GNOME/
];
# Tcpdump (see http://www.tcpdump.org/mirrors.html).
tcpdump = [
ftp://ftp.wiretapped.net/pub/security/packet-capture/tcpdump.org/
ftp://mirror.aarnet.edu.au/pub/tcpdump/
ftp://gd.tuwien.ac.at/infosys/security/tcpdump.org/
ftp://ftp.gwdg.de/pub/misc/tcpdump/
];
# X.org.
xorg = [
http://xorg.freedesktop.org/releases/

4
pkgs/development/libraries/glefw/default.nix
View file

@ -1,9 +1,10 @@
args: with args;
stdenv.mkDerivation {
name = "glefw-2.6";
src = fetchurl {
url = http://prdownloads.sourceforge.net/glfw/glfw-2.6.tar.bz2;
url = mirror://sourceforge/glfw/glfw-2.6.tar.bz2;
sha256 = "1jnz7szax7410qrkiwkvq34sxy11w46ybyqbkaczdyvqas6cm1hv";
};
@ -13,6 +14,7 @@ stdenv.mkDerivation {
ensureDir $out
make x11-install PREFIX=$out
'';
installPhase=":";
meta = {

9
pkgs/development/libraries/glew/default.nix
View file

@ -1,18 +1,19 @@
args: with args;
stdenv.mkDerivation {
name = "glew-1.5.2";
src = fetchurl {
url = http://dfn.dl.sourceforge.net/sourceforge/glew/glew-1.5.2.tgz;
url = mirror://sourceforge/glew/glew-1.5.2.tgz;
sha256 = "0dh5wpfq7aaldkiwcqmm9w59c2qcglkjv8zazmnm8n5771n3caj8";
};
buildInputs = [mesa x11 libXmu libXi];
meta = {
description = "cross-platform open-source C/C++ extension loading library";
homepage = http://glew.sourceforge.net/;
license = ["BSD" "GLX" "SGI-B" "GPL2"]; # License description copied from gentoo-1.4.0
description = "cross-platform open-source C/C++ extension loading library";
homepage = http://glew.sourceforge.net/;
license = ["BSD" "GLX" "SGI-B" "GPL2"]; # License description copied from gentoo-1.4.0
};
installPhase="GLEW_DEST=\$out make install";

25
pkgs/development/libraries/libpcap/default.nix
View file

@ -1,23 +1,18 @@
{stdenv, fetchurl, flex, bison}:
{ stdenv, fetchurl, flex, bison }:
stdenv.mkDerivation rec {
name = "libpcap-1.0.0";
src = fetchurl {
url = [
"mirror://tcpdump/release/${name}.tar.gz"
"http://www.sfr-fresh.com/unix/misc/${name}.tar.gz"
];
sha256 = "1h3kmj485qz1i08xs4sc3a0bmhs1rvq0h7gycs7paap2szhw8552";
url = "http://www.tcpdump.org/release/${name}.tar.gz";
sha256 = "1h3kmj485qz1i08xs4sc3a0bmhs1rvq0h7gycs7paap2szhw8552";
};
buildInputs = [flex bison];
configureFlags = [
"${if stdenv.system == "i686-linux" then "--with-pcap=linux" else ""}"
"--with-pcap=linux"
];
buildInputs = [ flex bison ];
configureFlags = "--with-pcap=linux";
preInstall = ''ensureDir $out/bin'';
patches = if stdenv.system == "i686-linux"
then []
else [ ./libpcap_amd64.patch ];
patches = [ ./libpcap_amd64.patch ];
}

0
pkgs/development/libraries/tk/8.5.7.nix → pkgs/development/libraries/tk/default.nix
View file

10
pkgs/development/tools/misc/lsof/default.nix
View file

@ -1,15 +1,11 @@
{stdenv, fetchurl}:
stdenv.mkDerivation {
name = "lsof-4.81";
name = "lsof-4.83";
src = fetchurl {
urls = [
http://ftp.uni-bayreuth.de/packages/tools/lsof/lsof_4.81.tar.bz2
ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/lsof_4.81.tar.bz2
ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/OLD/lsof_4.81.tar.bz2
];
sha256 = "1fcamd8qpczgb3kz9b2rhflbq6lyd3lic4i7xl7n99fx76ha1n19";
url = ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/lsof_4.83.tar.bz2;
sha256 = "0i7mn4ygmrf0rvxz5vgzhmr8q7bhxrh9h2q7rpip1f9npq5r77xq";
};
unpackPhase = "tar xvjf $src; cd lsof_*; tar xvf lsof_*.tar; sourceRoot=$( echo lsof_*/); ";

10
pkgs/tools/networking/tcpdump/default.nix
View file

@ -1,14 +1,14 @@
{stdenv, fetchurl, libpcap}:
{ stdenv, fetchurl, libpcap }:
stdenv.mkDerivation rec {
name = "tcpdump-3.9.4";
name = "tcpdump-4.0.0";
src = fetchurl {
url = "mirror://tcpdump/release/${name}.tar.gz";
sha256 = "1dbknf6ys7n3mmlb6klr0jh0jgnnq3zd9y44kjdxcbmbdjhp1rvy";
url = "http://www.tcpdump.org/release/${name}.tar.gz";
sha256 = "112j0d12l5zsq56akn4n23i98pwblfb7qhblk567ddbl0bz9xsaz";
};
buildInputs = [libpcap];
buildInputs = [ libpcap ];
meta = {
description = "tcpdump, a famous network sniffer";

6
pkgs/tools/package-management/dpkg/default.nix
View file

@ -1,11 +1,11 @@
{stdenv, fetchurl, perl, zlib, bzip2}:
stdenv.mkDerivation {
name = "dpkg-1.14.25";
name = "dpkg-1.14.28";
src = fetchurl {
url = mirror://debian/pool/main/d/dpkg/dpkg_1.14.25.tar.gz;
sha256 = "1111r1ijyh149h7vby9vc8137hl9778ja3dln7ilkxhc1y1yjp2l";
url = mirror://debian/pool/main/d/dpkg/dpkg_1.14.28.tar.gz;
sha256 = "1k3h1rv2qd6ha6mpifhjkpasd4dzr8l45jvc49p7fldqm4nzyixc";
};
configureFlags = "--without-dselect --with-admindir=/var/lib/dpkg";

6
pkgs/top-level/all-packages.nix
View file

@ -4727,7 +4727,7 @@ let
inherit stdenv fetchurl cmake qt4;
};
tk = import ../development/libraries/tk/8.5.7.nix {
tk = import ../development/libraries/tk {
inherit fetchurl stdenv tcl x11;
};
@ -8579,8 +8579,8 @@ let
};
foldingathome = import ../misc/foldingathome {
inherit fetchurl stdenv;
};
inherit fetchurl stdenv;
};
freestyle = import ../misc/freestyle {
inherit fetchurl freeglut qt4 libpng lib3ds libQGLViewer swig;