Merge master into haskell-updates

2021-12-19 00:08:41 +00:00 · 2021-12-19 00:08:41 +00:00 · 0c19ae0aba
commit 0c19ae0aba
parent eec551fc15 487bb1b1e2
164 changed files with 2537 additions and 2482 deletions
--- a/doc/languages-frameworks/dotnet.section.md
+++ b/doc/languages-frameworks/dotnet.section.md
@ -72,7 +72,7 @@ The `dotnetCorePackages.sdk` contains both a runtime and the full sdk of a given
 To package Dotnet applications, you can use `buildDotnetModule`. This has similar arguments to `stdenv.mkDerivation`, with the following additions:

 * `projectFile` has to be used for specifying the dotnet project file relative to the source root. These usually have `.sln` or `.csproj` file extensions. This can be an array of multiple projects as well.
-* `nugetDeps` has to be used to specify the NuGet dependency file. Unfortunately, these cannot be deterministically fetched without a lockfile. This file should be generated using `nuget-to-nix` tool, which is available in nixpkgs.
+* `nugetDeps` has to be used to specify the NuGet dependency file. Unfortunately, these cannot be deterministically fetched without a lockfile. A script to fetch these is available as `passthru.fetch-deps`. This file can also be generated manually using `nuget-to-nix` tool, which is available in nixpkgs.
 * `packNupkg` is used to pack project as a `nupkg`, and installs it to `$out/share`. If set to `true`, the derivation can be used as a dependency for another dotnet project by adding it to `projectReferences`.
 * `projectReferences` can be used to resolve `ProjectReference` project items. Referenced projects can be packed with `buildDotnetModule` by setting the `packNupkg = true` attribute and passing a list of derivations to `projectReferences`. Since we are sharing referenced projects as NuGets they must be added to csproj/fsproj files as `PackageReference` as well.
 For example, your project has a local dependency:
@ -99,6 +99,8 @@ To package Dotnet applications, you can use `buildDotnetModule`. This has simila
 * `dotnetPackFlags` can be used to pass flags to `dotnet pack`. Used only if `packNupkg` is set to `true`.
 * `dotnetFlags` can be used to pass flags to all of the above phases.

+When packaging a new application, you need to fetch it's dependencies. You can set `nugetDeps` to an empty string to make the derivation temporarily evaluate, and then run `nix-build -A package.passthru.fetch-deps` to generate it's dependency fetching script. After running the script, you should have the location of the generated lockfile printed to the console. This can be copied to a stable directory. Note that if either `projectFile` or `nugetDeps` are unset, this script cannot be generated!
+
 Here is an example `default.nix`, using some of the previously discussed arguments:
 ```nix
 { lib, buildDotnetModule, dotnetCorePackages, ffmpeg }:
@ -112,7 +114,8 @@ in buildDotnetModule rec {
  src = ./.;

  projectFile = "src/project.sln";
-  nugetDeps = ./deps.nix; # File generated with `nuget-to-nix path/to/src > deps.nix`.
+  nugetDeps = ./deps.nix; # File generated with `nix-build -A package.passthru.fetch-deps`.
+
  projectReferences = [ referencedProject ]; # `referencedProject` must contain `nupkg` in the folder structure.

  dotnet-sdk = dotnetCorePackages.sdk_3_1;
--- a/doc/languages-frameworks/python.section.md
+++ b/doc/languages-frameworks/python.section.md
@ -995,18 +995,18 @@ called with `callPackage` and passed `python` or `pythonPackages` (possibly
 specifying an interpreter version), like this:

 ```nix
-{ lib, python3Packages }:
+{ lib, python3 }:

-python3Packages.buildPythonApplication rec {
+python3.pkgs.buildPythonApplication rec {
  pname = "luigi";
  version = "2.7.9";

-  src = python3Packages.fetchPypi {
+  src = python3.pkgs.fetchPypi {
    inherit pname version;
    sha256 = "035w8gqql36zlan0xjrzz9j4lh9hs0qrsgnbyw07qs7lnkvbdv9x";
  };

-  propagatedBuildInputs = with python3Packages; [ tornado_4 python-daemon ];
+  propagatedBuildInputs = with python3.pkgs; [ tornado python-daemon ];

  meta = with lib; {
    ...
--- a/doc/languages-frameworks/rust.section.md
+++ b/doc/languages-frameworks/rust.section.md
@ -293,7 +293,7 @@ Test flags, e.g., `--package foo`, can be passed to `cargo test` via the

 Another attribute, called `checkFlags`, is used to pass arguments to the test
 binary itself, as stated
-(here)[https://doc.rust-lang.org/cargo/commands/cargo-test.html].
+[here](https://doc.rust-lang.org/cargo/commands/cargo-test.html).

 #### Tests relying on the structure of the `target/` directory {#tests-relying-on-the-structure-of-the-target-directory}

--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@ -12130,6 +12130,12 @@
    githubId = 122319;
    name = "Renato Alves";
  };
+  unrooted = {
+    name = "Konrad Klawikowski";
+    email = "konrad.root.klawikowski@gmail.com";
+    github = "unrooted";
+    githubId = 30440603;
+  };
  uralbash = {
    email = "root@uralbash.ru";
    github = "uralbash";
@ -12579,6 +12585,12 @@
    githubId = 78392041;
    name = "Winter";
  };
+  wintrmvte = {
+    name = "Jakub Lutczyn";
+    email = "kubalutczyn@gmail.com";
+    github = "wintrmvte";
+    githubId = 41823252;
+  };
  wirew0rm = {
    email = "alex@wirew0rm.de";
    github = "wirew0rm";
@ -12657,6 +12669,12 @@
    githubId = 28888242;
    name = "WORLDofPEACE";
  };
+  wr0belj = {
+    name = "Jakub Wróbel";
+    email = "wrobel.jakub@protonmail.com";
+    github = "wr0belj";
+    githubId = 40501814;
+  };
  wscott = {
    email = "wsc9tt@gmail.com";
    github = "wscott";
--- a/maintainers/team-list.nix
+++ b/maintainers/team-list.nix
@ -247,6 +247,15 @@ with lib.maintainers; {
    scope = "Maintain Podman and CRI-O related packages and modules.";
  };

+  redcodelabs = {
+    members = [
+      unrooted
+      wr0belj
+      wintrmvte
+    ];
+    scope = "Maintain Red Code Labs related packages and modules.";
+  };
+
  sage = {
    members = [
      timokau
--- a/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml
+++ b/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml
@ -167,6 +167,16 @@
          using this default will print a warning when rebuilt.
        </para>
      </listitem>
+      <listitem>
+        <para>
+          The option
+          <link linkend="opt-services.ssh.enableAskPassword">services.ssh.enableAskPassword</link>
+          was added, decoupling the setting of
+          <literal>SSH_ASKPASS</literal> from
+          <literal>services.xserver.enable</literal>. This allows easy
+          usage in non-X11 environments, e.g. Wayland.
+        </para>
+      </listitem>
    </itemizedlist>
  </section>
 </section>
--- a/nixos/doc/manual/release-notes/rl-2205.section.md
+++ b/nixos/doc/manual/release-notes/rl-2205.section.md
@ -68,3 +68,9 @@ In addition to numerous new and upgraded packages, this release has the followin

 - The `services.unifi.openPorts` option default value of `true` is now deprecated and will be changed to `false` in 22.11.
  Configurations using this default will print a warning when rebuilt.
+
+- The option
+  [services.ssh.enableAskPassword](#opt-services.ssh.enableAskPassword) was
+  added, decoupling the setting of `SSH_ASKPASS` from
+  `services.xserver.enable`. This allows easy usage in non-X11 environments,
+  e.g. Wayland.
--- a/nixos/modules/programs/ssh.nix
+++ b/nixos/modules/programs/ssh.nix
@ -33,6 +33,13 @@ in

    programs.ssh = {

+      enableAskPassword = mkOption {
+        type = types.bool;
+        default = config.services.xserver.enable;
+        defaultText = literalExpression "config.services.xserver.enable";
+        description = "Whether to configure SSH_ASKPASS in the environment.";
+      };
+
      askPassword = mkOption {
        type = types.str;
        default = "${pkgs.x11_ssh_askpass}/libexec/x11-ssh-askpass";
@ -287,7 +294,7 @@ in
        # Allow ssh-agent to ask for confirmation. This requires the
        # unit to know about the user's $DISPLAY (via ‘systemctl
        # import-environment’).
-        environment.SSH_ASKPASS = optionalString config.services.xserver.enable askPasswordWrapper;
+        environment.SSH_ASKPASS = optionalString cfg.enableAskPassword askPasswordWrapper;
        environment.DISPLAY = "fake"; # required to make ssh-agent start $SSH_ASKPASS
      };

@ -298,7 +305,7 @@ in
        fi
      '';

-    environment.variables.SSH_ASKPASS = optionalString config.services.xserver.enable askPassword;
+    environment.variables.SSH_ASKPASS = optionalString cfg.enableAskPassword askPassword;

  };
 }
--- a/nixos/modules/services/hardware/spacenavd.nix
+++ b/nixos/modules/services/hardware/spacenavd.nix
@ -15,7 +15,6 @@ in {
  config = mkIf cfg.enable {
    systemd.user.services.spacenavd = {
      description = "Daemon for the Spacenavigator 6DOF mice by 3Dconnexion";
-      after = [ "syslog.target" ];
      wantedBy = [ "graphical.target" ];
      serviceConfig = {
        ExecStart = "${pkgs.spacenavd}/bin/spacenavd -d -l syslog";
--- a/nixos/modules/services/networking/unifi.nix
+++ b/nixos/modules/services/networking/unifi.nix
@ -7,7 +7,6 @@ let
    @${cfg.jrePackage}/bin/java java \
        ${optionalString (cfg.initialJavaHeapSize != null) "-Xms${(toString cfg.initialJavaHeapSize)}m"} \
        ${optionalString (cfg.maximumJavaHeapSize != null) "-Xmx${(toString cfg.maximumJavaHeapSize)}m"} \
-        ${optionalString (lib.versionOlder cfg.unifiPackage.version "6.5.54") "-Dlog4j2.formatMsgNoLookups=true"} \
        -jar ${stateDir}/lib/ace.jar
  '';
 in
--- a/nixos/modules/services/x11/desktop-managers/pantheon.nix
+++ b/nixos/modules/services/x11/desktop-managers/pantheon.nix
@ -227,9 +227,9 @@ in
      environment.sessionVariables.GTK_CSD = "1";
      environment.etc."gtk-3.0/settings.ini".source = "${pkgs.pantheon.elementary-default-settings}/etc/gtk-3.0/settings.ini";

-      xdg.portal.extraPortals = with pkgs; [
-        pantheon.elementary-files
-        pantheon.elementary-settings-daemon
+      xdg.portal.extraPortals = with pkgs.pantheon; [
+        elementary-files
+        elementary-settings-daemon
        xdg-desktop-portal-pantheon
      ];

--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@ -485,6 +485,7 @@ in
  ucarp = handleTest ./ucarp.nix {};
  udisks2 = handleTest ./udisks2.nix {};
  unbound = handleTest ./unbound.nix {};
+  unifi = handleTest ./unifi.nix {};
  unit-php = handleTest ./web-servers/unit-php.nix {};
  upnp = handleTest ./upnp.nix {};
  usbguard = handleTest ./usbguard.nix {};
--- a/nixos/tests/docker-tools.nix
+++ b/nixos/tests/docker-tools.nix
@ -215,6 +215,12 @@ import ./make-test-python.nix ({ pkgs, ... }: {
                f"docker run --rm  ${examples.layersOrder.imageName} cat /tmp/layer{index}"
            )

+    with subtest("Ensure layers unpacked in correct order before runAsRoot runs"):
+        assert "abc" in docker.succeed(
+            "docker load --input='${examples.layersUnpackOrder}'",
+            "docker run --rm ${examples.layersUnpackOrder.imageName} cat /layer-order"
+        )
+
    with subtest("Ensure environment variables are correctly inherited"):
        docker.succeed(
            "docker load --input='${examples.environmentVariables}'"
--- a/nixos/tests/unifi.nix
+++ b/nixos/tests/unifi.nix
@ -0,0 +1,35 @@
+# Test UniFi controller
+
+{ system ? builtins.currentSystem
+, config ? { allowUnfree = true; }
+, pkgs ? import ../.. { inherit system config; }
+}:
+
+with import ../lib/testing-python.nix { inherit system pkgs; };
+with pkgs.lib;
+
+let
+  makeAppTest = unifi: makeTest {
+    name = "unifi-controller-${unifi.version}";
+    meta = with pkgs.lib.maintainers; {
+      maintainers = [ zhaofengli ];
+    };
+
+    nodes.server = {
+      services.unifi = {
+        enable = true;
+        unifiPackage = unifi;
+        openFirewall = false;
+      };
+    };
+
+    testScript = ''
+      server.wait_for_unit("unifi.service")
+      server.wait_until_succeeds("curl -Lk https://localhost:8443 >&2", timeout=300)
+    '';
+  };
+in with pkgs; {
+  unifiLTS = makeAppTest unifiLTS;
+  unifi5 = makeAppTest unifi5;
+  unifi6 = makeAppTest unifi6;
+}
--- a/pkgs/applications/editors/android-studio/common.nix
+++ b/pkgs/applications/editors/android-studio/common.nix
@ -46,6 +46,7 @@
 , stdenv
 , systemd
 , unzip
+, usbutils
 , which
 , runCommand
 , xkeyboard_config
@ -102,6 +103,7 @@ let
          # Runtime stuff
          git
          ps
+          usbutils
        ]}" \
        --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [

--- a/pkgs/applications/editors/cudatext/default.nix
+++ b/pkgs/applications/editors/cudatext/default.nix
@ -38,13 +38,13 @@ let
 in
 stdenv.mkDerivation rec {
  pname = "cudatext";
-  version = "1.150.0";
+  version = "1.152.0";

  src = fetchFromGitHub {
    owner = "Alexey-T";
    repo = "CudaText";
    rev = version;
-    sha256 = "sha256-6XG4v2S7InKA6OVrV+q1lT/CzNxmzVQfmAAo2cqbqBY=";
+    sha256 = "sha256-LwPlWfna+/LsQxOBuTFpE7e7Qr5g9NN14rVasMZVImQ=";
  };

  postPatch = ''
@ -99,6 +99,8 @@ stdenv.mkDerivation rec {
    fi
  '') additionalLexers;

+  passthru.updateScript = ./update.sh;
+
  meta = with lib; {
    description = "Cross-platform code editor";
    longDescription = ''
--- a/pkgs/applications/editors/cudatext/deps.json
+++ b/pkgs/applications/editors/cudatext/deps.json
@ -16,8 +16,8 @@
  },
  "ATSynEdit": {
    "owner": "Alexey-T",
-    "rev": "2021.11.25",
-    "sha256": "sha256-CbH0C+UOJ9X2wKG5IEbgitda06lazujYM8l961k7C7g="
+    "rev": "2021.12.12",
+    "sha256": "sha256-glP2Srw3Lw1JNQO+DIwixf4Xdbo5M6pBdYufwGERPW4="
  },
  "ATSynEdit_Cmp": {
    "owner": "Alexey-T",
@ -26,13 +26,13 @@
  },
  "EControl": {
    "owner": "Alexey-T",
-    "rev": "2021.10.21",
-    "sha256": "sha256-RyRpHihmmr/EeVWk9CR0S3pvKy0FzqLZNGti33+4fkI="
+    "rev": "2021.12.07",
+    "sha256": "sha256-givCklAHao26psWLI2qK246igxcAQEeIYTGH61FX6Xo="
  },
  "ATSynEdit_Ex": {
    "owner": "Alexey-T",
-    "rev": "2021.11.25",
-    "sha256": "sha256-6hk9wNdoz1d3VpuW7yHyIQnnYseEAfgjCNGl6+o0Hjs="
+    "rev": "2021.12.07",
+    "sha256": "sha256-/2Fv/vrpbHSiJro11cjbziUaT4gfwa6y5aQBoYgq3OQ="
  },
  "Python-for-Lazarus": {
    "owner": "Alexey-T",
--- a/pkgs/applications/editors/cudatext/update.sh
+++ b/pkgs/applications/editors/cudatext/update.sh
@ -0,0 +1,23 @@
+#!/usr/bin/env nix-shell
+#!nix-shell -i bash -p curl gnused jq nix-prefetch moreutils
+
+set -euo pipefail
+cd "$(dirname "$0")"
+
+version=$(curl -s https://api.github.com/repos/Alexey-T/CudaText/releases/latest | jq -r '.tag_name')
+url="https://github.com/Alexey-T/CudaText/archive/refs/tags/${version}.tar.gz"
+hash=$(nix-prefetch-url --quiet --unpack --type sha256 $url)
+sriHash=$(nix hash to-sri --type sha256 $hash)
+
+sed -i "s#version = \".*\"#version = \"$version\"#" default.nix
+sed -i "s#sha256 = \".*\"#sha256 = \"$sriHash\"#" default.nix
+
+while IFS=$'\t' read repo owner rev; do
+  latest=$(curl -s https://api.github.com/repos/${owner}/${repo}/releases/latest | jq -r '.tag_name')
+  if [ "$latest" != "$rev" ]; then
+    url="https://github.com/${owner}/${repo}/archive/refs/tags/${latest}.tar.gz"
+    hash=$(nix-prefetch-url --quiet --unpack --type sha256 $url)
+    sriHash=$(nix hash to-sri --type sha256 $hash)
+    jq ".${repo}.rev = \"${latest}\" | .${repo}.sha256 = \"${sriHash}\"" deps.json | sponge deps.json
+  fi
+done <<< $(jq -r 'to_entries[]|[.key,.value.owner,.value.rev]|@tsv' deps.json)
--- a/pkgs/applications/editors/vscode/vscode.nix
+++ b/pkgs/applications/editors/vscode/vscode.nix
@ -14,17 +14,17 @@ let
  archive_fmt = if stdenv.isDarwin then "zip" else "tar.gz";

  sha256 = {
-    x86_64-linux = "0xn2gcvqjbj2adfwq2s0pz1n4yxg6spq4hifhvwavb34pn9yc9p9";
-    x86_64-darwin = "13kgsxhjdfcdgz8xbhzpd7x1xh6am255dwxpbr03cg4p8iwfd3ig";
-    aarch64-linux = "166ag0k0j8wixm3arl1ld4a4qi92ff1zvb6whhqshzdv0s39pys3";
-    aarch64-darwin = "08g8qjbvlp27i37z7jcsvzgg6vm0grppnlh0jyji6lz31ksib6pz";
-    armv7l-linux = "15l9kr01f0jxfi0a9dnldsjrwzv9x60ljgvmlh0zhx4h0q1x0n7l";
+    x86_64-linux = "1bglf1a8b5whv9pk811fdnx0mvfcfasjxbik73p67msp4yy68lm4";
+    x86_64-darwin = "0cv6i2i69xf6hn0vrfl3gk3ky7r5yvp4k7zx2k695gzck5s9bx8y";
+    aarch64-linux = "1jggspj5q4vfgs4xdvx5p8qsfm98wf17jmxqzs68lmlhmhadyh22";
+    aarch64-darwin = "0c1nz7a54xq20a2a4fqcmlhry6gqwz5f1ys7dx0x5whaxbybh8my";
+    armv7l-linux = "0p2rdxbqpzk79ra7br7wfs8kr0hnh3l022mqb7y16gc426xjlfn4";
  }.${system};
 in
  callPackage ./generic.nix rec {
    # Please backport all compatible updates to the stable release.
    # This is important for the extension ecosystem.
-    version = "1.63.1";
+    version = "1.63.2";
    pname = "vscode";

    executableName = "code" + lib.optionalString isInsiders "-insiders";
--- a/pkgs/applications/editors/vscode/vscodium.nix
+++ b/pkgs/applications/editors/vscode/vscodium.nix
@ -13,10 +13,10 @@ let
  archive_fmt = if system == "x86_64-darwin" then "zip" else "tar.gz";

  sha256 = {
-    x86_64-linux = "1p7rbpvmllpdvghk3avg8f0xrbfhgyyj7l0ajjp0pcx24g3ijdwq";
-    x86_64-darwin = "1ggcvdvciq5dkiknlxsrxkx96gj0g8vw0h2v1bj1xvv1mqjv0kwk";
-    aarch64-linux = "0ypi7n99c6s99vxl78j5zw4l8jysgnz3bzch3l9yqpp1faq2zim5";
-    armv7l-linux = "1rb1b4ixvm98y5s40i6qhzl6c5rv1jkbvcbwrv4s2g122j002dwn";
+    x86_64-linux = "0pczrbifjgm905371i8c6bk90ka291cmny6hr1nzfix7bn5psjx0";
+    x86_64-darwin = "12g2jlrhng3i56a4v9jf7nrj045jivnfdx4dhka1fiv60nn4gc46";
+    aarch64-linux = "1bhhz4yvmk3zqljy3b77hlsxbwm2l675pslhwr44p6fb4hmn8fai";
+    armv7l-linux = "15nbskq92b85zdyg7pgagi9mqhnbyisfkipqb3brc2rvmyxpzclb";
  }.${system};

  sourceRoot = {
@ -31,7 +31,7 @@ in

    # Please backport all compatible updates to the stable release.
    # This is important for the extension ecosystem.
-    version = "1.63.1";
+    version = "1.63.2";
    pname = "vscodium";

    executableName = "codium";
--- a/pkgs/applications/graphics/hydrus/default.nix
+++ b/pkgs/applications/graphics/hydrus/default.nix
@ -10,14 +10,14 @@

 python3Packages.buildPythonPackage rec {
  pname = "hydrus";
-  version = "464";
+  version = "466";
  format = "other";

  src = fetchFromGitHub {
    owner = "hydrusnetwork";
    repo = "hydrus";
    rev = "v${version}";
-    sha256 = "sha256-ZAndODbl6cH0H1rA3Bhn3AlfIuba0LjxWxusGPDYvlA=";
+    sha256 = "sha256-ih2BctOC9cuTYP8A9ikhGBqNP0SToSAkqmZhtBvgpIo=";
  };

  nativeBuildInputs = [
--- a/pkgs/applications/kde/akonadi/default.nix
+++ b/pkgs/applications/kde/akonadi/default.nix
@ -36,4 +36,11 @@ mkDerivation {
    ''-DNIX_OUT=\"${placeholder "out"}\"''
    ''-I${lib.getDev kio}/include/KF5''  # Fixes: kio_version.h: No such file or directory
  ];
+
+  # compatibility symlinks for kmymoney, can probably be removed in next kde bump
+  postInstall = ''
+    ln -s $dev/include/KF5/AkonadiCore/Akonadi/Collection $dev/include/KF5/AkonadiCore/Collection
+    ln -s $dev/include/KF5/AkonadiCore/Akonadi/ItemFetchScope $dev/include/KF5/AkonadiCore/ItemFetchScope
+    ln -s $dev/include/KF5/AkonadiCore/Akonadi/RecursiveItemFetchJob $dev/include/KF5/AkonadiCore/RecursiveItemFetchJob
+  '';
 }
--- a/pkgs/applications/kde/fetch.sh
+++ b/pkgs/applications/kde/fetch.sh
@ -1 +1 @@
-WGET_ARGS=( https://download.kde.org/stable/release-service/21.08.3/src -A '*.tar.xz' )
+WGET_ARGS=( https://download.kde.org/stable/release-service/21.12.0/src -A '*.tar.xz' )
--- a/pkgs/applications/kde/kitinerary.nix
+++ b/pkgs/applications/kde/kitinerary.nix
@ -1,6 +1,5 @@
-{
-  mkDerivation, lib, extra-cmake-modules
-, qtbase, qtdeclarative, ki18n, kmime, kpkpass
+{ mkDerivation, lib, extra-cmake-modules
+, qtdeclarative, ki18n, kmime, kpkpass
 , poppler, kcontacts, kcalendarcore
 , shared-mime-info
 }:
@ -16,8 +15,13 @@ mkDerivation {
    shared-mime-info # for update-mime-database
  ];
  buildInputs = [
-    qtbase qtdeclarative ki18n kmime kpkpass poppler
+    qtdeclarative kmime kpkpass poppler
    kcontacts kcalendarcore
  ];
+
+  CXXFLAGS = [
+    "-I${lib.getDev ki18n}/include/KF5"  # Fixes: ki18n_version.h: No such file or directory
+  ];
+
  outputs = [ "out" "dev" ];
 }
--- a/pkgs/applications/kde/krfb.nix
+++ b/pkgs/applications/kde/krfb.nix
@ -1,10 +1,9 @@
-{
-  mkDerivation, lib,
-  extra-cmake-modules, kdoctools,
-  kconfig, kcoreaddons, kcrash, kdbusaddons, kdnssd, knotifications, kwallet,
-  kwidgetsaddons, kwindowsystem, kxmlgui,
-  libvncserver, libXtst, libXdamage,
-  qtx11extras
+{ mkDerivation, lib
+, extra-cmake-modules, kdoctools
+, kconfig, kcoreaddons, kcrash, kdbusaddons, kdnssd, knotifications, kwallet
+, kwidgetsaddons, kwindowsystem, kxmlgui, kwayland
+, libvncserver, libXtst, libXdamage
+, qtx11extras
 }:

 mkDerivation {
@ -19,7 +18,7 @@ mkDerivation {
  buildInputs = [
    libvncserver libXtst libXdamage
    kconfig kcoreaddons kcrash kdbusaddons knotifications kwallet kwidgetsaddons
-    kwindowsystem kxmlgui
+    kwindowsystem kxmlgui kwayland
    qtx11extras
  ];
  propagatedBuildInputs = [ kdnssd ];
--- a/pkgs/applications/kde/picmi.nix
+++ b/pkgs/applications/kde/picmi.nix
@ -1,4 +1,4 @@
-{ mkDerivation, lib
+{ mkDerivation, lib, fetchpatch
 , libkdegames, extra-cmake-modules
 , kdeclarative, knewstuff
 }:
@ -15,6 +15,17 @@ mkDerivation {
    license = licenses.gpl2Plus;
    platforms = platforms.linux;
  };
+
+  patches = [
+    # fix compile error due to usage of deprecated things
+    # probably can be removed with the next kde bump
+    (fetchpatch {
+      url = "https://invent.kde.org/games/picmi/-/commit/99639fb499fe35eb463621efca1c0e4ff2a52bad.patch";
+      revert = true;
+      sha256 = "sha256-rRhTvUB1Hpc3bLv9b5yIf/G7uJy2/OgBfXToZwV4jrg=";
+    })
+  ];
+
  nativeBuildInputs = [
    extra-cmake-modules
  ];
--- a/pkgs/applications/kde/srcs.nix
+++ b/pkgs/applications/kde/srcs.nix
--- a/pkgs/applications/misc/dbeaver/default.nix
+++ b/pkgs/applications/misc/dbeaver/default.nix
@ -20,13 +20,13 @@

 stdenv.mkDerivation rec {
  pname = "dbeaver";
-  version = "21.3.0"; # When updating also update fetchedMavenDeps.sha256
+  version = "21.3.1"; # When updating also update fetchedMavenDeps.sha256

  src = fetchFromGitHub {
    owner = "dbeaver";
    repo = "dbeaver";
    rev = version;
-    sha256 = "iKxnuMm5hpreP706N+XxaBrDVVwVFRWKNmiCyXkOUCQ=";
+    sha256 = "ePy3uS+LpyDzweLocSk3O/G2zFPISKbMbci9fdELrpE=";
  };

  fetchedMavenDeps = stdenv.mkDerivation {
--- a/pkgs/applications/misc/golden-cheetah/default.nix
+++ b/pkgs/applications/misc/golden-cheetah/default.nix
@ -16,13 +16,13 @@ let
  };
 in mkDerivation rec {
  pname = "golden-cheetah";
-  version = "3.6-DEV2107";
+  version = "3.6-DEV2111";

  src = fetchFromGitHub {
    owner = "GoldenCheetah";
    repo = "GoldenCheetah";
    rev = "v${version}";
-    sha256 = "1d54x3pv27w1ys2f5l7gnfhyijhgcgdjnq1c1mj7hvg35dmh054d";
+    sha256 = "17sk89szvaq31bcv6rgfn1bbw132k7w8zlalfb3ayflavdxbk6sa";
  };

  buildInputs = [
--- a/pkgs/applications/misc/pdfsam-basic/default.nix
+++ b/pkgs/applications/misc/pdfsam-basic/default.nix
@ -2,11 +2,11 @@

 stdenv.mkDerivation rec {
  pname = "pdfsam-basic";
-  version = "4.2.7";
+  version = "4.2.8";

  src = fetchurl {
    url = "https://github.com/torakiki/pdfsam/releases/download/v${version}/pdfsam_${version}-1_amd64.deb";
-    sha256 = "sha256-PVG4KZX6KxkrooywgEmqOItyLt5hGs+b/KCaguduGyc=";
+    sha256 = "sha256-bbGFSy2ZuUtFWyAgje6s+RSQ6S7NZGAhjvZMbIWfYhE=";
  };

  unpackPhase = ''
--- a/pkgs/applications/misc/spicetify-cli/default.nix
+++ b/pkgs/applications/misc/spicetify-cli/default.nix
@ -2,13 +2,13 @@

 buildGoModule rec {
  pname = "spicetify-cli";
-  version = "2.8.2";
+  version = "2.8.3";

  src = fetchFromGitHub {
    owner = "khanhas";
    repo = pname;
    rev = "v${version}";
-    sha256 = "sha256-YMVB9nKsHYy65McYs1w/ETy+1b8GkjuWFk6PZs4HFko=";
+    sha256 = "sha256-Ht+EDCoPn1dA8VHTEiq5xPm34lcsiug8jQHvQdCG2yg=";
  };

  vendorSha256 = "sha256-g0RYIVIq4oMXdRZDBDnVYg7ombN5WEo/6O9hChQvOYs=";
--- a/pkgs/applications/networking/browsers/chromium/upstream-info.json
+++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json
@ -31,15 +31,15 @@
    }
  },
  "dev": {
-    "version": "98.0.4750.0",
-    "sha256": "0qygnmb1wlbarni2pdfs1xl50ggvf0211c6mj7341wwsbd0bpkgr",
-    "sha256bin64": "1psbh5xwlgr4ain4s9vk7d0kdbbd14v29f95ai5i4d2d3cpj2319",
+    "version": "98.0.4758.9",
+    "sha256": "1sq6v2hdhpk12w37sz7jf5vwkn72ydcqzcxysf7hs2flcfgscydj",
+    "sha256bin64": "1jfj08jpxji2q890zbvpvmgf5bjqgvigkr1hg8ch8vaaybs5wr04",
    "deps": {
      "gn": {
-        "version": "2021-12-03",
+        "version": "2021-12-07",
        "url": "https://gn.googlesource.com/gn",
-        "rev": "e0afadf7a743d5b14737bd454df45d5f1caf0d23",
-        "sha256": "00pxhfikscghgm79zckh9j00jgjmdy6hixkpfq5vmgc0xpxif78v"
+        "rev": "fc295f3ac7ca4fe7acc6cb5fb052d22909ef3a8f",
+        "sha256": "02bx3bp85kkis704gndb6jvjph7gv3ij746bq4anl30kfrkpcifh"
      }
    }
  },
--- a/pkgs/applications/networking/cluster/terraform/default.nix
+++ b/pkgs/applications/networking/cluster/terraform/default.nix
@ -197,8 +197,8 @@ rec {
  };

  terraform_1 = mkTerraform {
-    version = "1.1.1";
-    sha256 = "sha256-JHwHxFpAUVnm9QlfSYrBELrgct0RkjS7OQb6gKEAsCA=";
+    version = "1.1.2";
+    sha256 = "sha256-8M/hs4AiApe9C19VnVhWYYOkKqXbv3aREUTNfExTDww=";
    vendorSha256 = "sha256-inPNvNUcil9X0VQ/pVgZdnnmn9UCfEz7qXiuKDj8RYM=";
    patches = [ ./provider-path-0_15.patch ];
    passthru = { inherit plugins; };
--- a/pkgs/applications/networking/dnscontrol/default.nix
+++ b/pkgs/applications/networking/dnscontrol/default.nix
@ -2,16 +2,16 @@

 buildGoModule rec {
  pname = "dnscontrol";
-  version = "3.13.0";
+  version = "3.13.1";

  src = fetchFromGitHub {
    owner = "StackExchange";
    repo = pname;
    rev = "v${version}";
-    sha256 = "sha256-XBpdNQHG90rJWGfXpJgXsj5AR2VhK/3+1U7Zl8XDlsw=";
+    sha256 = "sha256-S3/uxtrCFU9HbNhYKqOYy1ytSVi2DU/lXIlhBgNnaPg=";
  };

-  vendorSha256 = "sha256-Ob4ZPtP14TsNOnGVfR5lFAKpJsjoJDKmiE++DqY32QA=";
+  vendorSha256 = "sha256-OwiZL+MBmAFtV8Vg2Wl9yAeTG3AzMSmCjefxObU7lfQ=";

  subPackages = [ "." ];

--- a/pkgs/applications/networking/flexget/default.nix
+++ b/pkgs/applications/networking/flexget/default.nix
@ -2,14 +2,14 @@

 python3Packages.buildPythonApplication rec {
  pname = "flexget";
-  version = "3.2.4";
+  version = "3.2.6";

  # Fetch from GitHub in order to use `requirements.in`
  src = fetchFromGitHub {
    owner = "flexget";
    repo = "flexget";
    rev = "v${version}";
-    sha256 = "sha256-kwvZvIu+uACI2vBBy9eVuLLJlv1evUJ/4gI6rx1NW/g=";
+    sha256 = "0cwzhk1w2wpf33cqbnrzckqy91b58qqpnkmh5nxv02z6fl7psmbh";
  };

  postPatch = ''
--- a/pkgs/applications/networking/gopher/sacc/default.nix
+++ b/pkgs/applications/networking/gopher/sacc/default.nix
@ -4,11 +4,11 @@

 stdenv.mkDerivation rec {
  pname = "sacc";
-  version = "1.04";
+  version = "1.05";

  src = fetchurl {
-    url = "ftp://bitreich.org/releases/sacc/sacc-${version}.tgz";
-    sha512 = "1rjxs77a5k2mgpwr2ln1czn64fmss9yw59g0k60r25c2ny2la6ddfcl5zclawcikk346na6m96jrfwssmka0axr2spwpl61wm0lijnk";
+    url = "ftp://bitreich.org/releases/sacc/sacc-${version}.tar.gz";
+    sha512 = "080vpacipdis396lrw3fxc1z7h2d0njm2zi63kvlk0n2m1disv97c968zx8dp76kfw1s03nvvr6v3vnpfkkywiz1idjc92s5rgcbsk1";
  };

  inherit patches;
--- a/pkgs/applications/networking/instant-messengers/psi-plus/default.nix
+++ b/pkgs/applications/networking/instant-messengers/psi-plus/default.nix
@ -4,6 +4,7 @@
 , cmake
 , qtbase
 , qtmultimedia
+, qtimageformats
 , qtx11extras
 , qttools
 , libidn
@ -67,6 +68,7 @@ mkDerivation rec {
  buildInputs = [
    qtbase
    qtmultimedia
+    qtimageformats
    qtx11extras
    libidn
    qca-qt5
--- a/pkgs/applications/networking/powerdns-admin/default.nix
+++ b/pkgs/applications/networking/powerdns-admin/default.nix
@ -1,12 +1,12 @@
 { lib, stdenv, fetchFromGitHub, mkYarnPackage, nixosTests, writeText, python3 }:

 let
-  version = "0.2.3";
+  version = "0.2.4";
  src = fetchFromGitHub {
    owner = "ngoduykhanh";
    repo = "PowerDNS-Admin";
    rev = "v${version}";
-    sha256 = "16faz57d77mxkflkvwyi8gb9wvnq2vhw79b84v1fmqvxri1yaphw";
+    sha256 = "sha256-xJ0NNnDVwGl+t9q1INPhCxcTmQayYBYdjEG0PbPCI9E=";
  };

  python = python3.override {
@ -22,7 +22,7 @@ let
  };

  pythonDeps = with python.pkgs; [
-    flask flask_assets flask_login flask_sqlalchemy flask_migrate flask-seasurf flask_mail flask-sslify
+    flask flask_assets flask_login flask_sqlalchemy flask_migrate flask-seasurf flask_mail flask-session flask-sslify
    mysqlclient psycopg2 sqlalchemy
    cffi configobj cryptography bcrypt requests ldap pyotp qrcode dnspython
    gunicorn python3-saml pyopenssl pytz cssmin jsmin authlib bravado-core
@ -125,6 +125,6 @@ in stdenv.mkDerivation rec {
    description = "A PowerDNS web interface with advanced features";
    homepage = "https://github.com/ngoduykhanh/PowerDNS-Admin";
    license = licenses.mit;
-    maintainers = with maintainers; [ zhaofengli ];
+    maintainers = with maintainers; [ Flakebi zhaofengli ];
  };
 }
--- a/pkgs/applications/networking/powerdns-admin/package.json
+++ b/pkgs/applications/networking/powerdns-admin/package.json
@ -12,5 +12,5 @@
    "multiselect": "^0.9.12"
  },
  "name": "powerdns-admin-assets",
-  "version": "0.2.3"
+  "version": "0.2.4"
 }
--- a/pkgs/applications/networking/powerdns-admin/yarndeps.nix
+++ b/pkgs/applications/networking/powerdns-admin/yarndeps.nix
@ -114,11 +114,11 @@
      };
    }
    {
-      name = "bn.js___bn.js_4.11.9.tgz";
+      name = "bn.js___bn.js_4.12.0.tgz";
      path = fetchurl {
-        name = "bn.js___bn.js_4.11.9.tgz";
-        url  = "https://registry.yarnpkg.com/bn.js/-/bn.js-4.11.9.tgz";
-        sha1 = "26d556829458f9d1e81fc48952493d0ba3507828";
+        name = "bn.js___bn.js_4.12.0.tgz";
+        url  = "https://registry.yarnpkg.com/bn.js/-/bn.js-4.12.0.tgz";
+        sha1 = "775b3f278efbb9718eec7361f483fb36fbbfea88";
      };
    }
    {
@ -530,11 +530,11 @@
      };
    }
    {
-      name = "elliptic___elliptic_6.5.3.tgz";
+      name = "elliptic___elliptic_6.5.4.tgz";
      path = fetchurl {
-        name = "elliptic___elliptic_6.5.3.tgz";
-        url  = "https://registry.yarnpkg.com/elliptic/-/elliptic-6.5.3.tgz";
-        sha1 = "cb59eb2efdaf73a0bd78ccd7015a62ad6e0f93d6";
+        name = "elliptic___elliptic_6.5.4.tgz";
+        url  = "https://registry.yarnpkg.com/elliptic/-/elliptic-6.5.4.tgz";
+        sha1 = "da37cebd31e79a1367e941b592ed1fbebd58abbb";
      };
    }
    {
--- a/pkgs/applications/networking/remote/nice-dcv-client/default.nix
+++ b/pkgs/applications/networking/remote/nice-dcv-client/default.nix
@ -1,4 +1,5 @@
-{ lib, stdenv
+{ lib
+, stdenv
 , fetchurl
 , glib
 , libX11
@ -16,22 +17,23 @@
 , gtk3
 , libselinux
 , libxml2
+, libffi
 , python3Packages
 , cpio
 , autoPatchelfHook
+, wrapGAppsHook
 }:

 stdenv.mkDerivation rec {
  pname = "nice-dcv-client";
-  version = "2020.2.1737-1";
-
+  version = "2021.2.3797-1";
  src =
    fetchurl {
-      url = "https://d1uj6qtbmh3dt5.cloudfront.net/2020.2/Clients/nice-dcv-viewer-${version}.el8.x86_64.rpm";
-      sha256 = "sha256-SUpfHd/Btc07cfjc3zx5I5BiNatr/c4E2/mfJuU4R1E=";
+      url = "https://d1uj6qtbmh3dt5.cloudfront.net/2021.2/Clients/nice-dcv-viewer-${version}.el8.x86_64.rpm";
+      sha256 = "sha256-iLz25SB5v7ghkAZOMGPmpNaPihd8ikzCQS//r1xBNRU=";
    };

-  nativeBuildInputs = [ autoPatchelfHook python3Packages.rpm ];
+  nativeBuildInputs = [ autoPatchelfHook wrapGAppsHook python3Packages.rpm ];
  unpackPhase = ''
    rpm2cpio $src | ${cpio}/bin/cpio -idm
  '';
@ -57,31 +59,28 @@ stdenv.mkDerivation rec {
  installPhase = ''
    mkdir -p $out/bin/
    mkdir -p $out/lib64/
-
    mv usr/bin/dcvviewer $out/bin/dcvviewer
    mv usr/lib64/* $out/lib64/
-
    mkdir -p $out/libexec/dcvviewer
    mv usr/libexec/dcvviewer/dcvviewer $out/libexec/dcvviewer/dcvviewer
    patchelf \
      --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \
      $out/libexec/dcvviewer/dcvviewer
-
    # Fix the wrapper script to have the right basedir.
    sed -i "s#basedir=/usr#basedir=$out#" $out/bin/dcvviewer
-
    mv usr/share $out/
+
    ${glib.dev}/bin/glib-compile-schemas $out/share/glib-2.0/schemas

-    # broken symlink, seems to give a warning message if i don't delete it
-    rm $out/lib64/dcvviewer/gio/modules/libdconfsettings.so
+    # we already ship libffi.so.7
+    ln -s ${lib.getLib libffi}/lib/libffi.so $out/lib64/libffi.so.6
  '';

  meta = with lib; {
    description = "High-performance remote display protocol";
    homepage = "https://aws.amazon.com/hpc/dcv/";
    license = licenses.unfree;
-    platforms = platforms.linux;
+    platforms = [ "x86_64-linux" ];
    maintainers = with maintainers; [ rmcgibbo ];
  };
 }
--- a/pkgs/applications/office/notes-up/default.nix
+++ b/pkgs/applications/office/notes-up/default.nix
@ -2,40 +2,42 @@
 , stdenv
 , fetchFromGitHub
 , nix-update-script
-, pantheon
-, pkg-config
-, vala
-, cmake
+, desktop-file-utils
+, meson
 , ninja
-, gtk3
-, gtksourceview3
-, webkitgtk
-, gtkspell3
-, glib
-, libgee
-, pcre
-, sqlite
-, discount
+, pkg-config
+, python3
+, vala
 , wrapGAppsHook
-, withPantheon ? false
+, discount
+, glib
+, gtk3
+, gtksourceview4
+, gtkspell3
+, libgee
+, pantheon
+, sqlite
+, webkitgtk
 }:

 stdenv.mkDerivation rec {
  pname = "notes-up";
-  version = "unstable-2020-12-29";
+  version = "2.0.6";

  src = fetchFromGitHub {
    owner = "Philip-Scott";
    repo = "Notes-up";
-    rev = "2ea9f35f588769758f5d2d4436d71c4059141a6f";
-    sha256 = "sha256-lKOM9+s34xYB9bF9pgip9DFu+6AaxSE4HjFVhoWtttk=";
+    rev = version;
+    sha256 = "sha256-t9BCtdWd2JLrKTcmri1Lgl5RLBYD2xWCtMxoVXz0XPk=";
  };

  nativeBuildInputs = [
-    cmake
+    desktop-file-utils
+    meson
    ninja
-    vala
    pkg-config
+    python3
+    vala
    wrapGAppsHook
  ];

@ -43,17 +45,18 @@ stdenv.mkDerivation rec {
    discount
    glib
    gtk3
-    gtksourceview3
+    gtksourceview4
    gtkspell3
    libgee
    pantheon.granite
-    pcre
    sqlite
    webkitgtk
  ];

-  # Whether to build with contractor support (Pantheon specific)
-  cmakeFlags = lib.optional (!withPantheon) "-Dnoele=yes";
+  postPatch = ''
+    chmod +x meson/post_install.py
+    patchShebangs meson/post_install.py
+  '';

  passthru = {
    updateScript = nix-update-script {
@ -62,12 +65,11 @@ stdenv.mkDerivation rec {
  };

  meta = with lib; {
-    description = "Markdown notes editor and manager designed for elementary OS"
-      + lib.optionalString withPantheon " - built with Contractor support";
+    description = "Markdown notes editor and manager designed for elementary OS";
    homepage = "https://github.com/Philip-Scott/Notes-up";
    license = licenses.gpl2Only;
    maintainers = with maintainers; [ ] ++ teams.pantheon.members;
    platforms = platforms.linux;
-    mainProgram = "com.github.philip-scott.notes-up";
+    mainProgram = "com.github.philip_scott.notes-up";
  };
 }
--- a/pkgs/applications/office/todoman/default.nix
+++ b/pkgs/applications/office/todoman/default.nix
@ -9,11 +9,11 @@ let
 in
 buildPythonApplication rec {
  pname = "todoman";
-  version = "4.0.1";
+  version = "4.1.0";

  src = fetchPypi {
    inherit pname version;
-    sha256 = "ec88f8009321e77deb0ae682f7d036c139edf4175f8413011b532905c6e7d2b1";
+    sha256 = "ce3caa481d923e91da9b492b46509810a754e2d3ef857f5d20bc5a8e362b50c8";
  };

  SETUPTOOLS_SCM_PRETEND_VERSION = version;
--- a/pkgs/applications/office/trilium/default.nix
+++ b/pkgs/applications/office/trilium/default.nix
@ -19,16 +19,16 @@ let
    maintainers = with maintainers; [ fliegendewurst ];
  };

-  version = "0.48.7";
+  version = "0.48.8";

  desktopSource = {
    url = "https://github.com/zadam/trilium/releases/download/v${version}/trilium-linux-x64-${version}.tar.xz";
-    sha256 = "16clrn89mq2n30hb50y45s6qn5l7n1hj4b124wjxrkmmwpdbjwad";
+    sha256 = "1dz4wdx3d1pmm3yrvipqa929f6gqilhfc3sp6xcgbn9faypp6qra";
  };

  serverSource = {
    url = "https://github.com/zadam/trilium/releases/download/v${version}/trilium-linux-x64-server-${version}.tar.xz";
-    sha256 = "18zwplcai4s82pdy3l30862jdl22311qh78anrjz29fm6srx1y9l";
+    sha256 = "0jp1hj51x5wz27f7739nwwli119pzpskg269cxk4i04xxbhr145j";
  };

 in {
@ -40,15 +40,6 @@ in {

    src = fetchurl desktopSource;

-    # Fetch from source repo, no longer included in release.
-    # (they did special-case icon.png but we want the scalable svg)
-    # Use the version here to ensure we get any changes.
-    trilium_svg = fetchurl {
-      url = "https://raw.githubusercontent.com/zadam/trilium/v${version}/images/icon.svg";
-      sha256 = "0sz3piskdlx267whx8r6afrdadn25bf0zmxplj1599zqkf7w7n0x";
-    };
-
-
    nativeBuildInputs = [
      autoPatchelfHook
      makeWrapper
@ -61,12 +52,12 @@ in {
      runHook preInstall
      mkdir -p $out/bin
      mkdir -p $out/share/trilium
-      mkdir -p $out/share/{applications,icons/hicolor/scalable/apps}
+      mkdir -p $out/share/{applications,icons/hicolor/128x128/apps}

      cp -r ./* $out/share/trilium
      ln -s $out/share/trilium/trilium $out/bin/trilium

-      ln -s ${trilium_svg} $out/share/icons/hicolor/scalable/apps/trilium.svg
+      ln -s $out/share/trilium/icon.png $out/share/icons/hicolor/128x128/apps/trilium.png
      cp ${desktopItem}/share/applications/* $out/share/applications
      runHook postInstall
    '';
--- a/pkgs/applications/office/zanshin/default.nix
+++ b/pkgs/applications/office/zanshin/default.nix
@ -1,55 +1,31 @@
 { mkDerivation
 , lib
 , fetchurl
-, fetchpatch
 , extra-cmake-modules
-, qtbase
 , boost
 , akonadi-calendar
-, akonadi-notes
-, akonadi-search
-, kidentitymanagement
 , kontactinterface
-, kldap
 , krunner
-, kwallet
-, kcalendarcore
 }:

 mkDerivation rec {
  pname = "zanshin";
-  version = "0.5.71";
+  version = "21.12.0";

  src = fetchurl {
-    url = "mirror://kde/stable/${pname}/${pname}-${version}.tar.xz";
-    sha256 = "0b316ddcd46sawva84x5d8nsp19v66gbm83djrra7fv3k8nkv4xh";
+    url = "mirror://kde/stable/release-service/${version}/src/zanshin-${version}.tar.xz";
+    sha256 = "sha256-l8W47tS7q747fkSAH3HJdwPsqjMfCyxzl3xJEeAXeh0=";
  };

-  patches = [
-    # Build with kontactinterface >= 5.14.42.
-    # Remove after next release.
-    (fetchpatch {
-      url = "https://invent.kde.org/pim/zanshin/-/commit/4850c08998b33b37af99c3312d193b063b3e8174.diff";
-      sha256 = "sha256:0lh0a035alhmws3zyfnkb814drq5cqxvzpwl4g1g5d435gy8k4ps";
-    })
-  ];
-
  nativeBuildInputs = [
    extra-cmake-modules
  ];

  buildInputs = [
-    qtbase
    boost
    akonadi-calendar
-    akonadi-notes
-    akonadi-search
-    kidentitymanagement
    kontactinterface
-    kldap
    krunner
-    kwallet
-    kcalendarcore
  ];

  meta = with lib; {
--- a/pkgs/applications/science/misc/boinc/default.nix
+++ b/pkgs/applications/science/misc/boinc/default.nix
@ -3,8 +3,8 @@ libGLU, libGL, libXmu, libXi, freeglut, libjpeg, libtool, wxGTK30, xcbutil,
 sqlite, gtk2, patchelf, libXScrnSaver, libnotify, libX11, libxcb }:

 let
-  majorVersion = "7.14";
-  minorVersion = "2";
+  majorVersion = "7.18";
+  minorVersion = "1";
 in

 stdenv.mkDerivation rec {
@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
    owner = "BOINC";
    repo = "boinc";
    rev = "client_release/${majorVersion}/${version}";
-    sha256 = "0nicpkag18xq0libfqqvs0im22mijpsxzfk272iwdd9l0lmgfvyd";
+    sha256 = "sha256-ijkfWTFwwJXvh6f0P5hkzWODxU+Ugz6iQUK+5jEpWXQ=";
  };

  nativeBuildInputs = [ libtool automake autoconf m4 pkg-config ];
@ -37,10 +37,15 @@ stdenv.mkDerivation rec {

  configureFlags = [ "--disable-server" ];

-  meta = {
+  postInstall = ''
+    install --mode=444 -D 'client/scripts/boinc-client.service' "$out/etc/systemd/system/boinc.service"
+  '';
+
+  meta = with lib; {
    description = "Free software for distributed and grid computing";
    homepage = "https://boinc.berkeley.edu/";
-    license = lib.licenses.lgpl2Plus;
-    platforms = lib.platforms.linux;  # arbitrary choice
+    license = licenses.lgpl2Plus;
+    platforms = platforms.linux;  # arbitrary choice
+    maintainers = with maintainers; [ Luflosi ];
  };
 }
--- a/pkgs/applications/version-management/gitkraken/default.nix
+++ b/pkgs/applications/version-management/gitkraken/default.nix
@ -11,19 +11,19 @@ with lib;
 let
  curlWithGnuTls = curl.override { gnutlsSupport = true; opensslSupport = false; };
  pname = "gitkraken";
-  version = "8.1.1";
+  version = "8.2.0";

  throwSystem = throw "Unsupported system: ${stdenv.hostPlatform.system}";

  srcs = {
    x86_64-linux = fetchzip {
      url = "https://release.axocdn.com/linux/GitKraken-v${version}.tar.gz";
-      sha256 = "sha256-C6R7/ucQhMsugg7qT+B8OG77AMOx2nmZlVAQcxAfpmc=";
+      sha256 = "sha256-id8pdkTphi3J0ZG88K7oc/O6OwAvmWyFEs9kMbleSFs=";
    };

    x86_64-darwin = fetchzip {
      url = "https://release.axocdn.com/darwin/GitKraken-v${version}.zip";
-      sha256 = "sha256-l0K9Ha+0KqVqNQOSouT2rwRRi4YoIjMNnZnmBY8Loa8=";
+      sha256 = "sha256-dwPKIXOQB3lixvMBJJRrRSamYRoC9n1rjcqi542dA44=";
    };

    aarch64-darwin = srcs.x86_64-darwin;
--- a/pkgs/build-support/build-dotnet-module/default.nix
+++ b/pkgs/build-support/build-dotnet-module/default.nix
@ -1,4 +1,4 @@
-{ lib, stdenvNoCC, linkFarmFromDrvs, makeWrapper, fetchurl, xml2, dotnetCorePackages, dotnetPackages, cacert }:
+{ lib, stdenvNoCC, linkFarmFromDrvs, nuget-to-nix, writeScript, makeWrapper, fetchurl, xml2, dotnetCorePackages, dotnetPackages, cacert }:

 { name ? "${args.pname}-${args.version}"
 , enableParallelBuilding ? true
@ -28,7 +28,7 @@
 # The packages project file, which contains instructions on how to compile it. This can be an array of multiple project files as well.
 , projectFile ? null
 # The NuGet dependency file. This locks all NuGet dependency versions, as otherwise they cannot be deterministically fetched.
-# This can be generated using the `nuget-to-nix` tool.
+# This can be generated by running the `passthru.fetch-deps` script.
 , nugetDeps ? null
 # A list of derivations containing nupkg packages for local project references.
 # Referenced derivations can be built with `buildDotnetModule` with `packNupkg=true` flag.
@ -63,7 +63,7 @@ assert projectFile == null -> throw "Defining the `projectFile` attribute is req

 # TODO: Automatically generate a dependency file when a lockfile is present.
 # This file is unfortunately almost never present, as Microsoft recommands not to push this in upstream repositories.
-assert nugetDeps == null -> throw "Defining the `nugetDeps` attribute is required, as to lock the NuGet dependencies. This file can be generated using the `nuget-to-nix` tool.";
+assert nugetDeps == null -> throw "Defining the `nugetDeps` attribute is required, as to lock the NuGet dependencies. This file can be generated by running the `passthru.fetch-deps` script.";

 let
  _nugetDeps = linkFarmFromDrvs "${name}-nuget-deps" (import nugetDeps {
@ -113,6 +113,41 @@ let
    DOTNET_NOLOGO = true; # This disables the welcome message.
    DOTNET_CLI_TELEMETRY_OPTOUT = true;

+    passthru.fetch-deps = args.passthru.fetch-deps or writeScript "fetch-${args.pname}-deps" ''
+      set -euo pipefail
+      cd "$(dirname "''${BASH_SOURCE[0]}")"
+
+      export HOME=$(mktemp -d)
+      deps_file="/tmp/${args.pname}-deps.nix"
+
+      store_src="${package.src}"
+      src="$(mktemp -d /tmp/${args.pname}.XXX)"
+      cp -rT "$store_src" "$src"
+      chmod -R +w "$src"
+
+      trap "rm -rf $src $HOME" EXIT
+      pushd "$src"
+
+      export DOTNET_NOLOGO=1
+      export DOTNET_CLI_TELEMETRY_OPTOUT=1
+
+      mkdir -p "$HOME/nuget_pkgs"
+
+      for project in "${lib.concatStringsSep "\" \"" (lib.toList projectFile)}"; do
+        ${dotnet-sdk}/bin/dotnet restore "$project" \
+          ${lib.optionalString (!enableParallelBuilding) "--disable-parallel"} \
+          -p:ContinuousIntegrationBuild=true \
+          -p:Deterministic=true \
+          --packages "$HOME/nuget_pkgs" \
+          "''${dotnetRestoreFlags[@]}" \
+          "''${dotnetFlags[@]}"
+      done
+
+      echo "Writing lockfile..."
+      ${nuget-to-nix}/bin/nuget-to-nix "$HOME/nuget_pkgs" > "$deps_file"
+      echo "Succesfully wrote lockfile to: $deps_file"
+    '';
+
    configurePhase = args.configurePhase or ''
      runHook preConfigure

--- a/pkgs/build-support/docker/default.nix
+++ b/pkgs/build-support/docker/default.nix
@ -240,7 +240,7 @@ rec {
          # Unpack all of the parent layers into the image.
          lowerdir=""
          extractionID=0
-          for layerTar in $(tac layer-list); do
+          for layerTar in $(cat layer-list); do
            echo "Unpacking layer $layerTar"
            extractionID=$((extractionID + 1))

--- a/pkgs/build-support/docker/examples.nix
+++ b/pkgs/build-support/docker/examples.nix
@ -405,6 +405,29 @@ rec {
    created = "now";
  };

+  # 23. Ensure that layers are unpacked in the correct order before the
+  # runAsRoot script is executed.
+  layersUnpackOrder =
+  let
+    layerOnTopOf = parent: layerName:
+      pkgs.dockerTools.buildImage {
+        name = "layers-unpack-order-${layerName}";
+        tag = "latest";
+        fromImage = parent;
+        contents = [ pkgs.coreutils ];
+        runAsRoot = ''
+          #!${pkgs.runtimeShell}
+          echo -n "${layerName}" >> /layer-order
+        '';
+      };
+    # When executing the runAsRoot script when building layer C, if layer B is
+    # not unpacked on top of layer A, the contents of /layer-order will not be
+    # "ABC".
+    layerA = layerOnTopOf null   "a";
+    layerB = layerOnTopOf layerA "b";
+    layerC = layerOnTopOf layerB "c";
+  in layerC;
+
  # buildImage without explicit tag
  bashNoTag = pkgs.dockerTools.buildImage {
    name = "bash-no-tag";
--- a/pkgs/data/icons/luna-icons/default.nix
+++ b/pkgs/data/icons/luna-icons/default.nix
@ -9,13 +9,13 @@

 stdenv.mkDerivation rec {
  pname = "luna-icons";
-  version = "1.7";
+  version = "1.8";

  src = fetchFromGitHub {
    owner = "darkomarko42";
    repo = pname;
    rev = version;
-    sha256 = "sha256-L8bkO2zGEXfwqoWZRDCm/PdBxwedkx57kduwlMoyAME=";
+    sha256 = "1c317ac43ff70sxn1syx20qhs4nkccv6hbf69fmi3acswqsll1z4";
  };

  nativeBuildInputs = [
--- a/pkgs/data/misc/v2ray-domain-list-community/default.nix
+++ b/pkgs/data/misc/v2ray-domain-list-community/default.nix
@ -1,7 +1,7 @@
-{ stdenv, buildGoModule, fetchFromGitHub, lib }:
+{ stdenv, pkgsBuildBuild, fetchFromGitHub, lib }:

 let
-  generator = buildGoModule rec {
+  generator = pkgsBuildBuild.buildGoModule rec {
    pname = "v2ray-domain-list-community";
    version = "20211119143108";
    src = fetchFromGitHub {
--- a/pkgs/desktops/pantheon/apps/elementary-videos/default.nix
+++ b/pkgs/desktops/pantheon/apps/elementary-videos/default.nix
@ -21,15 +21,13 @@

 stdenv.mkDerivation rec {
  pname = "elementary-videos";
-  version = "2.8.0";
-
-  repoName = "videos";
+  version = "2.8.1";

  src = fetchFromGitHub {
    owner = "elementary";
-    repo = repoName;
+    repo = "videos";
    rev = version;
-    sha256 = "sha256-FFCtQ42LygfjowehwZcISWTfv8PBZTH0X8mPrpiG8Ug=";
+    sha256 = "sha256-Ki6i9u+oXOBTH+dVJ9RgBxszD7Wvdrfahd9abyjFYJY=";
  };

  nativeBuildInputs = [
--- a/pkgs/desktops/pantheon/default.nix
+++ b/pkgs/desktops/pantheon/default.nix
@ -4,23 +4,37 @@
 lib.makeScope pkgs.newScope (self: with self; {

  switchboardPlugs = [
-    switchboard-plug-a11y switchboard-plug-about
-    switchboard-plug-applications switchboard-plug-bluetooth
-    switchboard-plug-datetime switchboard-plug-display
-    switchboard-plug-keyboard switchboard-plug-mouse-touchpad
-    switchboard-plug-network switchboard-plug-notifications
-    switchboard-plug-onlineaccounts switchboard-plug-pantheon-shell
-    switchboard-plug-power switchboard-plug-printers
-    switchboard-plug-security-privacy switchboard-plug-sharing
-    switchboard-plug-sound switchboard-plug-wacom
+    switchboard-plug-a11y
+    switchboard-plug-about
+    switchboard-plug-applications
+    switchboard-plug-bluetooth
+    switchboard-plug-datetime
+    switchboard-plug-display
+    switchboard-plug-keyboard
+    switchboard-plug-mouse-touchpad
+    switchboard-plug-network
+    switchboard-plug-notifications
+    switchboard-plug-onlineaccounts
+    switchboard-plug-pantheon-shell
+    switchboard-plug-power
+    switchboard-plug-printers
+    switchboard-plug-security-privacy
+    switchboard-plug-sharing
+    switchboard-plug-sound
+    switchboard-plug-wacom
  ];

  wingpanelIndicators = [
-    wingpanel-applications-menu wingpanel-indicator-a11y
-    wingpanel-indicator-bluetooth wingpanel-indicator-datetime
-    wingpanel-indicator-keyboard wingpanel-indicator-network
-    wingpanel-indicator-nightlight wingpanel-indicator-notifications
-    wingpanel-indicator-power wingpanel-indicator-session
+    wingpanel-applications-menu
+    wingpanel-indicator-a11y
+    wingpanel-indicator-bluetooth
+    wingpanel-indicator-datetime
+    wingpanel-indicator-keyboard
+    wingpanel-indicator-network
+    wingpanel-indicator-nightlight
+    wingpanel-indicator-notifications
+    wingpanel-indicator-power
+    wingpanel-indicator-session
    wingpanel-indicator-sound
  ];

@ -33,8 +47,6 @@ lib.makeScope pkgs.newScope (self: with self; {

  elementary-gsettings-schemas = callPackage ./desktop/elementary-gsettings-schemas { };

-  notes-up = pkgs.notes-up.override { withPantheon = true; };
-
  touchegg = pkgs.touchegg.override { withPantheon = true; };

  #### APPS
@ -129,6 +141,8 @@ lib.makeScope pkgs.newScope (self: with self; {

  pantheon-agent-polkit = callPackage ./services/pantheon-agent-polkit { };

+  xdg-desktop-portal-pantheon = callPackage ./services/xdg-desktop-portal-pantheon { };
+
  #### WINGPANEL INDICATORS

  wingpanel-applications-menu = callPackage ./desktop/wingpanel-indicators/applications-menu { };
@ -211,6 +225,13 @@ lib.makeScope pkgs.newScope (self: with self; {

  elementary-wallpapers = callPackage ./artwork/elementary-wallpapers { };

+  ### THIRD-PARTY
+
+  # Put packages that ONLY works with Pantheon in pkgs/desktops/pantheon/third-party,
+  # specfically third party switchboard plugins and wingpanel indicators.
+  # Please call these packages in pkgs/top-level/all-packages.nix instead of this file.
+  # https://github.com/NixOS/nixpkgs/issues/115222#issuecomment-906868654
+
 } // lib.optionalAttrs (config.allowAliases or true) {

  ### ALIASES
@ -223,4 +244,6 @@ lib.makeScope pkgs.newScope (self: with self; {

  extra-elementary-contracts = throw "extra-elementary-contracts has been removed as all contracts have been upstreamed."; # added 2021-12-01

+  inherit (pkgs) notes-up; # added 2021-12-18
+
 })
--- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/notifications/default.nix
+++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/notifications/default.nix
@ -16,13 +16,13 @@

 stdenv.mkDerivation rec {
  pname = "wingpanel-indicator-notifications";
-  version = "6.0.3";
+  version = "6.0.4";

  src = fetchFromGitHub {
    owner = "elementary";
    repo = pname;
    rev = version;
-    sha256 = "sha256-iHhZJwaomQgH1Sal8uejl4QlavOQ75UKZ9xchTi1X3U=";
+    sha256 = "sha256-tIpR/WIhE0Mmt2EploNNDVlAX4OUNI3VnEflTLVkfSo=";
  };

  nativeBuildInputs = [
--- a/pkgs/desktops/pantheon/services/xdg-desktop-portal-pantheon/default.nix
+++ b/pkgs/desktops/pantheon/services/xdg-desktop-portal-pantheon/default.nix
@ -8,9 +8,9 @@
 , vala
 , wrapGAppsHook
 , glib
+, granite
 , gtk3
 , libhandy
-, pantheon
 , systemd
 , vte
 }:
@ -36,9 +36,9 @@ stdenv.mkDerivation rec {

  buildInputs = [
    glib
+    granite
    gtk3
    libhandy
-    pantheon.granite
    systemd
    vte
  ];
@ -49,7 +49,7 @@ stdenv.mkDerivation rec {

  passthru = {
    updateScript = nix-update-script {
-      attrPath = pname;
+      attrPath = "pantheon.${pname}";
    };
  };

--- a/pkgs/desktops/pantheon/third-party/pantheon-tweaks/default.nix
+++ b/pkgs/desktops/pantheon/third-party/pantheon-tweaks/default.nix
--- a/pkgs/desktops/pantheon/third-party/pantheon-tweaks/fix-paths.patch
+++ b/pkgs/desktops/pantheon/third-party/pantheon-tweaks/fix-paths.patch
--- a/pkgs/desktops/pantheon/third-party/wingpanel-indicator-ayatana/default.nix
+++ b/pkgs/desktops/pantheon/third-party/wingpanel-indicator-ayatana/default.nix
@ -0,0 +1,58 @@
+{ lib
+, stdenv
+, fetchFromGitHub
+, substituteAll
+, meson
+, ninja
+, pkg-config
+, vala
+, gtk3
+, libindicator-gtk3
+, pantheon
+, indicator-application-gtk3
+}:
+
+stdenv.mkDerivation rec {
+  pname = "wingpanel-indicator-ayatana";
+  version = "unstable-2021-12-01";
+
+  src = fetchFromGitHub {
+    owner = "Lafydev";
+    repo = pname;
+    rev = "53dc05919cdba772c787620a4bee5821e38c53cd";
+    sha256 = "sha256-T0OHzqENyeAr0pvXUaRMwF1RpwKVyDAF5P5G9S28COU=";
+  };
+
+  patches = [
+    # Fixes install path for wingpanel indicator
+    # https://github.com/Lafydev/wingpanel-indicator-ayatana/pull/30
+    ./fix-indicator-dir.patch
+    # Tells the indicator the path for libapplication.so
+    (substituteAll {
+      src = ./fix-libapplication-dir.patch;
+      indicator_application = indicator-application-gtk3;
+    })
+  ];
+
+  nativeBuildInputs = [
+    meson
+    ninja
+    pkg-config
+    vala
+  ];
+
+  buildInputs = [
+    gtk3
+    libindicator-gtk3
+    pantheon.granite
+    pantheon.wingpanel
+  ];
+
+  meta = with lib; {
+    description = "Ayatana Compatibility Indicator for Wingpanel";
+    homepage = "https://github.com/Lafydev/wingpanel-indicator-ayatana";
+    license = licenses.lgpl21Plus;
+    platforms = platforms.linux;
+    maintainers = teams.pantheon.members;
+  };
+}
--- a/pkgs/desktops/pantheon/third-party/wingpanel-indicator-ayatana/fix-indicator-dir.patch
+++ b/pkgs/desktops/pantheon/third-party/wingpanel-indicator-ayatana/fix-indicator-dir.patch
@ -0,0 +1,16 @@
+diff --git a/meson.build b/meson.build
+index 4aeab2b..dc44e6c 100644
+--- a/meson.build
+++ b/meson.build
+@@ -25,8 +25,10 @@ dependencies = {
+     'wingpanel': wingpanel
+ }
+ 
+libdir = join_paths(get_option('prefix'), get_option('libdir'))
+
+ indicator_name = 'ayatana'
+-indicator_dir  = dependencies['wingpanel'].get_pkgconfig_variable('indicatorsdir')
+indicator_dir  = dependencies['wingpanel'].get_pkgconfig_variable('indicatorsdir', define_variable: ['libdir', libdir])
+ 
+ # ----------------------------------------------------------------------------------------------------------------------
+ # Bindings:
--- a/pkgs/desktops/pantheon/third-party/wingpanel-indicator-ayatana/fix-libapplication-dir.patch
+++ b/pkgs/desktops/pantheon/third-party/wingpanel-indicator-ayatana/fix-libapplication-dir.patch
@ -0,0 +1,13 @@
+diff --git a/src/IndicatorFactory.vala b/src/IndicatorFactory.vala
+index 9411de0..632d83b 100644
+--- a/src/IndicatorFactory.vala
+++ b/src/IndicatorFactory.vala
+@@ -24,7 +24,7 @@ public class AyatanaCompatibility.IndicatorFactory : Object, IndicatorLoader {
+     public Gee.Collection<IndicatorIface> get_indicators () {
+         if (indicators == null) {
+             indicators = new Gee.LinkedList<IndicatorIface> ();
+-            load_indicator (File.new_for_path (Constants.AYATANA_INDICATOR_DIR), "libapplication.so");
+            load_indicator (File.new_for_path ("@indicator_application@/lib/indicators3/7/"), "libapplication.so");
+         }
+ 
+         return indicators.read_only_view;
--- a/pkgs/desktops/plasma-5/fetch.sh
+++ b/pkgs/desktops/plasma-5/fetch.sh
@ -1 +1 @@
-WGET_ARGS=( https://download.kde.org/stable/plasma/5.23.3/ -A '*.tar.xz' )
+WGET_ARGS=( https://download.kde.org/stable/plasma/5.23.4/ -A '*.tar.xz' )
--- a/pkgs/desktops/plasma-5/srcs.nix
+++ b/pkgs/desktops/plasma-5/srcs.nix
@ -4,427 +4,427 @@

 {
  bluedevil = {
-    version = "5.23.3";
+    version = "5.23.4";
    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.23.3/bluedevil-5.23.3.tar.xz";
-      sha256 = "1n6h2m4z67vl0mv0hs0g5xff1vcj03w0nhx4hkhy66hly556nq8x";
-      name = "bluedevil-5.23.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.23.4/bluedevil-5.23.4.tar.xz";
+      sha256 = "13sxwsks7gnws13jhk8428npzdyhvv5yhczzayi5yd3856d3g4av";
+      name = "bluedevil-5.23.4.tar.xz";
    };
  };
  breeze = {
-    version = "5.23.3";
+    version = "5.23.4";
    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.23.3/breeze-5.23.3.tar.xz";
-      sha256 = "1514y4k52bc71nljihj655d7swk2qvr168i0j2xqcm0w4aiz4jmv";
-      name = "breeze-5.23.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.23.4/breeze-5.23.4.tar.xz";
+      sha256 = "1wbhir9g2gfwcvw0ib50qhqk0rgfji8wjipqqp7ddsm463ykp472";
+      name = "breeze-5.23.4.tar.xz";
    };
  };
  breeze-grub = {
-    version = "5.23.3";
+    version = "5.23.4";
    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.23.3/breeze-grub-5.23.3.tar.xz";
-      sha256 = "1nwhjw0nkdg94znh7h80byrq8vpa1f20ph1m4fhlj233nfskw0zy";
-      name = "breeze-grub-5.23.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.23.4/breeze-grub-5.23.4.tar.xz";
+      sha256 = "1zkl8ddbdnckz4glaf0j6vkxf1z63d5q9nx0w64d17qydp1fwxjq";
+      name = "breeze-grub-5.23.4.tar.xz";
    };
  };
  breeze-gtk = {
-    version = "5.23.3";
+    version = "5.23.4";
    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.23.3/breeze-gtk-5.23.3.tar.xz";
-      sha256 = "0wq313laj7nlsw3d6p1prq1d4gic5lz2ipklj4dq4vsvsh99ggvn";
-      name = "breeze-gtk-5.23.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.23.4/breeze-gtk-5.23.4.tar.xz";
+      sha256 = "0jv064y7wlvglk0w2yx1zwnxjhczi9gq6cfnz004z18rlqwnz9pq";
+      name = "breeze-gtk-5.23.4.tar.xz";
    };
  };
  breeze-plymouth = {
-    version = "5.23.3";
+    version = "5.23.4";
    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.23.3/breeze-plymouth-5.23.3.tar.xz";
-      sha256 = "047clfgqcrplwi3158pw1r868yyqlxs7iqqy861wzlsmjz9qzqdl";
-      name = "breeze-plymouth-5.23.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.23.4/breeze-plymouth-5.23.4.tar.xz";
+      sha256 = "1qc8pnhhl89bqwyh215cn92qahw8k8gx7zr14rwxqjn9hxf9jxxy";
+      name = "breeze-plymouth-5.23.4.tar.xz";
    };
  };
  discover = {
-    version = "5.23.3";
+    version = "5.23.4";
    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.23.3/discover-5.23.3.tar.xz";
-      sha256 = "056wcvk44r11rycnn12xf8r5psxqnm0f6i6z6nc5100sqkhip6p0";
-      name = "discover-5.23.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.23.4/discover-5.23.4.tar.xz";
+      sha256 = "0z5bp7p3f470i4x5796raawx7kjg1ca453y63wn9papdbiyl4iiz";
+      name = "discover-5.23.4.tar.xz";
    };
  };
  drkonqi = {
-    version = "5.23.3";
+    version = "5.23.4";
    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.23.3/drkonqi-5.23.3.tar.xz";
-      sha256 = "14yc6nq3z6jm8siq2r15nzsqxpawk5iqy9ghmmwy9xa4vf18dxy5";
-      name = "drkonqi-5.23.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.23.4/drkonqi-5.23.4.tar.xz";
+      sha256 = "073vdclybx83dpvvqb3rc413k3nh50nil8rcig4kqm0gzjhp3qdb";
+      name = "drkonqi-5.23.4.tar.xz";
    };
  };
  kactivitymanagerd = {
-    version = "5.23.3";
+    version = "5.23.4";
    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.23.3/kactivitymanagerd-5.23.3.tar.xz";
-      sha256 = "0rizk05v19qqymrjh7vswcp80a4rpyffmq7kg88pv5k11fcjqw5b";
-      name = "kactivitymanagerd-5.23.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.23.4/kactivitymanagerd-5.23.4.tar.xz";
+      sha256 = "1m0rbv8pkswkzfvbf231vn2c8x507ymc07kd0dw03np8h8zs5vbz";
+      name = "kactivitymanagerd-5.23.4.tar.xz";
    };
  };
  kde-cli-tools = {
-    version = "5.23.3";
+    version = "5.23.4";
    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.23.3/kde-cli-tools-5.23.3.tar.xz";
-      sha256 = "0f8wab6n4klxj4yy4l4k3q3pdqlz9718mbjydnsmn1jgn20shsa0";
-      name = "kde-cli-tools-5.23.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.23.4/kde-cli-tools-5.23.4.tar.xz";
+      sha256 = "0ay320b3ixlicd8d1rjngkbxspmpk7rd8g562dv0c54hk73q61gj";
+      name = "kde-cli-tools-5.23.4.tar.xz";
    };
  };
  kde-gtk-config = {
-    version = "5.23.3";
+    version = "5.23.4";
    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.23.3/kde-gtk-config-5.23.3.tar.xz";
-      sha256 = "12w2jv0mi39c2g1w3g3c68m80ailcm98hibk1mg885r36gx9kskb";
-      name = "kde-gtk-config-5.23.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.23.4/kde-gtk-config-5.23.4.tar.xz";
+      sha256 = "0537vk4wdvgz7jl0qkksf38bra5fdk6d0z6lnwm5v4fapdysbry9";
+      name = "kde-gtk-config-5.23.4.tar.xz";
    };
  };
  kdecoration = {
-    version = "5.23.3";
+    version = "5.23.4";
    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.23.3/kdecoration-5.23.3.tar.xz";
-      sha256 = "134jmp5l2bvl042a5a1f1d66mqi4g7vrpmrn3gi7ysi34w1ylfc8";
-      name = "kdecoration-5.23.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.23.4/kdecoration-5.23.4.tar.xz";
+      sha256 = "0s80dhbba458yr85m6yfv7m5jkkn0xqzp42nhhaj4m9hh36bbd9s";
+      name = "kdecoration-5.23.4.tar.xz";
    };
  };
  kdeplasma-addons = {
-    version = "5.23.3";
+    version = "5.23.4";
    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.23.3/kdeplasma-addons-5.23.3.tar.xz";
-      sha256 = "139wzfj21k32m36014sas3ad5qdc0df4131ckj1shlz882w4l3dw";
-      name = "kdeplasma-addons-5.23.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.23.4/kdeplasma-addons-5.23.4.tar.xz";
+      sha256 = "1j7xd2p8a8xi69sh91hldyajqg77lx5bla1vjg65f7yqz903bp4h";
+      name = "kdeplasma-addons-5.23.4.tar.xz";
    };
  };
  kgamma5 = {
-    version = "5.23.3";
+    version = "5.23.4";
    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.23.3/kgamma5-5.23.3.tar.xz";
-      sha256 = "06wzcpsjqy5pw3s6qg32l6qg9jf61bbpjwh802182balfq2jl0y5";
-      name = "kgamma5-5.23.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.23.4/kgamma5-5.23.4.tar.xz";
+      sha256 = "1b3m812xxcya0gf665m8crpmwq91mkq28jkcjaavknr9dd22dkyk";
+      name = "kgamma5-5.23.4.tar.xz";
    };
  };
  khotkeys = {
-    version = "5.23.3";
+    version = "5.23.4";
    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.23.3/khotkeys-5.23.3.tar.xz";
-      sha256 = "1ccjlr3q1lsmmdmh30wbrdaardvhivdzm9vrd46d301rdz6gyv86";
-      name = "khotkeys-5.23.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.23.4/khotkeys-5.23.4.tar.xz";
+      sha256 = "1fsll3cp6z763wp65iwqz244hzq0qlm4007jpxgd4gasbrd5zfg8";
+      name = "khotkeys-5.23.4.tar.xz";
    };
  };
  kinfocenter = {
-    version = "5.23.3";
+    version = "5.23.4";
    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.23.3/kinfocenter-5.23.3.tar.xz";
-      sha256 = "09yz5grzwzgs1cg39j18zy7af8azy2lbg4bkkmh7wayv8pngj4gv";
-      name = "kinfocenter-5.23.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.23.4/kinfocenter-5.23.4.tar.xz";
+      sha256 = "0z3hwq5qjkrcxn0smgi7x49mcyixm1apjd4f16q0z40sn7sdybad";
+      name = "kinfocenter-5.23.4.tar.xz";
    };
  };
  kmenuedit = {
-    version = "5.23.3";
+    version = "5.23.4";
    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.23.3/kmenuedit-5.23.3.tar.xz";
-      sha256 = "006kkg7jzwp4icik1hv95wcpw5sb1l1s94wnljvxdfdjkgzjxq55";
-      name = "kmenuedit-5.23.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.23.4/kmenuedit-5.23.4.tar.xz";
+      sha256 = "1iildwnhkvg2i2yhp6zl7m77fpa8vs7hhv8wjma3vbr2gh808nck";
+      name = "kmenuedit-5.23.4.tar.xz";
    };
  };
  kscreen = {
-    version = "5.23.3";
+    version = "5.23.4";
    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.23.3/kscreen-5.23.3.tar.xz";
-      sha256 = "1x4qlycb1dxw36s3zyyrjfmfvwvwk8f8r0jls6hq8gqkl810abhw";
-      name = "kscreen-5.23.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.23.4/kscreen-5.23.4.tar.xz";
+      sha256 = "0sa9xvyz42c69aqnn2bm3j1hq87n2nk5yawppl7csxyz91iyv3n5";
+      name = "kscreen-5.23.4.tar.xz";
    };
  };
  kscreenlocker = {
-    version = "5.23.3";
+    version = "5.23.4";
    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.23.3/kscreenlocker-5.23.3.tar.xz";
-      sha256 = "0wjcrikx3q533qz9wi0z3jm4k0lc09w2xsxr4iw1hh3afsd6jr34";
-      name = "kscreenlocker-5.23.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.23.4/kscreenlocker-5.23.4.tar.xz";
+      sha256 = "1n4gkcf74hk60fvbkb9940q5r89jbj4kwc4byi51523n038pvymf";
+      name = "kscreenlocker-5.23.4.tar.xz";
    };
  };
  ksshaskpass = {
-    version = "5.23.3";
+    version = "5.23.4";
    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.23.3/ksshaskpass-5.23.3.tar.xz";
-      sha256 = "0dcych5zcv8fqmy1lhwpbfzj75ihs648d8ppfr0nj15mm2pgnvhx";
-      name = "ksshaskpass-5.23.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.23.4/ksshaskpass-5.23.4.tar.xz";
+      sha256 = "1s9wbfl867fgr5md51f63fc57626zw2b637xh7qy8sn563l8y1lk";
+      name = "ksshaskpass-5.23.4.tar.xz";
    };
  };
  ksystemstats = {
-    version = "5.23.3";
+    version = "5.23.4";
    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.23.3/ksystemstats-5.23.3.tar.xz";
-      sha256 = "13jic16480rxhdwz0z49di19sxdi7rgvg61lg5i00w9mm6mbph3l";
-      name = "ksystemstats-5.23.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.23.4/ksystemstats-5.23.4.tar.xz";
+      sha256 = "00vs71jxqlv52absh16jyj1zryk2ib0bpd21c4qja11a3hw7j3gz";
+      name = "ksystemstats-5.23.4.tar.xz";
    };
  };
  kwallet-pam = {
-    version = "5.23.3";
+    version = "5.23.4";
    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.23.3/kwallet-pam-5.23.3.tar.xz";
-      sha256 = "0axxk7szp5kn5hhlxh2mjzbwzaj4g1yn40ymgb6dga10h1nfdkd8";
-      name = "kwallet-pam-5.23.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.23.4/kwallet-pam-5.23.4.tar.xz";
+      sha256 = "08ycniyna3hzdgzi3m61iamwid32hajb1k1m27kw16abh3ds4vx7";
+      name = "kwallet-pam-5.23.4.tar.xz";
    };
  };
  kwayland-integration = {
-    version = "5.23.3";
+    version = "5.23.4";
    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.23.3/kwayland-integration-5.23.3.tar.xz";
-      sha256 = "01gm3xbaih22v33bd9142xnrli13yxmib42pj8rnczhczrpnc3z3";
-      name = "kwayland-integration-5.23.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.23.4/kwayland-integration-5.23.4.tar.xz";
+      sha256 = "14j6iwakkmdyhf3796ap2dnfi0vdbrl3813x4ygzjyb8068a7k9g";
+      name = "kwayland-integration-5.23.4.tar.xz";
    };
  };
  kwayland-server = {
-    version = "5.23.3";
+    version = "5.23.4";
    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.23.3/kwayland-server-5.23.3.tar.xz";
-      sha256 = "1hjh278iaz3ydf9bqy2fmm4hsvc60hrqw4hlc3ddcadp28dhg3gx";
-      name = "kwayland-server-5.23.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.23.4/kwayland-server-5.23.4.tar.xz";
+      sha256 = "13cvw4i1ysw4ncdnx7c4qw29zc350wbmc29dy06b574idm5rbnrm";
+      name = "kwayland-server-5.23.4.tar.xz";
    };
  };
  kwin = {
-    version = "5.23.3";
+    version = "5.23.4";
    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.23.3/kwin-5.23.3.tar.xz";
-      sha256 = "04w8vnz3rzd9g1j1f4fbgyxjvxqrhasx6f2vqkrrh4cd56ndmcbz";
-      name = "kwin-5.23.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.23.4/kwin-5.23.4.tar.xz";
+      sha256 = "0rqim6p0r7k886mwvqy4zpz18scnah9zvjjbgx0p77f1086azvsc";
+      name = "kwin-5.23.4.tar.xz";
    };
  };
  kwrited = {
-    version = "5.23.3";
+    version = "5.23.4";
    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.23.3/kwrited-5.23.3.tar.xz";
-      sha256 = "0156syandkq0s76xrrcz6nkxa6jgpf1a6nbkdw0a8biyxs5md644";
-      name = "kwrited-5.23.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.23.4/kwrited-5.23.4.tar.xz";
+      sha256 = "15sixbk5i5i1jv07hj820xi4fh0b6fmb4jkv2917911wpdkdnyik";
+      name = "kwrited-5.23.4.tar.xz";
    };
  };
  layer-shell-qt = {
-    version = "5.23.3";
+    version = "5.23.4";
    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.23.3/layer-shell-qt-5.23.3.tar.xz";
-      sha256 = "15y7p0a59779aqxnsryqirsxslbvbig733i5s3n5jmg98y40712a";
-      name = "layer-shell-qt-5.23.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.23.4/layer-shell-qt-5.23.4.tar.xz";
+      sha256 = "0a74s7wx3jxxi1dp4j0a5dz7k45il4wjf7hf9j6cw2m5pdni1i2k";
+      name = "layer-shell-qt-5.23.4.tar.xz";
    };
  };
  libkscreen = {
-    version = "5.23.3";
+    version = "5.23.4";
    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.23.3/libkscreen-5.23.3.tar.xz";
-      sha256 = "0kazvsahnk7ngld12lp1c07c34x9kal03fy8g7w9bgdha3j7xmdq";
-      name = "libkscreen-5.23.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.23.4/libkscreen-5.23.4.tar.xz";
+      sha256 = "0n1xghmabhn7sb99k0zsyrbx05mbaf926hyyw9qp5rf07r8yzk2p";
+      name = "libkscreen-5.23.4.tar.xz";
    };
  };
  libksysguard = {
-    version = "5.23.3";
+    version = "5.23.4";
    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.23.3/libksysguard-5.23.3.tar.xz";
-      sha256 = "0ma4b0w08j0f46ivh9grci7wfh4z5j8nml83kcvnain1nwzprha0";
-      name = "libksysguard-5.23.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.23.4/libksysguard-5.23.4.tar.xz";
+      sha256 = "1xik5qaww9m26nkg804akaxbn7i7bd8ibc2v93h3p8ihkb5hh7lw";
+      name = "libksysguard-5.23.4.tar.xz";
    };
  };
  milou = {
-    version = "5.23.3";
+    version = "5.23.4";
    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.23.3/milou-5.23.3.tar.xz";
-      sha256 = "0myvm9bkq189cfla7yqiwmbb5z2cm90rq5ll655n2c7zk3lqnn0d";
-      name = "milou-5.23.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.23.4/milou-5.23.4.tar.xz";
+      sha256 = "15wniaj9zprhvly6krxl5847q8kh8m8z5sr2wj816n70hh1y58f8";
+      name = "milou-5.23.4.tar.xz";
    };
  };
  oxygen = {
-    version = "5.23.3";
+    version = "5.23.4";
    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.23.3/oxygen-5.23.3.tar.xz";
-      sha256 = "0r79xadvg7l4nsziy78wydhn4f0223fjc2xd60zih1dwmgapgf0z";
-      name = "oxygen-5.23.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.23.4/oxygen-5.23.4.tar.xz";
+      sha256 = "0b4rhf9500jhx73xw4ghqifgkfr527n2isiiys8g7m23ya38pbxz";
+      name = "oxygen-5.23.4.tar.xz";
    };
  };
  plasma-browser-integration = {
-    version = "5.23.3";
+    version = "5.23.4";
    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.23.3/plasma-browser-integration-5.23.3.tar.xz";
-      sha256 = "0r3sq6w73qn246nddf4f8lbym8k4wp2ycfr2laz888b5cjf9df97";
-      name = "plasma-browser-integration-5.23.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.23.4/plasma-browser-integration-5.23.4.tar.xz";
+      sha256 = "004406s80i0gv1ga151ws7sny4l3y74swawdgd1swmvkjg2ii909";
+      name = "plasma-browser-integration-5.23.4.tar.xz";
    };
  };
  plasma-desktop = {
-    version = "5.23.3";
+    version = "5.23.4";
    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.23.3/plasma-desktop-5.23.3.tar.xz";
-      sha256 = "01259pqncx3gcpanrmhal51dn4y8xcrs16pl5bjnasdn9r8mlhs3";
-      name = "plasma-desktop-5.23.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.23.4/plasma-desktop-5.23.4.tar.xz";
+      sha256 = "1p48sl6zyra1iyri9zrx88wka9fbzgyhkd9m7r4nqa8h0v5p12as";
+      name = "plasma-desktop-5.23.4.tar.xz";
    };
  };
  plasma-disks = {
-    version = "5.23.3";
+    version = "5.23.4";
    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.23.3/plasma-disks-5.23.3.tar.xz";
-      sha256 = "1qwxhasmycn6ah2pv46z8vvls85lfwxm4z61q13l63a50489a05b";
-      name = "plasma-disks-5.23.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.23.4/plasma-disks-5.23.4.tar.xz";
+      sha256 = "0sgfwqyn539nd6s23nix3igf7z87sn3dn9zp8w2fy488vmm1pdmi";
+      name = "plasma-disks-5.23.4.tar.xz";
    };
  };
  plasma-firewall = {
-    version = "5.23.3";
+    version = "5.23.4";
    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.23.3/plasma-firewall-5.23.3.tar.xz";
-      sha256 = "0kqb7sxysh6gq143rmmznv95mx4275bp1xfrlys518yn97clnwqq";
-      name = "plasma-firewall-5.23.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.23.4/plasma-firewall-5.23.4.tar.xz";
+      sha256 = "040w85ml5rh0l95l744576s3kb00niyr72q4pvf5xj98df1h89aw";
+      name = "plasma-firewall-5.23.4.tar.xz";
    };
  };
  plasma-integration = {
-    version = "5.23.3";
+    version = "5.23.4";
    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.23.3/plasma-integration-5.23.3.tar.xz";
-      sha256 = "0q53b43yl5s1pvlqpmic2x8q5inawk66n8wng7rzgcfv9d3imhrn";
-      name = "plasma-integration-5.23.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.23.4/plasma-integration-5.23.4.tar.xz";
+      sha256 = "0b4rvfnd40xgvgab81p9qjgdpjww673nlaiklwrkrqmv41m0yy33";
+      name = "plasma-integration-5.23.4.tar.xz";
    };
  };
  plasma-nano = {
-    version = "5.23.3";
+    version = "5.23.4";
    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.23.3/plasma-nano-5.23.3.tar.xz";
-      sha256 = "0ijygajn78c97s8ys8m2zn52zx45kxhk857hppkxp4jqpd5psf34";
-      name = "plasma-nano-5.23.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.23.4/plasma-nano-5.23.4.tar.xz";
+      sha256 = "1kw77w00261dmp2w0jvaslamia215mlhd3nnl0wr39p5vhlym70p";
+      name = "plasma-nano-5.23.4.tar.xz";
    };
  };
  plasma-nm = {
-    version = "5.23.3";
+    version = "5.23.4";
    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.23.3/plasma-nm-5.23.3.tar.xz";
-      sha256 = "157almdi3br1qdfr0lwfdwc60fbizkwmpw3j2czk2sdsvm58rhgf";
-      name = "plasma-nm-5.23.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.23.4/plasma-nm-5.23.4.tar.xz";
+      sha256 = "0c4gfdyzac67yxjvz75mxd61wacnsa01liaajdyj853bn7wkx294";
+      name = "plasma-nm-5.23.4.tar.xz";
    };
  };
  plasma-pa = {
-    version = "5.23.3";
+    version = "5.23.4";
    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.23.3/plasma-pa-5.23.3.tar.xz";
-      sha256 = "0md3vb2iffn4qdnj4msyn6j3hvidnsxzp2dfsnb3n0yp29niwxqk";
-      name = "plasma-pa-5.23.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.23.4/plasma-pa-5.23.4.tar.xz";
+      sha256 = "0g4q0y4sr14xsi71mv5qgn6qj8svmd045ff73hf34pb15qvdq0a7";
+      name = "plasma-pa-5.23.4.tar.xz";
    };
  };
  plasma-phone-components = {
-    version = "5.23.3";
+    version = "5.23.4";
    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.23.3/plasma-phone-components-5.23.3.tar.xz";
-      sha256 = "1w8yqczr0933vhca5id32vg1k2np6n6hkh58n4x3z3xpdxpb5d4c";
-      name = "plasma-phone-components-5.23.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.23.4/plasma-phone-components-5.23.4.tar.xz";
+      sha256 = "0ml5pyi90nlmx5550sf3x9263f8mypj4jmdskzabzhnz44ck8vy9";
+      name = "plasma-phone-components-5.23.4.tar.xz";
    };
  };
  plasma-sdk = {
-    version = "5.23.3";
+    version = "5.23.4";
    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.23.3/plasma-sdk-5.23.3.tar.xz";
-      sha256 = "0fb9g6vhsaxd6h6889jyhnxp86g7rwkmyiafq72hx6ikv69wyvbi";
-      name = "plasma-sdk-5.23.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.23.4/plasma-sdk-5.23.4.tar.xz";
+      sha256 = "1cbsksjy9x3jlk8bzd9m1zgr83rzkwv0jd015fap707ysdil1ypk";
+      name = "plasma-sdk-5.23.4.tar.xz";
    };
  };
  plasma-systemmonitor = {
-    version = "5.23.3";
+    version = "5.23.4";
    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.23.3/plasma-systemmonitor-5.23.3.tar.xz";
-      sha256 = "1jlgfrkdw785x9bib2hzxjyd70b9aqgcp1w6lk75bhgkrz85kz8p";
-      name = "plasma-systemmonitor-5.23.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.23.4/plasma-systemmonitor-5.23.4.tar.xz";
+      sha256 = "16kfpzm8bhxyl9jx5xqbas4cm99sny4b2n6i27hc7ggjgx9r3j31";
+      name = "plasma-systemmonitor-5.23.4.tar.xz";
    };
  };
  plasma-tests = {
-    version = "5.23.3";
+    version = "5.23.4";
    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.23.3/plasma-tests-5.23.3.tar.xz";
-      sha256 = "1fgl09c0ir8w128z4l0bggszjsvsqncb42k44vn6i6d0qdisxdgh";
-      name = "plasma-tests-5.23.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.23.4/plasma-tests-5.23.4.tar.xz";
+      sha256 = "1vnihnrxgbrk224xxpisqj84hjbllyk32vsra2rbgrwp2g58fh69";
+      name = "plasma-tests-5.23.4.tar.xz";
    };
  };
  plasma-thunderbolt = {
-    version = "5.23.3";
+    version = "5.23.4";
    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.23.3/plasma-thunderbolt-5.23.3.tar.xz";
-      sha256 = "0vzdzsl6isg24j0830lg7is47kpmpvsni7gf4vri2l8a6fy7ibav";
-      name = "plasma-thunderbolt-5.23.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.23.4/plasma-thunderbolt-5.23.4.tar.xz";
+      sha256 = "0g5n24qwm6yd78rg14d6j2hn0krn0z0fm6bpyzr54ycrgiv850zz";
+      name = "plasma-thunderbolt-5.23.4.tar.xz";
    };
  };
  plasma-vault = {
-    version = "5.23.3";
+    version = "5.23.4";
    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.23.3/plasma-vault-5.23.3.tar.xz";
-      sha256 = "061zq00mz1aamam4pc4kbbzdx4mi07iiach6w52n0c9d1bz16ym2";
-      name = "plasma-vault-5.23.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.23.4/plasma-vault-5.23.4.tar.xz";
+      sha256 = "1ay9x7kbgb5qg7w1m1rp9xbp8dzsxdj7zh2ifk3lff1g5f3yh9y6";
+      name = "plasma-vault-5.23.4.tar.xz";
    };
  };
  plasma-workspace = {
-    version = "5.23.3";
+    version = "5.23.4";
    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.23.3/plasma-workspace-5.23.3.tar.xz";
-      sha256 = "0mz2aanm46s88lwm1s2nwm8yfanj78rnx1y14ppzm4dx0lrjx046";
-      name = "plasma-workspace-5.23.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.23.4/plasma-workspace-5.23.4.tar.xz";
+      sha256 = "0kd37sfg8hbf8biia3ip89nx0jgrdgfprmda392gx5xfzbnlxv0k";
+      name = "plasma-workspace-5.23.4.tar.xz";
    };
  };
  plasma-workspace-wallpapers = {
-    version = "5.23.3";
+    version = "5.23.4";
    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.23.3/plasma-workspace-wallpapers-5.23.3.tar.xz";
-      sha256 = "1kz4xqzgwnhp1wmqmgadn0jjc9033i2bm8hiycqkahhj603k552s";
-      name = "plasma-workspace-wallpapers-5.23.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.23.4/plasma-workspace-wallpapers-5.23.4.tar.xz";
+      sha256 = "157kbi40bv9arxq7cvgxypk1qmrpd52d76xq99rsfbzdfrggx9nc";
+      name = "plasma-workspace-wallpapers-5.23.4.tar.xz";
    };
  };
  plymouth-kcm = {
-    version = "5.23.3";
+    version = "5.23.4";
    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.23.3/plymouth-kcm-5.23.3.tar.xz";
-      sha256 = "1fa26h19g4f2fhpisp1jsl1niis50fbkdss7j1nqg44jih0g0qyf";
-      name = "plymouth-kcm-5.23.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.23.4/plymouth-kcm-5.23.4.tar.xz";
+      sha256 = "11f2r4nq7pi8xn3z6zjc58ix5hj3das16xqvq7m82p8zvw2qs44p";
+      name = "plymouth-kcm-5.23.4.tar.xz";
    };
  };
  polkit-kde-agent = {
-    version = "1-5.23.3";
+    version = "1-5.23.4";
    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.23.3/polkit-kde-agent-1-5.23.3.tar.xz";
-      sha256 = "1r5sqxzj5r9xqn3iwsfj06f1w69q41j4wq2z11kndnjad0pwrf3r";
-      name = "polkit-kde-agent-1-5.23.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.23.4/polkit-kde-agent-1-5.23.4.tar.xz";
+      sha256 = "06qjz87c2h0vgpk0jpf24194rahdrwpc274k6vmfkmbr5232w48h";
+      name = "polkit-kde-agent-1-5.23.4.tar.xz";
    };
  };
  powerdevil = {
-    version = "5.23.3";
+    version = "5.23.4";
    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.23.3/powerdevil-5.23.3.tar.xz";
-      sha256 = "0hcb22dy4hslzrk3md6amzm51hlmv08747f34x5drdl10cg98mzb";
-      name = "powerdevil-5.23.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.23.4/powerdevil-5.23.4.tar.xz";
+      sha256 = "1sl62vm25libbx2l2kw7s9p44kdq561gh8an03vkf1q1qgrnpwsf";
+      name = "powerdevil-5.23.4.tar.xz";
    };
  };
  qqc2-breeze-style = {
-    version = "5.23.3";
+    version = "5.23.4";
    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.23.3/qqc2-breeze-style-5.23.3.tar.xz";
-      sha256 = "0716mw6dgpzwkaiinp8vphvxj3vrb95v7zckh4pgdky8ahxv655l";
-      name = "qqc2-breeze-style-5.23.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.23.4/qqc2-breeze-style-5.23.4.tar.xz";
+      sha256 = "1wl8zxq7bca6v40mnwjnpxc3pzz30khc223y9dwpgy8ampvy2ghr";
+      name = "qqc2-breeze-style-5.23.4.tar.xz";
    };
  };
  sddm-kcm = {
-    version = "5.23.3";
+    version = "5.23.4";
    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.23.3/sddm-kcm-5.23.3.tar.xz";
-      sha256 = "0sb9sjdbhafjcx2nf2ffzjh14gyambj1w32gjz29fl15xjbmvqnr";
-      name = "sddm-kcm-5.23.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.23.4/sddm-kcm-5.23.4.tar.xz";
+      sha256 = "148vf9af4fhma0w6v7wwlxpq8v8a858yx3qx7w0pg8jq5zd1k6g2";
+      name = "sddm-kcm-5.23.4.tar.xz";
    };
  };
  systemsettings = {
-    version = "5.23.3";
+    version = "5.23.4";
    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.23.3/systemsettings-5.23.3.tar.xz";
-      sha256 = "0i8vc1y95jd3g5vcgzixd73mn1r9s2jg9ix5nwfq4i5ihi0a0ph1";
-      name = "systemsettings-5.23.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.23.4/systemsettings-5.23.4.tar.xz";
+      sha256 = "0naw5zxgs47nx5wwg1li35salyg2cfpaphhn5m20plwqfi43zbdw";
+      name = "systemsettings-5.23.4.tar.xz";
    };
  };
  xdg-desktop-portal-kde = {
-    version = "5.23.3";
+    version = "5.23.4";
    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.23.3/xdg-desktop-portal-kde-5.23.3.tar.xz";
-      sha256 = "1aajlgccl1z9m49a016ixr2hiy231wyx6xnmpbvjx9h1b52b3rpz";
-      name = "xdg-desktop-portal-kde-5.23.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.23.4/xdg-desktop-portal-kde-5.23.4.tar.xz";
+      sha256 = "17n5d4rjm28in7jpsq2qg2d7lv3qcnlpmgi9kclx81miih9rjwan";
+      name = "xdg-desktop-portal-kde-5.23.4.tar.xz";
    };
  };
 }
--- a/pkgs/development/compilers/dotnet/build-dotnet.nix
+++ b/pkgs/development/compilers/dotnet/build-dotnet.nix
@ -4,7 +4,8 @@
 }:

 assert builtins.elem type [ "aspnetcore" "runtime" "sdk"];
-{ lib, stdenv
+{ lib
+, stdenv
 , fetchurl
 , libunwind
 , openssl
@ -42,9 +43,8 @@ in stdenv.mkDerivation rec {
  inherit pname version;

  # Some of these dependencies are `dlopen()`ed.
-  rpath = lib.makeLibraryPath [
+  rpath = lib.makeLibraryPath ([
    stdenv.cc.cc
-    lttng-ust_2_12
    zlib

    curl
@ -52,7 +52,9 @@ in stdenv.mkDerivation rec {
    libunwind
    libuuid
    openssl
-  ];
+  ] ++ lib.optionals stdenv.isLinux [
+    lttng-ust_2_12
+  ]);

  src = fetchurl {
    url = builtins.getAttr type urls;
--- a/pkgs/development/compilers/nim/default.nix
+++ b/pkgs/development/compilers/nim/default.nix
@ -98,12 +98,12 @@ in {

  nim-unwrapped = stdenv.mkDerivation rec {
    pname = "nim-unwrapped";
-    version = "1.6.0";
+    version = "1.6.2";
    strictDeps = true;

    src = fetchurl {
      url = "https://nim-lang.org/download/nim-${version}.tar.xz";
-      hash = "sha256-UgZdSNcqcnAuwa/l96mDHhFnNTHiec3/nK7AGgfuxj0=";
+      hash = "sha256-msRxT6bDFdaR2n9diUHBsZDU1Dc5fZdC4yfC1RiT43M=";
    };

    buildInputs = [ boehmgc openssl pcre readline sqlite ];
--- a/pkgs/development/compilers/open-watcom/v2.nix
+++ b/pkgs/development/compilers/open-watcom/v2.nix
@ -1,6 +1,7 @@
 { stdenv
 , lib
 , fetchFromGitHub
+, unstableGitUpdater

 # Docs cause an immense increase in build time, up to 2 additional hours
 , withDocs ? false
@ -11,14 +12,14 @@

 stdenv.mkDerivation rec {
  pname = "open-watcom-v2";
-  version = "unstable-2021-11-30";
+  version = "unstable-2021-12-10";
  name = "${pname}-unwrapped-${version}";

  src = fetchFromGitHub {
    owner = "open-watcom";
    repo = "open-watcom-v2";
-    rev = "982c958eb4840e1c6a98773ba0600f652500f5a7";
-    sha256 = "18dp9nd1gjnpd1870149v67vzxbna25l6zi052z1r51xvaqwc3cx";
+    rev = "ca685c1b780149f7210426f0bb78dd7b67b19e6d";
+    sha256 = "1nmmj94z5hips2426rcdqdcsm8015jjj51rm9fnx81qagdj52j5d";
  };

  postPatch = ''
@ -82,6 +83,10 @@ stdenv.mkDerivation rec {
  # Stripping breaks many tools
  dontStrip = true;

+  passthru.updateScript = unstableGitUpdater {
+    url = "https://github.com/open-watcom/open-watcom-v2.git";
+  };
+
  meta = with lib; {
    description = "The v2 fork of the Open Watcom suite of compilers and tools";
    longDescription = ''
--- a/pkgs/development/compilers/open-watcom/wrapper.nix
+++ b/pkgs/development/compilers/open-watcom/wrapper.nix
@ -123,6 +123,8 @@ let
          '';
        };
      };
+
+      inherit (open-watcom) meta;
    };
 in
 lib.makeOverridable wrapper
--- a/pkgs/development/interpreters/python/tests.nix
+++ b/pkgs/development/interpreters/python/tests.nix
@ -20,7 +20,15 @@ let
    envs = let
      inherit python;
      pythonEnv = python.withPackages(ps: with ps; [ ]);
-      pythonVirtualEnv = python.withPackages(ps: with ps; [ virtualenv ]);
+      pythonVirtualEnv = if python.isPy3k
+        then
+           python.withPackages(ps: with ps; [ virtualenv ])
+        else
+          python.buildEnv.override {
+            extraLibs = with python.pkgs; [ virtualenv ];
+            # Collisions because of namespaces __init__.py
+            ignoreCollisions = true;
+          };
    in {
      # Plain Python interpreter
      plain = rec {
--- a/pkgs/development/libraries/SDL_image/default.nix
+++ b/pkgs/development/libraries/SDL_image/default.nix
@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, fetchpatch, SDL, libpng, libjpeg, libtiff, giflib, libXpm }:
+{ lib, stdenv, fetchurl, fetchpatch, SDL, libpng, libjpeg, libtiff, giflib, libXpm, pkg-config }:

 stdenv.mkDerivation rec {
  pname = "SDL_image";
@ -25,6 +25,7 @@ stdenv.mkDerivation rec {
    "--disable-tif-shared"
  ] ++ lib.optional stdenv.isDarwin "--disable-sdltest";

+  nativeBuildInputs = [ pkg-config ];
  buildInputs = [ SDL libpng libjpeg libtiff giflib libXpm ];

  meta = with lib; {
--- a/pkgs/development/libraries/SDL_mixer/default.nix
+++ b/pkgs/development/libraries/SDL_mixer/default.nix
@ -1,6 +1,6 @@
 { stdenv, lib, fetchurl
 , SDL, libogg, libvorbis, smpeg, libmikmod
-, fluidsynth
+, fluidsynth, pkg-config
 , enableNativeMidi ? false
 }:

@ -13,6 +13,7 @@ stdenv.mkDerivation rec {
    sha256 = "0alrhqgm40p4c92s26mimg9cm1y7rzr6m0p49687jxd9g6130i0n";
  };

+  nativeBuildInputs = [ pkg-config ];
  buildInputs = [ SDL libogg libvorbis fluidsynth smpeg libmikmod ];

  configureFlags = [ "--disable-music-ogg-shared" "--disable-music-mod-shared" ]
--- a/pkgs/development/libraries/SDL_net/default.nix
+++ b/pkgs/development/libraries/SDL_net/default.nix
@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, SDL }:
+{ lib, stdenv, fetchurl, SDL, pkg-config }:

 stdenv.mkDerivation rec {
  pname = "SDL_net";
@ -11,6 +11,7 @@ stdenv.mkDerivation rec {

  configureFlags = lib.optional stdenv.isDarwin "--disable-sdltest";

+  nativeBuildInputs = [ pkg-config ];
  propagatedBuildInputs = [ SDL ];

  meta = with lib; {
--- a/pkgs/development/libraries/amdvlk/default.nix
+++ b/pkgs/development/libraries/amdvlk/default.nix
@ -1,6 +1,7 @@
 { stdenv
 , lib
 , fetchRepoProject
+, writeScript
 , cmake
 , ninja
 , patchelf
@ -21,17 +22,18 @@ let

 in stdenv.mkDerivation rec {
  pname = "amdvlk";
-  version = "2021.Q4.1";
+  version = "2021.Q4.2";

  src = fetchRepoProject {
    name = "${pname}-src";
    manifest = "https://github.com/GPUOpen-Drivers/AMDVLK.git";
    rev = "refs/tags/v-${version}";
-    sha256 = "sha256-yvpHLreBNhiSxnZis5+XcTOSZPRLq5K8YNJsjpYqD6s=";
+    sha256 = "DpylZjIqWmCnUI0lEvd/HQcY+lr8asMurt1K9MI3qQw=";
  };

  buildInputs = [
    expat
+    libdrm
    ncurses
    openssl
    wayland
@ -66,16 +68,36 @@ in stdenv.mkDerivation rec {
  cmakeDir = "../drivers/xgl";

  installPhase = ''
+    runHook preInstall
+
    install -Dm755 -t $out/lib icd/amdvlk${suffix}.so
    install -Dm644 -t $out/share/vulkan/icd.d icd/amd_icd${suffix}.json
    install -Dm644 -t $out/share/vulkan/implicit_layer.d icd/amd_icd${suffix}.json

    patchelf --set-rpath "$rpath" $out/lib/amdvlk${suffix}.so
+
+    runHook postInstall
  '';

  # Keep the rpath, otherwise vulkaninfo and vkcube segfault
  dontPatchELF = true;

+  passthru.updateScript = writeScript "update.sh" ''
+    #!/usr/bin/env nix-shell
+    #!nix-shell -i bash -p coreutils curl gnused jq common-updater-scripts
+
+    function setHash() {
+      sed -i "pkgs/development/libraries/amdvlk/default.nix" -e 's,sha256 = "[^.'"'"']*",sha256 = "'"$1"'",'
+    }
+
+    version="$(curl -sL "https://api.github.com/repos/GPUOpen-Drivers/AMDVLK/releases?per_page=1" | jq '.[0].tag_name | split("-") | .[1]' --raw-output)"
+    sed -i "pkgs/development/libraries/amdvlk/default.nix" -e 's/version = "[^.'"'"']*"/version = "'"$version"'"/'
+
+    setHash "$(nix-instantiate --eval -A lib.fakeSha256 | xargs echo)"
+    hash="$(nix to-base64 $(nix-build -A amdvlk 2>&1 | tail -n3 | grep 'got:' | cut -d: -f2- | xargs echo || true))"
+    setHash "$hash"
+  '';
+
  meta = with lib; {
    description = "AMD Open Source Driver For Vulkan";
    homepage = "https://github.com/GPUOpen-Drivers/AMDVLK";
--- a/pkgs/development/libraries/aspell/dictionaries.nix
+++ b/pkgs/development/libraries/aspell/dictionaries.nix
@ -41,10 +41,14 @@ let
    stdenv.mkDerivation ({
      name = "aspell-dict-${shortName}";

-      buildInputs = [aspell which];
+      strictDeps = true;
+
+      nativeBuildInputs = [ aspell which ];

      dontAddPrefix = true;

+      configurePlatforms = [ ];
+
      preBuild = "makeFlagsArray=(dictdir=$out/lib/aspell datadir=$out/lib/aspell)";

      meta = {
--- a/pkgs/development/libraries/gsl/default.nix
+++ b/pkgs/development/libraries/gsl/default.nix
@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
  NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isx86_64 "-mno-fma";

  # https://lists.gnu.org/archive/html/bug-gsl/2015-11/msg00012.html
-  doCheck = stdenv.hostPlatform.system != "i686-linux" && stdenv.hostPlatform.system != "aarch64-linux";
+  doCheck = stdenv.hostPlatform.system != "i686-linux";

  meta = {
    description = "The GNU Scientific Library, a large numerical library";
--- a/pkgs/development/libraries/gtk/2.x.nix
+++ b/pkgs/development/libraries/gtk/2.x.nix
@ -4,7 +4,7 @@
 , cupsSupport ? config.gtk2.cups or stdenv.isLinux, cups
 , gdktarget ? if stdenv.isDarwin then "quartz" else "x11"
 , AppKit, Cocoa
-, fetchpatch
+, fetchpatch, buildPackages
 }:

 with lib;
@ -38,6 +38,7 @@ stdenv.mkDerivation rec {
    gtkCleanImmodulesCache
  ];

+
  nativeBuildInputs = setupHooks ++ [ perl pkg-config gettext gobject-introspection ];

  patches = [
@ -72,6 +73,9 @@ stdenv.mkDerivation rec {
    "--disable-glibtest"
    "--disable-introspection"
    "--disable-visibility"
+  ] ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [
+    "ac_cv_path_GTK_UPDATE_ICON_CACHE=${buildPackages.gtk2}/bin/gtk-update-icon-cache"
+    "ac_cv_path_GDK_PIXBUF_CSOURCE=${buildPackages.gdk-pixbuf.dev}/bin/gdk-pixbuf-csource"
  ];

  doCheck = false; # needs X11
--- a/pkgs/development/libraries/mpich/default.nix
+++ b/pkgs/development/libraries/mpich/default.nix
@ -11,11 +11,11 @@ assert (ch4backend.pname == "ucx" || ch4backend.pname == "libfabric");

 stdenv.mkDerivation  rec {
  pname = "mpich";
-  version = "3.4.2";
+  version = "3.4.3";

  src = fetchurl {
    url = "https://www.mpich.org/static/downloads/${version}/mpich-${version}.tar.gz";
-    sha256 = "1gw7qpb27mhsj7ip0hhljshgpwvz2hmyhizhlp6793afp2lbw6aw";
+    sha256 = "1msg5i2mcmjix5pvpa84dwmlqpqm3206frl1060k342i62gxhm41";
  };

  configureFlags = [
--- a/pkgs/development/libraries/pipewire/default.nix
+++ b/pkgs/development/libraries/pipewire/default.nix
@ -10,7 +10,6 @@
 , docutils
 , doxygen
 , graphviz
-, valgrind
 , glib
 , dbus
 , alsa-lib
@ -28,28 +27,30 @@
 , makeFontsConf
 , callPackage
 , nixosTests
+, withValgrind ? lib.meta.availableOn stdenv.hostPlatform valgrind
+, valgrind
 , withMediaSession ? true
 , libcameraSupport ? true
 , libcamera
 , libdrm
 , gstreamerSupport ? true
-, gst_all_1 ? null
+, gst_all_1
 , ffmpegSupport ? true
-, ffmpeg ? null
+, ffmpeg
 , bluezSupport ? true
-, bluez ? null
-, sbc ? null
-, libfreeaptx ? null
-, ldacbt ? null
-, fdk_aac ? null
+, bluez
+, sbc
+, libfreeaptx
+, ldacbt
+, fdk_aac
 , nativeHspSupport ? true
 , nativeHfpSupport ? true
 , ofonoSupport ? true
 , hsphfpdSupport ? true
 , pulseTunnelSupport ? true
-, libpulseaudio ? null
+, libpulseaudio
 , zeroconfSupport ? true
-, avahi ? null
+, avahi
 }:

 let
@ -121,7 +122,6 @@ let
      vulkan-headers
      vulkan-loader
      webrtc-audio-processing
-      valgrind
      SDL2
      systemd
    ] ++ lib.optionals gstreamerSupport [ gst_all_1.gst-plugins-base gst_all_1.gstreamer ]
@ -131,6 +131,9 @@ let
    ++ lib.optional pulseTunnelSupport libpulseaudio
    ++ lib.optional zeroconfSupport avahi;

+    # Valgrind binary is required for running one optional test.
+    checkInputs = lib.optional withValgrind valgrind;
+
    mesonFlags = [
      "-Ddocs=enabled"
      "-Dudevrulesdir=lib/udev/rules.d"
--- a/pkgs/development/libraries/uhttpmock/default.nix
+++ b/pkgs/development/libraries/uhttpmock/default.nix
@ -11,10 +11,10 @@ stdenv.mkDerivation rec {
    sha256 = "0kkf670abkq5ikm3mqls475lydfsd9by1kv5im4k757xrl1br1d4";
  };

-  nativeBuildInputs = [ pkg-config ];
-  buildInputs = [ autoconf gtk-doc automake libtool glib libsoup gobject-introspection ];
+  nativeBuildInputs = [ pkg-config autoconf automake gtk-doc libtool gobject-introspection ];
+  buildInputs = [ glib libsoup ];

-  preConfigure = "./autogen.sh";
+  preConfigure = "NOCONFIGURE=1 ./autogen.sh";

  meta = with lib; {
    description = "Project for mocking web service APIs which use HTTP or HTTPS";
--- a/pkgs/development/nim-packages/build-nim-package/default.nix
+++ b/pkgs/development/nim-packages/build-nim-package/default.nix
@ -14,7 +14,7 @@ stdenv.mkDerivation (attrs // {
    nim_builder --phase:configure
    runHook postConfigure
  '' else
-    buildPhase;
+    configurePhase;

  buildPhase = if isNull buildPhase then ''
    runHook preBuild
--- a/pkgs/development/python-modules/blspy/default.nix
+++ b/pkgs/development/python-modules/blspy/default.nix
@ -2,7 +2,6 @@
 , buildPythonPackage
 , fetchPypi
 , fetchFromGitHub
-, fetchpatch
 , setuptools-scm
 , substituteAll
 , cmake
@ -14,12 +13,12 @@

 buildPythonPackage rec {
  pname = "blspy";
-  version = "1.0.6";
+  version = "1.0.8";
  disabled = pythonOlder "3.7";

  src = fetchPypi {
    inherit pname version;
-    hash = "sha256-sULXnecEs8VI687pR9EK9jjYWlrB4tV4dt7Kzekaxb4=";
+    hash = "sha256-yKLirwWWeUTs5BFXZfqfuNJUXtQW40EiNPxuP+FeHso=";
  };

  patches = [
@ -40,12 +39,12 @@ buildPythonPackage rec {
        sha256 = "sha256-lGz7o6DQVAuEc7yTp8bYS2kwjzHwGaNjugDi1ruRJOA=";
        fetchSubmodules = true;
      };
-    })
-
-    # avoid dynamic linking error at import time
-    (fetchpatch {
-      url = "https://github.com/Chia-Network/bls-signatures/pull/287/commits/797241e9dae1c164c862cbdb38c865d4b124a601.patch";
-      sha256 = "sha256-tlc4aA75gUxt5OaSNZqIlO//PXjmddVgVLYuVEFNmkE=";
+      catch2_src = fetchFromGitHub {
+        owner = "catchorg";
+        repo = "Catch2";
+        rev = "v2.13.7"; # pinned by blspy
+        sha256 = "NhZ8Hh7dka7KggEKKZyEbIZahuuTYeCT7cYYSUvkPzI=";
+      };
    })
  ];

--- a/pkgs/development/python-modules/blspy/dont_fetch_dependencies.patch
+++ b/pkgs/development/python-modules/blspy/dont_fetch_dependencies.patch
@ -48,3 +48,17 @@ index 5a8c381..d9aa940 100644
 )
 FetchContent_MakeAvailable(pybind11 relic)
 
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 449164a..15a955e 100644
+--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
+@@ -37,8 +37,7 @@ install(FILES $<TARGET_FILE:bls> DESTINATION lib)
+ if(BUILD_BLS_TESTS)
+   FetchContent_Declare(
+     Catch2
+-    GIT_REPOSITORY https://github.com/catchorg/Catch2.git
+-    GIT_TAG        v2.13.7
+    URL @catch2_src@
+   )
+   FetchContent_MakeAvailable(Catch2)
+   add_executable(runtest test.cpp)
--- a/pkgs/development/python-modules/casbin/default.nix
+++ b/pkgs/development/python-modules/casbin/default.nix
@ -9,7 +9,7 @@

 buildPythonPackage rec {
  pname = "casbin";
-  version = "1.15.1";
+  version = "1.15.2";
  format = "setuptools";

  disabled = pythonOlder "3.6";
@ -18,7 +18,7 @@ buildPythonPackage rec {
    owner = pname;
    repo = "pycasbin";
    rev = "v${version}";
-    sha256 = "1majsbpldsch3wgg7pdm87vk9dhqll9nk2pjjvqp8rvg93x2kkww";
+    sha256 = "0mrk6b16f4ds666qa4884kjjbmb55kpfvvqsznfmyg9iii6dir50";
  };

  propagatedBuildInputs = [
--- a/pkgs/development/python-modules/django-jinja2/default.nix
+++ b/pkgs/development/python-modules/django-jinja2/default.nix
@ -4,7 +4,7 @@

 buildPythonPackage rec {
  pname = "django-jinja";
-  version = "2.9.1";
+  version = "2.10.0";

  meta = {
    description = "Simple and nonobstructive jinja2 integration with Django";
@ -14,7 +14,7 @@ buildPythonPackage rec {

  src = fetchPypi {
    inherit pname version;
-    sha256 = "6c1fc68b0f4b1fb21b208a3e5dc19a3b11bab2812c06f827d5fdbd24001a1910";
+    sha256 = "ae6a3fdf1ffa7a9ef6fd2f0a59c1a68c96b29f7f00f5166375658ef392f1ed32";
  };

  buildInputs = [ django pytz tox ];
--- a/pkgs/development/python-modules/elasticsearch/default.nix
+++ b/pkgs/development/python-modules/elasticsearch/default.nix
@ -12,11 +12,11 @@ buildPythonPackage (rec {
  # there's a clear path forward. See
  # https://github.com/elastic/elasticsearch-py/issues/1639 for more
  # info.
-  version = "7.16.0";
+  version = "7.16.1";

  src = fetchPypi {
    inherit pname version;
-    sha256 = "d7f8665715ad80e3e99e42388bcc49c1b06162f72acfa1f8febe2baf5570b0ed";
+    sha256 = "c024ee2e7e2509c842c4e3c5e2b99a92ceecfde06d6dac2d32a19bf566c3e175";
  };

  # Check is disabled because running them destroy the content of the local cluster!
--- a/pkgs/development/python-modules/filelock/3.2.nix
+++ b/pkgs/development/python-modules/filelock/3.2.nix
@ -1,4 +1,4 @@
-{ lib, buildPythonPackage, fetchPypi }:
+{ lib, buildPythonPackage, fetchPypi, setuptools-scm }:

 buildPythonPackage rec {
  pname = "filelock";
@ -9,6 +9,10 @@ buildPythonPackage rec {
    sha256 = "1qry67zv2pmz8px6wdfbjqv75nmryy2ac7asqgs6q6db2722kpcw";
  };

+  nativeBuildInputs = [
+    setuptools-scm
+  ];
+
  meta = with lib; {
    homepage = "https://github.com/benediktschmitt/py-filelock";
    description = "A platform independent file lock for Python";
--- a/pkgs/development/python-modules/flask-session/default.nix
+++ b/pkgs/development/python-modules/flask-session/default.nix
@ -0,0 +1,27 @@
+{ lib, fetchPypi, buildPythonPackage, pytestCheckHook, flask, cachelib }:
+
+buildPythonPackage rec {
+  pname = "Flask-Session";
+  version = "0.4.0";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "sha256-ye1UMh+oxMoBMv/TNpWCdZ7aclL7SzvuSA5pDRukH0Y=";
+  };
+
+  propagatedBuildInputs = [ flask cachelib ];
+
+  checkInputs = [ pytestCheckHook ];
+
+  # The rest of the tests require database servers and optional db connector dependencies
+  pytestFlagsArray = [ "-k" "'null_session or filesystem_session'" ];
+
+  pythonImportsCheck = [ "flask_session" ];
+
+  meta = with lib; {
+    description = "A Flask extension that adds support for server-side sessions";
+    homepage = "https://github.com/fengsp/flask-session";
+    license = licenses.bsd3;
+    maintainers = with maintainers; [ zhaofengli ];
+  };
+}
--- a/pkgs/development/python-modules/myfitnesspal/default.nix
+++ b/pkgs/development/python-modules/myfitnesspal/default.nix
@ -20,12 +20,12 @@

 buildPythonPackage rec {
  pname = "myfitnesspal";
-  version = "1.16.5";
+  version = "1.16.6";
  format = "setuptools";

  src = fetchPypi {
    inherit pname version;
-    sha256 = "sha256-v7lYaZLHxQs3/2uJnj+9y0xCXfPO1C38jLwzF7IMbb0=";
+    sha256 = "ac07369ede3ca4c6d673e02f2b9e0893b17d079f3085e36fdfdbdd1cba9f37db";
  };

  propagatedBuildInputs = [
--- a/pkgs/development/python-modules/platformdirs/2.nix
+++ b/pkgs/development/python-modules/platformdirs/2.nix
@ -0,0 +1,43 @@
+{ lib
+, appdirs
+, buildPythonPackage
+, fetchFromGitHub
+, platformdirs
+, pytest-mock
+, pytestCheckHook
+, pythonOlder
+, setuptools-scm
+}:
+
+buildPythonPackage rec {
+  pname = "platformdirs";
+  version = "2.0.2";
+
+  src = fetchFromGitHub {
+    owner = pname;
+    repo = pname;
+    rev = version;
+    sha256 = "sha256-yCvfOPuX9hbQO9gbFHfeu+dGH+Vb9FM7wng1XU2D8hE=";
+  };
+
+  SETUPTOOLS_SCM_PRETEND_VERSION = version;
+
+  nativeBuildInputs = [
+    setuptools-scm
+  ];
+
+  checkInputs = [
+    appdirs
+    pytest-mock
+    pytestCheckHook
+  ];
+
+ pythonImportsCheck = [ "platformdirs" ];
+
+  meta = with lib; {
+    description = "Python module for determining appropriate platform-specific directories";
+    homepage = "https://platformdirs.readthedocs.io/";
+    license = licenses.mit;
+    maintainers = with maintainers; [ fab ];
+  };
+}
--- a/pkgs/development/python-modules/pubnub/default.nix
+++ b/pkgs/development/python-modules/pubnub/default.nix
@ -13,13 +13,13 @@

 buildPythonPackage rec {
  pname = "pubnub";
-  version = "5.4.0";
+  version = "5.5.0";

  src = fetchFromGitHub {
    owner = pname;
    repo = "python";
    rev = "v${version}";
-    sha256 = "sha256-FyDsTqDQTI/Xxu4Sl4eHqwmgwN+ip+8WKGJs/h/kl2Y=";
+    sha256 = "133sis24jd40yq4sgp8lmg2kac5wiiccisjpkhm50rb9wdbpn6kh";
  };

  propagatedBuildInputs = [
--- a/pkgs/development/python-modules/pypandoc/default.nix
+++ b/pkgs/development/python-modules/pypandoc/default.nix
@ -4,13 +4,13 @@

 buildPythonPackage rec {
  pname = "pypandoc";
-  version = "1.6.4";
+  version = "1.7.0";

  src = fetchFromGitHub {
    owner = "NicklasTegner";
    repo = pname;
    rev = "v${version}";
-    sha256 = "0rssjig3nwdi4qvsjq7v7k8jyv6l9szfl5dp1a8s54c4j4dw37nh";
+    sha256 = "00r88qcvc9jpi8jvd6rpizz9gm33aq8hc3mf8lrarrjiq2fsxmk9";
  };

  patches = [
--- a/pkgs/development/python-modules/pywizlight/default.nix
+++ b/pkgs/development/python-modules/pywizlight/default.nix
@ -10,7 +10,7 @@

 buildPythonPackage rec {
  pname = "pywizlight";
-  version = "0.4.15";
+  version = "0.4.16";
  format = "setuptools";

  disabled = pythonOlder "3.7";
@ -19,7 +19,7 @@ buildPythonPackage rec {
    owner = "sbidy";
    repo = pname;
    rev = "v${version}";
-    sha256 = "sha256-Ud6/aLvAWqTcvCJTiprkj9yG6DXdDOPzFEr+T0/qnBw=";
+    sha256 = "sha256-Da5hkmzGJtfqiDPV9X02opv54Ry6sGiSbDnej9a2QDA=";
  };

  propagatedBuildInputs = [
--- a/pkgs/development/python-modules/sphinxext-opengraph/default.nix
+++ b/pkgs/development/python-modules/sphinxext-opengraph/default.nix
@ -2,24 +2,29 @@
 , buildPythonPackage
 , fetchFromGitHub
 , sphinx
+, pytestCheckHook
+, beautifulsoup4
 }:

 buildPythonPackage rec {
  pname = "sphinxext-opengraph";
-  version = "0.4.2";
+  version = "0.5.1";

  src = fetchFromGitHub {
    owner = "wpilibsuite";
    repo = "sphinxext-opengraph";
    rev = "v${version}";
-    sha256 = "sha256-978aPtaqUDHcswDdFynzi+IjDYaBmCZDZk+dmDkhajY=";
+    sha256 = "sha256-US0UXxcTlN7x5v2ilpL+umTr7tadqthqhvfaQnm7tCc=";
  };

  propagatedBuildInputs = [
    sphinx
  ];

-  doCheck = false; # no tests
+  checkInputs = [
+    pytestCheckHook
+    beautifulsoup4
+  ];

  pythonImportsCheck = [ "sphinxext.opengraph" ];

--- a/pkgs/development/python-modules/tableaudocumentapi/default.nix
+++ b/pkgs/development/python-modules/tableaudocumentapi/default.nix
@ -5,11 +5,11 @@

 buildPythonPackage rec {
  pname = "tableaudocumentapi";
-  version = "0.7";
+  version = "0.9";

  src = fetchPypi {
    inherit pname version;
-    sha256 = "5b1d04817a0fba43d58e1ce23c64ad8dfe54dc029ba5ccae3908944555bb13e0";
+    sha256 = "0c7d01f01758dd6e50ff2fc915c6087c0da17298635e6635581aaf25c934d6ce";
  };

  # tests not inclued with release
--- a/pkgs/development/python-modules/tensorflow/default.nix
+++ b/pkgs/development/python-modules/tensorflow/default.nix
@ -6,13 +6,13 @@
 , numpy, tensorflow-tensorboard, absl-py
 , setuptools, wheel, keras, keras-preprocessing, google-pasta
 , opt-einsum, astunparse, h5py
-, termcolor, grpcio, six, wrapt, protobuf, tensorflow-estimator
+, termcolor, grpcio, six, wrapt, protobuf-python, tensorflow-estimator
 , dill, flatbuffers-python, tblib, typing-extensions
 # Common deps
 , git, pybind11, which, binutils, glibcLocales, cython, perl
 # Common libraries
 , jemalloc, mpi, gast, grpc, sqlite, boringssl, jsoncpp
-, curl, snappy, flatbuffers-core, lmdb-core, icu, double-conversion, libpng, libjpeg_turbo, giflib
+, curl, snappy, flatbuffers-core, lmdb-core, icu, double-conversion, libpng, libjpeg_turbo, giflib, protobuf-core
 # Upsteam by default includes cuda support since tensorflow 1.15. We could do
 # that in nix as well. It would make some things easier and less confusing, but
 # it would also make the default tensorflow package unfree. See
@ -90,7 +90,7 @@ let
      keras-preprocessing
      numpy
      opt-einsum
-      protobuf
+      protobuf-python
      setuptools
      six
      tblib
@ -188,11 +188,16 @@ let
      sha256 = "sha256-n7jRDPeXsyq4pEWSWmOCas4c8VsArIKlCuwvSU/Ro/c=";
    };

+    patches = [
+      # Patch the sources to compile with protobuf >= 3.16.
+      ./system-protobuf.patch
+    ];
+
    # On update, it can be useful to steal the changes from gentoo
    # https://gitweb.gentoo.org/repo/gentoo.git/tree/sci-libs/tensorflow

    nativeBuildInputs = [
-      which pythonEnv cython perl
+      which pythonEnv cython perl protobuf-core
    ] ++ lib.optional cudaSupport addOpenGLRunpath;

    buildInputs = [
@ -241,12 +246,7 @@ let
      # "com_github_googleapis_googleapis"
      # "com_github_googlecloudplatform_google_cloud_cpp"
      "com_github_grpc_grpc"
-      # Multiple issues with custom protobuf.
-      # First `com_github_googleapis` fails to configure. Can be worked around by disabling `com_github_googleapis`
-      # and related functionality, but then the next error is about "dangling symbolic link", and in general
-      # looks like that's only the beginning: see
-      # https://stackoverflow.com/questions/55578884/how-to-build-tensorflow-1-13-1-with-custom-protobuf
-      # "com_google_protobuf"
+      "com_google_protobuf"
      # Fails with the error: external/org_tensorflow/tensorflow/core/profiler/utils/tf_op_utils.cc:46:49: error: no matching function for call to 're2::RE2::FullMatch(absl::lts_2020_02_25::string_view&, re2::RE2&)'
      # "com_googlesource_code_re2"
      "curl"
@ -281,6 +281,11 @@ let

    INCLUDEDIR = "${includes_joined}/include";

+    # This is needed for the Nix-provided protobuf dependency to work,
+    # as otherwise the rule `link_proto_files` tries to create the links
+    # to `/usr/include/...` which results in build failures.
+    PROTOBUF_INCLUDE_PATH = "${protobuf-core}/include";
+
    PYTHON_BIN_PATH = pythonEnv.interpreter;

    TF_NEED_GCP = true;
@ -356,12 +361,12 @@ let
    fetchAttrs = {
      # cudaSupport causes fetch of ncclArchive, resulting in different hashes
      sha256 = if cudaSupport then
-        "sha256-GIBs1BAUuefwlavu7dr9rFb4n1A3uwnvvCAvsBnSSqQ="
+        "sha256-+szc2mRoImwijzbj3nw6HmZp3DeRjjPRU5yC+5AEbkg="
      else
        if stdenv.isDarwin then
-          "sha256-156eOnnjk+wzIiGLd6k/+SAgm4AyImsV/qBsHFlxe+k="
+          "sha256-+bwIzp6t7gRJPcI8B5oyuf9z0AjCAyggUR7x+vv5kFs="
        else
-          "sha256-Fj/wWapsre55VctJ1k1kcYKAn3uDCMPN5rVX8y76ypM=";
+          "sha256-5yOYmeGpJq4Chi55H7iblxyRXVktgnePtpYTPvBs538=";
    };

    buildAttrs = {
@ -454,7 +459,7 @@ in buildPythonPackage {
    keras-preprocessing
    numpy
    opt-einsum
-    protobuf
+    protobuf-python
    six
    tblib
    tensorflow-estimator
--- a/pkgs/development/python-modules/tensorflow/system-protobuf.patch
+++ b/pkgs/development/python-modules/tensorflow/system-protobuf.patch
@ -0,0 +1,13 @@
+diff --git a/tensorflow/core/kernels/example_parsing_ops.cc b/tensorflow/core/kernels/example_parsing_ops.cc
+index a1265cfb5c6..ada919bbd7b 100644
+--- a/tensorflow/core/kernels/example_parsing_ops.cc
+++ b/tensorflow/core/kernels/example_parsing_ops.cc
+@@ -1218,7 +1218,7 @@ class DecodeJSONExampleOp : public OpKernel {
+           resolver_.get(), "type.googleapis.com/tensorflow.Example", &in, &out);
+       OP_REQUIRES(ctx, status.ok(),
+                   errors::InvalidArgument("Error while parsing JSON: ",
+-                                          string(status.error_message())));
+                                          string(status.message())));
+     }
+   }
+ 
--- a/pkgs/development/python-modules/torchvision/default.nix
+++ b/pkgs/development/python-modules/torchvision/default.nix
@ -24,13 +24,13 @@ let
  cudaArchStr = lib.optionalString cudaSupport lib.strings.concatStringsSep ";" pytorch.cudaArchList;
 in buildPythonPackage rec {
  pname = "torchvision";
-  version = "0.11.1";
+  version = "0.11.2";

  src = fetchFromGitHub {
    owner = "pytorch";
    repo = "vision";
    rev = "v${version}";
-    sha256 = "05dg835mmpzf7k2jn101l7x7cnra1kldwbgf19zblym5lfn21zhf";
+    sha256 = "136w9pqyfdsxxc7337q3x42gsr17gs0i0af2swfhzqhz6hd5139i";
  };

  nativeBuildInputs = [ libpng ninja which ]
--- a/pkgs/development/python-modules/types-requests/default.nix
+++ b/pkgs/development/python-modules/types-requests/default.nix
@ -5,12 +5,12 @@

 buildPythonPackage rec {
  pname = "types-requests";
-  version = "2.26.1";
+  version = "2.26.2";
  format = "setuptools";

  src = fetchPypi {
    inherit pname version;
-    sha256 = "sha256-CJPhEuFRC7tn9TeUHJIZLedHLlG/fyNuDlg4ZvDtkz4=";
+    sha256 = "0e22d9cdeff4c3eb068eb883d59b127c98d80525f3d0412a1c4499c6ae1f711e";
  };

  # Module doesn't have tests
--- a/pkgs/development/python-modules/virtualenv/default.nix
+++ b/pkgs/development/python-modules/virtualenv/default.nix
@ -74,6 +74,9 @@ buildPythonPackage rec {
  disabledTests = [
    # Permission Error
    "test_bad_exe_py_info_no_raise"
+  ] ++ lib.optionals isPy27 [
+    "test_python_via_env_var"
+    "test_python_multi_value_prefer_newline_via_env_var"
  ];

  pythonImportsCheck = [ "virtualenv" ];
--- a/pkgs/development/tools/analysis/checkov/default.nix
+++ b/pkgs/development/tools/analysis/checkov/default.nix
@ -46,13 +46,13 @@ with py.pkgs;

 buildPythonApplication rec {
  pname = "checkov";
-  version = "2.0.668";
+  version = "2.0.672";

  src = fetchFromGitHub {
    owner = "bridgecrewio";
    repo = pname;
    rev = version;
-    sha256 = "sha256-kCqhNxqI+9F9nQvZDOYjC2Bb5a1x4a9b9aqvDe/siP0=";
+    sha256 = "sha256-bxJQYCAQnSOaXXczvLxdpMzlBAehgctwMNvItR6FsgM=";
  };

  nativeBuildInputs = with py.pkgs; [
--- a/pkgs/development/tools/bazelisk/default.nix
+++ b/pkgs/development/tools/bazelisk/default.nix
@ -2,16 +2,16 @@

 buildGoModule rec {
  pname = "bazelisk";
-  version = "1.10.1";
+  version = "1.11.0";

  src = fetchFromGitHub {
    owner = "bazelbuild";
    repo = pname;
    rev = "v${version}";
-    sha256 = "sha256-MpAYJSDAbyh4aGW+hRrny5+bXZ96cNcUhqJkgY8bdD8=";
+    sha256 = "sha256-9J49+1fI3wmHQqYgdoGgaAuVMA9eG7wrFe7dQEectvI=";
  };

-  vendorSha256 = "sha256-5qpeAD4VFsR8iJlRiNTncOdq39lq3MU6gSLu3G/BcPU=";
+  vendorSha256 = "sha256-+zJEB9FyVvxHdwR/dAn56jrMbgVBhlbziVFe2WCQFfE=";

  doCheck = false;

--- a/Show more
+++ b/Show more