From df275267440bd5b7bdb7c835417eb038eee9d3e9 Mon Sep 17 00:00:00 2001 From: Gavin John Date: Thu, 5 Sep 2024 11:13:33 -0700 Subject: [PATCH 1/7] qgroundcontrol: move to by-name --- .../default.nix => by-name/qg/qgroundcontrol/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename pkgs/{applications/science/robotics/qgroundcontrol/default.nix => by-name/qg/qgroundcontrol/package.nix} (100%) diff --git a/pkgs/applications/science/robotics/qgroundcontrol/default.nix b/pkgs/by-name/qg/qgroundcontrol/package.nix similarity index 100% rename from pkgs/applications/science/robotics/qgroundcontrol/default.nix rename to pkgs/by-name/qg/qgroundcontrol/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a4ca15f6c5db..00b0bd079710 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -32787,7 +32787,7 @@ with pkgs; wrapQemuBinfmtP = callPackage ../applications/virtualization/qemu/binfmt-p-wrapper.nix { }; - qgroundcontrol = libsForQt5.callPackage ../applications/science/robotics/qgroundcontrol { }; + qgroundcontrol = libsForQt5.callPackage ../by-name/qg/qgroundcontrol/package.nix { }; qjackctl = libsForQt5.callPackage ../applications/audio/qjackctl { }; From 16cba249af34bf0046006bff2ef8920aa1977e14 Mon Sep 17 00:00:00 2001 From: Gavin John Date: Thu, 5 Sep 2024 11:14:35 -0700 Subject: [PATCH 2/7] qgroundcontrol: nixfmt --- pkgs/by-name/qg/qgroundcontrol/package.nix | 47 ++++++++++++++++++---- 1 file changed, 40 insertions(+), 7 deletions(-) diff --git a/pkgs/by-name/qg/qgroundcontrol/package.nix b/pkgs/by-name/qg/qgroundcontrol/package.nix index 8caddf7dfcef..7cb29b68a09e 100644 --- a/pkgs/by-name/qg/qgroundcontrol/package.nix +++ b/pkgs/by-name/qg/qgroundcontrol/package.nix @@ -1,14 +1,39 @@ -{ lib, stdenv, fetchFromGitHub, SDL2, qtbase, qtcharts, qtlocation, qtserialport -, qtsvg, qtquickcontrols2, qtgraphicaleffects, qtspeech, qtx11extras, qmake -, qttools, gst_all_1, wayland, pkg-config, wrapQtAppsHook }: +{ + lib, + stdenv, + fetchFromGitHub, + SDL2, + qtbase, + qtcharts, + qtlocation, + qtserialport, + qtsvg, + qtquickcontrols2, + qtgraphicaleffects, + qtspeech, + qtx11extras, + qmake, + qttools, + gst_all_1, + wayland, + pkg-config, + wrapQtAppsHook, +}: stdenv.mkDerivation rec { pname = "qgroundcontrol"; version = "4.4.2"; propagatedBuildInputs = [ - qtbase qtcharts qtlocation qtserialport qtsvg qtquickcontrols2 - qtgraphicaleffects qtspeech qtx11extras + qtbase + qtcharts + qtlocation + qtserialport + qtsvg + qtquickcontrols2 + qtgraphicaleffects + qtspeech + qtx11extras ]; gstInputs = with gst_all_1; [ @@ -21,7 +46,12 @@ stdenv.mkDerivation rec { ]; buildInputs = [ SDL2 ] ++ gstInputs ++ propagatedBuildInputs; - nativeBuildInputs = [ pkg-config qmake qttools wrapQtAppsHook ]; + nativeBuildInputs = [ + pkg-config + qmake + qttools + wrapQtAppsHook + ]; preConfigure = '' mkdir build @@ -76,7 +106,10 @@ stdenv.mkDerivation rec { homepage = "http://qgroundcontrol.com/"; license = licenses.gpl3Plus; platforms = platforms.linux; - maintainers = with maintainers; [ lopsided98 pandapip1 ]; + maintainers = with maintainers; [ + lopsided98 + pandapip1 + ]; mainProgram = "QGroundControl"; }; } From 4f688aecec5c30480ea501188b3912b10dfe2442 Mon Sep 17 00:00:00 2001 From: Gavin John Date: Thu, 5 Sep 2024 11:14:58 -0700 Subject: [PATCH 3/7] qgroundcontrol: Replace homepage with https link --- pkgs/by-name/qg/qgroundcontrol/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/qg/qgroundcontrol/package.nix b/pkgs/by-name/qg/qgroundcontrol/package.nix index 7cb29b68a09e..3d12c817ab59 100644 --- a/pkgs/by-name/qg/qgroundcontrol/package.nix +++ b/pkgs/by-name/qg/qgroundcontrol/package.nix @@ -103,7 +103,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Provides full ground station support and configuration for the PX4 and APM Flight Stacks"; - homepage = "http://qgroundcontrol.com/"; + homepage = "https://qgroundcontrol.com/"; license = licenses.gpl3Plus; platforms = platforms.linux; maintainers = with maintainers; [ From e78df2f24e493c1daf1f263512f8586b347bb0ef Mon Sep 17 00:00:00 2001 From: Gavin John Date: Thu, 5 Sep 2024 11:15:37 -0700 Subject: [PATCH 4/7] qgroundcontrol: remove a `with lib;` --- pkgs/by-name/qg/qgroundcontrol/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/qg/qgroundcontrol/package.nix b/pkgs/by-name/qg/qgroundcontrol/package.nix index 3d12c817ab59..b48cd62aadbb 100644 --- a/pkgs/by-name/qg/qgroundcontrol/package.nix +++ b/pkgs/by-name/qg/qgroundcontrol/package.nix @@ -101,12 +101,12 @@ stdenv.mkDerivation rec { fetchSubmodules = true; }; - meta = with lib; { + meta = { description = "Provides full ground station support and configuration for the PX4 and APM Flight Stacks"; homepage = "https://qgroundcontrol.com/"; - license = licenses.gpl3Plus; - platforms = platforms.linux; - maintainers = with maintainers; [ + license = lib.licenses.gpl3Plus; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ lopsided98 pandapip1 ]; From 54bda8090bf8495ee8905c653b8d57a9a8898e51 Mon Sep 17 00:00:00 2001 From: Gavin John Date: Thu, 5 Sep 2024 11:22:08 -0700 Subject: [PATCH 5/7] qgroundcontrol: add changelog --- pkgs/by-name/qg/qgroundcontrol/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/qg/qgroundcontrol/package.nix b/pkgs/by-name/qg/qgroundcontrol/package.nix index b48cd62aadbb..72f8a972f9ac 100644 --- a/pkgs/by-name/qg/qgroundcontrol/package.nix +++ b/pkgs/by-name/qg/qgroundcontrol/package.nix @@ -104,6 +104,7 @@ stdenv.mkDerivation rec { meta = { description = "Provides full ground station support and configuration for the PX4 and APM Flight Stacks"; homepage = "https://qgroundcontrol.com/"; + changelog = "https://github.com/mavlink/qgroundcontrol/blob/master/ChangeLog.md"; license = lib.licenses.gpl3Plus; platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ From 4c6a603295b7b74b7cbf19c3558f17358b6b5bdb Mon Sep 17 00:00:00 2001 From: Gavin John Date: Thu, 5 Sep 2024 11:22:48 -0700 Subject: [PATCH 6/7] qgroundcontrol: Remove pname misuse --- pkgs/by-name/qg/qgroundcontrol/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/qg/qgroundcontrol/package.nix b/pkgs/by-name/qg/qgroundcontrol/package.nix index 72f8a972f9ac..abaf015764aa 100644 --- a/pkgs/by-name/qg/qgroundcontrol/package.nix +++ b/pkgs/by-name/qg/qgroundcontrol/package.nix @@ -95,7 +95,7 @@ stdenv.mkDerivation rec { # TODO: package mavlink so we can build from a normal source tarball src = fetchFromGitHub { owner = "mavlink"; - repo = pname; + repo = "qgroundcontrol"; rev = "v${version}"; hash = "sha256-2Bc4uC/2e+PTsvFZ4RjnTzkOiBO9vsYHeLPkcwpDRrg="; fetchSubmodules = true; From 5bffe8d9b592aa371880714f746a0de5c0d924cc Mon Sep 17 00:00:00 2001 From: Gavin John Date: Thu, 5 Sep 2024 12:01:16 -0700 Subject: [PATCH 7/7] qgroundcontrol: switch to using libsForQt5 --- pkgs/by-name/qg/qgroundcontrol/package.nix | 28 +++++++--------------- pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 9 insertions(+), 21 deletions(-) diff --git a/pkgs/by-name/qg/qgroundcontrol/package.nix b/pkgs/by-name/qg/qgroundcontrol/package.nix index abaf015764aa..b27e6bb51b4a 100644 --- a/pkgs/by-name/qg/qgroundcontrol/package.nix +++ b/pkgs/by-name/qg/qgroundcontrol/package.nix @@ -3,28 +3,17 @@ stdenv, fetchFromGitHub, SDL2, - qtbase, - qtcharts, - qtlocation, - qtserialport, - qtsvg, - qtquickcontrols2, - qtgraphicaleffects, - qtspeech, - qtx11extras, - qmake, - qttools, + libsForQt5, gst_all_1, wayland, pkg-config, - wrapQtAppsHook, }: stdenv.mkDerivation rec { pname = "qgroundcontrol"; version = "4.4.2"; - propagatedBuildInputs = [ + propagatedBuildInputs = with libsForQt5; [ qtbase qtcharts qtlocation @@ -46,12 +35,13 @@ stdenv.mkDerivation rec { ]; buildInputs = [ SDL2 ] ++ gstInputs ++ propagatedBuildInputs; - nativeBuildInputs = [ - pkg-config - qmake - qttools - wrapQtAppsHook - ]; + nativeBuildInputs = + [ pkg-config ] + ++ (with libsForQt5; [ + qmake + qttools + wrapQtAppsHook + ]); preConfigure = '' mkdir build diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 00b0bd079710..facc5b1fb2ce 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -32787,8 +32787,6 @@ with pkgs; wrapQemuBinfmtP = callPackage ../applications/virtualization/qemu/binfmt-p-wrapper.nix { }; - qgroundcontrol = libsForQt5.callPackage ../by-name/qg/qgroundcontrol/package.nix { }; - qjackctl = libsForQt5.callPackage ../applications/audio/qjackctl { }; qimgv = libsForQt5.callPackage ../applications/graphics/qimgv { };