From 9710439e3dfca79c3ce80ebdee72c303b7a4dc4a Mon Sep 17 00:00:00 2001
From: Eric Litak <elitak@gmail.com>
Date: Tue, 22 May 2018 10:43:15 -0700
Subject: betaflight: 3.2.3 -> 3.4.0-rc4

---
 pkgs/development/misc/stm32/betaflight/default.nix | 25 +++++++++++-----------
 1 file changed, 12 insertions(+), 13 deletions(-)

diff --git a/pkgs/development/misc/stm32/betaflight/default.nix b/pkgs/development/misc/stm32/betaflight/default.nix
index 8d4d0d7f4a2b..0c601c7773cc 100644
--- a/pkgs/development/misc/stm32/betaflight/default.nix
+++ b/pkgs/development/misc/stm32/betaflight/default.nix
@@ -1,18 +1,17 @@
 { stdenv, fetchFromGitHub
 , gcc-arm-embedded, python2
 , skipTargets ? [
-  # These targets do not build for various unexplored reasons
-  # TODO ... fix them
-  "AFROMINI"
-  "ALIENWHOOP"
-  "BEEBRAIN"
-  "CJMCU"
-  "FRSKYF3"
+  # These targets do not build, for the reasons listed, along with the last version checked.
+  # Probably all of the issues with these targets need to be addressed upstream.
+  "AG3X"       # 3.4.0-rc4: has not specified a valid STM group, must be one of F1, F3, F405, F411 or F7x5. Have you prepared a valid target.mk?
+  "ALIENWHOOP" # 3.4.0-rc4: has not specified a valid STM group, must be one of F1, F3, F405, F411 or F7x5. Have you prepared a valid target.mk?
+  "FURYF3"     # 3.4.0-rc4: flash region overflow
+  "OMNINXT"    # 3.4.0-rc4: has not specified a valid STM group, must be one of F1, F3, F405, F411 or F7x5. Have you prepared a valid target.mk?
 ]}:
 
 let
 
-  version = "3.2.3";
+  version = "3.4.0-rc4";
 
 in stdenv.mkDerivation rec {
 
@@ -21,8 +20,8 @@ in stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "betaflight";
     repo = "betaflight";
-    rev = "v${version}";
-    sha256 = "0vbjyxfjxgpaiiwvj5bscrlfikzp3wnxpmc4sxcz5yw5mwb9g428";
+    rev = "8e9e7574481b1abba9354b24f41eb31054943785"; # Always use a commit id here!
+    sha256 = "1wyp23p876xbfi9z6gm4xn1nwss3myvrjjjq9pd3s0vf5gkclkg5";
   };
 
   buildInputs = [
@@ -31,7 +30,7 @@ in stdenv.mkDerivation rec {
   ];
 
   postPatch = ''
-    sed -ri "s/REVISION.*=.*git log.*/REVISION = ${builtins.substring 0 9 src.rev}/" Makefile # Let's not require git in shell
+    sed -ri "s/REVISION.*=.*git log.*/REVISION = ${builtins.substring 0 10 src.rev}/" Makefile # Simulate abbrev'd rev.
     sed -ri "s/binary hex/hex/" Makefile # No need for anything besides .hex
   '';
 
@@ -39,7 +38,7 @@ in stdenv.mkDerivation rec {
 
   preBuild = ''
     buildFlagsArray=(
-      "SKIP_TARGETS=${toString skipTargets}"
+      "NOBUILD_TARGETS=${toString skipTargets}"
       "GCC_REQUIRED_VERSION=$(arm-none-eabi-gcc -dumpversion)"
       all
     )
@@ -59,7 +58,7 @@ in stdenv.mkDerivation rec {
     homepage = https://github.com/betaflight/betaflight;
     license = licenses.gpl3;
     maintainers = with maintainers; [ elitak ];
-    platforms = platforms.linux;
+    platforms = [ "i686-linux" "x86_64-linux" ];
   };
 
 }
-- 
cgit v1.2.3


From fd004d9f08d10c33fc651d5e6e071663598b6504 Mon Sep 17 00:00:00 2001
From: Eric Litak <elitak@gmail.com>
Date: Tue, 22 May 2018 09:51:19 -0700
Subject: inav: init at 2.0.0-rc2

---
 pkgs/development/misc/stm32/inav/default.nix | 56 ++++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix              |  2 +
 2 files changed, 58 insertions(+)
 create mode 100644 pkgs/development/misc/stm32/inav/default.nix

diff --git a/pkgs/development/misc/stm32/inav/default.nix b/pkgs/development/misc/stm32/inav/default.nix
new file mode 100644
index 000000000000..cb9cc80d3252
--- /dev/null
+++ b/pkgs/development/misc/stm32/inav/default.nix
@@ -0,0 +1,56 @@
+{ stdenv, fetchFromGitHub
+, gcc-arm-embedded, ruby
+}:
+
+let
+
+  version = "2.0.0-rc2";
+
+in stdenv.mkDerivation rec {
+
+  name = "inav-${version}";
+
+  src = fetchFromGitHub {
+    owner = "iNavFlight";
+    repo = "inav";
+    rev = "a8415e89c2956d133d8175827c079bcf3bc3766c"; # Always use a commit id here!
+    sha256 = "15zai8qf43b06fmws1sbkmdgip51zp7gkfj7pp9b6gi8giarzq3y";
+  };
+
+  buildInputs = [
+    gcc-arm-embedded
+    ruby
+  ];
+
+  postPatch = ''
+    sed -ri "s/REVISION.*=.*shell git.*/REVISION = ${builtins.substring 0 10 src.rev}/" Makefile # Simulate abbrev'd rev.
+    sed -ri "s/-j *[0-9]+//" Makefile # Eliminate parallel build args in submakes
+    sed -ri "s/binary hex/hex/" Makefile # No need for anything besides .hex
+  '';
+
+  enableParallelBuilding = true;
+
+  preBuild = ''
+    buildFlagsArray=(
+      all
+    )
+  '';
+
+  installPhase = ''
+    runHook preInstall
+
+    mkdir -p $out
+    cp obj/*.hex $out
+
+    runHook postInstall
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Navigation-enabled flight control software";
+    homepage = https://inavflight.github.io;
+    license = licenses.gpl3;
+    maintainers = with maintainers; [ elitak ];
+    platforms = [ "i686-linux" "x86_64-linux" ];
+  };
+
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6b1219690d7f..e24d3c04fa80 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7688,6 +7688,8 @@ with pkgs;
     guile = guile_2_0;
   };
 
+  inav = callPackage ../development/misc/stm32/inav { };
+
   pharo-vms = callPackage ../development/pharo/vm { };
   pharo = pharo-vms.multi-vm-wrapper;
   pharo-cog32 = pharo-vms.cog32;
-- 
cgit v1.2.3


From 56e5eb94c7a53a27d8a36eaf967f4b9fc35c4b12 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Thu, 2 Aug 2018 16:02:56 +0200
Subject: xmlroff: add license

see issue #43716
---
 pkgs/tools/typesetting/xmlroff/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/tools/typesetting/xmlroff/default.nix b/pkgs/tools/typesetting/xmlroff/default.nix
index 2177937221a1..f8b0ddbfac56 100644
--- a/pkgs/tools/typesetting/xmlroff/default.nix
+++ b/pkgs/tools/typesetting/xmlroff/default.nix
@@ -41,5 +41,6 @@ stdenv.mkDerivation rec {
 
   meta = {
     platforms = stdenv.lib.platforms.unix;
+    license = stdenv.lib.licenses.bsd3;
   };
 }
-- 
cgit v1.2.3


From cf7227a56277cdc674139b67a3c11a182e3f5b1c Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Thu, 2 Aug 2018 16:04:32 +0200
Subject: xmacro: add license

see issue #43716
---
 pkgs/tools/X11/xmacro/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/tools/X11/xmacro/default.nix b/pkgs/tools/X11/xmacro/default.nix
index e986b46aa487..fee601d15750 100644
--- a/pkgs/tools/X11/xmacro/default.nix
+++ b/pkgs/tools/X11/xmacro/default.nix
@@ -15,5 +15,6 @@ stdenv.mkDerivation rec {
 
   meta = {
     platforms = stdenv.lib.platforms.linux;
+    license = stdenv.lib.licenses.gpl2;
   };
 }
-- 
cgit v1.2.3


From 750fae6539ee888ce6f4f9e1b2681972eddd63a3 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Thu, 2 Aug 2018 16:07:30 +0200
Subject: xlsfonts: add license

see issue #43716
---
 pkgs/servers/x11/xorg/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index cc28dc73ca87..26865ebb9426 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -2526,6 +2526,7 @@ let
     nativeBuildInputs = [ pkgconfig ];
     buildInputs = [ libX11 xproto ];
     meta.platforms = stdenv.lib.platforms.unix;
+    meta.license = stdenv.lib.licenses.mit;
   }) // {inherit libX11 xproto ;};
 
   xmag = (mkDerivation "xmag" {
-- 
cgit v1.2.3


From b386e902888fa932705a96756d903db9a1a4e863 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Thu, 2 Aug 2018 16:09:09 +0200
Subject: xmove: add license

see issue #43716
---
 pkgs/applications/misc/xmove/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/applications/misc/xmove/default.nix b/pkgs/applications/misc/xmove/default.nix
index 32729d57475f..e461a2c8816a 100644
--- a/pkgs/applications/misc/xmove/default.nix
+++ b/pkgs/applications/misc/xmove/default.nix
@@ -14,5 +14,6 @@ stdenv.mkDerivation {
 
   meta = {
     platforms = stdenv.lib.platforms.linux;
+    license = stdenv.lib.licenses.mit;
   };
 }
-- 
cgit v1.2.3


From 274f091b9531bb1efc446c3f05be91d5ebca372f Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Thu, 2 Aug 2018 16:36:57 +0200
Subject: wv: add license

see issue #43716
---
 pkgs/tools/misc/wv/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/tools/misc/wv/default.nix b/pkgs/tools/misc/wv/default.nix
index 59efcaa18095..f19d448e5fc2 100644
--- a/pkgs/tools/misc/wv/default.nix
+++ b/pkgs/tools/misc/wv/default.nix
@@ -19,5 +19,6 @@ stdenv.mkDerivation rec {
   meta = {
     description = "Converter from Microsoft Word formats to human-editable ones";
     platforms = stdenv.lib.platforms.unix;
+    license = stdenv.lib.licenses.gpl2;
   };
 }
-- 
cgit v1.2.3


From 28808fe6b5602dc44f662e06e83d9da622c584df Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?=
 <robert.schuetz@stud.uni-heidelberg.de>
Date: Fri, 3 Aug 2018 14:16:54 +0200
Subject: python.pkgs.acme: add meta

---
 pkgs/development/python-modules/acme/default.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/development/python-modules/acme/default.nix b/pkgs/development/python-modules/acme/default.nix
index 820ee2a95d81..503c6f796591 100644
--- a/pkgs/development/python-modules/acme/default.nix
+++ b/pkgs/development/python-modules/acme/default.nix
@@ -27,4 +27,8 @@ buildPythonPackage rec {
   checkInputs = [ nose ];
 
   postUnpack = "sourceRoot=\${sourceRoot}/acme";
+
+  meta = certbot.meta // {
+    description = "ACME protocol implementation in Python";
+  };
 }
-- 
cgit v1.2.3


From 433ffc32eaa8de6cbeae8d25e5c20deb041d20cb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?=
 <robert.schuetz@stud.uni-heidelberg.de>
Date: Fri, 3 Aug 2018 14:19:43 +0200
Subject: python.pkgs.amqplib: add license

---
 pkgs/development/python-modules/amqplib/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/python-modules/amqplib/default.nix b/pkgs/development/python-modules/amqplib/default.nix
index 37f1e395d8de..3699fdd5d499 100644
--- a/pkgs/development/python-modules/amqplib/default.nix
+++ b/pkgs/development/python-modules/amqplib/default.nix
@@ -15,5 +15,6 @@ buildPythonPackage rec {
   meta = with stdenv.lib; {
     homepage = http://code.google.com/p/py-amqplib/;
     description = "Python client for the Advanced Message Queuing Procotol (AMQP)";
+    license = licenses.lgpl21;
   };
 }
-- 
cgit v1.2.3


From 88208439ea08ff908a7a09ed08dc18a2ad7ee03c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?=
 <robert.schuetz@stud.uni-heidelberg.de>
Date: Fri, 3 Aug 2018 14:21:52 +0200
Subject: python.pkgs.ansi: add meta

---
 pkgs/development/python-modules/ansi/default.nix | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/ansi/default.nix b/pkgs/development/python-modules/ansi/default.nix
index a79de55d2eb0..77b93ce890e4 100644
--- a/pkgs/development/python-modules/ansi/default.nix
+++ b/pkgs/development/python-modules/ansi/default.nix
@@ -1,4 +1,4 @@
-{ buildPythonPackage, fetchPypi }:
+{ lib, buildPythonPackage, fetchPypi }:
 
 buildPythonPackage rec {
   pname = "ansi";
@@ -12,4 +12,10 @@ buildPythonPackage rec {
   checkPhase = ''
     python -c "import ansi.color"
   '';
+
+  meta = with lib; {
+    description = "ANSI cursor movement and graphics";
+    homepage = https://github.com/tehmaze/ansi/;
+    license = licenses.mit;
+  };
 }
-- 
cgit v1.2.3


From 1ea27eb720a27faa23020d9a92cce0e22b5a9a11 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?=
 <robert.schuetz@stud.uni-heidelberg.de>
Date: Fri, 3 Aug 2018 14:23:41 +0200
Subject: python.pkgs.anyjson: update meta

---
 pkgs/development/python-modules/anyjson/default.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/anyjson/default.nix b/pkgs/development/python-modules/anyjson/default.nix
index 6db4bbdc3148..65476b47f8fd 100644
--- a/pkgs/development/python-modules/anyjson/default.nix
+++ b/pkgs/development/python-modules/anyjson/default.nix
@@ -1,4 +1,4 @@
-{ buildPythonPackage, fetchPypi, isPy3k, nose }:
+{ lib, buildPythonPackage, fetchPypi, isPy3k, nose }:
 
 buildPythonPackage rec {
   pname = "anyjson";
@@ -14,8 +14,9 @@ buildPythonPackage rec {
 
   buildInputs = [ nose ];
 
-  meta = {
-    homepage = https://pypi.python.org/pypi/anyjson/;
+  meta = with lib; {
+    homepage = https://bitbucket.org/runeh/anyjson/;
     description = "Wrapper that selects the best available JSON implementation";
+    license = licenses.bsd2;
   };
 }
-- 
cgit v1.2.3


From c2cf345b4c786554765646e3277b6b06d6569cf8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?=
 <robert.schuetz@stud.uni-heidelberg.de>
Date: Fri, 3 Aug 2018 14:29:14 +0200
Subject: python.pkgs.application: add meta

---
 pkgs/development/python-modules/application/default.nix | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/application/default.nix b/pkgs/development/python-modules/application/default.nix
index 584eb3ae2c52..520e01723e6c 100644
--- a/pkgs/development/python-modules/application/default.nix
+++ b/pkgs/development/python-modules/application/default.nix
@@ -1,4 +1,4 @@
-{ buildPythonPackage, fetchdarcs, zope_interface, isPy3k }:
+{ lib, buildPythonPackage, fetchdarcs, zope_interface, isPy3k }:
 
 buildPythonPackage rec {
   pname = "python-application";
@@ -12,4 +12,10 @@ buildPythonPackage rec {
   };
 
   buildInputs = [ zope_interface ];
+
+  meta = with lib; {
+    description = "Basic building blocks for python applications";
+    homepage = https://github.com/AGProjects/python-application;
+    license = licenses.lgpl2Plus;
+  };
 }
-- 
cgit v1.2.3


From fd08f993f348cabc8cf70a5f2ee09173d5165313 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?=
 <robert.schuetz@stud.uni-heidelberg.de>
Date: Fri, 3 Aug 2018 14:34:41 +0200
Subject: python.pkgs.area53: add meta

---
 pkgs/development/python-modules/area53/default.nix | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/area53/default.nix b/pkgs/development/python-modules/area53/default.nix
index 20013b8a1ed4..cd8e83dbf630 100644
--- a/pkgs/development/python-modules/area53/default.nix
+++ b/pkgs/development/python-modules/area53/default.nix
@@ -1,4 +1,4 @@
-{ buildPythonPackage, fetchPypi
+{ lib, buildPythonPackage, fetchPypi
 , boto }:
 
 buildPythonPackage rec {
@@ -14,4 +14,10 @@ buildPythonPackage rec {
   doCheck = false;
 
   propagatedBuildInputs = [ boto ];
+
+  meta = with lib; {
+    description = "Python Interface to Route53";
+    homepage = https://github.com/mariusv/Area53;
+    license = licenses.unfree; # unspecified
+  };
 }
-- 
cgit v1.2.3


From 0fa1ffd17f0f083ffe76ae23767908e82c3fe5f7 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Sat, 4 Aug 2018 16:04:51 +0200
Subject: xlsfonts: set license in overrides

---
 pkgs/servers/x11/xorg/default.nix   | 1 -
 pkgs/servers/x11/xorg/overrides.nix | 4 ++++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index 26865ebb9426..cc28dc73ca87 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -2526,7 +2526,6 @@ let
     nativeBuildInputs = [ pkgconfig ];
     buildInputs = [ libX11 xproto ];
     meta.platforms = stdenv.lib.platforms.unix;
-    meta.license = stdenv.lib.licenses.mit;
   }) // {inherit libX11 xproto ;};
 
   xmag = (mkDerivation "xmag" {
diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix
index 2438c49d9cb9..d989d17b0325 100644
--- a/pkgs/servers/x11/xorg/overrides.nix
+++ b/pkgs/servers/x11/xorg/overrides.nix
@@ -426,6 +426,10 @@ in
     '';
   };
 
+  xlsfonts = attrs: attrs // {
+    meta = attrs.meta // { license = lib.licenses.mit; };
+  };
+
   xorgserver = with xorg; attrs_passed:
     # exchange attrs if abiCompat is set
     let
-- 
cgit v1.2.3


From 1ab197b9e7f90080acc8fe1bbe43d457e00d4191 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Sat, 4 Aug 2018 16:08:03 +0200
Subject: w3m: add license

see issue #43716
---
 pkgs/applications/networking/browsers/w3m/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/applications/networking/browsers/w3m/default.nix b/pkgs/applications/networking/browsers/w3m/default.nix
index c71ccdf8a0d2..d1561a065269 100644
--- a/pkgs/applications/networking/browsers/w3m/default.nix
+++ b/pkgs/applications/networking/browsers/w3m/default.nix
@@ -76,5 +76,6 @@ stdenv.mkDerivation rec {
     description = "A text-mode web browser";
     maintainers = [ maintainers.cstrahan ];
     platforms = stdenv.lib.platforms.unix;
+    license = stdenv.lib.licenses.mit;
   };
 }
-- 
cgit v1.2.3


From e5ef637fc2bfb5398af4bd491c1795942ea47ade Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Sat, 4 Aug 2018 16:09:40 +0200
Subject: vsftpd: add license

see issue #43716
---
 pkgs/servers/ftp/vsftpd/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/servers/ftp/vsftpd/default.nix b/pkgs/servers/ftp/vsftpd/default.nix
index 2386acf1b79a..cc7493f9533c 100644
--- a/pkgs/servers/ftp/vsftpd/default.nix
+++ b/pkgs/servers/ftp/vsftpd/default.nix
@@ -46,5 +46,6 @@ stdenv.mkDerivation rec {
 
   meta = {
     platforms = stdenv.lib.platforms.linux;
+    license = stdenv.lib.licenses.gpl2;
   };
 }
-- 
cgit v1.2.3


From 834bc4d834cba1aaef029c4e2f070173d5e22bab Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Sat, 4 Aug 2018 16:10:58 +0200
Subject: vncrec: add license

see issue #43716
---
 pkgs/tools/video/vncrec/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/tools/video/vncrec/default.nix b/pkgs/tools/video/vncrec/default.nix
index 162a1b6d5a47..7efcf6cbf83a 100644
--- a/pkgs/tools/video/vncrec/default.nix
+++ b/pkgs/tools/video/vncrec/default.nix
@@ -27,5 +27,6 @@ stdenv.mkDerivation rec {
     description = "VNC recorder";
     homepage = http://ronja.twibright.com/utils/vncrec/;
     platforms = stdenv.lib.platforms.linux;
+    license = stdenv.lib.licenses.gpl2;
   };
 }
-- 
cgit v1.2.3


From 997418e5ee3bdc78b00055aebbe47083f11a852f Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Sat, 4 Aug 2018 16:13:28 +0200
Subject: vnc2flv: add license

see issue #43716
---
 pkgs/tools/video/vnc2flv/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/tools/video/vnc2flv/default.nix b/pkgs/tools/video/vnc2flv/default.nix
index 32cf2771b51d..561c8cf7d78f 100644
--- a/pkgs/tools/video/vnc2flv/default.nix
+++ b/pkgs/tools/video/vnc2flv/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, pythonPackages }:
+{ stdenv, fetchurl, pythonPackages }:
 
 pythonPackages.buildPythonApplication rec {
   name = "vnc2flv-20100207";
@@ -15,5 +15,6 @@ pythonPackages.buildPythonApplication rec {
   meta = {
     description = "Tool to record VNC sessions to Flash Video";
     homepage = http://www.unixuser.org/~euske/python/vnc2flv/;
+    license = stdenv.lib.licenses.mit;
   };
 }
-- 
cgit v1.2.3


From bc4494b56f9f055ca4c8b52c3049289314dae02c Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Sat, 4 Aug 2018 16:15:01 +0200
Subject: vmfs-tools: add license

see issue #43716
---
 pkgs/tools/filesystems/vmfs-tools/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/tools/filesystems/vmfs-tools/default.nix b/pkgs/tools/filesystems/vmfs-tools/default.nix
index b22f7e07a464..6cc049a44092 100644
--- a/pkgs/tools/filesystems/vmfs-tools/default.nix
+++ b/pkgs/tools/filesystems/vmfs-tools/default.nix
@@ -20,5 +20,6 @@ stdenv.mkDerivation rec {
     description = "FUSE-based VMFS (vmware) mounting tools";
     maintainers = with maintainers; [ peterhoeg ];
     platforms = platforms.linux;
+    license = licenses.gpl2;
   };
 }
-- 
cgit v1.2.3


From 8aafab9b49739f7bcd226a45b36ef94b6d02887b Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Sat, 4 Aug 2018 16:21:21 +0200
Subject: upower: add license

see issue #43716
---
 pkgs/os-specific/linux/upower/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/os-specific/linux/upower/default.nix b/pkgs/os-specific/linux/upower/default.nix
index c4af0bec9a23..629f61bf5b16 100644
--- a/pkgs/os-specific/linux/upower/default.nix
+++ b/pkgs/os-specific/linux/upower/default.nix
@@ -36,5 +36,6 @@ stdenv.mkDerivation rec {
     homepage = https://upower.freedesktop.org/;
     description = "A D-Bus service for power management";
     platforms = stdenv.lib.platforms.linux;
+    license = stdenv.lib.licenses.gpl2Plus;
   };
 }
-- 
cgit v1.2.3


From 8d87f1a842947e9604c0f7a333d8f1a7a456a716 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Sat, 4 Aug 2018 16:22:42 +0200
Subject: untie: add license

see issue #43716
---
 pkgs/os-specific/linux/untie/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/os-specific/linux/untie/default.nix b/pkgs/os-specific/linux/untie/default.nix
index 91443eeced58..739bd4471927 100644
--- a/pkgs/os-specific/linux/untie/default.nix
+++ b/pkgs/os-specific/linux/untie/default.nix
@@ -14,6 +14,7 @@ stdenv.mkDerivation rec {
     description = "A tool to run processes untied from some of the namespaces";
     maintainers = with maintainers; [ raskin ];
     platforms = platforms.linux;
+    license = licenses.gpl2Plus;
   };
 
   passthru = {
-- 
cgit v1.2.3


From b876df06733c8f850a5aadd125e80725687b06d9 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Sat, 4 Aug 2018 16:28:21 +0200
Subject: twmn: add license

see issue #43176
---
 pkgs/applications/misc/twmn/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/applications/misc/twmn/default.nix b/pkgs/applications/misc/twmn/default.nix
index 020aa963541e..0667ec49b328 100644
--- a/pkgs/applications/misc/twmn/default.nix
+++ b/pkgs/applications/misc/twmn/default.nix
@@ -30,5 +30,6 @@ stdenv.mkDerivation rec {
     homepage = https://github.com/sboli/twmn;
     platforms = with stdenv.lib.platforms; linux;
     maintainers = [ stdenv.lib.maintainers.matejc ];
+    license = stdenv.lib.licenses.lgpl3;
   };
 }
-- 
cgit v1.2.3


From f1902db4e6dc8ac7277e22d8d1d112f4206778e2 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Sat, 4 Aug 2018 16:30:03 +0200
Subject: tre: add license

see issue #43716
---
 pkgs/development/libraries/tre/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/libraries/tre/default.nix b/pkgs/development/libraries/tre/default.nix
index 12f7e4c765d2..901b6aa097fd 100644
--- a/pkgs/development/libraries/tre/default.nix
+++ b/pkgs/development/libraries/tre/default.nix
@@ -16,5 +16,6 @@ stdenv.mkDerivation rec {
 
   meta = {
     platforms = stdenv.lib.platforms.unix;
+    license = stdenv.lib.licenses.bsd2;
   };
 }
-- 
cgit v1.2.3


From 731b4f4bb5719e0d5ef172d28d48500319761e56 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Sat, 4 Aug 2018 16:35:11 +0200
Subject: trackballs: add license

see issue #43716
---
 pkgs/games/trackballs/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/games/trackballs/default.nix b/pkgs/games/trackballs/default.nix
index 06bd2a8bc4d0..8549a860d8e8 100644
--- a/pkgs/games/trackballs/default.nix
+++ b/pkgs/games/trackballs/default.nix
@@ -19,5 +19,6 @@ stdenv.mkDerivation rec {
     homepage = https://trackballs.github.io/;
     description = "3D Marble Madness clone";
     platforms = stdenv.lib.platforms.linux;
+    license = stdenv.lib.licenses.gpl2;
   };
 }
-- 
cgit v1.2.3


From 270d3892b3c4bd03e849c050c1f2884383e91586 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Sat, 4 Aug 2018 16:37:55 +0200
Subject: toxiproxy: add license

see issue #43716
---
 pkgs/development/tools/toxiproxy/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/tools/toxiproxy/default.nix b/pkgs/development/tools/toxiproxy/default.nix
index 10a27e2e3b88..565ec7904f18 100644
--- a/pkgs/development/tools/toxiproxy/default.nix
+++ b/pkgs/development/tools/toxiproxy/default.nix
@@ -22,5 +22,6 @@ buildGoPackage rec {
   meta = {
     description = "Proxy for for simulating network conditions.";
     maintainers = with lib.maintainers; [ avnik ];
+    license = lib.licenses.mit;
   };
 }
-- 
cgit v1.2.3


From 9c9f5aaeb220937784899ba4b168b9c39f338627 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Sat, 4 Aug 2018 16:47:10 +0200
Subject: tasknc: add license

see issue #43716
---
 pkgs/applications/misc/tasknc/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/applications/misc/tasknc/default.nix b/pkgs/applications/misc/tasknc/default.nix
index e44690a5bd79..bf0e964d591f 100644
--- a/pkgs/applications/misc/tasknc/default.nix
+++ b/pkgs/applications/misc/tasknc/default.nix
@@ -38,5 +38,6 @@ stdenv.mkDerivation rec {
     description = "A ncurses wrapper around taskwarrior";
     maintainers = with maintainers; [ infinisil ];
     platforms = platforms.linux; # Cannot test others
+    license = licenses.mit;
   };
 }
-- 
cgit v1.2.3


From c8967313b1aa0c568b7b8540ee16705181116417 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Sat, 4 Aug 2018 16:50:29 +0200
Subject: taffybar: add license

see issue #43716
---
 pkgs/applications/window-managers/taffybar/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/applications/window-managers/taffybar/default.nix b/pkgs/applications/window-managers/taffybar/default.nix
index dfb2eec5dc55..681a5baec82c 100644
--- a/pkgs/applications/window-managers/taffybar/default.nix
+++ b/pkgs/applications/window-managers/taffybar/default.nix
@@ -15,5 +15,6 @@ in stdenv.mkDerivation {
 
   meta = {
     platforms = stdenv.lib.platforms.unix;
+    license = stdenv.lib.licenses.bsd3;
   };
 }
-- 
cgit v1.2.3


From 9fe17c6ff3252425ce1f276f91c32fdae8b64203 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Sat, 4 Aug 2018 16:52:03 +0200
Subject: sysvinit: add license

see issue #43716
---
 pkgs/os-specific/linux/sysvinit/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/os-specific/linux/sysvinit/default.nix b/pkgs/os-specific/linux/sysvinit/default.nix
index b516cfe65edd..0ccf318dfb21 100644
--- a/pkgs/os-specific/linux/sysvinit/default.nix
+++ b/pkgs/os-specific/linux/sysvinit/default.nix
@@ -40,5 +40,6 @@ stdenv.mkDerivation {
     homepage = http://www.nongnu.org/sysvinit/;
     description = "Utilities related to booting and shutdown";
     platforms = stdenv.lib.platforms.linux;
+    license = stdenv.lib.licenses.gpl2Plus;
   };
 }
-- 
cgit v1.2.3


From 8743f8f29ae715dd4444096ea0b205947f2b4bc8 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Sat, 4 Aug 2018 16:55:09 +0200
Subject: surfraw: add license

see issue #43716
---
 pkgs/tools/networking/surfraw/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/tools/networking/surfraw/default.nix b/pkgs/tools/networking/surfraw/default.nix
index b23616c57e92..80daf6447efa 100644
--- a/pkgs/tools/networking/surfraw/default.nix
+++ b/pkgs/tools/networking/surfraw/default.nix
@@ -19,5 +19,6 @@ stdenv.mkDerivation rec {
     homepage = http://surfraw.alioth.debian.org;
     maintainers = [];
     platforms = stdenv.lib.platforms.linux;
+    license = stdenv.lib.licenses.publicDomain;
   };
 }
-- 
cgit v1.2.3


From eaf278693857fde64c9a3e6ae435885ee79d42b3 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Sat, 4 Aug 2018 16:56:21 +0200
Subject: subversion: add license

see issue #43716
---
 pkgs/applications/version-management/subversion/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/applications/version-management/subversion/default.nix b/pkgs/applications/version-management/subversion/default.nix
index fc98b398213c..e6cc30cea952 100644
--- a/pkgs/applications/version-management/subversion/default.nix
+++ b/pkgs/applications/version-management/subversion/default.nix
@@ -96,6 +96,7 @@ let
       homepage = http://subversion.apache.org/;
       maintainers = with stdenv.lib.maintainers; [ eelco lovek323 ];
       platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin;
+      license = stdenv.lib.licenses.asl20;
     };
 
   } // stdenv.lib.optionalAttrs stdenv.isDarwin {
-- 
cgit v1.2.3


From eaf7debad65eeef7ec1da374e46698a470bc72ac Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Sat, 4 Aug 2018 16:58:14 +0200
Subject: statifier: add license

see issue #43716
---
 pkgs/os-specific/linux/statifier/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/os-specific/linux/statifier/default.nix b/pkgs/os-specific/linux/statifier/default.nix
index 67df9dd2f11f..376ae47ffbe0 100644
--- a/pkgs/os-specific/linux/statifier/default.nix
+++ b/pkgs/os-specific/linux/statifier/default.nix
@@ -19,5 +19,6 @@ multiStdenv.mkDerivation {
   meta = with multiStdenv.lib; {
     description = "Tool for creating static Linux binaries";
     platforms = platforms.linux;
+    license = licenses.gpl2;
   };
 }
-- 
cgit v1.2.3


From e700483077408c4617f80ab1a0f2f1d52f16120d Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Sat, 4 Aug 2018 16:59:43 +0200
Subject: sstp: add license

see issue #43716
---
 pkgs/tools/networking/sstp/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/tools/networking/sstp/default.nix b/pkgs/tools/networking/sstp/default.nix
index dce6d1acb776..e8db3a071843 100644
--- a/pkgs/tools/networking/sstp/default.nix
+++ b/pkgs/tools/networking/sstp/default.nix
@@ -28,5 +28,6 @@ stdenv.mkDerivation rec {
     homepage = http://sstp-client.sourceforge.net/;
     platforms = stdenv.lib.platforms.linux;
     maintainers = [ stdenv.lib.maintainers.ktosiek ];
+    license = stdenv.lib.licenses.gpl2;
   };
 }
-- 
cgit v1.2.3


From 49a39aac3e6f0f6e431d85b7125685826d147f22 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Sat, 4 Aug 2018 17:00:58 +0200
Subject: ssss: add license

see issue #43716
---
 pkgs/tools/security/ssss/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/tools/security/ssss/default.nix b/pkgs/tools/security/ssss/default.nix
index b286f31304e9..3bbcdafcdcdd 100644
--- a/pkgs/tools/security/ssss/default.nix
+++ b/pkgs/tools/security/ssss/default.nix
@@ -23,5 +23,6 @@ stdenv.mkDerivation rec {
     description = "Shamir Secret Sharing Scheme";
     homepage = http://point-at-infinity.org/ssss/;
     platforms = stdenv.lib.platforms.unix;
+    license = stdenv.lib.licenses.gpl2;
   };
 }
-- 
cgit v1.2.3


From d9290e55a3301e73ca6b3e557293f2bde1d55a20 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Sat, 4 Aug 2018 18:26:41 +0200
Subject: slim: add license

see issue #43716
---
 pkgs/applications/display-managers/slim/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/applications/display-managers/slim/default.nix b/pkgs/applications/display-managers/slim/default.nix
index 12e3dad9c79c..e504c09e43e6 100644
--- a/pkgs/applications/display-managers/slim/default.nix
+++ b/pkgs/applications/display-managers/slim/default.nix
@@ -50,5 +50,6 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = https://sourceforge.net/projects/slim.berlios/; # berlios shut down; I found no replacement yet
     platforms = stdenv.lib.platforms.linux;
+    license = stdenv.lib.licenses.gpl2;
   };
 }
-- 
cgit v1.2.3


From 8c0ae3ac2f02de2876908def733078aaf5a971bd Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Sat, 4 Aug 2018 18:28:11 +0200
Subject: smack: add license

see issue #43716
---
 pkgs/development/libraries/java/smack/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/libraries/java/smack/default.nix b/pkgs/development/libraries/java/smack/default.nix
index c39478e590dd..e28925c65bb2 100644
--- a/pkgs/development/libraries/java/smack/default.nix
+++ b/pkgs/development/libraries/java/smack/default.nix
@@ -11,5 +11,6 @@ stdenv.mkDerivation {
 
   meta = {
     platforms = stdenv.lib.platforms.unix;
+    license = stdenv.lib.licenses.asl20;
   };
 }
-- 
cgit v1.2.3


From d5ca0166b64581b0634277033ae3743d3b09841e Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Sat, 4 Aug 2018 18:32:01 +0200
Subject: smem: add license

see issue #43716
---
 pkgs/os-specific/linux/smem/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/os-specific/linux/smem/default.nix b/pkgs/os-specific/linux/smem/default.nix
index a07eec431c33..ede8d425f12d 100644
--- a/pkgs/os-specific/linux/smem/default.nix
+++ b/pkgs/os-specific/linux/smem/default.nix
@@ -29,5 +29,6 @@ stdenv.mkDerivation rec {
     description = "A memory usage reporting tool that takes shared memory into account";
     platforms = lib.platforms.linux;
     maintainers = [ lib.maintainers.eelco ];
+    license = lib.licenses.gpl2Plus;
   };
 }
-- 
cgit v1.2.3


From bd899f95edfbaa4187f7ba3f555943f89be296a0 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Sat, 4 Aug 2018 18:34:51 +0200
Subject: skydns: add license

see issue #43716
---
 pkgs/servers/skydns/default.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkgs/servers/skydns/default.nix b/pkgs/servers/skydns/default.nix
index 7bfea23c78b5..82d79785b11c 100644
--- a/pkgs/servers/skydns/default.nix
+++ b/pkgs/servers/skydns/default.nix
@@ -1,4 +1,4 @@
-{ buildGoPackage, fetchFromGitHub }:
+{ stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   name = "skydns-${version}";
@@ -15,4 +15,8 @@ buildGoPackage rec {
   };
 
   goDeps = ./deps.nix;
+
+  meta = {
+    license = stdenv.lib.licenses.mit;
+  };
 }
-- 
cgit v1.2.3


From 60ad4b15945f1cc4437cc1764e1df10864a879e0 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Sat, 4 Aug 2018 18:37:19 +0200
Subject: sidproxd: add license

see issue #43716
---
 pkgs/applications/networking/siproxd/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/applications/networking/siproxd/default.nix b/pkgs/applications/networking/siproxd/default.nix
index 14ed2587e636..cd697f107b35 100644
--- a/pkgs/applications/networking/siproxd/default.nix
+++ b/pkgs/applications/networking/siproxd/default.nix
@@ -17,5 +17,6 @@ stdenv.mkDerivation rec {
     description = "A masquerading SIP Proxy Server";
     maintainers = with stdenv.lib.maintainers; [viric];
     platforms = with stdenv.lib.platforms; linux;
+    license = stdenv.lib.licenses.gpl2Plus;
   };
 }
-- 
cgit v1.2.3


From 58b24cf4d25db93c9ef8c59125656ff062b67dee Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Sat, 4 Aug 2018 18:38:46 +0200
Subject: shfmt: add license

see issue #43716
---
 pkgs/tools/text/shfmt/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/tools/text/shfmt/default.nix b/pkgs/tools/text/shfmt/default.nix
index fe699b355900..2ab568ba8416 100644
--- a/pkgs/tools/text/shfmt/default.nix
+++ b/pkgs/tools/text/shfmt/default.nix
@@ -21,5 +21,6 @@ buildGoPackage rec {
       shfmt formats shell programs. It can use tabs or any number of spaces to indent.
       You can feed it standard input, any number of files or any number of directories to recurse into.
     '';
+    license = licenses.bsd3;
   };
 }
-- 
cgit v1.2.3


From 847e1bd906ac8ab3c23705df4849c86179552885 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Sat, 4 Aug 2018 18:41:06 +0200
Subject: setserial: add license

see issue #43716
---
 pkgs/tools/system/setserial/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/tools/system/setserial/default.nix b/pkgs/tools/system/setserial/default.nix
index 959334f4cc5d..d6e8f4f1bb9f 100644
--- a/pkgs/tools/system/setserial/default.nix
+++ b/pkgs/tools/system/setserial/default.nix
@@ -22,5 +22,6 @@ stdenv.mkDerivation rec {
   meta = {
     description = "Serial port configuration utility";
     platforms = stdenv.lib.platforms.linux;
+    license = stdenv.lib.licenses.gpl2;
   };
 }
-- 
cgit v1.2.3


From 6482d5c3d15d0790dd79aa37c1c9baedeae92c79 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Sat, 4 Aug 2018 18:42:30 +0200
Subject: seccure: add license

see issue #43716
---
 pkgs/tools/security/seccure/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/tools/security/seccure/default.nix b/pkgs/tools/security/seccure/default.nix
index 1a276875ed7a..a2ec48d4d270 100644
--- a/pkgs/tools/security/seccure/default.nix
+++ b/pkgs/tools/security/seccure/default.nix
@@ -21,5 +21,6 @@ stdenv.mkDerivation rec {
     homepage = http://point-at-infinity.org/seccure/;
     description = "Zero-configuration elliptic curve cryptography utility";
     platforms = stdenv.lib.platforms.unix;
+    license = stdenv.lib.licenses.lgpl3;
   };
 }
-- 
cgit v1.2.3


From 0e3b4b6e7d7149abde78cbfe40f0a94a0e84e270 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Sat, 4 Aug 2018 18:43:42 +0200
Subject: sddm: add license

see issue #43716
---
 pkgs/applications/display-managers/sddm/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/applications/display-managers/sddm/default.nix b/pkgs/applications/display-managers/sddm/default.nix
index 5e583049190c..c9fd4f9c4ab9 100644
--- a/pkgs/applications/display-managers/sddm/default.nix
+++ b/pkgs/applications/display-managers/sddm/default.nix
@@ -62,5 +62,6 @@ in mkDerivation rec {
     homepage    = https://github.com/sddm/sddm;
     maintainers = with maintainers; [ abbradar ttuegel ];
     platforms   = platforms.linux;
+    license     = licenses.gpl2Plus;
   };
 }
-- 
cgit v1.2.3


From 3cea40adb3ca36be64daf7cf5dfaee30a9300393 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Sat, 4 Aug 2018 18:46:28 +0200
Subject: scrot: add license

see issue #43716
---
 pkgs/tools/graphics/scrot/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/tools/graphics/scrot/default.nix b/pkgs/tools/graphics/scrot/default.nix
index 49bd74ea412f..e3c7254457db 100644
--- a/pkgs/tools/graphics/scrot/default.nix
+++ b/pkgs/tools/graphics/scrot/default.nix
@@ -27,5 +27,6 @@ stdenv.mkDerivation rec {
     description = "A command-line screen capture utility";
     platforms = platforms.linux;
     maintainers = with maintainers; [ garbas ];
+    license = licenses.mit;
   };
 }
-- 
cgit v1.2.3


From 3e262e3e9910265b344472ab5bc9c2941f30e037 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Sat, 4 Aug 2018 18:48:18 +0200
Subject: scheme48: add license

see issue #43716
---
 pkgs/development/interpreters/scheme48/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/interpreters/scheme48/default.nix b/pkgs/development/interpreters/scheme48/default.nix
index 1bfe81241048..e01aef98303c 100644
--- a/pkgs/development/interpreters/scheme48/default.nix
+++ b/pkgs/development/interpreters/scheme48/default.nix
@@ -8,6 +8,7 @@ stdenv.mkDerivation {
     description = "Scheme 48";
     maintainers = with stdenv.lib.maintainers; [ the-kenny ];
     platforms = with stdenv.lib.platforms; unix;
+    license = stdenv.lib.licenses.bsd3;
   };
 
   src = fetchurl {
-- 
cgit v1.2.3


From 2bc6257cfdcd7c7d0dc771a9f0d9a8ec62c722ed Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Sat, 4 Aug 2018 18:54:35 +0200
Subject: sbsigntool: add license

see issue #43716
---
 pkgs/tools/security/sbsigntool/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/tools/security/sbsigntool/default.nix b/pkgs/tools/security/sbsigntool/default.nix
index bcf1a5c1f792..cfe54967cce3 100644
--- a/pkgs/tools/security/sbsigntool/default.nix
+++ b/pkgs/tools/security/sbsigntool/default.nix
@@ -47,6 +47,7 @@ stdenv.mkDerivation rec {
     homepage    = http://jk.ozlabs.org/docs/sbkeysync-maintaing-uefi-key-databases;
     maintainers = [ maintainers.tstrobel ];
     platforms   = [ "x86_64-linux" ]; # Broken on i686
+    license     = licenses.gpl3;
   };
 }
 
-- 
cgit v1.2.3


From 1857fe6c149c3ca5d57985b2915e85a967c73425 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Sat, 4 Aug 2018 19:09:20 +0200
Subject: rxvt_unicode: add license

see issue #43716
---
 pkgs/applications/misc/rxvt_unicode/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/applications/misc/rxvt_unicode/default.nix b/pkgs/applications/misc/rxvt_unicode/default.nix
index 4ee9f461760c..0e59ef5512d8 100644
--- a/pkgs/applications/misc/rxvt_unicode/default.nix
+++ b/pkgs/applications/misc/rxvt_unicode/default.nix
@@ -67,5 +67,6 @@ stdenv.mkDerivation (rec {
     downloadPage = "http://dist.schmorp.de/rxvt-unicode/Attic/";
     maintainers = [ ];
     platforms = platforms.unix;
+    license = licenses.gpl3;
   };
 })
-- 
cgit v1.2.3


From 1058537c7cd92adf342f4e95e471262bcaf2e9cf Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Sat, 4 Aug 2018 19:12:54 +0200
Subject: rtorrent: add license

see issue #43716
---
 pkgs/tools/networking/p2p/rtorrent/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/tools/networking/p2p/rtorrent/default.nix b/pkgs/tools/networking/p2p/rtorrent/default.nix
index 6ab462ac5a8c..30e8089fb241 100644
--- a/pkgs/tools/networking/p2p/rtorrent/default.nix
+++ b/pkgs/tools/networking/p2p/rtorrent/default.nix
@@ -47,5 +47,6 @@ stdenv.mkDerivation rec {
 
     platforms = platforms.unix;
     maintainers = with maintainers; [ ebzzry codyopel ];
+    license = licenses.gpl2Plus;
   };
 }
-- 
cgit v1.2.3


From e91778419b4613df201d65aefa68e632e300e705 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Sun, 5 Aug 2018 15:56:50 +0200
Subject: beecrypt: add license

see issue #43716
---
 pkgs/development/libraries/beecrypt/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/libraries/beecrypt/default.nix b/pkgs/development/libraries/beecrypt/default.nix
index a48de9a03f21..09758440524c 100644
--- a/pkgs/development/libraries/beecrypt/default.nix
+++ b/pkgs/development/libraries/beecrypt/default.nix
@@ -11,5 +11,6 @@ stdenv.mkDerivation {
 
   meta = {
     platforms = stdenv.lib.platforms.linux;
+    license = stdenv.lib.licenses.lgpl2;
   };
 }
-- 
cgit v1.2.3


From f2256c52f10e0cb5a39b4f4a948f21ab20ae9945 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Sun, 5 Aug 2018 15:58:32 +0200
Subject: bitbucket-cli: add license

see issue #43716
---
 pkgs/development/python-modules/bitbucket-cli/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/python-modules/bitbucket-cli/default.nix b/pkgs/development/python-modules/bitbucket-cli/default.nix
index b5d115f4d0bb..0a54c0ed17c3 100644
--- a/pkgs/development/python-modules/bitbucket-cli/default.nix
+++ b/pkgs/development/python-modules/bitbucket-cli/default.nix
@@ -19,5 +19,6 @@ buildPythonPackage rec {
     description = "Bitbucket command line interface";
     homepage = https://bitbucket.org/zhemao/bitbucket-cli;
     maintainers = with maintainers; [ refnil ];
+    license = licenses.bsd2;
   };
 }
-- 
cgit v1.2.3


From 5c831c7bfe1966b7d3c72266ca1c0c38c9f761ad Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Sun, 5 Aug 2018 16:02:07 +0200
Subject: brasero: correct license, is actually gpl2Plus

see issue #43716
---
 pkgs/tools/cd-dvd/brasero/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/cd-dvd/brasero/default.nix b/pkgs/tools/cd-dvd/brasero/default.nix
index 9587416a96af..753bdd49959c 100644
--- a/pkgs/tools/cd-dvd/brasero/default.nix
+++ b/pkgs/tools/cd-dvd/brasero/default.nix
@@ -45,7 +45,7 @@ in stdenv.mkDerivation rec {
     description = "A Gnome CD/DVD Burner";
     homepage = https://wiki.gnome.org/Apps/Brasero;
     maintainers = [ maintainers.bdimcheff ];
-    license = licenses.gpl2;
+    license = licenses.gpl2Plus;
     platforms = platforms.linux;
   };
 }
-- 
cgit v1.2.3


From 4269eb17dc6a2067269737f0f06e7073c02cb657 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Sun, 5 Aug 2018 16:06:55 +0200
Subject: brasero: inherit meta in wrapper

see issue #43716
---
 pkgs/tools/cd-dvd/brasero/wrapper.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/tools/cd-dvd/brasero/wrapper.nix b/pkgs/tools/cd-dvd/brasero/wrapper.nix
index 839cc1d604e6..7f97209a4aa9 100644
--- a/pkgs/tools/cd-dvd/brasero/wrapper.nix
+++ b/pkgs/tools/cd-dvd/brasero/wrapper.nix
@@ -12,4 +12,6 @@ in symlinkJoin {
     wrapProgram $out/bin/brasero \
       --prefix PATH ':' ${binPath}
   '';
+  
+  inherit (brasero-original) meta;
 }
-- 
cgit v1.2.3


From 4d432df0a54e57e612efdcec468cd6078a133413 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Sun, 5 Aug 2018 16:11:26 +0200
Subject: cointop: add license

see issue #43716
---
 pkgs/applications/misc/cointop/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/applications/misc/cointop/default.nix b/pkgs/applications/misc/cointop/default.nix
index 2ac335759ce4..23d76afff0ce 100644
--- a/pkgs/applications/misc/cointop/default.nix
+++ b/pkgs/applications/misc/cointop/default.nix
@@ -26,5 +26,6 @@ buildGoPackage rec {
     homepage  = https://cointop.sh;
     platforms = stdenv.lib.platforms.linux; # cannot test others
     maintainers = [ ];
+    license = stdenv.lib.licenses.asl20;
   };
 }
-- 
cgit v1.2.3


From 7b4f037a91b193bb4f9bfcdd1021c1211c155042 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Sun, 5 Aug 2018 16:12:46 +0200
Subject: construo: add license

see issue #43716
---
 pkgs/games/construo/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/games/construo/default.nix b/pkgs/games/construo/default.nix
index 7db641367311..38a67289d391 100644
--- a/pkgs/games/construo/default.nix
+++ b/pkgs/games/construo/default.nix
@@ -21,5 +21,6 @@ stdenv.mkDerivation rec {
   meta = {
     description = "Masses and springs simulation game";
     homepage = http://fs.fsf.org/construo/;
+    license = stdenv.lib.licenses.gpl3;
   };
 }
-- 
cgit v1.2.3


From 71caa7c54a72b43e245752e355efdd48f764cda9 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Sun, 5 Aug 2018 16:14:20 +0200
Subject: convmv: add license

see issue #43716
---
 pkgs/tools/misc/convmv/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/tools/misc/convmv/default.nix b/pkgs/tools/misc/convmv/default.nix
index 52bcbde1cc1b..56b9d5c849a5 100644
--- a/pkgs/tools/misc/convmv/default.nix
+++ b/pkgs/tools/misc/convmv/default.nix
@@ -26,5 +26,6 @@ stdenv.mkDerivation rec {
     description = "Converts filenames from one encoding to another";
     platforms = platforms.linux ++ platforms.freebsd ++ platforms.cygwin;
     maintainers = [ ];
+    license = licenses.gpl2Plus;
   };
 }
-- 
cgit v1.2.3


From 5e493c9475d2be8179bd47010eabf999053dc85d Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Sun, 5 Aug 2018 16:24:34 +0200
Subject: dillo: add license

see issue #43716
---
 pkgs/applications/networking/browsers/dillo/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/applications/networking/browsers/dillo/default.nix b/pkgs/applications/networking/browsers/dillo/default.nix
index 73094767bf3d..9dc329dfc181 100644
--- a/pkgs/applications/networking/browsers/dillo/default.nix
+++ b/pkgs/applications/networking/browsers/dillo/default.nix
@@ -27,5 +27,6 @@ stdenv.mkDerivation rec {
     '';
     maintainers = [ maintainers.AndersonTorres ];
     platforms = platforms.linux;
+    license = licenses.gpl3;
   };
 }
-- 
cgit v1.2.3


From 85ea1c2f4c5dd4d39915a6f08c1ae907a207a75f Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Sun, 5 Aug 2018 16:26:02 +0200
Subject: diod: add license

see issue #43716
---
 pkgs/servers/diod/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/servers/diod/default.nix b/pkgs/servers/diod/default.nix
index a233b6ba4cf8..eba73b2692a2 100644
--- a/pkgs/servers/diod/default.nix
+++ b/pkgs/servers/diod/default.nix
@@ -15,5 +15,6 @@ stdenv.mkDerivation rec {
     description = "An I/O forwarding server that implements a variant of the 9P protocol";
     maintainers = [ stdenv.lib.maintainers.rickynils];
     platforms = stdenv.lib.platforms.linux;
+    license = stdenv.lib.licenses.gpl2Plus;
   };
 }
-- 
cgit v1.2.3


From 31b8aebded376cff61791db36fc72ea832358064 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Sun, 5 Aug 2018 16:27:34 +0200
Subject: dirmngr: add license

see issue #43716
---
 pkgs/tools/security/dirmngr/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/tools/security/dirmngr/default.nix b/pkgs/tools/security/dirmngr/default.nix
index 888fa48eab9a..ee97bda19064 100644
--- a/pkgs/tools/security/dirmngr/default.nix
+++ b/pkgs/tools/security/dirmngr/default.nix
@@ -12,5 +12,6 @@ stdenv.mkDerivation rec {
 
   meta = {
     platforms = stdenv.lib.platforms.unix;
+    license = stdenv.lib.licenses.gpl2Plus;
   };
 }
-- 
cgit v1.2.3


From f611b23aeeb9c37a10b6734b757acebb25a6727b Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Sun, 5 Aug 2018 16:28:41 +0200
Subject: diskscan: add license

see issue #43716
---
 pkgs/tools/misc/diskscan/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/tools/misc/diskscan/default.nix b/pkgs/tools/misc/diskscan/default.nix
index 9449b7759a8c..7b97e58fdf96 100644
--- a/pkgs/tools/misc/diskscan/default.nix
+++ b/pkgs/tools/misc/diskscan/default.nix
@@ -21,5 +21,6 @@ stdenv.mkDerivation rec {
     platforms = with platforms; linux;
     maintainers = with maintainers; [ peterhoeg ];
     inherit version;
+    license = licenses.gpl3;
   };
 }
-- 
cgit v1.2.3


From 9ff03a77167edc775a8f339257554a8fc6b83f27 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Sun, 5 Aug 2018 16:29:27 +0200
Subject: disper: add license

see issue #43716
---
 pkgs/tools/misc/disper/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/tools/misc/disper/default.nix b/pkgs/tools/misc/disper/default.nix
index 27bb62c582a5..22951eecf533 100644
--- a/pkgs/tools/misc/disper/default.nix
+++ b/pkgs/tools/misc/disper/default.nix
@@ -23,6 +23,7 @@ stdenv.mkDerivation rec {
     description = "On-the-fly display switch utility";
     homepage = http://willem.engen.nl/projects/disper/;
     platforms = stdenv.lib.platforms.unix;
+    license = stdenv.lib.licenses.gpl3;
   };
 
 }
-- 
cgit v1.2.3


From 89da937013e595b93e92256198a03e73dc531b00 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Sun, 5 Aug 2018 16:31:42 +0200
Subject: dmraid: add license

see issue #43716
---
 pkgs/os-specific/linux/dmraid/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/os-specific/linux/dmraid/default.nix b/pkgs/os-specific/linux/dmraid/default.nix
index a6f6365ae631..129ccb304564 100644
--- a/pkgs/os-specific/linux/dmraid/default.nix
+++ b/pkgs/os-specific/linux/dmraid/default.nix
@@ -44,5 +44,6 @@ stdenv.mkDerivation rec {
     '';
     maintainers = [ stdenv.lib.maintainers.raskin ];
     platforms = stdenv.lib.platforms.linux;
+    license = stdenv.lib.licenses.gpl2Plus;
   };
 }
-- 
cgit v1.2.3


From 49f4f1048a0bd8e6972e2d11454666da639d76a1 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Sun, 5 Aug 2018 16:33:00 +0200
Subject: dosage: add license

see issue #43716
---
 pkgs/applications/graphics/dosage/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/graphics/dosage/default.nix b/pkgs/applications/graphics/dosage/default.nix
index 69d09cd429c1..d45d6c3a62e3 100644
--- a/pkgs/applications/graphics/dosage/default.nix
+++ b/pkgs/applications/graphics/dosage/default.nix
@@ -1,4 +1,4 @@
-{ pythonPackages, fetchFromGitHub }:
+{ stdenv, pythonPackages, fetchFromGitHub }:
 
 pythonPackages.buildPythonApplication rec {
   pname = "dosage";
@@ -23,5 +23,6 @@ pythonPackages.buildPythonApplication rec {
   meta = {
     description = "A comic strip downloader and archiver";
     homepage = https://dosage.rocks/;
+    license = stdenv.lib.licenses.mit;
   };
 }
-- 
cgit v1.2.3


From 9119cd2a9efaa8d03668f1abf4dc8d0b838ec6cd Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Sun, 5 Aug 2018 16:34:12 +0200
Subject: dosfstools: add license

see issue #43716
---
 pkgs/tools/filesystems/dosfstools/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/tools/filesystems/dosfstools/default.nix b/pkgs/tools/filesystems/dosfstools/default.nix
index dc6bcca597bd..bc79577ab2b5 100644
--- a/pkgs/tools/filesystems/dosfstools/default.nix
+++ b/pkgs/tools/filesystems/dosfstools/default.nix
@@ -21,5 +21,6 @@ stdenv.mkDerivation rec {
     repositories.git = git://daniel-baumann.ch/git/software/dosfstools.git;
     homepage = https://www.daniel-baumann.ch/software/dosfstools/;
     platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin;
+    license = stdenv.lib.licenses.gpl3;
   };
 }
-- 
cgit v1.2.3


From a62fa40209307933d1a09665b25491163b669b48 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Sun, 5 Aug 2018 16:36:23 +0200
Subject: ekiga: add license

see issue #43716
---
 pkgs/applications/networking/instant-messengers/ekiga/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/applications/networking/instant-messengers/ekiga/default.nix b/pkgs/applications/networking/instant-messengers/ekiga/default.nix
index f831ac0847ce..bcabdf43cd22 100644
--- a/pkgs/applications/networking/instant-messengers/ekiga/default.nix
+++ b/pkgs/applications/networking/instant-messengers/ekiga/default.nix
@@ -55,6 +55,7 @@ stdenv.mkDerivation rec {
     description = "VOIP/Videoconferencing app with full SIP and H.323 support";
     maintainers = [ maintainers.raskin ];
     platforms = platforms.linux;
+    license = licenses.gpl2Plus;
   };
 
   passthru = {
-- 
cgit v1.2.3


From e4e98a27b036a3357837854b052f5a13c4e322a3 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Sun, 5 Aug 2018 16:37:30 +0200
Subject: emma: add license

see issue #43716
---
 pkgs/development/tools/analysis/emma/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/tools/analysis/emma/default.nix b/pkgs/development/tools/analysis/emma/default.nix
index c4e37e5c700a..1bd24b4785d0 100644
--- a/pkgs/development/tools/analysis/emma/default.nix
+++ b/pkgs/development/tools/analysis/emma/default.nix
@@ -19,5 +19,6 @@ stdenv.mkDerivation {
     homepage = http://emma.sourceforge.net/;
     description = "A code coverage tool for Java";
     platforms = stdenv.lib.platforms.unix;
+    license = stdenv.lib.licenses.cpl10;
   };
 }
-- 
cgit v1.2.3


From 2348623b95d54f87172b46c487694e721287f529 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Sun, 5 Aug 2018 16:39:08 +0200
Subject: fetchmail: add license

see issue #43716
---
 pkgs/applications/misc/fetchmail/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/applications/misc/fetchmail/default.nix b/pkgs/applications/misc/fetchmail/default.nix
index 5cd8f572ad48..8304cb0f8d1c 100644
--- a/pkgs/applications/misc/fetchmail/default.nix
+++ b/pkgs/applications/misc/fetchmail/default.nix
@@ -29,5 +29,6 @@ stdenv.mkDerivation {
 
     platforms = stdenv.lib.platforms.unix;
     maintainers = [ stdenv.lib.maintainers.peti ];
+    license = stdenv.lib.licenses.gpl2Plus;
   };
 }
-- 
cgit v1.2.3


From a344029c34ec015ab0168d80d8bf0392b0a8264b Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Sun, 5 Aug 2018 16:40:43 +0200
Subject: findbugs: add license

see issue #43716
---
 pkgs/development/tools/analysis/findbugs/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/tools/analysis/findbugs/default.nix b/pkgs/development/tools/analysis/findbugs/default.nix
index a5a3d2439186..7f2df62008f0 100644
--- a/pkgs/development/tools/analysis/findbugs/default.nix
+++ b/pkgs/development/tools/analysis/findbugs/default.nix
@@ -39,5 +39,6 @@ stdenv.mkDerivation rec {
     homepage = http://findbugs.sourceforge.net/;
     maintainers = with maintainers; [ pSub ];
     platforms = with platforms; unix;
+    license = licenses.lgpl3;
   };
 }
-- 
cgit v1.2.3


From 03b2a4dd799b10cdfd99d4db6b47267d7c303412 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Sun, 5 Aug 2018 16:41:49 +0200
Subject: fondu: add license

see issue #43716
---
 pkgs/tools/misc/fondu/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/tools/misc/fondu/default.nix b/pkgs/tools/misc/fondu/default.nix
index 7610bb88f390..e31da3bfd212 100644
--- a/pkgs/tools/misc/fondu/default.nix
+++ b/pkgs/tools/misc/fondu/default.nix
@@ -15,5 +15,6 @@ stdenv.mkDerivation rec {
 
   meta = {
     platforms = stdenv.lib.platforms.unix;
+    license = stdenv.lib.licenses.gpl3;
   };
 }
-- 
cgit v1.2.3


From e7c9273b87827f4415fd1bf9d9bc56450d2d8101 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Sun, 5 Aug 2018 16:43:09 +0200
Subject: getmail: add license

see issue #43716
---
 pkgs/tools/networking/getmail/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/tools/networking/getmail/default.nix b/pkgs/tools/networking/getmail/default.nix
index 224c7a4ab484..ac69fd992658 100644
--- a/pkgs/tools/networking/getmail/default.nix
+++ b/pkgs/tools/networking/getmail/default.nix
@@ -26,5 +26,6 @@ python2Packages.buildPythonApplication rec {
     homepage = http://pyropus.ca/software/getmail/;
     inherit version;
     updateWalker = true;
+    license = stdenv.lib.licenses.gpl2Plus;
   };
 }
-- 
cgit v1.2.3


From 6071ff18be1a170b7d977a354d7506657d913a6e Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Sun, 5 Aug 2018 16:45:48 +0200
Subject: exiv2: add license

see issue #43716
---
 pkgs/development/libraries/exiv2/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/libraries/exiv2/default.nix b/pkgs/development/libraries/exiv2/default.nix
index 7f5f19035179..1c6c6fd7015c 100644
--- a/pkgs/development/libraries/exiv2/default.nix
+++ b/pkgs/development/libraries/exiv2/default.nix
@@ -36,5 +36,6 @@ stdenv.mkDerivation rec {
     homepage = http://www.exiv2.org/;
     description = "A library and command-line utility to manage image metadata";
     platforms = stdenv.lib.platforms.all;
+    license = stdenv.lib.licenses.gpl2Plus;
   };
 }
-- 
cgit v1.2.3


From 85afc926d8dfcbc079322594e803078d72a31f9f Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Sun, 5 Aug 2018 16:46:45 +0200
Subject: exult: add license

see issue #43716
---
 pkgs/games/exult/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/games/exult/default.nix b/pkgs/games/exult/default.nix
index 2fe76649d552..36ea8a7a3d58 100644
--- a/pkgs/games/exult/default.nix
+++ b/pkgs/games/exult/default.nix
@@ -46,5 +46,6 @@ stdenv.mkDerivation rec {
     maintainers = [ stdenv.lib.maintainers.eelco ];
     platforms = stdenv.lib.platforms.unix;
     hydraPlatforms = stdenv.lib.platforms.linux; # darwin times out
+    license = stdenv.lib.licenses.gpl2Plus;
   };
 }
-- 
cgit v1.2.3


From 9f415e386bb86cce3e6f43455af9873f365493a9 Mon Sep 17 00:00:00 2001
From: taku0 <mxxouy6x3m_github@tatapa.org>
Date: Mon, 6 Aug 2018 16:03:52 +0900
Subject: thunderbird-bin: 52.9.1 -> 60.0

---
 .../thunderbird-bin/release_sources.nix            | 500 ++++++++++-----------
 1 file changed, 245 insertions(+), 255 deletions(-)

diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix
index 047b1659642b..5097215d4366 100644
--- a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix
+++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix
@@ -1,595 +1,585 @@
 {
-  version = "52.9.1";
+  version = "60.0";
   sources = [
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-x86_64/ar/thunderbird-52.9.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/ar/thunderbird-60.0.tar.bz2";
       locale = "ar";
       arch = "linux-x86_64";
-      sha512 = "9384c43cbac7d6b88fa160e22fb21e6f4250276b46d3fc0322dca45a6b5ebacfc39a431b54d34262a32f2a7cc9130b68b6dc4b636a737ecb7132e077592882a5";
+      sha512 = "fd37e00c8b50d1dc932295288ad2865358da2f37f5b170a3a7f75d929e78486165a24f1967defcb4032546a7f712cd6887c7cf47257a4a08685df85f9ecf81bd";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-x86_64/ast/thunderbird-52.9.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/ast/thunderbird-60.0.tar.bz2";
       locale = "ast";
       arch = "linux-x86_64";
-      sha512 = "b1d0b26dc21c4487f016c60aa8560ff34c868c6e617040f963ff9e76b859d7d265cf529c0d70fcb736aa946ad50b1a0cae0dd66df1594e102a85cfa489b07358";
+      sha512 = "64a14f40678a64def00597eb1bd7cc0c9759b56da4e72bfe24c3d4e50ef92414bb18346b8ecc9c0a834a063a2a2fe7920b72c2ce59c7cb7ba67442f7e8842b13";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-x86_64/be/thunderbird-52.9.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/be/thunderbird-60.0.tar.bz2";
       locale = "be";
       arch = "linux-x86_64";
-      sha512 = "635ad3d57463eb51830dfb66871258b69bcfcd9ed0c2b38956a25db242905113a6604812a6d6aa1778dde1783595e2b4cb6b3a51f48af6f6740e6613ba78adf7";
+      sha512 = "6368f3693f0f54f4768d27a4b9f82015d4c789180db3d8ea5302053e2ff8d7bc5e50388b00b7b1d534c0145718255c84d43977361f5d8cff5f432a8336436e9c";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-x86_64/bg/thunderbird-52.9.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/bg/thunderbird-60.0.tar.bz2";
       locale = "bg";
       arch = "linux-x86_64";
-      sha512 = "573f0b63a16f62662958ff1884a2cf76436242f377258f39ea254732aaa4d1f358ee651b2e4f5eb2cd3c20f69ad6b6ea2bc6985fc3d99e23edeb75d3ca55ba27";
+      sha512 = "b881105b39f5a3d66cf77105fb555af692477b387a4fe2c13c9c398968baa705cdf3753665b0e6d28bd8fdb21bc75e439672402dbe1185a9f8289b8236f505ef";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-x86_64/bn-BD/thunderbird-52.9.1.tar.bz2";
-      locale = "bn-BD";
-      arch = "linux-x86_64";
-      sha512 = "d277706e699ebdbcc4ccbf8f6d5c4c256b0ed65ad7b604962e8cc2dffa5b06eeffad7dfd5dc5a08b87a25f0e728daa79d2e0ca0ab9ade7136057a3aef203f26f";
-    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-x86_64/br/thunderbird-52.9.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/br/thunderbird-60.0.tar.bz2";
       locale = "br";
       arch = "linux-x86_64";
-      sha512 = "11e362e77f4b5ce75823c3aa60fab68969d8b19b6fb9a51027c81ad4e1e4f46c4a5a4e3218361521d076859453523a30cf79ec715abfc59cca31c541f02562ef";
+      sha512 = "c45a3dfb8ae5564071c2e59a623263f995a83f9ac20c84345be47935a337b863be3d334b2e0f40767842e9a53cbb1eb00dd87645cb0b8a737efce15cd81b9336";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-x86_64/ca/thunderbird-52.9.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/ca/thunderbird-60.0.tar.bz2";
       locale = "ca";
       arch = "linux-x86_64";
-      sha512 = "7eba10d82c0b2bd58d87670c345ac8948c06f1b6a0ac853d40b1993fc101931dc581b3e252ebe0a22948f18738d60714aeabebc8dc1953f0199ccb6b2fa1af47";
+      sha512 = "aec05cd7e9a5f529408bca9691ef68bb384b23b9cd464c9342336b96da0afe20473121128861c20d55bc3c4f5c33f779fe892681270d5b26df6b64aa27c13511";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-x86_64/cs/thunderbird-52.9.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/cs/thunderbird-60.0.tar.bz2";
       locale = "cs";
       arch = "linu