Merge branch 'nixos-unstable' of https://github.com/NixOS/nixpkgs

Conflicts:
	nixpkgs/nixos/modules/config/console.nix
	nixpkgs/nixos/modules/services/mail/mailman.nix
	nixpkgs/nixos/modules/services/mail/public-inbox.nix
	nixpkgs/nixos/modules/services/mail/rss2email.nix
	nixpkgs/nixos/modules/services/networking/ssh/sshd.nix
	nixpkgs/pkgs/applications/networking/instant-messengers/dino/default.nix
	nixpkgs/pkgs/applications/networking/irc/weechat/default.nix
	nixpkgs/pkgs/applications/window-managers/sway/default.nix
	nixpkgs/pkgs/build-support/go/module.nix
	nixpkgs/pkgs/build-support/rust/build-rust-package/default.nix
	nixpkgs/pkgs/development/interpreters/python/default.nix
	nixpkgs/pkgs/development/node-packages/overrides.nix
	nixpkgs/pkgs/development/tools/b4/default.nix
	nixpkgs/pkgs/servers/dict/dictd-db.nix
	nixpkgs/pkgs/servers/mail/public-inbox/default.nix
	nixpkgs/pkgs/tools/security/pinentry/default.nix
	nixpkgs/pkgs/tools/text/unoconv/default.nix
	nixpkgs/pkgs/top-level/all-packages.nix

1 files changed, 112 insertions, 92 deletions

diff --git a/nixpkgs/pkgs/desktops/plasma-5/default.nix b/nixpkgs/pkgs/desktops/plasma-5/default.nix
index 41cdc298e987..0c501b4c5a4c 100644
--- a/nixpkgs/pkgs/desktops/plasma-5/default.nix
+++ b/nixpkgs/pkgs/desktops/plasma-5/default.nix
@@ -1,39 +1,47 @@
 /*
 
-# New packages
+  # New packages
 
-READ THIS FIRST
+  READ THIS FIRST
 
-This module is for official packages in KDE Plasma 5. All available packages are
-listed in `./srcs.nix`, although a few are not yet packaged in Nixpkgs (see
-below).
+  This module is for official packages in KDE Plasma 5. All available packages are
+  listed in `./srcs.nix`, although a few are not yet packaged in Nixpkgs (see
+  below).
 
-IF YOUR PACKAGE IS NOT LISTED IN `./srcs.nix`, IT DOES NOT GO HERE.
+  IF YOUR PACKAGE IS NOT LISTED IN `./srcs.nix`, IT DOES NOT GO HERE.
 
-Many of the packages released upstream are not yet built in Nixpkgs due to lack
-of demand. To add a Nixpkgs build for an upstream package, copy one of the
-existing packages here and modify it as necessary.
+  Many of the packages released upstream are not yet built in Nixpkgs due to lack
+  of demand. To add a Nixpkgs build for an upstream package, copy one of the
+  existing packages here and modify it as necessary.
 
-# Updates
+  # Updates
 
-1. Update the URL in `./fetch.sh`.
-2. Run `./maintainers/scripts/fetch-kde-qt.sh pkgs/desktops/plasma-5`
+  1. Update the URL in `./fetch.sh`.
+  2. Run `./maintainers/scripts/fetch-kde-qt.sh pkgs/desktops/plasma-5`
    from the top of the Nixpkgs tree.
-3. Use `nox-review wip` to check that everything builds.
-4. Commit the changes and open a pull request.
+  3. Use `nox-review wip` to check that everything builds.
+  4. Commit the changes and open a pull request.
 
 */
 
-{ libsForQt5, lib, config, fetchurl
-, gconf, gsettings-desktop-schemas
+{ libsForQt5
+, lib
+, config
+, fetchurl
+, gconf
+, gsettings-desktop-schemas
 }:
 
 let
-  minQtVersion = "5.15";
-  broken = lib.versionOlder libsForQt5.qtbase.version minQtVersion;
   maintainers = with lib.maintainers; [ ttuegel nyanloutre ];
   license = with lib.licenses; [
-    lgpl21Plus lgpl3Plus bsd2 mit gpl2Plus gpl3Plus fdl12
+    lgpl21Plus
+    lgpl3Plus
+    bsd2
+    mit
+    gpl2Plus
+    gpl3Plus
+    fdl12Plus
   ];
 
   srcs = import ./srcs.nix {
@@ -41,33 +49,35 @@ let
     mirror = "mirror://kde";
   };
 
-  mkDerivation = libsForQt5.callPackage ({ mkDerivation }: mkDerivation) {};
+  qtStdenv = libsForQt5.callPackage ({ stdenv }: stdenv) {};
 
-  packages = self: with self;
+  packages = self:
     let
 
       propagate = out:
-        let setupHook = { writeScript }:
-              writeScript "setup-hook" ''
-                if [[ "''${hookName-}" != postHook ]]; then
-                    postHooks+=("source @dev@/nix-support/setup-hook")
-                else
-                    # Propagate $${out} output
-                    propagatedUserEnvPkgs+=" @${out}@"
-
-                    if [ -z "$outputDev" ]; then
-                        echo "error: \$outputDev is unset!" >&2
-                        exit 1
-                    fi
-
-                    # Propagate $dev so that this setup hook is propagated
-                    # But only if there is a separate $dev output
-                    if [ "$outputDev" != out ]; then
-                        propagatedBuildInputs+=" @dev@"
-                    fi
-                fi
-              '';
-        in callPackage setupHook {};
+        let
+          setupHook = { writeScript }:
+            writeScript "setup-hook" ''
+              if [[ "''${hookName-}" != postHook ]]; then
+                  postHooks+=("source @dev@/nix-support/setup-hook")
+              else
+                  # Propagate $${out} output
+                  propagatedUserEnvPkgs+=" @${out}@"
+
+                  if [ -z "$outputDev" ]; then
+                      echo "error: \$outputDev is unset!" >&2
+                      exit 1
+                  fi
+
+                  # Propagate $dev so that this setup hook is propagated
+                  # But only if there is a separate $dev output
+                  if [ "$outputDev" != out ]; then
+                      propagatedBuildInputs+=" @dev@"
+                  fi
+              fi
+            '';
+        in
+        callPackage setupHook { };
 
       propagateBin = propagate "bin";
 
@@ -86,71 +96,80 @@ let
 
             defaultSetupHook = if hasBin && hasDev then propagateBin else null;
             setupHook = args.setupHook or defaultSetupHook;
+            nativeBuildInputs = (args.nativeBuildInputs or []) ++ [ libsForQt5.wrapQtAppsHook ];
 
             meta =
-              let meta = args.meta or {}; in
+              let meta = args.meta or { }; in
               meta // {
                 homepage = meta.homepage or "http://www.kde.org";
                 license = meta.license or license;
-                maintainers = (meta.maintainers or []) ++ maintainers;
+                maintainers = (meta.maintainers or [ ]) ++ maintainers;
                 platforms = meta.platforms or lib.platforms.linux;
-                broken = meta.broken or broken;
               };
           in
-          mkDerivation (args // {
-            inherit pname version meta outputs setupHook src;
+          qtStdenv.mkDerivation (args // {
+            inherit pname version meta outputs setupHook src nativeBuildInputs;
           });
       };
 
-    in {
-      bluedevil = callPackage ./bluedevil.nix {};
-      breeze-gtk = callPackage ./breeze-gtk.nix {};
-      breeze-qt5 = callPackage ./breeze-qt5.nix {};
-      breeze-grub = callPackage ./breeze-grub.nix {};
-      breeze-plymouth = callPackage ./breeze-plymouth {};
-      discover = callPackage ./discover.nix {};
-      kactivitymanagerd = callPackage ./kactivitymanagerd.nix {};
-      kde-cli-tools = callPackage ./kde-cli-tools.nix {};
+    in
+    {
+      aura-browser = callPackage ./aura-browser.nix { };
+      bluedevil = callPackage ./bluedevil.nix { };
+      breeze-gtk = callPackage ./breeze-gtk.nix { };
+      breeze-qt5 = callPackage ./breeze-qt5.nix { };
+      breeze-grub = callPackage ./breeze-grub.nix { };
+      breeze-plymouth = callPackage ./breeze-plymouth { };
+      discover = callPackage ./discover.nix { };
+      flatpak-kcm = callPackage ./flatpak-kcm.nix { };
+      kactivitymanagerd = callPackage ./kactivitymanagerd.nix { };
+      kde-cli-tools = callPackage ./kde-cli-tools.nix { };
       kde-gtk-config = callPackage ./kde-gtk-config { inherit gsettings-desktop-schemas; };
-      kdecoration = callPackage ./kdecoration.nix {};
-      kdeplasma-addons = callPackage ./kdeplasma-addons.nix {};
-      kgamma5 = callPackage ./kgamma5.nix {};
-      khotkeys = callPackage ./khotkeys.nix {};
-      kinfocenter = callPackage ./kinfocenter.nix {};
-      kmenuedit = callPackage ./kmenuedit.nix {};
-      kscreen = callPackage ./kscreen.nix {};
-      kscreenlocker = callPackage ./kscreenlocker.nix {};
-      ksshaskpass = callPackage ./ksshaskpass.nix {};
-      ksystemstats = callPackage ./ksystemstats.nix {};
-      kwallet-pam = callPackage ./kwallet-pam.nix {};
-      kwayland-integration = callPackage ./kwayland-integration.nix {};
-      kwin = callPackage ./kwin {};
-      kwrited = callPackage ./kwrited.nix {};
-      layer-shell-qt = callPackage ./layer-shell-qt.nix {};
-      libkscreen = callPackage ./libkscreen {};
-      libksysguard = callPackage ./libksysguard {};
-      milou = callPackage ./milou.nix {};
-      oxygen = callPackage ./oxygen.nix {};
-      plasma-browser-integration = callPackage ./plasma-browser-integration.nix {};
-      plasma-desktop = callPackage ./plasma-desktop {};
-      plasma-disks = callPackage ./plasma-disks.nix {};
-      plasma-integration = callPackage ./plasma-integration {};
-      plasma-mobile = callPackage ./plasma-mobile {};
-      plasma-nano = callPackage ./plasma-nano {};
-      plasma-nm = callPackage ./plasma-nm {};
+      kdecoration = callPackage ./kdecoration.nix { };
+      kdeplasma-addons = callPackage ./kdeplasma-addons.nix { };
+      kgamma5 = callPackage ./kgamma5.nix { };
+      khotkeys = callPackage ./khotkeys.nix { };
+      kinfocenter = callPackage ./kinfocenter { };
+      kmenuedit = callPackage ./kmenuedit.nix { };
+      kpipewire = callPackage ./kpipewire.nix { };
+      kscreen = callPackage ./kscreen.nix { };
+      kscreenlocker = callPackage ./kscreenlocker.nix { };
+      ksshaskpass = callPackage ./ksshaskpass.nix { };
+      ksystemstats = callPackage ./ksystemstats.nix { };
+      kwallet-pam = callPackage ./kwallet-pam.nix { };
+      kwayland-integration = callPackage ./kwayland-integration.nix { };
+      kwin = callPackage ./kwin { };
+      kwrited = callPackage ./kwrited.nix { };
+      layer-shell-qt = callPackage ./layer-shell-qt.nix { };
+      libkscreen = callPackage ./libkscreen { };
+      libksysguard = callPackage ./libksysguard { };
+      milou = callPackage ./milou.nix { };
+      oxygen = callPackage ./oxygen.nix { };
+      oxygen-sounds = callPackage ./oxygen-sounds.nix { };
+      plank-player = callPackage ./plank-player.nix { };
+      plasma-bigscreen = callPackage ./plasma-bigscreen.nix { };
+      plasma-browser-integration = callPackage ./plasma-browser-integration.nix { };
+      plasma-desktop = callPackage ./plasma-desktop { };
+      plasma-disks = callPackage ./plasma-disks.nix { };
+      plasma-integration = callPackage ./plasma-integration { };
+      plasma-mobile = callPackage ./plasma-mobile { };
+      plasma-nano = callPackage ./plasma-nano { };
+      plasma-nm = callPackage ./plasma-nm { };
       plasma-pa = callPackage ./plasma-pa.nix { inherit gconf; };
-      plasma-sdk = callPackage ./plasma-sdk.nix {};
+      plasma-remotecontrollers = callPackage ./plasma-remotecontrollers.nix { };
+      plasma-sdk = callPackage ./plasma-sdk.nix { };
       plasma-systemmonitor = callPackage ./plasma-systemmonitor.nix { };
       plasma-thunderbolt = callPackage ./plasma-thunderbolt.nix { };
-      plasma-vault = callPackage ./plasma-vault {};
-      plasma-workspace = callPackage ./plasma-workspace {};
-      plasma-workspace-wallpapers = callPackage ./plasma-workspace-wallpapers.nix {};
-      polkit-kde-agent = callPackage ./polkit-kde-agent.nix {};
-      powerdevil = callPackage ./powerdevil.nix {};
-      qqc2-breeze-style = callPackage ./qqc2-breeze-style.nix {};
-      sddm-kcm = callPackage ./sddm-kcm.nix {};
-      systemsettings = callPackage ./systemsettings.nix {};
-      xdg-desktop-portal-kde = callPackage ./xdg-desktop-portal-kde.nix {};
+      plasma-vault = callPackage ./plasma-vault { };
+      plasma-welcome = callPackage ./plasma-welcome.nix { };
+      plasma-workspace = callPackage ./plasma-workspace { };
+      plasma-workspace-wallpapers = callPackage ./plasma-workspace-wallpapers.nix { };
+      polkit-kde-agent = callPackage ./polkit-kde-agent.nix { };
+      powerdevil = callPackage ./powerdevil.nix { };
+      qqc2-breeze-style = callPackage ./qqc2-breeze-style.nix { };
+      sddm-kcm = callPackage ./sddm-kcm.nix { };
+      systemsettings = callPackage ./systemsettings.nix { };
+      xdg-desktop-portal-kde = callPackage ./xdg-desktop-portal-kde.nix { };
 
       thirdParty = let inherit (libsForQt5) callPackage; in {
         plasma-applet-caffeine-plus = callPackage ./3rdparty/addons/caffeine-plus.nix { };
@@ -161,6 +180,7 @@ let
         krohnkite = callPackage ./3rdparty/kwin/scripts/krohnkite.nix { };
         krunner-ssh = callPackage ./3rdparty/addons/krunner-ssh.nix { };
         krunner-symbols = callPackage ./3rdparty/addons/krunner-symbols.nix { };
+        kzones = callPackage ./3rdparty/kwin/scripts/kzones.nix { };
         lightly = callPackage ./3rdparty/lightly { };
         parachute = callPackage ./3rdparty/kwin/scripts/parachute.nix { };
       };