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

Merge pull request #48136 from bhipple/u/licenses

Browse Source 
Add licenses
This commit is contained in:
Matthew Bauer 2018-10-10 13:21:52 -05:00 committed by GitHub
commit e4c0560d22
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pkgs/applications/virtualization/xen/generic.nix
View File

@ -234,5 +234,6 @@ stdenv.mkDerivation (rec {
+ withXenfiles (name: x: ''* ${name}: ${x.meta.description or "(No description)"}.''); + withXenfiles (name: x: ''* ${name}: ${x.meta.description or "(No description)"}.'');
platforms = [ "x86_64-linux" ]; platforms = [ "x86_64-linux" ];
maintainers = with stdenv.lib.maintainers; [ eelco tstrobel oxij ]; maintainers = with stdenv.lib.maintainers; [ eelco tstrobel oxij ];
license = stdenv.lib.licenses.gpl2;
} // (config.meta or {}); } // (config.meta or {});
} // removeAttrs config [ "xenfiles" "buildInputs" "patches" "postPatch" "meta" ]) } // removeAttrs config [ "xenfiles" "buildInputs" "patches" "postPatch" "meta" ])

1
pkgs/development/libraries/harfbuzz/default.nix
View File

@ -63,6 +63,7 @@ stdenv.mkDerivation {
homepage = http://www.freedesktop.org/wiki/Software/HarfBuzz; homepage = http://www.freedesktop.org/wiki/Software/HarfBuzz;
downloadPage = "https://www.freedesktop.org/software/harfbuzz/release/"; downloadPage = "https://www.freedesktop.org/software/harfbuzz/release/";
maintainers = [ maintainers.eelco ]; maintainers = [ maintainers.eelco ];
license = licenses.mit;
platforms = with platforms; linux ++ darwin; platforms = with platforms; linux ++ darwin;
inherit version; inherit version;
updateWalker = true; updateWalker = true;

6
pkgs/development/python-modules/pytest/default.nix
View File

@ -37,8 +37,10 @@ buildPythonPackage rec {
''; '';
meta = with stdenv.lib; { meta = with stdenv.lib; {
maintainers = with maintainers; [ domenkozar lovek323 madjar lsix ]; homepage = https://docs.pytest.org;
platforms = platforms.unix;
description = "Framework for writing tests"; description = "Framework for writing tests";
maintainers = with maintainers; [ domenkozar lovek323 madjar lsix ];
license = licenses.mit;
platforms = platforms.unix;
}; };
} }

6
pkgs/tools/text/par/default.nix
View File

@ -28,9 +28,11 @@ stdenv.mkDerivation {
''; '';
meta = { meta = with stdenv.lib; {
homepage = http://www.nicemice.net/par/; homepage = http://www.nicemice.net/par/;
description = "Paragraph reflow for email"; description = "Paragraph reflow for email";
platforms = stdenv.lib.platforms.unix; platforms = platforms.unix;
# See https://fedoraproject.org/wiki/Licensing/Par for license details
license = licenses.free;
}; };
} }