* Fixed some more URLs.
svn path=/nixpkgs/trunk/; revision=9294
This commit is contained in:
parent
105344a44e
commit
ea9667ab18
|
@ -9,7 +9,7 @@ find "$1" -name "*.nix" | while read fn; do
|
||||||
if url=$(echo "$line" | sed 's^url = \(.*\);^\1^'); then
|
if url=$(echo "$line" | sed 's^url = \(.*\);^\1^'); then
|
||||||
|
|
||||||
if ! echo "$url" | grep -q -E "www.cs.uu.nl|nix.cs.uu.nl|.stratego-language.org|java.sun.com|ut2004|linuxq3a|RealPlayer|Adbe|belastingdienst|microsoft|armijn/.nix|sun.com|archive.eclipse.org"; then
|
if ! echo "$url" | grep -q -E "www.cs.uu.nl|nix.cs.uu.nl|.stratego-language.org|java.sun.com|ut2004|linuxq3a|RealPlayer|Adbe|belastingdienst|microsoft|armijn/.nix|sun.com|archive.eclipse.org"; then
|
||||||
base=$(basename $url)
|
base="$(basename "$url")"
|
||||||
newPath="$distDir/$base"
|
newPath="$distDir/$base"
|
||||||
|
|
||||||
if test -e "$newPath"; then
|
if test -e "$newPath"; then
|
||||||
|
@ -20,7 +20,11 @@ find "$1" -name "*.nix" | while read fn; do
|
||||||
if test -z "$hash"; then
|
if test -z "$hash"; then
|
||||||
hash=$(fgrep -A 1 "$url" "$fn" | grep sha256 | sed 's^.*sha256 = \"\(.*\)\";.*^\1^')
|
hash=$(fgrep -A 1 "$url" "$fn" | grep sha256 | sed 's^.*sha256 = \"\(.*\)\";.*^\1^')
|
||||||
hashType="sha256 --base32"
|
hashType="sha256 --base32"
|
||||||
if test -z "$hash"; then
|
if test -n "$hash"; then
|
||||||
|
if test "${#hash}" = 64; then
|
||||||
|
hash=$(nix-hash --to-base32 --type sha256 $hash)
|
||||||
|
fi
|
||||||
|
else
|
||||||
hash=$(fgrep -A 1 "$url" "$fn" | grep sha1 | sed 's^.*sha1 = \"\(.*\)\";.*^\1^')
|
hash=$(fgrep -A 1 "$url" "$fn" | grep sha1 | sed 's^.*sha1 = \"\(.*\)\";.*^\1^')
|
||||||
hashType="sha1"
|
hashType="sha1"
|
||||||
if test -z "$hash"; then
|
if test -z "$hash"; then
|
||||||
|
@ -31,13 +35,13 @@ find "$1" -name "*.nix" | while read fn; do
|
||||||
fi
|
fi
|
||||||
#echo "HASH = $hash"
|
#echo "HASH = $hash"
|
||||||
if ! test "$(nix-hash --type $hashType --flat "$newPath")" = "$hash"; then
|
if ! test "$(nix-hash --type $hashType --flat "$newPath")" = "$hash"; then
|
||||||
echo "WARNING: $fn: $newPath exists and differs!"
|
echo "WARNING: $fn: $newPath exists and differs, hash should be $hash!"
|
||||||
continue
|
continue
|
||||||
fi
|
fi
|
||||||
|
|
||||||
else
|
else
|
||||||
|
|
||||||
if echo $url | grep -q '^mirror://'; then
|
if echo $url | grep -q 'mirror://'; then
|
||||||
#echo "$fn: skipping mirrored $url"
|
#echo "$fn: skipping mirrored $url"
|
||||||
continue
|
continue
|
||||||
fi
|
fi
|
||||||
|
@ -75,3 +79,5 @@ find "$1" -name "*.nix" | while read fn; do
|
||||||
done
|
done
|
||||||
|
|
||||||
done
|
done
|
||||||
|
|
||||||
|
echo DONE
|
|
@ -6,7 +6,7 @@ stdenv.mkDerivation {
|
||||||
name = "GStreamer-0.10.10";
|
name = "GStreamer-0.10.10";
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = http://gstreamer.freedesktop.org/src/gstreamer/gstreamer-0.10.10.tar.bz2;
|
url = http://gstreamer.freedesktop.org/src/gstreamer/gstreamer-0.10.10.tar.bz2;
|
||||||
md5 = "6875bf0bd3cf38b9ae1362b9e644e6fc" ;
|
md5 = "6875bf0bd3cf38b9ae1362b9e644e6fc";
|
||||||
};
|
};
|
||||||
|
|
||||||
buildInputs = [perl bison flex glib pkgconfig libxml2];
|
buildInputs = [perl bison flex glib pkgconfig libxml2];
|
||||||
|
|
|
@ -3,8 +3,8 @@
|
||||||
stdenv.mkDerivation {
|
stdenv.mkDerivation {
|
||||||
name = "cdparanoia-III-alpha9.8";
|
name = "cdparanoia-III-alpha9.8";
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = http://downloads.xiph.org/releases/cdparanoia/cdparanoia-III-alpha9.8.src.tgz ;
|
url = http://downloads.xiph.org/releases/cdparanoia/cdparanoia-III-alpha9.8.src.tgz;
|
||||||
md5 = "7218e778b5970a86c958e597f952f193" ;
|
md5 = "7218e778b5970a86c958e597f952f193";
|
||||||
};
|
};
|
||||||
|
|
||||||
patches = [./fix.patch];
|
patches = [./fix.patch];
|
||||||
|
|
|
@ -4,7 +4,7 @@ stdenv.mkDerivation {
|
||||||
name = "flac-1.1.2";
|
name = "flac-1.1.2";
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = http://downloads.xiph.org/releases/flac/flac-1.1.2.tar.gz;
|
url = http://downloads.xiph.org/releases/flac/flac-1.1.2.tar.gz;
|
||||||
md5 = "2bfc127cdda02834d0491ab531a20960" ;
|
md5 = "2bfc127cdda02834d0491ab531a20960";
|
||||||
};
|
};
|
||||||
|
|
||||||
buildInputs = [libogg] ;
|
buildInputs = [libogg] ;
|
||||||
|
|
|
@ -39,6 +39,6 @@ stdenv.mkDerivation {
|
||||||
|
|
||||||
meta = {
|
meta = {
|
||||||
description = "Emacs with Unicode, GTK and Xft support (23.x alpha)";
|
description = "Emacs with Unicode, GTK and Xft support (23.x alpha)";
|
||||||
url = http://www.emacswiki.org/cgi-bin/wiki/XftGnuEmacs;
|
homepage = http://www.emacswiki.org/cgi-bin/wiki/XftGnuEmacs;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -25,6 +25,6 @@ stdenv.mkDerivation {
|
||||||
|
|
||||||
meta = {
|
meta = {
|
||||||
description = "A light-weight image viewer";
|
description = "A light-weight image viewer";
|
||||||
url = http://linuxbrit.co.uk/feh/;
|
homepage = http://linuxbrit.co.uk/feh/;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -7,7 +7,7 @@ stdenv.mkDerivation {
|
||||||
name = "gimp-2.4.0-rc1";
|
name = "gimp-2.4.0-rc1";
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = ftp://ftp.gtk.org/pub/gimp/v2.4/testing/gimp-2.4.0-rc1.tar.bz2;
|
url = ftp://ftp.gtk.org/pub/gimp/v2.4/testing/gimp-2.4.0-rc1.tar.bz2;
|
||||||
sha256 = "0n9gfmmxjjhi4dpdfwc37z8n4zsyx6byil1ig27agjgic22bydm1" ;
|
sha256 = "0n9gfmmxjjhi4dpdfwc37z8n4zsyx6byil1ig27agjgic22bydm1";
|
||||||
};
|
};
|
||||||
|
|
||||||
buildInputs = [
|
buildInputs = [
|
||||||
|
|
|
@ -1,4 +1,5 @@
|
||||||
args: with args.lib; with args;
|
args: with args.lib; with args;
|
||||||
|
|
||||||
let
|
let
|
||||||
co = chooseOptionsByFlags {
|
co = chooseOptionsByFlags {
|
||||||
inherit args;
|
inherit args;
|
||||||
|
@ -14,8 +15,7 @@ in args.stdenv.mkDerivation {
|
||||||
inherit (co) buildInputs configureFlags;
|
inherit (co) buildInputs configureFlags;
|
||||||
|
|
||||||
src = args.fetchurl {
|
src = args.fetchurl {
|
||||||
url = http://downloads.sourceforge.net/materm/mrxvt-0.5.3.tar.gz?modtime=1187784483&big_mirror=0;
|
url = mirror://sourceforge/materm/mrxvt-0.5.3.tar.gz;
|
||||||
name="mrxvt-0.5.3.tar.gz";
|
|
||||||
sha256 = "04flnn58hp4qvvk6jzyipsj13v1qyrjabgbw5laz5cqxvxzpncp2";
|
sha256 = "04flnn58hp4qvvk6jzyipsj13v1qyrjabgbw5laz5cqxvxzpncp2";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -10,6 +10,7 @@ stdenv.mkDerivation {
|
||||||
|
|
||||||
buildInputs = [ python perl ncurses x11 zlib openssl ];
|
buildInputs = [ python perl ncurses x11 zlib openssl ];
|
||||||
configureFlags = "--with-perl --with-python";
|
configureFlags = "--with-perl --with-python";
|
||||||
|
|
||||||
meta = {
|
meta = {
|
||||||
description = "Full-Featured Text WWW Browser";
|
description = "Full-Featured Text WWW Browser";
|
||||||
homepage = http://elinks.or.cz;
|
homepage = http://elinks.or.cz;
|
||||||
|
|
|
@ -8,7 +8,6 @@ assert stdenv.system == "i686-linux";
|
||||||
builder = ./builder.sh;
|
builder = ./builder.sh;
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = http://fpdownload.macromedia.com/get/flashplayer/current/install_flash_player_9_linux.tar.gz;
|
url = http://fpdownload.macromedia.com/get/flashplayer/current/install_flash_player_9_linux.tar.gz;
|
||||||
/*sha256 = "0y69n2i8b0zrb5dswhsvb6gls30p42p869vvyvpsg3prwwdrf6z3";*/
|
|
||||||
sha256 = "ad2f9eb98e976a82b62e97e7cf3a555464e43b80507b87ed7c469706faa4d897";
|
sha256 = "ad2f9eb98e976a82b62e97e7cf3a555464e43b80507b87ed7c469706faa4d897";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -1,14 +1,14 @@
|
||||||
{ stdenv, fetchurl, x11, lua, gettext, groff }:
|
{ stdenv, fetchurl, x11, lua, gettext, groff }:
|
||||||
|
|
||||||
stdenv.mkDerivation {
|
stdenv.mkDerivation {
|
||||||
name = "ion-3rc-20070608";
|
name = "ion-3rc-20070902";
|
||||||
meta = {
|
meta = {
|
||||||
description = "Ion is a tiling tabbed window manager designed with keyboard users in mind.";
|
description = "Ion is a tiling tabbed window manager designed with keyboard users in mind.";
|
||||||
homepage = http://modeemi.fi/~tuomov/ion;
|
homepage = http://modeemi.fi/~tuomov/ion;
|
||||||
};
|
};
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = ftp://ftp.chg.ru/pub/Linux/gentoo/distfiles/ion-3rc-20070608.tar.gz;
|
url = http://iki.fi/tuomov/dl/ion-3rc-20070902.tar.gz;
|
||||||
sha256 = "1s46vbm74vjdjmnz8dczk9km8lhwnw63mziwb2ymib63c6gxifhy";
|
sha256 = "062a0rgxzz4h1hih5lp7l2nfvhz095brag9fmnanzqc4dac228xl";
|
||||||
};
|
};
|
||||||
buildInputs = [ x11 lua gettext groff ];
|
buildInputs = [ x11 lua gettext groff ];
|
||||||
buildFlags = "LUA_DIR=${lua} X11_PREFIX=/no-such-path PREFIX=\${out}";
|
buildFlags = "LUA_DIR=${lua} X11_PREFIX=/no-such-path PREFIX=\${out}";
|
||||||
|
|
|
@ -4,7 +4,7 @@ stdenv.mkDerivation {
|
||||||
name = "agg-2.5";
|
name = "agg-2.5";
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = http://www.antigrain.com/agg-2.5.tar.gz;
|
url = http://www.antigrain.com/agg-2.5.tar.gz;
|
||||||
sha256 = "07wii4i824vy9qsvjsgqxppgqmfdxq0xa87i5yk53fijriadq7mb" ;
|
sha256 = "07wii4i824vy9qsvjsgqxppgqmfdxq0xa87i5yk53fijriadq7mb";
|
||||||
};
|
};
|
||||||
buildInputs = [autoconf automake libtool pkgconfig];
|
buildInputs = [autoconf automake libtool pkgconfig];
|
||||||
preConfigure = "sh autogen.sh";
|
preConfigure = "sh autogen.sh";
|
||||||
|
|
|
@ -4,6 +4,6 @@ stdenv.mkDerivation {
|
||||||
name = "libogg-1.1.3";
|
name = "libogg-1.1.3";
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = http://downloads.xiph.org/releases/ogg/libogg-1.1.3.tar.gz;
|
url = http://downloads.xiph.org/releases/ogg/libogg-1.1.3.tar.gz;
|
||||||
md5 = "eaf7dc6ebbff30975de7527a80831585" ;
|
md5 = "eaf7dc6ebbff30975de7527a80831585";
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,12 +0,0 @@
|
||||||
{stdenv, fetchurl}:
|
|
||||||
|
|
||||||
stdenv.mkDerivation {
|
|
||||||
name = "core-apache-ant-1.6.1";
|
|
||||||
realname = "apache-ant-1.6.1";
|
|
||||||
|
|
||||||
builder = ./core-builder.sh;
|
|
||||||
src = fetchurl {
|
|
||||||
url = http://www.apache.org/dist/ant/binaries/apache-ant-1.6.1-bin.tar.bz2;
|
|
||||||
md5 = "703d0265d05b98afd95be0bc21b98420";
|
|
||||||
};
|
|
||||||
}
|
|
|
@ -19,7 +19,7 @@ stdenv.mkDerivation {
|
||||||
# "... you may transfer a copy of the Software ... provided such
|
# "... you may transfer a copy of the Software ... provided such
|
||||||
# recipient agrees to be fully bound by the terms hereof."
|
# recipient agrees to be fully bound by the terms hereof."
|
||||||
description = "Firmware for the Intel 2200BG wireless card (requires acceptance of license, see http://ipw2200.sourceforge.net/firmware.php?fid=7";
|
description = "Firmware for the Intel 2200BG wireless card (requires acceptance of license, see http://ipw2200.sourceforge.net/firmware.php?fid=7";
|
||||||
url = http://ipw2200.sourceforge.net/firmware.php;
|
homepage = http://ipw2200.sourceforge.net/firmware.php;
|
||||||
license = http://ipw2200.sourceforge.net/firmware.php?fid=7;
|
license = http://ipw2200.sourceforge.net/firmware.php?fid=7;
|
||||||
# See also http://ipw2100.sourceforge.net/firmware_faq.php
|
# See also http://ipw2100.sourceforge.net/firmware_faq.php
|
||||||
};
|
};
|
||||||
|
|
|
@ -4,7 +4,7 @@ stdenv.mkDerivation {
|
||||||
name = "vsftpd-2.0.3";
|
name = "vsftpd-2.0.3";
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = ftp://vsftpd.beasts.org/users/cevans/vsftpd-2.0.3.tar.gz;
|
url = ftp://vsftpd.beasts.org/users/cevans/vsftpd-2.0.3.tar.gz;
|
||||||
md5 = "74936cbd8e8251deb1cd99c5fb18b6f8" ;
|
md5 = "74936cbd8e8251deb1cd99c5fb18b6f8";
|
||||||
};
|
};
|
||||||
|
|
||||||
NIX_LDFLAGS = [ "-lcrypt" "-lssl" "-lcrypto" ];
|
NIX_LDFLAGS = [ "-lcrypt" "-lssl" "-lcrypto" ];
|
||||||
|
|
|
@ -4,7 +4,7 @@ stdenv.mkDerivation {
|
||||||
name = "dovecot-1.0.3";
|
name = "dovecot-1.0.3";
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = http://dovecot.org/releases/1.0/dovecot-1.0.3.tar.gz;
|
url = http://dovecot.org/releases/1.0/dovecot-1.0.3.tar.gz;
|
||||||
sha256 = "14b3sbvj9xpm5mjwfavwrcwmzfdgian51ncspl8j83cd8j01jdjz" ;
|
sha256 = "14b3sbvj9xpm5mjwfavwrcwmzfdgian51ncspl8j83cd8j01jdjz";
|
||||||
};
|
};
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -13,7 +13,7 @@ stdenv.mkDerivation {
|
||||||
builder = ./builder.sh;
|
builder = ./builder.sh;
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = http://us1.samba.org/samba/ftp/stable/samba-3.0.25b.tar.gz; #TODO, change this to a URL of cs.uu.nl/...
|
url = http://us1.samba.org/samba/ftp/stable/samba-3.0.25b.tar.gz;
|
||||||
sha256 = "18l71skn7mryg78jpd8x38pf27wvrx00v33w3z2ycsfnrbcp8l6w";
|
sha256 = "18l71skn7mryg78jpd8x38pf27wvrx00v33w3z2ycsfnrbcp8l6w";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue