diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2015-02-10 11:24:22 +0100 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2015-02-10 11:32:43 +0100 |
| commit | 3786f08d254a3aa7d3c8c89071e02580f7e8f88e (patch) | |
| tree | 59aa6c6decfdd5540aa2163b54d279bdeff3b232 /pkgs/build-support | |
| parent | 42722a2940bbacbd1c4eda5aedfc427ed8bad085 (diff) | |
| download | nixlib-3786f08d254a3aa7d3c8c89071e02580f7e8f88e.tar nixlib-3786f08d254a3aa7d3c8c89071e02580f7e8f88e.tar.gz nixlib-3786f08d254a3aa7d3c8c89071e02580f7e8f88e.tar.bz2 nixlib-3786f08d254a3aa7d3c8c89071e02580f7e8f88e.tar.lz nixlib-3786f08d254a3aa7d3c8c89071e02580f7e8f88e.tar.xz nixlib-3786f08d254a3aa7d3c8c89071e02580f7e8f88e.tar.zst nixlib-3786f08d254a3aa7d3c8c89071e02580f7e8f88e.zip | |
Add Fedora 21
Diffstat (limited to 'pkgs/build-support')
| -rw-r--r-- | pkgs/build-support/fetchurl/mirrors.nix | 3 | ||||
| -rw-r--r-- | pkgs/build-support/vm/default.nix | 29 |
2 files changed, 30 insertions, 2 deletions
diff --git a/pkgs/build-support/fetchurl/mirrors.nix b/pkgs/build-support/fetchurl/mirrors.nix index 53104f2f1f26..df6a464fa484 100644 --- a/pkgs/build-support/fetchurl/mirrors.nix +++ b/pkgs/build-support/fetchurl/mirrors.nix @@ -195,7 +195,7 @@ rec { # Fedora (please only add full mirrors that carry old Fedora distributions as well). # See: https://mirrors.fedoraproject.org/publiclist (but not all carry old content). fedora = [ - http://archives.fedoraproject.org/pub/archive/fedora/ + http://archives.fedoraproject.org/pub/fedora/ http://fedora.osuosl.org/ http://ftp.nluug.nl/pub/os/Linux/distr/fedora/ http://ftp.funet.fi/pub/mirrors/ftp.redhat.com/pub/fedora/ @@ -204,6 +204,7 @@ rec { http://ftp.linux.cz/pub/linux/fedora/ http://ftp.heanet.ie/pub/fedora/ http://mirror.1000mbps.com/fedora/ + http://archives.fedoraproject.org/pub/archive/fedora/ ]; # Old SUSE distributions. Unfortunately there is no master site, diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix index ba916c12cfca..1a80592a40e5 100644 --- a/pkgs/build-support/vm/default.nix +++ b/pkgs/build-support/vm/default.nix @@ -420,9 +420,10 @@ rec { ''} echo "unpacking RPMs..." + set +o pipefail for i in $rpms; do echo "$i..." - ${rpm}/bin/rpm2cpio "$i" | (chroot /mnt ${cpio}/bin/cpio -i --make-directories) + ${rpm}/bin/rpm2cpio "$i" | chroot /mnt ${cpio}/bin/cpio -i --make-directories done eval "$preInstall" @@ -1033,6 +1034,32 @@ rec { unifiedSystemDir = true; }; + fedora21i386 = { + name = "fedora-21-i386"; + fullName = "Fedora 21 (i386)"; + packagesList = fetchurl rec { + url = "mirror://fedora/linux/releases/21/Everything/i386/os/repodata/${sha256}-primary.xml.gz"; + sha256 = "a6ad1140adeef65bbc1fdcc7f8f2b356f0d20c71bbe3f1625038e7f43fc44780"; + }; + urlPrefix = mirror://fedora/linux/releases/21/Everything/i386/os; + archs = ["noarch" "i386" "i586" "i686"]; + packages = commonFedoraPackages ++ [ "cronie" "util-linux" ]; + unifiedSystemDir = true; + }; + + fedora21x86_64 = { + name = "fedora-21-x86_64"; + fullName = "Fedora 21 (x86_64)"; + packagesList = fetchurl rec { + url = "mirror://fedora/linux/releases/21/Everything/x86_64/os/repodata/${sha256}-primary.xml.gz"; + sha256 = "e2a28baab2ea4632fad93f9f28144cda3458190888fdf7f2acc9bc289f397e96"; + }; + urlPrefix = mirror://fedora/linux/releases/21/Everything/x86_64/os; + archs = ["noarch" "x86_64"]; + packages = commonFedoraPackages ++ [ "cronie" "util-linux" ]; + unifiedSystemDir = true; + }; + opensuse103i386 = { name = "opensuse-10.3-i586"; fullName = "openSUSE 10.3 (i586)"; |