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

fixes #1933

Browse Source
This commit is contained in:
Domen Kožar 2014-10-23 00:13:31 +02:00
parent 80585d4599
commit efea92de19
9 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/desktops/gnome-3/3.10/core/libgnome-keyring/default.nix
View File

@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
meta = {
description = "Framework for managing passwords and other secrets";
homepage = http://live.gnome.org/GnomeKeyring;
# TODO license = with stdenv.lib.licenses; [ gpl2Plus lgpl2Plus ];
license = with stdenv.lib.licenses; [ gpl2Plus lgpl2Plus ];
inherit (glib.meta) platforms maintainers;
longDescription = ''

2
pkgs/desktops/gnome-3/3.10/core/yelp-xsl/default.nix
View File

@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
homepage = https://wiki.gnome.org/Apps/Yelp;
description = "Yelp's universal stylesheets for Mallard and DocBook";
maintainers = with maintainers; [ lethalman ];
# TODO license = [licenses.gpl2 licenses.lgpl2];
license = [licenses.gpl2 licenses.lgpl2];
platforms = platforms.linux;
};
}

2
pkgs/desktops/gnome-3/3.12/core/libgnome-keyring/default.nix
View File

@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
meta = {
description = "Framework for managing passwords and other secrets";
homepage = http://live.gnome.org/GnomeKeyring;
# TODO license = with stdenv.lib.licenses; [ gpl2Plus lgpl2Plus ];
license = with stdenv.lib.licenses; [ gpl2Plus lgpl2Plus ];
inherit (glib.meta) platforms maintainers;
longDescription = ''

2
pkgs/desktops/gnome-3/3.12/core/yelp-xsl/default.nix
View File

@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
homepage = https://wiki.gnome.org/Apps/Yelp;
description = "Yelp's universal stylesheets for Mallard and DocBook";
maintainers = with maintainers; [ lethalman ];
# TODO license = [licenses.gpl2 licenses.lgpl2];
license = [licenses.gpl2 licenses.lgpl2];
platforms = platforms.linux;
};
}

2
pkgs/development/libraries/pangomm/default.nix
View File

@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "C++ interface to the Pango text rendering library";
homepage = http://www.pango.org/;
# TODO license = with licenses; [ lgpl2 lgpl21 ];
license = with licenses; [ lgpl2 lgpl21 ];
maintainers = with maintainers; [ lovek323 raskin ];
platforms = platforms.unix;

2
pkgs/development/tools/misc/lttv/default.nix
View File

@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
homepage = http://lttng.org/;
# liblttvtraceread (ltt/ directory) is distributed under the GNU LGPL v2.1.
# The rest of the LTTV package is distributed under the GNU GPL v2.
# TODO license = with licenses; [ gpl2 lgpl21 ];
license = with licenses; [ gpl2 lgpl21 ];
platforms = platforms.linux;
maintainers = [ maintainers.bjornfor ];
};

2
pkgs/os-specific/darwin/otool/default.nix
View File

@ -24,7 +24,7 @@ stdenv.mkDerivation {
meta = with stdenv.lib; {
description = "Object file displaying tool";
homepage = https://developer.apple.com/library/mac/documentation/Darwin/Reference/ManPages/man1/otool.1.html;
# TODO license = with licenses; [ apsl20 gpl2Plus ];
license = with licenses; [ apsl20 gpl2Plus ];
maintainers = with maintainers; [ lovek323 ];
platforms = platforms.darwin;

2
pkgs/os-specific/linux/lttng-modules/default.nix
View File

@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "Linux kernel modules for LTTng tracing";
homepage = http://lttng.org/;
# TODO license = with licenses; [ lgpl21 gpl2 mit ];
license = with licenses; [ lgpl21 gpl2 mit ];
platforms = platforms.linux;
maintainers = [ maintainers.bjornfor ];
};

4
pkgs/tools/networking/p2p/tahoe-lafs/default.nix
View File

@ -66,9 +66,7 @@ buildPythonPackage {
'';
homepage = http://allmydata.org/;
# TODO license = [ lib.licenses.gpl2Plus /* or */ "TGPPLv1+" ];
license = [ lib.licenses.gpl2Plus /* or */ "TGPPLv1+" ];
maintainers = [ lib.maintainers.simons ];
platforms = lib.platforms.gnu; # arbitrary choice
};