diff options
18 files changed, 39 insertions, 45 deletions
diff --git a/maintainers/scripts/evacuate-urls.sh b/maintainers/scripts/evacuate-urls.sh index 04fdfd89bde3..3aa368ec6682 100755 --- a/maintainers/scripts/evacuate-urls.sh +++ b/maintainers/scripts/evacuate-urls.sh @@ -9,7 +9,7 @@ find "$1" -name "*.nix" | while read fn; do 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 - base=$(basename $url) + base="$(basename "$url")" newPath="$distDir/$base" if test -e "$newPath"; then @@ -20,7 +20,11 @@ find "$1" -name "*.nix" | while read fn; do if test -z "$hash"; then hash=$(fgrep -A 1 "$url" "$fn" | grep sha256 | sed 's^.*sha256 = \"\(.*\)\";.*^\1^') 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^') hashType="sha1" if test -z "$hash"; then @@ -31,13 +35,13 @@ find "$1" -name "*.nix" | while read fn; do fi #echo "HASH = $hash" 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 fi else - if echo $url | grep -q '^mirror://'; then + if echo $url | grep -q 'mirror://'; then #echo "$fn: skipping mirrored $url" continue fi @@ -74,4 +78,6 @@ find "$1" -name "*.nix" | while read fn; do done -done \ No newline at end of file +done + +echo DONE \ No newline at end of file diff --git a/pkgs/applications/audio/GStreamer/default.nix b/pkgs/applications/audio/GStreamer/default.nix index 607d2e9ce9fe..0239b29f7ee2 100644 --- a/pkgs/applications/audio/GStreamer/default.nix +++ b/pkgs/applications/audio/GStreamer/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation { name = "GStreamer-0.10.10"; src = fetchurl { url = http://gstreamer.freedesktop.org/src/gstreamer/gstreamer-0.10.10.tar.bz2; - md5 = "6875bf0bd3cf38b9ae1362b9e644e6fc" ; + md5 = "6875bf0bd3cf38b9ae1362b9e644e6fc"; }; buildInputs = [perl bison flex glib pkgconfig libxml2]; diff --git a/pkgs/applications/audio/cdparanoia/default.nix b/pkgs/applications/audio/cdparanoia/default.nix index 0d741899cdf2..e8d317726117 100644 --- a/pkgs/applications/audio/cdparanoia/default.nix +++ b/pkgs/applications/audio/cdparanoia/default.nix @@ -3,8 +3,8 @@ stdenv.mkDerivation { name = "cdparanoia-III-alpha9.8"; src = fetchurl { - url = http://downloads.xiph.org/releases/cdparanoia/cdparanoia-III-alpha9.8.src.tgz ; - md5 = "7218e778b5970a86c958e597f952f193" ; + url = http://downloads.xiph.org/releases/cdparanoia/cdparanoia-III-alpha9.8.src.tgz; + md5 = "7218e778b5970a86c958e597f952f193"; }; patches = [./fix.patch]; diff --git a/pkgs/applications/audio/flac/default.nix b/pkgs/applications/audio/flac/default.nix index 6d6b07348ff9..58c11aaa0f81 100644 --- a/pkgs/applications/audio/flac/default.nix +++ b/pkgs/applications/audio/flac/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "flac-1.1.2"; src = fetchurl { url = http://downloads.xiph.org/releases/flac/flac-1.1.2.tar.gz; - md5 = "2bfc127cdda02834d0491ab531a20960" ; + md5 = "2bfc127cdda02834d0491ab531a20960"; }; buildInputs = [libogg] ; diff --git a/pkgs/applications/editors/emacs-unicode/default.nix b/pkgs/applications/editors/emacs-unicode/default.nix index 0a6a1389bbd8..dbacd3e20b9f 100644 --- a/pkgs/applications/editors/emacs-unicode/default.nix +++ b/pkgs/applications/editors/emacs-unicode/default.nix @@ -39,6 +39,6 @@ stdenv.mkDerivation { meta = { 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; }; } diff --git a/pkgs/applications/graphics/feh/default.nix b/pkgs/applications/graphics/feh/default.nix index f234432dc560..f79cfd6f176f 100644 --- a/pkgs/applications/graphics/feh/default.nix +++ b/pkgs/applications/graphics/feh/default.nix @@ -25,6 +25,6 @@ stdenv.mkDerivation { meta = { description = "A light-weight image viewer"; - url = http://linuxbrit.co.uk/feh/; + homepage = http://linuxbrit.co.uk/feh/; }; } diff --git a/pkgs/applications/graphics/gimp/default.nix b/pkgs/applications/graphics/gimp/default.nix index 58444075f98a..e2e962662f48 100644 --- a/pkgs/applications/graphics/gimp/default.nix +++ b/pkgs/applications/graphics/gimp/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation { name = "gimp-2.4.0-rc1"; src = fetchurl { url = ftp://ftp.gtk.org/pub/gimp/v2.4/testing/gimp-2.4.0-rc1.tar.bz2; - sha256 = "0n9gfmmxjjhi4dpdfwc37z8n4zsyx6byil1ig27agjgic22bydm1" ; + sha256 = "0n9gfmmxjjhi4dpdfwc37z8n4zsyx6byil1ig27agjgic22bydm1"; }; buildInputs = [ diff --git a/pkgs/applications/misc/mrxvt/default.nix b/pkgs/applications/misc/mrxvt/default.nix index ed52a19be4c1..aaabef2b6b8c 100644 --- a/pkgs/applications/misc/mrxvt/default.nix +++ b/pkgs/applications/misc/mrxvt/default.nix @@ -1,4 +1,5 @@ args: with args.lib; with args; + let co = chooseOptionsByFlags { inherit args; @@ -14,16 +15,15 @@ in args.stdenv.mkDerivation { inherit (co) buildInputs configureFlags; src = args.fetchurl { - url = http://downloads.sourceforge.net/materm/mrxvt-0.5.3.tar.gz?modtime=1187784483&big_mirror=0; - name="mrxvt-0.5.3.tar.gz"; + url = mirror://sourceforge/materm/mrxvt-0.5.3.tar.gz; sha256 = "04flnn58hp4qvvk6jzyipsj13v1qyrjabgbw5laz5cqxvxzpncp2"; }; name = "mrxvt-0.5.3"; meta = { - description = "multitabbed lightweight terminal emulator basd on rxvt supporting transparency, backgroundimages, freetype fonts,.."; - homepage = http://sourceforge.net/projects/materm; - license = "GPL"; - }; + description = "multitabbed lightweight terminal emulator basd on rxvt supporting transparency, backgroundimages, freetype fonts,.."; + homepage = http://sourceforge.net/projects/materm; + license = "GPL"; + }; } diff --git a/pkgs/applications/networking/browsers/elinks/default.nix b/pkgs/applications/networking/browsers/elinks/default.nix index 7b7c14819925..75db8f04f948 100644 --- a/pkgs/applications/networking/browsers/elinks/default.nix +++ b/pkgs/applications/networking/browsers/elinks/default.nix @@ -10,8 +10,9 @@ stdenv.mkDerivation { buildInputs = [ python perl ncurses x11 zlib openssl ]; configureFlags = "--with-perl --with-python"; + meta = { - description = "Full-Featured Text WWW Browser"; - homepage = http://elinks.or.cz; + description = "Full-Featured Text WWW Browser"; + homepage = http://elinks.or.cz; }; } diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-9/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-9/default.nix index d2f4210a6f50..d6972ac2f79c 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-9/default.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-9/default.nix @@ -8,8 +8,7 @@ assert stdenv.system == "i686-linux"; builder = ./builder.sh; src = fetchurl { url = http://fpdownload.macromedia.com/get/flashplayer/current/install_flash_player_9_linux.tar.gz; - /*sha256 = "0y69n2i8b0zrb5dswhsvb6gls30p42p869vvyvpsg3prwwdrf6z3";*/ - sha256 = "ad2f9eb98e976a82b62e97e7cf3a555464e43b80507b87ed7c469706faa4d897"; + sha256 = "ad2f9eb98e976a82b62e97e7cf3a555464e43b80507b87ed7c469706faa4d897"; }; inherit zlib alsaLib; diff --git a/pkgs/applications/window-managers/ion-3/default.nix b/pkgs/applications/window-managers/ion-3/default.nix index 282de5ab0c4a..e6714536cadd 100644 --- a/pkgs/applications/window-managers/ion-3/default.nix +++ b/pkgs/applications/window-managers/ion-3/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, x11, lua, gettext, groff }: stdenv.mkDerivation { - name = "ion-3rc-20070608"; + name = "ion-3rc-20070902"; meta = { - description = "Ion is a tiling tabbed window manager designed with keyboard users in mind."; - homepage = http://modeemi.fi/~tuomov/ion; + description = "Ion is a tiling tabbed window manager designed with keyboard users in mind."; + homepage = http://modeemi.fi/~tuomov/ion; }; src = fetchurl { - url = ftp://ftp.chg.ru/pub/Linux/gentoo/distfiles/ion-3rc-20070608.tar.gz; - sha256 = "1s46vbm74vjdjmnz8dczk9km8lhwnw63mziwb2ymib63c6gxifhy"; + url = http://iki.fi/tuomov/dl/ion-3rc-20070902.tar.gz; + sha256 = "062a0rgxzz4h1hih5lp7l2nfvhz095brag9fmnanzqc4dac228xl"; }; buildInputs = [ x11 lua gettext groff ]; buildFlags = "LUA_DIR=${lua} X11_PREFIX=/no-such-path PREFIX=\${out}"; diff --git a/pkgs/development/libraries/agg/default.nix b/pkgs/development/libraries/agg/default.nix index df8cfc5c04d3..2c85f401255c 100644 --- a/pkgs/development/libraries/agg/default.nix +++ b/pkgs/development/libraries/agg/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "agg-2.5"; src = fetchurl { url = http://www.antigrain.com/agg-2.5.tar.gz; - sha256 = "07wii4i824vy9qsvjsgqxppgqmfdxq0xa87i5yk53fijriadq7mb" ; + sha256 = "07wii4i824vy9qsvjsgqxppgqmfdxq0xa87i5yk53fijriadq7mb"; }; buildInputs = [autoconf automake libtool pkgconfig]; preConfigure = "sh autogen.sh"; diff --git a/pkgs/development/libraries/libogg/default.nix b/pkgs/development/libraries/libogg/default.nix index 50351f66391f..fc4c77f9f2a3 100644 --- a/pkgs/development/libraries/libogg/default.nix +++ b/pkgs/development/libraries/libogg/default.nix @@ -4,6 +4,6 @@ stdenv.mkDerivation { name = "libogg-1.1.3"; src = fetchurl { url = http://downloads.xiph.org/releases/ogg/libogg-1.1.3.tar.gz; - md5 = "eaf7dc6ebbff30975de7527a80831585" ; + md5 = "eaf7dc6ebbff30975de7527a80831585"; }; } diff --git a/pkgs/development/tools/build-managers/apache-ant/core-apache-ant-1.6.1.nix b/pkgs/development/tools/build-managers/apache-ant/core-apache-ant-1.6.1.nix deleted file mode 100644 index 070cc4071ad3..000000000000 --- a/pkgs/development/tools/build-managers/apache-ant/core-apache-ant-1.6.1.nix +++ /dev/null @@ -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"; - }; -} diff --git a/pkgs/os-specific/linux/firmware/ipw2200/default.nix b/pkgs/os-specific/linux/firmware/ipw2200/default.nix index e10a8b45c311..7852ce2ca808 100644 --- a/pkgs/os-specific/linux/firmware/ipw2200/default.nix +++ b/pkgs/os-specific/linux/firmware/ipw2200/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { # "... you may transfer a copy of the Software ... provided such # 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"; - url = http://ipw2200.sourceforge.net/firmware.php; + homepage = http://ipw2200.sourceforge.net/firmware.php; license = http://ipw2200.sourceforge.net/firmware.php?fid=7; # See also http://ipw2100.sourceforge.net/firmware_faq.php }; diff --git a/pkgs/servers/ftp/vsftpd/default.nix b/pkgs/servers/ftp/vsftpd/default.nix index a6a5afcfd6fc..861845ab24f4 100644 --- a/pkgs/servers/ftp/vsftpd/default.nix +++ b/pkgs/servers/ftp/vsftpd/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "vsftpd-2.0.3"; src = fetchurl { url = ftp://vsftpd.beasts.org/users/cevans/vsftpd-2.0.3.tar.gz; - md5 = "74936cbd8e8251deb1cd99c5fb18b6f8" ; + md5 = "74936cbd8e8251deb1cd99c5fb18b6f8"; }; NIX_LDFLAGS = [ "-lcrypt" "-lssl" "-lcrypto" ]; diff --git a/pkgs/servers/mail/dovecot/default.nix b/pkgs/servers/mail/dovecot/default.nix index 1c58819ab167..e93926b2f378 100644 --- a/pkgs/servers/mail/dovecot/default.nix +++ b/pkgs/servers/mail/dovecot/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "dovecot-1.0.3"; src = fetchurl { url = http://dovecot.org/releases/1.0/dovecot-1.0.3.tar.gz; - sha256 = "14b3sbvj9xpm5mjwfavwrcwmzfdgian51ncspl8j83cd8j01jdjz" ; + sha256 = "14b3sbvj9xpm5mjwfavwrcwmzfdgian51ncspl8j83cd8j01jdjz"; }; } diff --git a/pkgs/servers/samba/default.nix b/pkgs/servers/samba/default.nix index e91af3fbc248..3ce8784a9a5a 100644 --- a/pkgs/servers/samba/default.nix +++ b/pkgs/servers/samba/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation { builder = ./builder.sh; 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"; }; |