summary refs log tree commit diff
path: root/pkgs/build-support/vm/deb
diff options
context:
space:
mode:
authorEelco Dolstra <eelco.dolstra@logicblox.com>2012-08-27 13:46:51 -0400
committerEelco Dolstra <eelco.dolstra@logicblox.com>2012-08-27 13:53:07 -0400
commit20de8c808658154a838d6519ecfa32f260b25fd7 (patch)
tree166a5f69032712f27100883e4584e8a8415b21ff /pkgs/build-support/vm/deb
parentbacc6ab790cd05c7fa1360b87be321602e87a69d (diff)
downloadnixpkgs-20de8c808658154a838d6519ecfa32f260b25fd7.tar
nixpkgs-20de8c808658154a838d6519ecfa32f260b25fd7.tar.gz
nixpkgs-20de8c808658154a838d6519ecfa32f260b25fd7.tar.bz2
nixpkgs-20de8c808658154a838d6519ecfa32f260b25fd7.tar.lz
nixpkgs-20de8c808658154a838d6519ecfa32f260b25fd7.tar.xz
nixpkgs-20de8c808658154a838d6519ecfa32f260b25fd7.tar.zst
nixpkgs-20de8c808658154a838d6519ecfa32f260b25fd7.zip
Make the "universe" repository available to the Ubuntu image generator
Also fix Ubuntu 12.04 name from "oneiric" to "precise".
Diffstat (limited to 'pkgs/build-support/vm/deb')
-rw-r--r--pkgs/build-support/vm/deb/deb-closure.pl2
1 files changed, 2 insertions, 0 deletions
diff --git a/pkgs/build-support/vm/deb/deb-closure.pl b/pkgs/build-support/vm/deb/deb-closure.pl
index f5b764783b4..1d41f89218b 100644
--- a/pkgs/build-support/vm/deb/deb-closure.pl
+++ b/pkgs/build-support/vm/deb/deb-closure.pl
@@ -53,6 +53,8 @@ foreach my $cdata (values %packages) {
     my @provides = getDeps(Dpkg::Deps::parse($cdata->{Provides}));
     foreach my $name (@provides) {
         #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};
     }
 }