From efea92de19b21e62fd6e416ebcade0ec088941ce Mon Sep 17 00:00:00 2001 From: Domen Kožar Date: Thu, 23 Oct 2014 00:13:31 +0200 Subject: fixes #1933 --- pkgs/desktops/gnome-3/3.10/core/libgnome-keyring/default.nix | 2 +- pkgs/desktops/gnome-3/3.10/core/yelp-xsl/default.nix | 2 +- pkgs/desktops/gnome-3/3.12/core/libgnome-keyring/default.nix | 2 +- pkgs/desktops/gnome-3/3.12/core/yelp-xsl/default.nix | 2 +- pkgs/development/libraries/pangomm/default.nix | 2 +- pkgs/development/tools/misc/lttv/default.nix | 2 +- pkgs/os-specific/darwin/otool/default.nix | 2 +- pkgs/os-specific/linux/lttng-modules/default.nix | 2 +- pkgs/tools/networking/p2p/tahoe-lafs/default.nix | 4 +--- 9 files changed, 9 insertions(+), 11 deletions(-) diff --git a/pkgs/desktops/gnome-3/3.10/core/libgnome-keyring/default.nix b/pkgs/desktops/gnome-3/3.10/core/libgnome-keyring/default.nix index 28c7b80c0d4..ed37f013e16 100644 --- a/pkgs/desktops/gnome-3/3.10/core/libgnome-keyring/default.nix +++ b/pkgs/desktops/gnome-3/3.10/core/libgnome-keyring/default.nix @@ -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 = '' diff --git a/pkgs/desktops/gnome-3/3.10/core/yelp-xsl/default.nix b/pkgs/desktops/gnome-3/3.10/core/yelp-xsl/default.nix index c5060bdba75..708a8ff32d6 100644 --- a/pkgs/desktops/gnome-3/3.10/core/yelp-xsl/default.nix +++ b/pkgs/desktops/gnome-3/3.10/core/yelp-xsl/default.nix @@ -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; }; } diff --git a/pkgs/desktops/gnome-3/3.12/core/libgnome-keyring/default.nix b/pkgs/desktops/gnome-3/3.12/core/libgnome-keyring/default.nix index 65d1c9d1493..c6c9323c010 100644 --- a/pkgs/desktops/gnome-3/3.12/core/libgnome-keyring/default.nix +++ b/pkgs/desktops/gnome-3/3.12/core/libgnome-keyring/default.nix @@ -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 = '' diff --git a/pkgs/desktops/gnome-3/3.12/core/yelp-xsl/default.nix b/pkgs/desktops/gnome-3/3.12/core/yelp-xsl/default.nix index 0a5bc78af47..e9911823073 100644 --- a/pkgs/desktops/gnome-3/3.12/core/yelp-xsl/default.nix +++ b/pkgs/desktops/gnome-3/3.12/core/yelp-xsl/default.nix @@ -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; }; } diff --git a/pkgs/development/libraries/pangomm/default.nix b/pkgs/development/libraries/pangomm/default.nix index ab598f47a52..f71c52e670b 100644 --- a/pkgs/development/libraries/pangomm/default.nix +++ b/pkgs/development/libraries/pangomm/default.nix @@ -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; diff --git a/pkgs/development/tools/misc/lttv/default.nix b/pkgs/development/tools/misc/lttv/default.nix index 0096cbdbabf..5cf8b664941 100644 --- a/pkgs/development/tools/misc/lttv/default.nix +++ b/pkgs/development/tools/misc/lttv/default.nix @@ -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 ]; }; diff --git a/pkgs/os-specific/darwin/otool/default.nix b/pkgs/os-specific/darwin/otool/default.nix index e0793664a9c..671e51542d0 100644 --- a/pkgs/os-specific/darwin/otool/default.nix +++ b/pkgs/os-specific/darwin/otool/default.nix @@ -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; diff --git a/pkgs/os-specific/linux/lttng-modules/default.nix b/pkgs/os-specific/linux/lttng-modules/default.nix index dc23244e38d..315265f8203 100644 --- a/pkgs/os-specific/linux/lttng-modules/default.nix +++ b/pkgs/os-specific/linux/lttng-modules/default.nix @@ -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 ]; }; diff --git a/pkgs/tools/networking/p2p/tahoe-lafs/default.nix b/pkgs/tools/networking/p2p/tahoe-lafs/default.nix index 76a4a0eae62..e82b7b8050e 100644 --- a/pkgs/tools/networking/p2p/tahoe-lafs/default.nix +++ b/pkgs/tools/networking/p2p/tahoe-lafs/default.nix @@ -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 }; -- cgit 1.4.1