summary refs log tree commit diff
diff options
context:
space:
mode:
authorxeji <36407913+xeji@users.noreply.github.com>2018-09-01 19:09:40 +0200
committerGitHub <noreply@github.com>2018-09-01 19:09:40 +0200
commit62e3355a91edb1c5ede65291529fd487fc754404 (patch)
treecb9f455d20641d04b8bff3370e98adf3548956fb
parentffcf8dcee79200ac0d19b2b479f42a64f17ec631 (diff)
parent0c0656bcdceea0e86316aa386197a275fa6b8ca9 (diff)
downloadnixlib-62e3355a91edb1c5ede65291529fd487fc754404.tar
nixlib-62e3355a91edb1c5ede65291529fd487fc754404.tar.gz
nixlib-62e3355a91edb1c5ede65291529fd487fc754404.tar.bz2
nixlib-62e3355a91edb1c5ede65291529fd487fc754404.tar.lz
nixlib-62e3355a91edb1c5ede65291529fd487fc754404.tar.xz
nixlib-62e3355a91edb1c5ede65291529fd487fc754404.tar.zst
nixlib-62e3355a91edb1c5ede65291529fd487fc754404.zip
Merge pull request #45909 from markuskowa/licenses-12
Add licenses
-rw-r--r--pkgs/applications/altcoins/ethabi.nix5
-rw-r--r--pkgs/applications/altcoins/ethrun.nix5
-rw-r--r--pkgs/applications/audio/axoloti/libusb1.nix6
-rw-r--r--pkgs/applications/audio/distrho/default.nix1
-rw-r--r--pkgs/applications/audio/lastfmsubmitd/default.nix3
-rw-r--r--pkgs/applications/graphics/k3d/default.nix9
-rw-r--r--pkgs/applications/misc/golden-cheetah/default.nix7
-rw-r--r--pkgs/applications/misc/goldendict/default.nix8
-rw-r--r--pkgs/applications/misc/gphoto2/gphotofs.nix10
-rw-r--r--pkgs/applications/misc/gxneur/default.nix5
-rw-r--r--pkgs/applications/misc/krename/default.nix1
-rw-r--r--pkgs/applications/misc/mop/default.nix5
-rw-r--r--pkgs/applications/misc/nut/default.nix7
-rw-r--r--pkgs/applications/misc/pdf-quench/default.nix1
-rw-r--r--pkgs/applications/misc/posterazor/default.nix7
-rw-r--r--pkgs/applications/misc/terminal-notifier/default.nix4
-rw-r--r--pkgs/applications/misc/wordnet/default.nix5
-rw-r--r--pkgs/applications/misc/xautoclick/default.nix7
-rw-r--r--pkgs/applications/misc/xchm/default.nix5
-rw-r--r--pkgs/applications/misc/xpdf/default.nix10
20 files changed, 65 insertions, 46 deletions
diff --git a/pkgs/applications/altcoins/ethabi.nix b/pkgs/applications/altcoins/ethabi.nix
index 81b4cb52948f..d0bc700eb70f 100644
--- a/pkgs/applications/altcoins/ethabi.nix
+++ b/pkgs/applications/altcoins/ethabi.nix
@@ -17,10 +17,11 @@ buildRustPackage rec {
 
   cargoBuildFlags = ["--features cli"];
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "Ethereum function call encoding (ABI) utility";
     homepage = https://github.com/ethcore/ethabi/;
-    maintainers = [stdenv.lib.maintainers.dbrock];
+    maintainers = [ maintainers.dbrock ];
+    license = licenses.gpl3;
     inherit version;
   };
 }
diff --git a/pkgs/applications/altcoins/ethrun.nix b/pkgs/applications/altcoins/ethrun.nix
index 2a8c37610dba..c58d9d8faf48 100644
--- a/pkgs/applications/altcoins/ethrun.nix
+++ b/pkgs/applications/altcoins/ethrun.nix
@@ -15,10 +15,11 @@ buildRustPackage rec {
 
   cargoSha256 = "14x8pbjgkz0g724lnvd9mi2alqd6fipjljw6xsraf9gqwijn1kn0";
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "Directly run Ethereum bytecode";
     homepage = https://github.com/dapphub/ethrun/;
-    maintainers = [stdenv.lib.maintainers.dbrock];
+    maintainers = [ maintainers.dbrock ];
+    license = licenses.gpl3;
     broken = true; # mark temporary as broken
     inherit version;
   };
diff --git a/pkgs/applications/audio/axoloti/libusb1.nix b/pkgs/applications/audio/axoloti/libusb1.nix
index cf71c006046e..1a6ebd346cca 100644
--- a/pkgs/applications/audio/axoloti/libusb1.nix
+++ b/pkgs/applications/audio/axoloti/libusb1.nix
@@ -29,10 +29,10 @@ stdenv.mkDerivation rec {
     sed 's,-ludev,-L${systemd.lib}/lib -ludev,' -i $out/lib/libusb-1.0.la
   '';
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = http://www.libusb.info;
     description = "User-space USB library";
-    platforms = stdenv.lib.platforms.unix;
-    maintainers = [ ];
+    platforms = platforms.unix;
+    license = licenses.lgpl21;
   };
 }
diff --git a/pkgs/applications/audio/distrho/default.nix b/pkgs/applications/audio/distrho/default.nix
index 5885e0f73f53..bf79b68bc7db 100644
--- a/pkgs/applications/audio/distrho/default.nix
+++ b/pkgs/applications/audio/distrho/default.nix
@@ -46,6 +46,7 @@ stdenv.mkDerivation rec {
       TAL-Filter-2 TAL-NoiseMaker TAL-Reverb TAL-Reverb-2 TAL-Reverb-3
       TAL-Vocoder-2 TheFunction ThePilgrim Vex Wolpertinger
     '';
+    license = with licenses; [ gpl2 gpl3 gpl2Plus lgpl3 mit ];
     maintainers = [ maintainers.goibhniu ];
     platforms = [ "x86_64-linux" ];
   };
diff --git a/pkgs/applications/audio/lastfmsubmitd/default.nix b/pkgs/applications/audio/lastfmsubmitd/default.nix
index e22bca29bc97..3135a00334c7 100644
--- a/pkgs/applications/audio/lastfmsubmitd/default.nix
+++ b/pkgs/applications/audio/lastfmsubmitd/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, pythonPackages }:
+{ lib, fetchurl, pythonPackages }:
 
 pythonPackages.buildPythonApplication rec {
   pname = "lastfmsubmitd";
@@ -15,6 +15,7 @@ pythonPackages.buildPythonApplication rec {
 
   meta = {
     homepage = https://www.red-bean.com/decklin/lastfmsubmitd/;
+    license = lib.licenses.mit;
     description = "An last.fm audio scrobbler and daemon";
   };
 }
diff --git a/pkgs/applications/graphics/k3d/default.nix b/pkgs/applications/graphics/k3d/default.nix
index 3555c2b477ff..a4b509704a7f 100644
--- a/pkgs/applications/graphics/k3d/default.nix
+++ b/pkgs/applications/graphics/k3d/default.nix
@@ -39,12 +39,11 @@ stdenv.mkDerivation rec {
 
   #doCheck = false;
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "A 3D editor with support for procedural editing";
     homepage = http://www.k-3d.org/;
-    platforms = with stdenv.lib.platforms;
-      linux;
-    maintainers = with stdenv.lib.maintainers;
-      [raskin];
+    platforms = platforms.linux;
+    maintainers = [ maintainers.raskin ];
+    license = licenses.gpl2;
   };
 }
diff --git a/pkgs/applications/misc/golden-cheetah/default.nix b/pkgs/applications/misc/golden-cheetah/default.nix
index f62eb92ac04a..eecc34b3d94f 100644
--- a/pkgs/applications/misc/golden-cheetah/default.nix
+++ b/pkgs/applications/misc/golden-cheetah/default.nix
@@ -34,9 +34,10 @@ stdenv.mkDerivation rec {
   # RCC: Error in 'Resources/application.qrc': Cannot find file 'translations/gc_fr.qm'
   enableParallelBuilding = false;
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "Performance software for cyclists, runners and triathletes";
-    platforms = stdenv.lib.platforms.linux;
-    maintainers = [ stdenv.lib.maintainers.ocharles ];
+    platforms = platforms.linux;
+    maintainers = [ maintainers.ocharles ];
+    license = licenses.gpl3;
   };
 }
diff --git a/pkgs/applications/misc/goldendict/default.nix b/pkgs/applications/misc/goldendict/default.nix
index 5cb51eefe5d7..42d5d83f7bdb 100644
--- a/pkgs/applications/misc/goldendict/default.nix
+++ b/pkgs/applications/misc/goldendict/default.nix
@@ -19,11 +19,11 @@ stdenv.mkDerivation rec {
 
   qmakeFlags = [ "CONFIG+=zim_support" ];
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = http://goldendict.org/;
     description = "A feature-rich dictionary lookup program";
-
-    platforms = stdenv.lib.platforms.linux;
-    maintainers = with stdenv.lib.maintainers; [ gebner astsmtl ];
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ gebner astsmtl ];
+    license = licenses.gpl3Plus;
   };
 }
diff --git a/pkgs/applications/misc/gphoto2/gphotofs.nix b/pkgs/applications/misc/gphoto2/gphotofs.nix
index 6fa11667cf33..7b23fca2121e 100644
--- a/pkgs/applications/misc/gphoto2/gphotofs.nix
+++ b/pkgs/applications/misc/gphoto2/gphotofs.nix
@@ -13,11 +13,11 @@ stdenv.mkDerivation rec {
     libgphoto2 fuse glib libtool
   ];
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "Fuse FS to mount a digital camera";
-    maintainers = [
-      stdenv.lib.maintainers.raskin
-    ];
-    platforms = stdenv.lib.platforms.linux;
+    homepage = http://www.gphoto.org/;
+    maintainers = [ maintainers.raskin ];
+    platforms = platforms.linux;
+    license = with licenses; [ lgpl2 gpl2 ];
   };
 }
diff --git a/pkgs/applications/misc/gxneur/default.nix b/pkgs/applications/misc/gxneur/default.nix
index ec041902b256..9def56aa98c1 100644
--- a/pkgs/applications/misc/gxneur/default.nix
+++ b/pkgs/applications/misc/gxneur/default.nix
@@ -14,8 +14,9 @@ stdenv.mkDerivation {
     libglade GConf pcre libappindicator-gtk2
   ];
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "GUI for XNEUR keyboard layout switcher";
-    platforms = stdenv.lib.platforms.linux;
+    platforms = platforms.linux;
+    license = with licenses; [ gpl2 gpl3 ];
   };
 }
diff --git a/pkgs/applications/misc/krename/default.nix b/pkgs/applications/misc/krename/default.nix
index a0a2776ae360..52233ad2f2f4 100644
--- a/pkgs/applications/misc/krename/default.nix
+++ b/pkgs/applications/misc/krename/default.nix
@@ -20,6 +20,7 @@ in mkDerivation rec {
   meta = with lib; {
     homepage = http://www.krename.net;
     description = "A powerful batch renamer for KDE";
+    license = licenses.gpl2;
     inherit (kconfig.meta) platforms;
     maintainers = with maintainers; [ peterhoeg ];
   };
diff --git a/pkgs/applications/misc/mop/default.nix b/pkgs/applications/misc/mop/default.nix
index 8c6bd92d5362..b9179bbe5463 100644
--- a/pkgs/applications/misc/mop/default.nix
+++ b/pkgs/applications/misc/mop/default.nix
@@ -22,9 +22,10 @@ buildGoPackage rec {
     sha256 = "0zp51g9i8rw6acs4vnrxclbxa5z1v0a0m1xx27szszp0rphcczkx";
   };
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "Simple stock tracker implemented in go";
     homepage =  https://github.com/mop-tracker/mop;
-    platforms = stdenv.lib.platforms.all;
+    license = licenses.mit;
+    platforms = platforms.all;
   };
 }
diff --git a/pkgs/applications/misc/nut/default.nix b/pkgs/applications/misc/nut/default.nix
index 4d53203ccd4d..816918ca0638 100644
--- a/pkgs/applications/misc/nut/default.nix
+++ b/pkgs/applications/misc/nut/default.nix
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
       "$out/lib:${neon}/lib:${libusb.out}/lib:${avahi}/lib:${freeipmi}/lib"
   '';
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "Network UPS Tools";
     longDescription = ''
       Network UPS Tools is a collection of programs which provide a common
@@ -41,8 +41,9 @@ stdenv.mkDerivation rec {
     '';
     homepage = http://www.networkupstools.org/;
     repositories.git = https://github.com/networkupstools/nut.git;
-    platforms = with stdenv.lib.platforms; linux;
-    maintainers = with stdenv.lib.maintainers; [ pierron ];
+    platforms = platforms.linux;
+    maintainers = [ maintainers.pierron ];
+    license = with licenses; [ gpl1Plus gpl2Plus gpl3Plus ];
     priority = 10;
   };
 }
diff --git a/pkgs/applications/misc/pdf-quench/default.nix b/pkgs/applications/misc/pdf-quench/default.nix
index c567a7903b81..0829c4f91ccc 100644
--- a/pkgs/applications/misc/pdf-quench/default.nix
+++ b/pkgs/applications/misc/pdf-quench/default.nix
@@ -31,6 +31,7 @@ pythonPackages.buildPythonApplication rec {
     homepage = https://github.com/linuxerwang/pdf-quench;
     description = "A visual tool for cropping pdf files";
     platforms = platforms.linux;
+    license = licenses.gpl2;
     maintainers = with maintainers; [ flokli ];
   };
 }
diff --git a/pkgs/applications/misc/posterazor/default.nix b/pkgs/applications/misc/posterazor/default.nix
index 6cb00fb1525c..45db856dbb9e 100644
--- a/pkgs/applications/misc/posterazor/default.nix
+++ b/pkgs/applications/misc/posterazor/default.nix
@@ -28,10 +28,11 @@ stdenv.mkDerivation rec {
     cp PosteRazor $out/bin
   '';
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = http://posterazor.sourceforge.net/;
     description = "Cuts a raster image into pieces which can afterwards be printed out and assembled to a poster";
-    maintainers = [ stdenv.lib.maintainers.madjar ];
-    platforms = stdenv.lib.platforms.linux;
+    maintainers = [ maintainers.madjar ];
+    license = licenses.gpl3Plus;
+    platforms = platforms.linux;
   };
 }
diff --git a/pkgs/applications/misc/terminal-notifier/default.nix b/pkgs/applications/misc/terminal-notifier/default.nix
index c838eca50659..b05c8a803996 100644
--- a/pkgs/applications/misc/terminal-notifier/default.nix
+++ b/pkgs/applications/misc/terminal-notifier/default.nix
@@ -27,6 +27,8 @@ stdenv.mkDerivation rec {
 
   meta = with lib; {
     maintainers = with maintainers; [ cstrahan ];
-    platforms   = platforms.darwin;
+    homepage = https://github.com/julienXX/terminal-notifier;
+    license = licenses.mit;
+    platforms  = platforms.darwin;
   };
 }
diff --git a/pkgs/applications/misc/wordnet/default.nix b/pkgs/applications/misc/wordnet/default.nix
index a2e3fa13fc6a..5d153a0e417f 100644
--- a/pkgs/applications/misc/wordnet/default.nix
+++ b/pkgs/applications/misc/wordnet/default.nix
@@ -42,7 +42,10 @@ stdenv.mkDerivation rec {
       '';
 
     homepage = https://wordnet.princeton.edu/;
-
+    license = {
+      fullName = "WordNet 3.0 license";
+      url = https://wordnet.princeton.edu/license-and-commercial-use;
+    };
     maintainers = [ ];
     platforms = with stdenv.lib.platforms; linux ++ darwin;
   };
diff --git a/pkgs/applications/misc/xautoclick/default.nix b/pkgs/applications/misc/xautoclick/default.nix
index bb18da4d4ada..045354da3d60 100644
--- a/pkgs/applications/misc/xautoclick/default.nix
+++ b/pkgs/applications/misc/xautoclick/default.nix
@@ -23,7 +23,10 @@ stdenv.mkDerivation rec {
     addToSearchPath PATH .bin
   '';
 
-  meta = {
-    platforms = stdenv.lib.platforms.linux;
+  meta = with stdenv.lib; {
+    description = "Autoclicker application, which enables you to automatically click the left mousebutton";
+    homepage = http://xautoclick.sourceforge.net;
+    license = licenses.gpl2;
+    platforms = platforms.linux;
   };
 }
diff --git a/pkgs/applications/misc/xchm/default.nix b/pkgs/applications/misc/xchm/default.nix
index 74c9c807b81e..a7a6500fd22a 100644
--- a/pkgs/applications/misc/xchm/default.nix
+++ b/pkgs/applications/misc/xchm/default.nix
@@ -13,9 +13,10 @@ stdenv.mkDerivation {
     echo $NIX_LDFLAGS
   '';
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "A viewer for Microsoft HTML Help files";
     homepage = http://xchm.sourceforge.net;
-    platforms = stdenv.lib.platforms.linux;
+    license = licenses.gpl2;
+    platforms = platforms.linux;
   };
 }
diff --git a/pkgs/applications/misc/xpdf/default.nix b/pkgs/applications/misc/xpdf/default.nix
index 3cb416a5f7cb..7e0369b277d3 100644
--- a/pkgs/applications/misc/xpdf/default.nix
+++ b/pkgs/applications/misc/xpdf/default.nix
@@ -41,11 +41,11 @@ stdenv.mkDerivation {
       --set QT_PLUGIN_PATH ${qtbase.bin}/${qtbase.qtPluginPrefix}:${qtsvg.bin}/${qtbase.qtPluginPrefix}
   '';
 
-  meta = {
-    homepage = http://www.foolabs.com/xpdf/;
+  meta = with stdenv.lib; {
+    homepage = https://www.xpdfreader.com;
     description = "Viewer for Portable Document Format (PDF) files";
-
-    platforms = stdenv.lib.platforms.unix;
-    maintainers = [ stdenv.lib.maintainers.peti ];
+    license = with licenses; [ gpl2 gpl3 ];
+    platforms = platforms.unix;
+    maintainers = [ maintainers.peti ];
   };
 }