diff --git a/pkgs/applications/kde/default.nix b/pkgs/applications/kde/default.nix index fed0e84de737..6a57ccf9ee6e 100644 --- a/pkgs/applications/kde/default.nix +++ b/pkgs/applications/kde/default.nix @@ -141,6 +141,7 @@ let kigo = callPackage ./kigo.nix {}; killbots = callPackage ./killbots.nix {}; kimap = callPackage ./kimap.nix {}; + kio-admin = callPackage ./kio-admin.nix {}; kio-extras = callPackage ./kio-extras.nix {}; kio-gdrive = callPackage ./kio-gdrive.nix {}; kipi-plugins = callPackage ./kipi-plugins.nix {}; diff --git a/pkgs/applications/kde/kio-admin.nix b/pkgs/applications/kde/kio-admin.nix new file mode 100644 index 000000000000..4734d447a1ac --- /dev/null +++ b/pkgs/applications/kde/kio-admin.nix @@ -0,0 +1,16 @@ +{ mkDerivation, lib, extra-cmake-modules, qtbase, kio, ki18n, polkit-qt }: + +mkDerivation { + pname = "kio-admin"; + + nativeBuildInputs = [ extra-cmake-modules ]; + buildInputs = [ qtbase kio ki18n polkit-qt ]; + + meta = with lib; { + description = "Manage files as administrator using the admin:// KIO protocol."; + homepage = "https://invent.kde.org/system/kio-admin"; + license = licenses.gpl2Plus; + platforms = platforms.linux; + maintainers = with maintainers; [ k900 ]; + }; +} diff --git a/pkgs/tools/filesystems/kio-admin/default.nix b/pkgs/tools/filesystems/kio-admin/default.nix deleted file mode 100644 index 7e4a97fa255a..000000000000 --- a/pkgs/tools/filesystems/kio-admin/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ lib, stdenv, fetchFromGitLab, cmake, extra-cmake-modules, qtbase, wrapQtAppsHook, kio, ki18n, polkit-qt }: - -stdenv.mkDerivation rec { - pname = "kio-admin"; - version = "1.0.0"; - - src = fetchFromGitLab { - domain = "invent.kde.org"; - owner = "system"; - repo = "kio-admin"; - rev = "v${version}"; - hash = "sha256-llnUsOttqFJVArJdZS9s6qHS9eGbdtdoaPMXKHtsUn4="; - }; - - nativeBuildInputs = [ cmake extra-cmake-modules wrapQtAppsHook ]; - buildInputs = [ qtbase kio ki18n polkit-qt ]; - - meta = with lib; { - description = "Manage files as administrator using the admin:// KIO protocol."; - homepage = "https://invent.kde.org/system/kio-admin"; - license = licenses.gpl2Plus; - platforms = platforms.linux; - maintainers = with maintainers; [ k900 ]; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index ee87c750db94..60bd366de97a 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -789,6 +789,7 @@ mapAliases ({ kindlegen = throw "kindlegen has been removed from nixpkgs, as it's abandoned and no longer available for download"; # Added 2021-03-09 kinetic-cpp-client = throw "kinetic-cpp-client has been removed from nixpkgs, as it's abandoned"; # Added 2020-04-28 kino = throw "kino has been removed because it was broken and abandoned"; # Added 2021-04-25 + kio-admin = libsForQt5.kdeGear.kio-admin; # Added 2023-03-18 knockknock = throw "knockknock has been removed from nixpkgs because the upstream project is abandoned"; # Added 2022-01-01 kodestudio = throw "kodestudio has been removed from nixpkgs, as the nix package has been long unmaintained and out of date."; # Added 2022-06-07 kodiGBM = kodi-gbm; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d0db95eda950..4db46c431657 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8963,8 +8963,6 @@ with pkgs; kibi = callPackage ../applications/editors/kibi { }; - kio-admin = libsForQt5.callPackage ../tools/filesystems/kio-admin { }; - kio-fuse = libsForQt5.callPackage ../tools/filesystems/kio-fuse { }; kismet = callPackage ../applications/networking/sniffers/kismet { };