Merge master into staging-next

nixos/modules/services/misc/gitlab.nix

@@ -156,7 +156,7 @@ let
       };
       extra = {};
       uploads.storage_path = cfg.statePath;
-      pages = {
+      pages = optionalAttrs cfg.pages.enable {
         enabled = cfg.pages.enable;
         port = 8090;
         host = cfg.pages.settings.pages-domain;

pkgs/applications/audio/minidsp/default.nix

@@ -0,0 +1,40 @@
+{
+  lib,
+  fetchFromGitHub,
+  rustPlatform,
+  stdenv,
+  libusb1,
+  AppKit,
+  IOKit,
+  pkg-config,
+}:
+rustPlatform.buildRustPackage rec {
+  pname = "minidsp";
+  version = "0.1.9";
+
+  src = fetchFromGitHub {
+    owner = "mrene";
+    repo = "minidsp-rs";
+    # v0.1.9 tag is out of date, cargo lock fixed in next commit on main
+    rev = "b03a95a05917f20b9c3153c03e4e99dd943d9f6f";
+    hash = "sha256-uZBrX3VCCpr7AY82PgR596mncL5wWDK7bpx2m/jCJBE=";
+  };
+
+  cargoHash = "sha256-0PyojyimxnwEtHA98Npf4eHvycjuXdPrrIFilVuEnQk=";
+
+  cargoBuildFlags = ["-p minidsp -p minidsp-daemon"];
+
+  buildInputs =
+    lib.optionals stdenv.isLinux [libusb1]
+    ++ lib.optionals stdenv.isDarwin [AppKit IOKit];
+
+  nativeBuildInputs = lib.optionals stdenv.isLinux [pkg-config];
+
+  meta = with lib; {
+    description = "A control interface for some MiniDSP products";
+    homepage = "https://github.com/mrene/minidsp-rs";
+    license = licenses.asl20;
+    platforms = platforms.linux ++ platforms.darwin;
+    maintainers = [maintainers.adamcstephens];
+  };
+}

pkgs/applications/audio/zrythm/default.nix

@@ -27,6 +27,7 @@
 , help2man
 , jq
 , json-glib
+, kissfft
 , libadwaita
 , libaudec
 , libbacktrace
@@ -86,13 +87,13 @@ let
   });
 in stdenv.mkDerivation rec {
   pname = "zrythm";
-  version = "1.0.0-beta.4.5.62";
+  version = "1.0.0-beta.4.6.3";
 
   src = fetchFromSourcehut {
     owner = "~alextee";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-K93Y4Adh9TqoetSn7nrbbruIri1MKYoSGzoRBGHwbPA=";
+    hash = "sha256-5GBr8N+GzbptrvP/NisBXT0dsl9vn537B4InB00/N+A=";
   };
 
   nativeBuildInputs = [
@@ -135,6 +136,7 @@ in stdenv.mkDerivation rec {
     gtksourceview5
     guile
     json-glib
+    kissfft
     libadwaita
     libbacktrace
     libcyaml
@@ -213,7 +215,7 @@ in stdenv.mkDerivation rec {
   meta = with lib; {
     homepage = "https://www.zrythm.org";
     description = "Automated and intuitive digital audio workstation";
-    maintainers = with maintainers; [ tshaynik magnetophon ];
+    maintainers = with maintainers; [ tshaynik magnetophon yuu ];
     platforms = platforms.linux;
     license = licenses.agpl3Plus;
   };

pkgs/applications/editors/vim/plugins/overrides.nix

@@ -796,18 +796,18 @@ self: super: {
 
   sniprun =
     let
-      version = "1.2.8";
+      version = "1.2.13";
       src = fetchFromGitHub {
         owner = "michaelb";
         repo = "sniprun";
         rev = "v${version}";
-        sha256 = "sha256-iPZ0DPAErkMJIn85t1FIiGhLcMZlL06iNKLqmRu7gXI=";
+        hash = "sha256-VDLBktZChRgorJt/V/wuFQn/SL4yOZIElmntEQEi8Tc=";
       };
       sniprun-bin = rustPlatform.buildRustPackage {
         pname = "sniprun-bin";
         inherit version src;
 
-        cargoSha256 = "sha256-HZEh6jtuRqsyjyDbDIV38x2N1unbSu24D8vrPZ17ktE=";
+        cargoSha256 = "sha256-cJwmuwsC81fSH36TRU7xGzlR4pVdjsw73uRaH1uWY+0=";
 
         nativeBuildInputs = [ makeWrapper ];
 

pkgs/applications/editors/vscode/extensions/WakaTime.vscode-wakatime/default.nix

@@ -12,11 +12,11 @@ in
       sha256 = "sha256-vWqGxMbxKqd4UgKK0sOKadMTDf6Y3TQxfWsc93MHjFs=";
     };
 
-    meta = with lib; {
+    meta = {
       description = ''
         Visual Studio Code plugin for automatic time tracking and metrics generated
         from your programming activity
       '';
-      license = licenses.bsd3;
+      license = lib.licenses.bsd3;
     };
   }

pkgs/applications/editors/vscode/extensions/chenglou92.rescript-vscode/default.nix

@@ -20,10 +20,10 @@ vscode-utils.buildVscodeMarketplaceExtension rec {
     ln -s ${rescript-editor-analysis}/bin ${analysisDir}
   '';
 
-  meta = with lib; {
+  meta = {
     description = "The official VSCode plugin for ReScript";
     homepage = "https://github.com/rescript-lang/rescript-vscode";
-    maintainers = with maintainers; [ dlip jayesh-bhoot ];
-    license = licenses.mit;
+    maintainers = [ lib.maintainers.dlip lib.maintainers.jayesh-bhoot ];
+    license = lib.licenses.mit;
   };
 }

pkgs/applications/editors/vscode/extensions/chenglou92.rescript-vscode/rescript-editor-analysis.nix

@@ -25,10 +25,10 @@ stdenv.mkDerivation {
     install -D -m0555 rescript-editor-analysis.exe $out/bin/rescript-editor-analysis.exe
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Analysis binary for the ReScript VSCode plugin";
     homepage = "https://github.com/rescript-lang/rescript-vscode";
-    maintainers = with maintainers; [ dlip jayesh-bhoot ];
-    license = licenses.mit;
+    maintainers = [ lib.maintainers.dlip lib.maintainers.jayesh-bhoot ];
+    license = lib.licenses.mit;
   };
 }

pkgs/applications/editors/vscode/extensions/hashicorp.terraform/default.nix

@@ -13,8 +13,8 @@ vscode-utils.buildVscodeMarketplaceExtension rec {
     substituteInPlace out/serverPath.js --replace TERRAFORM-LS-PATH ${terraform-ls}/bin/terraform-ls
   '';
 
-  meta = with lib; {
-    license = licenses.mit;
-    maintainers = with maintainers; [ rhoriguchi ];
+  meta = {
+    license = lib.licenses.mit;
+    maintainers = [ lib.maintainers.rhoriguchi ];
   };
 }

pkgs/applications/editors/vscode/extensions/jebbs.plantuml/default.nix

@@ -13,15 +13,15 @@ vscode-utils.buildVscodeMarketplaceExtension {
     jq '.contributes.configuration.properties."plantuml.java".default = "${plantuml}/bin/plantuml"' package.json | sponge package.json
   '';
 
-  meta = with lib; {
+  meta = {
     description = "A Visual Studio Code extension for supporting Rich PlantUML";
     downloadPage =
       "https://marketplace.visualstudio.com/items?itemName=jebbs.plantuml";
     homepage = "https://github.com/qjebbs/vscode-plantuml";
     changelog =
       "https://marketplace.visualstudio.com/items/jebbs.plantuml/changelog";
-    license = licenses.mit;
-    maintainers = with maintainers; [ victormignot ];
+    license = lib.licenses.mit;
+    maintainers = [ lib.maintainers.victormignot ];
   };
 }
 

pkgs/applications/editors/vscode/extensions/ms-dotnettools.csharp/default.nix

@@ -121,11 +121,11 @@ vscode-utils.buildVscodeMarketplaceExtension rec {
     '')
     vsixInfo.binaries));
 
-  meta = with lib; {
+  meta = {
     description = "C# for Visual Studio Code (powered by OmniSharp)";
     homepage = "https://github.com/OmniSharp/omnisharp-vscode";
-    license = licenses.mit;
-    maintainers = [ maintainers.jraygauthier ];
+    license = lib.licenses.mit;
+    maintainers = [ lib.maintainers.jraygauthier ];
     platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin" ];
   };
 }

pkgs/applications/editors/vscode/extensions/ms-python.python/default.nix

@@ -76,13 +76,13 @@ vscode-utils.buildVscodeMarketplaceExtension rec {
     fi
   '';
 
-  meta = with lib; {
+  meta = {
     description = "A Visual Studio Code extension with rich support for the Python language";
     downloadPage = "https://marketplace.visualstudio.com/items?itemName=ms-python.python";
     homepage = "https://github.com/Microsoft/vscode-python";
     changelog = "https://github.com/microsoft/vscode-python/releases";
-    license = licenses.mit;
+    license = lib.licenses.mit;
     platforms = [ "x86_64-linux" "aarch64-darwin" "x86_64-darwin" ];
-    maintainers = with maintainers; [ jraygauthier jfchevrette ];
+    maintainers = [ lib.maintainers.jraygauthier lib.maintainers.jfchevrette ];
   };
 }

pkgs/applications/editors/vscode/extensions/ms-toolsai.jupyter/default.nix

@@ -30,10 +30,10 @@ vscode-utils.buildVscodeMarketplaceExtension {
     jq "$(print_jq_query)" ./package.json | sponge ./package.json
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Jupyter extension for vscode";
     homepage = "https://github.com/microsoft/vscode-jupyter";
-    license = licenses.mit;
-    maintainers = with maintainers; [ jraygauthier ];
+    license = lib.licenses.mit;
+    maintainers = [ lib.maintainers.jraygauthier ];
   };
 }

pkgs/applications/editors/vscode/extensions/ms-vscode-remote.remote-ssh/default.nix

@@ -87,9 +87,9 @@ buildVscodeMarketplaceExtension {
       --replace '# Start the server\n' '${patch}'
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Use any remote machine with a SSH server as your development environment.";
-    license = licenses.unfree;
-    maintainers = with maintainers; [ SuperSandro2000 tbenst ];
+    license = lib.licenses.unfree;
+    maintainers = [ lib.maintainers.SuperSandro2000 lib.maintainers.tbenst ];
   };
 }

pkgs/applications/editors/vscode/extensions/ms-vscode.cpptools/default.nix

@@ -80,11 +80,11 @@ vscode-utils.buildVscodeMarketplaceExtension rec {
     wrapProgram $out/share/vscode/extensions/ms-vscode.cpptools/debugAdapters/bin/OpenDebugAD7 --prefix PATH : ${lib.makeBinPath [ gdb ]}
   '';
 
-  meta = with lib; {
+  meta = {
     description = "The C/C++ extension adds language support for C/C++ to Visual Studio Code, including features such as IntelliSense and debugging.";
     homepage = "https://marketplace.visualstudio.com/items?itemName=ms-vscode.cpptools";
-    license = licenses.unfree;
-    maintainers = with maintainers; [ jraygauthier stargate01 ];
+    license = lib.licenses.unfree;
+    maintainers = [ lib.maintainers.jraygauthier lib.maintainers.stargate01 ];
     platforms = [ "x86_64-linux" ];
   };
 }

pkgs/applications/editors/vscode/extensions/ms-vsliveshare.vsliveshare/default.nix

@@ -44,11 +44,11 @@ in ((vscode-utils.override { stdenv = gccStdenv; }).buildVscodeMarketplaceExtens
       --replace "'xsel'" "'${xsel}/bin/xsel'"
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Live Share lets you achieve greater confidence at speed by streamlining collaborative editing, debugging, and more in real-time during development";
     homepage = "https://aka.ms/vsls-docs";
-    license = licenses.unfree;
-    maintainers = with maintainers; [ jraygauthier V ];
+    license = lib.licenses.unfree;
+    maintainers = [ lib.maintainers.jraygauthier lib.maintainers.V ];
     platforms = [ "x86_64-linux" ];
   };
 })

pkgs/applications/editors/vscode/extensions/rust-lang.rust-analyzer/default.nix

@@ -80,11 +80,11 @@ vscode-utils.buildVscodeExtension {
       package.json | sponge package.json
   '';
 
-  meta = with lib; {
+  meta = {
     description = "An alternative rust language server to the RLS";
     homepage = "https://github.com/rust-lang/rust-analyzer";
-    license = with licenses; [ mit asl20 ];
-    maintainers = with maintainers; [ ];
-    platforms = platforms.all;
+    license = [ lib.licenses.mit lib.licenses.asl20 ];
+    maintainers = [ ];
+    platforms = lib.platforms.all;
   };
 }

pkgs/applications/editors/vscode/extensions/sumneko.lua/default.nix

@@ -18,10 +18,10 @@ vscode-utils.buildVscodeMarketplaceExtension {
       $out/$installPrefix/server/bin/lua-language-server
   '';
 
-  meta = with lib; {
+  meta = {
     description = "The Lua language server provides various language features for Lua to make development easier and faster.";
     homepage = "https://marketplace.visualstudio.com/items?itemName=sumneko.lua";
-    license = licenses.mit;
-    maintainers = with maintainers; [ lblasc ];
+    license = lib.licenses.mit;
+    maintainers = [ lib.maintainers.lblasc ];
   };
 }

pkgs/applications/editors/vscode/extensions/vadimcn.vscode-lldb/default.nix

@@ -103,11 +103,11 @@ in stdenv.mkDerivation {
     updateScript = ./update.sh;
   };
 
-  meta = with lib; {
+  meta = {
     description = "A native debugger extension for VSCode based on LLDB";
     homepage = "https://github.com/vadimcn/vscode-lldb";
-    license = with licenses; [ mit ];
-    maintainers = with maintainers; [ nigelgbanks ];
-    platforms = platforms.all;
+    license = [ lib.licenses.mit ];
+    maintainers = [ lib.maintainers.nigelgbanks ];
+    platforms = lib.platforms.all;
   };
 }

pkgs/applications/editors/vscode/extensions/vscode-utils.nix

@@ -87,8 +87,8 @@ let
     builtins.map extensionFromVscodeMarketplace mktplcExtRefList;
 
   vscodeWithConfiguration = import ./vscodeWithConfiguration.nix {
-   inherit lib extensionsFromVscodeMarketplace writeShellScriptBin;
-   vscodeDefault = vscode;
+    inherit lib extensionsFromVscodeMarketplace writeShellScriptBin;
+    vscodeDefault = vscode;
   };
 
   vscodeExts2nix = import ./vscodeExts2nix.nix {

pkgs/applications/graphics/wings/default.nix

@@ -1,4 +1,4 @@
-{ fetchurl, lib, stdenv, erlang, cl, libGL, libGLU, runtimeShell }:
+{ lib, stdenv, fetchurl, fetchpatch, erlang, cl, libGL, libGLU, runtimeShell }:
 
 stdenv.mkDerivation rec {
   pname = "wings";
@@ -9,10 +9,15 @@ stdenv.mkDerivation rec {
     sha256 = "1xcmifs4vq2810pqqvsjsm8z3lz24ys4c05xkh82nyppip2s89a3";
   };
 
-  ERL_LIBS = "${cl}/lib/erlang/lib";
+  patches = [
+    (fetchpatch {
+      url = "https://github.com/dgud/wings/commit/94b3a3c6a0cfdcdbd98edce055d5c83ecb361f37.patch";
+      hash = "sha256-DHT1TiYoowloIWrdutBu70mL+557cTFr1dRcNgwbkpE=";
+    })
+  ];
 
-  patchPhase = ''
-    sed -i 's,-Werror ,,' e3d/Makefile
+  postPatch = ''
+    find . -type f -name "Makefile" -exec sed -i 's,-Werror ,,' {} \;
     sed -i 's,../../wings/,../,' icons/Makefile
     find plugins_src -mindepth 2 -type f -name "*.[eh]rl" -exec sed -i 's,wings/src/,../../src/,' {} \;
     find plugins_src -mindepth 2 -type f -name "*.[eh]rl" -exec sed -i 's,wings/e3d/,../../e3d/,' {} \;
@@ -24,6 +29,8 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ erlang cl libGL libGLU ];
 
+  ERL_LIBS = "${cl}/lib/erlang/lib";
+
   # I did not test the *cl* part. I added the -pa just by imitation.
   installPhase = ''
     mkdir -p $out/bin $out/lib/wings-${version}/ebin

pkgs/applications/misc/metamorphose2/default.nix

@@ -29,7 +29,7 @@ stdenv.mkDerivation {
   '';
 
   nativeBuildInputs = [ makeWrapper ];
-  propagatedBuildInputs = with python3.pkgs; [ mutagen wxPython_4_1 pillow six ];
+  propagatedBuildInputs = with python3.pkgs; [ mutagen wxPython_4_2 pillow six ];
 
   makeFlags = [ "PREFIX=$(out)" ];
 

pkgs/applications/misc/oxker/default.nix

@@ -2,14 +2,14 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "oxker";
-  version = "0.2.4";
+  version = "0.2.5";
 
   src = fetchCrate {
     inherit pname version;
-    sha256 = "sha256-wYGaBXorAcwFnlUixrOP63s32WV1V7/8SUOBXIeLB7o=";
+    sha256 = "sha256-w0YLSwRv6uhDwi06q0/mhGc5C6O2xq3vc9Se7/xXkhA=";
   };
 
-  cargoHash = "sha256-rdzr6oOrJNTX3dCSO3ZdKNFZ31/CHdupKL7QmmuuX7I=";
+  cargoHash = "sha256-Q0+6YgcdWa4RjNA7ffQJN0uIN8UFuCdbYjTFoM8w8uo=";
 
   meta = with lib; {
     description = "A simple tui to view & control docker containers";

pkgs/applications/misc/playonlinux/default.nix

@@ -61,7 +61,7 @@ let
   libs = pkgs: lib.makeLibraryPath [ xorg.libX11 libGL ];
 
   python = python3.withPackages(ps: with ps; [
-    wxPython_4_1
+    wxPython_4_2
     setuptools
     natsort
   ]);

pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix

@@ -54,7 +54,6 @@
 , microsoft_gsl
 , rlottie
 , stdenv
-, gcc10Stdenv
 }:
 
 # Main reference:
@@ -70,10 +69,8 @@ let
       cxxStandard = "20";
     };
   };
-  # Aarch64 default gcc9 will cause ICE. For reference #108305
-  env = if stdenv.isAarch64 then gcc10Stdenv else stdenv;
 in
-env.mkDerivation rec {
+stdenv.mkDerivation rec {
   pname = "telegram-desktop";
   version = "4.6.5";
   # Note: Update via pkgs/applications/networking/instant-messengers/telegram/tdesktop/update.py

pkgs/applications/science/biology/mafft/default.nix

@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "mafft";
-  version = "7.508";
+  version = "7.515";
 
   src = fetchFromGitLab {
     owner = "sysimm";
     repo = pname;
-    rev = version;
-    sha256 = "sha256-XQllmTgLntCBUFJzV2HL4f4oMilcUVTRgcfeZBdD5c0=";
+    rev = "v${version}";
+    sha256 = "sha256-ssZvjOHJLsBjB48sKr1U7VrRZUIduFkme22MdVbzoNk=";
   };
 
   preBuild = ''

pkgs/applications/science/logic/glucose/default.nix

@@ -1,13 +1,21 @@
-{ lib, stdenv, fetchurl, zlib }:
+{ lib
+, stdenv
+, fetchurl
+, zlib
+, enableUnfree ? false
+}:
+
 stdenv.mkDerivation rec {
-  pname = "glucose";
+  pname = "glucose" + lib.optionalString enableUnfree "-syrup";
   version = "4.1";
 
   src = fetchurl {
     url = "http://www.labri.fr/perso/lsimon/downloads/softwares/glucose-syrup-${version}.tgz";
-    sha256 = "0aahrkaq7n0z986fpqz66yz946nxardfi6dh8calzcfjpvqiraji";
+    hash = "sha256-Uaoc8b7SsU8VQ7CZ6FpW3RqSvjfm4+sMSh/Yg9XMUCk=";
   };
 
+  sourceRoot = "glucose-syrup-${version}/${if enableUnfree then "parallel" else "simp"}";
+
   postPatch = ''
     substituteInPlace Main.cc \
       --replace "defined(__linux__)" "defined(__linux__) && defined(__x86_64__)"
@@ -15,17 +23,22 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ zlib ];
 
-  sourceRoot = "glucose-syrup-${version}/simp";
   makeFlags = [ "r" ];
+
   installPhase = ''
-    install -Dm0755 glucose_release $out/bin/glucose
+    runHook preInstall
+
+    install -Dm0755 ${pname}_release $out/bin/${pname}
     mkdir -p "$out/share/doc/${pname}-${version}/"
     install -Dm0755 ../{LICEN?E,README*,Changelog*} "$out/share/doc/${pname}-${version}/"
+
+    runHook postInstall
   '';
 
   meta = with lib; {
-    description = "Modern, parallel SAT solver (sequential version)";
-    license = licenses.mit;
+    description = "Modern, parallel SAT solver (${if enableUnfree then "parallel" else "sequential"} version)";
+    homepage = "https://www.labri.fr/perso/lsimon/research/glucose/";
+    license = if enableUnfree then licenses.unfreeRedistributable else licenses.mit;
     platforms = platforms.unix;
     maintainers = with maintainers; [ gebner ];
   };

pkgs/applications/science/logic/glucose/syrup.nix

@@ -1,24 +0,0 @@
-{ lib, stdenv, zlib, glucose }:
-stdenv.mkDerivation rec {
-  pname = "glucose-syrup";
-  version = glucose.version;
-
-  src = glucose.src;
-
-  buildInputs = [ zlib ];
-
-  sourceRoot = "glucose-syrup-${version}/parallel";
-  makeFlags = [ "r" ];
-  installPhase = ''
-    install -Dm0755 glucose-syrup_release $out/bin/glucose-syrup
-    mkdir -p "$out/share/doc/${pname}-${version}/"
-    install -Dm0755 ../{LICEN?E,README*,Changelog*} "$out/share/doc/${pname}-${version}/"
-  '';
-
-  meta = with lib; {
-    description = "Modern, parallel SAT solver (parallel version)";
-    license = licenses.unfreeRedistributable;
-    platforms = platforms.unix;
-    maintainers = with maintainers; [ gebner ];
-  };
-}

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

@@ -41,7 +41,7 @@ let
 
       substituteInPlace $out/bin/${pname} \
         --replace "/usr/lib/beyondcompare" "$out/lib/beyondcompare" \
-        --replace "ldd" "${glibc.out}/bin/ldd" \
+        --replace "ldd" "${glibc.bin}/bin/ldd" \
         --replace "/bin/bash" "${runtimeShell}"
 
       # Create symlink bzip2 library

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

@@ -1,44 +1,51 @@
-{ lib, stdenv, fetchurl, wxGTK30, subversion, apr, aprutil, python3, fetchpatch }:
+{ lib
+, stdenv
+, fetchFromGitHub
+, autoreconfHook
+, wxGTK32
+, subversion
+, apr
+, aprutil
+, python3
+, darwin
+}:
 
 stdenv.mkDerivation rec {
   pname = "rapidsvn";
-  version = "0.12.1";
+  version = "unstable-2021-08-02";
 
-  src = fetchurl {
-    url = "http://www.rapidsvn.org/download/release/${version}/${pname}-${version}.tar.gz";
-    sha256 = "1bmcqjc12k5w0z40k7fkk8iysqv4fw33i80gvcmbakby3d4d4i4p";
+  src = fetchFromGitHub {
+    owner = "RapidSVN";
+    repo = "RapidSVN";
+    rev = "3a564e071c3c792f5d733a9433b9765031f8eed0";
+    hash = "sha256-6bQTHAOZAP+06kZDHjDx9VnGm4vrZUDyLHZdTpiyP08=";
   };
 
-  buildInputs = [ wxGTK30 subversion apr aprutil python3 ];
+  postPatch = ''
+    substituteInPlace configure.ac \
+      --replace "[3.0.*]" "[3.*]"
+  '';
 
-  env.NIX_CFLAGS_COMPILE = toString [ "-std=c++14" ];
+  nativeBuildInputs = [
+    autoreconfHook
+  ];
+
+  buildInputs = [
+    wxGTK32
+    subversion
+    apr
+    aprutil
+    python3
+  ] ++ lib.optionals stdenv.isDarwin [
+    darwin.apple_sdk.frameworks.Cocoa
+  ];
 
   configureFlags = [
     "--with-svn-include=${subversion.dev}/include"
     "--with-svn-lib=${subversion.out}/lib"
   ];
 
-  patches = [
-    ./fix-build.patch
-    # Python 3 compatibility patches
-    (fetchpatch {
-      url = "https://github.com/RapidSVN/RapidSVN/pull/44/commits/2e26fd5d6a413d6c3a055c17ac4840b95d1537e9.patch";
-      hash = "sha256-8acABzscgZh1bfAt35KHfU+nfaiO7P1b+lh34Bj0REI=";
-    })
-    (fetchpatch {
-      url = "https://github.com/RapidSVN/RapidSVN/pull/44/commits/92927af764f92b3731333ed3dba637f98611167a.patch";
-      hash = "sha256-4PdShGcfFwxjdI3ygbnKFAa8l9dGERq/xSl54WisgKM=";
-    })
-    (fetchpatch {
-      url = "https://github.com/RapidSVN/RapidSVN/pull/44/commits/3e375f11d94cb8faddb8b7417354a9fb51f304ec.patch";
-      hash = "sha256-BUpCMEH7jctOLtJktDUE52bxexfLemLItZ0IgdAnq9g=";
-    })
-    # wxWidgets 3.0 compatibility patches
-    (fetchpatch {
-      url = "https://sources.debian.org/data/main/r/rapidsvn/0.12.1dfsg-3.1/debian/patches/wx3.0.patch";
-      sha256 = "sha256-/07+FoOrNw/Pc+wlVt4sGOITfIIEu8ZbI3/ym0u8bs4=";
-    })
-  ];
+  env.NIX_CFLAGS_COMPILE = "-std=c++14";
 
   meta = {
     description = "Multi-platform GUI front-end for the Subversion revision system";
@@ -46,6 +53,5 @@ stdenv.mkDerivation rec {
     license = lib.licenses.gpl3Plus;
     maintainers = [ lib.maintainers.viric ];
     platforms = lib.platforms.unix;
-    broken = stdenv.isDarwin;
   };
 }

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

@@ -166,15 +166,20 @@ python3Packages.buildPythonApplication {
 
   HGNAME = "sl";
   SAPLING_OSS_BUILD = "true";
-  SAPLING_VERSION = version;
   SAPLING_VERSION_HASH = versionHash;
 
+  # Python setuptools version 66 and newer does not support upstream Sapling's
+  # version numbers (e.g. "0.2.20230124-180750-hf8cd450a"). Change the version
+  # number to something supported by setuptools (e.g. "0.2.20230124").
+  # https://github.com/facebook/sapling/issues/571
+  SAPLING_VERSION = builtins.elemAt (builtins.split "-" version) 0;
+
   # just a simple check phase, until we have a running test suite. this should
   # help catch issues like lack of a LOCALE_ARCHIVE setting (see GH PR #202760)
   doCheck = true;
   installCheckPhase = ''
-    echo -n "testing sapling version; should be \"${version}\"... "
-    $out/bin/sl version | grep -qw "${version}"
+    echo -n "testing sapling version; should be \"$SAPLING_VERSION\"... "
+    $out/bin/sl version | grep -qw "$SAPLING_VERSION"
     echo "OK!"
   '';
 

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

@@ -1,20 +1,21 @@
-{ lib, rustPlatform, fetchFromGitHub, stdenv, Security, git }:
+{ lib, rustPlatform, fetchFromGitHub, stdenv, darwin, git }:
 
 rustPlatform.buildRustPackage rec {
   pname = "srvc";
-  version = "0.14.1";
+  version = "0.15.0";
 
   src = fetchFromGitHub {
     owner = "insilica";
     repo = "rs-srvc";
     rev = "v${version}";
-    sha256 = "sha256-6wA2dnUUgS6HNQo2vMFqoT+seZHqcNLoTN+f5+Ok1AQ=";
+    hash = "sha256-vShPc+Tz8n2o8E13npr7ZbDzRaAesWBOJQaCO5ljypM=";
   };
 
-  cargoHash = "sha256-XkRnbfTaCo0J1+yOOvIxhDTjtaZURkjFOPWsFRk8iNU=";
+  cargoHash = "sha256-fHHJR1OvqCYfJkXe9mVQXJeTETDadR65kf8LMsPdAds=";
 
   buildInputs = lib.optionals stdenv.isDarwin [
-    Security
+    darwin.apple_sdk.frameworks.CoreServices
+    darwin.apple_sdk.frameworks.Security
   ];
 
   nativeCheckInputs = [ git ];

pkgs/build-support/rust/import-cargo-lock.nix

@@ -1,4 +1,4 @@
-{ fetchgit, fetchurl, lib, runCommand, cargo, jq }:
+{ fetchgit, fetchurl, lib, writers, python3Packages, runCommand, cargo, jq }:
 
 {
   # Cargo lock file
@@ -93,6 +93,11 @@ let
       sha256 = checksum;
     };
 
+  # Replaces values inherited by workspace members.
+  replaceWorkspaceValues = writers.writePython3 "replace-workspace-values"
+    { libraries = with python3Packages; [ tomli tomli-w ]; flakeIgnore = [ "E501" ]; }
+    (builtins.readFile ./replace-workspace-values.py);
+
   # Fetch and unpack a crate.
   mkCrate = pkg:
     let
@@ -171,6 +176,11 @@ let
         cp -prvd "$tree/" $out
         chmod u+w $out
 
+        if grep -q workspace "$out/Cargo.toml"; then
+          chmod u+w "$out/Cargo.toml"
+          ${replaceWorkspaceValues} "$out/Cargo.toml" "${tree}/Cargo.toml"
+        fi
+
         # Cargo is happy with empty metadata.
         printf '{"files":{},"package":null}' > "$out/.cargo-checksum.json"
 

pkgs/build-support/rust/replace-workspace-values.py

@@ -0,0 +1,95 @@
+# This script implements the workspace inheritance mechanism described
+# here: https://doc.rust-lang.org/cargo/reference/workspaces.html#the-package-table
+#
+# Please run `mypy --strict`, `black`, and `isort --profile black` on this after editing, thanks!
+
+import sys
+from typing import Any
+
+import tomli
+import tomli_w
+
+
+def load_file(path: str) -> dict[str, Any]:
+    with open(path, "rb") as f:
+        return tomli.load(f)
+
+
+def replace_key(
+    workspace_manifest: dict[str, Any], table: dict[str, Any], section: str, key: str
+) -> bool:
+    if "workspace" in table[key] and table[key]["workspace"] is True:
+        print("replacing " + key)
+
+        replaced = table[key]
+        del replaced["workspace"]
+
+        workspace_copy = workspace_manifest[section][key]
+
+        if section == "dependencies":
+            crate_features = replaced.get("features")
+
+            if type(workspace_copy) is str:
+                replaced["version"] = workspace_copy
+            else:
+                replaced.update(workspace_copy)
+
+                merged_features = (crate_features or []) + (
+                    workspace_copy.get("features") or []
+                )
+
+                if len(merged_features) > 0:
+                    # Dictionaries are guaranteed to be ordered (https://stackoverflow.com/a/7961425)
+                    replaced["features"] = list(dict.fromkeys(merged_features))
+        elif section == "package":
+            table[key] = replaced = workspace_copy
+
+        return True
+
+    return False
+
+
+def replace_dependencies(
+    workspace_manifest: dict[str, Any], root: dict[str, Any]
+) -> bool:
+    changed = False
+
+    for key in ["dependencies", "dev-dependencies", "build-dependencies"]:
+        if key in root:
+            for k in root[key].keys():
+                changed |= replace_key(workspace_manifest, root[key], "dependencies", k)
+
+    return changed
+
+
+def main() -> None:
+    crate_manifest = load_file(sys.argv[1])
+    workspace_manifest = load_file(sys.argv[2])["workspace"]
+
+    if "workspace" in crate_manifest:
+        return
+
+    changed = False
+
+    for key in crate_manifest["package"].keys():
+        changed |= replace_key(
+            workspace_manifest, crate_manifest["package"], "package", key
+        )
+
+    changed |= replace_dependencies(workspace_manifest, crate_manifest)
+
+    if "target" in crate_manifest:
+        for key in crate_manifest["target"].keys():
+            changed |= replace_dependencies(
+                workspace_manifest, crate_manifest["target"][key]
+            )
+
+    if not changed:
+        return
+
+    with open(sys.argv[1], "wb") as f:
+        tomli_w.dump(crate_manifest, f)
+
+
+if __name__ == "__main__":
+    main()

pkgs/build-support/rust/test/import-cargo-lock/default.nix

@@ -1,4 +1,4 @@
-{ callPackage }:
+{ callPackage, writers, python3Packages }:
 
 # Build like this from nixpkgs root:
 # $ nix-build -A tests.importCargoLock
@@ -12,4 +12,9 @@
   gitDependencyBranch = callPackage ./git-dependency-branch { };
   maturin = callPackage ./maturin { };
   v1 = callPackage ./v1 { };
+  gitDependencyWorkspaceInheritance = callPackage ./git-dependency-workspace-inheritance {
+    replaceWorkspaceValues = writers.writePython3 "replace-workspace-values"
+      { libraries = with python3Packages; [ tomli tomli-w ]; flakeIgnore = [ "E501" ]; }
+      (builtins.readFile ../../replace-workspace-values.py);
+  };
 }

pkgs/build-support/rust/test/import-cargo-lock/git-dependency-workspace-inheritance/crate.toml

@@ -0,0 +1,6 @@
+[package]
+version = { workspace = true }
+
+[dependencies]
+foo = { workspace = true, features = ["cat"] }
+bar = "1.0.0"

pkgs/build-support/rust/test/import-cargo-lock/git-dependency-workspace-inheritance/default.nix

@@ -0,0 +1,7 @@
+{ replaceWorkspaceValues, runCommand }:
+
+runCommand "git-dependency-workspace-inheritance-test" { } ''
+  cp --no-preserve=mode ${./crate.toml} "$out"
+  ${replaceWorkspaceValues} "$out" ${./workspace.toml}
+  diff -u "$out" ${./want.toml}
+''

pkgs/build-support/rust/test/import-cargo-lock/git-dependency-workspace-inheritance/want.toml

@@ -0,0 +1,12 @@
+[package]
+version = "1.0.0"
+
+[dependencies]
+bar = "1.0.0"
+
+[dependencies.foo]
+features = [
+    "cat",
+    "meow",
+]
+version = "1.0.0"

pkgs/build-support/rust/test/import-cargo-lock/git-dependency-workspace-inheritance/workspace.toml

@@ -0,0 +1,5 @@
+[workspace.package]
+version = "1.0.0"
+
+[workspace.dependencies]
+foo = { version = "1.0.0", features = ["meow"] }

pkgs/development/interpreters/luau/default.nix

@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "luau";
-  version = "0.567";
+  version = "0.568";
 
   src = fetchFromGitHub {
     owner = "Roblox";
     repo = "luau";
     rev = version;
-    hash = "sha256-x1P9/TZUU/XITH1/8NtPXzM46fwk0VxHNphlWqzhoog=";
+    hash = "sha256-ToNAduAKc4gJqO+fMZ2ZT43lnobonytdaSN5Yh0Q6A8=";
   };
 
   nativeBuildInputs = [ cmake ];

pkgs/development/libraries/cl/default.nix

@@ -1,4 +1,4 @@
-{lib, stdenv, fetchFromGitHub, rebar, erlang, opencl-headers, ocl-icd }:
+{ lib, stdenv, fetchFromGitHub, rebar, erlang, opencl-headers, ocl-icd }:
 
 stdenv.mkDerivation rec {
   version = "1.2.4";
@@ -11,6 +11,12 @@ stdenv.mkDerivation rec {
     sha256 = "1gwkjl305a0231hz3k0w448dsgbgdriaq764sizs5qfn59nzvinz";
   };
 
+  # https://github.com/tonyrog/cl/issues/39
+  postPatch = ''
+    substituteInPlace c_src/Makefile \
+      --replace "-m64" ""
+  '';
+
   buildInputs = [ erlang rebar opencl-headers ocl-icd ];
 
   buildPhase = ''
@@ -29,8 +35,6 @@ stdenv.mkDerivation rec {
     homepage = "https://github.com/tonyrog/cl";
     description = "OpenCL binding for Erlang";
     license = licenses.mit;
-    # https://github.com/tonyrog/cl/issues/39
-    broken = stdenv.isAarch64;
     platforms = platforms.linux;
   };
 }

pkgs/development/libraries/science/math/mkl/default.nix

@@ -139,6 +139,9 @@ in stdenvNoCC.mkDerivation ({
 
     # Headers
     cp -r opt/intel/oneapi/mkl/${mklVersion}/include $out/
+
+    # CMake config
+    cp -r opt/intel/oneapi/mkl/${mklVersion}/lib/cmake $out/lib
   '' +
     (if enableStatic then ''
       install -Dm0644 -t $out/lib opt/intel/oneapi/mkl/${mklVersion}/lib/intel64/*.a

pkgs/development/ocaml-modules/pgocaml/default.nix

@@ -4,16 +4,16 @@
 
 buildDunePackage rec {
   pname = "pgocaml";
-  version = "4.2.2-dev-20210111";
+  version = "4.3.0";
   src = fetchFromGitHub {
     owner = "darioteixeira";
     repo = "pgocaml";
-    rev = "1bb0025deeb3d14029afdcc69aaa7847026e243e";
-    sha256 = "11inbjf87gclc2xmpq56ag4cm4467y9q9hjgbdn69fa1bman2zn2";
+    rev = version;
+    hash = "sha256-W1fbRnU1l61qqxfVY2qiBnVpGD81xrBO8k0tWr+RXMY=";
   };
 
-  minimumOCamlVersion = "4.08";
-  useDune2 = true;
+  minimalOCamlVersion = "4.08";
+  duneVersion = "3";
 
   propagatedBuildInputs = [ calendar csv hex ppx_deriving ppx_sexp_conv re rresult sexplib ];
 

pkgs/development/ocaml-modules/pgocaml/ppx.nix

@@ -2,7 +2,10 @@
 
 buildDunePackage {
   pname = "pgocaml_ppx";
-  inherit (pgocaml) src version useDune2 meta;
+  inherit (pgocaml) src version meta;
 
-  propagatedBuildInputs = [ pgocaml ppx_optcomp ];
+  duneVersion = "3";
+
+  buildInputs = [ ppx_optcomp ];
+  propagatedBuildInputs = [ pgocaml ];
 }

pkgs/development/python-modules/debugpy/default.nix

@@ -3,6 +3,7 @@
 , buildPythonPackage
 , pythonOlder
 , fetchFromGitHub
+, fetchpatch
 , substituteAll
 , gdb
 , django
@@ -37,6 +38,12 @@ buildPythonPackage rec {
       inherit version;
     })
 
+    # https://github.com/microsoft/debugpy/issues/1230
+    (fetchpatch {
+      url = "https://patch-diff.githubusercontent.com/raw/microsoft/debugpy/pull/1232.patch";
+      sha256 = "sha256-m5p+xYiJ4w4GcaFIaPmlnErp/7WLwcvJmaCqa2SeSxU=";
+    })
+
     # Fix importing debugpy in:
     # - test_nodebug[module-launch(externalTerminal)]
     # - test_nodebug[module-launch(integratedTerminal)]
@@ -100,10 +107,14 @@ buildPythonPackage rec {
   pytestFlagsArray = [
     "--timeout=0"
   ];
-
   # Fixes hanging tests on Darwin
   __darwinAllowLocalNetworking = true;
 
+  disabledTests = [
+    # https://github.com/microsoft/debugpy/issues/1241
+    "test_flask_breakpoint_multiproc"
+  ];
+
   pythonImportsCheck = [
     "debugpy"
   ];

pkgs/development/python-modules/pywlroots/default.nix

@@ -9,29 +9,30 @@
 , pixman
 , pythonOlder
 , udev
-, wlroots_0_16
+, wlroots
 , wayland
 , pywayland
 , xkbcommon
 , xorg
 , pytestCheckHook
+, qtile
 }:
 
 buildPythonPackage rec {
   pname = "pywlroots";
-  version = "0.16.1";
+  version = "0.15.24";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-GFJw88N0313PudM0o/jOvtoE3u8kSoV+lYgKlNya4wM=";
+    hash = "sha256-TvYhxiAbK+mpcEE9y79WH96dzeDnvI0xPaUxSYQqyHE=";
   };
 
   nativeBuildInputs = [ pkg-config ];
   propagatedNativeBuildInputs = [ cffi ];
-  buildInputs = [ libinput libxkbcommon pixman xorg.libxcb udev wayland wlroots_0_16 ];
+  buildInputs = [ libinput libxkbcommon pixman xorg.libxcb udev wayland wlroots ];
   propagatedBuildInputs = [ cffi pywayland xkbcommon ];
   nativeCheckInputs = [ pytestCheckHook ];
 
@@ -41,6 +42,8 @@ buildPythonPackage rec {
 
   pythonImportsCheck = [ "wlroots" ];
 
+  passthru.tests = { inherit qtile; };
+
   meta = with lib; {
     homepage = "https://github.com/flacjacket/pywlroots";
     description = "Python bindings to wlroots using cffi";

pkgs/development/python-modules/scooby/default.nix

@@ -25,6 +25,11 @@ buildPythonPackage rec {
     hash = "sha256-wKbCIA6Xp+VYhcQ5ZpHo5usB+ksnMAJyv5naBvl4Cxo=";
   };
 
+  postPatch = ''
+    # Drop broken version specifier
+    sed -i '/python_requires/d' setup.py
+  '';
+
   SETUPTOOLS_SCM_PRETEND_VERSION = version;
 
   nativeBuildInputs = [

pkgs/development/tools/continuous-integration/woodpecker/common.nix

@@ -1,7 +1,7 @@
 { lib, fetchFromGitHub }:
 let
-  version = "0.15.6";
-  srcSha256 = "sha256-8XXeGEw7+NGULsD5/g1j9+P2h82oRpEuMJT6sMp+z38=";
+  version = "0.15.7";
+  srcSha256 = "sha256-Y6ew9CychStC26A7uyjChvkR+oDis3GZq8kYLHS7AXQ=";
   yarnSha256 = "sha256-PY0BIBbjyi2DG+n5x/IPc0AwrFSwII4huMDU+FeZ/Sc=";
 in
 {

pkgs/development/tools/ruff/default.nix

@@ -8,16 +8,24 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "ruff";
-  version = "0.0.244";
+  version = "0.0.248";
 
   src = fetchFromGitHub {
     owner = "charliermarsh";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-oQBNVs7hoiXNqz5lYq5YNKHfpQ/c8LZAvNvtFqpTM2E=";
+    hash = "sha256-qsjn8AW6Wx0ZaTht9BToQxYWngrrrR8LIIWcNfr8fXw=";
   };
 
-  cargoSha256 = "sha256-61kypAXWfUZLfTbSp+b0gCKwuWtxAYVtKIwfVOcJ2o8=";
+  # We have to use importCargoLock here because `cargo vendor` currently doesn't support workspace
+  # inheritance within Git dependencies, but importCargoLock does.
+  cargoLock = {
+    lockFile = ./Cargo.lock;
+    outputHashes = {
+      "libcst-0.1.0" = "sha256-66Td5jnLEEDHgYapsSmxfgIE43T7PSTYRznllIOw81U=";
+      "rustpython-ast-0.2.0" = "sha256-k2WHnRtqSzdawHQKOfTjvyZxgRWXRv9dvSzfYC7171o=";
+    };
+  };
 
   nativeBuildInputs = [
     installShellFiles
@@ -27,6 +35,8 @@ rustPlatform.buildRustPackage rec {
     darwin.apple_sdk.frameworks.CoreServices
   ];
 
+  cargoBuildFlags = [ "--package=ruff_cli" ];
+
   # building tests fails with `undefined symbols`
   doCheck = false;
 

pkgs/development/tools/viceroy/default.nix

@@ -2,18 +2,18 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "viceroy";
-  version = "0.3.5";
+  version = "0.4.0";
 
   src = fetchFromGitHub {
     owner = "fastly";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-X+RmsS+GxdBiFt2Fo0MgkuyjQDwQNuOLDL1YVQdqhXo=";
+    hash = "sha256-6D+P7fQBhLYuAw9bIVgEU4Zi18kBLUn/4jr1E8cFugU=";
   };
 
   buildInputs = lib.optional stdenv.isDarwin Security;
 
-  cargoHash = "sha256-vbhBlfHrFcjtaUJHYvB106ElYP0NquOo+rgIx9cWenY=";
+  cargoHash = "sha256-URBtmMR61K1/LtIt3Q3tfQ4viZPvoiumR2LudcpYk6s=";
 
   cargoTestFlags = [
     "--package viceroy-lib"

pkgs/games/cutemaze/default.nix

@@ -26,14 +26,20 @@ stdenv.mkDerivation rec {
 
   buildInputs = [
     qtbase
-    qtwayland
     qtsvg
+  ] ++ lib.optionals stdenv.isLinux [
+    qtwayland
   ];
 
-  postInstall = lib.optionalString stdenv.isDarwin ''
+  installPhase = if stdenv.isDarwin then ''
+    runHook preInstall
+
     mkdir -p $out/Applications
     mv CuteMaze.app $out/Applications
-  '';
+    makeWrapper $out/Applications/CuteMaze.app/Contents/MacOS/CuteMaze $out/bin/cutemaze
+
+    runHook postInstall
+  '' else null;
 
   meta = with lib; {
     changelog = "https://github.com/gottcode/cutemaze/blob/v${version}/ChangeLog";

pkgs/misc/fastly/default.nix

@@ -10,13 +10,13 @@
 
 buildGoModule rec {
   pname = "fastly";
-  version = "8.0.0";
+  version = "8.1.0";
 
   src = fetchFromGitHub {
     owner = "fastly";
     repo = "cli";
     rev = "refs/tags/v${version}";
-    hash = "sha256-Bwof1Np0eSjmBXQ6dqFmw3TA/2u+VzzyIn/95m9eXVo=";
+    hash = "sha256-4RynQS3Y+Aa93hYWyvZSkAq2teUKJhqAn8NSvnEEdzE=";
     # The git commit is part of the `fastly version` original output;
     # leave that output the same in nixpkgs. Use the `.git` directory
     # to retrieve the commit SHA, and remove the directory afterwards,
@@ -33,7 +33,7 @@ buildGoModule rec {
     "cmd/fastly"
   ];
 
-  vendorHash = "sha256-/tdvIX839NkhUoj/bfJ/68K8RtPCidydNQZCdDvizzU=";
+  vendorHash = "sha256-XND6sSjbZCTraKOapAvsVOZGf27YcyFnkC1vl8wO0ug=";
 
   nativeBuildInputs = [
     installShellFiles

pkgs/servers/jackett/default.nix

@@ -9,13 +9,13 @@
 
 buildDotnetModule rec {
   pname = "jackett";
-  version = "0.20.3599";
+  version = "0.20.3627";
 
   src = fetchFromGitHub {
     owner = pname;
     repo = pname;
     rev = "v${version}";
-    hash = "sha512-GZCdReOysCkFCkOeaqRivJlKRsuKtRNMPTdKsbj6KqyhPW41GLJffBkl8XKi6pmREp/jCtWs2+tw1D7xcaGNqg==";
+    hash = "sha512-enyxUGfS7nzy4Ej+raPbhUc+WJJQL5J3i8WhoVsYBDwlcfW0kXjljhipPqkW4bONTRKL3zLI4HbaHEW1t/Ca/g==";
   };
 
   projectFile = "src/Jackett.Server/Jackett.Server.csproj";

pkgs/servers/matrix-conduit/cargo-11192-workaround.patch

@@ -1,259 +0,0 @@
-diff --git ruma-appservice-api/Cargo.toml ruma-appservice-api/Cargo.toml
-index b48852c8..8641bc42 100644
---- ruma-appservice-api/Cargo.toml
-+++ ruma-appservice-api/Cargo.toml
-@@ -23,11 +23,11 @@ unstable-msc2409 = []
- unstable-msc3202 = []
- 
- [dependencies]
--js_int = { workspace = true, features = ["serde"] }
-+js_int = { version = "0.2.2", features = ["serde"] }
- ruma-common = { version = "0.10.5", path = "../ruma-common", features = ["api", "events"] }
--serde = { workspace = true }
--serde_json = { workspace = true }
-+serde = { version = "1.0.147", features = ["derive"] }
-+serde_json = { version = "1.0.87" }
- 
- [dev-dependencies]
--assert_matches = { workspace = true }
-+assert_matches = { version = "1.5.0" }
- serde_yaml = "0.9.14"
-diff --git ruma-client-api/Cargo.toml ruma-client-api/Cargo.toml
-index ddd2e44b..5756c055 100644
---- ruma-client-api/Cargo.toml
-+++ ruma-client-api/Cargo.toml
-@@ -31,16 +31,16 @@ client = []
- server = []
- 
- [dependencies]
--assign = { workspace = true }
-+assign = { version = "1.1.1" }
- bytes = "1.0.1"
--http = { workspace = true }
--js_int = { workspace = true, features = ["serde"] }
-+http = { version = "0.2.8" }
-+js_int = { version = "0.2.2", features = ["serde"] }
- js_option = "0.1.1"
--maplit = { workspace = true }
-+maplit = { version = "1.0.2" }
- percent-encoding = "2.1.0"
- ruma-common = { version = "0.10.5", path = "../ruma-common", features = ["api", "events"] }
--serde = { workspace = true }
--serde_json = { workspace = true }
-+serde = { version = "1.0.147", features = ["derive"] }
-+serde_json = { version = "1.0.87" }
- 
- [dev-dependencies]
--assert_matches = { workspace = true }
-+assert_matches = { version = "1.5.0" }
-diff --git ruma-common/Cargo.toml ruma-common/Cargo.toml
-index 83f22461..4ba11cfb 100644
---- ruma-common/Cargo.toml
-+++ ruma-common/Cargo.toml
-@@ -48,15 +48,15 @@ unstable-sanitize = ["dep:html5ever", "dep:phf"]
- unstable-unspecified = []
- 
- [dependencies]
--base64 = { workspace = true }
-+base64 = { version = "0.20.0" }
- bytes = "1.0.1"
- form_urlencoded = "1.0.0"
- getrandom = { version = "0.2.6", optional = true }
- html5ever = { version = "0.25.2", optional = true }
--http = { workspace = true, optional = true }
-+http = { version = "0.2.8", optional = true }
- indexmap = { version = "1.9.1", features = ["serde"] }
- itoa = "1.0.1"
--js_int = { workspace = true, features = ["serde"] }
-+js_int = { version = "0.2.2", features = ["serde"] }
- js_option = "0.1.0"
- konst = { version = "0.2.19", features = ["rust_1_64", "alloc"] }
- percent-encoding = "2.1.0"
-@@ -66,25 +66,25 @@ rand = { version = "0.8.3", optional = true }
- regex = { version = "1.5.6", default-features = false, features = ["std", "perf"] }
- ruma-identifiers-validation = { version = "0.9.0", path = "../ruma-identifiers-validation", default-features = false }
- ruma-macros = { version = "0.10.5", path = "../ruma-macros" }
--serde = { workspace = true }
--serde_json = { workspace = true, features = ["raw_value"] }
--thiserror = { workspace = true }
--tracing = { workspace = true, features = ["attributes"] }
-+serde = { version = "1.0.147", features = ["derive"] }
-+serde_json = { version = "1.0.87", features = ["raw_value"] }
-+thiserror = { version = "1.0.37" }
-+tracing = { version = "0.1.37", default-features = false, features = ["std", "attributes"] }
- url = "2.2.2"
- uuid = { version = "1.0.0", optional = true, features = ["v4"] }
- wildmatch = "2.0.0"
- 
- # dev-dependencies can't be optional, so this is a regular dependency
--criterion = { workspace = true, optional = true }
-+criterion = { version = "0.4.0", optional = true }
- 
- [target.'cfg(all(target_arch = "wasm32", target_os = "unknown"))'.dependencies]
- js-sys = { version = "0.3", optional = true }
- 
- [dev-dependencies]
--assert_matches = { workspace = true }
--assign = { workspace = true }
--http = { workspace = true }
--maplit = { workspace = true }
-+assert_matches = { version = "1.5.0" }
-+assign = { version = "1.1.1" }
-+http = { version = "0.2.8" }
-+maplit = { version = "1.0.2" }
- trybuild = "1.0.71"
- 
- [[bench]]
-diff --git ruma-federation-api/Cargo.toml ruma-federation-api/Cargo.toml
-index 380d1ed3..a4508a80 100644
---- ruma-federation-api/Cargo.toml
-+++ ruma-federation-api/Cargo.toml
-@@ -26,11 +26,11 @@ unstable-msc3723 = []
- unstable-unspecified = []
- 
- [dependencies]
--js_int = { workspace = true, features = ["serde"] }
-+js_int = { version = "0.2.2", features = ["serde"] }
- ruma-common = { version = "0.10.5", path = "../ruma-common", features = ["api", "events"] }
--serde = { workspace = true }
--serde_json = { workspace = true }
-+serde = { version = "1.0.147", features = ["derive"] }
-+serde_json = { version = "1.0.87" }
- 
- [dev-dependencies]
--assert_matches = { workspace = true }
--http = { workspace = true }
-+assert_matches = { version = "1.5.0" }
-+http = { version = "0.2.8" }
-diff --git ruma-identifiers-validation/Cargo.toml ruma-identifiers-validation/Cargo.toml
-index cd79ba78..28a9cd9e 100644
---- ruma-identifiers-validation/Cargo.toml
-+++ ruma-identifiers-validation/Cargo.toml
-@@ -15,5 +15,5 @@ all-features = true
- compat = []
- 
- [dependencies]
--js_int = { workspace = true }
--thiserror = { workspace = true }
-+js_int = { version = "0.2.2" }
-+thiserror = { version = "1.0.37" }
-diff --git ruma-identity-service-api/Cargo.toml ruma-identity-service-api/Cargo.toml
-index 9dd4bc14..6edf1170 100644
---- ruma-identity-service-api/Cargo.toml
-+++ ruma-identity-service-api/Cargo.toml
-@@ -19,9 +19,9 @@ client = []
- server = []
- 
- [dependencies]
--js_int = { workspace = true, features = ["serde"] }
-+js_int = { version = "0.2.2", features = ["serde"] }
- ruma-common = { version = "0.10.5", path = "../ruma-common", features = ["api"] }
--serde = { workspace = true }
-+serde = { version = "1.0.147", features = ["derive"] }
- 
- [dev-dependencies]
--serde_json = { workspace = true }
-+serde_json = { version = "1.0.87" }
-diff --git ruma-macros/Cargo.toml ruma-macros/Cargo.toml
-index 70a6a7a6..e86c0631 100644
---- ruma-macros/Cargo.toml
-+++ ruma-macros/Cargo.toml
-@@ -23,6 +23,6 @@ proc-macro-crate = "1.0.0"
- proc-macro2 = "1.0.24"
- quote = "1.0.8"
- ruma-identifiers-validation = { version = "0.9.0", path = "../ruma-identifiers-validation", default-features = false }
--serde = { workspace = true }
-+serde = { version = "1.0.147", features = ["derive"] }
- syn = { version = "1.0.57", features = ["extra-traits", "full", "visit"] }
- toml = "0.5.9"
-diff --git ruma-push-gateway-api/Cargo.toml ruma-push-gateway-api/Cargo.toml
-index 5d589828..e08144ce 100644
---- ruma-push-gateway-api/Cargo.toml
-+++ ruma-push-gateway-api/Cargo.toml
-@@ -20,7 +20,7 @@ client = []
- server = []
- 
- [dependencies]
--js_int = { workspace = true, features = ["serde"] }
-+js_int = { version = "0.2.2", features = ["serde"] }
- ruma-common = { version = "0.10.5", path = "../ruma-common", features = ["api", "events"] }
--serde = { workspace = true }
--serde_json = { workspace = true }
-+serde = { version = "1.0.147", features = ["derive"] }
-+serde_json = { version = "1.0.87" }
-diff --git ruma-signatures/Cargo.toml ruma-signatures/Cargo.toml
-index dd1c9951..d06bffd9 100644
---- ruma-signatures/Cargo.toml
-+++ ruma-signatures/Cargo.toml
-@@ -18,16 +18,16 @@ ring-compat = ["dep:subslice"]
- unstable-exhaustive-types = []
- 
- [dependencies]
--base64 = { workspace = true }
-+base64 = { version = "0.20.0" }
- ed25519-dalek = "1.0.1"
- pkcs8 = { version = "0.9.0", features = ["alloc"] }
- # because dalek uses an older version of rand_core
- rand = { version = "0.7", features = ["getrandom"] }
- ruma-common = { version = "0.10.5", path = "../ruma-common", features = ["canonical-json"] }
--serde_json = { workspace = true }
-+serde_json = { version = "1.0.87" }
- sha2 = "0.9.5"
- subslice = { version = "0.2.3", optional = true }
--thiserror = { workspace = true }
-+thiserror = { version = "1.0.37" }
- 
- [dev-dependencies]
--assert_matches = { workspace = true }
-+assert_matches = { version = "1.5.0" }
-diff --git ruma-state-res/Cargo.toml ruma-state-res/Cargo.toml
-index d23556f1..ec6088bc 100644
---- ruma-state-res/Cargo.toml
-+++ ruma-state-res/Cargo.toml
-@@ -19,18 +19,18 @@ unstable-exhaustive-types = []
- 
- [dependencies]
- itertools = "0.10.0"
--js_int = { workspace = true }
-+js_int = { version = "0.2.2" }
- ruma-common = { version = "0.10.5", path = "../ruma-common", features = ["events"] }
--serde = { workspace = true }
--serde_json = { workspace = true }
--thiserror = { workspace = true }
--tracing = { workspace = true }
-+serde = { version = "1.0.147", features = ["derive"] }
-+serde_json = { version = "1.0.87" }
-+thiserror = { version = "1.0.37" }
-+tracing = { version = "0.1.37", default-features = false, features = ["std"] }
- 
- # dev-dependencies can't be optional, so this is a regular dependency
--criterion = { workspace = true, optional = true }
-+criterion = { version = "0.4.0", optional = true }
- 
- [dev-dependencies]
--maplit = { workspace = true }
-+maplit = { version = "1.0.2" }
- rand = "0.8.3"
- ruma-common = { version = "0.10.5", path = "../ruma-common", features = ["unstable-pdu"] }
- tracing-subscriber = "0.3.16"
-diff --git ruma/Cargo.toml ruma/Cargo.toml
-index 0b62cff1..05ce9990 100644
---- ruma/Cargo.toml
-+++ ruma/Cargo.toml
-@@ -191,8 +191,8 @@ __ci = [
- ]
- 
- [dependencies]
--assign = { workspace = true }
--js_int = { workspace = true }
-+assign = { version = "1.1.1" }
-+js_int = { version = "0.2.2" }
- js_option = "0.1.1"
- 
- ruma-common = { version = "0.10.5", path = "../ruma-common" }
-@@ -208,4 +208,4 @@ ruma-identity-service-api = { version = "0.6.0", path = "../ruma-identity-servic
- ruma-push-gateway-api = { version = "0.6.0", path = "../ruma-push-gateway-api", optional = true }
- 
- [dev-dependencies]
--serde = { workspace = true }
-+serde = { version = "1.0.147", features = ["derive"] }

pkgs/servers/matrix-conduit/default.nix

@@ -1,4 +1,4 @@
-{ lib, rustPlatform, fetchFromGitLab, stdenv, darwin, nixosTests, rocksdb_6_23 }:
+{ lib, rustPlatform, fetchFromGitLab, pkg-config, sqlite, stdenv, darwin, nixosTests, rocksdb_6_23 }:
 
 rustPlatform.buildRustPackage rec {
   pname = "matrix-conduit";
@@ -11,22 +11,29 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-GSCpmn6XRbmnfH31R9c6QW3/pez9KHPjI99dR+ln0P4=";
   };
 
-  # https://github.com/rust-lang/cargo/issues/11192
-  # https://github.com/ruma/ruma/issues/1441
-  postPatch = ''
-    pushd $cargoDepsCopy
-    patch -p0 < ${./cargo-11192-workaround.patch}
-    for p in ruma*; do echo '{"files":{},"package":null}' > $p/.cargo-checksum.json; done
-    popd
-  '';
+  # We have to use importCargoLock here because `cargo vendor` currently doesn't support workspace
+  # inheritance within Git dependencies, but importCargoLock does.
+  cargoLock = {
+    lockFile = ./Cargo.lock;
+    outputHashes = {
+      "heed-0.10.6" = "sha256-rm02pJ6wGYN4SsAbp85jBVHDQ5ITjZZd+79EC2ubRsY=";
+      "reqwest-0.11.9" = "sha256-wH/q7REnkz30ENBIK5Rlxnc1F6vOyuEANMHFmiVPaGw=";
+      "ruma-0.7.4" = "sha256-ztobLdOXSGyK1YcPMMIycO3ZmnjxG5mLkHltf0Fbs8s=";
+    };
+  };
 
-  cargoSha256 = "sha256-WFoupcuaG7f7KYBn/uzbOzlHHLurOyvm5e1lEcinxC8=";
+  # Conduit enables rusqlite's bundled feature by default, but we'd rather use our copy of SQLite.
+  preBuild = ''
+    substituteInPlace Cargo.toml --replace "features = [\"bundled\"]" "features = []"
+    cargo update --offline -p rusqlite
+  '';
 
   nativeBuildInputs = [
     rustPlatform.bindgenHook
+    pkg-config
   ];
 
-  buildInputs = lib.optionals stdenv.isDarwin [
+  buildInputs = [ sqlite ] ++ lib.optionals stdenv.isDarwin [
     darwin.apple_sdk.frameworks.Security
   ];
 

pkgs/servers/monitoring/telegraf/default.nix

@@ -2,7 +2,7 @@
 
 buildGoModule rec {
   pname = "telegraf";
-  version = "1.25.1";
+  version = "1.26.0";
 
   excludedPackages = "test";
 
@@ -12,10 +12,10 @@ buildGoModule rec {
     owner = "influxdata";
     repo = "telegraf";
     rev = "v${version}";
-    sha256 = "sha256-r+kbF4TajBkZyp0B6Tb/Y1Nm7e2zQctDYEmyn0qTqW0=";
+    sha256 = "sha256-Huyjgo6UC9l6DVWBaKvN7ETxzsLDSaDC5Qx+gCR4LU4=";
   };
 
-  vendorHash = "sha256-AlmmWjwhC5xStcwo+NW0IwC+FteL4Ttwo717VgE8IHM=";
+  vendorHash = "sha256-Z1xmtQ/Cs+7gdipEip/nkxARtuCYG1lZ59bGNhPjTcA=";
   proxyVendor = true;
 
   ldflags = [

pkgs/tools/security/step-kms-plugin/default.nix

@@ -11,16 +11,16 @@
 
 buildGoModule rec {
   pname = "step-kms-plugin";
-  version = "0.7.0";
+  version = "0.8.0";
 
   src = fetchFromGitHub {
     owner = "smallstep";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-5oMkR997ZbPpOqazpyxEvLKbak7THAu855FC6a/Tr+4=";
+    hash = "sha256-VHQuNJzOYr5aLQqlzx6mDPBOKw6OSPSXBiEopKLuUo0=";
   };
 
-  vendorHash = "sha256-Zd2rZez5vP9uL5dolGHO8FR0ARoYP78amcakK/lKtdc=";
+  vendorHash = "sha256-o6mylylpfQyswXA0kCADjqYFE0XDW9ZYglwDMpFRiu8=";
 
   proxyVendor = true;
 

pkgs/tools/system/fio/default.nix

@@ -4,13 +4,13 @@
 
 stdenv.mkDerivation rec {
   pname = "fio";
-  version = "3.33";
+  version = "3.34";
 
   src = fetchFromGitHub {
     owner  = "axboe";
     repo   = "fio";
     rev    = "fio-${version}";
-    sha256 = "sha256-d4Fx2QdO+frt+gcBzegJ9CW5NJQRLNkML/iD3te/1d0=";
+    sha256 = "sha256-+csIerzwYOmXfmykYI0DHzbJf4iUCkEy1f7SFmAiuv4=";
   };
 
   buildInputs = [ python3 zlib ]

pkgs/top-level/all-packages.nix

@@ -5613,9 +5613,7 @@ with pkgs;
 
   spacevim = callPackage ../applications/editors/spacevim { };
 
-  srvc = callPackage ../applications/version-management/srvc {
-    inherit (darwin.apple_sdk.frameworks) Security;
-  };
+  srvc = callPackage ../applications/version-management/srvc { };
 
   ssmsh = callPackage ../tools/admin/ssmsh { };
 
@@ -19507,9 +19505,7 @@ with pkgs;
 
   chromaprint = callPackage ../development/libraries/chromaprint { };
 
-  cl = callPackage ../development/libraries/cl {
-    erlang = erlangR23;
-  };
+  cl = callPackage ../development/libraries/cl { };
 
   clanlib = callPackage ../development/libraries/clanlib { };
 
@@ -31692,6 +31688,10 @@ with pkgs;
 
   miniaudicle = callPackage ../applications/audio/miniaudicle { stdenv = gcc10StdenvCompat; };
 
+  minidsp = callPackage ../applications/audio/minidsp {
+    inherit (darwin.apple_sdk.frameworks) AppKit IOKit;
+  };
+
   minicom = callPackage ../tools/misc/minicom { };
 
   minigalaxy = callPackage ../applications/misc/minigalaxy { };
@@ -34398,9 +34398,7 @@ with pkgs;
 
   wily = callPackage ../applications/editors/wily { };
 
-  wings = callPackage ../applications/graphics/wings {
-    erlang = erlangR21;
-  };
+  wings = callPackage ../applications/graphics/wings { };
 
   write_stylus = libsForQt5.callPackage ../applications/graphics/write_stylus { };
 
@@ -37290,7 +37288,9 @@ with pkgs;
   glom = callPackage ../applications/misc/glom { };
 
   glucose = callPackage ../applications/science/logic/glucose { };
-  glucose-syrup = callPackage ../applications/science/logic/glucose/syrup.nix { };
+  glucose-syrup = callPackage ../applications/science/logic/glucose {
+    enableUnfree = true;
+  };
 
   hol = callPackage ../applications/science/logic/hol { };