From a7ba1f82f1664f92fe9b13ef65d80c5ffdc1b16c Mon Sep 17 00:00:00 2001
From: Ilya Epifanov <mail@ilya.network>
Date: Sat, 15 Jun 2024 13:18:25 +0200
Subject: [PATCH 1/2] inav-configurator: add versioning support

---
 .../robotics/inav-configurator/default.nix    | 69 +++++++++++++++++++
 pkgs/by-name/in/inav-configurator/package.nix | 61 ----------------
 pkgs/top-level/all-packages.nix               |  6 ++
 3 files changed, 75 insertions(+), 61 deletions(-)
 create mode 100644 pkgs/applications/science/robotics/inav-configurator/default.nix
 delete mode 100644 pkgs/by-name/in/inav-configurator/package.nix

diff --git a/pkgs/applications/science/robotics/inav-configurator/default.nix b/pkgs/applications/science/robotics/inav-configurator/default.nix
new file mode 100644
index 0000000000000..23d91c3f719d7
--- /dev/null
+++ b/pkgs/applications/science/robotics/inav-configurator/default.nix
@@ -0,0 +1,69 @@
+{ lib, stdenv, fetchurl, makeDesktopItem, copyDesktopItems, nwjs, wrapGAppsHook3, gsettings-desktop-schemas, version, hash, packed ? false }:
+
+let
+  shortVersion = lib.versions.major version;
+  bin_name = "inav-configurator";
+in
+stdenv.mkDerivation rec {
+  pname = "${bin_name}-" + shortVersion;
+  inherit version;
+
+  src = fetchurl {
+    url = "https://github.com/iNavFlight/inav-configurator/releases/download/${version}/INAV-Configurator_linux64_${version}.tar.gz";
+    inherit hash;
+  };
+
+  postUnpack = ''
+    find -name "lib*.so" -delete
+    find -name "lib*.so.*" -delete
+  '';
+
+  nativeBuildInputs = [ copyDesktopItems wrapGAppsHook3 ];
+
+  buildInputs = [ gsettings-desktop-schemas ];
+
+  installPhase = let
+    icon = fetchurl {
+      url = "https://raw.githubusercontent.com/iNavFlight/inav-configurator/bf3fc89e6df51ecb83a386cd000eebf16859879e/images/inav_icon_128.png";
+      hash = "sha256-/EMleYuNk6s3lg4wYwXGUSLbppgmXrdJZkUX9n8jBMU=";
+    };
+  in ''
+    runHook preInstall
+
+    mkdir -p $out/bin \
+             $out/opt/${pname}
+
+    cp -r * $out/opt/${pname}/
+    install -m 444 -D ${icon} $out/share/icons/hicolor/128x128/apps/${pname}.png
+
+    chmod +x $out/opt/${pname}/inav-configurator
+    makeWrapper ${nwjs}/bin/nw $out/bin/${pname} \
+                --add-flags $out/opt/${pname}${if packed then "/${bin_name}" else ""}
+
+    runHook postInstall
+  '';
+
+  desktopItems = makeDesktopItem {
+    name = pname;
+    exec = pname;
+    icon = pname;
+    comment = "INAV configuration tool " + version;
+    desktopName = "INAV Configurator " + version;
+    genericName = "Flight controller configuration tool";
+  };
+
+  meta = {
+    description = "The INAV flight control system configuration tool";
+    mainProgram = pname;
+    longDescription = ''
+      A crossplatform configuration tool for the INAV flight control system.
+      Various types of aircraft are supported by the tool and by INAV, e.g.
+      quadcopters, hexacopters, octocopters and fixed-wing aircraft.
+    '';
+    homepage = "https://github.com/iNavFlight/inav/wiki";
+    sourceProvenance = [ lib.sourceTypes.binaryNativeCode ];
+    license = lib.licenses.gpl3Only;
+    maintainers = with lib.maintainers; [ tilcreator wucke13 ilya-epifanov ];
+    platforms = lib.platforms.linux;
+  };
+}
diff --git a/pkgs/by-name/in/inav-configurator/package.nix b/pkgs/by-name/in/inav-configurator/package.nix
deleted file mode 100644
index 6862b909b044a..0000000000000
--- a/pkgs/by-name/in/inav-configurator/package.nix
+++ /dev/null
@@ -1,61 +0,0 @@
-{ lib, stdenv, fetchurl, makeDesktopItem, copyDesktopItems, nwjs, wrapGAppsHook3, gsettings-desktop-schemas, gtk3 }:
-
-stdenv.mkDerivation rec {
-  pname = "inav-configurator";
-  version = "5.1.0";
-
-  src = fetchurl {
-    url = "https://github.com/iNavFlight/inav-configurator/releases/download/${version}/INAV-Configurator_linux64_${version}.tar.gz";
-    sha256 = "sha256-ZvZxQICa5fnJBTx0aW/hqQCuhQW9MkcVa2sOjPYaPXM=";
-  };
-
-  icon = fetchurl {
-    url = "https://raw.githubusercontent.com/iNavFlight/inav-configurator/bf3fc89e6df51ecb83a386cd000eebf16859879e/images/inav_icon_128.png";
-    sha256 = "1i844dzzc5s5cr4vfpi6k2kdn8jiqq2n6c0fjqvsp4wdidwjahzw";
-  };
-
-  nativeBuildInputs = [ copyDesktopItems wrapGAppsHook3 ];
-
-  buildInputs = [ gsettings-desktop-schemas gtk3 ];
-
-  installPhase = ''
-    runHook preInstall
-
-    mkdir -p $out/bin \
-             $out/opt/${pname}
-
-    cp -r inav-configurator $out/opt/inav-configurator/
-    install -m 444 -D $icon $out/share/icons/hicolor/128x128/apps/${pname}.png
-
-    chmod +x $out/opt/inav-configurator/inav-configurator
-    makeWrapper ${nwjs}/bin/nw $out/bin/${pname} --add-flags $out/opt/inav-configurator/inav-configurator
-
-    runHook postInstall
-  '';
-
-  desktopItems = [
-    (makeDesktopItem {
-      name = pname;
-      exec = pname;
-      icon = pname;
-      comment = "iNavFlight configuration tool";
-      desktopName = "iNav Configurator";
-      genericName = "Flight controller configuration tool";
-    })
-  ];
-
-  meta = with lib; {
-    description = "INav flight control system configuration tool";
-    mainProgram = "inav-configurator";
-    longDescription = ''
-      A crossplatform configuration tool for the iNav flight control system.
-      Various types of aircraft are supported by the tool and by iNav, e.g.
-      quadcopters, hexacopters, octocopters and fixed-wing aircraft.
-    '';
-    homepage = "https://github.com/iNavFlight/inav/wiki";
-    sourceProvenance = with sourceTypes; [ binaryNativeCode ];
-    license = licenses.gpl3Only;
-    maintainers = with maintainers; [ tilcreator wucke13 ];
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5f45b720e1db1..66d04ada431ae 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -18299,6 +18299,12 @@ with pkgs;
 
   apmplanner2 = libsForQt5.callPackage ../applications/science/robotics/apmplanner2 { };
 
+  inav-configurator = callPackage ../applications/science/robotics/inav-configurator {
+    version = "5.1.0";
+    hash = "sha256-ZvZxQICa5fnJBTx0aW/hqQCuhQW9MkcVa2sOjPYaPXM=";
+    packed = true;
+  };
+
   ### MISC
 
   android-file-transfer = libsForQt5.callPackage ../tools/filesystems/android-file-transfer { };

From db917c00b665cfe16dcf89ecb316a81b7218db5f Mon Sep 17 00:00:00 2001
From: Ilya Epifanov <mail@ilya.network>
Date: Sat, 15 Jun 2024 13:19:22 +0200
Subject: [PATCH 2/2] inav-configurator6: init at 6.1.0

---
 pkgs/top-level/all-packages.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 66d04ada431ae..96b57463d6d4f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -18304,6 +18304,10 @@ with pkgs;
     hash = "sha256-ZvZxQICa5fnJBTx0aW/hqQCuhQW9MkcVa2sOjPYaPXM=";
     packed = true;
   };
+  inav-configurator6 = callPackage ../applications/science/robotics/inav-configurator {
+    version = "6.1.0";
+    hash = "sha256-HIicfkPM824+T+zNWK9l6VDZd9Yt/1fVTQjYqfqoUSs=";
+  };
 
   ### MISC