summary refs log tree commit diff
diff options
context:
space:
mode:
authorxeji <36407913+xeji@users.noreply.github.com>2018-10-24 10:35:59 +0200
committerGitHub <noreply@github.com>2018-10-24 10:35:59 +0200
commit53715963be130012ae50d6060f956ea3c9956e50 (patch)
treeb9d5aeb22cdd99ad541a95d0b9bc671afb6c9015
parent655b45bb853e71be99a68fd70bb975002f79343c (diff)
parent3371821d74182b1d397ce9bbe91a39c7423a8bdb (diff)
downloadnixlib-53715963be130012ae50d6060f956ea3c9956e50.tar
nixlib-53715963be130012ae50d6060f956ea3c9956e50.tar.gz
nixlib-53715963be130012ae50d6060f956ea3c9956e50.tar.bz2
nixlib-53715963be130012ae50d6060f956ea3c9956e50.tar.lz
nixlib-53715963be130012ae50d6060f956ea3c9956e50.tar.xz
nixlib-53715963be130012ae50d6060f956ea3c9956e50.tar.zst
nixlib-53715963be130012ae50d6060f956ea3c9956e50.zip
Merge pull request #48909 from markuskowa/licenses-23
Add licenses
-rw-r--r--pkgs/development/libraries/libsigcxx/1.2.nix5
-rw-r--r--pkgs/development/libraries/libuv/default.nix1
-rw-r--r--pkgs/development/libraries/libwmf/default.nix6
-rw-r--r--pkgs/development/libraries/libwpd/0.8.nix11
-rw-r--r--pkgs/development/libraries/libwpg/default.nix6
-rw-r--r--pkgs/development/libraries/log4shib/default.nix2
-rw-r--r--pkgs/development/libraries/loudmouth/default.nix5
-rw-r--r--pkgs/development/libraries/martyr/default.nix1
-rw-r--r--pkgs/development/libraries/mdds/0.12.1.nix5
-rw-r--r--pkgs/development/libraries/mdds/0.7.1.nix5
-rw-r--r--pkgs/development/libraries/mdds/default.nix5
-rw-r--r--pkgs/development/libraries/mono-addins/default.nix1
-rw-r--r--pkgs/development/libraries/mono-zeroconf/default.nix1
-rw-r--r--pkgs/development/libraries/msilbc/default.nix6
-rw-r--r--pkgs/development/libraries/mythes/default.nix1
15 files changed, 40 insertions, 21 deletions
diff --git a/pkgs/development/libraries/libsigcxx/1.2.nix b/pkgs/development/libraries/libsigcxx/1.2.nix
index 38e5ffcb4de0..fa27a80e22ed 100644
--- a/pkgs/development/libraries/libsigcxx/1.2.nix
+++ b/pkgs/development/libraries/libsigcxx/1.2.nix
@@ -11,10 +11,11 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ pkgconfig ];
   buildInputs = [ m4];
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = https://libsigcplusplus.github.io/libsigcplusplus/;
     description = "A typesafe callback system for standard C++";
     branch = "1.2";
-    platforms = stdenv.lib.platforms.unix;
+    platforms = platforms.unix;
+    license = licenses.lgpl3;
   };
 }
diff --git a/pkgs/development/libraries/libuv/default.nix b/pkgs/development/libraries/libuv/default.nix
index e608ea300d1a..68c35c49ef37 100644
--- a/pkgs/development/libraries/libuv/default.nix
+++ b/pkgs/development/libraries/libuv/default.nix
@@ -66,6 +66,7 @@ stdenv.mkDerivation rec {
     homepage    = https://github.com/libuv/libuv;
     maintainers = with maintainers; [ cstrahan ];
     platforms   = with platforms; linux ++ darwin;
+    license     = with licenses; [ mit isc bsd2 bsd3 cc-by-40 ];
   };
 
 }
diff --git a/pkgs/development/libraries/libwmf/default.nix b/pkgs/development/libraries/libwmf/default.nix
index eed0c77af804..bf685862adf1 100644
--- a/pkgs/development/libraries/libwmf/default.nix
+++ b/pkgs/development/libraries/libwmf/default.nix
@@ -22,8 +22,10 @@ stdenv.mkDerivation {
     })
   ];
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "WMF library from wvWare";
-    platforms = stdenv.lib.platforms.unix;
+    homepage = http://wvware.sourceforge.net/libwmf.html;
+    license = licenses.gpl2;
+    platforms = platforms.unix;
   };
 }
diff --git a/pkgs/development/libraries/libwpd/0.8.nix b/pkgs/development/libraries/libwpd/0.8.nix
index 49012f8bddf8..736b1a45fa20 100644
--- a/pkgs/development/libraries/libwpd/0.8.nix
+++ b/pkgs/development/libraries/libwpd/0.8.nix
@@ -2,19 +2,22 @@
 
 stdenv.mkDerivation rec {
   name = "libwpd-0.8.14";
-  
+
   src = fetchurl {
     url = "mirror://sourceforge/libwpd/${name}.tar.gz";
     sha256 = "1syli6i5ma10cwzpa61a18pyjmianjwsf6pvmvzsh5md6yk4yx01";
   };
-  
+
   patches = [ ./gcc-0.8.patch ];
 
   buildInputs = [ glib libgsf libxml2 ];
 
   nativeBuildInputs = [ pkgconfig bzip2 ];
 
-  meta = {
-    platforms = stdenv.lib.platforms.unix;
+  meta = with stdenv.lib; {
+    description = "Library for importing WordPerfect documents";
+    homepage = http://libwpd.sourceforge.net;
+    license = with licenses; [ lgpl21 mpl20 ];
+    platforms = platforms.unix;
   };
 }
diff --git a/pkgs/development/libraries/libwpg/default.nix b/pkgs/development/libraries/libwpg/default.nix
index 9d262910e14f..99808be2b216 100644
--- a/pkgs/development/libraries/libwpg/default.nix
+++ b/pkgs/development/libraries/libwpg/default.nix
@@ -11,10 +11,10 @@ stdenv.mkDerivation rec {
   buildInputs = [ libwpd zlib librevenge ];
   nativeBuildInputs = [ pkgconfig ];
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = http://libwpg.sourceforge.net;
     description = "C++ library to parse WPG";
-    maintainers = [ ];
-    platforms = stdenv.lib.platforms.all;
+    license = with licenses; [ lgpl21 mpl20 ];
+    platforms = platforms.all;
   };
 }
diff --git a/pkgs/development/libraries/log4shib/default.nix b/pkgs/development/libraries/log4shib/default.nix
index 7b672aebe445..b2fba7df509b 100644
--- a/pkgs/development/libraries/log4shib/default.nix
+++ b/pkgs/development/libraries/log4shib/default.nix
@@ -15,5 +15,7 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     description = "A forked version of log4cpp that has been created for the Shibboleth project";
     maintainers = [ maintainers.jammerful ];
+    license = licenses.lgpl21;
+    homepage = http://log4cpp.sf.net;
   };
 }
diff --git a/pkgs/development/libraries/loudmouth/default.nix b/pkgs/development/libraries/loudmouth/default.nix
index aecd75656dae..cad5d0d7ecad 100644
--- a/pkgs/development/libraries/loudmouth/default.nix
+++ b/pkgs/development/libraries/loudmouth/default.nix
@@ -18,11 +18,12 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ pkgconfig ];
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "A lightweight C library for the Jabber protocol";
-    platforms = stdenv.lib.platforms.linux;
+    platforms = platforms.linux;
     downloadPage = "http://mcabber.com/files/loudmouth/";
     downloadURLRegexp = "loudmouth-[0-9.]+[.]tar[.]bz2$";
     updateWalker = true;
+    license = licenses.lgpl21;
   };
 }
diff --git a/pkgs/development/libraries/martyr/default.nix b/pkgs/development/libraries/martyr/default.nix
index 3b6102715391..064f04f220cd 100644
--- a/pkgs/development/libraries/martyr/default.nix
+++ b/pkgs/development/libraries/martyr/default.nix
@@ -20,5 +20,6 @@ stdenv.mkDerivation rec {
   meta = {
     description = "Martyr is a Java framework around the IRC protocol to allow application writers easy manipulation of the protocol and client state";
     homepage = http://martyr.sourceforge.net/;
+    license = stdenv.lib.licenses.lgpl21;
   };
 }
diff --git a/pkgs/development/libraries/mdds/0.12.1.nix b/pkgs/development/libraries/mdds/0.12.1.nix
index 11bd437d377e..e1dd7586f921 100644
--- a/pkgs/development/libraries/mdds/0.12.1.nix
+++ b/pkgs/development/libraries/mdds/0.12.1.nix
@@ -9,9 +9,10 @@ stdenv.mkDerivation rec {
     sha256 = "0gg8mb9kxh3wggh7njj1gf90xy27p0yq2cw88wqar9hhg2fmwmi3";
   };
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = https://gitlab.com/mdds/mdds;
     description = "A collection of multi-dimensional data structure and indexing algorithm";
-    platforms = stdenv.lib.platforms.all;
+    platforms = platforms.all;
+    license = licenses.mit;
   };
 }
diff --git a/pkgs/development/libraries/mdds/0.7.1.nix b/pkgs/development/libraries/mdds/0.7.1.nix
index 8ff1d6d5e9a2..2b61668d5c67 100644
--- a/pkgs/development/libraries/mdds/0.7.1.nix
+++ b/pkgs/development/libraries/mdds/0.7.1.nix
@@ -9,9 +9,10 @@ stdenv.mkDerivation rec {
     sha256 = "0zhrx7m04pknc8i2cialmbna1hmwa0fzs8qphan4rdxibf0c4yzy";
   };
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = https://gitlab.com/mdds/mdds/;
     description = "A collection of multi-dimensional data structure and indexing algorithm";
-    platforms = stdenv.lib.platforms.all;
+    platforms = platforms.all;
+    license = licenses.mit;
   };
 }
diff --git a/pkgs/development/libraries/mdds/default.nix b/pkgs/development/libraries/mdds/default.nix
index 43fee9ccead8..3b0a0441cc4e 100644
--- a/pkgs/development/libraries/mdds/default.nix
+++ b/pkgs/development/libraries/mdds/default.nix
@@ -16,10 +16,11 @@ stdenv.mkDerivation rec {
 
   checkInputs = [ boost ];
 
-  meta = {
+  meta = with stdenv.lib; {
     inherit version;
     homepage = https://gitlab.com/mdds/mdds;
     description = "A collection of multi-dimensional data structure and indexing algorithm";
-    platforms = stdenv.lib.platforms.all;
+    platforms = platforms.all;
+    license = licenses.mit;
   };
 }
diff --git a/pkgs/development/libraries/mono-addins/default.nix b/pkgs/development/libraries/mono-addins/default.nix
index 345c6e51f0b7..ca72557242f1 100644
--- a/pkgs/development/libraries/mono-addins/default.nix
+++ b/pkgs/development/libraries/mono-addins/default.nix
@@ -27,5 +27,6 @@ stdenv.mkDerivation rec {
       and for creating libraries which extend those applications.
     '';
     platforms = platforms.linux;
+    license = licenses.mit;
   };
 }
diff --git a/pkgs/development/libraries/mono-zeroconf/default.nix b/pkgs/development/libraries/mono-zeroconf/default.nix
index d96f90b4bfd6..37195d385627 100644
--- a/pkgs/development/libraries/mono-zeroconf/default.nix
+++ b/pkgs/development/libraries/mono-zeroconf/default.nix
@@ -20,5 +20,6 @@ stdenv.mkDerivation rec {
     description = "A cross platform Zero Configuration Networking library for Mono and .NET";
     homepage = http://www.mono-project.com/archived/monozeroconf/;
     platforms = platforms.linux;
+    license = licenses.mit;
   };
 }
diff --git a/pkgs/development/libraries/msilbc/default.nix b/pkgs/development/libraries/msilbc/default.nix
index cfb02ddbf9dd..601e70427a13 100644
--- a/pkgs/development/libraries/msilbc/default.nix
+++ b/pkgs/development/libraries/msilbc/default.nix
@@ -16,7 +16,9 @@ stdenv.mkDerivation rec {
     "MEDIASTREAMER_LIBS=mediastreamer" "MEDIASTREAMER_CFLAGS=-I${mediastreamer}/include"
   ];
 
-  meta = {
-    platforms = stdenv.lib.platforms.linux;
+  meta = with stdenv.lib; {
+    description = "Mediastreamer plugin for the iLBC audio codec";
+    platforms = platforms.linux;
+    license = licenses.gpl2;
   };
 }
diff --git a/pkgs/development/libraries/mythes/default.nix b/pkgs/development/libraries/mythes/default.nix
index dd40a3962449..28888e551ef6 100644
--- a/pkgs/development/libraries/mythes/default.nix
+++ b/pkgs/development/libraries/mythes/default.nix
@@ -14,6 +14,7 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = http://hunspell.sourceforge.net/;
     description = "Thesaurus library from Hunspell project";
+    license = stdenv.lib.licenses.bsd3;
     inherit (hunspell.meta) platforms;
   };
 }