diff options
author | Weijia Wang <9713184+wegank@users.noreply.github.com> | 2024-01-07 18:48:50 +0100 |
---|---|---|
committer | Weijia Wang <9713184+wegank@users.noreply.github.com> | 2024-01-07 18:49:21 +0100 |
commit | e10c14a05bb4ee7d57db9eebd722a504ecd6ba97 (patch) | |
tree | 4a61d2eaa5e23a98a29ee73c5c0029d7b73940f3 | |
parent | 4166d6026065b381ae0bb43ed10fcba2103238c4 (diff) |
libsForQt5.kpmcore, partition-manager: move to applications/kde
-rw-r--r-- | pkgs/applications/kde/default.nix | 2 | ||||
-rw-r--r-- | pkgs/applications/kde/kpmcore/default.nix (renamed from pkgs/development/libraries/kpmcore/default.nix) | 12 | ||||
-rw-r--r-- | pkgs/applications/kde/kpmcore/nixostrustedprefix.patch (renamed from pkgs/development/libraries/kpmcore/nixostrustedprefix.patch) | 0 | ||||
-rw-r--r-- | pkgs/applications/kde/partitionmanager/default.nix (renamed from pkgs/tools/misc/partition-manager/default.nix) | 9 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 2 | ||||
-rw-r--r-- | pkgs/top-level/qt5-packages.nix | 2 |
6 files changed, 6 insertions, 21 deletions
diff --git a/pkgs/applications/kde/default.nix b/pkgs/applications/kde/default.nix index ab2c10d15779b..3fd3894719759 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 index 260a94e06aded..4bfc4db0f4a53 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 index cb1eb68364dd5..cb1eb68364dd5 100644 --- a/pkgs/development/libraries/kpmcore/nixostrustedprefix.patch +++ b/pkgs/applications/kde/kpmcore/nixostrustedprefix.patch diff --git a/pkgs/tools/misc/partition-manager/default.nix b/pkgs/applications/kde/partitionmanager/default.nix index 8dde1e68bd297..a898984d45021 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 5670bbec2d836..fd860051fa5a4 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 f38a4c1c49078..365f89dc990ff 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 { }; |