Merge staging-next into staging

2023-04-10 18:01:45 +00:00 · 2023-04-10 18:01:45 +00:00 · da9d584845
commit da9d584845
parent 939ef9894d ace14e0119
66 changed files with 1290 additions and 485 deletions
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@ -850,6 +850,12 @@
    githubId = 858965;
    name = "Andrew Morsillo";
  };
+  amz-x = {
+    email = "mail@amz-x.com";
+    github = "amz-x";
+    githubId = 18249234;
+    name = "Christopher Crouse";
+  };
  AnatolyPopov = {
    email = "aipopov@live.ru";
    github = "AnatolyPopov";
--- a/nixos/modules/hardware/video/webcam/ipu6.nix
+++ b/nixos/modules/hardware/video/webcam/ipu6.nix
@ -10,7 +10,7 @@ in

  options.hardware.ipu6 = {

-    enable = mkEnableOption (lib.mdDoc "ipu6 kernel module");
+    enable = mkEnableOption (lib.mdDoc "support for Intel IPU6/MIPI cameras");

    platform = mkOption {
      type = types.enum [ "ipu6" "ipu6ep" ];
--- a/pkgs/applications/audio/tenacity/default.nix
+++ b/pkgs/applications/audio/tenacity/default.nix
@ -1,6 +1,6 @@
 { stdenv
 , lib
-, fetchFromGitHub
+, fetchFromGitea
 , fetchpatch
 , cmake
 , wxGTK32
@ -30,7 +30,7 @@
 , expat
 , libid3tag
 , libopus
-, ffmpeg_4
+, ffmpeg_5
 , soundtouch
 , pcre
 , portaudio
@ -49,32 +49,27 @@

 stdenv.mkDerivation rec {
  pname = "tenacity";
-  version = "unstable-2022-06-30";
+  version = "1.3-beta2";

-  src = fetchFromGitHub {
+  src = fetchFromGitea {
+    domain = "codeberg.org";
    owner = "tenacityteam";
    repo = pname;
-    rev = "91f8b4340b159af551fff94a284c6b0f704a7932";
-    sha256 = "sha256-4VWckXzqo2xspw9eUloDvjxQYbsHn6ghEDw+hYqJcCE=";
+    rev = "v${version}";
+    sha256 = "sha256-9gWoqFa87neIvRnezWI3RyCAOU4wKEHPn/Hgj3/fol0=";
  };

-  patches = [
-    (fetchpatch {
-      url = "https://aur.archlinux.org/cgit/aur.git/plain/wxwidgets-gtk3-3.1.6-plus.patch?h=tenacity-wxgtk3-git&id=c2503538fa7d7001181905988179952d09f69659";
-      postFetch = "echo >> $out";
-      sha256 = "sha256-xRY1tizBJ9CBY6e9oZVz4CWx7DWPGD9A9Ysol4prBww=";
-    })
-  ];
-
  postPatch = ''
-    touch src/RevisionIdent.h
+    mkdir -p build/src/private
+    touch build/src/private/RevisionIdent.h

-    substituteInPlace src/FileNames.cpp \
-      --replace /usr/include/linux/magic.h ${linuxHeaders}/include/linux/magic.h
+    substituteInPlace libraries/lib-files/FileNames.cpp \
+         --replace /usr/include/linux/magic.h \
+                   ${linuxHeaders}/include/linux/magic.h
  '';

  postFixup = ''
-    rm $out/tenacity
+    rm $out/audacity
    wrapProgram "$out/bin/tenacity" \
      --suffix AUDACITY_PATH : "$out/share/tenacity" \
      --suffix AUDACITY_MODULES_PATH : "$out/lib/tenacity/modules" \
@ -90,7 +85,6 @@ stdenv.mkDerivation rec {
    "-lavdevice"
    "-lavfilter"
    "-lavformat"
-    "-lavresample"
    "-lavutil"
    "-lpostproc"
    "-lswresample"
@ -110,7 +104,7 @@ stdenv.mkDerivation rec {
  buildInputs = [
    alsa-lib
    expat
-    ffmpeg_4
+    ffmpeg_5
    file
    flac
    glib
--- a/pkgs/applications/editors/vim/plugins/generated.nix
+++ b/pkgs/applications/editors/vim/plugins/generated.nix
--- a/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix
+++ b/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix
@ -137,12 +137,12 @@
  };
  c_sharp = buildGrammar {
    language = "c_sharp";
-    version = "0.0.0+rev=fcacbeb";
+    version = "0.0.0+rev=92d572e";
    src = fetchFromGitHub {
      owner = "tree-sitter";
      repo = "tree-sitter-c-sharp";
-      rev = "fcacbeb4af6bcdcfb4527978a997bb03f4fe086d";
-      hash = "sha256-sMNNnp1Ypljou0RZ9V0M4qVP/2Osrk1L8NCiyEGY1pw=";
+      rev = "92d572eef5ffdd4117e7ba36b56850a90cb79151";
+      hash = "sha256-Zp8aEoLv/FPaTQPJzS2gS3htU9wpUwWB1gvRfYh4gsY=";
    };
    meta.homepage = "https://github.com/tree-sitter/tree-sitter-c-sharp";
  };
@ -579,12 +579,12 @@
  };
  gitcommit = buildGrammar {
    language = "gitcommit";
-    version = "0.0.0+rev=f71b93f";
+    version = "0.0.0+rev=1723599";
    src = fetchFromGitHub {
      owner = "gbprod";
      repo = "tree-sitter-gitcommit";
-      rev = "f71b93f399c9c2b315825827c95466e7405ec622";
-      hash = "sha256-489Rbi75XbW/IuFLijFThsI+BNXqVY1tVALwMT6yie0=";
+      rev = "17235998809be904892f14ee57730d96795e9323";
+      hash = "sha256-UhPlEanOBUpzqVPCqe8t5MIwdUwSeaoFJFsxpnUqwn8=";
    };
    meta.homepage = "https://github.com/gbprod/tree-sitter-gitcommit";
  };
@ -942,12 +942,12 @@
  };
  kotlin = buildGrammar {
    language = "kotlin";
-    version = "0.0.0+rev=826ef28";
+    version = "0.0.0+rev=c84d16e";
    src = fetchFromGitHub {
      owner = "fwcd";
      repo = "tree-sitter-kotlin";
-      rev = "826ef28d605d0925a86a99022cd222c96f2d0952";
-      hash = "sha256-7fDwzt9BXs1h+2D9APAG/ruA81ZyAL4LOElXLdz8wyE=";
+      rev = "c84d16e7f75032cdd8c4ad986a76ca9e1fe4e639";
+      hash = "sha256-SvzWWsXlcT5aIpswhKA8xo7iRIDaDZkeUuPGyvfc2fk=";
    };
    meta.homepage = "https://github.com/fwcd/tree-sitter-kotlin";
  };
@ -1619,12 +1619,12 @@
  };
  sql = buildGrammar {
    language = "sql";
-    version = "0.0.0+rev=685c890";
+    version = "0.0.0+rev=8f1c49f";
    src = fetchFromGitHub {
      owner = "derekstride";
      repo = "tree-sitter-sql";
-      rev = "685c8905831fa7a0b548f7d712b97436b6eb301f";
-      hash = "sha256-kcr8dY69dKQgzK5D/Fimymq7W/NqS55yoGIvAjbMBQ8=";
+      rev = "8f1c49febcb8944d39df8554d32c749b4f5f3158";
+      hash = "sha256-9/Otouynt5Cqh5UdeiMsTo+F22fBu1U+EuN7e+TYQy4=";
    };
    meta.homepage = "https://github.com/derekstride/tree-sitter-sql";
  };
@ -1923,14 +1923,14 @@
  };
  vim = buildGrammar {
    language = "vim";
-    version = "0.0.0+rev=e39a7bb";
+    version = "0.0.0+rev=2886b52";
    src = fetchFromGitHub {
-      owner = "vigoux";
-      repo = "tree-sitter-viml";
-      rev = "e39a7bbcfdcfc7900629962b785c7e14503ae590";
-      hash = "sha256-f3UAHwCL5yerEjmuDp+guzX4/ik4h7ProH5P8AmdO10=";
+      owner = "neovim";
+      repo = "tree-sitter-vim";
+      rev = "2886b52143d570d81f97c98be7a1e204ce9d3bcd";
+      hash = "sha256-w8yHo5rtqqD80gbSChaHhSzt3ljPBKWYZ+pxaWFM35s=";
    };
-    meta.homepage = "https://github.com/vigoux/tree-sitter-viml";
+    meta.homepage = "https://github.com/neovim/tree-sitter-vim";
  };
  vimdoc = buildGrammar {
    language = "vimdoc";
--- a/pkgs/applications/editors/vim/plugins/vim-plugin-names
+++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names
@ -464,7 +464,22 @@ https://github.com/Shougo/neosnippet-snippets/,,
 https://github.com/Shougo/neosnippet.vim/,,
 https://github.com/kassio/neoterm/,,
 https://github.com/nvim-neotest/neotest/,HEAD,
+https://github.com/sidlatau/neotest-dart/,HEAD,
+https://github.com/MarkEmmons/neotest-deno/,HEAD,
+https://github.com/Issafalcon/neotest-dotnet/,HEAD,
+https://github.com/jfpedroza/neotest-elixir/,HEAD,
+https://github.com/nvim-neotest/neotest-go/,HEAD,
 https://github.com/MrcJkb/neotest-haskell/,HEAD,
+https://github.com/haydenmeade/neotest-jest/,HEAD,
+https://github.com/theutz/neotest-pest/,HEAD,
+https://github.com/olimorris/neotest-phpunit/,HEAD,
+https://github.com/nvim-neotest/neotest-plenary/,HEAD,
+https://github.com/nvim-neotest/neotest-python/,HEAD,
+https://github.com/olimorris/neotest-rspec/,HEAD,
+https://github.com/rouge8/neotest-rust/,HEAD,
+https://github.com/stevanmilic/neotest-scala/,HEAD,
+https://github.com/shunsambongi/neotest-testthat/,HEAD,
+https://github.com/marilari88/neotest-vitest/,HEAD,
 https://github.com/rose-pine/neovim/,main,rose-pine
 https://github.com/Shatur/neovim-ayu/,,
 https://github.com/cloudhead/neovim-fuzzy/,,
--- a/pkgs/applications/editors/vscode/extensions/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/default.nix
@ -1056,6 +1056,23 @@ let
        };
      };

+      equinusocio.vsc-material-theme = buildVscodeMarketplaceExtension {
+        mktplcRef = {
+          name = "vsc-material-theme";
+          publisher = "Equinusocio";
+          version = "33.8.0";
+          sha256 = "sha256-+I4AUwsrElT62XNvmuAC2iBfHfjNYY0bmAqzQvfwUYM=";
+        };
+        meta = {
+          changelog = "https://marketplace.visualstudio.com/items/Equinusocio.vsc-material-theme/changelog";
+          description = "The most epic theme now for Visual Studio Code";
+          downloadPage = "https://marketplace.visualstudio.com/items?itemName=Equinusocio.vsc-material-theme";
+          homepage = "https://github.com/material-theme/vsc-material-theme";
+          license = lib.licenses.asl20;
+          maintainers = [ lib.maintainers.stunkymonkey ];
+        };
+      };
+
      esbenp.prettier-vscode = buildVscodeMarketplaceExtension {
        mktplcRef = {
          name = "prettier-vscode";
@ -2194,6 +2211,23 @@ let
        };
      };

+      nonylene.dark-molokai-theme = buildVscodeMarketplaceExtension {
+        mktplcRef = {
+          name = "dark-molokai-theme";
+          publisher = "nonylene";
+          version = "1.0.5";
+          sha256 = "sha256-2qjV6iSz8DDU1yP1II9sxGSgiETmEtotFvfNjm+cTuI=";
+        };
+        meta = {
+          changelog = "https://marketplace.visualstudio.com/items/nonylene.dark-molokai-theme/changelog";
+          description = "Theme inspired by VSCode default dark theme, monokai theme and Vim Molokai theme";
+          downloadPage = "https://marketplace.visualstudio.com/items?itemName=nonylene.dark-molokai-theme";
+          homepage = "https://github.com/nonylene/vscode-dark-molokai-theme";
+          license = lib.licenses.mit;
+          maintainers = [ lib.maintainers.amz-x ];
+        };
+      };
+
      nvarner.typst-lsp = buildVscodeMarketplaceExtension {
        mktplcRef = {
          name = "typst-lsp";
--- a/pkgs/applications/networking/cluster/kubedb-cli/default.nix
+++ b/pkgs/applications/networking/cluster/kubedb-cli/default.nix
@ -2,16 +2,16 @@

 buildGoModule rec {
  pname = "kubedb-cli";
-  version = "0.30.0";
+  version = "0.33.0";

  src = fetchFromGitHub {
    owner = "kubedb";
    repo = "cli";
    rev = "v${version}";
-    sha256 = "sha256-i8kv/YzEWAFQJwIkwot2huIEAZYMUGQqSak4nUMRjn4=";
+    sha256 = "sha256-J5eEyLoeYC4JhreuN+ymeVMfnyf9ADL08FpnpmRy1vI=";
  };

-  vendorSha256 = null;
+  vendorHash = null;

  # Don't compile the documentation stuff
  subPackages = [ "cmd/kubectl-dba" ];
--- a/pkgs/applications/networking/instant-messengers/discord/default.nix
+++ b/pkgs/applications/networking/instant-messengers/discord/default.nix
@ -1,7 +1,7 @@
 { branch ? "stable", callPackage, fetchurl, lib, stdenv }:
 let
  versions = if stdenv.isLinux then {
-    stable = "0.0.25";
+    stable = "0.0.26";
    ptb = "0.0.41";
    canary = "0.0.150";
  } else {
@ -14,7 +14,7 @@ let
    x86_64-linux = {
      stable = fetchurl {
        url = "https://dl.discordapp.net/apps/linux/${version}/discord-${version}.tar.gz";
-        sha256 = "sha256-WBcmy9fwGPq3Vs1+7lIOR7OiW/d0kZNIKp4Q5NRYBCw=";
+        sha256 = "sha256-MPdNxZJBmIN4NGEoYWvL2cmNm37/YT275m2bVWHXbwY=";
      };
      ptb = fetchurl {
        url = "https://dl-ptb.discordapp.net/apps/linux/${version}/discord-ptb-${version}.tar.gz";
--- a/pkgs/applications/networking/instant-messengers/discord/disable-breaking-updates.py
+++ b/pkgs/applications/networking/instant-messengers/discord/disable-breaking-updates.py
@ -14,6 +14,7 @@ This will dramatically improve the experience :

 import json
 import os
+import sys
 from pathlib import Path

 XDG_CONFIG_HOME = os.environ.get("XDG_CONFIG_HOME") or os.path.join(
@ -25,7 +26,11 @@ settings_path_temp = Path(f"{XDG_CONFIG_HOME}/@configDirName@/settings.json.tmp"

 if os.path.exists(settings_path):
    with settings_path.open(encoding="utf-8") as settings_file:
-        settings = json.load(settings_file)
+        try:
+            settings = json.load(settings_file)
+        except json.JSONDecodeError:
+            print("[Nix] settings.json is malformed, letting Discord fix itself")
+            sys.exit(0)
 else:
    settings = {}

--- a/pkgs/applications/networking/remote/freerdp/default.nix
+++ b/pkgs/applications/networking/remote/freerdp/default.nix
@ -28,6 +28,7 @@
 , libxkbcommon
 , libxkbfile
 , wayland
+, wayland-scanner
 , gstreamer
 , gst-plugins-base
 , gst-plugins-good
@ -48,6 +49,11 @@
 , Cocoa
 , CoreMedia
 , withUnfree ? false
+
+# tries to compile and run generate_argument_docbook.c
+, withManPages ? stdenv.buildPlatform.canExecute stdenv.hostPlatform
+
+, buildPackages
 }:

 let
@ -149,7 +155,10 @@ stdenv.mkDerivation rec {
    faac
  ];

-  nativeBuildInputs = [ cmake libxslt docbook-xsl-nons pkg-config ];
+  nativeBuildInputs = [
+    cmake libxslt docbook-xsl-nons pkg-config
+    wayland-scanner
+  ];

  doCheck = true;

@ -158,6 +167,7 @@ stdenv.mkDerivation rec {
    "-Wno-dev"
    "-DCMAKE_INSTALL_LIBDIR=lib"
    "-DDOCBOOKXSL_DIR=${docbook-xsl-nons}/xml/xsl/docbook"
+    "-DWAYLAND_SCANNER=${buildPackages.wayland-scanner}/bin/wayland-scanner"
  ]
  ++ lib.mapAttrsToList (k: v: "-D${k}=${cmFlag v}") {
    BUILD_TESTING = false; # false is recommended by upstream
@ -168,6 +178,7 @@ stdenv.mkDerivation rec {
    WITH_JPEG = (libjpeg_turbo != null);
    WITH_OPENH264 = (openh264 != null);
    WITH_OSS = false;
+    WITH_MANPAGES = withManPages;
    WITH_PCSC = (pcsclite != null);
    WITH_PULSE = (libpulseaudio != null);
    WITH_SERVER = buildServer;
--- a/pkgs/applications/networking/syncthing/default.nix
+++ b/pkgs/applications/networking/syncthing/default.nix
@ -13,16 +13,16 @@ let
  common = { stname, target, postInstall ? "" }:
    buildGoModule rec {
      pname = stname;
-      version = "1.23.2";
+      version = "1.23.4";

      src = fetchFromGitHub {
        owner = "syncthing";
        repo = "syncthing";
        rev = "v${version}";
-        hash = "sha256-EowUQYfSznTuAHV7OIesFPM99zRmeKkzYNp7VANtR2U=";
+        hash = "sha256-a2ulTP7J5+f5ikdKVIq4l6GQEJ8PH+MGNV4C0NReFyQ=";
      };

-      vendorHash = "sha256-5NgflkRXkbWiIkASmxIgWliE8sF89HtlMtlIF+5u6Ic=";
+      vendorHash = "sha256-d/So51ZMDdduUEgOOu9wc3kLh4dRzFR6S5BxcCVtiXI=";

      nativeBuildInputs = lib.optionals stdenv.isDarwin [
        # Recent versions of macOS seem to require binaries to be signed when
--- a/pkgs/applications/science/electronics/nvc/default.nix
+++ b/pkgs/applications/science/electronics/nvc/default.nix
@ -1,6 +1,7 @@
 { lib
 , stdenv
 , fetchFromGitHub
+, fetchpatch
 , autoreconfHook
 , check
 , flex
@ -15,15 +16,28 @@

 stdenv.mkDerivation rec {
  pname = "nvc";
-  version = "1.8.2";
+  version = "1.9.0";

  src = fetchFromGitHub {
    owner = "nickg";
    repo = pname;
    rev = "r${version}";
-    hash = "sha256-s7QgufD3sQ6sZh2H78E8x0dMidHRKHUm8tASXoKK3xk=";
+    hash = "sha256-hsoEAFSXI2bvzZV33jdg1849fipPQlUu3MZVvht54fI=";
  };

+  patches = [
+    # TODO: remove me on next release
+    (fetchpatch {
+      url = "https://github.com/nickg/nvc/commit/c857e16c33851f8a5386b97bc0dada2836b5db83.patch";
+      hash = "sha256-rvZHI1iQXT9zLpCugg5mGmMZBRbTe9PSHtDG7FVZ67Q=";
+    })
+  ];
+
+  # TODO: recheck me on next release
+  postPatch = lib.optionalString stdenv.isLinux ''
+    sed -i "/vhpi4/d" test/regress/testlist.txt
+  '';
+
  nativeBuildInputs = [
    autoreconfHook
    check
@ -36,15 +50,12 @@ stdenv.mkDerivation rec {
    libffi
    llvm
    zlib
-  ] ++ [
-    (if stdenv.isLinux then elfutils else libelf)
+  ] ++ lib.optionals stdenv.isLinux [
+    elfutils
+  ] ++ lib.optionals (!stdenv.isLinux) [
+    libelf
  ];

-  # TODO: recheck me on next release
-  postPatch = lib.optionalString stdenv.isLinux ''
-    sed -i "/vhpi4/d" test/regress/testlist.txt
-  '';
-
  preConfigure = ''
    mkdir build
    cd build
@ -63,7 +74,7 @@ stdenv.mkDerivation rec {
    description = "VHDL compiler and simulator";
    homepage = "https://www.nickg.me.uk/nvc/";
    license = licenses.gpl3Plus;
-    platforms = platforms.unix;
    maintainers = with maintainers; [ wegank ];
+    platforms = platforms.unix;
  };
 }
--- a/pkgs/applications/terminal-emulators/foot/default.nix
+++ b/pkgs/applications/terminal-emulators/foot/default.nix
@ -27,7 +27,7 @@
 }:

 let
-  version = "1.13.1";
+  version = "1.14.0";

  # build stimuli file for PGO build and the script to generate it
  # independently of the foot's build, so we can cache the result
@ -99,7 +99,7 @@ stdenv.mkDerivation rec {
    owner = "dnkl";
    repo = pname;
    rev = version;
-    sha256 = "0k0zbh6adwr99y9aazlyvp6s1k8zaq2j6x8kqb8q9a5qjjg56lay";
+    sha256 = "1187805pxygyl547w75i4cl37kaw8y8ng11r5qqldv6fm74k31mk";
  };

  depsBuildBuild = [
@ -165,6 +165,7 @@ stdenv.mkDerivation rec {
    # make sure there is _some_ profiling data on all binaries
    ./footclient --version
    ./foot --version
+    ./utils/xtgettcap
    ./tests/test-config
    # generate pgo data of wayland independent code
    ./pgo ${stimuliFile} ${stimuliFile} ${stimuliFile}
--- a/pkgs/build-support/cc-wrapper/default.nix
+++ b/pkgs/build-support/cc-wrapper/default.nix
@ -17,6 +17,7 @@
 , isGNU ? false, isClang ? cc.isClang or false, gnugrep ? null
 , buildPackages ? {}
 , libcxx ? null
+, grossHackForStagingNext ? false

 # Whether or not to add `-B` and `-L` to `nix-support/cc-{c,ld}flags`
 , useCcForLibs ?
@ -407,7 +408,11 @@ stdenv.mkDerivation {
      touch "$out/nix-support/libcxx-cxxflags"
      touch "$out/nix-support/libcxx-ldflags"
    ''
-    + optionalString (libcxx == null && (useGccForLibs && gccForLibs.langCC or false)) ''
+    # Adding -isystem flags should be done only for clang; gcc
+    # already knows how to find its own libstdc++, and adding
+    # additional -isystem flags will confuse gfortran (see
+    # https://github.com/NixOS/nixpkgs/pull/209870#issuecomment-1500550903)
+    + optionalString (libcxx == null && (if grossHackForStagingNext then isClang else true) && (useGccForLibs && gccForLibs.langCC or false)) ''
      for dir in ${gccForLibs}${lib.optionalString (hostPlatform != targetPlatform) "/${targetPlatform.config}"}/include/c++/*; do
        echo "-isystem $dir" >> $out/nix-support/libcxx-cxxflags
      done
--- a/pkgs/desktops/deepin/default.nix
+++ b/pkgs/desktops/deepin/default.nix
@ -69,6 +69,7 @@ let
    dde-daemon = callPackage ./go-package/dde-daemon { };
    deepin-pw-check = callPackage ./go-package/deepin-pw-check { };
    deepin-desktop-schemas = callPackage ./go-package/deepin-desktop-schemas { };
+    startdde = callPackage ./go-package/startdde { };

    #### TOOLS
    dde-device-formatter = callPackage ./tools/dde-device-formatter { };
--- a/pkgs/desktops/deepin/go-package/startdde/0001-avoid-use-hardcode-path.patch
+++ b/pkgs/desktops/deepin/go-package/startdde/0001-avoid-use-hardcode-path.patch
@ -0,0 +1,153 @@
+From 47a700c64329f76ab91ac01d83a93f43bebe638b Mon Sep 17 00:00:00 2001
+From: rewine <lhongxu@outlook.com>
+Date: Sun, 9 Apr 2023 17:14:00 +0800
+Subject: [PATCH] avoid use hardcode path
+
+---
+ display/wayland.go            |  4 ++--
+ main.go                       | 10 +++++-----
+ misc/auto_launch/chinese.json |  4 ++--
+ session.go                    | 15 +++++++++------
+ 4 files changed, 18 insertions(+), 15 deletions(-)
+
+diff --git a/display/wayland.go b/display/wayland.go
+index b980425..e44342a 100644
+--- a/display/wayland.go
+++ b/display/wayland.go
+@@ -556,7 +556,7 @@ func (mm *kMonitorManager) applyByWLOutput(monitorMap map[uint32]*Monitor) error
+ 	
+ 	if len(args_enable) > 0 {
+ 		ctx, cancel := context.WithTimeout(context.Background(), time.Second*5)
+-		cmdline := exec.CommandContext(ctx, "/usr/bin/dde_wloutput", "set")
+		cmdline := exec.CommandContext(ctx, "dde_wloutput", "set")
+ 		cmdline.Args = append(cmdline.Args, args_enable...)
+ 		logger.Info("cmd line args_enable:", cmdline.Args)
+ 
+@@ -572,7 +572,7 @@ func (mm *kMonitorManager) applyByWLOutput(monitorMap map[uint32]*Monitor) error
+ 	}
+ 	if len(args_disable) > 0 {
+ 		ctx, cancel := context.WithTimeout(context.Background(), time.Second*5)
+-		cmdline := exec.CommandContext(ctx, "/usr/bin/dde_wloutput", "set")
+		cmdline := exec.CommandContext(ctx, "dde_wloutput", "set")
+ 		cmdline.Args = append(cmdline.Args, args_disable...)
+ 		logger.Info("cmd line args_disable:", cmdline.Args)
+ 
+diff --git a/main.go b/main.go
+index 77b4e78..30aa3fd 100644
+--- a/main.go
+++ b/main.go
+@@ -96,17 +96,17 @@ func shouldUseDDEKWin() bool {
+ 	}
+ 
+ end:
+-	_, err = os.Stat("/usr/bin/kwin_no_scale")
+        _, err = exec.LookPath("kwin_no_scale")
+ 	return err == nil
+ }
+ 
+ const (
+-	cmdKWin                = "/usr/bin/kwin_no_scale"
+	cmdKWin                = "kwin_no_scale"
+ 	cmdDdeSessionDaemon    = "/usr/lib/deepin-daemon/dde-session-daemon"
+-	cmdDdeDock             = "/usr/bin/dde-dock"
+-	cmdDdeDesktop          = "/usr/bin/dde-desktop"
+	cmdDdeDock             = "dde-dock"
+	cmdDdeDesktop          = "dde-desktop"
+ 	cmdLoginReminderHelper = "/usr/libexec/deepin/login-reminder-helper"
+-	cmdDdeHintsDialog      = "/usr/bin/dde-hints-dialog"
+	cmdDdeHintsDialog      = "dde-hints-dialog"
+ 
+ 	loginReminderTimeout    = 5 * time.Second
+ 	loginReminderTimeFormat = "2006-01-02 15:04:05"
+diff --git a/misc/auto_launch/chinese.json b/misc/auto_launch/chinese.json
+index 079a521..1856ab1 100644
+--- a/misc/auto_launch/chinese.json
+++ b/misc/auto_launch/chinese.json
+@@ -13,7 +13,7 @@
+     "Priority": 9,
+     "Group": [
+       {
+-        "Command": "/usr/bin/dde-file-manager",
+        "Command": "dde-file-manager",
+         "Wait": false,
+         "Args": [
+           "-d"
+@@ -39,7 +39,7 @@
+     "Priority": 7,
+     "Group": [
+       {
+-        "Command": "/usr/bin/dde-shutdown",
+        "Command": "dde-shutdown",
+         "Wait": false,
+         "Args": [
+           "-d"
+diff --git a/session.go b/session.go
+index 26f89ef..f412ca4 100644
+--- a/session.go
+++ b/session.go
+@@ -18,6 +18,7 @@ import (
+ 	"syscall"
+ 	"time"
+ 
+	"github.com/adrg/xdg"
+ 	"github.com/godbus/dbus"
+ 	"github.com/linuxdeepin/dde-api/soundutils"
+ 	daemon "github.com/linuxdeepin/go-dbus-factory/com.deepin.daemon.daemon"
+@@ -53,8 +54,10 @@ const (
+ 
+ 	xsKeyQtFontName     = "Qt/FontName"
+ 	xsKeyQtMonoFontName = "Qt/MonoFontName"
+)
+ 
+-	ddeLockDesktopFile = "/usr/share/applications/dde-lock.desktop"
+var (
+	ddeLockDesktopFile, _ = xdg.SearchDataFile("applications/dde-lock.desktop");
+ )
+ 
+ type SessionManager struct {
+@@ -90,7 +93,7 @@ type SessionManager struct {
+ }
+ 
+ const (
+-	cmdShutdown      = "/usr/bin/dde-shutdown"
+	cmdShutdown      = "dde-shutdown"
+ 	lockFrontDest    = "com.deepin.dde.lockFront"
+ 	lockFrontIfc     = lockFrontDest
+ 	lockFrontObjPath = "/com/deepin/dde/lockFront"
+@@ -471,7 +474,7 @@ func (m *SessionManager) SetLocked(sender dbus.Sender, value bool) *dbus.Error {
+ 		return dbusutil.ToError(err)
+ 	}
+ 
+-	if exe == "/usr/bin/dde-lock" {
+	if strings.Contains(exe, "dde-lock") {
+ 		m.setLocked(value)
+ 		return nil
+ 	}
+@@ -491,7 +494,7 @@ func (m *SessionManager) SetLocked(sender dbus.Sender, value bool) *dbus.Error {
+ 		return dbusutil.ToError(fmt.Errorf("desktop file %q is invalid", desktopFile))
+ 	}
+ 	exe = info.GetExecutable()
+-	if exe != "/usr/bin/dde-lock" {
+	if strings.Contains(exe, "dde-lock") {
+ 		return dbusutil.ToError(fmt.Errorf("exe %q of desktop file %q is invalid", exe, desktopFile))
+ 	}
+ 
+@@ -798,7 +801,7 @@ func setupEnvironments2() {
+ 	// man gnome-keyring-daemon:
+ 	// The daemon will print out various environment variables which should be set
+ 	// in the user's environment, in order to interact with the daemon.
+-	gnomeKeyringOutput, err := exec.Command("/usr/bin/gnome-keyring-daemon", "--start",
+	gnomeKeyringOutput, err := exec.Command("gnome-keyring-daemon", "--start",
+ 		"--components=secrets,pkcs11,ssh").Output()
+ 	if err == nil {
+ 		lines := bytes.Split(gnomeKeyringOutput, []byte{'\n'})
+@@ -1389,4 +1392,4 @@ func initXEventMonitor() {
+ 			setDPMSMode(true)
+ 		}
+ 	})
+-}
+\ No newline at end of file
+}
+-- 
+2.39.2
+
--- a/pkgs/desktops/deepin/go-package/startdde/default.nix
+++ b/pkgs/desktops/deepin/go-package/startdde/default.nix
@ -0,0 +1,102 @@
+{ stdenv
+, lib
+, fetchFromGitHub
+, buildGoPackage
+, pkg-config
+, go-dbus-factory
+, go-gir-generator
+, go-lib
+, gettext
+, dde-api
+, libgnome-keyring
+, gtk3
+, alsa-lib
+, libpulseaudio
+, libgudev
+, libsecret
+, jq
+, wrapGAppsHook
+, runtimeShell
+, dde-polkit-agent
+}:
+
+buildGoPackage rec {
+  pname = "startdde";
+  version = "5.10.1";
+
+  goPackagePath = "github.com/linuxdeepin/startdde";
+
+  src = fetchFromGitHub {
+    owner = "linuxdeepin";
+    repo = pname;
+    rev = version;
+    sha256 = "sha256-dbTcYS7dEvT0eP45jKE8WiG9Pm4LU6jvR8hjMQv/yxU=";
+  };
+
+  patches = [
+    ./0001-avoid-use-hardcode-path.patch
+  ];
+
+  postPatch = ''
+    substituteInPlace display/manager.go session.go \
+      --replace "/bin/bash" "${runtimeShell}"
+    substituteInPlace display/manager.go main.go utils.go session.go \
+      --replace "/usr/lib/deepin-daemon" "/run/current-system/sw/lib/deepin-daemon"
+    substituteInPlace misc/xsessions/deepin.desktop.in --subst-var-by PREFIX $out
+    substituteInPlace watchdog/dde_polkit_agent.go misc/auto_launch/{default.json,chinese.json} \
+      --replace "/usr/lib/polkit-1-dde/dde-polkit-agent" "${dde-polkit-agent}/lib/polkit-1-dde/dde-polkit-agent"
+    substituteInPlace startmanager.go launch_group.go memchecker/config.go \
+      --replace "/usr/share/startdde" "$out/share/startdde"
+    substituteInPlace misc/lightdm.conf --replace "/usr" "$out"
+  '';
+
+  goDeps = ./deps.nix;
+
+  nativeBuildInputs = [
+    gettext
+    pkg-config
+    jq
+    wrapGAppsHook
+  ];
+
+  buildInputs = [
+    go-dbus-factory
+    go-gir-generator
+    go-lib
+    dde-api
+    libgnome-keyring
+    gtk3
+    alsa-lib
+    libpulseaudio
+    libgudev
+    libsecret
+  ];
+
+  buildPhase = ''
+    runHook preBuild
+    addToSearchPath GOPATH "${go-dbus-factory}/share/gocode"
+    addToSearchPath GOPATH "${go-gir-generator}/share/gocode"
+    addToSearchPath GOPATH "${go-lib}/share/gocode"
+    addToSearchPath GOPATH "${dde-api}/share/gocode"
+    make -C go/src/${goPackagePath}
+    runHook postBuild
+  '';
+
+  installPhase = ''
+    make install DESTDIR="$out" PREFIX="/" -C go/src/${goPackagePath}
+  '';
+
+  passthru.providedSessions = [ "deepin" ];
+
+  meta = with lib; {
+    description = "Starter of deepin desktop environment";
+    longDescription = ''
+      Startdde is used for launching DDE components and invoking user's
+      custom applications which compliant with xdg autostart specification
+    '';
+    homepage = "https://github.com/linuxdeepin/startdde";
+    license = licenses.gpl3Plus;
+    platforms = platforms.linux;
+    maintainers = teams.deepin.members;
+  };
+}
--- a/pkgs/desktops/deepin/go-package/startdde/deps.nix
+++ b/pkgs/desktops/deepin/go-package/startdde/deps.nix
@ -0,0 +1,236 @@
+[
+  {
+    goPackagePath = "github.com/cryptix/wav";
+    fetch = {
+      type = "git";
+      url = "https://github.com/cryptix/wav";
+      rev = "8bdace674401f0bd3b63c65479b6a6ff1f9d5e44";
+      sha256 = "18nyqv0ic35fs9fny8sj84c00vbxs8mnric6vr6yl42624fh5id6";
+    };
+  }
+  {
+    goPackagePath = "github.com/davecgh/go-spew";
+    fetch = {
+      type = "git";
+      url = "https://github.com/davecgh/go-spew";
+      rev = "v1.1.1";
+      sha256 = "sha256-nhzSUrE1fCkN0+RL04N4h8jWmRFPPPWbCuDc7Ss0akI=";
+    };
+  }
+  {
+    goPackagePath = "github.com/linuxdeepin/go-x11-client";
+    fetch = {
+      type = "git";
+      url = "https://github.com/linuxdeepin/go-x11-client";
+      rev = "0.6.9";
+      sha256 = "sha256-xXNaXpFFHJN1fCFLoVrQFCXQ4ya+Kga55QWcJL/InkA=";
+    };
+  }
+  {
+    goPackagePath = "golang.org/x/xerrors";
+    fetch = {
+      type = "git";
+      url = "https://github.com/golang/xerrors";
+      rev = "2f41105eb62f341cfe208d06de4ee3bdd3a083da";
+      sha256 = "sha256-yZNeG+jcarcw/aOFhrhxWWE20r0P+/VJF4i/0JQfv1c=";
+    };
+  }
+  {
+    goPackagePath = "github.com/fsnotify/fsnotify";
+    fetch = {
+      type = "git";
+      url = "https://github.com/fsnotify/fsnotify";
+      rev = "v1.5.1";
+      sha256 = "sha256-B8kZ8yiWgallT7R2j1kSRJcJkSGFVf9ise+TpXa+7XY=";
+    };
+  }
+  {
+    goPackagePath = "github.com/godbus/dbus";
+    fetch = {
+      type = "git";
+      url = "https://github.com/godbus/dbus";
+      rev = "v5.1.0";
+      sha256 = "sha256-JSPtmkGEStBEVrKGszeLCb7P38SzQKgMiDC3eDppXs0=";
+    };
+  }
+  {
+    goPackagePath = "github.com/stretchr/testify";
+    fetch = {
+      type = "git";
+      url = "https://github.com/stretchr/testify";
+      rev = "v1.7.1";
+      sha256 = "sha256-disUVIHiIDSj/go3APtJH8awSl8QwKRRFLKI7LRnl0w=";
+    };
+  }
+  {
+    goPackagePath = "golang.org/x/sys";
+    fetch = {
+      type = "git";
+      url = "https://github.com/golang/sys";
+      rev = "289d7a0edf712062d9f1484b07bdf2383f48802f";
+      sha256 = "sha256-AzS/J3OocI7mA0xsIfQzyskNKVija7F2yvuts+EFJBs=";
+    };
+  }
+  {
+    goPackagePath = "gopkg.in/yaml.v3";
+    fetch = {
+      type = "git";
+      url = "https://github.com/go-yaml/yaml";
+      rev = "496545a6307b2a7d7a710fd516e5e16e8ab62dbc";
+      sha256 = "sha256-j8yDji+vqsitpRZirpb4w/Em8nstgf28wpwkcrOlxBk=";
+    };
+  }
+  {
+    goPackagePath = "github.com/stretchr/objx";
+    fetch = {
+      type = "git";
+      url = "https://github.com/stretchr/objx";
+      rev = "v0.3.0";
+      sha256 = "sha256-T753/EiD5Cpk6H2JFhd+s1gFvpNptG2XlEHxZF6dQaw=";
+    };
+  }
+  {
+    goPackagePath = "github.com/pmezard/go-difflib";
+    fetch = {
+      type = "git";
+      url = "https://github.com/pmezard/go-difflib";
+      rev = "5d4384ee4fb2527b0a1256a821ebfc92f91efefc";
+      sha256 = "sha256-XA4Oj1gdmdV/F/+8kMI+DBxKPthZ768hbKsO3d9Gx90=";
+    };
+  }
+  {
+    goPackagePath = "github.com/axgle/mahonia";
+    fetch = {
+      type = "git";
+      url = "https://github.com/axgle/mahonia";
+      rev = "3358181d7394e26beccfae0ffde05193ef3be33a";
+      sha256 = "0b8wsrxmv8a0cqbnsg55lpf29pxy2zw8azvgh3ck664lqpcfybhq";
+    };
+  }
+  {
+    goPackagePath = "golang.org/x/text";
+    fetch = {
+      type = "git";
+      url = "https://github.com/golang/text";
+      rev = "v0.3.7";
+      sha256 = "sha256-XpIbgE6MxWwDQQcPXr2NIsE2cev2+CIabi566TYGfHY=";
+    };
+  }
+  {
+    goPackagePath = "golang.org/x/image";
+    fetch = {
+      type = "git";
+      url = "https://github.com/golang/image";
+      rev = "70e8d0d3baa9a699c3865c753cbfa8ae65bd86ce";
+      sha256 = "sha256-oMbDIke/qQ6cp7JLNsMusf7EIUfuj0WavFVfI0lxTDs=";
+    };
+  }
+  {
+    goPackagePath = "github.com/nfnt/resize";
+    fetch = {
+      type = "git";
+      url = "https://github.com/nfnt/resize";
+      rev = "83c6a9932646f83e3267f353373d47347b6036b2";
+      sha256 = "005cpiwq28krbjf0zjwpfh63rp4s4is58700idn24fs3g7wdbwya";
+    };
+  }
+  {
+    goPackagePath = "github.com/Lofanmi/pinyin-golang";
+    fetch = {
+      type = "git";
+      url = "https://github.com/Lofanmi/pinyin-golang";
+      rev = "1db892057f20c56a3286cc1517e0642dacbff54c";
+      sha256 = "sha256-nhO6AYZ3vc7nwgmmfTlE6m33caY9gGZoKiSYvFLqHQc=";
+    };
+  }
+  {
+    goPackagePath = "github.com/mozillazg/go-pinyin";
+    fetch = {
+      type = "git";
+      url = "https://github.com/mozillazg/go-pinyin";
+      rev = "8930bc1fcb5693689dc35d98ad2a4153662e34b1";
+      sha256 = "sha256-kuMNiWpPeqsIsFgYIOsffxUfwcLPaMZWdZRBJAMDVvA=";
+    };
+  }
+  {
+    goPackagePath = "github.com/kelvins/sunrisesunset";
+    fetch = {
+      type = "git";
+      url = "https://github.com/kelvins/sunrisesunset";
+      rev = "39fa1bd816d52927b4cfcab0a1535b17eafe0a3d";
+      sha256 = "sha256-awklKAW1YM3sWM21irbyu2sUMIo3kCOj12lzyVzDefw=";
+    };
+  }
+  {
+    goPackagePath = "github.com/rickb777/date";
+    fetch = {
+      type = "git";
+      url = "https://github.com/rickb777/date";
+      rev = "v1.18";
+      sha256 = "sha256-8r8eFOF5dKtowE3dnjpSMIXJ/yX2IjiR7nZ/EApUZbA=";
+    };
+  }
+  {
+    goPackagePath = "github.com/rickb777/plural";
+    fetch = {
+      type = "git";
+      url = "https://github.com/rickb777/plural";
+      rev = "v1.4.1";
+      sha256 = "sha256-nhN+ApdfUie45L+M2OZAPtSoiIZ1pZ2UpDX/DePS6Yw=";
+    };
+  }
+  {
+    goPackagePath = "github.com/gosexy/gettext";
+    fetch = {
+      type = "git";
+      url = "https://github.com/gosexy/gettext";
+      rev = "v0.9";
+      sha256 = "0asphx8nd7zmp88wk6aakk5292np7yw73akvfdvlvs9q5r5ahkgi";
+    };
+  }
+  {
+    goPackagePath = "github.com/msteinert/pam";
+    fetch = {
+      type = "git";
+      url = "https://github.com/msteinert/pam";
+      rev = "v1.0.0";
+      sha256 = "sha256-Ji13ckPyZUBAovhK2hRHgf2LB1ieglX/XrIJBxVcsXc=";
+    };
+  }
+  {
+    goPackagePath = "github.com/youpy/go-wav";
+    fetch = {
+      type = "git";
+      url = "https://github.com/youpy/go-wav";
+      rev = "v0.3.2";
+      sha256 = "sha256-jNqXW3F3fcgjT47+d2MVXauWkA7+1KfYVu3ZZpRCTkM=";
+    };
+  }
+  {
+    goPackagePath = "github.com/zaf/g711";
+    fetch = {
+      type = "git";
+      url = "https://github.com/zaf/g711";
+      rev = "v1.2";
+      sha256 = "sha256-G+0cgGw/fcOUFVn32AeqUE0YjyOS82Z5MTcn6IANhCY=";
+    };
+  }
+  {
+    goPackagePath = "github.com/youpy/go-riff";
+    fetch = {
+      type = "git";
+      url = "https://github.com/youpy/go-riff";
+      rev = "v0.1.0";
+      sha256 = "sha256-d/3rkxDeRTPveZblArKc61gB4LJVV08n7g0THieuhx8=";
+    };
+  }
+  {
+    goPackagePath = "github.com/adrg/xdg";
+    fetch = {
+      type = "git";
+      url = "https://github.com/adrg/xdg";
+      rev = "v0.4.0";
+      sha256 = "sha256-zGjkdUQmrVqD6rMO9oDY+TeJCpuqnHyvkPCaXDlac/U=";
+    };
+  }
+]
--- a/pkgs/desktops/plasma-5/bluedevil.nix
+++ b/pkgs/desktops/plasma-5/bluedevil.nix
@ -1,5 +1,4 @@
 { mkDerivation
-, lib
 , extra-cmake-modules
 , shared-mime-info
 , qtbase
--- a/pkgs/desktops/plasma-5/breeze-plymouth/default.nix
+++ b/pkgs/desktops/plasma-5/breeze-plymouth/default.nix
@ -2,7 +2,6 @@
 , lib
 , extra-cmake-modules
 , plymouth
-, nixos-icons
 , imagemagick
 , netpbm
 , perl
--- a/pkgs/desktops/plasma-5/discover.nix
+++ b/pkgs/desktops/plasma-5/discover.nix
@ -1,5 +1,4 @@
 { mkDerivation
-, lib
 , extra-cmake-modules
 , gettext
 , kdoctools
@ -12,7 +11,6 @@
 , packagekit-qt
 , pcre
 , util-linux
-, qtbase
 , qtquickcontrols2
 , qtwebview
 , qtx11extras
--- a/pkgs/desktops/plasma-5/kactivitymanagerd.nix
+++ b/pkgs/desktops/plasma-5/kactivitymanagerd.nix
@ -1,5 +1,4 @@
 { mkDerivation
-, lib
 , extra-cmake-modules
 , boost
 , kconfig
--- a/pkgs/desktops/plasma-5/kdecoration.nix
+++ b/pkgs/desktops/plasma-5/kdecoration.nix
@ -1,4 +1,4 @@
-{ mkDerivation, lib, extra-cmake-modules, qtbase, ki18n, kcoreaddons }:
+{ mkDerivation, extra-cmake-modules, qtbase, ki18n, kcoreaddons }:

 mkDerivation {
  pname = "kdecoration";
--- a/pkgs/desktops/plasma-5/kgamma5.nix
+++ b/pkgs/desktops/plasma-5/kgamma5.nix
@ -1,11 +1,9 @@
 { mkDerivation
-, lib
 , extra-cmake-modules
 , kdoctools
 , kconfig
 , kconfigwidgets
 , ki18n
-, qtbase
 , qtx11extras
 , libXxf86vm
 }:
--- a/pkgs/desktops/plasma-5/khotkeys.nix
+++ b/pkgs/desktops/plasma-5/khotkeys.nix
@ -1,8 +1,6 @@
 { mkDerivation
-, lib
 , extra-cmake-modules
 , kdoctools
-, qtbase
 , kcmutils
 , kdbusaddons
 , kdelibs4support
--- a/pkgs/desktops/plasma-5/kinfocenter/default.nix
+++ b/pkgs/desktops/plasma-5/kinfocenter/default.nix
@ -2,7 +2,6 @@
 , lib
 , extra-cmake-modules
 , kdoctools
-, qtbase
 , qttools
 , kcmutils
 , kcompletion
--- a/pkgs/desktops/plasma-5/kscreenlocker.nix
+++ b/pkgs/desktops/plasma-5/kscreenlocker.nix
@ -1,5 +1,4 @@
 { mkDerivation
-, lib
 , extra-cmake-modules
 , kdoctools
 , kcmutils
@ -12,7 +11,6 @@
 , libXcursor
 , pam
 , plasma-framework
-, qtbase
 , qtdeclarative
 , qtx11extras
 , wayland
--- a/pkgs/desktops/plasma-5/ksshaskpass.nix
+++ b/pkgs/desktops/plasma-5/ksshaskpass.nix
@ -1,5 +1,4 @@
 { mkDerivation
-, lib
 , extra-cmake-modules
 , kdoctools
 , kcoreaddons
--- a/pkgs/desktops/plasma-5/kwayland-integration.nix
+++ b/pkgs/desktops/plasma-5/kwayland-integration.nix
@ -1,5 +1,4 @@
 { mkDerivation
-, lib
 , extra-cmake-modules
 , kguiaddons
 , kidletime
--- a/pkgs/desktops/plasma-5/kwrited.nix
+++ b/pkgs/desktops/plasma-5/kwrited.nix
@ -1,5 +1,4 @@
 { mkDerivation
-, lib
 , extra-cmake-modules
 , kcoreaddons
 , kdbusaddons
--- a/pkgs/desktops/plasma-5/layer-shell-qt.nix
+++ b/pkgs/desktops/plasma-5/layer-shell-qt.nix
@ -1,5 +1,4 @@
 { mkDerivation
-, lib
 , extra-cmake-modules
 , kguiaddons
 , kidletime
--- a/pkgs/desktops/plasma-5/libkscreen/default.nix
+++ b/pkgs/desktops/plasma-5/libkscreen/default.nix
@ -1,8 +1,6 @@
 { mkDerivation
-, lib
 , propagate
 , extra-cmake-modules
-, qtbase
 , wayland-scanner
 , kconfig
 , kwayland
--- a/pkgs/desktops/plasma-5/libksysguard/default.nix
+++ b/pkgs/desktops/plasma-5/libksysguard/default.nix
@ -1,5 +1,4 @@
 { mkDerivation
-, lib
 , extra-cmake-modules
 , kauth
 , kcompletion
@ -13,7 +12,6 @@
 , kwidgetsaddons
 , kwindowsystem
 , plasma-framework
-, qtbase
 , qtscript
 , qtwebengine
 , qtx11extras
--- a/pkgs/desktops/plasma-5/milou.nix
+++ b/pkgs/desktops/plasma-5/milou.nix
@ -1,5 +1,4 @@
 { mkDerivation
-, lib
 , extra-cmake-modules
 , kcoreaddons
 , kdeclarative
@ -8,7 +7,6 @@
 , krunner
 , kservice
 , plasma-framework
-, qtbase
 , qtscript
 , qtdeclarative
 }:
--- a/pkgs/desktops/plasma-5/plasma-mobile/default.nix
+++ b/pkgs/desktops/plasma-5/plasma-mobile/default.nix
@ -2,10 +2,6 @@
 , lib
 , extra-cmake-modules
 , kdoctools
-, coreutils
-, dbus
-, gnugrep
-, gnused
 , libdbusmenu
 , pam
 , wayland
@ -30,12 +26,9 @@
 , maliit-framework
 , maliit-keyboard
 , qtfeedback
-, qtwayland
 , qttools
 }:

-let inherit (lib) getBin getLib; in
-
 mkDerivation {
  pname = "plasma-mobile";

--- a/pkgs/desktops/plasma-5/plasma-nm/default.nix
+++ b/pkgs/desktops/plasma-5/plasma-nm/default.nix
@ -1,5 +1,4 @@
 { mkDerivation
-, lib
 , substituteAll
 , extra-cmake-modules
 , kdoctools
@ -29,7 +28,6 @@
 , modemmanager-qt
 , networkmanager-qt
 , qca-qt5
-, qtbase
 , qtdeclarative
 , qttools
 }:
--- a/pkgs/desktops/plasma-5/plasma-pa.nix
+++ b/pkgs/desktops/plasma-5/plasma-pa.nix
@ -1,5 +1,4 @@
 { mkDerivation
-, lib
 , extra-cmake-modules
 , kdoctools
 , kcmutils
--- a/pkgs/desktops/plasma-5/plasma-sdk.nix
+++ b/pkgs/desktops/plasma-5/plasma-sdk.nix
@ -1,5 +1,4 @@
 { mkDerivation
-, lib
 , extra-cmake-modules
 , karchive
 , kcompletion
--- a/pkgs/desktops/plasma-5/plasma-systemmonitor.nix
+++ b/pkgs/desktops/plasma-5/plasma-systemmonitor.nix
@ -1,5 +1,4 @@
 { mkDerivation
-, lib
 , extra-cmake-modules
 , kdoctools
 , qtquickcontrols2
--- a/pkgs/desktops/plasma-5/plasma-workspace/default.nix
+++ b/pkgs/desktops/plasma-5/plasma-workspace/default.nix
@ -2,9 +2,6 @@
 , lib
 , extra-cmake-modules
 , kdoctools
-, coreutils
-, gnugrep
-, gnused
 , isocodes
 , libdbusmenu
 , libSM
--- a/pkgs/desktops/plasma-5/polkit-kde-agent.nix
+++ b/pkgs/desktops/plasma-5/polkit-kde-agent.nix
@ -1,5 +1,4 @@
 { mkDerivation
-, lib
 , extra-cmake-modules
 , kcoreaddons
 , kconfig
@ -11,7 +10,6 @@
 , kwidgetsaddons
 , kwindowsystem
 , polkit-qt
-, qtbase
 }:

 mkDerivation {
--- a/pkgs/desktops/plasma-5/qqc2-breeze-style.nix
+++ b/pkgs/desktops/plasma-5/qqc2-breeze-style.nix
@ -1,5 +1,4 @@
 { mkDerivation
-, lib
 , extra-cmake-modules
 , kconfig
 , kconfigwidgets
--- a/pkgs/desktops/plasma-5/sddm-kcm.nix
+++ b/pkgs/desktops/plasma-5/sddm-kcm.nix
@ -1,11 +1,9 @@
 { mkDerivation
-, lib
 , extra-cmake-modules
 , shared-mime-info
 , libpthreadstubs
 , libXcursor
 , libXdmcp
-, qtbase
 , qtquickcontrols2
 , qtx11extras
 , karchive
--- a/pkgs/desktops/plasma-5/xdg-desktop-portal-kde.nix
+++ b/pkgs/desktops/plasma-5/xdg-desktop-portal-kde.nix
@ -1,5 +1,4 @@
 { mkDerivation
-, lib
 , extra-cmake-modules
 , gettext
 , kdoctools
--- a/pkgs/development/compilers/gcc/12/default.nix
+++ b/pkgs/development/compilers/gcc/12/default.nix
@ -29,6 +29,7 @@
 , buildPackages
 , libxcrypt
 , disableGdbPlugin ? !enablePlugin
+, disableBootstrap ? !stdenv.hostPlatform.isDarwin
 , nukeReferences
 , callPackage
 }:
@ -56,7 +57,6 @@ with builtins;

 let majorVersion = "12";
    version = "${majorVersion}.2.0";
-    disableBootstrap = !stdenv.hostPlatform.isDarwin;

    inherit (stdenv) buildPlatform hostPlatform targetPlatform;

--- a/pkgs/development/libraries/gobject-introspection/default.nix
+++ b/pkgs/development/libraries/gobject-introspection/default.nix
@ -79,7 +79,8 @@ stdenv.mkDerivation (finalAttrs: {
    # Build definition checks for the Python modules needed at runtime by importing them.
    (buildPackages.python3.withPackages pythonModules)
    finalAttrs.setupHook # move .gir files
-  ] ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [ gobject-introspection-unwrapped ];
+    # can't use canExecute, we need prebuilt when cross
+  ] ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ gobject-introspection-unwrapped ];

  buildInputs = [
    (python3.withPackages pythonModules)
@ -106,8 +107,10 @@ stdenv.mkDerivation (finalAttrs: {
      inherit (buildPackages) bash;
      buildlddtree = "${buildPackages.pax-utils}/bin/lddtree";
    }}"
-    "-Dgi_cross_use_prebuilt_gi=true"
    "-Dgi_cross_binary_wrapper=${stdenv.hostPlatform.emulator buildPackages}"
+    # can't use canExecute, we need prebuilt when cross
+  ] ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [
+    "-Dgi_cross_use_prebuilt_gi=true"
  ];

  doCheck = !stdenv.isAarch64;
--- a/pkgs/development/libraries/libcyaml/default.nix
+++ b/pkgs/development/libraries/libcyaml/default.nix
@ -4,13 +4,13 @@

 stdenv.mkDerivation rec {
  pname = "libcyaml";
-  version = "1.3.1";
+  version = "1.4.0";

  src = fetchFromGitHub {
    owner = "tlsa";
    repo = "libcyaml";
    rev = "v${version}";
-    sha256 = "sha256-ntgTgIJ3u1IbR/eYOgwmgR9Jvx28P+l44wAMlBEcbj8=";
+    sha256 = "sha256-UENh8oxZm7uukCr448Nrf7devDK4SIT3DVhvXbwfjw8=";
  };

  buildInputs = [ libyaml ];
--- a/pkgs/development/libraries/libvirt/default.nix
+++ b/pkgs/development/libraries/libvirt/default.nix
@ -114,13 +114,13 @@ stdenv.mkDerivation rec {
  # NOTE: You must also bump:
  # <nixpkgs/pkgs/development/python-modules/libvirt/default.nix>
  # SysVirt in <nixpkgs/pkgs/top-level/perl-packages.nix>
-  version = "9.1.0";
+  version = "9.2.0";

  src = fetchFromGitLab {
    owner = pname;
    repo = pname;
    rev = "v${version}";
-    sha256 = "sha256-V39p0kg+zGdoIY9mJjtMLk2xzlTjHG0SPR2GjvHK9FI=";
+    sha256 = "sha256-uASIfQVbY/5I/PELEB6EGzzHfcgY4jIolbyH05TgiLA=";
    fetchSubmodules = true;
  };

--- a/pkgs/development/python-modules/aenum/default.nix
+++ b/pkgs/development/python-modules/aenum/default.nix
@ -8,14 +8,14 @@

 buildPythonPackage rec {
  pname = "aenum";
-  version = "3.1.11";
+  version = "3.1.12";
  format = "setuptools";

  disabled = pythonOlder "3.7";

  src = fetchPypi {
    inherit pname version;
-    hash = "sha256-rtLCc1R65yoNXuhpcZwCpkPaFr9QfICVj6rcfgOOP3M=";
+    hash = "sha256-PlMckYYKgfiF9+bpfSGa6XcsuJlYAIR4iTXa19l0LvA=";
  };

  nativeCheckInputs = [
--- a/pkgs/development/python-modules/cassandra-driver/default.nix
+++ b/pkgs/development/python-modules/cassandra-driver/default.nix
@ -1,62 +1,58 @@
-{ stdenv
-, lib
+{ lib
+, stdenv
 , buildPythonPackage
-, fetchFromGitHub
-, pythonOlder
 , cython
 , eventlet
-, futures ? null
-, iana-etc
+, fetchFromGitHub
 , geomet
+, gevent
+, gremlinpython
+, iana-etc
 , libev
+, libredirect
 , mock
 , nose
 , pytestCheckHook
+, pythonOlder
 , pytz
 , pyyaml
 , scales
 , six
 , sure
-, gremlinpython
-, gevent
 , twisted
-, libredirect
 }:

 buildPythonPackage rec {
  pname = "cassandra-driver";
-  version = "3.25.0";
+  version = "3.26.0";
+  format = "setuptools";
+
+  disabled = pythonOlder "3.7";

-  # pypi tarball doesn't include tests
  src = fetchFromGitHub {
    owner = "datastax";
    repo = "python-driver";
-    rev = version;
-    sha256 = "1dn7iiavsrhh6i9hcyw0mk8j95r5ym0gbrvdca998hx2rnz5ark6";
+    rev = "refs/tags/${version}";
+    hash = "sha256-mLQEG41WyFtXY2PJzoM4uaI4Cm+0xSIAPGhijHHbTBk=";
  };

  postPatch = ''
-    substituteInPlace setup.py --replace 'geomet>=0.1,<0.3' 'geomet'
+    substituteInPlace setup.py \
+      --replace 'geomet>=0.1,<0.3' 'geomet'
  '';

-  nativeBuildInputs = [ cython ];
-  buildInputs = [ libev ];
-  propagatedBuildInputs = [ six geomet ]
-    ++ lib.optionals (pythonOlder "3.4") [ futures ];
+  nativeBuildInputs = [
+    cython
+  ];

-  # Make /etc/protocols accessible to allow socket.getprotobyname('tcp') in sandbox,
-  # also /etc/resolv.conf is referenced by some tests
-  preCheck = (lib.optionalString stdenv.isLinux ''
-    echo "nameserver 127.0.0.1" > resolv.conf
-    export NIX_REDIRECTS=/etc/protocols=${iana-etc}/etc/protocols:/etc/resolv.conf=$(realpath resolv.conf)
-    export LD_PRELOAD=${libredirect}/lib/libredirect.so
-  '') + ''
-    # increase tolerance for time-based test
-    substituteInPlace tests/unit/io/utils.py --replace 'delta=.15' 'delta=.3'
-  '';
-  postCheck = ''
-    unset NIX_REDIRECTS LD_PRELOAD
-  '';
+  buildInputs = [
+    libev
+  ];
+
+  propagatedBuildInputs = [
+    six
+    geomet
+  ];

  nativeCheckInputs = [
    pytestCheckHook
@ -72,13 +68,34 @@ buildPythonPackage rec {
    twisted
  ];

+  # Make /etc/protocols accessible to allow socket.getprotobyname('tcp') in sandbox,
+  # also /etc/resolv.conf is referenced by some tests
+  preCheck = (lib.optionalString stdenv.isLinux ''
+    echo "nameserver 127.0.0.1" > resolv.conf
+    export NIX_REDIRECTS=/etc/protocols=${iana-etc}/etc/protocols:/etc/resolv.conf=$(realpath resolv.conf)
+    export LD_PRELOAD=${libredirect}/lib/libredirect.so
+  '') + ''
+    # increase tolerance for time-based test
+    substituteInPlace tests/unit/io/utils.py --replace 'delta=.15' 'delta=.3'
+  '';
+
+  pythonImportsCheck = [
+    "cassandra"
+  ];
+
+  postCheck = ''
+    unset NIX_REDIRECTS LD_PRELOAD
+  '';
+
  pytestFlagsArray = [
    "tests/unit"
  ];
+
  disabledTestPaths = [
    # requires puresasl
    "tests/unit/advanced/test_auth.py"
  ];
+
  disabledTests = [
    # doesn't seem to be intended to be run directly
    "_PoolTests"
@ -91,6 +108,7 @@ buildPythonPackage rec {
  meta = with lib; {
    description = "A Python client driver for Apache Cassandra";
    homepage = "http://datastax.github.io/python-driver";
+    changelog = "https://github.com/datastax/python-driver/blob/${version}/CHANGELOG.rst";
    license = licenses.asl20;
    maintainers = with maintainers; [ turion ris ];
  };
--- a/pkgs/development/python-modules/django-sesame/default.nix
+++ b/pkgs/development/python-modules/django-sesame/default.nix
@ -1,21 +1,46 @@
-{ lib, buildPythonPackage, fetchFromGitHub
-, django }:
+{ lib
+, buildPythonPackage
+, django
+, fetchFromGitHub
+, poetry-core
+, python
+, pythonOlder
+, ua-parser
+}:

 buildPythonPackage rec {
  pname = "django-sesame";
-  version = "1.7";
+  version = "3.1";
+  format = "pyproject";
+
+  disabled = pythonOlder "3.7";

  src = fetchFromGitHub {
    owner = "aaugustin";
    repo = pname;
-    rev = version;
-    sha256 = "0k8s44zn2jmasp0w064vrx685fn4pbmdfx8qmhkab1hd5ys6pi44";
+    rev = "refs/tags/${version}";
+    hash = "sha256-Pyyhm0th0cNEkM0sd6maCnf4qELsSO82c9CQuqQdn0w=";
  };

-  nativeCheckInputs = [ django ];
+  nativeBuildInputs = [
+    poetry-core
+  ];
+
+  nativeCheckInputs = [
+    django
+    ua-parser
+  ];
+
+  pythonImportsCheck = [
+    "sesame"
+  ];

  checkPhase = ''
-    make test
+    runHook preCheck
+
+    ${python.interpreter} -m django test --settings=tests.settings
+
+    runHook postCheck
  '';

  meta = with lib; {
--- a/pkgs/development/python-modules/libvirt/default.nix
+++ b/pkgs/development/python-modules/libvirt/default.nix
@ -2,13 +2,13 @@

 buildPythonPackage rec {
  pname = "libvirt";
-  version = "9.1.0";
+  version = "9.2.0";

  src = fetchFromGitLab {
    owner = "libvirt";
    repo = "libvirt-python";
    rev = "v${version}";
-    hash = "sha256-kdWmgmkvI7yaqyFytPnHN6OtF+gsRe58q6AlXFycfQ8=";
+    hash = "sha256-htJPNFiY0WuQlgfFkLh3RUmnx2X4aQ0+iUQgZ1+HDp0=";
  };

  nativeBuildInputs = [ pkg-config ];
--- a/pkgs/development/python-modules/lsassy/default.nix
+++ b/pkgs/development/python-modules/lsassy/default.nix
@ -10,7 +10,7 @@

 buildPythonPackage rec {
  pname = "lsassy";
-  version = "3.1.7";
+  version = "3.1.8";
  format = "setuptools";

  disabled = pythonOlder "3.7";
@ -19,7 +19,7 @@ buildPythonPackage rec {
    owner = "Hackndo";
    repo = pname;
    rev = "refs/tags/v${version}";
-    hash = "sha256-q9zaKccgqj8haP7zQGS0rplfLylsPXggjzhN6VWV4/A=";
+    hash = "sha256-refOq/QWRv1naCskVm6h1QmCH9/YkDJ90HU3Hzc2w4A=";
  };

  propagatedBuildInputs = [
--- a/pkgs/development/python-modules/openai-whisper/default.nix
+++ b/pkgs/development/python-modules/openai-whisper/default.nix
@ -2,6 +2,7 @@
 , fetchFromGitHub
 , buildPythonPackage
 , substituteAll
+, cudaSupport ? false

 # runtime
 , ffmpeg
@ -9,10 +10,15 @@
 # propagates
 , numpy
 , torch
+, torchWithCuda
 , tqdm
 , more-itertools
 , transformers
 , ffmpeg-python
+, numba
+, openai-triton
+, scipy
+, tiktoken

 # tests
 , pytestCheckHook
@ -20,14 +26,14 @@

 buildPythonPackage rec {
  pname = "whisper";
-  version = "20230124";
+  version = "20230314";
  format = "setuptools";

  src = fetchFromGitHub {
    owner = "openai";
    repo = pname;
    rev = "refs/tags/v${version}";
-    hash = "sha256-+3fs/EXK5NGlISuMTk7r2ZZ4tNFKbNFNkVS2LmHBvwk=";
+    hash = "sha256-qQCELjRFeRCT1k1CBc3netRtFvt+an/EbkrgnmiX/mc=";
  };

  patches = [
@ -39,13 +45,31 @@ buildPythonPackage rec {

  propagatedBuildInputs = [
    numpy
-    torch
    tqdm
    more-itertools
    transformers
    ffmpeg-python
+    numba
+    scipy
+    tiktoken
+  ] ++ lib.optionals (!cudaSupport) [
+    torch
+  ] ++ lib.optionals (cudaSupport) [
+    openai-triton
+    torchWithCuda
  ];

+  postPatch = ''
+    substituteInPlace requirements.txt \
+      --replace "tiktoken==0.3.1" "tiktoken>=0.3.1"
+  ''
+  # openai-triton is only needed for CUDA support.
+  # triton needs CUDA to be build.
+  # -> by making it optional, we can build whisper without unfree packages enabled
+  + lib.optionalString (!cudaSupport) ''
+    sed -i '/if sys.platform.startswith("linux") and platform.machine() == "x86_64":/{N;d}' setup.py
+  '';
+
  preCheck = ''
    export HOME=$TMPDIR
  '';
@ -56,14 +80,18 @@ buildPythonPackage rec {

  disabledTests = [
    # requires network access to download models
+    "test_tokenizer"
    "test_transcribe"
+    # requires NVIDIA drivers
+    "test_dtw_cuda_equivalence"
+    "test_median_filter_equivalence"
  ];

  meta = with lib; {
+    changelog = "https://github.com/openai/whisper/blob/v$[version}/CHANGELOG.md";
    description = "General-purpose speech recognition model";
    homepage = "https://github.com/openai/whisper";
    license = licenses.mit;
-    maintainers = with maintainers; [ hexa ];
+    maintainers = with maintainers; [ hexa MayNiklas ];
  };
 }
-
--- a/pkgs/development/python-modules/pgspecial/default.nix
+++ b/pkgs/development/python-modules/pgspecial/default.nix
@ -10,11 +10,11 @@

 buildPythonPackage rec {
  pname = "pgspecial";
-  version = "2.0.1";
+  version = "2.1.0";

  src = fetchPypi {
    inherit pname version;
-    hash = "sha256-ZEQ7vJrQm1fQ9Ny7OO/0TVKFO3QYyepS9YV6vhu1NOw=";
+    hash = "sha256-CZqcQ7V2iIWpnHYbHxSoxlBLsU6WMa2HVXOa2vdYJm8=";
  };

  propagatedBuildInputs = [
--- a/pkgs/servers/monitoring/prometheus/mysqld-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/mysqld-exporter.nix
@ -3,12 +3,11 @@
 buildGoModule rec {
  pname = "mysqld_exporter";
  version = "0.14.0";
-  rev = "v${version}";

  src = fetchFromGitHub {
-    inherit rev;
    owner = "prometheus";
    repo = "mysqld_exporter";
+    rev = "v${version}";
    sha256 = "sha256-SMcpQNygv/jVLNuQP8V6BH/CmSt5Y4dzYPsboTH2dos=";
  };

@ -17,7 +16,7 @@ buildGoModule rec {
  ldflags = let t = "github.com/prometheus/common/version"; in [
    "-s" "-w"
    "-X ${t}.Version=${version}"
-    "-X ${t}.Revision=${rev}"
+    "-X ${t}.Revision=${src.rev}"
    "-X ${t}.Branch=unknown"
    "-X ${t}.BuildUser=nix@nixpkgs"
    "-X ${t}.BuildDate=unknown"
--- a/pkgs/servers/nextcloud/packages/24.json
+++ b/pkgs/servers/nextcloud/packages/24.json
@ -1,6 +1,6 @@
 {
  "bookmarks": {
-    "sha256": "511aadcda0b1f051191c20cfd7048150536cfb1e748deb11b568bec4e535a173",
+    "sha256": "1jkbwzig4xd042jcbdbdh4whkpxb87f7ba0c89c78bdgcqzjv1a3",
    "url": "https://github.com/nextcloud/bookmarks/releases/download/v11.0.4/bookmarks-11.0.4.tar.gz",
    "version": "11.0.4",
    "description": "- 📂 Sort bookmarks into folders\n- 🏷 Add tags and personal notes\n- 🔍 Full-text search\n- 📲 Synchronize with all your browsers and devices\n- 👪 Share bookmarks with other users and publicly\n- ☠ Find broken links\n- ⚛ Generate RSS feeds of your collections\n- 📔 Read archived versions of your links in case they are depublished\n- 💬 Create new bookmarks directly from within Nextcloud Talk\n- 💼 Built-in Dashboard widgets for frequent and recent links\n\nRequirements:\n - PHP v7.4+\n - PHP extensions:\n   - intl: *\n   - mbstring: *\n - when using MySQL, use at least v8.0",
@ -10,9 +10,9 @@
    ]
  },
  "calendar": {
-    "sha256": "1cb3rjqgjysmirfvda4fqyr24ljh1203bzygmzzm9n26ji72636f",
-    "url": "https://github.com/nextcloud-releases/calendar/releases/download/v3.5.6/calendar-v3.5.6.tar.gz",
-    "version": "3.5.6",
+    "sha256": "0zzq556727yryxa0zas6agm6azl1898gbjx4wnl8d8m9hczf6xr2",
+    "url": "https://github.com/nextcloud-releases/calendar/releases/download/v3.5.7/calendar-v3.5.7.tar.gz",
+    "version": "3.5.7",
    "description": "The Calendar app is a user interface for Nextcloud's CalDAV server. Easily sync events from various devices with your Nextcloud and edit them online.\n\n* 🚀 **Integration with other Nextcloud apps!** Currently Contacts - more to come.\n* 🌐 **WebCal Support!** Want to see your favorite team’s matchdays in your calendar? No problem!\n* 🙋 **Attendees!** Invite people to your events\n* ⌚️ **Free/Busy!** See when your attendees are available to meet\n* ⏰ **Reminders!** Get alarms for events inside your browser and via email\n* 🔍 Search! Find your events at ease\n* ☑️ Tasks! See tasks with a due date directly in the calendar\n* 🙈 **We’re not reinventing the wheel!** Based on the great [c-dav library](https://github.com/nextcloud/cdav-library), [ical.js](https://github.com/mozilla-comm/ical.js) and [fullcalendar](https://github.com/fullcalendar/fullcalendar) libraries.",
    "homepage": "https://github.com/nextcloud/calendar/",
    "licenses": [
@ -110,9 +110,9 @@
    ]
  },
  "news": {
-    "sha256": "029rzfnqf2h37pw30hmclmvizz8v7r2sgqbs4gkp0kj0s6fx388z",
-    "url": "https://github.com/nextcloud/news/releases/download/21.2.0-beta1/news.tar.gz",
-    "version": "21.2.0-beta1",
+    "sha256": "0l8ps13y00hq3xh1w874f3zx73gpmi4jxd3gzwhggx1r495gxqbh",
+    "url": "https://github.com/nextcloud/news/releases/download/21.2.0-beta2/news.tar.gz",
+    "version": "21.2.0-beta2",
    "description": "📰 A RSS/Atom Feed reader App for Nextcloud\n\n- 📲 Synchronize your feeds with multiple mobile or desktop [clients](https://nextcloud.github.io/news/clients/)\n- 🔄 Automatic updates of your news feeds\n- 🆓 Free and open source under AGPLv3, no ads or premium functions\n\n**System Cron is currently required for this app to work**\n\nRequirements can be found [here](https://nextcloud.github.io/news/install/#dependencies)\n\nThe Changelog is available [here](https://github.com/nextcloud/news/blob/master/CHANGELOG.md)\n\nCreate a [bug report](https://github.com/nextcloud/news/issues/new/choose)\n\nCreate a [feature request](https://github.com/nextcloud/news/discussions/new)\n\nReport a [feed issue](https://github.com/nextcloud/news/discussions/new)",
    "homepage": "https://github.com/nextcloud/news",
    "licenses": [
@ -120,7 +120,7 @@
    ]
  },
  "notes": {
-    "sha256": "adddee56456d0115f87a74405a6d62bd5e3af256e86199d87bbff3b2a6876299",
+    "sha256": "0b88xsznfi31la7iyj4b7j1qlb8wvrmq49z9dgdrwja3r81mxnsr",
    "url": "https://github.com/nextcloud/notes/releases/download/v4.5.1/notes.tar.gz",
    "version": "4.5.1",
    "description": "The Notes app is a distraction free notes taking app for [Nextcloud](https://www.nextcloud.com/). It provides categories for better organization and supports formatting using [Markdown](https://en.wikipedia.org/wiki/Markdown) syntax. Notes are saved as files in your Nextcloud, so you can view and edit them with every Nextcloud client. Furthermore, a separate [REST API](https://github.com/nextcloud/notes/blob/master/docs/api/README.md) allows for an easy integration into third-party apps (currently, there are notes apps for [Android](https://github.com/nextcloud/notes-android), [iOS](https://github.com/nextcloud/notes-ios) and the [console](https://git.danielmoch.com/nncli/about) which allow convenient access to your Nextcloud notes). Further features include marking notes as favorites.",
@ -160,9 +160,9 @@
    ]
  },
  "previewgenerator": {
-    "sha256": "0652pbbdibc37nqzb897b9h7xs57liiv60m6n70pmv9yxx0jwll2",
-    "url": "https://github.com/nextcloud-releases/previewgenerator/releases/download/v5.2.1/previewgenerator-v5.2.1.tar.gz",
-    "version": "5.2.1",
+    "sha256": "0vwlx3z80i12f9hm0qrm014a0wybjk2j5is7vyn9wcizhr6mpzjv",
+    "url": "https://github.com/nextcloud-releases/previewgenerator/releases/download/v5.2.2/previewgenerator-v5.2.2.tar.gz",
+    "version": "5.2.2",
    "description": "The Preview Generator app allows admins to pre-generate previews. The app listens to edit events and stores this information. Once a cron job is triggered it will generate start preview generation. This means that you can better utilize your system by pre-generating previews when your system is normally idle and thus putting less load on your machine when the requests are actually served.\n\nThe app does not replace on demand preview generation so if a preview is requested before it is pre-generated it will still be shown.\nThe first time you install this app, before using a cron job, you properly want to generate all previews via:\n**./occ preview:generate-all -vvv**\n\n**Important**: To enable pre-generation of previews you must add **php /var/www/nextcloud/occ preview:pre-generate** to a system cron job that runs at times of your choosing.",
    "homepage": "https://github.com/nextcloud/previewgenerator",
    "licenses": [
@ -190,7 +190,7 @@
    ]
  },
  "tasks": {
-    "sha256": "fdfa3168ac80eaef3e2de5009eee02a369acc8d35dfd8283d1f25423bdf3c532",
+    "sha256": "0jm13d6nm7cfsw27yfiq1il9xjlh0qrq8xby2yz9dmggn7lk1dx5",
    "url": "https://github.com/nextcloud/tasks/releases/download/v0.14.5/tasks.tar.gz",
    "version": "0.14.5",
    "description": "Once enabled, a new Tasks menu will appear in your Nextcloud apps menu. From there you can add and delete tasks, edit their title, description, start and due dates and mark them as important. Tasks can be shared between users. Tasks can be synchronized using CalDav (each task list is linked to an Nextcloud calendar, to sync it to your local client: Thunderbird, Evolution, KDE Kontact, iCal … - just add the calendar as a remote calendar in your client). You can download your tasks as ICS files using the download button for each calendar.",
@ -220,7 +220,7 @@
    ]
  },
  "twofactor_webauthn": {
-    "sha256": "291c20032cfc1f2fb081cc8721e272bc503d103987c6abb7ce442e497d278d0a",
+    "sha256": "10f6dm9cxljicmfk9l4ncg6r7c1jy1pvm0b5kvz35q9jgniq0hcs",
    "url": "https://github.com/nextcloud-releases/twofactor_webauthn/releases/download/v0.3.3/twofactor_webauthn-v0.3.3.tar.gz",
    "version": "0.3.3",
    "description": "A two-factor provider for WebAuthn devices",
--- a/pkgs/servers/nextcloud/packages/25.json
+++ b/pkgs/servers/nextcloud/packages/25.json
@ -10,9 +10,9 @@
    ]
  },
  "calendar": {
-    "sha256": "1f116521c8mn2ihng20z94f1z3bj0fq4k5968a4nd9m7n0hi47wx",
-    "url": "https://github.com/nextcloud-releases/calendar/releases/download/v4.3.1/calendar-v4.3.1.tar.gz",
-    "version": "4.3.1",
+    "sha256": "0hda62j3n2rs59d1rlnd20y20dahhkcs3zlhly7nw3s8csyd1whl",
+    "url": "https://github.com/nextcloud-releases/calendar/releases/download/v4.3.2/calendar-v4.3.2.tar.gz",
+    "version": "4.3.2",
    "description": "The Calendar app is a user interface for Nextcloud's CalDAV server. Easily sync events from various devices with your Nextcloud and edit them online.\n\n* 🚀 **Integration with other Nextcloud apps!** Currently Contacts - more to come.\n* 🌐 **WebCal Support!** Want to see your favorite team’s matchdays in your calendar? No problem!\n* 🙋 **Attendees!** Invite people to your events\n* ⌚️ **Free/Busy!** See when your attendees are available to meet\n* ⏰ **Reminders!** Get alarms for events inside your browser and via email\n* 🔍 Search! Find your events at ease\n* ☑️ Tasks! See tasks with a due date directly in the calendar\n* 🙈 **We’re not reinventing the wheel!** Based on the great [c-dav library](https://github.com/nextcloud/cdav-library), [ical.js](https://github.com/mozilla-comm/ical.js) and [fullcalendar](https://github.com/fullcalendar/fullcalendar) libraries.",
    "homepage": "https://github.com/nextcloud/calendar/",
    "licenses": [
@ -100,9 +100,9 @@
    ]
  },
  "news": {
-    "sha256": "029rzfnqf2h37pw30hmclmvizz8v7r2sgqbs4gkp0kj0s6fx388z",
-    "url": "https://github.com/nextcloud/news/releases/download/21.2.0-beta1/news.tar.gz",
-    "version": "21.2.0-beta1",
+    "sha256": "0l8ps13y00hq3xh1w874f3zx73gpmi4jxd3gzwhggx1r495gxqbh",
+    "url": "https://github.com/nextcloud/news/releases/download/21.2.0-beta2/news.tar.gz",
+    "version": "21.2.0-beta2",
    "description": "📰 A RSS/Atom Feed reader App for Nextcloud\n\n- 📲 Synchronize your feeds with multiple mobile or desktop [clients](https://nextcloud.github.io/news/clients/)\n- 🔄 Automatic updates of your news feeds\n- 🆓 Free and open source under AGPLv3, no ads or premium functions\n\n**System Cron is currently required for this app to work**\n\nRequirements can be found [here](https://nextcloud.github.io/news/install/#dependencies)\n\nThe Changelog is available [here](https://github.com/nextcloud/news/blob/master/CHANGELOG.md)\n\nCreate a [bug report](https://github.com/nextcloud/news/issues/new/choose)\n\nCreate a [feature request](https://github.com/nextcloud/news/discussions/new)\n\nReport a [feed issue](https://github.com/nextcloud/news/discussions/new)",
    "homepage": "https://github.com/nextcloud/news",
    "licenses": [
@ -140,9 +140,9 @@
    ]
  },
  "polls": {
-    "sha256": "1hxbdygk5vqgqpdqmpss4pklcjb020a768cgz4l7hcm0g12idz9v",
-    "url": "https://github.com/nextcloud/polls/releases/download/v5.0.0-rc1/polls.tar.gz",
-    "version": "5.0.0-rc1",
+    "sha256": "0g5fq9ls7fvcgh0nhpsc8b6ca5vnsisqzpnyq5bcw8bmhnznzj7g",
+    "url": "https://github.com/nextcloud/polls/releases/download/v5.0.0-rc2/polls.tar.gz",
+    "version": "5.0.0-rc2",
    "description": "A polls app, similar to Doodle/Dudle with the possibility to restrict access (members, certain groups/users, hidden and public).",
    "homepage": "https://github.com/nextcloud/polls",
    "licenses": [
@ -150,9 +150,9 @@
    ]
  },
  "previewgenerator": {
-    "sha256": "0652pbbdibc37nqzb897b9h7xs57liiv60m6n70pmv9yxx0jwll2",
-    "url": "https://github.com/nextcloud-releases/previewgenerator/releases/download/v5.2.1/previewgenerator-v5.2.1.tar.gz",
-    "version": "5.2.1",
+    "sha256": "0vwlx3z80i12f9hm0qrm014a0wybjk2j5is7vyn9wcizhr6mpzjv",
+    "url": "https://github.com/nextcloud-releases/previewgenerator/releases/download/v5.2.2/previewgenerator-v5.2.2.tar.gz",
+    "version": "5.2.2",
    "description": "The Preview Generator app allows admins to pre-generate previews. The app listens to edit events and stores this information. Once a cron job is triggered it will generate start preview generation. This means that you can better utilize your system by pre-generating previews when your system is normally idle and thus putting less load on your machine when the requests are actually served.\n\nThe app does not replace on demand preview generation so if a preview is requested before it is pre-generated it will still be shown.\nThe first time you install this app, before using a cron job, you properly want to generate all previews via:\n**./occ preview:generate-all -vvv**\n\n**Important**: To enable pre-generation of previews you must add **php /var/www/nextcloud/occ preview:pre-generate** to a system cron job that runs at times of your choosing.",
    "homepage": "https://github.com/nextcloud/previewgenerator",
    "licenses": [
--- a/pkgs/servers/nextcloud/packages/26.json
+++ b/pkgs/servers/nextcloud/packages/26.json
@ -10,9 +10,9 @@
    ]
  },
  "calendar": {
-    "sha256": "1f116521c8mn2ihng20z94f1z3bj0fq4k5968a4nd9m7n0hi47wx",
-    "url": "https://github.com/nextcloud-releases/calendar/releases/download/v4.3.1/calendar-v4.3.1.tar.gz",
-    "version": "4.3.1",
+    "sha256": "0hda62j3n2rs59d1rlnd20y20dahhkcs3zlhly7nw3s8csyd1whl",
+    "url": "https://github.com/nextcloud-releases/calendar/releases/download/v4.3.2/calendar-v4.3.2.tar.gz",
+    "version": "4.3.2",
    "description": "The Calendar app is a user interface for Nextcloud's CalDAV server. Easily sync events from various devices with your Nextcloud and edit them online.\n\n* 🚀 **Integration with other Nextcloud apps!** Currently Contacts - more to come.\n* 🌐 **WebCal Support!** Want to see your favorite team’s matchdays in your calendar? No problem!\n* 🙋 **Attendees!** Invite people to your events\n* ⌚️ **Free/Busy!** See when your attendees are available to meet\n* ⏰ **Reminders!** Get alarms for events inside your browser and via email\n* 🔍 Search! Find your events at ease\n* ☑️ Tasks! See tasks with a due date directly in the calendar\n* 🙈 **We’re not reinventing the wheel!** Based on the great [c-dav library](https://github.com/nextcloud/cdav-library), [ical.js](https://github.com/mozilla-comm/ical.js) and [fullcalendar](https://github.com/fullcalendar/fullcalendar) libraries.",
    "homepage": "https://github.com/nextcloud/calendar/",
    "licenses": [
@ -90,9 +90,9 @@
    ]
  },
  "mail": {
-    "sha256": "0dz3macak3r3gqn4rxpkli2bmb284w3kywlfcra7gnkiqfivrf9v",
-    "url": "https://github.com/nextcloud-releases/mail/releases/download/v3.0.3-beta1/mail-v3.0.3-beta1.tar.gz",
-    "version": "3.0.3-beta.1",
+    "sha256": "1q9vqjmr7mkxszjpwxcbwfqgn6m2qzrzmbxa7rbiy1dnb1frnsks",
+    "url": "https://github.com/nextcloud-releases/mail/releases/download/v3.1.0/mail-v3.1.0.tar.gz",
+    "version": "3.1.0",
    "description": "**💌 A mail app for Nextcloud**\n\n- **🚀 Integration with other Nextcloud apps!** Currently Contacts, Calendar & Files – more to come.\n- **📥 Multiple mail accounts!** Personal and company account? No problem, and a nice unified inbox. Connect any IMAP account.\n- **🔒 Send & receive encrypted mails!** Using the great [Mailvelope](https://mailvelope.com) browser extension.\n- **🙈 We’re not reinventing the wheel!** Based on the great [Horde](https://horde.org) libraries.\n- **📬 Want to host your own mail server?** We do not have to reimplement this as you could set up [Mail-in-a-Box](https://mailinabox.email)!",
    "homepage": "https://github.com/nextcloud/mail#readme",
    "licenses": [
@ -100,9 +100,9 @@
    ]
  },
  "news": {
-    "sha256": "029rzfnqf2h37pw30hmclmvizz8v7r2sgqbs4gkp0kj0s6fx388z",
-    "url": "https://github.com/nextcloud/news/releases/download/21.2.0-beta1/news.tar.gz",
-    "version": "21.2.0-beta1",
+    "sha256": "0l8ps13y00hq3xh1w874f3zx73gpmi4jxd3gzwhggx1r495gxqbh",
+    "url": "https://github.com/nextcloud/news/releases/download/21.2.0-beta2/news.tar.gz",
+    "version": "21.2.0-beta2",
    "description": "📰 A RSS/Atom Feed reader App for Nextcloud\n\n- 📲 Synchronize your feeds with multiple mobile or desktop [clients](https://nextcloud.github.io/news/clients/)\n- 🔄 Automatic updates of your news feeds\n- 🆓 Free and open source under AGPLv3, no ads or premium functions\n\n**System Cron is currently required for this app to work**\n\nRequirements can be found [here](https://nextcloud.github.io/news/install/#dependencies)\n\nThe Changelog is available [here](https://github.com/nextcloud/news/blob/master/CHANGELOG.md)\n\nCreate a [bug report](https://github.com/nextcloud/news/issues/new/choose)\n\nCreate a [feature request](https://github.com/nextcloud/news/discussions/new)\n\nReport a [feed issue](https://github.com/nextcloud/news/discussions/new)",
    "homepage": "https://github.com/nextcloud/news",
    "licenses": [
@ -140,9 +140,9 @@
    ]
  },
  "polls": {
-    "sha256": "1hxbdygk5vqgqpdqmpss4pklcjb020a768cgz4l7hcm0g12idz9v",
-    "url": "https://github.com/nextcloud/polls/releases/download/v5.0.0-rc1/polls.tar.gz",
-    "version": "5.0.0-rc1",
+    "sha256": "0g5fq9ls7fvcgh0nhpsc8b6ca5vnsisqzpnyq5bcw8bmhnznzj7g",
+    "url": "https://github.com/nextcloud/polls/releases/download/v5.0.0-rc2/polls.tar.gz",
+    "version": "5.0.0-rc2",
    "description": "A polls app, similar to Doodle/Dudle with the possibility to restrict access (members, certain groups/users, hidden and public).",
    "homepage": "https://github.com/nextcloud/polls",
    "licenses": [
@ -150,9 +150,9 @@
    ]
  },
  "previewgenerator": {
-    "sha256": "0652pbbdibc37nqzb897b9h7xs57liiv60m6n70pmv9yxx0jwll2",
-    "url": "https://github.com/nextcloud-releases/previewgenerator/releases/download/v5.2.1/previewgenerator-v5.2.1.tar.gz",
-    "version": "5.2.1",
+    "sha256": "0vwlx3z80i12f9hm0qrm014a0wybjk2j5is7vyn9wcizhr6mpzjv",
+    "url": "https://github.com/nextcloud-releases/previewgenerator/releases/download/v5.2.2/previewgenerator-v5.2.2.tar.gz",
+    "version": "5.2.2",
    "description": "The Preview Generator app allows admins to pre-generate previews. The app listens to edit events and stores this information. Once a cron job is triggered it will generate start preview generation. This means that you can better utilize your system by pre-generating previews when your system is normally idle and thus putting less load on your machine when the requests are actually served.\n\nThe app does not replace on demand preview generation so if a preview is requested before it is pre-generated it will still be shown.\nThe first time you install this app, before using a cron job, you properly want to generate all previews via:\n**./occ preview:generate-all -vvv**\n\n**Important**: To enable pre-generation of previews you must add **php /var/www/nextcloud/occ preview:pre-generate** to a system cron job that runs at times of your choosing.",
    "homepage": "https://github.com/nextcloud/previewgenerator",
    "licenses": [
--- a/pkgs/tools/admin/awscli2/default.nix
+++ b/pkgs/tools/admin/awscli2/default.nix
@ -9,8 +9,8 @@
 }:

 let
-  py = python3.override {
-    packageOverrides = self: super: {
+  py = python3 // {
+    pkgs = python3.pkgs.overrideScope (self: super: {
      ipython = super.ipython.overridePythonAttrs (oldAttrs: rec {
        pname = "ipython";
        version = "8.5.0";
@ -31,7 +31,7 @@ let
          hash = "sha256-nxzRax6GwpaPJRnX+zHdnWaZFvUVYSwmnRTp7VK1FlA=";
        };
      });
-    };
+    });
  };

 in
--- a/pkgs/tools/inputmethods/uim/default.nix
+++ b/pkgs/tools/inputmethods/uim/default.nix
@ -152,7 +152,6 @@ stdenv.mkDerivation rec {
    description = "A multilingual input method framework";
    license     = licenses.bsd3;
    platforms   = platforms.unix;
-    broken      = stdenv.hostPlatform.isAarch64; # fails to build libgcroots (not supported on aarch64)
    maintainers = with maintainers; [ ericsagnes oxij ];
  };
 }
--- a/pkgs/tools/misc/tmux-sessionizer/default.nix
+++ b/pkgs/tools/misc/tmux-sessionizer/default.nix
@ -9,16 +9,16 @@

 rustPlatform.buildRustPackage rec {
  pname = "tmux-sessionizer";
-  version = "0.2.0";
+  version = "0.2.1";

  src = fetchFromGitHub {
    owner = "jrmoulton";
    repo = pname;
    rev = "v${version}";
-    sha256 = "sha256-FSh3ww5KpktNSvqB3kcIaTxNHypwsVTHze0mgBtuJQE=";
+    sha256 = "sha256-fV+LBs+jbcOjArUfygEXkyxg/xGhI35YduUkx4AyQhk=";
  };

-  cargoSha256 = "sha256-3DyLYegAzNbPpW6MUIDLm1QUqmGg8zH0Ps1dbdaSezs=";
+  cargoHash = "sha256-Bg4C4r3h/kaMsAqzit9JVuAe7vYrRB9W5OLOWPgCJHc=";

  nativeBuildInputs = [ pkg-config ];
  buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security ];
--- a/pkgs/tools/security/age-plugin-yubikey/default.nix
+++ b/pkgs/tools/security/age-plugin-yubikey/default.nix
@ -3,38 +3,45 @@
 , rustPlatform
 , fetchFromGitHub
 , pkg-config
+, openssl
 , pcsclite
 , PCSC
 , Foundation
+, IOKit
 }:

 rustPlatform.buildRustPackage rec {
  pname = "age-plugin-yubikey";
-  version = "0.3.3";
+  version = "0.4.0";

  src = fetchFromGitHub {
    owner = "str4d";
    repo = pname;
    rev = "v${version}";
-    sha256 = "sha256-b7/65mfUr4p8tP4uU/BFonW0DqTTMIhEgB2xIwIxQVg=";
+    hash = "sha256-V3NzZyCfslUBsARO5UC8N+cuptLxg2euM87DGqtLpPk=";
  };

-  cargoSha256 = "sha256-LnHpinNZZHrIEWrVW0t1ja5WN57/fmiSmZlB0ylau8Y=";
+  cargoHash = "sha256-5qmwCcrhDkJlyeTS+waMiTxro1HjMHiQE5Ds/4sVpx4=";

-  nativeBuildInputs = lib.optionals stdenv.isLinux [ pkg-config ];
+  nativeBuildInputs = [
+    pkg-config
+  ];

-  buildInputs =
-    if stdenv.isDarwin then [
-      Foundation
-      PCSC
-    ] else [
-      pcsclite
-    ];
+  buildInputs = [
+    openssl
+  ]
+  ++ lib.optional stdenv.isLinux pcsclite
+  ++ lib.optionals stdenv.isDarwin [
+    IOKit
+    Foundation
+    PCSC
+  ];

  meta = with lib; {
-    description = "YubiKey plugin for age clients";
+    description = "YubiKey plugin for age";
    homepage = "https://github.com/str4d/age-plugin-yubikey";
-    license = with licenses; [ asl20 mit ];
-    maintainers = with maintainers; [ vtuan10 ];
+    changelog = "https://github.com/str4d/age-plugin-yubikey/blob/${src.rev}/CHANGELOG.md";
+    license = with licenses; [ mit asl20 ];
+    maintainers = with maintainers; [ kranzes vtuan10 ];
  };
 }
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@ -6336,8 +6336,8 @@ with pkgs;

  agebox = callPackage ../tools/security/agebox { };

-  age-plugin-yubikey = callPackage ../tools/security/age-plugin-yubikey {
-    inherit (pkgs.darwin.apple_sdk.frameworks) Foundation PCSC;
+  age-plugin-yubikey = darwin.apple_sdk_11_0.callPackage ../tools/security/age-plugin-yubikey {
+    inherit (darwin.apple_sdk_11_0.frameworks) Foundation PCSC IOKit;
  };

  artim-dark = callPackage ../data/themes/artim-dark { };
@ -14846,6 +14846,15 @@ with pkgs;
    profiledCompiler = false;
  });

+  gfortran-tmp-noisystem = wrapCCWith { grossHackForStagingNext = true; cc = (gcc.cc.override {
+    name = "gfortran";
+    langFortran = true;
+    langCC = false;
+    langC = false;
+    profiledCompiler = false;
+    disableBootstrap = false;
+  }); };
+
  gfortran48 = wrapCC (gcc48.cc.override {
    name = "gfortran";
    langFortran = true;
@ -15327,8 +15336,12 @@ with pkgs;
  julia_16-bin = callPackage ../development/compilers/julia/1.6-bin.nix { };
  julia_18-bin = callPackage ../development/compilers/julia/1.8-bin.nix { };

-  julia_18 = callPackage ../development/compilers/julia/1.8.nix { };
-  julia_19 = callPackage ../development/compilers/julia/1.9.nix { };
+  julia_18 = callPackage ../development/compilers/julia/1.8.nix {
+    gfortran = gfortran-tmp-noisystem;
+  };
+  julia_19 = callPackage ../development/compilers/julia/1.9.nix {
+    gfortran = gfortran-tmp-noisystem;
+  };

  julia-lts-bin = julia_16-bin;
  julia-stable-bin = julia_18-bin;
@ -37823,7 +37836,7 @@ with pkgs;

  ngspice = callPackage ../applications/science/electronics/ngspice { };

-  nvc = callPackage ../applications/science/electronics/nvc { };
+  nvc = darwin.apple_sdk_11_0.callPackage ../applications/science/electronics/nvc { };

  openems = callPackage ../applications/science/electronics/openems {
    qcsxcad = libsForQt5.qcsxcad;
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@ -6817,7 +6817,9 @@ self: super: with self; {

  openai-triton = callPackage ../development/python-modules/openai-triton { llvmPackages = pkgs.llvmPackages_rocm; };

-  openai-whisper = callPackage ../development/python-modules/openai-whisper { };
+  openai-whisper = callPackage ../development/python-modules/openai-whisper {
+    cudaSupport = pkgs.config.cudaSupport or false;
+  };

  openant = callPackage ../development/python-modules/openant { };