Merge commit 'cfb29ab882323d379aba20a95020c7c24f883eae'

Partial staging merge, including cc-wrapper fixes Conflicts: pkgs/applications/audio/spotify/default.nix pkgs/build-support/cc-wrapper/default.nix pkgs/development/compilers/cryptol/1.8.x.nix
2015-02-02 21:14:28 -05:00
parent acbf8eb561 cfb29ab882
commit c45372f038
153 changed files with 419 additions and 377 deletions
--- a/lib/licenses.nix
+++ b/lib/licenses.nix
@@ -190,6 +190,11 @@ lib.mapAttrs (n: v: v // { shortName = n; }) rec {
    url = http://www.calculate-linux.org/packages/licenses/iASL;
  };

+  ijg = spdx {
+    spdxId = "IJG";
+    fullName = "Independent JPEG Group License";
+  };
+
  inria = {
    fullName  = "INRIA Non-Commercial License Agreement";
    url       = "http://compcert.inria.fr/doc/LICENSE";