public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make the "universe" repository available to the Ubuntu image generator

Browse Source 
Also fix Ubuntu 12.04 name from "oneiric" to "precise".
This commit is contained in:
Eelco Dolstra 2012-08-27 13:46:51 -04:00
parent bacc6ab790
commit 20de8c8086
2 changed files with 34 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/build-support/vm/deb/deb-closure.pl
View File

@ -53,6 +53,8 @@ foreach my $cdata (values %packages) {
my @provides = getDeps(Dpkg::Deps::parse($cdata->{Provides})); my @provides = getDeps(Dpkg::Deps::parse($cdata->{Provides}));
foreach my $name (@provides) { foreach my $name (@provides) {
#die "conflicting provide: $name\n" if defined $provides{$name}; #die "conflicting provide: $name\n" if defined $provides{$name};
#warn "provide by $cdata->{Package} conflicts with package with the same name: $name\n";
next if defined $packages{$name};
$provides{$name} = $cdata->{Package}; $provides{$name} = $cdata->{Package};
} }
} }

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

@ -759,10 +759,13 @@ rec {
(i.e. generate a closure from a Packages.bz2 file). */ (i.e. generate a closure from a Packages.bz2 file). */
debClosureGenerator = debClosureGenerator =
{name, packagesList, urlPrefix, packages}: {name, packagesLists, urlPrefix, packages}:
runCommand "${name}.nix" {} '' runCommand "${name}.nix" {} ''
bunzip2 < ${packagesList} > ./Packages for i in ${toString packagesLists}; do
echo "adding $i..."
bunzip2 < $i >> ./Packages
done
# Work around this bug: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=452279 # Work around this bug: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=452279
sed -i ./Packages -e s/x86_64-linux-gnu/x86-64-linux-gnu/g sed -i ./Packages -e s/x86_64-linux-gnu/x86-64-linux-gnu/g
@ -777,12 +780,13 @@ rec {
names. */ names. */
makeImageFromDebDist = makeImageFromDebDist =
{ name, fullName, size ? 4096, urlPrefix, packagesList { name, fullName, size ? 4096, urlPrefix
, packagesList ? "", packagesLists ? [packagesList]
, packages, extraPackages ? [], postInstall ? "" }: , packages, extraPackages ? [], postInstall ? "" }:
let let
expr = debClosureGenerator { expr = debClosureGenerator {
inherit name packagesList urlPrefix; inherit name packagesLists urlPrefix;
packages = packages ++ extraPackages; packages = packages ++ extraPackages;
}; };
in in
@ -1233,23 +1237,35 @@ rec {
}; };
ubuntu1204i386 = { ubuntu1204i386 = {
name = "ubuntu-12.04-oneiric-i386"; name = "ubuntu-12.04-precise-i386";
fullName = "Ubuntu 12.04 Precise (i386)"; fullName = "Ubuntu 12.04 Precise (i386)";
packagesList = fetchurl { packagesLists =
[ (fetchurl {
url = mirror://ubuntu/dists/precise/main/binary-i386/Packages.bz2; url = mirror://ubuntu/dists/precise/main/binary-i386/Packages.bz2;
sha256 = "18ns9h4qhvjfcip9z55grzi371racxavgqkp6b5kfkdq2wwwax2d"; sha256 = "18ns9h4qhvjfcip9z55grzi371racxavgqkp6b5kfkdq2wwwax2d";
}; })
(fetchurl {
url = mirror://ubuntu/dists/precise/universe/binary-i386/Packages.bz2;
sha256 = "085lkzbnzkc74kfdmwdc32sfqyfz8dr0rbiifk8kx9jih3xjw2jk";
})
];
urlPrefix = mirror://ubuntu; urlPrefix = mirror://ubuntu;
packages = commonDebPackages ++ [ "diffutils" ]; packages = commonDebPackages ++ [ "diffutils" ];
}; };
ubuntu1204x86_64 = { ubuntu1204x86_64 = {
name = "ubuntu-12.04-oneiric-amd64"; name = "ubuntu-12.04-precise-amd64";
fullName = "Ubuntu 12.04 Precise (amd64)"; fullName = "Ubuntu 12.04 Precise (amd64)";
packagesList = fetchurl { packagesList =
[ (fetchurl {
url = mirror://ubuntu/dists/precise/main/binary-amd64/Packages.bz2; url = mirror://ubuntu/dists/precise/main/binary-amd64/Packages.bz2;
sha256 = "1aabpn0hdih6cbabyn87yvhccqj44q9k03mqmjsb920iqlckl3fc"; sha256 = "1aabpn0hdih6cbabyn87yvhccqj44q9k03mqmjsb920iqlckl3fc";
}; })
(fetchurl {
url = mirror://ubuntu/dists/precise/universe/binary-amd64/Packages.bz2;
sha256 = "0x4hz5aplximgb7gnpvrhkw8m7a40s80rkm5b8hil0afblwlg4vr";
})
];
urlPrefix = mirror://ubuntu; urlPrefix = mirror://ubuntu;
packages = commonDebPackages ++ [ "diffutils" ]; packages = commonDebPackages ++ [ "diffutils" ];
}; };