Merge master into haskell-updates

.github/workflows/manual-rendering.yml

@@ -54,7 +54,7 @@ jobs:
       # less noisy until all nixpkgs pull requests have stopped using
       # docbook for option docs.
       - name: Comment on failure
-        uses: peter-evans/create-or-update-comment@v2
+        uses: peter-evans/create-or-update-comment@v3
         if: ${{ failure() && steps.check.conclusion == 'failure' }}
         with:
           issue-number: 189318

.github/workflows/periodic-merge-24h.yml

@@ -51,7 +51,7 @@ jobs:
           github_token: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Comment on failure
-        uses: peter-evans/create-or-update-comment@v2
+        uses: peter-evans/create-or-update-comment@v3
         if: ${{ failure() }}
         with:
           issue-number: 105153

.github/workflows/periodic-merge-6h.yml

@@ -49,7 +49,7 @@ jobs:
           github_token: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Comment on failure
-        uses: peter-evans/create-or-update-comment@v2
+        uses: peter-evans/create-or-update-comment@v3
         if: ${{ failure() }}
         with:
           issue-number: 105153

.github/workflows/update-terraform-providers.yml

@@ -46,7 +46,7 @@ jobs:
         run: |
           git clean -f
       - name: create PR
-        uses: peter-evans/create-pull-request@v4
+        uses: peter-evans/create-pull-request@v5
         with:
           body: |
             Automatic update by [update-terraform-providers](https://github.com/NixOS/nixpkgs/blob/master/.github/workflows/update-terraform-providers.yml) action.

doc/languages-frameworks/texlive.section.md

@@ -40,17 +40,24 @@ Since release 15.09 there is a new TeX Live packaging that lives entirely under
 
 ## Custom packages {#sec-language-texlive-custom-packages}
 
+You may find that you need to use an external TeX package. A derivation for such package has to provide the contents of the "texmf" directory in its output and provide the appropriate `tlType` attribute (one of `"run"`, `"bin"`, `"doc"`, `"source"`). Dependencies on other TeX packages can be listed in the attribute `tlDeps`.
 
-You may find that you need to use an external TeX package. A derivation for such package has to provide contents of the "texmf" directory in its output and provide the `tlType` attribute. Here is a (very verbose) example:
+Such derivation must then be listed in the attribute `pkgs` of an attribute set passed to `texlive.combine`, for instance by passing `extraPkgs = { pkgs = [ custom_package ]; };`. Within Nixpkgs, `pkgs` should be part of the derivation itself, allowing users to call `texlive.combine { inherit (texlive) scheme-small; inherit some_tex_package; }`.
+
+Here is a (very verbose) example where the attribute `pkgs` is attached to the derivation itself, which requires creating a fixed point. See also the packages `auctex`, `eukleides`, `mftrace` for more examples.
 
 ```nix
 with import <nixpkgs> {};
 
 let
-  foiltex_run = stdenvNoCC.mkDerivation {
+  foiltex = stdenvNoCC.mkDerivation (finalAttrs: {
     pname = "latex-foiltex";
     version = "2.1.4b";
-    passthru.tlType = "run";
+    passthru = {
+      pkgs = [ finalAttrs.finalPackage ];
+      tlDeps = with texlive; [ latex ];
+      tlType = "run";
+    };
 
     srcs = [
       (fetchurl {
@@ -102,8 +109,7 @@ let
       maintainers = with maintainers; [ veprbl ];
       platforms = platforms.all;
     };
-  };
+  });
-  foiltex = { pkgs = [ foiltex_run ]; };
 
   latex_with_foiltex = texlive.combine {
     inherit (texlive) scheme-small;

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";
@@ -7095,6 +7101,13 @@
       fingerprint = "7EB1 C02A B62B B464 6D7C  E4AE D1D0 9DE1 69EA 19A0";
     }];
   };
+  jfvillablanca = {
+    email = "jmfv.dev@gmail.com";
+    matrix = "@jfvillablanca:matrix.org";
+    github = "jfvillablanca";
+    githubId = 31008330;
+    name = "Jann Marc Villablanca";
+  };
   jgart = {
     email = "jgart@dismail.de";
     github = "jgarte";
@@ -16932,6 +16945,12 @@
     githubId = 568532;
     name = "Christian Zagrodnick";
   };
+  zahrun = {
+    email = "zahrun@murena.io";
+    github = "zahrun";
+    githubId = 10415894;
+    name = "Zahrun";
+  };
   zakame = {
     email = "zakame@zakame.net";
     github = "zakame";

nixos/modules/hardware/opengl.nix

@@ -69,50 +69,21 @@ in
       package = mkOption {
         type = types.package;
         internal = true;
-        default = cfg.mesaPackage;
         description = lib.mdDoc ''
           The package that provides the OpenGL implementation.
-
-          The default is Mesa's drivers which should cover all OpenGL-capable
-          hardware. If you want to use another Mesa version, adjust
-          {option}`mesaPackage`.
         '';
       };
+
       package32 = mkOption {
         type = types.package;
         internal = true;
-        default = cfg.mesaPackage32;
         description = lib.mdDoc ''
-          Same as {option}`package` but for the 32-bit OpenGL implementation on
+          The package that provides the 32-bit OpenGL implementation on
-          64-bit systems. Used when {option}`driSupport32Bit` is set.
+          64-bit systems. Used when {option}`driSupport32Bit` is
+          set.
         '';
       };
 
-      mesaPackage = mkOption {
-        type = types.package;
-        default = pkgs.mesa;
-        defaultText = literalExpression "pkgs.mesa";
-        example = literalExpression "pkgs.mesa_22";
-        description = lib.mdDoc ''
-          The Mesa driver package used for rendering support on the system.
-
-          You should only need to adjust this if you require a newer Mesa
-          version for your hardware or because you need to patch a bug.
-        '';
-        apply = mesa: mesa.drivers or (throw "`mesa` package must have a `drivers` output.");
-      };
-      mesaPackage32 = mkOption {
-        type = types.package;
-        default = pkgs.pkgsi686Linux.mesa;
-        defaultText = literalExpression "pkgs.pkgsi686Linux.mesa";
-        example = literalExpression "pkgs.pkgsi686Linux.mesa_22";
-        description = lib.mdDoc ''
-          Same as {option}`mesaPackage` but for the 32-bit Mesa on 64-bit
-          systems. Used when {option}`driSupport32Bit` is set.
-        '';
-        apply = mesa: mesa.drivers or (throw "`mesa` package must have a `drivers` output.");
-      };
-
       extraPackages = mkOption {
         type = types.listOf types.package;
         default = [];
@@ -126,6 +97,7 @@ in
           :::
         '';
       };
+
       extraPackages32 = mkOption {
         type = types.listOf types.package;
         default = [];
@@ -181,6 +153,9 @@ in
     environment.sessionVariables.LD_LIBRARY_PATH = mkIf cfg.setLdLibraryPath
       ([ "/run/opengl-driver/lib" ] ++ optional cfg.driSupport32Bit "/run/opengl-driver-32/lib");
 
+    hardware.opengl.package = mkDefault pkgs.mesa.drivers;
+    hardware.opengl.package32 = mkDefault pkgs.pkgsi686Linux.mesa.drivers;
+
     boot.extraModulePackages = optional (elem "virtualbox" videoDrivers) kernelPackages.virtualboxGuestAdditions;
   };
 }

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" ];

nixos/modules/module-list.nix

@@ -197,6 +197,7 @@
   ./programs/mdevctl.nix
   ./programs/mepo.nix
   ./programs/mininet.nix
+  ./programs/minipro.nix
   ./programs/miriway.nix
   ./programs/mosh.nix
   ./programs/msmtp.nix

nixos/modules/services/networking/ddclient.nix

@@ -29,9 +29,9 @@ let
   configFile = if (cfg.configFile != null) then cfg.configFile else configFile';
 
   preStart = ''
-    install ${configFile} /run/${RuntimeDirectory}/ddclient.conf
+    install --mode=600 --owner=$USER ${configFile} /run/${RuntimeDirectory}/ddclient.conf
     ${lib.optionalString (cfg.configFile == null) (if (cfg.protocol == "nsupdate") then ''
-      install ${cfg.passwordFile} /run/${RuntimeDirectory}/ddclient.key
+      install --mode=600 --owner=$USER ${cfg.passwordFile} /run/${RuntimeDirectory}/ddclient.key
     '' else if (cfg.passwordFile != null) then ''
       "${pkgs.replace-secret}/bin/replace-secret" "@password_placeholder@" "${cfg.passwordFile}" "/run/${RuntimeDirectory}/ddclient.conf"
     '' else ''

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";
+    rev = "v${version}";
-    sha256 = "sha256-4VWckXzqo2xspw9eUloDvjxQYbsHn6ghEDw+hYqJcCE=";
+    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 \
+    substituteInPlace libraries/lib-files/FileNames.cpp \
-      --replace /usr/include/linux/magic.h ${linuxHeaders}/include/linux/magic.h
+         --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

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";
+      rev = "92d572eef5ffdd4117e7ba36b56850a90cb79151";
-      hash = "sha256-sMNNnp1Ypljou0RZ9V0M4qVP/2Osrk1L8NCiyEGY1pw=";
+      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";
+      rev = "17235998809be904892f14ee57730d96795e9323";
-      hash = "sha256-489Rbi75XbW/IuFLijFThsI+BNXqVY1tVALwMT6yie0=";
+      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";
+      rev = "c84d16e7f75032cdd8c4ad986a76ca9e1fe4e639";
-      hash = "sha256-7fDwzt9BXs1h+2D9APAG/ruA81ZyAL4LOElXLdz8wyE=";
+      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";
+      rev = "8f1c49febcb8944d39df8554d32c749b4f5f3158";
-      hash = "sha256-kcr8dY69dKQgzK5D/Fimymq7W/NqS55yoGIvAjbMBQ8=";
+      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";
+      owner = "neovim";
-      repo = "tree-sitter-viml";
+      repo = "tree-sitter-vim";
-      rev = "e39a7bbcfdcfc7900629962b785c7e14503ae590";
+      rev = "2886b52143d570d81f97c98be7a1e204ce9d3bcd";
-      hash = "sha256-f3UAHwCL5yerEjmuDp+guzX4/ik4h7ProH5P8AmdO10=";
+      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";

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/,,

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";

pkgs/applications/editors/vscode/vscodium.nix

@@ -15,11 +15,11 @@ let
   archive_fmt = if stdenv.isDarwin then "zip" else "tar.gz";
 
   sha256 = {
-    x86_64-linux = "1dz0fppcbb1cbrq7lp72fdm53ss85bp7i9y5yk3l0yzlmb737syv";
+    x86_64-linux = "0i73nkcja70k64ndwsajy69pb1x2cy71n6i42cmk5qh5mw56brxp";
-    x86_64-darwin = "1m7j4fnlcjjfpx551svh67sj45zln798dsjc1b4hlwcn6qh65kfk";
+    x86_64-darwin = "08vx79aq4s6xsmvg6dv3klbg2yq1k1l6m3nq90kpng7j8anjh954";
-    aarch64-linux = "0ym6l1zkqwwj7jx2k1765094krq6cw562hyvliv1cy6079xkahiy";
+    aarch64-linux = "1bcn40j83pmssdzw0990fsm3hp8fbx9xblyc6zmf53f0yz41528p";
-    aarch64-darwin = "14zq18s68nh8jq542kjn0pf92s7ld5x2p220z71xg3mywmlsgjqf";
+    aarch64-darwin = "0w3gyrp01qflk6gcqzy54nd7wgmrlpsdpin0gfyk4fg46fss9b78";
-    armv7l-linux = "05h96x5nngli7zv2yh8a2yp8z5d8mqq1a6427sdpg3aybyj7ij2d";
+    armv7l-linux = "1bm26cgx2038alzxpcib8r4hd40zbr27kaixrrzamsn6wslg9p1f";
   }.${system} or throwSystem;
 
   sourceRoot = if stdenv.isDarwin then "" else ".";
@@ -29,7 +29,7 @@ in
 
     # Please backport all compatible updates to the stable release.
     # This is important for the extension ecosystem.
-    version = "1.77.0.23093";
+    version = "1.77.1.23095";
     pname = "vscodium";
 
     executableName = "codium";

pkgs/applications/emulators/ryujinx/default.nix

@@ -29,13 +29,13 @@
 
 buildDotnetModule rec {
   pname = "ryujinx";
-  version = "1.1.692"; # Based off of the official github actions builds: https://github.com/Ryujinx/Ryujinx/actions/workflows/release.yml
+  version = "1.1.700"; # Based off of the official github actions builds: https://github.com/Ryujinx/Ryujinx/actions/workflows/release.yml
 
   src = fetchFromGitHub {
     owner = "Ryujinx";
     repo = "Ryujinx";
-    rev = "1b41b285ac7f551c3495ced436ce3930ad7223b4";
+    rev = "a1efd87c45027a347e91fd22d42f33c3eed89030";
-    sha256 = "07s42xmdagi97i7c3mm9qak9msgv4c75say10dl4nha784kxkbvp";
+    sha256 = "0ng8ph2sdlcrsy4nlyjhff2n0c76nzkakpnks7qrv6ljr911yck1";
   };
 
   dotnet-sdk = dotnetCorePackages.sdk_7_0;

pkgs/applications/emulators/ryujinx/deps.nix

@@ -50,10 +50,10 @@
   (fetchNuGet { pname = "Microsoft.CSharp"; version = "4.7.0"; sha256 = "0gd67zlw554j098kabg887b5a6pq9kzavpa3jjy5w53ccjzjfy8j"; })
   (fetchNuGet { pname = "Microsoft.DotNet.PlatformAbstractions"; version = "3.1.6"; sha256 = "0b9myd7gqbpaw9pkd2bx45jhik9mwj0f1ss57sk2cxmag2lkdws5"; })
   (fetchNuGet { pname = "Microsoft.Extensions.DependencyModel"; version = "6.0.0"; sha256 = "08c4fh1n8vsish1vh7h73mva34g0as4ph29s4lvps7kmjb4z64nl"; })
-  (fetchNuGet { pname = "Microsoft.IdentityModel.Abstractions"; version = "6.27.0"; sha256 = "053c1pkx9bnb9440f5rkzbdv99wgcaw95xnqjp09ncd2crh8kakp"; })
+  (fetchNuGet { pname = "Microsoft.IdentityModel.Abstractions"; version = "6.28.1"; sha256 = "0g5a5w34263psh90mp1403m9bh3pcfw6z29vlzdpllzbifk0licr"; })
-  (fetchNuGet { pname = "Microsoft.IdentityModel.JsonWebTokens"; version = "6.27.0"; sha256 = "103qvpahmn1x8yxj0kc920s27xbyjr15z8lf5ikrsrikalb5yjx9"; })
+  (fetchNuGet { pname = "Microsoft.IdentityModel.JsonWebTokens"; version = "6.28.1"; sha256 = "1smsbv400nk4b6x1y9gsk60rlfjmrdvni26d1jnqsxpm1250zdvf"; })
-  (fetchNuGet { pname = "Microsoft.IdentityModel.Logging"; version = "6.27.0"; sha256 = "1c3b0bkmxa24bvzi16jc7lc1nifqcq4jg7ild973bb8mivicagzv"; })
+  (fetchNuGet { pname = "Microsoft.IdentityModel.Logging"; version = "6.28.1"; sha256 = "15bq83wi4h8f1lqinijdqd7vg6n2v77hyza20mjqcp1h3hl2vj43"; })
-  (fetchNuGet { pname = "Microsoft.IdentityModel.Tokens"; version = "6.27.0"; sha256 = "0h51vdcz6pkv4ky2ygba4vks56rskripqb3fjz95ym0l0xg20s1a"; })
+  (fetchNuGet { pname = "Microsoft.IdentityModel.Tokens"; version = "6.28.1"; sha256 = "0ckpjjdy2rv1z7ivqrkc7z16rcqygxzs0la80g8df68p4xxfa0c5"; })
   (fetchNuGet { pname = "Microsoft.IO.RecyclableMemoryStream"; version = "2.3.2"; sha256 = "115bm7dljchr7c02hiv1r3l21r22wpml1j26fyn2amaflaihpq4l"; })
   (fetchNuGet { pname = "Microsoft.NET.Test.Sdk"; version = "17.5.0"; sha256 = "00gz2i8kx4mlq1ywj3imvf7wc6qzh0bsnynhw06z0mgyha1a21jy"; })
   (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.0.1"; sha256 = "01al6cfxp68dscl15z7rxfw9zvhm64dncsw09a1vmdkacsa2v6lr"; })
@@ -177,7 +177,7 @@
   (fetchNuGet { pname = "System.Globalization"; version = "4.3.0"; sha256 = "1cp68vv683n6ic2zqh2s1fn4c2sd87g5hpp6l4d4nj4536jz98ki"; })
   (fetchNuGet { pname = "System.Globalization.Calendars"; version = "4.0.1"; sha256 = "0bv0alrm2ck2zk3rz25lfyk9h42f3ywq77mx1syl6vvyncnpg4qh"; })
   (fetchNuGet { pname = "System.Globalization.Extensions"; version = "4.0.1"; sha256 = "0hjhdb5ri8z9l93bw04s7ynwrjrhx2n0p34sf33a9hl9phz69fyc"; })
-  (fetchNuGet { pname = "System.IdentityModel.Tokens.Jwt"; version = "6.27.0"; sha256 = "0fihix48dk0jrkawby62fs163dv5hsh63vdhdyp7hfz6nabsqs2j"; })
+  (fetchNuGet { pname = "System.IdentityModel.Tokens.Jwt"; version = "6.28.1"; sha256 = "0pn9bk0n15136z434x7yxikda5ggwjwka2c7k0qkprnkmk3yifcl"; })
   (fetchNuGet { pname = "System.IO"; version = "4.1.0"; sha256 = "1g0yb8p11vfd0kbkyzlfsbsp5z44lwsvyc0h3dpw6vqnbi035ajp"; })
   (fetchNuGet { pname = "System.IO"; version = "4.3.0"; sha256 = "05l9qdrzhm4s5dixmx68kxwif4l99ll5gqmh7rqgw554fx0agv5f"; })
   (fetchNuGet { pname = "System.IO.Compression"; version = "4.1.0"; sha256 = "0iym7s3jkl8n0vzm3jd6xqg9zjjjqni05x45dwxyjr2dy88hlgji"; })

pkgs/applications/misc/auto-multiple-choice/default.nix

@@ -23,14 +23,13 @@
 , poppler
 , auto-multiple-choice
 }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: rec {
   pname = "auto-multiple-choice";
   version = "1.5.2";
   src = fetchurl {
     url = "https://download.auto-multiple-choice.net/${pname}_${version}_precomp.tar.gz";
     sha256 = "sha256-AjonJOooSe53Fww3QU6Dft95ojNqWrTuPul3nkIbctM=";
   };
-  tlType = "run";
 
   # There's only the Makefile
   dontConfigure = true;
@@ -137,6 +136,11 @@ stdenv.mkDerivation rec {
     XMLWriter
   ]);
 
+  passthru = {
+    tlType = "run";
+    pkgs = [ finalAttrs.finalPackage ];
+  };
+
   meta = with lib; {
     description = "Create and manage multiple choice questionnaires with automated marking.";
     longDescription = ''
@@ -156,10 +160,7 @@ stdenv.mkDerivation rec {
         auto-multiple-choice
         (texlive.combine {
           inherit (pkgs.texlive) scheme-full;
-          extra =
+          inherit auto-multiple-choice;
-            {
-              pkgs = [ auto-multiple-choice ];
-            };
         })
       ];
       </screen>
@@ -172,4 +173,4 @@ stdenv.mkDerivation rec {
     maintainers = [ maintainers.thblt ];
     platforms = platforms.all;
   };
-}
+})

pkgs/applications/misc/diffuse/default.nix

@@ -14,13 +14,13 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "diffuse";
-  version = "0.7.7";
+  version = "0.8.1";
 
   src = fetchFromGitHub {
     owner = "MightyCreak";
     repo = "diffuse";
     rev = "v${version}";
-    sha256 = "7tidv01znXYYSOKe3cH2+gSBF00aneL9nealcE5avcE=";
+    sha256 = "L+6QwM7w/16IVbiyakBpP7vkbd2/BCGTiRlQG0v1XmU=";
   };
 
   format = "other";

pkgs/applications/misc/kuro/default.nix

@@ -0,0 +1,85 @@
+{ lib
+, fetchFromGitHub
+, makeWrapper
+, makeDesktopItem
+, copyDesktopItems
+, mkYarnPackage
+, electron
+}:
+
+mkYarnPackage rec {
+  pname = "kuro";
+  version = "9.0.0";
+
+  src = fetchFromGitHub {
+    owner = "davidsmorais";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "sha256-9Z/r5T5ZI5aBghHmwiJcft/x/wTRzDlbIupujN2RFfU=";
+  };
+
+  packageJSON = ./package.json;
+  yarnLock = ./yarn.lock;
+  yarnNix = ./yarn.nix;
+
+  ELECTRON_SKIP_BINARY_DOWNLOAD = "1";
+
+  nativeBuildInputs = [
+    makeWrapper
+    copyDesktopItems
+  ];
+
+  postBuild = ''
+    pushd deps/kuro
+
+    yarn --offline run electron-builder \
+      --dir \
+      -c.electronDist=${electron}/lib/electron \
+      -c.electronVersion=${electron.version}
+
+    popd
+  '';
+
+  installPhase = ''
+    runHook preInstall
+
+    # resources
+    mkdir -p "$out/share/lib/kuro"
+    cp -r ./deps/kuro/dist/*-unpacked/{locales,resources{,.pak}} "$out/share/lib/kuro"
+
+    # icons
+    install -Dm644 ./deps/kuro/static/Icon.png $out/share/icons/hicolor/1024x1024/apps/kuro.png
+
+    # executable wrapper
+    makeWrapper '${electron}/bin/electron' "$out/bin/kuro" \
+      --add-flags "$out/share/lib/kuro/resources/app.asar" \
+      --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" \
+      --inherit-argv0
+
+    runHook postInstall
+  '';
+  # Do not attempt generating a tarball for contents again.
+  # note: `doDist = false;` does not work.
+  distPhase = "true";
+
+  desktopItems = [
+    (makeDesktopItem {
+      name = pname;
+      exec = pname;
+      icon = pname;
+      desktopName = "Kuro";
+      genericName = "Microsoft To-Do Client";
+      comment = meta.description;
+      categories = [ "Office" ];
+      startupWMClass = pname;
+    })
+  ];
+
+  meta = with lib; {
+    description = "An unofficial, featureful, open source, community-driven, free Microsoft To-Do app";
+    homepage = "https://github.com/davidsmorais/kuro";
+    license = licenses.mit;
+    maintainers = with maintainers; [ ChaosAttractor ];
+    inherit (electron.meta) platforms;
+  };
+}

pkgs/applications/misc/kuro/package.json

@@ -0,0 +1,149 @@
+{
+  "name": "kuro",
+  "productName": "Kuro",
+  "version": "9.0.0",
+  "description": "Elegant Microsoft To-Do desktop app (Ao fork)",
+  "license": "MIT",
+  "repository": "davidsmorais/kuro",
+  "author": {
+    "name": "davidsmorais",
+    "email": "david@dsmorais.com",
+    "url": "https://github.com/davidsmorais"
+  },
+  "maintainers": [
+    {
+      "name": "davidsmorais",
+      "email": "david@dsmorais.com",
+      "url": "https://github.com/davidsmorais"
+    }
+  ],
+  "scripts": {
+    "postinstall": "electron-builder install-app-deps",
+    "icons": "electron-icon-maker --input=./static/Icon.png --output=./build/",
+    "test": "xo && stylelint 'src/style/*.css'",
+    "release": "yarn version && rm -rf dist build && yarn icons && electron-builder --publish never",
+    "build-snap": "electron-builder --linux snap",
+    "build-win": "electron-builder --win",
+    "start": "electron ."
+  },
+  "dependencies": {
+    "auto-launch": "^5.0.1",
+    "electron-context-menu": "^3.6.1",
+    "electron-debug": "^1.4.0",
+    "electron-dl": "^2.0.0",
+    "electron-store": "^8.1.0",
+    "lodash": "^4.17.21"
+  },
+  "devDependencies": {
+    "electron": "^22.1.0",
+    "electron-builder": "^23.6.0",
+    "electron-icon-maker": "^0.0.5",
+    "stylelint": "^14.9.1",
+    "xo": "^0.53.1"
+  },
+  "xo": {
+    "envs": [
+      "browser",
+      "node"
+    ],
+    "rules": {
+      "n/prefer-global/process": 0,
+      "unicorn/prefer-module": 0,
+      "unicorn/no-for-loop": 0,
+      "unicorn/no-array-for-each": 0,
+      "import/extensions": 0,
+      "object-curly-spacing": 0,
+      "quote-props": 0,
+      "unicorn/prefer-query-selector": 0,
+      "quotes": [
+        "error",
+        "double"
+      ]
+    },
+    "space": 2
+  },
+  "stylelint": {
+    "rules": {
+      "block-closing-brace-empty-line-before": "never",
+      "block-closing-brace-newline-after": "always",
+      "block-no-empty": true,
+      "block-opening-brace-space-before": "always",
+      "color-hex-case": "upper",
+      "color-hex-length": "long",
+      "color-no-invalid-hex": true,
+      "comment-no-empty": true,
+      "declaration-block-semicolon-space-before": "never",
+      "indentation": 2,
+      "max-empty-lines": 0,
+      "no-duplicate-selectors": true
+    }
+  },
+  "build": {
+    "appId": "com.davidsmorais.kuro",
+    "snap": {
+      "title": "Kuro"
+    },
+    "files": [
+      "**/*",
+      "!media${/*}",
+      "!docs${/*}"
+    ],
+    "win": {
+      "target": [
+        {
+          "target": "nsis",
+          "arch": [
+            "x64"
+          ]
+        }
+      ],
+      "icon": "icons/win/icon.ico",
+      "publish": {
+        "provider": "github",
+        "releaseType": "release"
+      }
+    },
+    "linux": {
+      "category": "Office",
+      "icon": "icons/png",
+      "description": "Kuro is an unofficial, featureful, open source, community-driven, free Microsoft To-Do app, used by people in more than 120 countries. (Ao fork)",
+      "synopsis": "Elegant Microsoft To-Do desktop app (Ao fork)",
+      "publish": {
+        "provider": "github",
+        "releaseType": "release"
+      },
+      "target": [
+        {
+          "target": "AppImage",
+          "arch": [
+            "x64"
+          ]
+        },
+        {
+          "target": "deb",
+          "arch": [
+            "x64"
+          ]
+        },
+        {
+          "target": "pacman",
+          "arch": [
+            "x64"
+          ]
+        },
+        {
+          "target": "rpm",
+          "arch": [
+            "x64"
+          ]
+        },
+        {
+          "target": "snap",
+          "arch": [
+            "x64"
+          ]
+        }
+      ]
+    }
+  }
+}

pkgs/applications/misc/onagre/default.nix

@@ -0,0 +1,40 @@
+{ lib
+, fetchFromGitHub
+, rustPlatform
+, cmake
+, pkgconf
+, freetype
+, expat
+}:
+
+rustPlatform.buildRustPackage rec {
+  pname = "onagre";
+  version = "1.0.0-alpha.0";
+
+  src = fetchFromGitHub {
+    owner = "oknozor";
+    repo = pname;
+    rev = version;
+    hash = "sha256-hP+slfCWgsTgR2ZUjAmqx9f7+DBu3MpSLvaiZhqNK1Q=";
+  };
+
+  cargoLock = {
+    lockFile = ./Cargo.lock;
+    outputHashes = {
+      "pop-launcher-1.2.1" = "sha256-LeKaJIvooD2aUlY113P0mzxOcj63sGkrA0SIccNqCLY=";
+    };
+  };
+
+  cargoSha256 = "sha256-IOhAGrAiT2mnScNP7k7XK9CETUr6BjGdQVdEUvTYQT4=";
+
+  nativeBuildInputs = [ cmake pkgconf ];
+  buildInputs = [ freetype expat ];
+
+  meta = with lib; {
+    description = "A general purpose application launcher for X and wayland inspired by rofi/wofi and alfred";
+    homepage = "https://github.com/oknozor/onagre";
+    license = licenses.mit;
+    maintainers = [ maintainers.jfvillablanca ];
+    platforms = platforms.linux;
+  };
+}

pkgs/applications/misc/p2pool/default.nix

@@ -19,13 +19,13 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "p2pool";
-  version = "3.1";
+  version = "3.2";
 
   src = fetchFromGitHub {
     owner = "SChernykh";
     repo = "p2pool";
     rev = "v${version}";
-    sha256 = "sha256-yHxg/9QhaDNlUFzylftsJEk+pJoSoTfA0rJfcolBdTs=";
+    sha256 = "sha256-KJ7KE1Joma4KXSqNQi3z+Q3hhc3HLNEaQjunu79qjUs=";
     fetchSubmodules = true;
   };
 

pkgs/applications/misc/slade/default.nix

@@ -19,13 +19,13 @@
 
 stdenv.mkDerivation rec {
   pname = "slade";
-  version = "3.2.1";
+  version = "3.2.2";
 
   src = fetchFromGitHub {
     owner = "sirjuddington";
     repo = "SLADE";
     rev = version;
-    sha256 = "sha256-KFRX3sfI//Op/h/EfEuAZOY22RO5qNXmvhSksC0aS4U=";
+    sha256 = "sha256-UAxGNJ66o5wO8i/g0CgY395uHfJRJSxTlXlBbhgDAbM=";
   };
 
   postPatch = lib.optionalString (!stdenv.hostPlatform.isx86) ''

pkgs/applications/misc/spicetify-cli/default.nix

@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "spicetify-cli";
-  version = "2.16.2";
+  version = "2.17.1";
 
   src = fetchFromGitHub {
     owner = "spicetify";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-13JWceuiNz1FxgVVQ2KV88zYLIBkEVeTfPF5eEK1oe8=";
+    sha256 = "sha256-hgLJVD3JEehQjPO5T54xk5JxbcVyiBu4PXV+EdOczag=";
   };
 
-  vendorHash = "sha256-rmQpS4k/G3s/H7sPxVZ70KtJEvYjsDV2htV97viWttM=";
+  vendorHash = "sha256-mAtwbYuzkHUqG4fr2JffcM8PmBsBrnHWyl4DvVzfJCw=";
 
   ldflags = [
     "-s -w"

pkgs/applications/misc/system76-keyboard-configurator/default.nix

@@ -6,13 +6,13 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "system76-keyboard-configurator";
-  version = "1.3.0";
+  version = "1.3.1";
 
   src = fetchFromGitHub {
     owner = "pop-os";
     repo = "keyboard-configurator";
     rev = "v${version}";
-    sha256 = "sha256-/RIpnbwLoNDdts18qhYqc8lDqsPoA5GW6z7LaZc5dos=";
+    sha256 = "sha256-k9VmEg/HZECUwHaD491ZmfGUxZ14hLOaJD5x3zMK2jI=";
   };
 
   nativeBuildInputs = [
@@ -28,7 +28,7 @@ rustPlatform.buildRustPackage rec {
     udev
   ];
 
-  cargoSha256 = "sha256-hxHWfxNGmpX4mWj1ozOhhOyZI9J3aQzv3yvWFst81aU=";
+  cargoHash = "sha256-0SFph9quh4QWR3nU5IJr4FyLGqrYvmHcZHDRli6phsc=";
 
   meta = with lib; {
     description = "Keyboard configuration application for System76 keyboards and laptops";

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" ];

pkgs/applications/networking/cluster/multus-cni/default.nix

@@ -2,13 +2,13 @@
 
 buildGoModule rec {
   pname = "multus-cni";
-  version = "3.9.2";
+  version = "3.9.3";
 
   src = fetchFromGitHub {
     owner = "k8snetworkplumbingwg";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-AYSUJEoNYt4DYNcPynRBal5c5QAzRVltkjwoEM66VcY=";
+    sha256 = "sha256-43cFBrFM2jvD/SJ+QT1JQkr593jkdzAAvYlVUAQArEw=";
   };
 
   ldflags = [
@@ -21,7 +21,7 @@ buildGoModule rec {
     mv $GOPATH/bin/cmd $GOPATH/bin/multus
   '';
 
-  vendorSha256 = null;
+  vendorHash = null;
 
   # Some of the tests require accessing a k8s cluster
   doCheck = false;

pkgs/applications/networking/cluster/talosctl/default.nix

@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "talosctl";
-  version = "1.3.6";
+  version = "1.3.7";
 
   src = fetchFromGitHub {
     owner = "siderolabs";
     repo = "talos";
     rev = "v${version}";
-    hash = "sha256-UViS9s8si1OuGAiTP2o80A2jw9uh3nc73XjXCtG8Iho=";
+    hash = "sha256-zJcfx4rHPo8bAN4p0BK0i8Vu1aAaUynj9Aj7bBQoVKU=";
   };
 
-  vendorHash = "sha256-faw2I7cdhWM1ue6Ab2uHZXb9cdelcpoAooynrHeyIgw=";
+  vendorHash = "sha256-m7w6ItXGAtoT/ZqNOXbDackXV6cHtpAMBi4jfVhQa9A=";
 
   ldflags = [ "-s" "-w" ];
 

pkgs/applications/networking/cluster/werf/default.nix

@@ -10,16 +10,16 @@
 
 buildGoModule rec {
   pname = "werf";
-  version = "1.2.217";
+  version = "1.2.219";
 
   src = fetchFromGitHub {
     owner = "werf";
     repo = "werf";
     rev = "v${version}";
-    hash = "sha256-89r1M9yqvaSZiecNVAMnU02C8elT02GOYwfd8rZvdQM=";
+    hash = "sha256-yenIGKN6OoDxPRn4aHOQu8Msp1WzjLZzTZkSSKq1zlc=";
   };
 
-  vendorHash = "sha256-x4FuGAyQmvlI2ZltuCyvo1UFAFDh8P5wnXVeYEoUCyY=";
+  vendorHash = "sha256-lif2Vj8HQH8rZeBIky1lz5J6ISdV2yPyR1vQrPcZLuU=";
 
   proxyVendor = true;
 

pkgs/applications/networking/freefilesync/default.nix

@@ -18,13 +18,13 @@
 
 stdenv.mkDerivation rec {
   pname = "freefilesync";
-  version = "12.1";
+  version = "12.2";
 
   src = fetchFromGitHub {
     owner = "hkneptune";
     repo = "FreeFileSync";
     rev = "v${version}";
-    hash = "sha256-KA3Bn8skJ2gMmihmwlUmN6jXZmfoYY/f4vqbKwvxwgw=";
+    hash = "sha256-pCXMpK+NF06vgEgX31wyO24+kPhvPhdTeRk1j84nYd0=";
   };
 
   # Patches from Debian

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";

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 = {}
 

pkgs/applications/networking/mullvad/mullvad.nix

@@ -19,32 +19,22 @@
 }:
 rustPlatform.buildRustPackage rec {
   pname = "mullvad";
-  version = "2023.2";
+  version = "2023.3";
 
   src = fetchFromGitHub {
     owner = "mullvad";
     repo = "mullvadvpn-app";
     rev = version;
-    hash = "sha256-UozgUsew6MRplahTW/y688R2VetO50UGQevmVo8/QNs=";
+    hash = "sha256-as/d14xVTqJvb+QxzEyZWh1EMRVpE8cDQRbdc4R4pcU=";
   };
 
   cargoLock = {
     lockFile = ./Cargo.lock;
     outputHashes = {
-      "udp-over-tcp-0.2.0" = "sha256-h44xrmRAlfy1Br0PAtZAzOwSMptaUatjXysA/l2Kff8=";
+      "udp-over-tcp-0.3.0" = "sha256-5PeaM7/zhux1UdlaKpnQ2yIdmFy1n2weV/ux9lSRha4=";
     };
   };
 
-  patches = [
-    # https://github.com/mullvad/mullvadvpn-app/pull/4389
-    # can be removed after next release
-    (fetchpatch {
-      name = "mullvad-version-dont-check-git.patch";
-      url = "https://github.com/mullvad/mullvadvpn-app/commit/8062cc74fc94bbe073189e78328901606c859d41.patch";
-      hash = "sha256-1BhCId0J1dxhPM3oOmhZB+07N+k1GlvAT1h6ayfx174=";
-    })
-  ];
-
   nativeBuildInputs = [
     pkg-config
     protobuf

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;

pkgs/applications/networking/sniffers/sngrep/default.nix

@@ -11,13 +11,13 @@
 
 stdenv.mkDerivation rec {
   pname = "sngrep";
-  version = "1.6.0";
+  version = "1.7.0";
 
   src = fetchFromGitHub {
     owner = "irontec";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-dXCOuae/T38Ltq4uywPJW5TGMyXwaECUj3/Zq4sDflU=";
+    sha256 = "sha256-gFba2wOU4GwpOZTo5A2QpBgnC6OgDJEeyaPGHbA+7tA=";
   };
 
   nativeBuildInputs = [

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

pkgs/applications/science/electronics/nanovna-saver/default.nix

@@ -3,39 +3,36 @@
   python3,
   fetchFromGitHub,
   fetchpatch,
-  wrapQtAppsHook,
+  qt6,
 }:
 python3.pkgs.buildPythonApplication rec {
   pname = "nanovna-saver";
-  version = "0.5.4";
+  version = "0.6.0";
 
   src = fetchFromGitHub {
     owner = "NanoVNA-Saver";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-CLfgDQt2rOXtWwvEhlXEstPp28nFhuhiAPYL6EjZVu4=";
+    sha256 = "sha256-2vDjAdEL8eNje5bm/1m+Fdi+PCGxpXwpxe2KvlLYB58=";
   };
 
-  # Fix for https://github.com/NanoVNA-Saver/nanovna-saver/issues/579
+   nativeBuildInputs = [
-  # Try dropping the patch in the next release after v0.5.4
+    qt6.wrapQtAppsHook
-  patches = [
+    qt6.qtbase
-    (fetchpatch {
-      name = "remote-changelog-from-setup-py.patch";
-      url = "https://github.com/NanoVNA-Saver/${pname}/commit/d654ea0441939e4e1c599d1333b587a185394fbe.diff";
-      sha256 = "sha256-ifOhiWD0EYyQZRKp2W3G6crmWslca+/21APmhpfP/xE=";
-    })
   ];
 
-  nativeBuildInputs = [ wrapQtAppsHook ];
-
   propagatedBuildInputs = with python3.pkgs; [
     cython
     scipy
-    pyqt5
+    pyqt6
     pyserial
     numpy
+    setuptools
+    setuptools-scm
   ];
 
+  SETUPTOOLS_SCM_PRETEND_VERSION = version;
+
   doCheck = false;
 
   dontWrapGApps = true;

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
-  ] ++ [
+  ] ++ lib.optionals stdenv.isLinux [
-    (if stdenv.isLinux then elfutils else libelf)
+    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;
   };
 }

pkgs/applications/science/math/eukleides/default.nix

@@ -1,6 +1,6 @@
 { lib, stdenv, fetchurl, bison, flex, makeWrapper, texinfo4, getopt, readline, texlive }:
 
-lib.fix (eukleides: stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: rec {
   pname = "eukleides";
   version = "1.5.4";
 
@@ -49,10 +49,12 @@ lib.fix (eukleides: stdenv.mkDerivation rec {
 
   outputs = [ "out" "doc" "tex" ];
 
-  passthru.tlType = "run";
+  passthru = {
-  passthru.pkgs = [ eukleides.tex ]
+    tlType = "run";
     # packages needed by euktoeps, euktopdf and eukleides.sty
-    ++ (with texlive; collection-pstricks.pkgs ++ epstopdf.pkgs ++ iftex.pkgs ++ moreverb.pkgs);
+    tlDeps = with texlive; [ collection-pstricks epstopdf iftex moreverb ];
+    pkgs = [ finalAttrs.finalPackage.tex ];
+  };
 
   meta = {
     description = "Geometry Drawing Language";

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}

pkgs/applications/version-management/git-machete/default.nix

@@ -12,13 +12,13 @@
 
 buildPythonApplication rec {
   pname = "git-machete";
-  version = "3.16.1";
+  version = "3.16.3";
 
   src = fetchFromGitHub {
     owner = "virtuslab";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-Js32YKzQcrQfVt7RWXFPA7guR8Tpd1jCTuwboV1zyw0=";
+    hash = "sha256-pd+ZK34dPSCwl8bOwH388NZ6QNIlU5TqL7EabsWw7kk=";
   };
 
   nativeBuildInputs = [ installShellFiles ];

pkgs/applications/version-management/gut/default.nix

@@ -0,0 +1,33 @@
+{ buildGoModule
+, fetchFromGitHub
+, lib
+, nix-update-script
+}:
+
+buildGoModule rec {
+  pname = "gut";
+  version = "0.2.7";
+
+  src = fetchFromGitHub {
+    owner = "julien040";
+    repo = "gut";
+    rev = version;
+    sha256 = "sha256-qmp6QWmyharyTzUVXlX/oJZWbeyegX/u8/vzi/pTSaA=";
+  };
+
+  vendorSha256 = "sha256-E4jr+dskBdVXj/B5RW1AKyxxr+f/+ZW42OTO9XbCLuw=";
+
+  ldflags = [ "-s" "-w" "-X github.com/julien040/gut/src/telemetry.gutVersion=${version}" ];
+
+  # Checks if `/home` exists
+  doCheck = false;
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "An easy-to-use git client for Windows, macOS, and Linux";
+    homepage = "https://github.com/slackhq/go-audit";
+    maintainers = [ lib.maintainers.paveloom ];
+    license = [ lib.licenses.mit ];
+  };
+}

pkgs/applications/version-management/srvc/default.nix

@@ -2,16 +2,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "srvc";
-  version = "0.15.0";
+  version = "0.17.0";
 
   src = fetchFromGitHub {
     owner = "insilica";
     repo = "rs-srvc";
     rev = "v${version}";
-    hash = "sha256-vShPc+Tz8n2o8E13npr7ZbDzRaAesWBOJQaCO5ljypM=";
+    hash = "sha256-6cullXcSnFlGM5O/g/J5WwBBUPfg1cbvjyPcIZ6yjRE=";
   };
 
-  cargoHash = "sha256-fHHJR1OvqCYfJkXe9mVQXJeTETDadR65kf8LMsPdAds=";
+  cargoHash = "sha256-xmHCm4kH4y0ph0ssMXZn+TvLAciYrsggyjmar85zF74=";
 
   buildInputs = lib.optionals stdenv.isDarwin [
     darwin.apple_sdk.frameworks.CoreServices

pkgs/applications/video/obs-studio/plugins/default.nix

@@ -14,6 +14,8 @@
 
   looking-glass-obs = callPackage ./looking-glass-obs.nix { };
 
+  obs-backgroundremoval = callPackage ./obs-backgroundremoval { };
+
   obs-gstreamer = callPackage ./obs-gstreamer.nix { };
 
   obs-hyperion = qt6Packages.callPackage ./obs-hyperion/default.nix { };
@@ -40,7 +42,5 @@
 
   obs-websocket = throw "obs-websocket has been removed: Functionality has been integrated into obs-studio itself.";
 
-  obs-backgroundremoval = throw "obs-backgroundremoval has been removed: It does not work anymore and is unmaintained.";
-
   wlrobs = callPackage ./wlrobs.nix { };
 }

pkgs/applications/video/obs-studio/plugins/obs-backgroundremoval/default.nix

@@ -0,0 +1,45 @@
+{ lib
+, stdenv
+, fetchFromGitHub
+, cmake
+, obs-studio
+, onnxruntime
+, opencv
+}:
+
+stdenv.mkDerivation rec {
+  pname = "obs-backgroundremoval";
+  version = "0.5.16";
+
+  src = fetchFromGitHub {
+    owner = "royshil";
+    repo = "obs-backgroundremoval";
+    rev = "v${version}";
+    hash = "sha256-E+pm/Ma6dZTYlX3DpB49ynTETsRS2TBqgHSCijl/Txc=";
+  };
+
+  nativeBuildInputs = [ cmake ];
+  buildInputs = [ obs-studio onnxruntime opencv ];
+
+  dontWrapQtApps = true;
+
+  cmakeFlags = [
+    "-DUSE_SYSTEM_ONNXRUNTIME=ON"
+    "-DUSE_SYSTEM_OPENCV=ON"
+  ];
+
+  postInstall = ''
+    mkdir $out/lib $out/share
+    mv $out/obs-plugins/64bit $out/lib/obs-plugins
+    rm -rf $out/obs-plugins
+    mv $out/data $out/share/obs
+  '';
+
+  meta = with lib; {
+    description = "OBS plugin to replace the background in portrait images and video";
+    homepage = "https://github.com/royshil/obs-backgroundremoval";
+    maintainers = with maintainers; [ zahrun ];
+    license = licenses.mit;
+    platforms = [ "x86_64-linux" "i686-linux" ];
+  };
+}

pkgs/applications/virtualization/kvmtool/default.nix

@@ -1,23 +1,33 @@
-{ stdenv, fetchgit, lib }:
+{ stdenv, fetchgit, lib, dtc }:
 
 stdenv.mkDerivation {
   pname = "kvmtool";
-  version = "unstable-2022-06-09";
+  version = "unstable-2023-04-06";
 
   src = fetchgit {
     url = "https://git.kernel.org/pub/scm/linux/kernel/git/will/kvmtool.git";
-    rev = "f44af23e3a62e46158341807b0d2d132249b96a8";
+    rev = "77b108c6a6f1c66fb7f60a80d17596bb80bda8ad";
-    sha256 = "sha256-M83dCCXU/fkh21x10vx6BLg9Wja1714qW7yxl5zY6z0=";
+    sha256 = "sha256-wPhqjVpc6I9UOdb6lmzGh797sdvJ5q4dap2ssg8OY5E=";
   };
 
+  buildInputs = lib.optionals stdenv.hostPlatform.isAarch64 [ dtc ];
+
   enableParallelBuilding = true;
-  makeFlags = [ "prefix=${placeholder "out"}" ];
+
+  makeFlags = [
+    "prefix=${placeholder "out"}"
+  ] ++ lib.optionals stdenv.hostPlatform.isAarch64 ([
+    "LIBFDT_DIR=${dtc}/lib"
+  ] ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [
+    "CROSS_COMPILE=aarch64-unknown-linux-gnu-"
+    "ARCH=arm64"
+  ]);
 
   meta = with lib; {
     description = "A lightweight tool for hosting KVM guests";
     homepage = "https://git.kernel.org/pub/scm/linux/kernel/git/will/kvmtool.git/tree/README";
     license = licenses.gpl2Only;
     maintainers = with maintainers; [ astro ];
-    platforms = [ "x86_64-linux" ];
+    platforms = [ "x86_64-linux" "aarch64-linux" ];
   };
 }

pkgs/data/icons/nordzy-icon-theme/default.nix

@@ -8,13 +8,13 @@
 
 stdenvNoCC.mkDerivation rec {
   pname = "nordzy-icon-theme";
-  version = "1.8.1";
+  version = "1.8.4";
 
   src = fetchFromGitHub {
     owner = "alvatip";
     repo = "Nordzy-icon";
     rev = version;
-    sha256 = "sha256-JfVcznGoL/HmNbjZk6RUUp/RZIXYIAoOMA3HBpqlUcE=";
+    sha256 = "sha256-3Lv1jwvFjeKxtBmY1ZwgPBjz8xjbqDH5EcwsIb9Vy7g=";
   };
 
   # In the post patch phase we should first make sure to patch shebangs.

pkgs/data/themes/material-kwin-decoration/default.nix

@@ -17,13 +17,13 @@
 
 mkDerivation rec {
   pname = "material-kwin-decoration";
-  version = "unstable-2022-01-19";
+  version = "unstable-2023-01-15";
 
   src = fetchFromGitHub {
     owner = "Zren";
     repo = "material-decoration";
-    rev = "973949761f609f9c676c5b2b7c6d9560661d34c3";
+    rev = "0e989e5b815b64ee5bca989f983da68fa5556644";
-    sha256 = "sha256-n+yUmBUrkS+06qLnzl2P6CTQZZbDtJLy+2mDPCcQz9M=";
+    sha256 = "sha256-Ncn5jxkuN4ZBWihfycdQwpJ0j4sRpBGMCl6RNiH4mXg=";
   };
 
   # Remove -Werror since it uses deprecated methods

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 { };

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
+

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;
+  };
+}

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=";
+    };
+  }
+]

pkgs/desktops/plasma-5/bluedevil.nix

@@ -1,5 +1,4 @@
 { mkDerivation
-, lib
 , extra-cmake-modules
 , shared-mime-info
 , qtbase

pkgs/desktops/plasma-5/breeze-plymouth/default.nix

@@ -2,7 +2,6 @@
 , lib
 , extra-cmake-modules
 , plymouth
-, nixos-icons
 , imagemagick
 , netpbm
 , perl

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

pkgs/desktops/plasma-5/kactivitymanagerd.nix

@@ -1,5 +1,4 @@
 { mkDerivation
-, lib
 , extra-cmake-modules
 , boost
 , kconfig

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";

pkgs/desktops/plasma-5/kgamma5.nix

@@ -1,11 +1,9 @@
 { mkDerivation
-, lib
 , extra-cmake-modules
 , kdoctools
 , kconfig
 , kconfigwidgets
 , ki18n
-, qtbase
 , qtx11extras
 , libXxf86vm
 }:

pkgs/desktops/plasma-5/khotkeys.nix

@@ -1,8 +1,6 @@
 { mkDerivation
-, lib
 , extra-cmake-modules
 , kdoctools
-, qtbase
 , kcmutils
 , kdbusaddons
 , kdelibs4support

pkgs/desktops/plasma-5/kinfocenter/default.nix

@@ -2,7 +2,6 @@
 , lib
 , extra-cmake-modules
 , kdoctools
-, qtbase
 , qttools
 , kcmutils
 , kcompletion

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

pkgs/desktops/plasma-5/ksshaskpass.nix

@@ -1,5 +1,4 @@
 { mkDerivation
-, lib
 , extra-cmake-modules
 , kdoctools
 , kcoreaddons

pkgs/desktops/plasma-5/kwayland-integration.nix

@@ -1,5 +1,4 @@
 { mkDerivation
-, lib
 , extra-cmake-modules
 , kguiaddons
 , kidletime

pkgs/desktops/plasma-5/kwrited.nix

@@ -1,5 +1,4 @@
 { mkDerivation
-, lib
 , extra-cmake-modules
 , kcoreaddons
 , kdbusaddons

pkgs/desktops/plasma-5/layer-shell-qt.nix

@@ -1,5 +1,4 @@
 { mkDerivation
-, lib
 , extra-cmake-modules
 , kguiaddons
 , kidletime

pkgs/desktops/plasma-5/libkscreen/default.nix

@@ -1,8 +1,6 @@
 { mkDerivation
-, lib
 , propagate
 , extra-cmake-modules
-, qtbase
 , wayland-scanner
 , kconfig
 , kwayland

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

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
 }:

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";
 

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
 }:

pkgs/desktops/plasma-5/plasma-pa.nix

@@ -1,5 +1,4 @@
 { mkDerivation
-, lib
 , extra-cmake-modules
 , kdoctools
 , kcmutils

pkgs/desktops/plasma-5/plasma-sdk.nix

@@ -1,5 +1,4 @@
 { mkDerivation
-, lib
 , extra-cmake-modules
 , karchive
 , kcompletion

pkgs/desktops/plasma-5/plasma-systemmonitor.nix

@@ -1,5 +1,4 @@
 { mkDerivation
-, lib
 , extra-cmake-modules
 , kdoctools
 , qtquickcontrols2

pkgs/desktops/plasma-5/plasma-workspace/default.nix

@@ -2,9 +2,6 @@
 , lib
 , extra-cmake-modules
 , kdoctools
-, coreutils
-, gnugrep
-, gnused
 , isocodes
 , libdbusmenu
 , libSM

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 {

pkgs/desktops/plasma-5/qqc2-breeze-style.nix

@@ -1,5 +1,4 @@
 { mkDerivation
-, lib
 , extra-cmake-modules
 , kconfig
 , kconfigwidgets

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

pkgs/desktops/plasma-5/xdg-desktop-portal-kde.nix

@@ -1,5 +1,4 @@
 { mkDerivation
-, lib
 , extra-cmake-modules
 , gettext
 , kdoctools

pkgs/development/compilers/chicken/5/default.nix

@@ -3,7 +3,7 @@ let
   callPackage = newScope self;
 
   self = with lib; {
-    pkgs = self;
+    inherit callPackage;
 
     fetchegg = { pname, version, sha256, ... }:
       fetchurl {

pkgs/development/compilers/chicken/5/eggDerivation.nix

@@ -1,4 +1,4 @@
-{ lib, stdenv, chicken, makeWrapper }:
+{ callPackage, lib, stdenv, chicken, makeWrapper }:
 { name, src
 , buildInputs ? []
 , chickenInstallFlags ? []
@@ -6,15 +6,15 @@
 , ...} @ args:
 
 let
-  overrides = import ./overrides.nix;
+  overrides = callPackage ./overrides.nix { };
   baseName = lib.getName name;
   override = if builtins.hasAttr baseName overrides
    then
      builtins.getAttr baseName overrides
    else
-     {};
+     lib.id;
 in
-stdenv.mkDerivation ({
+(stdenv.mkDerivation ({
   name = "chicken-${name}";
   propagatedBuildInputs = buildInputs;
   nativeBuildInputs = [ makeWrapper ];
@@ -43,4 +43,4 @@ stdenv.mkDerivation ({
   meta = {
     inherit (chicken.meta) platforms;
   } // args.meta or {};
-} // (builtins.removeAttrs args ["name" "buildInputs" "meta"]) // override)
+} // builtins.removeAttrs args ["name" "buildInputs" "meta"]) ).overrideAttrs override

pkgs/development/compilers/chicken/5/overrides.nix

@@ -1,2 +1,58 @@
-{
+{ pkgs, lib, chickenEggs }:
+let
+  addToBuildInputs = pkg: old: {
+    buildInputs = (old.buildInputs or [ ]) ++ lib.toList pkg;
+  };
+  addToPropagatedBuildInputs = pkg: old: {
+    propagatedBuildInputs = (old.propagatedBuildInputs or [ ])
+      ++ lib.toList pkg;
+  };
+  addPkgConfig = old: {
+    nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ pkgs.pkg-config ];
+  };
+  addToBuildInputsWithPkgConfig = pkg: old:
+    (addPkgConfig old) // (addToBuildInputs pkg old);
+  addToPropagatedBuildInputsWithPkgConfig = pkg: old:
+    (addPkgConfig old) // (addToPropagatedBuildInputs pkg old);
+in {
+  breadline = addToBuildInputs pkgs.readline;
+  cairo = old:
+    (addToBuildInputsWithPkgConfig pkgs.cairo old)
+    // (addToPropagatedBuildInputs (with chickenEggs; [ srfi-1 srfi-13 ]) old);
+  cmark = addToBuildInputs pkgs.cmark;
+  dbus = addToBuildInputsWithPkgConfig pkgs.dbus;
+  epoxy = addToPropagatedBuildInputsWithPkgConfig pkgs.libepoxy;
+  exif = addToBuildInputs pkgs.libexif;
+  expat = addToBuildInputs pkgs.expat;
+  ezxdisp = addToBuildInputsWithPkgConfig pkgs.xorg.libX11;
+  freetype = addToBuildInputs pkgs.freetype;
+  glfw3 = addToBuildInputsWithPkgConfig pkgs.glfw3;
+  icu = addToBuildInputsWithPkgConfig pkgs.icu;
+  imlib2 = addToBuildInputsWithPkgConfig pkgs.imlib2;
+  lazy-ffi = addToBuildInputs pkgs.libffi;
+  leveldb = addToBuildInputs pkgs.leveldb;
+  magic = addToBuildInputs pkgs.file;
+  mdh = addToBuildInputs pkgs.pcre;
+  nanomsg = addToBuildInputs pkgs.nanomsg;
+  openssl = addToBuildInputs pkgs.openssl;
+  rocksdb = addToBuildInputs pkgs.rocksdb;
+  sdl-base = addToBuildInputs pkgs.SDL;
+  sdl2 = addToPropagatedBuildInputsWithPkgConfig pkgs.SDL2;
+  sdl2-image = addToBuildInputs pkgs.SDL2_image;
+  sdl2-ttf = addToBuildInputs pkgs.SDL2_ttf;
+  sqlite3 = addToBuildInputs pkgs.sqlite;
+  stemmer = addToBuildInputs pkgs.libstemmer;
+  stfl = addToBuildInputs [ pkgs.ncurses pkgs.stfl ];
+  taglib = addToBuildInputs [ pkgs.zlib pkgs.taglib ];
+  uuid-lib = addToBuildInputs pkgs.libuuid;
+  ws-client = addToBuildInputs pkgs.zlib;
+  xlib = addToPropagatedBuildInputs pkgs.xorg.libX11;
+  yaml = addToBuildInputs pkgs.libyaml;
+  zlib = addToBuildInputs pkgs.zlib;
+  zmq = addToBuildInputs pkgs.zeromq;
+  zstd = addToBuildInputs pkgs.zstd;
+
+  # platform changes
+  pledge = old: { meta = old.meta // { platforms = lib.platforms.openbsd; }; };
+  unveil = old: { meta = old.meta // { platforms = lib.platforms.openbsd; }; };
 }

pkgs/development/compilers/crystal/default.nix

@@ -269,8 +269,8 @@ rec {
   };
 
   crystal_1_7 = generic {
-    version = "1.7.2";
+    version = "1.7.3";
-    sha256 = "sha256-Bwd9Gmtwa/0oLhps3fc8GqBlB4o31LCR1Sf98Pz4i90=";
+    sha256 = "sha256-ULhLGHRIZbsKhaMvNhc+W74BwNgfEjHcMnVNApWY+EE=";
     binary = binaryCrystal_1_2;
   };
 

pkgs/development/compilers/kotlin/default.nix

@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "kotlin";
-  version = "1.8.10";
+  version = "1.8.20";
 
   src = fetchurl {
     url = "https://github.com/JetBrains/kotlin/releases/download/v${version}/kotlin-compiler-${version}.zip";
-    hash = "sha256-TD+nvBu57zBYojGdi8w7cZYHn4jpL9zY0wSkb0trV4c=";
+    sha256 = "1r0ann14rjr3f1idwhkfk5s1gr6b6wnkawjmg96gvsp2qv1p9pqh";
   };
 
   propagatedBuildInputs = [ jre ] ;

pkgs/development/compilers/kotlin/native.nix

@@ -7,7 +7,7 @@
 
 stdenv.mkDerivation rec {
   pname = "kotlin-native";
-  version = "1.8.10";
+  version = "1.8.20";
 
   src = let
     getArch = {
@@ -20,9 +20,9 @@ stdenv.mkDerivation rec {
       "https://github.com/JetBrains/kotlin/releases/download/v${version}/kotlin-native-${arch}-${version}.tar.gz";
 
     getHash = arch: {
-      "macos-aarch64" = "119ar6wax0bkp5fmardplhsvaw1jhpfr5xgkpkkv10nmx4agbkh8";
+      "macos-aarch64" = "1lin4yd4wy56m4spkkd0glicphkwfr0gzvs66prm925fcx1hzk5y";
-      "macos-x86_64" = "1nqqzx397k1ifpdymaw39iz5mzpyi7n00kpw03y5iq5avzr7rsjj";
+      "macos-x86_64" = "0ma0d0kvpbqw8cx8ixmnhk96y5xz6ljy6phbzsl8cbmfp0g817p3";
-      "linux-x86_64" = "0hlpda33y07d8dybjn65gzdl0ws0r8vda515pr2rhfisls18lp2c";
+      "linux-x86_64" = "0f24ag9azzjgar3qg1fjh9q5haigj4k0yjpqxfrvjqj8khag5ls3";
     }.${arch};
   in
     fetchurl {
@@ -39,7 +39,6 @@ stdenv.mkDerivation rec {
     runHook preInstall
 
     mkdir -p $out
-    rm bin/kotlinc
     mv * $out
 
     runHook postInstall

pkgs/development/interpreters/mujs/default.nix

@@ -1,12 +1,18 @@
-{ lib, stdenv, fetchurl, fetchpatch, readline }:
+{ lib
+, stdenv
+, fetchurl
+, fetchpatch
+, readline
+, gitUpdater
+}:
 
 stdenv.mkDerivation rec {
   pname = "mujs";
-  version = "1.3.2";
+  version = "1.3.3";
 
   src = fetchurl {
-    url = "https://mujs.com/downloads/mujs-${version}.tar.xz";
+    url = "https://mujs.com/downloads/mujs-${version}.tar.gz";
-    sha256 = "sha256-SIZZP8aIsM3M0x5ey+Wv560b7iOqaeZnuHGv1d/GQMM=";
+    hash = "sha256-4sXuVBbf2iIwx6DLeJXfmpstWyBluxjn5k3sKnlqvhs=";
   };
 
   patches = lib.optionals stdenv.isDarwin [
@@ -23,6 +29,11 @@ stdenv.mkDerivation rec {
 
   makeFlags = [ "prefix=$(out)" ];
 
+  passthru.updateScript = gitUpdater {
+    # No nicer place to track releases
+    url = "git://git.ghostscript.com/mujs.git";
+  };
+
   meta = with lib; {
     homepage = "https://mujs.com/";
     description = "A lightweight, embeddable Javascript interpreter";

pkgs/development/libraries/flatpak/default.nix

@@ -54,14 +54,14 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "flatpak";
-  version = "1.14.2";
+  version = "1.14.4";
 
   # TODO: split out lib once we figure out what to do with triggerdir
   outputs = [ "out" "dev" "man" "doc" "devdoc" "installedTests" ];
 
   src = fetchurl {
     url = "https://github.com/flatpak/flatpak/releases/download/${finalAttrs.version}/flatpak-${finalAttrs.version}.tar.xz";
-    sha256 = "sha256-yAcR6s9CqZB49jlqplVV3Wv3PuxjF3a3np17cmK293Q="; # Taken from https://github.com/flatpak/flatpak/releases/
+    sha256 = "sha256-ijTb0LZ8Q051mLmOxpCVPQRvDbJuSArq+0bXKuxxZ5k="; # Taken from https://github.com/flatpak/flatpak/releases/
   };
 
   patches = [

pkgs/development/libraries/flatpak/unset-env-vars.patch

@@ -1,11 +1,11 @@
 diff --git a/common/flatpak-run.c b/common/flatpak-run.c
-index d35b4652..b4bb4a44 100644
+index 8fa8c0e0..e1cdeba0 100644
 --- a/common/flatpak-run.c
 +++ b/common/flatpak-run.c
-@@ -1899,6 +1899,7 @@ static const ExportData default_exports[] = {
+@@ -1900,6 +1900,7 @@ static const ExportData default_exports[] = {
-   {"KRB5CCNAME", NULL},
    {"XKB_CONFIG_ROOT", NULL},
    {"GIO_EXTRA_MODULES", NULL},
+   {"GDK_BACKEND", NULL},
 +  {"GDK_PIXBUF_MODULE_FILE", NULL},
  };
  

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;

pkgs/development/libraries/highfive/default.nix

@@ -12,13 +12,13 @@ assert mpiSupport -> mpi != null;
 
 stdenv.mkDerivation rec {
   pname = "highfive${lib.optionalString mpiSupport "-mpi"}";
-  version = "2.6.2";
+  version = "2.7.1";
 
   src = fetchFromGitHub {
     owner = "BlueBrain";
     repo = "HighFive";
     rev = "v${version}";
-    sha256 = "sha256-rUuhhoVH4Jdve7eY0M5THWtoHoIluiujfQwfTYULEiQ=";
+    sha256 = "sha256-apKmIB34uqkqSCtTUzrUOhcRC5a2UG6KCdhp1jnXUgQ=";
   };
 
   nativeBuildInputs = [ cmake ];

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 ];

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;
   };
 

pkgs/development/libraries/mongoc/default.nix

@@ -17,11 +17,11 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "mongoc";
-  version = "1.23.2";
+  version = "1.23.3";
 
   src = fetchzip {
     url = "https://github.com/mongodb/mongo-c-driver/releases/download/${version}/mongo-c-driver-${version}.tar.gz";
-    sha256 = "08v7xc5m86apd338swd8g83ccvd6ni75xbdhqqwkrjbznljf8fjf";
+    sha256 = "sha256-wxcBnJENL3hMzf7GKLucjw7K08tK35+0sMNWZb2mWIo=";
   };
 
   # https://github.com/NixOS/nixpkgs/issues/25585

pkgs/development/libraries/qt-6/default.nix

@@ -2,26 +2,11 @@
 , lib
 , stdenv
 , fetchurl
-, fetchgit
 , fetchpatch
-, fetchFromGitHub
 , makeSetupHook
 , makeWrapper
-, bison
-, cups
-, harfbuzz
-, libGL
-, perl
 , cmake
-, ninja
+, gst_all_1
-, writeText
-, gstreamer
-, gst-plugins-base
-, gst-plugins-good
-, gst-libav
-, gst-vaapi
-, gtk3
-, dconf
 , libglvnd
 , darwin
 , buildPackages
@@ -37,23 +22,28 @@ let
     mirror = "mirror://qt";
   };
 
-  qtModule =
-    import ./qtModule.nix
-      { inherit stdenv lib perl cmake ninja writeText; }
-      { inherit self srcs; };
-
   addPackages = self: with self;
     let
-      callPackage = self.newScope ({ inherit qtModule stdenv srcs; });
+      callPackage = self.newScope ({
+        inherit qtModule srcs;
+        stdenv = if stdenv.isDarwin then darwin.apple_sdk_11_0.stdenv else stdenv;
+        cmake = cmake.overrideAttrs (attrs: {
+          patches = attrs.patches ++ [
+            ./patches/cmake.patch
+          ];
+        });
+      });
     in
     {
 
-      inherit callPackage qtModule srcs;
+      inherit callPackage srcs;
+
+      qtModule = callPackage ./qtModule.nix { };
 
       qtbase = callPackage ./modules/qtbase.nix {
         withGtk3 = true;
         inherit (srcs.qtbase) src version;
-        inherit bison cups harfbuzz libGL dconf gtk3 developerBuild cmake;
+        inherit developerBuild;
         inherit (darwin.apple_sdk_11_0.frameworks) AGL AVFoundation AppKit GSS MetalKit;
         patches = [
           ./patches/qtbase-qmake-mkspecs-mac.patch
@@ -68,7 +58,7 @@ let
           })
         ];
       };
-      env = callPackage ./qt-env.nix {};
+      env = callPackage ./qt-env.nix { };
       full = env "qt-full-${qtbase.version}" ([
         qt3d
         qt5compat
@@ -111,7 +101,7 @@ let
       qtlanguageserver = callPackage ./modules/qtlanguageserver.nix { };
       qtlottie = callPackage ./modules/qtlottie.nix { };
       qtmultimedia = callPackage ./modules/qtmultimedia.nix {
-        inherit gstreamer gst-plugins-base gst-plugins-good gst-libav gst-vaapi;
+        inherit (gst_all_1) gstreamer gst-plugins-base gst-plugins-good gst-libav gst-vaapi;
         inherit (darwin.apple_sdk_11_0.frameworks) VideoToolbox;
       };
       qtnetworkauth = callPackage ./modules/qtnetworkauth.nix { };
@@ -140,19 +130,21 @@ let
         inherit (darwin.apple_sdk_11_0.frameworks) WebKit;
       };
 
-      wrapQtAppsHook = makeSetupHook {
+      wrapQtAppsHook = makeSetupHook
-        name = "wrap-qt6-apps-hook";
+        {
-        propagatedBuildInputs = [ buildPackages.makeWrapper ];
+          name = "wrap-qt6-apps-hook";
+          propagatedBuildInputs = [ buildPackages.makeWrapper ];
         } ./hooks/wrap-qt-apps-hook.sh;
 
-      qmake = makeSetupHook {
+      qmake = makeSetupHook
-        name = "qmake6-hook";
+        {
-        propagatedBuildInputs = [ self.qtbase.dev ];
+          name = "qmake6-hook";
-        substitutions = {
+          propagatedBuildInputs = [ self.qtbase.dev ];
-          inherit debug;
+          substitutions = {
-          fix_qmake_libtool = ./hooks/fix-qmake-libtool.sh;
+            inherit debug;
-        };
+            fix_qmake_libtool = ./hooks/fix-qmake-libtool.sh;
-      } ./hooks/qmake-hook.sh;
+          };
+        } ./hooks/qmake-hook.sh;
     };
 
   # TODO(@Artturin): convert to makeScopeWithSplicing

pkgs/development/libraries/qt-6/qtModule.nix

@@ -1,6 +1,4 @@
-{ stdenv, lib, perl, cmake, ninja, writeText }:
+{ stdenv, lib, perl, cmake, ninja, writeText, qtbase, qmake, srcs, patches ? [ ] }:
-
-{ self, srcs, patches ? [ ] }:
 
 args:
 
@@ -18,7 +16,7 @@ stdenv.mkDerivation (args // {
     perl
     cmake
     ninja
-    self.qmake
+    qmake
   ];
   propagatedBuildInputs = args.qtInputs ++ (args.propagatedBuildInputs or [ ]);
 
@@ -61,7 +59,7 @@ stdenv.mkDerivation (args // {
       if [[ -z "$dontSyncQt" && -f sync.profile ]]; then
         # FIXME: this probably breaks crosscompiling as it's not from nativeBuildInputs
         # I don't know how to get /libexec from nativeBuildInputs to work, it's not under /bin
-        ${lib.getDev self.qtbase}/libexec/syncqt.pl -version "''${version%%-*}"
+        ${lib.getDev qtbase}/libexec/syncqt.pl -version "''${version%%-*}"
       fi
     '';