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

licenses: comment about two versions of MIT

Browse Source 
I decided to follow spdx.org and not to differentiate those two.
Packages would often have the wrong version anyway.
This commit is contained in:
Vladimír Čunát 2014-08-30 07:28:26 +02:00
parent f7aa6e1140
commit 3f0ebe7e75
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/licenses.nix
View File

@ -194,6 +194,8 @@ rec {
fullName = "Lucent Public License v1.02"; fullName = "Lucent Public License v1.02";
}; };
# spdx.org does not (yet) differentiate between the X11 and Expat versions
# for details see http://en.wikipedia.org/wiki/MIT_License#Various_versions
mit = spdx { mit = spdx {
shortName = "MIT"; shortName = "MIT";
fullName = "MIT License"; fullName = "MIT License";

2
pkgs/applications/audio/pianobar/default.nix
View File

@ -21,6 +21,6 @@ stdenv.mkDerivation rec {
description = "A console front-end for Pandora.com"; description = "A console front-end for Pandora.com";
homepage = "http://6xq.net/projects/pianobar/"; homepage = "http://6xq.net/projects/pianobar/";
platforms = stdenv.lib.platforms.linux; platforms = stdenv.lib.platforms.linux;
license = stdenv.lib.licenses.mit; license = stdenv.lib.licenses.mit; # expat version
}; };
} }

5
pkgs/development/libraries/expat/default.nix
View File

@ -8,9 +8,10 @@ stdenv.mkDerivation rec {
sha256 = "11pblz61zyxh68s5pdcbhc30ha1b2vfjd83aiwfg4vc15x3hadw2"; sha256 = "11pblz61zyxh68s5pdcbhc30ha1b2vfjd83aiwfg4vc15x3hadw2";
}; };
meta = { meta = with stdenv.lib; {
homepage = http://www.libexpat.org/; homepage = http://www.libexpat.org/;
description = "A stream-oriented XML parser library written in C"; description = "A stream-oriented XML parser library written in C";
platforms = stdenv.lib.platforms.all; platforms = platforms.all;
license = licenses.mit; # expat version
}; };
} }