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
@@ -30,6 +30,6 @@ stdenv.mkDerivation rec {

  meta = {
    description = "CLI program for LSI MegaRAID cards, which also works with some Dell PERC RAID cards";
-    license = "unfree";
+    license = stdenv.lib.licenses.unfree;
  };
 }