From 7d652d0c23219eef86a55b6ee80d41e2040f97f7 Mon Sep 17 00:00:00 2001 From: Ben Wolsieffer Date: Wed, 12 May 2021 22:48:04 -0400 Subject: [PATCH 1/3] mavproxy: 1.8.34 -> 1.8.36 --- pkgs/applications/science/robotics/mavproxy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/robotics/mavproxy/default.nix b/pkgs/applications/science/robotics/mavproxy/default.nix index 51389d20b7d1..800e97c43a12 100644 --- a/pkgs/applications/science/robotics/mavproxy/default.nix +++ b/pkgs/applications/science/robotics/mavproxy/default.nix @@ -3,11 +3,11 @@ buildPythonApplication rec { pname = "MAVProxy"; - version = "1.8.34"; + version = "1.8.36"; src = fetchPypi { inherit pname version; - sha256 = "b922c9b6cf4719667e195a02d8364ccebbe7966a9c18666f8ac22eae9d9e7a2c"; + sha256 = "1gc92gp45d9pcxhmc03kbnar61jxfpx50v3jhdrsflpzhxyhjz5g"; }; postPatch = '' From 09ac4d615a229d71790d2afc1dd7a052b3dac425 Mon Sep 17 00:00:00 2001 From: Ben Wolsieffer Date: Wed, 12 May 2021 22:51:36 -0400 Subject: [PATCH 2/3] mavproxy: clarify license as gpl3Plus The README states: "MAVProxy is released under the GNU General Public License v3 or later" --- pkgs/applications/science/robotics/mavproxy/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/science/robotics/mavproxy/default.nix b/pkgs/applications/science/robotics/mavproxy/default.nix index 800e97c43a12..8d27446bd664 100644 --- a/pkgs/applications/science/robotics/mavproxy/default.nix +++ b/pkgs/applications/science/robotics/mavproxy/default.nix @@ -30,7 +30,7 @@ buildPythonApplication rec { meta = with lib; { description = "MAVLink proxy and command line ground station"; homepage = "https://github.com/ArduPilot/MAVProxy"; - license = licenses.gpl3; + license = licenses.gpl3Plus; maintainers = with maintainers; [ lopsided98 ]; }; } From 37934f8ca32150f303e42cd097b58f7c8ecc2b37 Mon Sep 17 00:00:00 2001 From: Ben Wolsieffer Date: Wed, 12 May 2021 22:52:52 -0400 Subject: [PATCH 3/3] python3Packages.pymavlink: license should be lgpl3Plus The license file doesn't specify that later versions can be used, but I missed that it is stated in the README: "pymavlink is released under the GNU Lesser General Public License v3 or later." --- pkgs/development/python-modules/pymavlink/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/pymavlink/default.nix b/pkgs/development/python-modules/pymavlink/default.nix index 2f39be79821c..894e5c128e9e 100644 --- a/pkgs/development/python-modules/pymavlink/default.nix +++ b/pkgs/development/python-modules/pymavlink/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python MAVLink interface and utilities"; homepage = "https://github.com/ArduPilot/pymavlink"; - license = with licenses; [ lgpl3Only mit ]; + license = with licenses; [ lgpl3Plus mit ]; maintainers = with maintainers; [ lopsided98 ]; }; }