diff options
author | Michael Raskin <7c6f434c@mail.ru> | 2007-12-18 22:56:12 +0000 |
---|---|---|
committer | Michael Raskin <7c6f434c@mail.ru> | 2007-12-18 22:56:12 +0000 |
commit | 4290be9a99f8a16b8d3dedd3e5ca576a850e4785 (patch) | |
tree | 45a2272ba034c0f4faa6273fe1332a12657980da /pkgs | |
parent | 1b3aa6482dfd60b387e20e0019a25b4185a2677a (diff) | |
download | nixlib-4290be9a99f8a16b8d3dedd3e5ca576a850e4785.tar nixlib-4290be9a99f8a16b8d3dedd3e5ca576a850e4785.tar.gz nixlib-4290be9a99f8a16b8d3dedd3e5ca576a850e4785.tar.bz2 nixlib-4290be9a99f8a16b8d3dedd3e5ca576a850e4785.tar.lz nixlib-4290be9a99f8a16b8d3dedd3e5ca576a850e4785.tar.xz nixlib-4290be9a99f8a16b8d3dedd3e5ca576a850e4785.tar.zst nixlib-4290be9a99f8a16b8d3dedd3e5ca576a850e4785.zip |
Various fixes to lessen reliance on nix.cs.uu.nl for tarballs; version bumps for unavailabel tarballs; ATI driver builds now
svn path=/nixpkgs/trunk/; revision=9952
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/applications/misc/xterm/default.nix | 3 | ||||
-rw-r--r-- | pkgs/development/libraries/db4/db4-4.4.nix | 5 | ||||
-rw-r--r-- | pkgs/development/libraries/popt/popt-1.7.nix | 5 | ||||
-rw-r--r-- | pkgs/development/libraries/t1lib/default.nix | 9 | ||||
-rw-r--r-- | pkgs/development/tools/parsing/bison/bison-1.875.nix | 4 | ||||
-rw-r--r-- | pkgs/development/tools/parsing/flex/flex-2.5.4a.nix | 2 | ||||
-rw-r--r-- | pkgs/servers/x11/xorg/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/archivers/zip/default.nix | 2 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 8 |
9 files changed, 27 insertions, 15 deletions
diff --git a/pkgs/applications/misc/xterm/default.nix b/pkgs/applications/misc/xterm/default.nix index c14ceb84e87e..d27b723400e1 100644 --- a/pkgs/applications/misc/xterm/default.nix +++ b/pkgs/applications/misc/xterm/default.nix @@ -4,7 +4,8 @@ stdenv.mkDerivation { name = "xterm-208"; src = fetchurl { url = ftp://invisible-island.net/xterm/xterm.tar.gz; - md5 = "a062d0b398918015d07c31ecdcc5111a"; + md5 = "f7b04a66dc401dc22f5ddb7f345be229"; /* was a062d0b398918015d07c31ecdcc5111a */ }; buildInputs = [libXaw xproto libXt libX11 libSM libICE ncurses]; } + diff --git a/pkgs/development/libraries/db4/db4-4.4.nix b/pkgs/development/libraries/db4/db4-4.4.nix index 270f5359d953..2746d8127232 100644 --- a/pkgs/development/libraries/db4/db4-4.4.nix +++ b/pkgs/development/libraries/db4/db4-4.4.nix @@ -4,7 +4,10 @@ stdenv.mkDerivation ({ name = "db4-4.4.20"; builder = ./builder.sh; src = fetchurl { - url = http://nix.cs.uu.nl/dist/tarballs/db-4.4.20.NC.tar.gz; + urls = [ + http://download.oracle.com/berkeley-db/db-4.4.20.NC.tar.gz + http://nix.cs.uu.nl/dist/tarballs/db-4.4.20.NC.tar.gz + ]; md5 = "afd9243ea353bbaa04421488d3b37900"; }; configureFlags = [ diff --git a/pkgs/development/libraries/popt/popt-1.7.nix b/pkgs/development/libraries/popt/popt-1.7.nix index 1170760c828b..9ae06b0ed267 100644 --- a/pkgs/development/libraries/popt/popt-1.7.nix +++ b/pkgs/development/libraries/popt/popt-1.7.nix @@ -5,7 +5,10 @@ assert gettext != null; stdenv.mkDerivation { name = "popt-1.7"; src = fetchurl { - url = http://nix.cs.uu.nl/dist/tarballs/popt-1.7.tar.gz; + urls = [ + ftp://distro.ibiblio.org/pub/linux/distributions/pdaxrom/src/popt-1.7.tar.gz + http://nix.cs.uu.nl/dist/tarballs/popt-1.7.tar.gz + ]; md5 = "5988e7aeb0ae4dac8d83561265984cc9"; }; buildInputs = [gettext]; diff --git a/pkgs/development/libraries/t1lib/default.nix b/pkgs/development/libraries/t1lib/default.nix index c5b26424cdf3..a3ebe5e27ca1 100644 --- a/pkgs/development/libraries/t1lib/default.nix +++ b/pkgs/development/libraries/t1lib/default.nix @@ -1,11 +1,12 @@ -{stdenv, fetchurl, x11, libXaw}: +{stdenv, fetchurl, x11, libXaw, libXpm}: stdenv.mkDerivation { name = "t1lib-5.1.0"; src = fetchurl { - url = ftp://ftp.nluug.nl/pub/metalab/libs/graphics/t1lib-5.1.0.tar.gz; - md5 = "a05bed4aa63637052e60690ccde70421"; + url = ftp://ftp.nluug.nl/pub/metalab/libs/graphics/t1lib-5.1.1.tar.gz; + sha256 = "0r1wb94kjd8jwym9na2k2snikizrnyc4cf4mf92v89r4yy0apph8"; }; - buildInputs = [x11 libXaw]; + buildInputs = [x11 libXaw libXpm]; buildFlags = "without_doc"; } + diff --git a/pkgs/development/tools/parsing/bison/bison-1.875.nix b/pkgs/development/tools/parsing/bison/bison-1.875.nix index 92aeafb335a4..6a2ae1c794d6 100644 --- a/pkgs/development/tools/parsing/bison/bison-1.875.nix +++ b/pkgs/development/tools/parsing/bison/bison-1.875.nix @@ -5,7 +5,9 @@ assert m4 != null; stdenv.mkDerivation { name = "bison-1.875"; src = fetchurl { - url = http://nix.cs.uu.nl/dist/tarballs/bison-1.875.tar.bz2; + urls = [ http://nix.cs.uu.nl/dist/tarballs/bison-1.875.tar.bz2 + ftp://ftp.gnu.org/pub/gnu/bison/bison-1.875.tar.bz2 + ]; md5 = "b7f8027b249ebd4dd0cc948943a71af0"; }; buildInputs = [m4]; diff --git a/pkgs/development/tools/parsing/flex/flex-2.5.4a.nix b/pkgs/development/tools/parsing/flex/flex-2.5.4a.nix index 2d146eeca250..13bb68349790 100644 --- a/pkgs/development/tools/parsing/flex/flex-2.5.4a.nix +++ b/pkgs/development/tools/parsing/flex/flex-2.5.4a.nix @@ -5,7 +5,7 @@ assert yacc != null; stdenv.mkDerivation { name = "flex-2.5.4a"; src = fetchurl { - url = http://nix.cs.uu.nl/dist/tarballs/flex-2.5.4a.tar.gz; + url = mirror://sourceforge/flex/flex-2.5.4a.tar.gz; md5 = "bd8753d0b22e1f4ec87a553a73021adf"; }; buildInputs = [yacc]; diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 1a08a5057b10..7ab72ad2a8a1 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -1986,8 +1986,8 @@ rec { url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xf86-video-ati-6.6.3.tar.bz2; sha256 = "102p6nz1jvd3pgbl83a4zi99smydqr6il61r33l0lqmi3yg452nh"; }; - buildInputs = [pkgconfig fontsproto libdrm randrproto renderproto videoproto xextproto xf86driproto xf86miscproto xineramaproto xorgserver xproto ]; - }) // {inherit fontsproto libdrm randrproto renderproto videoproto xextproto xf86driproto xf86miscproto xineramaproto xorgserver xproto ;}; + buildInputs = [pkgconfig fontsproto libdrm randrproto renderproto videoproto xextproto xf86driproto xf86miscproto xineramaproto xorgserver xproto mesaHeaders glproto ]; + }) // {inherit fontsproto libdrm randrproto renderproto videoproto xextproto xf86driproto xf86miscproto xineramaproto xorgserver xproto mesaHeaders glproto;}; xf86videochips = (stdenv.mkDerivation { name = "xf86-video-chips-1.1.1"; diff --git a/pkgs/tools/archivers/zip/default.nix b/pkgs/tools/archivers/zip/default.nix index 51a1b618e023..f3fb96ae1e55 100644 --- a/pkgs/tools/archivers/zip/default.nix +++ b/pkgs/tools/archivers/zip/default.nix @@ -2,7 +2,7 @@ name = "zip-2.32"; builder = ./builder.sh; src = fetchurl { - url = http://ftp.info-zip.org/pub/infozip/src/zip232.tar.gz; + url = ftp://ftp.info-zip.org/pub/infozip/src/zip232.tgz; md5 = "8a4da4460386e324debe97f3b7fe4d96"; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fd4230767b83..ca66eec26480 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -302,7 +302,9 @@ rec { writeText = name: text: runCommand name {inherit text;} "echo -n \"$text\" > $out"; writeScript = name: text: runCommand name {inherit text;} "echo -n \"$text\" > $out; chmod +x $out"; - + + writeScriptBin = name: text: runCommand name {inherit text;} "mkdir -p \$out/bin; echo -n \"\$text\" > \$out/bin/\$name ; chmod +x \$out/bin/\$name"; + stdenvNewSetupScript = overrideSetup stdenv ../stdenv/generic/setup-new.sh; substituteAll = import ../build-support/substitute/substitute-all.nix { @@ -1261,7 +1263,7 @@ rec { # optional features inherit fetchurl flex bison apacheHttpd mysql; # gettext; inherit libxml2; - flags = [ "xdebug" "mysql" "mysqli" "pdo_mysql" "libxml2" "apxs2" ]; + flags = [ "mysql" "mysqli" "pdo_mysql" "libxml2" "apxs2" ]; }; @@ -2400,7 +2402,7 @@ rec { t1lib = import ../development/libraries/t1lib { inherit fetchurl stdenv x11; - inherit (xlibs) libXaw; + inherit (xlibs) libXaw libXpm; }; taglib = import ../development/libraries/taglib { |