diff options
Diffstat (limited to 'pkgs/build-support/vm/default.nix')
-rw-r--r-- | pkgs/build-support/vm/default.nix | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix index 10367957915..335cab7c45e 100644 --- a/pkgs/build-support/vm/default.nix +++ b/pkgs/build-support/vm/default.nix @@ -741,7 +741,7 @@ rec { # Note: no i386 release for Fedora >= 26 fedora26x86_64 = let version = "26"; - in rec { + in { name = "fedora-${version}-x86_64"; fullName = "Fedora ${version} (x86_64)"; packagesList = fetchurl rec { @@ -756,7 +756,7 @@ rec { fedora27x86_64 = let version = "27"; - in rec { + in { name = "fedora-${version}-x86_64"; fullName = "Fedora ${version} (x86_64)"; packagesList = fetchurl rec { @@ -774,9 +774,7 @@ rec { in rec { name = "centos-${version}-i386"; fullName = "CentOS ${version} (i386)"; - # N.B. Switch to vault.centos.org when the next release comes out - # urlPrefix = "http://vault.centos.org/${version}/os/i386"; - urlPrefix = "http://mirror.centos.org/centos-6/${version}/os/i386"; + urlPrefix = "mirror://centos/${version}/os/i386"; packagesList = fetchurl rec { url = "${urlPrefix}/repodata/${sha256}-primary.xml.gz"; sha256 = "b826a45082ef68340325c0855f3d2e5d5a4d0f77d28ba3b871791d6f14a97aeb"; @@ -790,9 +788,7 @@ rec { in rec { name = "centos-${version}-x86_64"; fullName = "CentOS ${version} (x86_64)"; - # N.B. Switch to vault.centos.org when the next release comes out - # urlPrefix = "http://vault.centos.org/${version}/os/x86_64"; - urlPrefix = "http://mirror.centos.org/centos-6/${version}/os/x86_64"; + urlPrefix = "mirror://centos/${version}/os/x86_64"; packagesList = fetchurl rec { url = "${urlPrefix}/repodata/${sha256}-primary.xml.gz"; sha256 = "ed2b2d4ac98d774d4cd3e91467e1532f7e8b0275cfc91a0d214b532dcaf1e979"; @@ -807,9 +803,7 @@ rec { in rec { name = "centos-${version}-x86_64"; fullName = "CentOS ${version} (x86_64)"; - # N.B. Switch to vault.centos.org when the next release comes out - # urlPrefix = "http://vault.centos.org/${version}/os/x86_64"; - urlPrefix = "http://mirror.centos.org/centos-7/${version}/os/x86_64"; + urlPrefix = "mirror://centos/${version}/os/x86_64"; packagesList = fetchurl rec { url = "${urlPrefix}/repodata/${sha256}-primary.xml.gz"; sha256 = "b686d3a0f337323e656d9387b9a76ce6808b26255fc3a138b1a87d3b1cb95ed5"; @@ -822,7 +816,7 @@ rec { /* The set of supported Dpkg-based distributions. */ - debDistros = rec { + debDistros = { # Interestingly, the SHA-256 hashes provided by Ubuntu in # http://nl.archive.ubuntu.com/ubuntu/dists/{gutsy,hardy}/Release are |