From e10c14a05bb4ee7d57db9eebd722a504ecd6ba97 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Sun, 7 Jan 2024 18:48:50 +0100 Subject: [PATCH 1/2] libsForQt5.kpmcore, partition-manager: move to applications/kde --- pkgs/applications/kde/default.nix | 2 ++ .../kde}/kpmcore/default.nix | 12 ++---------- .../kde}/kpmcore/nixostrustedprefix.patch | 0 .../kde/partitionmanager}/default.nix | 9 +-------- pkgs/top-level/all-packages.nix | 2 +- pkgs/top-level/qt5-packages.nix | 2 -- 6 files changed, 6 insertions(+), 21 deletions(-) rename pkgs/{development/libraries => applications/kde}/kpmcore/default.nix (75%) rename pkgs/{development/libraries => applications/kde}/kpmcore/nixostrustedprefix.patch (100%) rename pkgs/{tools/misc/partition-manager => applications/kde/partitionmanager}/default.nix (88%) diff --git a/pkgs/applications/kde/default.nix b/pkgs/applications/kde/default.nix index ab2c10d15779..3fd389471975 100644 --- a/pkgs/applications/kde/default.nix +++ b/pkgs/applications/kde/default.nix @@ -187,6 +187,7 @@ let kpat = callPackage ./kpat.nix {}; kpimtextedit = callPackage ./kpimtextedit.nix {}; kpkpass = callPackage ./kpkpass.nix {}; + kpmcore = callPackage ./kpmcore {}; kpublictransport = callPackage ./kpublictransport.nix {}; kqtquickcharts = callPackage ./kqtquickcharts.nix {}; krdc = callPackage ./krdc.nix {}; @@ -230,6 +231,7 @@ let minuet = callPackage ./minuet.nix {}; okular = callPackage ./okular.nix {}; palapeli = callPackage ./palapeli.nix {}; + partitionmanager = callPackage ./partitionmanager {}; picmi = callPackage ./picmi.nix {}; pim-data-exporter = callPackage ./pim-data-exporter.nix {}; pim-sieve-editor = callPackage ./pim-sieve-editor.nix {}; diff --git a/pkgs/development/libraries/kpmcore/default.nix b/pkgs/applications/kde/kpmcore/default.nix similarity index 75% rename from pkgs/development/libraries/kpmcore/default.nix rename to pkgs/applications/kde/kpmcore/default.nix index 260a94e06ade..4bfc4db0f4a5 100644 --- a/pkgs/development/libraries/kpmcore/default.nix +++ b/pkgs/applications/kde/kpmcore/default.nix @@ -1,6 +1,5 @@ -{ stdenv +{ mkDerivation , lib -, fetchurl , extra-cmake-modules , qca-qt5 , kauth @@ -9,15 +8,8 @@ , util-linux }: -stdenv.mkDerivation rec { +mkDerivation rec { pname = "kpmcore"; - # NOTE: When changing this version, also change the version of `partition-manager`. - version = "23.04.1"; - - src = fetchurl { - url = "mirror://kde/stable/release-service/${version}/src/${pname}-${version}.tar.xz"; - hash = "sha256-NFIq8CZwYvpqDOOYLlBqoGdgfNPsyf15FkB3dToDCB8="; - }; patches = [ ./nixostrustedprefix.patch diff --git a/pkgs/development/libraries/kpmcore/nixostrustedprefix.patch b/pkgs/applications/kde/kpmcore/nixostrustedprefix.patch similarity index 100% rename from pkgs/development/libraries/kpmcore/nixostrustedprefix.patch rename to pkgs/applications/kde/kpmcore/nixostrustedprefix.patch diff --git a/pkgs/tools/misc/partition-manager/default.nix b/pkgs/applications/kde/partitionmanager/default.nix similarity index 88% rename from pkgs/tools/misc/partition-manager/default.nix rename to pkgs/applications/kde/partitionmanager/default.nix index 8dde1e68bd29..a898984d4502 100644 --- a/pkgs/tools/misc/partition-manager/default.nix +++ b/pkgs/applications/kde/partitionmanager/default.nix @@ -65,15 +65,8 @@ let ]; in -mkDerivation rec { +mkDerivation { pname = "partitionmanager"; - # NOTE: When changing this version, also change the version of `kpmcore`. - version = "23.04.1"; - - src = fetchurl { - url = "mirror://kde/stable/release-service/${version}/src/${pname}-${version}.tar.xz"; - hash = "sha256-iMf6/QOJIDTKHAsCg3ey4GX0QHwrYl2LcCWxZsolMl8="; - }; nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5670bbec2d83..fd860051fa5a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9858,7 +9858,7 @@ with pkgs; krakenx = callPackage ../tools/system/krakenx { }; - partition-manager = libsForQt5.callPackage ../tools/misc/partition-manager { }; + partition-manager = libsForQt5.partitionmanager; kpcli = callPackage ../tools/security/kpcli { }; diff --git a/pkgs/top-level/qt5-packages.nix b/pkgs/top-level/qt5-packages.nix index f38a4c1c4907..365f89dc990f 100644 --- a/pkgs/top-level/qt5-packages.nix +++ b/pkgs/top-level/qt5-packages.nix @@ -164,8 +164,6 @@ in (noExtraAttrs (kdeFrameworks // plasmaMobileGear // plasma5 // plasma5.thirdP libqaccessibilityclient = callPackage ../development/libraries/libqaccessibilityclient { }; - kpmcore = callPackage ../development/libraries/kpmcore { }; - mapbox-gl-native = libsForQt5.callPackage ../development/libraries/mapbox-gl-native { }; mapbox-gl-qml = libsForQt5.callPackage ../development/libraries/mapbox-gl-qml { }; From 788c45eb575e7db2e7a104d586059958e61ab916 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Mon, 8 Jan 2024 13:36:56 +0100 Subject: [PATCH 2/2] partition-manager: move to aliases.nix --- nixos/modules/programs/partition-manager.nix | 2 +- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 -- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/nixos/modules/programs/partition-manager.nix b/nixos/modules/programs/partition-manager.nix index c18598b7c25d..cf0491ff028f 100644 --- a/nixos/modules/programs/partition-manager.nix +++ b/nixos/modules/programs/partition-manager.nix @@ -14,6 +14,6 @@ with lib; config = mkIf config.programs.partition-manager.enable { services.dbus.packages = [ pkgs.libsForQt5.kpmcore ]; # `kpmcore` need to be installed to pull in polkit actions. - environment.systemPackages = [ pkgs.libsForQt5.kpmcore pkgs.partition-manager ]; + environment.systemPackages = [ pkgs.libsForQt5.kpmcore pkgs.libsForQt5.partitionmanager ]; }; } diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 10d4d1b2840b..6c0a823dcf21 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -760,6 +760,7 @@ mapAliases ({ paperless-ng = paperless-ngx; # Added 2022-04-11 paper-note = throw "paper-note has been removed: abandoned by upstream"; # Added 2023-05-03 parity = openethereum; # Added 2020-08-01 + partition-manager = libsForQt5.partitionmanager; # Added 2024-01-08 pash = throw "'pash' has been removed: abandoned by upstream. Use 'powershell' instead"; # Added 2023-09-16 pcsctools = pcsc-tools; # Added 2023-12-07 pdf2xml = throw "'pdf2xml' was removed: abandoned for years."; # Added 2023-10-22 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fd860051fa5a..1b63e0019dfc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9858,8 +9858,6 @@ with pkgs; krakenx = callPackage ../tools/system/krakenx { }; - partition-manager = libsForQt5.partitionmanager; - kpcli = callPackage ../tools/security/kpcli { }; kphotoalbum = libsForQt5.callPackage ../applications/graphics/kphotoalbum { };