From aee2d2511b53cb318c64a598779f653007ba0d3e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Vitor=20de=20Lima=20Matos?= Date: Thu, 21 Apr 2022 12:41:40 -0300 Subject: [PATCH] skanpage: move into/use kde/gear distribution from 22.04 --- pkgs/applications/kde/default.nix | 1 + .../{graphics/skanpage/default.nix => kde/skanpage.nix} | 6 ------ pkgs/top-level/aliases.nix | 4 ++-- pkgs/top-level/all-packages.nix | 2 -- 4 files changed, 3 insertions(+), 10 deletions(-) rename pkgs/applications/{graphics/skanpage/default.nix => kde/skanpage.nix} (74%) diff --git a/pkgs/applications/kde/default.nix b/pkgs/applications/kde/default.nix index d8838587d766..115f3c54f761 100644 --- a/pkgs/applications/kde/default.nix +++ b/pkgs/applications/kde/default.nix @@ -219,6 +219,7 @@ let print-manager = callPackage ./print-manager.nix {}; rocs = callPackage ./rocs.nix {}; skanlite = callPackage ./skanlite.nix {}; + skanpage = callPackage ./skanpage.nix {}; spectacle = callPackage ./spectacle.nix {}; yakuake = callPackage ./yakuake.nix {}; zanshin = callPackage ./zanshin.nix {}; diff --git a/pkgs/applications/graphics/skanpage/default.nix b/pkgs/applications/kde/skanpage.nix similarity index 74% rename from pkgs/applications/graphics/skanpage/default.nix rename to pkgs/applications/kde/skanpage.nix index bee04cbad52c..024ad25ee6df 100644 --- a/pkgs/applications/graphics/skanpage/default.nix +++ b/pkgs/applications/kde/skanpage.nix @@ -10,12 +10,6 @@ mkDerivation rec { pname = "skanpage"; - version = "1.0.0"; - - src = fetchurl { - url = "mirror://kde/stable/skanpage/${version}/${pname}-${version}.tar.xz"; - hash = "sha256-kPVAG64oPkKF3ztHB4V7M2xc1AcvwiHnYpMMLMQNYGA="; - }; nativeBuildInputs = [ extra-cmake-modules ]; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 437fd6b8abac..a6c03165b78b 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1512,8 +1512,8 @@ mapAliases ({ plasma-integration plasma-nano plasma-nm plasma-pa plasma-mobile plasma-systemmonitor plasma-thunderbolt plasma-vault plasma-workspace plasma-workspace-wallpapers polkit-kde-agent powerdevil qqc2-breeze-style - sddm-kcm skanlite spectacle systemsettings xdg-desktop-portal-kde yakuake - zanshin + sddm-kcm skanlite skanpage spectacle systemsettings xdg-desktop-portal-kde + yakuake zanshin ; inherit (plasma5Packages.thirdParty) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a43b418172d6..1d8504a41ac2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -29480,8 +29480,6 @@ with pkgs; sipp = callPackage ../development/tools/misc/sipp { }; - skanpage = libsForQt5.callPackage ../applications/graphics/skanpage { }; - soci = callPackage ../development/libraries/soci { }; socialscan = with python3.pkgs; toPythonApplication socialscan;