From 059e8e179bb03e7a315ddd6400c59d36163eaca7 Mon Sep 17 00:00:00 2001
From: Domen Kozar <domen@dev.si>
Date: Wed, 12 Mar 2014 21:20:01 +0100
Subject: [PATCH] set all licenses to be attributes (and wait for Nix 1.7)
---
lib/licenses.nix | 38 +++++++++++++------
.../desktops/gnome-3/core/empathy/default.nix | 2 +-
.../gnome-3/core/libgnome-keyring/default.nix | 2 +-
.../gnome-3/core/yelp-xsl/default.nix | 2 +-
.../development/libraries/pangomm/default.nix | 2 +-
pkgs/development/tools/misc/lttv/default.nix | 2 +-
pkgs/os-specific/darwin/otool/default.nix | 2 +-
.../linux/lttng-modules/default.nix | 4 +-
pkgs/tools/networking/haproxy/default.nix | 4 +-
.../networking/p2p/tahoe-lafs/default.nix | 2 +-
10 files changed, 37 insertions(+), 23 deletions(-)
diff --git a/lib/licenses.nix b/lib/licenses.nix
index cda43583279..d82402cd3af 100644
--- a/lib/licenses.nix
+++ b/lib/licenses.nix
@@ -25,12 +25,14 @@
amd = {
shortName = "amd";
fullName = "AMD License Agreement";
- url = "http://developer.amd.com/amd-license-agreement/";
- };
+ url = http://developer.amd.com/amd-license-agreement/;
+ };#
- # Apple Public Source License 2.0;
- # http://opensource.org/licenses/APSL-2.0
- apsl20 = "APSL 2.0";
+ apsl20 = {
+ shortName = "APSL 2.0";
+ fullName = "Apple Public Source License 2.0";
+ url = http://opensource.org/licenses/APSL-2.0;
+ };
asl20 = {
shortName = "ASL2.0";
@@ -80,7 +82,11 @@
url = http://www.eclipse.org/legal/epl-v10.html;
};
- gpl2 = "GPLv2";
+ gpl2 = {
+ shortName = "GPLv2";
+ fullName = "GNU General Public License version 2";
+ url = http://www.gnu.org/licenses/old-licenses/gpl-2.0.html;
+ };
gpl2Oss = {
shortName = "GPLv2+OSS";
@@ -88,9 +94,11 @@
url = http://www.mysql.com/about/legal/licensing/foss-exception;
};
- # GNU General Public License version 2 or later;
- # http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
- gpl2Plus = "GPLv2+";
+ gpl2Plus = {
+ shortName = "GPLv2+";
+ fullName = "GNU General Public License version 2 or later";
+ url = http://www.gnu.org/licenses/old-licenses/gpl-2.0.html;
+ };
gpl3 = {
shortName = "GPLv3";
@@ -134,7 +142,11 @@
url = https://fedoraproject.org/wiki/Licensing/libtiff;
};
- lgpl2 = "LGPLv2";
+ lgpl2 = {
+ shortName = "LGPLv2";
+ fullName = "GNU Library General Public License version 2";
+ url = http://www.gnu.org/licenses/old-licenses/lgpl-2.0.html;
+ };
lgpl2Plus = {
shortName = "LGPLv2+";
@@ -142,7 +154,11 @@
url = http://www.gnu.org/licenses/old-licenses/lgpl-2.0.html;
};
- lgpl21 = "LGPLv2.1";
+ lgpl21 = {
+ shortName = "LGPLv2.1";
+ fullName = "GNU Lesser General Public License version 2.1";
+ url = http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html;
+ };
lgpl21Plus = {
shortName = "LGPLv2.1+";
diff --git a/pkgs/desktops/gnome-3/core/empathy/default.nix b/pkgs/desktops/gnome-3/core/empathy/default.nix
index 1e0c94d0c7f..1f7a027fd3e 100644
--- a/pkgs/desktops/gnome-3/core/empathy/default.nix
+++ b/pkgs/desktops/gnome-3/core/empathy/default.nix
@@ -51,7 +51,7 @@ stdenv.mkDerivation rec {
homepage = https://wiki.gnome.org/Apps/Empathy;
description = "Messaging program which supports text, voice, video chat, and file transfers over many different protocols";
maintainers = with maintainers; [ lethalman ];
- license = [ licenses.gpl2 licenses.lgpl2 ];
+ # TODO: license = [ licenses.gpl2 licenses.lgpl2 ];
platforms = platforms.linux;
};
}
diff --git a/pkgs/desktops/gnome-3/core/libgnome-keyring/default.nix b/pkgs/desktops/gnome-3/core/libgnome-keyring/default.nix
index ed37f013e16..28c7b80c0d4 100644
--- a/pkgs/desktops/gnome-3/core/libgnome-keyring/default.nix
+++ b/pkgs/desktops/gnome-3/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;
- license = with stdenv.lib.licenses; [ gpl2Plus lgpl2Plus ];
+ # TODO license = with stdenv.lib.licenses; [ gpl2Plus lgpl2Plus ];
inherit (glib.meta) platforms maintainers;
longDescription = ''
diff --git a/pkgs/desktops/gnome-3/core/yelp-xsl/default.nix b/pkgs/desktops/gnome-3/core/yelp-xsl/default.nix
index 708a8ff32d6..c5060bdba75 100644
--- a/pkgs/desktops/gnome-3/core/yelp-xsl/default.nix
+++ b/pkgs/desktops/gnome-3/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 ];
- license = [licenses.gpl2 licenses.lgpl2];
+ # TODO 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 f71c52e670b..ab598f47a52 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/;
- license = with licenses; [ lgpl2 lgpl21 ];
+ # TODO 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 5cf8b664941..0096cbdbabf 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.
- license = with licenses; [ gpl2 lgpl21 ];
+ # TODO 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 671e51542d0..e0793664a9c 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;
- license = with licenses; [ apsl20 gpl2Plus ];
+ # TODO 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 b9cc34345df..1673472036f 100644
--- a/pkgs/os-specific/linux/lttng-modules/default.nix
+++ b/pkgs/os-specific/linux/lttng-modules/default.nix
@@ -23,9 +23,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "Linux kernel modules for LTTng tracing";
homepage = http://lttng.org/;
- # TODO: Add "mit" to the license list once the license attr set vs string
- # decision has been made. (Having "mit" there breaks hydra evaluation.)
- license = with licenses; [ lgpl21 gpl2 ];
+ # TODO license = with licenses; [ lgpl21 gpl2 mit ];
platforms = platforms.linux;
maintainers = [ maintainers.bjornfor ];
};
diff --git a/pkgs/tools/networking/haproxy/default.nix b/pkgs/tools/networking/haproxy/default.nix
index e4a32e14260..42760da5d4a 100644
--- a/pkgs/tools/networking/haproxy/default.nix
+++ b/pkgs/tools/networking/haproxy/default.nix
@@ -29,9 +29,9 @@ stdenv.mkDerivation rec {
homepage = http://haproxy.1wt.eu;
maintainers = [ stdenv.lib.maintainers.garbas ];
platforms = stdenv.lib.platforms.linux;
- license = [
+ /* TODO license = [
stdenv.lib.licenses.gpl2
stdenv.lib.licenses.lgpl21
- ];
+ ];*/
};
}
diff --git a/pkgs/tools/networking/p2p/tahoe-lafs/default.nix b/pkgs/tools/networking/p2p/tahoe-lafs/default.nix
index 8796dbd076e..76a4a0eae62 100644
--- a/pkgs/tools/networking/p2p/tahoe-lafs/default.nix
+++ b/pkgs/tools/networking/p2p/tahoe-lafs/default.nix
@@ -67,7 +67,7 @@ buildPythonPackage {
homepage = http://allmydata.org/;
- license = [ lib.licenses.gpl2Plus /* or */ "TGPPLv1+" ];
+ # TODO license = [ lib.licenses.gpl2Plus /* or */ "TGPPLv1+" ];
maintainers = [ lib.maintainers.simons ];
platforms = lib.platforms.gnu; # arbitrary choice