libsForQt5.kpmcore, partition-manager: move to applications/kde

+6 -21
+2
pkgs/applications/kde/default.nix
··· 187 kpat = callPackage ./kpat.nix {}; 188 kpimtextedit = callPackage ./kpimtextedit.nix {}; 189 kpkpass = callPackage ./kpkpass.nix {}; 190 kpublictransport = callPackage ./kpublictransport.nix {}; 191 kqtquickcharts = callPackage ./kqtquickcharts.nix {}; 192 krdc = callPackage ./krdc.nix {}; ··· 230 minuet = callPackage ./minuet.nix {}; 231 okular = callPackage ./okular.nix {}; 232 palapeli = callPackage ./palapeli.nix {}; 233 picmi = callPackage ./picmi.nix {}; 234 pim-data-exporter = callPackage ./pim-data-exporter.nix {}; 235 pim-sieve-editor = callPackage ./pim-sieve-editor.nix {};
··· 187 kpat = callPackage ./kpat.nix {}; 188 kpimtextedit = callPackage ./kpimtextedit.nix {}; 189 kpkpass = callPackage ./kpkpass.nix {}; 190 + kpmcore = callPackage ./kpmcore {}; 191 kpublictransport = callPackage ./kpublictransport.nix {}; 192 kqtquickcharts = callPackage ./kqtquickcharts.nix {}; 193 krdc = callPackage ./krdc.nix {}; ··· 231 minuet = callPackage ./minuet.nix {}; 232 okular = callPackage ./okular.nix {}; 233 palapeli = callPackage ./palapeli.nix {}; 234 + partitionmanager = callPackage ./partitionmanager {}; 235 picmi = callPackage ./picmi.nix {}; 236 pim-data-exporter = callPackage ./pim-data-exporter.nix {}; 237 pim-sieve-editor = callPackage ./pim-sieve-editor.nix {};
+2 -10
pkgs/development/libraries/kpmcore/default.nix pkgs/applications/kde/kpmcore/default.nix
··· 1 - { stdenv 2 , lib 3 - , fetchurl 4 , extra-cmake-modules 5 , qca-qt5 6 , kauth ··· 9 , util-linux 10 }: 11 12 - stdenv.mkDerivation rec { 13 pname = "kpmcore"; 14 - # NOTE: When changing this version, also change the version of `partition-manager`. 15 - version = "23.04.1"; 16 - 17 - src = fetchurl { 18 - url = "mirror://kde/stable/release-service/${version}/src/${pname}-${version}.tar.xz"; 19 - hash = "sha256-NFIq8CZwYvpqDOOYLlBqoGdgfNPsyf15FkB3dToDCB8="; 20 - }; 21 22 patches = [ 23 ./nixostrustedprefix.patch
··· 1 + { mkDerivation 2 , lib 3 , extra-cmake-modules 4 , qca-qt5 5 , kauth ··· 8 , util-linux 9 }: 10 11 + mkDerivation rec { 12 pname = "kpmcore"; 13 14 patches = [ 15 ./nixostrustedprefix.patch
pkgs/development/libraries/kpmcore/nixostrustedprefix.patch pkgs/applications/kde/kpmcore/nixostrustedprefix.patch
+1 -8
pkgs/tools/misc/partition-manager/default.nix pkgs/applications/kde/partitionmanager/default.nix
··· 65 ]; 66 67 in 68 - mkDerivation rec { 69 pname = "partitionmanager"; 70 - # NOTE: When changing this version, also change the version of `kpmcore`. 71 - version = "23.04.1"; 72 - 73 - src = fetchurl { 74 - url = "mirror://kde/stable/release-service/${version}/src/${pname}-${version}.tar.xz"; 75 - hash = "sha256-iMf6/QOJIDTKHAsCg3ey4GX0QHwrYl2LcCWxZsolMl8="; 76 - }; 77 78 nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook ]; 79
··· 65 ]; 66 67 in 68 + mkDerivation { 69 pname = "partitionmanager"; 70 71 nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook ]; 72
+1 -1
pkgs/top-level/all-packages.nix
··· 9858 9859 krakenx = callPackage ../tools/system/krakenx { }; 9860 9861 - partition-manager = libsForQt5.callPackage ../tools/misc/partition-manager { }; 9862 9863 kpcli = callPackage ../tools/security/kpcli { }; 9864
··· 9858 9859 krakenx = callPackage ../tools/system/krakenx { }; 9860 9861 + partition-manager = libsForQt5.partitionmanager; 9862 9863 kpcli = callPackage ../tools/security/kpcli { }; 9864
-2
pkgs/top-level/qt5-packages.nix
··· 164 165 libqaccessibilityclient = callPackage ../development/libraries/libqaccessibilityclient { }; 166 167 - kpmcore = callPackage ../development/libraries/kpmcore { }; 168 - 169 mapbox-gl-native = libsForQt5.callPackage ../development/libraries/mapbox-gl-native { }; 170 171 mapbox-gl-qml = libsForQt5.callPackage ../development/libraries/mapbox-gl-qml { };
··· 164 165 libqaccessibilityclient = callPackage ../development/libraries/libqaccessibilityclient { }; 166 167 mapbox-gl-native = libsForQt5.callPackage ../development/libraries/mapbox-gl-native { }; 168 169 mapbox-gl-qml = libsForQt5.callPackage ../development/libraries/mapbox-gl-qml { };