about summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
authorAndré Vitor de Lima Matos <andre.vmatos@gmail.com>2022-04-21 12:41:40 -0300
committerAndré Vitor de Lima Matos <andre.vmatos@gmail.com>2022-04-24 19:05:44 -0300
commitaee2d2511b53cb318c64a598779f653007ba0d3e (patch)
tree86e86eb576ace92dc8cc350f6ea771f866c425f1 /pkgs
parentdd47a9f456e832c6750d0d730bb8b6ee1bb28c71 (diff)
skanpage: move into/use kde/gear distribution from 22.04
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/applications/kde/default.nix1
-rw-r--r--pkgs/applications/kde/skanpage.nix (renamed from pkgs/applications/graphics/skanpage/default.nix)6
-rw-r--r--pkgs/top-level/aliases.nix4
-rw-r--r--pkgs/top-level/all-packages.nix2
4 files changed, 3 insertions, 10 deletions
diff --git a/pkgs/applications/kde/default.nix b/pkgs/applications/kde/default.nix
index d8838587d7666..115f3c54f7611 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
index bee04cbad52c1..024ad25ee6df7 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 437fd6b8abac2..a6c03165b78b1 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 a43b418172d6f..1d8504a41ac26 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;