inav-configurator -> inav-configurator5

nixos/doc/manual/release-notes/rl-2411.section.md

@@ -223,6 +223,8 @@
 
 ## Backward Incompatibilities {#sec-release-24.11-incompatibilities}
 
+- `inav-configurator` package was renamed into `inav-configurator5`. Please use an appropriate version matching your firmware.
+
 - Nixpkgs now requires Nix 2.3.17 or newer to allow for zstd compressed binary artifacts.
 
 - The `sound` options have been removed or renamed, as they had a lot of unintended side effects. See [below](#sec-release-24.11-migration-sound) for details.

pkgs/by-name/in/inav-configurator/package.nix

@@ -1,61 +1,69 @@
-{ lib, stdenv, fetchurl, makeDesktopItem, copyDesktopItems, nwjs, wrapGAppsHook3, gsettings-desktop-schemas, gtk3 }:
+{ 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 = "inav-configurator";
-  version = "5.1.0";
+  pname = "${bin_name}-" + shortVersion;
+  inherit version;
 
   src = fetchurl {
     url = "https://github.com/iNavFlight/inav-configurator/releases/download/${version}/INAV-Configurator_linux64_${version}.tar.gz";
-    sha256 = "sha256-ZvZxQICa5fnJBTx0aW/hqQCuhQW9MkcVa2sOjPYaPXM=";
+    inherit hash;
   };
 
-  icon = fetchurl {
-    url = "https://raw.githubusercontent.com/iNavFlight/inav-configurator/bf3fc89e6df51ecb83a386cd000eebf16859879e/images/inav_icon_128.png";
-    sha256 = "1i844dzzc5s5cr4vfpi6k2kdn8jiqq2n6c0fjqvsp4wdidwjahzw";
-  };
+  postUnpack = ''
+    find -name "lib*.so" -delete
+    find -name "lib*.so.*" -delete
+  '';
 
   nativeBuildInputs = [ copyDesktopItems wrapGAppsHook3 ];
 
-  buildInputs = [ gsettings-desktop-schemas gtk3 ];
+  buildInputs = [ gsettings-desktop-schemas ];
 
-  installPhase = ''
+  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 inav-configurator $out/opt/inav-configurator/
-    install -m 444 -D $icon $out/share/icons/hicolor/128x128/apps/${pname}.png
+    cp -r * $out/opt/${pname}/
+    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
+    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 = "iNavFlight configuration tool";
-      desktopName = "iNav Configurator";
-      genericName = "Flight controller configuration tool";
-    })
-  ];
-
-  meta = with lib; {
-    description = "INav flight control system configuration tool";
-    mainProgram = "inav-configurator";
+  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.
+      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;
+    sourceProvenance = [ lib.sourceTypes.binaryNativeCode ];
+    license = lib.licenses.gpl3Only;
+    maintainers = with lib.maintainers; [ tilcreator wucke13 ilya-epifanov ];
+    platforms = lib.platforms.linux;
   };
 }

pkgs/top-level/all-packages.nix

@@ -17877,6 +17877,12 @@ with pkgs;
 
   apmplanner2 = libsForQt5.callPackage ../applications/science/robotics/apmplanner2 { };
 
+  inav-configurator5 = callPackage ../by-name/in/inav-configurator/package.nix {
+    version = "5.1.0";
+    hash = "sha256-ZvZxQICa5fnJBTx0aW/hqQCuhQW9MkcVa2sOjPYaPXM=";
+    packed = true;
+  };
+
   ### MISC
 
   android-file-transfer = libsForQt5.callPackage ../tools/filesystems/android-file-transfer { };