Merge remote-tracking branch 'origin/master' into staging.

Conflicts: pkgs/desktops/e18/enlightenment.nix
2014-08-04 16:51:47 +02:00
parent 9253a95f6b b35770818d
commit 2d326e5032
1261 changed files with 4697 additions and 3318 deletions
@@ -105,7 +105,7 @@ stdenv.mkDerivation {
  meta = { 
    description = "Tool to create a Debian system in a chroot";
    homepage = http://packages.debian.org/de/lenny/debootstrap; # http://code.erisian.com.au/Wiki/debootstrap
-    license = "GPL-2"; # gentoo says so.. ?
+    license = stdenv.lib.licenses.gpl2; # gentoo says so.. ?
    maintainers = [ stdenv.lib.maintainers.marcweber ];
    platforms = stdenv.lib.platforms.linux;
  };