diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2008-03-13 13:31:39 +0000 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2008-03-13 13:31:39 +0000 |
| commit | d8745d57b2a088518f72433650fa6c815ee26d9e (patch) | |
| tree | a2623a4755a129ec4ceb154a067f3302bd018b1d | |
| parent | fdf6a69b3aac2bea921a484889e297c13a57680e (diff) | |
| download | nixpkgs-d8745d57b2a088518f72433650fa6c815ee26d9e.tar nixpkgs-d8745d57b2a088518f72433650fa6c815ee26d9e.tar.gz nixpkgs-d8745d57b2a088518f72433650fa6c815ee26d9e.tar.bz2 nixpkgs-d8745d57b2a088518f72433650fa6c815ee26d9e.tar.lz nixpkgs-d8745d57b2a088518f72433650fa6c815ee26d9e.tar.xz nixpkgs-d8745d57b2a088518f72433650fa6c815ee26d9e.tar.zst nixpkgs-d8745d57b2a088518f72433650fa6c815ee26d9e.zip | |
* mirror://debian: stripped the /pool part; there are other Debian
files that can be useful. * mirror://ubuntu. svn path=/nixpkgs/trunk/; revision=11097
| -rw-r--r-- | pkgs/build-support/fetchurl/mirrors.nix | 18 | ||||
| -rw-r--r-- | pkgs/data/fonts/unifont/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/top-level/template-debian.nix | 4 |
3 files changed, 17 insertions, 9 deletions
diff --git a/pkgs/build-support/fetchurl/mirrors.nix b/pkgs/build-support/fetchurl/mirrors.nix index d6a119b336a..bf0ec26ec57 100644 --- a/pkgs/build-support/fetchurl/mirrors.nix +++ b/pkgs/build-support/fetchurl/mirrors.nix @@ -113,12 +113,20 @@ rec { http://ftp.funet.fi/pub/CPAN/ ]; - # Debian + # Debian. debian = [ - ftp://ftp.de.debian.org/debian/pool/ - ftp://ftp.nl.debian.org/debian/pool/ - ftp://ftp.ru.debian.org/debian/pool/ - ftp://ftp.debian.org/debian/pool/ + ftp://ftp.de.debian.org/debian/ + ftp://ftp.nl.debian.org/debian/ + ftp://ftp.ru.debian.org/debian/ + ftp://ftp.debian.org/debian/ + ]; + + + # Ubuntu. + ubuntu = [ + http://nl.archive.ubuntu.com/ubuntu/ + http://de.archive.ubuntu.com/ubuntu/ + http://archive.ubuntu.com/ubuntu/ ]; } diff --git a/pkgs/data/fonts/unifont/default.nix b/pkgs/data/fonts/unifont/default.nix index 3ffc5eabf93..dd525aa3d78 100644 --- a/pkgs/data/fonts/unifont/default.nix +++ b/pkgs/data/fonts/unifont/default.nix @@ -1,11 +1,11 @@ args: with args; with debPackage; debBuild ({ src = fetchurl { - url = mirror://debian/main/u/unifont/unifont_1.0.orig.tar.gz; + url = mirror://debian/pool/main/u/unifont/unifont_1.0.orig.tar.gz; sha256 = "0bg8d6c7w51n5409g0n7vqk3aagbzb5aird5r02vw0yz7w6i729l"; }; patch = fetchurl { - url = mirror://debian/main/u/unifont/unifont_1.0-4.diff.gz; + url = mirror://debian/pool/main/u/unifont/unifont_1.0-4.diff.gz; sha256 = "08j0rrf7hc05izchmsx9f9hg7vnyqdvbmba4b9jl8wfhvd1b09fd"; }; name = "unifont-1.0-4"; diff --git a/pkgs/top-level/template-debian.nix b/pkgs/top-level/template-debian.nix index 872d1984533..80621b27c4d 100644 --- a/pkgs/top-level/template-debian.nix +++ b/pkgs/top-level/template-debian.nix @@ -1,10 +1,10 @@ args: with args; with debPackage; debBuild ({ src = fetchurl { - url = mirror://debian/(abort "Specify URL"); + url = mirror://debian/pool/(abort "Specify URL"); }; patch = fetchurl { - url = mirror://debian/(abort "Specify URL"); + url = mirror://debian/pool/(abort "Specify URL"); }; name = "${abort "Specify name"}"; buildInputs = []; |