diff --git a/pkgs/applications/misc/gpxsee/default.nix b/pkgs/by-name/gp/gpxsee/package.nix similarity index 72% rename from pkgs/applications/misc/gpxsee/default.nix rename to pkgs/by-name/gp/gpxsee/package.nix index 1c0fef12c42a..3e414f88eadb 100644 --- a/pkgs/applications/misc/gpxsee/default.nix +++ b/pkgs/by-name/gp/gpxsee/package.nix @@ -2,52 +2,33 @@ lib, stdenv, fetchFromGitHub, - qmake, nix-update-script, - qtbase, - qttools, - qtlocation ? null, # qt5 only - qtpositioning ? null, # qt6 only - qtserialport, - qtsvg, - wrapQtAppsHook, + qt6, wrapGAppsHook3, }: -let - isQt6 = lib.versions.major qtbase.version == "6"; -in stdenv.mkDerivation (finalAttrs: { pname = "gpxsee"; - version = "13.46"; + version = "13.47"; src = fetchFromGitHub { owner = "tumic0"; repo = "GPXSee"; tag = finalAttrs.version; - hash = "sha256-SkAEnKviUHQrej1fhpLs1bh/nAOgmRzzBzTFe4fURVc="; + hash = "sha256-1waE0A70MsUaGttaxHcOO2aaeRdZ9ihc7ZeqJ+azH/0="; }; buildInputs = [ - qtserialport - ] - ++ ( - if isQt6 then - [ - qtbase - qtpositioning - qtsvg - ] - else - [ - qtlocation - ] - ); + qt6.qtbase + qt6.qtpositioning + qt6.qtserialport + qt6.qtsvg + ]; nativeBuildInputs = [ - qmake - qttools - wrapQtAppsHook + qt6.qmake + qt6.qttools + qt6.wrapQtAppsHook wrapGAppsHook3 ]; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 51bceb1e742e..ffcc8a553d97 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1118,6 +1118,8 @@ mapAliases { googler = throw "'googler' has been removed, as it no longer works and is abandoned upstream"; # Added 2025-04-01 gpicview = throw "'gpicview' has been removed due to lack of maintenance upstream and depending on gtk2. Consider using 'loupe', 'gthumb' or 'image-roll' instead"; # Added 2024-09-15 gprbuild-boot = gnatPackages.gprbuild-boot; # Added 2024-02-25; + gpxsee-qt5 = throw "gpxsee-qt5 was removed, use gpxsee instead"; # added 2025-09-09 + gpxsee-qt6 = gpxsee; # added 2025-09-09 gqview = throw "'gqview' has been removed due to lack of maintenance upstream and depending on gtk2. Consider using 'gthumb' instead"; gr-framework = throw "gr-framework has been removed, as it was broken"; # Added 2025-08-25 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 71f5affd6a80..1efc68614a62 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11755,12 +11755,6 @@ with pkgs; withDoc = true; }; - gpxsee-qt5 = libsForQt5.callPackage ../applications/misc/gpxsee { }; - - gpxsee-qt6 = qt6Packages.callPackage ../applications/misc/gpxsee { }; - - gpxsee = gpxsee-qt5; - guvcview = libsForQt5.callPackage ../os-specific/linux/guvcview { }; hachoir = with python3Packages; toPythonApplication hachoir;