nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-22 15:03:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

* Added an x86_64 (amd64) image for Debian.

Browse Source 
* Updated Debian 4.0 to r4a.  Dropped the revision ("r3", "r4a") from
  the attribute name since Debian doesn't seem to keep old revisions
  available anyway.

svn path=/nixpkgs/trunk/; revision=12849
This commit is contained in:
Eelco Dolstra 2008-09-12 13:17:52 +00:00
parent a5231ec30e
commit 8745d2f85d
1 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
pkgs/build-support/vm/default.nix
View File

@ -584,6 +584,10 @@ rec {
runCommand "${name}.nix" {} '' runCommand "${name}.nix" {} ''
bunzip2 < ${packagesList} > ./Packages bunzip2 < ${packagesList} > ./Packages
# Work around this bug: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=452279
substituteInPlace ./Packages --replace x86_64-linux-gnu x86-64-linux-gnu
${perl}/bin/perl -I${dpkg} -w ${deb/deb-closure.pl} \ ${perl}/bin/perl -I${dpkg} -w ${deb/deb-closure.pl} \
./Packages ${urlPrefix} ${toString packages} > $out ./Packages ${urlPrefix} ${toString packages} > $out
''; '';
@ -705,16 +709,26 @@ rec {
urlPrefix = mirror://ubuntu; urlPrefix = mirror://ubuntu;
} // args); } // args);
debian40r3i386 = args: makeImageFromDebDist ({ debian40i386 = args: makeImageFromDebDist ({
name = "debian-4.0r3-etch-i386"; name = "debian-4.0r4a-etch-i386";
fullName = "Debian 4.0r3 Etch (i386)"; fullName = "Debian 4.0r4a Etch (i386)";
packagesList = fetchurl { packagesList = fetchurl {
url = mirror://debian/dists/etch/main/binary-i386/Packages.bz2; url = mirror://debian/dists/etch/main/binary-i386/Packages.bz2;
sha256 = "7a8f2777315d71fd7321d1076b3bf5f76afe179fe66c2ce8e1ff4baed6424340"; sha256 = "ce963cc348f89ca50f65a8e32aa518c590e213c26c9ead48b0899f01f4456a4a";
}; };
urlPrefix = mirror://debian; urlPrefix = mirror://debian;
} // args); } // args);
debian40x86_64 = args: makeImageFromDebDist ({
name = "debian-4.0r4a-etch-amd64";
fullName = "Debian 4.0r4a Etch (amd64)";
packagesList = fetchurl {
url = mirror://debian/dists/etch/main/binary-amd64/Packages.bz2;
sha256 = "3403ebca73baeb68092e32d2c61a14eec4497702ef7281a7c1485abeb3d263f6";
};
urlPrefix = mirror://debian;
} // args);
}; };
@ -828,7 +842,8 @@ rec {
opensuse103i386 = diskImageFuns.opensuse103i386 { packages = commonOpenSUSEPackages; }; opensuse103i386 = diskImageFuns.opensuse103i386 { packages = commonOpenSUSEPackages; };
ubuntu710i386 = diskImageFuns.ubuntu710i386 { packages = commonDebianPackages; }; ubuntu710i386 = diskImageFuns.ubuntu710i386 { packages = commonDebianPackages; };
debian40r3i386 = diskImageFuns.debian40r3i386 { packages = commonDebianPackages; }; debian40i386 = diskImageFuns.debian40i386 { packages = commonDebianPackages; };
debian40x86_64 = diskImageFuns.debian40x86_64 { packages = commonDebianPackages; };
}; };