Merge master into staging-next

2024-11-25 00:12:56 +00:00 · 2024-11-13 12:05:52 +00:00 · 2024-11-13 12:05:52 +00:00 · d6721ede31
commit d6721ede31
parent 7ae1889486 8b4df30ab3
86 changed files with 3128 additions and 713 deletions
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@ -4179,6 +4179,12 @@
    githubId = 69784758;
    matrix = "@clot27:matrix.org";
  };
+  cloudripper = {
+    email = "other.wing8806@fastmail.com";
+    github = "cloudripper";
+    githubId = 70971768;
+    name = "cloudripper";
+  };
  clr-cera = {
    email = "clrcera05@gmail.com";
    github = "clr-cera";
@ -5168,6 +5174,12 @@
    github = "DeclanRixon";
    githubId = 57464835;
  };
+  deeengan = {
+    github = "deeengan";
+    githubId = 87693324;
+    name = "Dee Engan";
+    keys = [ { fingerprint = "9C24 79F5 F0CE 48F4 00EE  4A5B B8ED 46EB 468B F72D"; } ];
+  };
  deejayem = {
    email = "nixpkgs.bu5hq@simplelogin.com";
    github = "deejayem";
@ -11920,6 +11932,12 @@
    github = "krzaczek";
    githubId = 5773701;
  };
+  KSJ2000 = {
+    email = "katsho123@outlook.com";
+    name = "KSJ2000";
+    github = "KSJ2000";
+    githubId = 184105270;
+  };
  ktf = {
    email = "giulio.eulisse@cern.ch";
    github = "ktf";
@ -14378,12 +14396,6 @@
    githubId = 5378535;
    name = "Milo Gertjejansen";
  };
-  milran = {
-    email = "milranmike@protonmail.com";
-    github = "wattmto";
-    githubId = 93639059;
-    name = "Milran Mike";
-  };
  mimame = {
    email = "miguel.madrid.mencia@gmail.com";
    github = "mimame";
@ -19624,6 +19636,13 @@
    githubId = 5104601;
    name = "schnusch";
  };
+  schrobingus = {
+    email = "brent.monning.jr@gmail.com";
+    name = "Brent Monning";
+    github = "schrobingus";
+    githubId = 72168352;
+    matrix = "@schrobingus:matrix.org";
+  };
  Schweber = {
    github = "Schweber";
    githubId = 64630479;
@ -23360,6 +23379,12 @@
    github = "water-sucks";
    githubId = 68445574;
  };
+  wattmto = {
+    email = "dev@wattmto.dev";
+    github = "wattmto";
+    githubId = 93639059;
+    name = "wattmto";
+  };
  waynr = {
    name = "Wayne Warren";
    email = "wayne.warren.s@gmail.com";
--- a/nixos/modules/services/mail/protonmail-bridge.nix
+++ b/nixos/modules/services/mail/protonmail-bridge.nix
@ -18,7 +18,7 @@ in
      type = lib.types.listOf lib.types.path;
      default = [ ];
      example = lib.literalExpression "with pkgs; [ pass gnome-keyring ]";
-      description = "List of derivations to put in protonmail-bride's path.";
+      description = "List of derivations to put in protonmail-bridge's path.";
    };

    logLevel = lib.mkOption {
--- a/pkgs/applications/video/gpac/default.nix
+++ b/pkgs/applications/video/gpac/default.nix
@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, cctools, pkg-config, Carbon, zlib }:
+{ lib, stdenv, fetchFromGitHub, cctools, pkg-config, zlib }:

 stdenv.mkDerivation rec {
  pname = "gpac";
@ -21,8 +21,6 @@ stdenv.mkDerivation rec {

  buildInputs = [
    zlib
-  ] ++ lib.optionals stdenv.hostPlatform.isDarwin [
-    Carbon
  ];

  enableParallelBuilding = true;
--- a/pkgs/by-name/al/alist/package.nix
+++ b/pkgs/by-name/al/alist/package.nix
@ -0,0 +1,109 @@
+{
+  lib,
+  buildGoModule,
+  fetchFromGitHub,
+  fetchurl,
+  fuse,
+  stdenv,
+  installShellFiles,
+  versionCheckHook,
+}:
+buildGoModule rec {
+  pname = "alist";
+  version = "3.38.0";
+
+  src = fetchFromGitHub {
+    owner = "AlistGo";
+    repo = "alist";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-HF5T/TZXiyT186qZyzz+m0K9ajF1wk8YAZljcq5ccWM=";
+    # populate values that require us to use git. By doing this in postFetch we
+    # can delete .git afterwards and maintain better reproducibility of the src.
+    leaveDotGit = true;
+    postFetch = ''
+      cd "$out"
+      git rev-parse HEAD > $out/COMMIT
+      # '0000-00-00T00:00:00Z'
+      date -u -d "@$(git log -1 --pretty=%ct)" "+%Y-%m-%dT%H:%M:%SZ" > $out/SOURCE_DATE_EPOCH
+      find "$out" -name .git -print0 | xargs -0 rm -rf
+    '';
+  };
+  web = fetchurl {
+    url = "https://github.com/AlistGo/alist-web/releases/download/${version}/dist.tar.gz";
+    hash = "sha256-jHbWhjvHfgtdocuuELbOwrMzL8tOQfBVdH9MxasEwGo=";
+  };
+
+  proxyVendor = true;
+  vendorHash = "sha256-Q5E86bNedXOqMKS3WrXicWg27vnjyGao0nE34Ws2l9E=";
+
+  buildInputs = [ fuse ];
+
+  tags = [ "jsoniter" ];
+
+  ldflags = [
+    "-s"
+    "-w"
+    "-X \"github.com/alist-org/alist/v3/internal/conf.GitAuthor=Xhofe <i@nn.ci>\""
+    "-X github.com/alist-org/alist/v3/internal/conf.Version=${version}"
+    "-X github.com/alist-org/alist/v3/internal/conf.WebVersion=${version}"
+  ];
+
+  preConfigure = ''
+    # use matched web files
+    rm -rf public/dist
+    tar -xzf ${web}
+    mv -f dist public
+  '';
+
+  preBuild = ''
+    ldflags+=" -X \"github.com/alist-org/alist/v3/internal/conf.GoVersion=$(go version | sed 's/go version //')\""
+    ldflags+=" -X \"github.com/alist-org/alist/v3/internal/conf.BuiltAt=$(cat SOURCE_DATE_EPOCH)\""
+    ldflags+=" -X github.com/alist-org/alist/v3/internal/conf.GitCommit=$(cat COMMIT)"
+  '';
+
+  checkFlags =
+    let
+      # Skip tests that require network access
+      skippedTests = [
+        "TestHTTPAll"
+        "TestWebsocketAll"
+        "TestWebsocketCaller"
+      ];
+    in
+    [ "-skip=^${builtins.concatStringsSep "$|^" skippedTests}$" ];
+
+  nativeBuildInputs = [ installShellFiles ];
+
+  postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
+    installShellCompletion --cmd alist \
+      --bash <($out/bin/alist completion bash) \
+      --fish <($out/bin/alist completion fish) \
+      --zsh <($out/bin/alist completion zsh)
+  '';
+
+  doInstallCheck = true;
+
+  versionCheckProgramArg = "version";
+
+  nativeInstallCheckInputs = [
+    versionCheckHook
+  ];
+
+  meta = {
+    description = "File list/WebDAV program that supports multiple storages";
+    homepage = "https://github.com/alist-org/alist";
+    changelog = "https://github.com/alist-org/alist/releases/tag/v${version}";
+    license = with lib.licenses; [
+      agpl3Only
+      # alist-web
+      mit
+    ];
+    maintainers = with lib.maintainers; [ moraxyc ];
+    sourceProvenance = with lib.sourceTypes; [
+      fromSource
+      # alist-web
+      binaryBytecode
+    ];
+    mainProgram = "alist";
+  };
+}
--- a/pkgs/by-name/bi/bitwarden-desktop/dont-auto-setup-biometrics.patch
+++ b/pkgs/by-name/bi/bitwarden-desktop/dont-auto-setup-biometrics.patch
@ -0,0 +1,13 @@
+diff --git a/apps/desktop/src/platform/main/biometric/biometric.unix.main.ts b/apps/desktop/src/platform/main/biometric/biometric.unix.main.ts
+index e2428d9d12..de4e9e1e62 100644
+--- a/apps/desktop/src/platform/main/biometric/biometric.unix.main.ts
+++ b/apps/desktop/src/platform/main/biometric/biometric.unix.main.ts
+@@ -109,7 +109,7 @@ export default class BiometricUnixMain implements OsBiometricService {
+     // The user needs to manually set up the polkit policy outside of the sandbox
+     // since we allow access to polkit via dbus for the sandboxed clients, the authentication works from
+     // the sandbox, once the policy is set up outside of the sandbox.
+-    return isLinux() && !isSnapStore() && !isFlatpak();
+    return false;
+   }
+ 
+   async osBiometricsSetup(): Promise<void> {
--- a/pkgs/by-name/bi/bitwarden-desktop/package.nix
+++ b/pkgs/by-name/bi/bitwarden-desktop/package.nix
@ -46,11 +46,15 @@ in buildNpmPackage rec {

  patches = [
    ./electron-builder-package-lock.patch
+    ./dont-auto-setup-biometrics.patch
+    ./set-exe-path.patch # ensures `app.getPath("exe")` returns our wrapper, not ${electron}/bin/electron
  ];

  postPatch = ''
    # remove code under unfree license
    rm -r bitwarden_license
+
+    substituteInPlace apps/desktop/src/main.ts --replace-fail '%%exePath%%' "$out/bin/bitwarden"
  '';

  nodejs = nodejs_20;
@ -174,6 +178,13 @@ in buildNpmPackage rec {
      --set-default ELECTRON_IS_DEV 0 \
      --inherit-argv0

+    # Extract the polkit policy file from the multiline string in the source code.
+    # This may break in the future but its better than copy-pasting it manually.
+    mkdir -p $out/share/polkit-1/actions/
+    pushd apps/desktop/src/platform/main/biometric
+    awk '/const polkitPolicy = `/{gsub(/^.*`/, ""); print; str=1; next} str{if (/`;/) str=0; gsub(/`;/, ""); print}' biometric.unix.main.ts > $out/share/polkit-1/actions/com.bitwarden.Bitwarden.policy
+    popd
+
    pushd apps/desktop/resources/icons
    for icon in *.png; do
      dir=$out/share/icons/hicolor/"''${icon%.png}"/apps
--- a/pkgs/by-name/bi/bitwarden-desktop/set-exe-path.patch
+++ b/pkgs/by-name/bi/bitwarden-desktop/set-exe-path.patch
@ -0,0 +1,13 @@
+diff --git a/apps/desktop/src/main.ts b/apps/desktop/src/main.ts
+index 86d07440a7..be9fa6b4ab 100644
+--- a/apps/desktop/src/main.ts
+++ b/apps/desktop/src/main.ts
+@@ -80,6 +80,8 @@ export class Main {
+       appDataPath = path.join(process.env.SNAP_USER_DATA, "appdata");
+     }
+ 
+    app.setPath("exe", "%%exePath%%");
+
+     app.on("ready", () => {
+       // on ready stuff...
+     });
--- a/pkgs/by-name/br/brave/make-brave.nix
+++ b/pkgs/by-name/br/brave/make-brave.nix
@ -50,6 +50,10 @@
  xorg,
  zlib,

+  # Darwin dependencies
+  unzip,
+  makeWrapper,
+
  # command line arguments which are always set e.g "--disable-gpu"
  commandLineArgs ? "",

@ -76,7 +80,6 @@
  version,
  hash,
  url,
-  platform,
 }:

 let
@ -161,16 +164,21 @@ stdenv.mkDerivation {
  dontConfigure = true;
  dontBuild = true;
  dontPatchELF = true;
-  doInstallCheck = true;
+  doInstallCheck = stdenv.hostPlatform.isLinux;

-  nativeBuildInputs = [
-    dpkg
-    # override doesn't preserve splicing https://github.com/NixOS/nixpkgs/issues/132651
-    # Has to use `makeShellWrapper` from `buildPackages` even though `makeShellWrapper` from the inputs is spliced because `propagatedBuildInputs` would pick the wrong one because of a different offset.
-    (buildPackages.wrapGAppsHook3.override { makeWrapper = buildPackages.makeShellWrapper; })
-  ];
+  nativeBuildInputs =
+    lib.optionals stdenv.hostPlatform.isLinux [
+      dpkg
+      # override doesn't preserve splicing https://github.com/NixOS/nixpkgs/issues/132651
+      # Has to use `makeShellWrapper` from `buildPackages` even though `makeShellWrapper` from the inputs is spliced because `propagatedBuildInputs` would pick the wrong one because of a different offset.
+      (buildPackages.wrapGAppsHook3.override { makeWrapper = buildPackages.makeShellWrapper; })
+    ]
+    ++ lib.optionals stdenv.hostPlatform.isDarwin [
+      unzip
+      makeWrapper
+    ];

-  buildInputs = [
+  buildInputs = lib.optionals stdenv.hostPlatform.isLinux [
    # needed for GSETTINGS_SCHEMAS_PATH
    glib
    gsettings-desktop-schemas
@ -181,57 +189,73 @@ stdenv.mkDerivation {
    adwaita-icon-theme
  ];

-  unpackPhase = "dpkg-deb --fsys-tarfile $src | tar -x --no-same-permissions --no-same-owner";
+  unpackPhase =
+    if stdenv.hostPlatform.isLinux then
+      "dpkg-deb --fsys-tarfile $src | tar -x --no-same-permissions --no-same-owner"
+    else
+      "unzip $src";

-  installPhase = ''
-    runHook preInstall
+  installPhase =
+    lib.optionalString stdenv.hostPlatform.isLinux ''
+      runHook preInstall

-    mkdir -p $out $out/bin
+      mkdir -p $out $out/bin

-    cp -R usr/share $out
-    cp -R opt/ $out/opt
+      cp -R usr/share $out
+      cp -R opt/ $out/opt

-    export BINARYWRAPPER=$out/opt/brave.com/brave/brave-browser
+      export BINARYWRAPPER=$out/opt/brave.com/brave/brave-browser

-    # Fix path to bash in $BINARYWRAPPER
-    substituteInPlace $BINARYWRAPPER \
-        --replace /bin/bash ${stdenv.shell}
+      # Fix path to bash in $BINARYWRAPPER
+      substituteInPlace $BINARYWRAPPER \
+          --replace /bin/bash ${stdenv.shell}

-    ln -sf $BINARYWRAPPER $out/bin/brave
+      ln -sf $BINARYWRAPPER $out/bin/brave

-    for exe in $out/opt/brave.com/brave/{brave,chrome_crashpad_handler}; do
-        patchelf \
-            --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
-            --set-rpath "${rpath}" $exe
-    done
+      for exe in $out/opt/brave.com/brave/{brave,chrome_crashpad_handler}; do
+          patchelf \
+              --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
+              --set-rpath "${rpath}" $exe
+      done

-    # Fix paths
-    substituteInPlace $out/share/applications/brave-browser.desktop \
-        --replace /usr/bin/brave-browser-stable $out/bin/brave
-    substituteInPlace $out/share/gnome-control-center/default-apps/brave-browser.xml \
-        --replace /opt/brave.com $out/opt/brave.com
-    substituteInPlace $out/share/menu/brave-browser.menu \
-        --replace /opt/brave.com $out/opt/brave.com
-    substituteInPlace $out/opt/brave.com/brave/default-app-block \
-        --replace /opt/brave.com $out/opt/brave.com
+      # Fix paths
+      substituteInPlace $out/share/applications/brave-browser.desktop \
+          --replace /usr/bin/brave-browser-stable $out/bin/brave
+      substituteInPlace $out/share/gnome-control-center/default-apps/brave-browser.xml \
+          --replace /opt/brave.com $out/opt/brave.com
+      substituteInPlace $out/share/menu/brave-browser.menu \
+          --replace /opt/brave.com $out/opt/brave.com
+      substituteInPlace $out/opt/brave.com/brave/default-app-block \
+          --replace /opt/brave.com $out/opt/brave.com

-    # Correct icons location
-    icon_sizes=("16" "24" "32" "48" "64" "128" "256")
+      # Correct icons location
+      icon_sizes=("16" "24" "32" "48" "64" "128" "256")

-    for icon in ''${icon_sizes[*]}
-    do
-        mkdir -p $out/share/icons/hicolor/$icon\x$icon/apps
-        ln -s $out/opt/brave.com/brave/product_logo_$icon.png $out/share/icons/hicolor/$icon\x$icon/apps/brave-browser.png
-    done
+      for icon in ''${icon_sizes[*]}
+      do
+          mkdir -p $out/share/icons/hicolor/$icon\x$icon/apps
+          ln -s $out/opt/brave.com/brave/product_logo_$icon.png $out/share/icons/hicolor/$icon\x$icon/apps/brave-browser.png
+      done

-    # Replace xdg-settings and xdg-mime
-    ln -sf ${xdg-utils}/bin/xdg-settings $out/opt/brave.com/brave/xdg-settings
-    ln -sf ${xdg-utils}/bin/xdg-mime $out/opt/brave.com/brave/xdg-mime
+      # Replace xdg-settings and xdg-mime
+      ln -sf ${xdg-utils}/bin/xdg-settings $out/opt/brave.com/brave/xdg-settings
+      ln -sf ${xdg-utils}/bin/xdg-mime $out/opt/brave.com/brave/xdg-mime

-    runHook postInstall
-  '';
+      runHook postInstall
+    ''
+    + lib.optionalString stdenv.hostPlatform.isDarwin ''
+      runHook preInstall

-  preFixup = ''
+      mkdir -p $out/{Applications,bin}
+
+      cp -r "Brave Browser.app" $out/Applications/
+
+      makeWrapper "$out/Applications/Brave Browser.app/Contents/MacOS/Brave Browser" $out/bin/brave
+
+      runHook postInstall
+    '';
+
+  preFixup = lib.optionalString stdenv.hostPlatform.isLinux ''
    # Add command line args to wrapGApp.
    gappsWrapperArgs+=(
      --prefix LD_LIBRARY_PATH : ${rpath}
@ -286,10 +310,13 @@ stdenv.mkDerivation {
      jefflabonte
      nasirhm
      buckley310
+      matteopacini
    ];
    platforms = [
      "aarch64-linux"
      "x86_64-linux"
+      "aarch64-darwin"
+      "x86_64-darwin"
    ];
    mainProgram = "brave";
  };
--- a/pkgs/by-name/br/brave/package.nix
+++ b/pkgs/by-name/br/brave/package.nix
@ -14,6 +14,14 @@ let
      url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb";
      hash = "sha256-fJczTAra+j8+veicz4lIyKSNJyxJK4q9gpZoAyQwkxQ=";
    };
+    aarch64-darwin = {
+      url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-v${version}-darwin-arm64.zip";
+      hash = "sha256-kDiZ6NKQ+v1jBEUexItKTCKFsbnOtSzPmGEVWI5JoXI=";
+    };
+    x86_64-darwin = {
+      url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-v${version}-darwin-x64.zip";
+      hash = "sha256-/yl4k/XvmL7oBW1XU4wVNHfa07Z+XMHYTkkufhDCXUc=";
+    };
  };

  archive =
@ -27,6 +35,5 @@ callPackage ./make-brave.nix (removeAttrs args [ "callPackage" ]) (
  archive
  // {
    inherit pname version;
-    platform = stdenv.system;
  }
 )
--- a/pkgs/by-name/br/brave/update.sh
+++ b/pkgs/by-name/br/brave/update.sh
@ -5,15 +5,10 @@ SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" &>/dev/null && pwd)"

 latestVersion="$(curl --fail -s ${GITHUB_TOKEN:+-u ":$GITHUB_TOKEN"} "https://api.github.com/repos/brave/brave-browser/releases/latest" | jq -r '.tag_name' | sed 's/^v//')"

-hashAarch64="$(nix hash to-sri --type sha256 \
-    $(curl -sL https://brave-browser-apt-release.s3.brave.com/dists/stable/main/binary-arm64/Packages \
-    | sed -r -n 's/^SHA256: (.*)/\1/p' | head -n1)
-)"
-
-hashAmd64="$(nix hash to-sri --type sha256 \
-    $(curl -sL https://brave-browser-apt-release.s3.brave.com/dists/stable/main/binary-amd64/Packages \
-    | sed -r -n 's/^SHA256: (.*)/\1/p' | head -n1)
-)"
+hashAarch64="$(nix-hash --to-sri --type sha256 "$(nix-prefetch-url --type sha256 "https://github.com/brave/brave-browser/releases/download/v${latestVersion}/brave-browser_${latestVersion}_arm64.deb")")"
+hashAmd64="$(nix-hash --to-sri --type sha256 "$(nix-prefetch-url --type sha256 "https://github.com/brave/brave-browser/releases/download/v${latestVersion}/brave-browser_${latestVersion}_amd64.deb")")"
+hashAarch64Darwin="$(nix-hash --to-sri --type sha256 "$(nix-prefetch-url --type sha256 "https://github.com/brave/brave-browser/releases/download/v${latestVersion}/brave-v${latestVersion}-darwin-arm64.zip")")"
+hashAmd64Darwin="$(nix-hash --to-sri --type sha256 "$(nix-prefetch-url --type sha256 "https://github.com/brave/brave-browser/releases/download/v${latestVersion}/brave-v${latestVersion}-darwin-x64.zip")")"

 cat > $SCRIPT_DIR/package.nix << EOF
 # Expression generated by update.sh; do not edit it by hand!
@ -32,6 +27,14 @@ let
      url = "https://github.com/brave/brave-browser/releases/download/v\${version}/brave-browser_\${version}_amd64.deb";
      hash = "${hashAmd64}";
    };
+    aarch64-darwin = {
+      url = "https://github.com/brave/brave-browser/releases/download/v\${version}/brave-v\${version}-darwin-arm64.zip";
+      hash = "${hashAarch64Darwin}";
+    };
+    x86_64-darwin = {
+      url = "https://github.com/brave/brave-browser/releases/download/v\${version}/brave-v\${version}-darwin-x64.zip";
+      hash = "${hashAmd64Darwin}";
+    };
  };

  archive =
--- a/pkgs/by-name/ch/choparp/package.nix
+++ b/pkgs/by-name/ch/choparp/package.nix
@ -0,0 +1,45 @@
+{
+  stdenv,
+  lib,
+  fetchFromGitHub,
+  unstableGitUpdater,
+  libpcap,
+  installShellFiles,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "choparp";
+  version = "0-unstable-2021-04-23";
+
+  src = fetchFromGitHub {
+    owner = "quinot";
+    repo = "choparp";
+    rev = "e9f0b81135d81cb0416504a7e695e158f4a5285e";
+    hash = "sha256-0VZj7Hkn/aiRddWdBzDAXdOdxJZvwd+KaN9ddrrBjm8=";
+  };
+
+  nativeBuildInputs = [
+    installShellFiles
+  ];
+
+  buildPhase = ''
+    runHook preBuild
+
+    mkdir -p $out/bin
+    $CC -o $out/bin/choparp src/choparp.c -lpcap -L${lib.getLib libpcap}/lib -I${lib.getDev libpcap}/include
+    installManPage src/choparp.8
+
+    runHook postBuild
+  '';
+
+  passthru.updateScript = unstableGitUpdater { hardcodeZeroVersion = true; };
+
+  meta = {
+    homepage = "https://github.com/quinot/choparp";
+    description = "Proxy ARP daemon";
+    maintainers = with lib.maintainers; [ bot-wxt1221 ];
+    platforms = lib.platforms.unix;
+    license = lib.licenses.bsd3;
+    mainProgram = "choparp";
+  };
+})
--- a/pkgs/by-name/ci/circom/package.nix
+++ b/pkgs/by-name/ci/circom/package.nix
@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
    owner = "iden3";
    repo = "circom";
    rev = "v${version}";
-    hash = "sha256-OxfqbsxSIy0tLDMfDmdCZeMb2LCSG7I+Vm9RHb7tXFc=";
+    hash = "sha256-jaBtBFvGRTRImXQNM+FXr23XQqC5V7hRa9SZAgB/K4c=";
  };

  cargoHash = "sha256-KmUTlzRRmtD9vKJmh0MSUQxN8gz4qnp9fLs5Z0Lmypw=";
--- a/pkgs/by-name/ci/circt/package.nix
+++ b/pkgs/by-name/ci/circt/package.nix
@ -67,12 +67,14 @@ stdenv.mkDerivation rec {
        # Disable some tests on x86_64-darwin
        ++ lib.optionals (stdenv.hostPlatform.system == "x86_64-darwin") [
          # These test seem to pass on hydra (rosetta) but not on x86_64-darwin machines
-          "CIRCT :: Target/ExportSMTLIB/attributes.mlir"
-          "CIRCT :: Target/ExportSMTLIB/basic.mlir"
-          "CIRCT :: circt-bmc/comb-errors.mlir"
-          "CIRCT :: circt-bmc/seq-errors.mlir"
-          # This test was having issues with rosetta
-          "CIRCT :: Dialect/SMT/basic.mlir"
+          "CIRCT :: Target/ExportSMTLIB/.*\.mlir"
+          "CIRCT :: circt-bmc/.*\.mlir"
+          # These tests were having issues on rosetta
+          "CIRCT :: Dialect/.*/Reduction/.*\.mlir"
+          "CIRCT :: Dialect/SMT/.*\.mlir"
+          "CIRCT :: circt-as-dis/.*\.mlir"
+          "CIRCT :: circt-reduce/.*\.mlir"
+          "CIRCT :: circt-test/basic.mlir"
        ];
    in
    if lit-filters != [ ] then lib.strings.concatStringsSep "|" lit-filters else null;
--- a/pkgs/by-name/es/eslint_d/package.nix
+++ b/pkgs/by-name/es/eslint_d/package.nix
@ -2,16 +2,16 @@

 buildNpmPackage rec {
  pname = "eslint_d";
-  version = "14.1.1";
+  version = "14.2.2";

  src = fetchFromGitHub {
    owner = "mantoni";
    repo = "eslint_d.js";
    rev = "v${version}";
-    hash = "sha256-r+AQFFzB3PhvER6oVHpqQiFuaHuT+2O8gL2zu8aCTbs=";
+    hash = "sha256-7VsbGudZlfrjU+x3a9OWxu9qDCiDUq8xez85qNj08xY=";
  };

-  npmDepsHash = "sha256-XOFRzGPrisXE8GyqVO5xms+o9OwA9w0y+uJkcdyX+z0=";
+  npmDepsHash = "sha256-u8kmHQ7UfCR446d+HbkGlK76Aki+KrOtBO6/a/VXoTg=";

  dontNpmBuild = true;

--- a/pkgs/by-name/go/google-chrome/package.nix
+++ b/pkgs/by-name/go/google-chrome/package.nix
@ -166,11 +166,11 @@ let

  linux = stdenv.mkDerivation (finalAttrs: {
    inherit pname meta passthru;
-    version = "130.0.6723.91";
+    version = "131.0.6778.69";

    src = fetchurl {
      url = "https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_${finalAttrs.version}-1_amd64.deb";
-      hash = "sha256-30RwtLlU4GhqDhbHTZMqrih77d2yOFeIBiOG3CugvLo=";
+      hash = "sha256-7aE6RZE5kB3DaJFUDdc2Ter8SsZZM0JzYmKn1hF1BUs=";
    };

    # With strictDeps on, some shebangs were not being patched correctly
@ -266,11 +266,11 @@ let

  darwin = stdenvNoCC.mkDerivation (finalAttrs: {
    inherit pname meta passthru;
-    version = "130.0.6723.92";
+    version = "131.0.6778.70";

    src = fetchurl {
-      url = "http://dl.google.com/release2/chrome/adlhlvvxwq7oxwh4d3ghghzdnhaq_130.0.6723.92/GoogleChrome-130.0.6723.92.dmg";
-      hash = "sha256-R1YCj0Ou+pyGUCxh6ATTTPIb5qUTnGROZypuAh8SlAg=";
+      url = "http://dl.google.com/release2/chrome/acwi7l3xj4g6lag6mccophfiv2aa_131.0.6778.70/GoogleChrome-131.0.6778.70.dmg";
+      hash = "sha256-Gikqdh9g3FAnWBLrxMtbomKceIaMsz/GnguiEUpKJW0=";
    };

    dontPatch = true;
--- a/pkgs/by-name/go/goxlr-utility/Cargo.lock
+++ b/pkgs/by-name/go/goxlr-utility/Cargo.lock
@ -510,7 +510,7 @@ checksum = "d7ebdfa2ebdab6b1760375fa7d6f382b9f486eac35fc994625a00e89280bdbb7"
 dependencies = [
 "async-task",
 "concurrent-queue",
- "fastrand 2.1.0",
+ "fastrand 2.1.1",
 "futures-lite 2.3.0",
 "slab",
 ]
@ -1755,9 +1755,9 @@ dependencies = [

 [[package]]
 name = "fastrand"
-version = "2.1.0"
+version = "2.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9fc0510504f03c51ada170672ac806f1f105a88aa97a5281117e1ddc3368e51a"
+checksum = "e8c02a5121d4ea3eb16a80748c74f5549a5665e4c21333c6098f283870fbdea6"

 [[package]]
 name = "fdeflate"
@ -1964,7 +1964,7 @@ version = "2.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "52527eb5074e35e9339c6b4e8d12600c7128b68fb25dcb9fa9dec18f7c25f3a5"
 dependencies = [
- "fastrand 2.1.0",
+ "fastrand 2.1.1",
 "futures-core",
 "futures-io",
 "parking",
@ -2059,7 +2059,7 @@ checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b"

 [[package]]
 name = "goxlr-audio"
-version = "1.1.1"
+version = "1.1.4"
 dependencies = [
 "anyhow",
 "cpal",
@ -2076,7 +2076,7 @@ dependencies = [

 [[package]]
 name = "goxlr-client"
-version = "1.1.1"
+version = "1.1.4"
 dependencies = [
 "anyhow",
 "clap 4.5.11",
@ -2093,7 +2093,7 @@ dependencies = [

 [[package]]
 name = "goxlr-daemon"
-version = "1.1.1"
+version = "1.1.4"
 dependencies = [
 "actix",
 "actix-cors",
@ -2164,7 +2164,7 @@ dependencies = [

 [[package]]
 name = "goxlr-defaults"
-version = "1.1.1"
+version = "1.1.4"
 dependencies = [
 "clap 4.5.11",
 "include_dir",
@ -2172,7 +2172,7 @@ dependencies = [

 [[package]]
 name = "goxlr-initialiser"
-version = "1.1.1"
+version = "1.1.4"
 dependencies = [
 "anyhow",
 "block",
@ -2184,7 +2184,7 @@ dependencies = [

 [[package]]
 name = "goxlr-ipc"
-version = "1.1.1"
+version = "1.1.4"
 dependencies = [
 "anyhow",
 "async-trait",
@ -2205,7 +2205,7 @@ dependencies = [

 [[package]]
 name = "goxlr-launcher"
-version = "1.1.1"
+version = "1.1.4"
 dependencies = [
 "anyhow",
 "goxlr-ipc",
@ -2221,12 +2221,13 @@ dependencies = [

 [[package]]
 name = "goxlr-profile-loader"
-version = "1.1.1"
+version = "1.1.4"
 dependencies = [
 "anyhow",
 "byteorder",
 "enum-map",
 "enum-map-derive",
+ "fastrand 2.1.1",
 "log",
 "quick-xml",
 "ritelinked",
@ -2238,7 +2239,7 @@ dependencies = [

 [[package]]
 name = "goxlr-scribbles"
-version = "1.1.1"
+version = "1.1.4"
 dependencies = [
 "ab_glyph",
 "anyhow",
@ -2249,7 +2250,7 @@ dependencies = [

 [[package]]
 name = "goxlr-types"
-version = "1.1.1"
+version = "1.1.4"
 dependencies = [
 "clap 4.5.11",
 "derivative",
@ -2262,7 +2263,7 @@ dependencies = [

 [[package]]
 name = "goxlr-usb"
-version = "1.1.1"
+version = "1.1.4"
 dependencies = [
 "anyhow",
 "byteorder",
@ -3801,7 +3802,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ae1d5c74c9876f070d3e8fd503d748c7d974c3e48da8f41350fa5222ef9b4391"
 dependencies = [
 "atomic-waker",
- "fastrand 2.1.0",
+ "fastrand 2.1.1",
 "futures-io",
 ]

@ -4989,7 +4990,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1"
 dependencies = [
 "cfg-if",
- "fastrand 2.1.0",
+ "fastrand 2.1.1",
 "rustix 0.38.34",
 "windows-sys 0.52.0",
 ]
--- a/pkgs/by-name/go/goxlr-utility/package.nix
+++ b/pkgs/by-name/go/goxlr-utility/package.nix
@ -1,23 +1,24 @@
-{ lib
-, fetchFromGitHub
-, rustPlatform
-, installShellFiles
-, pkg-config
-, libpulseaudio
-, dbus
-, openssl
-, speechd-minimal
+{
+  lib,
+  fetchFromGitHub,
+  rustPlatform,
+  installShellFiles,
+  pkg-config,
+  libpulseaudio,
+  dbus,
+  openssl,
+  speechd-minimal,
 }:

 rustPlatform.buildRustPackage rec {
  pname = "goxlr-utility";
-  version = "1.1.1-unstable-2024-08-06";
+  version = "1.1.4";

  src = fetchFromGitHub {
    owner = "GoXLR-on-Linux";
    repo = "goxlr-utility";
-    rev = "dcd4454a2634f5a2af10f00c1cbcb016241ce2cb";
-    hash = "sha256-kWfCFsk0GhqX+pYOTeJd7XHlcWOX4D6fmIU/4nylU3Y=";
+    rev = "v${version}";
+    hash = "sha256-aThIu+3eNHCKS6lsio7cLZeIMg0509qkE0YQ6M6vPAI=";
  };

  cargoLock = {
@ -70,4 +71,3 @@ rustPlatform.buildRustPackage rec {
    maintainers = with maintainers; [ errnoh ];
  };
 }
-
--- a/pkgs/by-name/gq/gqlgenc/package.nix
+++ b/pkgs/by-name/gq/gqlgenc/package.nix
@ -20,6 +20,6 @@ buildGoModule rec {
    mainProgram = "gqlgenc";
    homepage = "https://github.com/Yamashou/gqlgenc";
    license = licenses.mit;
-    maintainers = with maintainers; [ milran ];
+    maintainers = with maintainers; [ wattmto ];
  };
 }
--- a/pkgs/by-name/gu/guymager/package.nix
+++ b/pkgs/by-name/gu/guymager/package.nix
@ -0,0 +1,79 @@
+{
+  lib,
+  stdenv,
+  fetchurl,
+  libsForQt5,
+  dpkg,
+  parted,
+  udev,
+  libewf-legacy,
+  libbfio,
+  libguytools,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "guymager";
+  version = "0.8.13";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/project/guymager/guymager/LatestSource/guymager-${finalAttrs.version}.tar.gz";
+    hash = "sha256-xDsQ/d6fyfLOr4uXpdoqMljfFrVgQTUu0t2e5opcaRg=";
+  };
+
+  enableParallelBuilding = true;
+
+  nativeBuildInputs = [
+    dpkg
+    libsForQt5.qmake
+    libsForQt5.qttools
+    libsForQt5.wrapQtAppsHook
+  ];
+  buildInputs = [
+    libsForQt5.qtbase
+    libewf-legacy
+    libbfio
+    libguytools
+    parted
+    udev
+  ];
+
+  postPatch = ''
+    patchShebangs compileinfo.sh
+    substituteInPlace manuals/guymager_body.1 config.cpp \
+      --replace-fail "/etc/guymager/guymager.cfg" "$out/share/guymager/guymager.cfg"
+    substituteInPlace compileinfo.sh \
+      --replace-fail " debian/changelog" "" \
+      --replace-fail "dpkg-parsechangelog" "dpkg-parsechangelog -l changelog"
+    substituteInPlace threadscan.cpp \
+    --replace-fail '/lib,/usr/lib,/usr/lib64,/usr/local/lib' '${
+      builtins.replaceStrings [ ":" ] [ "," ] (
+        lib.makeLibraryPath [
+          udev
+          parted
+        ]
+      )
+    }'
+    substituteInPlace org.freedesktop.guymager.policy guymager.pro main.cpp guymager.cfg \
+      --replace-fail /usr $out
+  '';
+
+  installPhase = ''
+    runHook preInstall
+    mkdir -p $out/{bin,share}
+    make clean
+    rm -rf *.cpp *.h *.pro
+    cp -aR . "$out/share/guymager/"
+    makeWrapper $out/share/guymager/guymager $out/bin/guymager
+    runHook postInstall
+  '';
+
+  meta = {
+    description = "Forensic imager for media acquisition";
+    mainProgram = "guymager";
+    homepage = "https://guymager.sourceforge.io";
+    maintainers = with lib.maintainers; [ d3vil0p3r ];
+    platforms = lib.platforms.linux;
+    sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
+    license = lib.licenses.gpl2Only;
+  };
+})
--- a/pkgs/by-name/im/immersed/darwin.nix
+++ b/pkgs/by-name/im/immersed/darwin.nix
@ -1,13 +1,19 @@
-{ stdenv
-, pname
-, version
-, src
-, meta
-, undmg
+{
+  stdenv,
+  pname,
+  version,
+  src,
+  meta,
+  undmg,
 }:

 stdenv.mkDerivation {
-  inherit pname version src meta;
+  inherit
+    pname
+    version
+    src
+    meta
+    ;

  nativeBuildInputs = [ undmg ];

--- a/pkgs/by-name/im/immersed/linux.nix
+++ b/pkgs/by-name/im/immersed/linux.nix
@ -1,9 +1,10 @@
-{ pname
-, version
-, src
-, meta
-, appimageTools
-, libgpg-error
+{
+  pname,
+  version,
+  src,
+  meta,
+  appimageTools,
+  libgpg-error,
 }:

 let
@ -22,23 +23,24 @@ appimageTools.wrapAppImage rec {
  inherit pname version meta;
  src = src';

-  extraPkgs = pkgs: with pkgs; [
-    libgpg-error
-    fontconfig
-    libGL
-    mesa
-    wayland
-    pipewire
-    fribidi
-    harfbuzz
-    freetype
-    libthai
-    e2fsprogs
-    zlib
-    libp11
-    xorg.libX11
-    xorg.libSM
-  ];
+  extraPkgs =
+    pkgs: with pkgs; [
+      libgpg-error
+      fontconfig
+      libGL
+      mesa
+      wayland
+      pipewire
+      fribidi
+      harfbuzz
+      freetype
+      libthai
+      e2fsprogs
+      zlib
+      libp11
+      xorg.libX11
+      xorg.libSM
+    ];

  multiArch = true;
 }
--- a/pkgs/by-name/im/immersed/package.nix
+++ b/pkgs/by-name/im/immersed/package.nix
@ -1,8 +1,9 @@
-{ lib
-, appimageTools
-, callPackage
-, fetchurl
-, stdenv
+{
+  lib,
+  appimageTools,
+  callPackage,
+  fetchurl,
+  stdenv,
 }:
 let
  pname = "immersed";
@ -26,11 +27,30 @@ let
    description = "VR coworking platform";
    homepage = "https://immersed.com";
    license = licenses.unfree;
-    maintainers = with maintainers; [ haruki7049 pandapip1 ];
+    maintainers = with maintainers; [
+      haruki7049
+      pandapip1
+    ];
    platforms = builtins.attrNames sources;
    sourceProvenance = with sourceTypes; [ binaryNativeCode ];
  };

-in if stdenv.hostPlatform.isDarwin
-then callPackage ./darwin.nix { inherit pname version src meta; }
-else callPackage ./linux.nix { inherit pname version src meta; }
+in
+if stdenv.hostPlatform.isDarwin then
+  callPackage ./darwin.nix {
+    inherit
+      pname
+      version
+      src
+      meta
+      ;
+  }
+else
+  callPackage ./linux.nix {
+    inherit
+      pname
+      version
+      src
+      meta
+      ;
+  }
--- a/pkgs/by-name/in/intentrace/package.nix
+++ b/pkgs/by-name/in/intentrace/package.nix
@ -0,0 +1,34 @@
+{
+  fetchFromGitHub,
+  lib,
+  rustPlatform,
+}:
+
+let
+  version = "0.2.4";
+in
+rustPlatform.buildRustPackage {
+  inherit version;
+  pname = "intentrace";
+
+  src = fetchFromGitHub {
+    owner = "sectordistrict";
+    repo = "intentrace";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-Bsis8tL2xahJT/qAFVbbd/CZ7n8KJYLPTIl1a1WHR4c=";
+  };
+
+  cargoHash = "sha256-pyGcQy7p0+Vqv3Khy1hLgahcOpqnbKKmRLZcKwkvVWw=";
+
+  meta = {
+    description = "Prettified Linux syscall tracing tool (like strace)";
+    homepage = "https://github.com/sectordistrict/intentrace";
+    license = lib.licenses.mit;
+    platforms = [ "x86_64-linux" ];
+    mainProgram = "intentrace";
+    maintainers = with lib.maintainers; [
+      cloudripper
+      jk
+    ];
+  };
+}
--- a/pkgs/by-name/in/invidious/package.nix
+++ b/pkgs/by-name/in/invidious/package.nix
--- a/pkgs/by-name/in/invidious/shards.nix
+++ b/pkgs/by-name/in/invidious/shards.nix
--- a/pkgs/by-name/in/invidious/update.sh
+++ b/pkgs/by-name/in/invidious/update.sh
@ -51,7 +51,7 @@ json_set '.invidious.date' "$date"
 json_set '.invidious.commit' "$commit"
 json_set '.invidious.version' "$new_version"

-new_hash=$(nix-prefetch -I 'nixpkgs=../../..' "$pkg")
+new_hash=$(nix-prefetch -I 'nixpkgs=../../../..' "$pkg")
 json_set '.invidious.hash' "$new_hash"

 # fetch video.js dependencies
--- a/pkgs/by-name/in/invidious/versions.json
+++ b/pkgs/by-name/in/invidious/versions.json
--- a/pkgs/by-name/in/invidious/videojs.nix
+++ b/pkgs/by-name/in/invidious/videojs.nix
--- a/pkgs/by-name/in/invidious/videojs.sh
+++ b/pkgs/by-name/in/invidious/videojs.sh
--- a/pkgs/by-name/li/libguytools/package.nix
+++ b/pkgs/by-name/li/libguytools/package.nix
@ -0,0 +1,56 @@
+{
+  lib,
+  stdenv,
+  fetchurl,
+  libsForQt5,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "libguytools";
+  version = "2.1.0";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/project/libguytools/libguytools/LatestSource/tools-${finalAttrs.version}.tar.gz";
+    hash = "sha256-eVYvjo2wKW2g9/9hL9nbQa1FRWDMMqMHok0V/adPHVY=";
+  };
+
+  qmakeFlags = [
+    "trunk.pro"
+    "toolsstatic.pro"
+  ];
+
+  enableParallelBuilding = true;
+
+  nativeBuildInputs = [
+    libsForQt5.qmake
+    libsForQt5.wrapQtAppsHook
+  ];
+  dontWrapQtApps = true;
+  buildInputs = [ libsForQt5.qtbase ];
+
+  postPatch = ''
+    sed -i "/dpkg-buildflags/d" tools.pro
+    patchShebangs create_version_file.sh
+  '';
+
+  preConfigure = ''
+    ./create_version_file.sh
+  '';
+
+  installPhase = ''
+    runHook preInstall
+    mkdir -p $out
+    cp -r lib $out/
+    cp -r include $out/
+    runHook postInstall
+  '';
+
+  meta = {
+    description = "Small programming toolbox";
+    mainProgram = "libguytools";
+    homepage = "https://libguytools.sourceforge.io";
+    maintainers = with lib.maintainers; [ d3vil0p3r ];
+    platforms = lib.platforms.linux;
+    license = lib.licenses.gpl2Plus;
+  };
+})
--- a/pkgs/by-name/ma/macmon/package.nix
+++ b/pkgs/by-name/ma/macmon/package.nix
@ -0,0 +1,27 @@
+{
+  lib,
+  rustPlatform,
+  fetchFromGitHub,
+}:
+
+rustPlatform.buildRustPackage rec {
+  pname = "macmon";
+  version = "0.3.3";
+
+  src = fetchFromGitHub {
+    owner = "vladkens";
+    repo = "macmon";
+    rev = "v${version}";
+    hash = "sha256-COpEjK1LUwGzhSgD09D4gx+MtS2hT0qt06rTPT8JQiQ=";
+  };
+
+  cargoHash = "sha256-DTkpFGl8kTWttFGKTCpny2L0IRrCgpnnXaKIFoxWrW4=";
+
+  meta = {
+    homepage = "https://github.com/vladkens/macmon";
+    description = "Sudoless performance monitoring for Apple Silicon processors";
+    platforms = [ "aarch64-darwin" ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ schrobingus ];
+  };
+}
--- a/pkgs/by-name/me/mergiraf/Cargo.lock
+++ b/pkgs/by-name/me/mergiraf/Cargo.lock
--- a/pkgs/by-name/me/mergiraf/package.nix
+++ b/pkgs/by-name/me/mergiraf/package.nix
@ -0,0 +1,41 @@
+{
+  stdenv,
+  lib,
+  fetchFromGitea,
+  rustPlatform,
+
+  # native check inputs
+  git,
+}:
+
+rustPlatform.buildRustPackage rec {
+  pname = "mergiraf";
+  version = "0.2.0";
+
+  src = fetchFromGitea {
+    domain = "codeberg.org";
+    owner = "mergiraf";
+    repo = "mergiraf";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-egtX2daCbPXi5rX2OxbEZA/VI9R4HMj5LRKbUEBFo+E=";
+  };
+
+  cargoLock = {
+    lockFile = ./Cargo.lock;
+    outputHashes = {
+      "tree-sitter-go-0.23.1" = "sha256-elPqkvVYs0vADOuN/umDteWP5hqcXhQAoSkqYDtTxaU=";
+      "tree-sitter-xml-0.7.0" = "sha256-RTWvOUAs3Uql9DKsP1jf9FZZHaZORE40GXd+6g6RQZw=";
+      "tree-sitter-yaml-0.6.1" = "sha256-gS+SjOnGl/86U9VV/y1ca7naYIe7DAOvOv++jCRLTKo=";
+    };
+  };
+
+  nativeCheckInputs = [ git ];
+
+  meta = {
+    description = "Syntax-aware git merge driver for a growing collection of programming languages and file formats";
+    mainProgram = "mergiraf";
+    homepage = "https://mergiraf.org/";
+    license = lib.licenses.gpl3Only;
+    maintainers = with lib.maintainers; [ zimbatm ];
+  };
+}
--- a/pkgs/by-name/mi/mindustry/0001-fix-include-path-for-SDL2-on-linux.patch
+++ b/pkgs/by-name/mi/mindustry/0001-fix-include-path-for-SDL2-on-linux.patch
--- a/pkgs/by-name/mi/mindustry/deps.json
+++ b/pkgs/by-name/mi/mindustry/deps.json
--- a/pkgs/by-name/mi/mindustry/package.nix
+++ b/pkgs/by-name/mi/mindustry/package.nix
@ -0,0 +1,286 @@
+{
+  lib,
+  stdenv,
+  fetchpatch,
+  makeWrapper,
+  makeDesktopItem,
+  copyDesktopItems,
+  fetchFromGitHub,
+  gradle,
+  jdk17,
+  zenity,
+
+  # for arc
+  SDL2,
+  pkg-config,
+  ant,
+  curl,
+  wget,
+  alsa-lib,
+  alsa-plugins,
+  glew,
+
+  # for soloud
+  libpulseaudio ? null,
+  libjack2 ? null,
+
+  nixosTests,
+
+  # Make the build version easily overridable.
+  # Server and client build versions must match, and an empty build version means
+  # any build is allowed, so this parameter acts as a simple whitelist.
+  # Takes the package version and returns the build version.
+  makeBuildVersion ? (v: v),
+  enableClient ? true,
+  enableServer ? true,
+
+  enableWayland ? false,
+}:
+
+let
+  pname = "mindustry";
+  version = "146";
+  buildVersion = makeBuildVersion version;
+
+  jdk = jdk17;
+
+  Mindustry = fetchFromGitHub {
+    owner = "Anuken";
+    repo = "Mindustry";
+    rev = "v${version}";
+    hash = "sha256-pJAJjb8rgDL5q2hfuXH2Cyb1Szu4GixeXoLMdnIAlno=";
+  };
+  Arc = fetchFromGitHub {
+    owner = "Anuken";
+    repo = "Arc";
+    rev = "v${version}";
+    hash = "sha256-L+5fshI1oo1lVdTMTBuPzqtEeR2dq1NORP84rZ83rT0=";
+  };
+  soloud = fetchFromGitHub {
+    owner = "Anuken";
+    repo = "soloud";
+    # This is pinned in Arc's arc-core/build.gradle
+    rev = "v0.9";
+    hash = "sha256-6KlqOtA19MxeqZttNyNrMU7pKqzlNiA4rBZKp9ekanc=";
+  };
+
+  desktopItem = makeDesktopItem {
+    name = "Mindustry";
+    desktopName = "Mindustry";
+    exec = "mindustry";
+    icon = "mindustry";
+    categories = [ "Game" ];
+  };
+
+in
+assert lib.assertMsg (
+  enableClient || enableServer
+) "mindustry: at least one of 'enableClient' and 'enableServer' must be true";
+stdenv.mkDerivation {
+  inherit pname version;
+
+  unpackPhase = ''
+    runHook preUnpack
+
+    cp -r ${Mindustry} Mindustry
+    cp -r ${Arc} Arc
+    chmod -R u+w -- Mindustry Arc
+    cp -r ${soloud} Arc/arc-core/csrc/soloud
+    chmod -R u+w -- Arc/arc-core/csrc/soloud
+
+    runHook postUnpack
+  '';
+
+  patches = [
+    ./0001-fix-include-path-for-SDL2-on-linux.patch
+    # Fix build with gradle 8.8, remove on next Arc release
+    (fetchpatch {
+      url = "https://github.com/Anuken/Arc/commit/2a91c51bf45d700091e397fd0b62384763901ae6.patch";
+      hash = "sha256-sSD78GmF14vBvNe+ajUJ4uIc4p857shTP/UkAK6Pyyg=";
+      extraPrefix = "Arc/";
+      stripLen = 1;
+    })
+    (fetchpatch {
+      url = "https://github.com/Anuken/Arc/commit/d7f8ea858c425410dbd43374271a703d4443b432.patch";
+      hash = "sha256-5LPgBOV0r/dUtpyxitTu3/9tMIqjeIKfGVJi3MEr7fQ=";
+      extraPrefix = "Arc/";
+      stripLen = 1;
+    })
+    (fetchpatch {
+      url = "https://github.com/Anuken/Mindustry/commit/695dad201fb4c2b4252f2ee5abde32e968169ba5.patch";
+      hash = "sha256-bbTjyfUl+XFG/dgD1XPddVKD/ImOP5ARAP3q0FPnt58=";
+      name = "always-use-local-arc-1.patch";
+      stripLen = 1;
+      extraPrefix = "Mindustry/";
+    })
+    (fetchpatch {
+      url = "https://github.com/Anuken/Mindustry/commit/f6082225e859c759c8d9c944250b6ecd490151ed.patch";
+      hash = "sha256-xFHdAUTS1EiHNQqw6qfzYk2LMr/DjeHoEzQfcfOUcFs=";
+      name = "always-use-local-arc-2.patch";
+      stripLen = 1;
+      extraPrefix = "Mindustry/";
+    })
+    (fetchpatch {
+      url = "https://github.com/Anuken/Mindustry/commit/e4eadbbb7f35db3093a0a3d13272bdfbedfaead3.patch";
+      hash = "sha256-L/XQAxh6UgKsTVTgQKDXNRIAdtVtaY4ameT/Yb/+1p8=";
+      name = "always-use-local-arc-3.patch";
+      stripLen = 1;
+      extraPrefix = "Mindustry/";
+    })
+  ];
+
+  postPatch =
+    ''
+      # Ensure the prebuilt shared objects don't accidentally get shipped
+      rm -r Arc/natives/natives-*/libs/*
+      rm -r Arc/backends/backend-*/libs/*
+
+      cd Mindustry
+
+      # Remove unbuildable iOS stuff
+      sed -i '/^project(":ios"){/,/^}/d' build.gradle
+      sed -i '/robo(vm|VM)/d' build.gradle
+      rm ios/build.gradle
+    ''
+    + lib.optionalString (!stdenv.hostPlatform.isx86) ''
+      substituteInPlace ../Arc/arc-core/build.gradle \
+        --replace-fail "-msse" ""
+      substituteInPlace ../Arc/backends/backend-sdl/build.gradle \
+        --replace-fail "-m64" ""
+    '';
+
+  mitmCache = gradle.fetchDeps {
+    inherit pname;
+    data = ./deps.json;
+  };
+
+  __darwinAllowLocalNetworking = true;
+
+  buildInputs = lib.optionals enableClient [
+    SDL2
+    alsa-lib
+    glew
+  ];
+  nativeBuildInputs =
+    [
+      pkg-config
+      gradle
+      makeWrapper
+      jdk
+    ]
+    ++ lib.optionals enableClient [
+      ant
+      copyDesktopItems
+      curl
+      wget
+    ];
+
+  desktopItems = lib.optional enableClient desktopItem;
+
+  gradleFlags = [
+    "-Pbuildversion=${buildVersion}"
+    "-Dorg.gradle.java.home=${jdk}"
+  ];
+
+  buildPhase =
+    ''
+      runHook preBuild
+    ''
+    + lib.optionalString enableServer ''
+      gradle server:dist
+    ''
+    + lib.optionalString enableClient ''
+      pushd ../Arc
+      gradle jnigenBuild
+      gradle jnigenJarNativesDesktop
+      glewlib=${lib.getLib glew}/lib/libGLEW.so
+      sdllib=${lib.getLib SDL2}/lib/libSDL2.so
+      patchelf backends/backend-sdl/libs/linux64/libsdl-arc*.so \
+        --add-needed $glewlib \
+        --add-needed $sdllib
+      # Put the freshly-built libraries where the pre-built libraries used to be:
+      cp arc-core/libs/*/* natives/natives-desktop/libs/
+      cp extensions/freetype/libs/*/* natives/natives-freetype-desktop/libs/
+      popd
+
+      gradle desktop:dist
+    ''
+    + ''
+      runHook postBuild
+    '';
+
+  installPhase =
+    let
+      installClient = ''
+        install -Dm644 desktop/build/libs/Mindustry.jar $out/share/mindustry.jar
+        mkdir -p $out/bin
+        makeWrapper ${jdk}/bin/java $out/bin/mindustry \
+          --add-flags "-jar $out/share/mindustry.jar" \
+          ${lib.optionalString stdenv.hostPlatform.isLinux "--suffix PATH : ${lib.makeBinPath [ zenity ]}"} \
+          --suffix LD_LIBRARY_PATH : ${
+            lib.makeLibraryPath [
+              libpulseaudio
+              alsa-lib
+              libjack2
+            ]
+          } \
+          --set ALSA_PLUGIN_DIR ${alsa-plugins}/lib/alsa-lib/ ${lib.optionalString enableWayland ''
+            --set SDL_VIDEODRIVER wayland \
+            --set SDL_VIDEO_WAYLAND_WMCLASS Mindustry
+          ''}
+
+        # Retain runtime depends to prevent them from being cleaned up.
+        # Since a jar is a compressed archive, nix can't figure out that the dependency is actually in there,
+        # and will assume that it's not actually needed.
+        # This can cause issues.
+        # See https://github.com/NixOS/nixpkgs/issues/109798.
+        echo "# Retained runtime dependencies: " >> $out/bin/mindustry
+        for dep in ${SDL2.out} ${alsa-lib.out} ${glew.out}; do
+          echo "# $dep" >> $out/bin/mindustry
+        done
+
+        install -Dm644 core/assets/icons/icon_64.png $out/share/icons/hicolor/64x64/apps/mindustry.png
+      '';
+      installServer = ''
+        install -Dm644 server/build/libs/server-release.jar $out/share/mindustry-server.jar
+        mkdir -p $out/bin
+        makeWrapper ${jdk}/bin/java $out/bin/mindustry-server \
+          --add-flags "-jar $out/share/mindustry-server.jar"
+      '';
+    in
+    ''
+      runHook preInstall
+    ''
+    + lib.optionalString enableClient installClient
+    + lib.optionalString enableServer installServer
+    + ''
+      runHook postInstall
+    '';
+
+  postGradleUpdate = ''
+    # this fetches non-gradle dependencies
+    cd ../Arc
+    gradle preJni
+  '';
+
+  passthru.tests.nixosTest = nixosTests.mindustry;
+
+  meta = {
+    homepage = "https://mindustrygame.github.io/";
+    downloadPage = "https://github.com/Anuken/Mindustry/releases";
+    description = "Sandbox tower defense game";
+    sourceProvenance = with lib.sourceTypes; [
+      fromSource
+      binaryBytecode # deps
+    ];
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [
+      chkno
+      fgaz
+      thekostins
+    ];
+    platforms = lib.platforms.all;
+    # TODO alsa-lib is linux-only, figure out what dependencies are required on Darwin
+    broken = enableClient && stdenv.hostPlatform.isDarwin;
+  };
+}
--- a/pkgs/by-name/mp/mpb/package.nix
+++ b/pkgs/by-name/mp/mpb/package.nix
@ -0,0 +1,67 @@
+{
+  stdenv,
+  lib,
+  fetchFromGitHub,
+  autoreconfHook,
+  gfortran,
+  pkg-config,
+  blas,
+  lapack,
+  fftw,
+  hdf5,
+  libctl,
+  guile,
+  perl,
+}:
+
+assert !blas.isILP64;
+assert !lapack.isILP64;
+
+stdenv.mkDerivation rec {
+  pname = "mpb";
+  version = "1.11.1";
+
+  src = fetchFromGitHub {
+    owner = "NanoComp";
+    repo = pname;
+    rev = "refs/tags/v${version}";
+    hash = "sha256-+2cMjZSGdfngtGoAeZRPRPBDvflTEIOWO8Se0W6jv9k=";
+  };
+
+  nativeBuildInputs = [
+    autoreconfHook
+    gfortran
+    pkg-config
+  ];
+
+  buildInputs = [
+    blas
+    lapack
+    fftw
+    hdf5
+    libctl
+    guile
+    perl
+  ];
+
+  enableParallelBuilding = true;
+
+  configureFlags = [
+    "--with-libctl=yes"
+    "--with-libctl=${libctl}"
+    "--enable-maintainer-mode"
+    "--disable-dependency-tracking"
+  ] ++ lib.optional (!stdenv.hostPlatform.isStatic) "--enable-shared";
+
+  doCheck = true;
+
+  meta = {
+    description = "MIT Photonic-Bands: computation of photonic band structures in periodic media";
+    homepage = "https://mpb.readthedocs.io/en/latest/";
+    license = lib.licenses.gpl2Only;
+    platforms = lib.platforms.linux;
+    maintainers = with lib.maintainers; [
+      sheepforce
+    ];
+  };
+}
--- a/pkgs/by-name/ob/obsidian/package.nix
+++ b/pkgs/by-name/ob/obsidian/package.nix
@ -12,7 +12,7 @@
 }:
 let
  pname = "obsidian";
-  version = "1.7.5";
+  version = "1.7.6";
  appname = "Obsidian";
  meta = with lib; {
    description = "Powerful knowledge base that works on top of a local folder of plain text Markdown files";
@ -26,7 +26,7 @@ let
  filename = if stdenv.hostPlatform.isDarwin then "Obsidian-${version}.dmg" else "obsidian-${version}.tar.gz";
  src = fetchurl {
    url = "https://github.com/obsidianmd/obsidian-releases/releases/download/v${version}/${filename}";
-    hash = if stdenv.hostPlatform.isDarwin then "sha256-2gUXA0a7gcVFtTl5qiJFTAu6A9W79DiP0hd8j1Mwv3I=" else "sha256-T177UqPnPLM/2dGUdwhK21AByYrJu9wgEKOWrrGBQkA=";
+    hash = if stdenv.hostPlatform.isDarwin then "sha256-K7NLFbsTVNNH2VEXLiBM1KaG3fEWwaUkvxYh3vtKGvc=" else "sha256-5xkhm87eN36NmwG+t7SYnn20zT+ZELC7g2x+6/UGrHE=";
  };

  icon = fetchurl {
--- a/pkgs/by-name/oc/ocrfeeder/package.nix
+++ b/pkgs/by-name/oc/ocrfeeder/package.nix
@ -1,18 +1,20 @@
-{ lib, stdenv
-, fetchurl
-, pkg-config
-, wrapGAppsHook3
-, intltool
-, itstool
-, libxml2
-, gobject-introspection
-, gtk3
-, goocanvas2
-, gtkspell3
-, isocodes
-, python3
-, tesseract4
-, extraOcrEngines ? [] # other supported engines are: ocrad gocr cuneiform
+{
+  lib,
+  stdenv,
+  fetchurl,
+  pkg-config,
+  wrapGAppsHook3,
+  intltool,
+  itstool,
+  libxml2,
+  gobject-introspection,
+  gtk3,
+  goocanvas2,
+  gtkspell3,
+  isocodes,
+  python3,
+  tesseract4,
+  extraOcrEngines ? [ ], # other supported engines are: ocrad gocr cuneiform
 }:

 stdenv.mkDerivation (finalAttrs: {
@ -21,7 +23,7 @@ stdenv.mkDerivation (finalAttrs: {

  src = fetchurl {
    url = "mirror://gnome/sources/ocrfeeder/${lib.versions.majorMinor finalAttrs.version}/ocrfeeder-${finalAttrs.version}.tar.xz";
-    sha256 = "sha256-sD0qWUndguJzTw0uy0FIqupFf4OX6dTFvcd+Mz+8Su0=";
+    hash = "sha256-sD0qWUndguJzTw0uy0FIqupFf4OX6dTFvcd+Mz+8Su0=";
  };

  nativeBuildInputs = [
@ -33,19 +35,28 @@ stdenv.mkDerivation (finalAttrs: {
    gobject-introspection
  ];

+  postPatch = ''
+    substituteInPlace configure \
+      --replace-fail "import imp" "import importlib.util" \
+      --replace-fail "imp.find_module" "importlib.util.find_spec" \
+      --replace-fail "distutils" "setuptools._distutils"
+  '';
+
  buildInputs = [
    gtk3
    goocanvas2
    gtkspell3
    isocodes
-    (python3.withPackages(ps: with ps; [
-      pyenchant
-      sane
-      pillow
-      reportlab
-      odfpy
-      pygobject3
-    ]))
+    (python3.withPackages (
+      ps: with ps; [
+        pyenchant
+        sane
+        pillow
+        reportlab
+        odfpy
+        pygobject3
+      ]
+    ))
  ];
  patches = [
    # Compiles, but doesn't launch without this, see:
@ -53,20 +64,23 @@ stdenv.mkDerivation (finalAttrs: {
    ./fix-launch.diff
  ];

-  enginesPath = lib.makeBinPath ([
-    tesseract4
-  ] ++ extraOcrEngines);
+  enginesPath = lib.makeBinPath (
+    [
+      tesseract4
+    ]
+    ++ extraOcrEngines
+  );

  preFixup = ''
    gappsWrapperArgs+=(--prefix PATH : "${finalAttrs.enginesPath}")
    gappsWrapperArgs+=(--set ISO_CODES_DIR "${isocodes}/share/xml/iso-codes")
  '';

-  meta = with lib; {
+  meta = {
    homepage = "https://gitlab.gnome.org/GNOME/ocrfeeder";
    description = "Complete Optical Character Recognition and Document Analysis and Recognition program";
-    maintainers = with maintainers; [ doronbehar ];
-    license = licenses.gpl3Plus;
-    platforms = platforms.linux;
+    maintainers = with lib.maintainers; [ doronbehar ];
+    license = lib.licenses.gpl3Plus;
+    platforms = lib.platforms.linux;
  };
 })
--- a/pkgs/by-name/oi/oils-for-unix/package.nix
+++ b/pkgs/by-name/oi/oils-for-unix/package.nix
@ -8,11 +8,11 @@ let
 in
 stdenv.mkDerivation rec {
  pname = "oils-for-unix";
-  version = "0.23.0";
+  version = "0.24.0";

  src = fetchurl {
    url = "https://www.oilshell.org/download/oils-for-unix-${version}.tar.gz";
-    hash = "sha256-ydNcp4tKCO6vrIvGQ54rtAvM0zcNsiJkh/rtY0ihdSE=";
+    hash = "sha256-30r+2U1TswOngs4DgMOT1g9tIZIe8qJZIrQAgordmPM=";
  };

  postPatch = ''
--- a/pkgs/by-name/on/onioncircuits/package.nix
+++ b/pkgs/by-name/on/onioncircuits/package.nix
@ -42,7 +42,7 @@ python3.pkgs.buildPythonApplication rec {
    description = "GTK application to display Tor circuits and streams";
    mainProgram = "onioncircuits";
    license = licenses.gpl3;
-    maintainers = with maintainers; [ milran ];
+    maintainers = with maintainers; [ wattmto ];
  };
 }

--- a/pkgs/by-name/pf/pflask/package.nix
+++ b/pkgs/by-name/pf/pflask/package.nix
@ -1,12 +1,20 @@
-{ lib, stdenv, fetchFromGitHub, fetchpatch, python3, wafHook }:
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  fetchpatch,
+  python3,
+  wafHook,
+  waf,
+}:

-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
  pname = "pflask";
  version = "unstable-2018-01-23";

  src = fetchFromGitHub {
    owner = "ghedo";
-    repo = pname;
+    repo = "pflask";
    rev = "9ac31ffe2ed29453218aac89ae992abbd6e7cc69";
    hash = "sha256-bAKPUj/EipZ98kHbZiFZZI3hLVMoQpCrYKMmznpSDhg=";
  };
@ -21,7 +29,21 @@ stdenv.mkDerivation rec {
    })
  ];

-  nativeBuildInputs = [ python3 wafHook ];
+  waf-version = "2.0.27";
+
+  nativeBuildInputs = [
+    python3
+    (wafHook.override {
+      waf = waf.overrideAttrs (old: {
+        version = finalAttrs.waf-version;
+        src = fetchFromGitHub {
+          inherit (old.src) owner repo;
+          rev = "waf-${finalAttrs.waf-version}";
+          hash = "sha256-GeEoD5CHubwR4ndGk7J7czEf0hWtPQr88TqJDPqeK0s=";
+        };
+      });
+    })
+  ];

  postInstall = ''
    mkdir -p $out/bin
@ -34,6 +56,6 @@ stdenv.mkDerivation rec {
    homepage = "https://ghedo.github.io/pflask/";
    license = lib.licenses.bsd2;
    platforms = lib.platforms.linux;
-    maintainers = [ ];
+    maintainers = with lib.maintainers; [ bot-wxt1221 ];
  };
-}
+})
--- a/pkgs/by-name/ph/phash/0001-proper-pthread-return-value.patch
+++ b/pkgs/by-name/ph/phash/0001-proper-pthread-return-value.patch
@ -0,0 +1,40 @@
+From 6ac2f207e8d8e1d16ee73198abccc64d20c5f608 Mon Sep 17 00:00:00 2001
+From: benaryorg <binary@benary.org>
+Date: Thu, 7 Nov 2024 03:27:52 +0000
+Subject: [PATCH 1/2] proper pthread return value
+
+*pthread_create(3)* states that the ways for a pthread to exit includes:
+
+> It returns from start_routine().  This is equivalent to calling pthread_exit(3) with the value supplied in the return statement.
+
+This "retval" is a void pointer which can be anything.
+In this case, since all threads are always joined with a parameter of NULL for the `void**` to store the retval this isn't really relevant for providing a meaningful return value.
+However a `void*` function must return a `void*`, otherwise compilers will complain:
+
+> pHash.cpp:416:1: warning: no return statement in function returning non-void [8;;https://gcc.gnu.org/onlinedocs/gcc/Warning-Options.html#index-Wreturn-type-Wreturn-type8;;]
+
+Therefore returning NULL seems reasonable.
+As for the choice of NULL vs. nullptr or any other value, NULL is already widely used in the file.
+
+Long story short: this fixes a compiler warning/error.
+
+Signed-off-by: benaryorg <binary@benary.org>
+---
+ src/pHash.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/pHash.cpp b/src/pHash.cpp
+index 07b03ad..23bbbf3 100644
+--- a/src/pHash.cpp
+++ b/src/pHash.cpp
+@@ -417,6 +417,7 @@ void *ph_image_thread(void *p)
+ 		memcpy(dp->hash, &hash, sizeof(hash));
+                 dp->hash_length = 1;
+         }
+        return NULL;
+ }
+ 
+ DP** ph_dct_image_hashes(char *files[], int count, int threads)
+-- 
+2.44.1
+
--- a/pkgs/by-name/ph/phash/package.nix
+++ b/pkgs/by-name/ph/phash/package.nix
@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, pkg-config, cimg, imagemagick }:
+{ lib, stdenv, fetchFromGitHub, fetchpatch, pkg-config, cimg, imagemagick }:

 stdenv.mkDerivation rec {
  pname = "pHash";
@ -24,6 +24,13 @@ stdenv.mkDerivation rec {
    sha256 = "sha256-frISiZ89ei7XfI5F2nJJehfQZsk0Mlb4n91q/AiZ2vA=";
  };

+  NIX_LDFLAGS = "-lfftw3_threads";
+
+  patches = [
+    # proper pthread return value (https://github.com/clearscene/pHash/pull/20)
+    ./0001-proper-pthread-return-value.patch
+  ];
+
  meta = with lib; {
    description = "Compute the perceptual hash of an image";
    license = licenses.gpl3;
--- a/pkgs/by-name/re/redlib/package.nix
+++ b/pkgs/by-name/re/redlib/package.nix
@ -9,16 +9,16 @@
 }:
 rustPlatform.buildRustPackage rec {
  pname = "redlib";
-  version = "0.35.1-unstable-2024-09-22";
+  version = "0.35.1-unstable-2024-11-01";

  src = fetchFromGitHub {
    owner = "redlib-org";
    repo = "redlib";
-    rev = "d5f137ce47de39e2c8c4ed09d13ba1f809bee560";
-    hash = "sha256-12XKeBCKciKummI43oTbKGkkY0mghA82ir2C3LhnwSs=";
+    rev = "f03bdcf472d32d51a1093528071dc329b348379d";
+    hash = "sha256-fbk0m20NpaUCWvH/l9hfmx+VKw4U3pkTkXdAeHL7bHs=";
  };

-  cargoHash = "sha256-XSmeJAK18J9WxrG5orFbAB9hWVLQQ50oB223oHT3OOk=";
+  cargoHash = "sha256-PNqecQSx0Q+K3bBfbOJYWPdl7JdUTDQ4f95RUuW0vPw=";

  buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [
    darwin.apple_sdk.frameworks.Security
@ -35,6 +35,9 @@ rustPlatform.buildRustPackage rec {
    "--skip=test_obfuscated_share_link"
    "--skip=test_share_link_strip_json"
    "--skip=test_localization_popular"
+    "--skip=test_private_sub"
+    "--skip=test_banned_sub"
+    "--skip=test_gated_sub"

    # subreddit.rs
    "--skip=test_fetching_subreddit"
@ -48,6 +51,7 @@ rustPlatform.buildRustPackage rec {
    "--skip=test_oauth_client"
    "--skip=test_oauth_client_refresh"
    "--skip=test_oauth_token_exists"
+    "--skip=test_oauth_headers_len"
  ];

  env = {
--- a/pkgs/by-name/ri/rip2/package.nix
+++ b/pkgs/by-name/ri/rip2/package.nix
@ -3,6 +3,8 @@
  rustPlatform,
  fetchFromGitHub,
  versionCheckHook,
+  installShellFiles,
+  stdenv,
 }:

 rustPlatform.buildRustPackage rec {
@ -18,6 +20,8 @@ rustPlatform.buildRustPackage rec {

  cargoHash = "sha256-l6rbeiyIsr1csBcp+428TpQYSs9RvfJutGoL/wtSGR8=";

+  nativeBuildInputs = [ installShellFiles ];
+
  # TODO: Unsure why this test fails, but not a major issue so
  #       skipping for now.
  checkFlags = [ "--skip=test_filetypes::file_type_3___fifo__" ];
@ -25,6 +29,12 @@ rustPlatform.buildRustPackage rec {
  doInstallCheck = true;
  nativeInstallCheckInputs = [ versionCheckHook ];
  versionCheckProgram = "${placeholder "out"}/bin/rip";
+  postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
+    installShellCompletion --cmd rip \
+      --bash <($out/bin/rip completions bash) \
+      --fish <($out/bin/rip completions fish) \
+      --zsh <($out/bin/rip completions zsh)
+  '';

  meta = {
    description = "Safe and ergonomic alternative to rm";
--- a/pkgs/by-name/sc/screenly-cli/package.nix
+++ b/pkgs/by-name/sc/screenly-cli/package.nix
@ -12,16 +12,16 @@

 rustPlatform.buildRustPackage rec {
  pname = "screenly-cli";
-  version = "1.0.1";
+  version = "1.0.2";

  src = fetchFromGitHub {
    owner = "screenly";
    repo = "cli";
    rev = "refs/tags/v${version}";
-    hash = "sha256-7Y9n6qo5kqaV8xHYn4BFbPBF/7mCV9DJJTSz4dqrgPc=";
+    hash = "sha256-iEz6LFPzOZCOvUMx3s6entcwyEsAKirY8CiIoId/Ie0=";
  };

-  cargoHash = "sha256-4fPC/BW2irA1iTKkxBhPOsxzS4uSfM3vOXhrx/7qRxg=";
+  cargoHash = "sha256-YurXcmjL44TBrLQocbCKtOEpG7d49aKU9Q/3vPoPvHg=";

  nativeBuildInputs = [
    pkg-config
--- a/pkgs/by-name/sk/skypeforlinux/package.nix
+++ b/pkgs/by-name/sk/skypeforlinux/package.nix
@ -42,8 +42,8 @@ let

  # Please keep the version x.y.0.z and do not update to x.y.76.z because the
  # source of the latter disappears much faster.
-  version = "8.131.0.202";
-  revision = "370";
+  version = "8.132.0.201";
+  revision = "373";

  rpath =
    lib.makeLibraryPath [
@ -103,7 +103,7 @@ let
      fetchurl {
        name = "skypeforlinux-${version}-${revision}.snap";
        url = "https://api.snapcraft.io/api/v1/snaps/download/QRDEfjn4WJYnm0FzDKwqqRZZI77awQEV_${revision}.snap";
-        hash = "sha512-POCDkJe58ie78PIze6qADPIbjfFxNhLJt5z7ooHNIna6IrJoeqpFYIrRo9uosHkUURu83MfueeyYd6z0j+P/RQ==";
+        hash = "sha512-Hrb/MlCYTvQ/4kicsnBfdKtnUPP8nFi1TKQ4zl3dtvwUWl9QGXX//sNQoBOj6b9KkgpCi6pI04wIWp/zdRMl6Q==";
      }
    else
      throw "Skype for linux is not supported on ${stdenv.hostPlatform.system}";
--- a/pkgs/by-name/sy/syshud/package.nix
+++ b/pkgs/by-name/sy/syshud/package.nix
@ -14,18 +14,22 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "syshud";
-  version = "0-unstable-2024-09-26";
+  version = "0-unstable-2024-11-04";

  src = fetchFromGitHub {
    owner = "System64fumo";
    repo = "syshud";
-    rev = "0b6e4958d8ea66b54bc67f0b5aa005fa3eaa4f6f";
-    hash = "sha256-cyE7ZxesAmnepW7kI6b9Gp7R/v+yG2//EQAj4/X6c+c=";
+    rev = "157b725a3f29d67f16c25fb3062b62ad6fec4e15";
+    hash = "sha256-q04xYOdnnyUyiFc72Gzk65fWzQgYSOACPUXIk7kvIP8=";
  };

  postPatch = ''
    substituteInPlace Makefile \
-      --replace-fail 'pkg-config' ''${PKG_CONFIG}
+      --replace-fail pkg-config ''${PKG_CONFIG}
+    substituteInPlace src/main.cpp \
+      --replace-fail /usr/share/sys64/hud/config.conf $out/share/sys64/hud/config.conf
+    substituteInPlace src/window.cpp \
+      --replace-fail /usr/share/sys64/hud/style.css $out/share/sys64/hud/style.css
  '';

  nativeBuildInputs = [
--- a/pkgs/applications/graphics/trimage/default.nix
+++ b/pkgs/applications/graphics/trimage/default.nix
@ -1,20 +1,22 @@
-{ lib
-, stdenv
-, fetchFromGitHub
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,

-, python3
-, installShellFiles
-, makeWrapper
-, wrapQtAppsHook
+  python3,
+  installShellFiles,
+  makeWrapper,
+  qt5,

-, advancecomp
-, jpegoptim
-, optipng
-, pngcrush
+  advancecomp,
+  jpegoptim,
+  optipng,
+  pngcrush,
 }:

 let
  pythonEnv = python3.withPackages (ps: with ps; [ pyqt5 ]);
+
  binPath = lib.makeBinPath [
    advancecomp
    jpegoptim
@ -36,7 +38,7 @@ stdenv.mkDerivation {
  nativeBuildInputs = [
    installShellFiles
    makeWrapper
-    wrapQtAppsHook
+    qt5.wrapQtAppsHook
  ];

  dontWrapQtApps = true;
--- a/pkgs/by-name/tr/trinity/package.nix
+++ b/pkgs/by-name/tr/trinity/package.nix
@ -1,14 +1,19 @@
-{ lib, stdenv, fetchFromGitHub }:
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  unstableGitUpdater,
+}:

-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
  pname = "trinity";
-  version = "1.9-unstable-2023-07-10";
+  version = "1.9-unstable-2024-09-19";

  src = fetchFromGitHub {
    owner = "kernelslacker";
    repo = "trinity";
-    rev = "e71872454d26baf37ae1d12e9b04a73d64179555";
-    hash = "sha256-Zy+4L1CuB2Ul5iF+AokDkAW1wheDzoCTNkvRZFGRNps=";
+    rev = "ba2360ed84a8c521d9c34af9c909315ea7c62aad";
+    hash = "sha256-lj27EtMzj+ULrAJh27rjiuL3/SzW/NRMG65l8sBi8k4=";
  };

  postPatch = ''
@ -20,12 +25,14 @@ stdenv.mkDerivation rec {

  installFlags = [ "DESTDIR=$(out)" ];

-  meta = with lib; {
+  passthru.updateScript = unstableGitUpdater { tagPrefix = "v"; };
+
+  meta = {
    description = "Linux System call fuzz tester";
    mainProgram = "trinity";
    homepage = "https://github.com/kernelslacker/trinity";
-    license = licenses.gpl2Only;
-    maintainers = [ maintainers.dezgeg ];
-    platforms = platforms.linux;
+    license = lib.licenses.gpl2Only;
+    maintainers = [ lib.maintainers.dezgeg ];
+    platforms = lib.platforms.linux;
  };
-}
+})
--- a/pkgs/by-name/ty/typos/package.nix
+++ b/pkgs/by-name/ty/typos/package.nix
@ -2,6 +2,9 @@
  lib,
  rustPlatform,
  fetchFromGitHub,
+  testers,
+  nix-update-script,
+  typos,
 }:

 rustPlatform.buildRustPackage rec {
@ -17,6 +20,12 @@ rustPlatform.buildRustPackage rec {

  cargoHash = "sha256-cn1jy8kQ6R+JU6w/sqcNP+uzSKKg3V4H97qnJAIESd0=";

+  passthru = {
+    tests.version = testers.testVersion { package = typos; };
+
+    updateScript = nix-update-script { };
+  };
+
  meta = with lib; {
    description = "Source code spell checker";
    mainProgram = "typos";
--- a/pkgs/by-name/un/unyaffs/package.nix
+++ b/pkgs/by-name/un/unyaffs/package.nix
@ -0,0 +1,45 @@
+{
+  fetchFromGitHub,
+  lib,
+  stdenv,
+  versionCheckHook,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "unyaffs";
+  version = "0.9";
+
+  src = fetchFromGitHub {
+    owner = "whataday";
+    repo = "unyaffs";
+    rev = "${finalAttrs.version}";
+    hash = "sha256-FcuPaxq74gVJ6UlOhFPSMtuwUAJVV/sAxAQojhmVXCs=";
+  };
+
+  preBuild = ''
+    sed -i '54i #if defined(__linux__)' unyaffs.c
+    sed -i '55i #include <sys/sysmacros.h>' unyaffs.c
+    sed -i '56i #endif' unyaffs.c
+  '';
+
+  installPhase = ''
+    runHook preInstall
+
+    install -Dm755 unyaffs -t $out/bin
+
+    runHook postInstall
+  '';
+
+  nativeInstallCheckInputs = [ versionCheckHook ];
+  doInstallCheck = true;
+  versionCheckProgramArg = "-V";
+
+  meta = {
+    description = "Tool to extract files from a YAFFS2 file system image";
+    homepage = "https://github.com/whataday/unyaffs";
+    license = lib.licenses.gpl2Only;
+    platforms = lib.platforms.unix;
+    maintainers = with lib.maintainers; [ KSJ2000 ];
+    mainProgram = "unyaffs";
+  };
+})
--- a/pkgs/by-name/yu/yutto/package.nix
+++ b/pkgs/by-name/yu/yutto/package.nix
@ -8,7 +8,7 @@

 python3Packages.buildPythonApplication rec {
  pname = "yutto";
-  version = "2.0.0-rc.4";
+  version = "2.0.0-rc.5";
  pyproject = true;

  disabled = python3Packages.pythonOlder "3.9";
@ -18,7 +18,7 @@ python3Packages.buildPythonApplication rec {
    owner = "yutto-dev";
    repo = "yutto";
    rev = "refs/tags/v${version}";
-    hash = "sha256-QP3sbZANsyYeZmLZSwQz6E1eysCVojRYHu/z9Szdb6U=";
+    hash = "sha256-QaApCkZtHjvGB6FOfic9wEH7rUlukwmxnrDaHkbvyJo=";
  };

  build-system = with python3Packages; [ hatchling ];
--- a/pkgs/by-name/zi/zitadel/console.nix
+++ b/pkgs/by-name/zi/zitadel/console.nix
@ -1,13 +1,20 @@
-{ generateProtobufCode
-, version
-, zitadelRepo
+{
+  generateProtobufCode,
+  version,
+  zitadelRepo,
 }:

-{ mkYarnPackage
-, fetchYarnDeps
-, grpc-gateway
-, protoc-gen-grpc-web
-, protoc-gen-js
+{
+  lib,
+  stdenv,
+  fetchYarnDeps,
+  yarnConfigHook,
+  yarnBuildHook,
+  nodejs,
+
+  grpc-gateway,
+  protoc-gen-grpc-web,
+  protoc-gen-js,
 }:

 let
@ -24,36 +31,32 @@ let
    hash = "sha256-n6BJ1gSSm66yOGdHcSea/nQbjiHZX2YX2zbFT4o75/4=";
  };
 in
-mkYarnPackage rec {
-  name = "zitadel-console";
+stdenv.mkDerivation {
+  pname = "zitadel-console";
  inherit version;

-  src = "${zitadelRepo}/console";
+  src = zitadelRepo;
+
+  sourceRoot = "${zitadelRepo.name}/console";

-  packageJSON = ./package.json;
  offlineCache = fetchYarnDeps {
-    yarnLock = "${src}/yarn.lock";
+    yarnLock = "${zitadelRepo}/console/yarn.lock";
    hash = "sha256-MWATjfhIbo3cqpzOdXP52f/0Td60n99OTU1Qk6oWmXU=";
  };

-  postPatch = ''
-    substituteInPlace src/styles.scss \
-      --replace-fail "/node_modules/flag-icons" "flag-icons"
+  nativeBuildInputs = [
+    yarnConfigHook
+    yarnBuildHook
+    nodejs
+  ];

-    substituteInPlace angular.json \
-      --replace-fail "./node_modules/tinycolor2" "../../node_modules/tinycolor2"
-  '';
-
-  buildPhase = ''
-    ln -s "${zitadelRepo}/docs" deps/docs
-    mkdir deps/console/src/app/proto
-    cp -r ${protobufGenerated}/* deps/console/src/app/proto/
-    yarn --offline build
+  preBuild = ''
+    cp -r ${protobufGenerated} src/app/proto
  '';

  installPhase = ''
-    cp -r deps/console/dist/console $out
+    runHook preInstall
+    cp -r dist/console "$out"
+    runHook postInstall
  '';
-
-  doDist = false;
 }
--- a/pkgs/by-name/zi/zitadel/package.json
+++ b/pkgs/by-name/zi/zitadel/package.json
@ -1,92 +0,0 @@
-{
-  "name": "console",
-  "version": "0.0.0",
-  "scripts": {
-    "ng": "ng",
-    "start": "node prebuild.development.js && ng serve",
-    "build": "ng build --configuration production --base-href=/ui/console/",
-    "prelint": "npm run generate",
-    "lint": "ng lint && prettier --check src",
-    "lint:fix": "prettier --write src",
-    "generate": "buf generate ../proto --include-imports --include-wkt"
-  },
-  "private": true,
-  "dependencies": {
-    "@angular/animations": "^16.2.5",
-    "@angular/cdk": "^16.2.4",
-    "@angular/common": "^16.2.5",
-    "@angular/compiler": "^16.2.5",
-    "@angular/core": "^16.2.5",
-    "@angular/forms": "^16.2.5",
-    "@angular/material": "^16.2.4",
-    "@angular/material-moment-adapter": "^16.2.4",
-    "@angular/platform-browser": "^16.2.5",
-    "@angular/platform-browser-dynamic": "^16.2.5",
-    "@angular/router": "^16.2.5",
-    "@angular/service-worker": "^16.2.5",
-    "@ctrl/ngx-codemirror": "^6.1.0",
-    "@fortawesome/angular-fontawesome": "^0.13.0",
-    "@fortawesome/fontawesome-svg-core": "^6.4.2",
-    "@fortawesome/free-brands-svg-icons": "^6.4.2",
-    "@grpc/grpc-js": "^1.9.3",
-    "@netlify/framework-info": "^9.8.10",
-    "@ngx-translate/core": "^15.0.0",
-    "angular-oauth2-oidc": "^15.0.1",
-    "angularx-qrcode": "^16.0.0",
-    "buffer": "^6.0.3",
-    "codemirror": "^5.65.8",
-    "cors": "^2.8.5",
-    "file-saver": "^2.0.5",
-    "flag-icons": "^7.1.0",
-    "google-proto-files": "^4.0.0",
-    "google-protobuf": "^3.21.2",
-    "grpc-web": "^1.4.1",
-    "i18n-iso-countries": "^7.7.0",
-    "libphonenumber-js": "^1.10.49",
-    "material-design-icons-iconfont": "^6.1.1",
-    "moment": "^2.29.4",
-    "ngx-color": "^9.0.0",
-    "opentype.js": "^1.3.4",
-    "rxjs": "~7.8.0",
-    "tinycolor2": "^1.6.0",
-    "tslib": "^2.6.2",
-    "uuid": "^9.0.1",
-    "zone.js": "~0.13.3"
-  },
-  "devDependencies": {
-    "@angular-devkit/build-angular": "^16.2.2",
-    "@angular-eslint/builder": "16.2.0",
-    "@angular-eslint/eslint-plugin": "16.2.0",
-    "@angular-eslint/eslint-plugin-template": "16.2.0",
-    "@angular-eslint/schematics": "16.2.0",
-    "@angular-eslint/template-parser": "16.2.0",
-    "@angular/cli": "^16.2.2",
-    "@angular/compiler-cli": "^16.2.5",
-    "@angular/language-service": "^16.2.5",
-    "@bufbuild/buf": "^1.23.1",
-    "@types/file-saver": "^2.0.7",
-    "@types/google-protobuf": "^3.15.3",
-    "@types/jasmine": "~5.1.4",
-    "@types/jasminewd2": "~2.0.13",
-    "@types/jsonwebtoken": "^9.0.5",
-    "@types/node": "^20.7.0",
-    "@types/opentype.js": "^1.3.8",
-    "@types/qrcode": "^1.5.2",
-    "@types/uuid": "^9.0.7",
-    "@typescript-eslint/eslint-plugin": "^5.59.11",
-    "@typescript-eslint/parser": "^5.60.1",
-    "codelyzer": "^6.0.2",
-    "eslint": "^8.50.0",
-    "jasmine-core": "~4.6.0",
-    "jasmine-spec-reporter": "~7.0.0",
-    "karma": "^6.4.2",
-    "karma-chrome-launcher": "^3.2.0",
-    "karma-coverage-istanbul-reporter": "^3.0.3",
-    "karma-jasmine": "^5.1.0",
-    "karma-jasmine-html-reporter": "^2.1.0",
-    "prettier": "^3.1.1",
-    "prettier-plugin-organize-imports": "^3.2.4",
-    "protractor": "~7.0.0",
-    "typescript": "^5.1.6"
-  }
-}
--- a/pkgs/development/python-modules/ailment/default.nix
+++ b/pkgs/development/python-modules/ailment/default.nix
@ -9,7 +9,7 @@

 buildPythonPackage rec {
  pname = "ailment";
-  version = "9.2.127";
+  version = "9.2.128";
  pyproject = true;

  disabled = pythonOlder "3.11";
@ -18,7 +18,7 @@ buildPythonPackage rec {
    owner = "angr";
    repo = "ailment";
    rev = "refs/tags/v${version}";
-    hash = "sha256-yd4O4REUjTRYZ3lODlsxmbbPHY7Z2X217wQWSn3Uv3U=";
+    hash = "sha256-08cIIFuo0Kf3jLtH6STPRAJVo+0ywFCcOo5rpXHXnwA=";
  };

  build-system = [ setuptools ];
--- a/pkgs/development/python-modules/angr/default.nix
+++ b/pkgs/development/python-modules/angr/default.nix
@ -36,7 +36,7 @@

 buildPythonPackage rec {
  pname = "angr";
-  version = "9.2.127";
+  version = "9.2.128";
  pyproject = true;

  disabled = pythonOlder "3.11";
@ -45,7 +45,7 @@ buildPythonPackage rec {
    owner = "angr";
    repo = "angr";
    rev = "refs/tags/v${version}";
-    hash = "sha256-hGKxLgXOL+PhhYxxJJQIMcEmFjG4WC9PQE4yP+/QuBg=";
+    hash = "sha256-OAdPBmJAGqQEiQCXKZMtEoyDMS/A9pUYeTXJQ0qQYVs=";
  };

  postPatch = ''
--- a/pkgs/development/python-modules/archinfo/default.nix
+++ b/pkgs/development/python-modules/archinfo/default.nix
@ -10,7 +10,7 @@

 buildPythonPackage rec {
  pname = "archinfo";
-  version = "9.2.127";
+  version = "9.2.128";
  pyproject = true;

  disabled = pythonOlder "3.8";
@ -19,7 +19,7 @@ buildPythonPackage rec {
    owner = "angr";
    repo = "archinfo";
    rev = "refs/tags/v${version}";
-    hash = "sha256-hIjL0pa4/TNnyFq61R0ND8o2mEjeRwUJ/S1wP1VglYg=";
+    hash = "sha256-uNzT3doBHbbRLjxTtndQx+03M9zCdOI+FuTmVea1C1M=";
  };

  build-system = [ setuptools ];
--- a/pkgs/development/python-modules/bids-validator/default.nix
+++ b/pkgs/development/python-modules/bids-validator/default.nix
@ -7,6 +7,9 @@
  # build-system
  setuptools,
  versioneer,
+
+  # dependencies
+  bidsschematools,
 }:

 buildPythonPackage rec {
@ -14,7 +17,7 @@ buildPythonPackage rec {
  version = "1.14.7.post0";
  pyproject = true;

-  disabled = pythonOlder "3.7";
+  disabled = pythonOlder "3.8";

  src = fetchPypi {
    pname = "bids_validator";
@ -22,21 +25,22 @@ buildPythonPackage rec {
    hash = "sha256-5gBaUAt1+KlhWT+2fUYIUQfa2xFvWaXDtSSqBpeUW2Y=";
  };

-  nativeBuildInputs = [
+  build-system = [
    setuptools
    versioneer
  ];

-  # needs packages which are not available in nixpkgs
-  doCheck = false;
+  dependencies = [
+    bidsschematools
+  ];

  pythonImportsCheck = [ "bids_validator" ];

-  meta = with lib; {
+  meta = {
    description = "Validator for the Brain Imaging Data Structure";
    homepage = "https://github.com/bids-standard/bids-validator";
    changelog = "https://github.com/bids-standard/bids-validator/releases/tag/v${version}";
-    license = licenses.mit;
-    maintainers = [ ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ wegank ];
  };
 }
--- a/pkgs/development/python-modules/bidsschematools/default.nix
+++ b/pkgs/development/python-modules/bidsschematools/default.nix
@ -0,0 +1,45 @@
+{
+  lib,
+  buildPythonPackage,
+  pythonOlder,
+  fetchPypi,
+  setuptools,
+  click,
+  pyyaml,
+  jsonschema,
+}:
+
+buildPythonPackage rec {
+  pname = "bidsschematools";
+  version = "0.11.3";
+  pyproject = true;
+
+  disabled = pythonOlder "3.9";
+
+  src = fetchPypi {
+    pname = "bidsschematools";
+    inherit version;
+    hash = "sha256-GvR3pOXXmdpjH2xdL+trhLW6ZdsTpEWUdNUlVQ4gFXo=";
+  };
+
+  build-system = [
+    setuptools
+  ];
+
+  dependencies = [
+    click
+    pyyaml
+    jsonschema
+  ];
+
+  pythonImportsCheck = [
+    "bidsschematools"
+  ];
+
+  meta = {
+    description = "Python tools for working with the BIDS schema";
+    homepage = "https://github.com/bids-standard/bids-specification/tree/master/tools/schemacode";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ wegank ];
+  };
+}
--- a/pkgs/development/python-modules/biliass/default.nix
+++ b/pkgs/development/python-modules/biliass/default.nix
@ -10,14 +10,14 @@

 buildPythonPackage rec {
  pname = "biliass";
-  version = "2.1.0";
+  version = "2.1.1";
  pyproject = true;

  src = fetchFromGitHub {
    owner = "yutto-dev";
    repo = "yutto";
    rev = "refs/tags/biliass@${version}";
-    hash = "sha256-PlZD+988KdJqYC1I1K7i+YAH1Tzr6zfXcJFR/M4mQRA=";
+    hash = "sha256-Pn6z4iDxNcLVoY4xk7v0zc8hmajWEaOYFDEw5HEYxl4=";
  };

  sourceRoot = "source/packages/biliass";
@ -30,7 +30,7 @@ buildPythonPackage rec {
      src
      ;
    sourceRoot = "${sourceRoot}/${cargoRoot}";
-    hash = "sha256-DMKUbJSVME5siSPybdO5bOluPn3obVq1/6822uoSsDQ=";
+    hash = "sha256-7jv/Q98qyn2xnv4rNK9ifGhxo9n3X90iF9CTyqc6sHU=";
  };

  nativeBuildInputs = with rustPlatform; [
--- a/pkgs/development/python-modules/claripy/default.nix
+++ b/pkgs/development/python-modules/claripy/default.nix
@ -14,7 +14,7 @@

 buildPythonPackage rec {
  pname = "claripy";
-  version = "9.2.127";
+  version = "9.2.128";
  pyproject = true;

  disabled = pythonOlder "3.11";
@ -23,7 +23,7 @@ buildPythonPackage rec {
    owner = "angr";
    repo = "claripy";
    rev = "refs/tags/v${version}";
-    hash = "sha256-uiB67+5zfLig1TgAzniWaRhibJKmdOPMDAfDVVfMs/0=";
+    hash = "sha256-YP2Cphf57iyZXrdseZhUkzrkop0+jCRu98ckurxS1UU=";
  };

  # z3 does not provide a dist-info, so python-runtime-deps-check will fail
--- a/pkgs/development/python-modules/cle/default.nix
+++ b/pkgs/development/python-modules/cle/default.nix
@ -5,27 +5,25 @@
  cart,
  cffi,
  fetchFromGitHub,
-  minidump,
  pefile,
  pyelftools,
  pytestCheckHook,
  pythonOlder,
  pyvex,
-  pyxbe,
  setuptools,
  sortedcontainers,
 }:

 let
  # The binaries are following the argr projects release cycle
-  version = "9.2.127";
+  version = "9.2.128";

  # Binary files from https://github.com/angr/binaries (only used for testing and only here)
  binaries = fetchFromGitHub {
    owner = "angr";
    repo = "binaries";
    rev = "refs/tags/v${version}";
-    hash = "sha256-EgkYynllp/UGMRJmshQRpnMdwhdOkYHgoMlTiqdtZO1=";
+    hash = "sha256-wROuTg+RMp2tkjPsjHTK7aJs4SWTuIw4SsuIKIUZvkw=";
  };
 in
 buildPythonPackage rec {
@ -39,28 +37,22 @@ buildPythonPackage rec {
    owner = "angr";
    repo = "cle";
    rev = "refs/tags/v${version}";
-    hash = "sha256-DcfFOzP7Ylms1/kAX5CIhujzj6Vpma8sb0Qyq6tSJq0=";
+    hash = "sha256-C3lp9Dhg0XZXTxnYbRMfanxVn8qJhL1VEVDrMCpkMe4=";
  };

  build-system = [ setuptools ];

-  pythonRelaxDeps = [ "pyvex" ];
-
  dependencies = [
    archinfo
    cart
    cffi
-    minidump
    pefile
    pyelftools
    pyvex
-    pyxbe
    sortedcontainers
  ];

-  nativeCheckInputs = [
-    pytestCheckHook
-  ];
+  nativeCheckInputs = [ pytestCheckHook ];

  # Place test binaries in the right location (location is hard-coded in the tests)
  preCheck = ''
--- a/pkgs/development/python-modules/dulwich/default.nix
+++ b/pkgs/development/python-modules/dulwich/default.nix
@ -20,7 +20,7 @@
 }:

 buildPythonPackage rec {
-  version = "0.22.1";
+  version = "0.22.5";
  pname = "dulwich";
  format = "setuptools";

@ -30,17 +30,9 @@ buildPythonPackage rec {
    owner = "jelmer";
    repo = "dulwich";
    rev = "refs/tags/dulwich-${version}";
-    hash = "sha256-bf3ZUMX4afpdTBpFnx0HMyzCNG6V/p4eOl36djxGbtk=";
+    hash = "sha256-/YqC7y8PU+H2qjPqqzdw6iSSSElK709izLTcs9qbt1I=";
  };

-  patches = [
-    (fetchpatch2 {
-      name = "dulwich-geventhttpclient-api-breakage.patch";
-      url = "https://github.com/jelmer/dulwich/commit/5f0497de9c37ac4f4e8f27bed8decce13765d3df.patch";
-      hash = "sha256-0GgDgmYuLCsMc9nRRLNL2W6WYrkZ/1ZnZBQusEAzLKI=";
-    })
-  ];
-
  build-system = [
    setuptools
    setuptools-rust
--- a/pkgs/development/python-modules/jsonargparse/default.nix
+++ b/pkgs/development/python-modules/jsonargparse/default.nix
@ -23,7 +23,7 @@

 buildPythonPackage rec {
  pname = "jsonargparse";
-  version = "4.33.2";
+  version = "4.34.0";
  pyproject = true;

  disabled = pythonOlder "3.11";
@ -32,7 +32,7 @@ buildPythonPackage rec {
    owner = "omni-us";
    repo = "jsonargparse";
    rev = "refs/tags/v${version}";
-    hash = "sha256-yY/j4UwAoe/qQjBQXgFSrv2BX7DB5EyGCdVYoioyKr8=";
+    hash = "sha256-dj2539vTmzsGNvHqjsCzqo2sqOh2ink8Ut4Mi0qCDzI=";
  };

  build-system = [ setuptools ];
--- a/pkgs/development/python-modules/lacuscore/default.nix
+++ b/pkgs/development/python-modules/lacuscore/default.nix
@ -17,7 +17,7 @@

 buildPythonPackage rec {
  pname = "lacuscore";
-  version = "1.12.0";
+  version = "1.12.3";
  pyproject = true;

  disabled = pythonOlder "3.9";
@ -26,7 +26,7 @@ buildPythonPackage rec {
    owner = "ail-project";
    repo = "LacusCore";
    rev = "refs/tags/v${version}";
-    hash = "sha256-83OD/oGzjLsW0FRFyW6Yh9pwh/lcCfZDIe6uahhTRVc=";
+    hash = "sha256-cKAHNOZZtIdys0z36F0ORf6xXL/JkAgwZouvYYu/OTU=";
  };

  pythonRelaxDeps = [
--- a/pkgs/development/python-modules/meep/default.nix
+++ b/pkgs/development/python-modules/meep/default.nix
@ -19,6 +19,7 @@
  libctl,
  libGDSII,
  guile,
+  mpb,
  python,
  numpy,
  scipy,
@ -72,6 +73,7 @@ buildPythonPackage rec {
    libGDSII
    guile
    gsl
+    mpb
  ];

  propagatedBuildInputs =
@ -124,6 +126,9 @@ buildPythonPackage rec {
  nativeCheckInputs = [
    mpiCheckPhaseHook
  ];
+  pythonImportCheck = [
+    "meep.mpb"
+  ];
  checkPhase = ''
    runHook preCheck

@ -154,12 +159,12 @@ buildPythonPackage rec {
    runHook postCheck
  '';

-  meta = with lib; {
+  meta = {
    description = "Free finite-difference time-domain (FDTD) software for electromagnetic simulations";
    homepage = "https://meep.readthedocs.io/en/latest/";
-    license = licenses.gpl2Only;
-    platforms = platforms.linux;
-    maintainers = with maintainers; [
+    license = lib.licenses.gpl2Only;
+    platforms = lib.platforms.linux;
+    maintainers = with lib.maintainers; [
      sheepforce
      markuskowa
    ];
--- a/pkgs/development/python-modules/miasm/default.nix
+++ b/pkgs/development/python-modules/miasm/default.nix
@ -12,11 +12,11 @@
  setuptools,
 }:
 let
-  commit = "90dc1671b59077ee27c3d44d9d536d6659eb3bbe";
+  commit = "cbc722eed8dc807955bd46f84886ae74d161dd0c";
 in
-buildPythonPackage rec {
+buildPythonPackage {
  pname = "miasm";
-  version = "0.1.5-unstable-2024-04-28";
+  version = "0.1.5-unstable-2024-08-20";

  pyproject = true;
  build-system = [ setuptools ];
@ -25,7 +25,7 @@ buildPythonPackage rec {
    owner = "cea-sec";
    repo = "miasm";
    rev = commit;
-    hash = "sha256-nkRcirJLmTwSL7lwd+Yk6mteU3YPnm5ekJ4eFF5FmYo=";
+    hash = "sha256-Ot11QuMtaJ8OQDAUgV3zVxTNp0kKc0Y9EXRZD96Caow=";
  };

  patches = [
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@ -230,8 +230,8 @@ rec {
      "sha256-ElaYUwcYs2/Z5CoTzclkAoMERA2AknrfLh389eN2g54=";

  mypy-boto3-cloudfront =
-    buildMypyBoto3Package "cloudfront" "1.35.0"
-      "sha256-ewZmBuNAs3YS2tG5WDbNBRr1y1BmmOTxvXrSASNhAp4=";
+    buildMypyBoto3Package "cloudfront" "1.35.58"
+      "sha256-s71YfOrIIPFeAci2Ca+q5QyV4+JjQ5xdQ5sU8SZE29c=";

  mypy-boto3-cloudhsm =
    buildMypyBoto3Package "cloudhsm" "1.35.0"
@ -266,8 +266,8 @@ rec {
      "sha256-wCjyRnd7RlnLRQrADd2Xmh74IsQxBfUgLIJuaZW7kjw=";

  mypy-boto3-codebuild =
-    buildMypyBoto3Package "codebuild" "1.35.55"
-      "sha256-qZ0POshM6WseOoeinzEkGiZP4UxkRvyf2Y83Vv6UYas=";
+    buildMypyBoto3Package "codebuild" "1.35.59"
+      "sha256-O/ZxlUd9+dMpYfhaLQEP1XjHx1bpeebQn2aVuh7A0is=";

  mypy-boto3-codecatalyst =
    buildMypyBoto3Package "codecatalyst" "1.35.0"
@ -358,8 +358,8 @@ rec {
      "sha256-rYvtpy8Uac5YO4x/WSvUHz0aY8vYVf30gW1aLyYDbRM=";

  mypy-boto3-controltower =
-    buildMypyBoto3Package "controltower" "1.35.0"
-      "sha256-Hc9S/t+sTaMHIk93/pIWowMm0qXyyKf2Jth0j/JdtyA=";
+    buildMypyBoto3Package "controltower" "1.35.59"
+      "sha256-fLh9uKE/8iAb/dOIgxe3wKJizZkXjlfBmO2hEr4/L1U=";

  mypy-boto3-cur =
    buildMypyBoto3Package "cur" "1.35.0"
@ -538,8 +538,8 @@ rec {
      "sha256-QsLASn6dGIQs/nedmPXwzHeZRPIEqWjPqfDKMbaFOmM=";

  mypy-boto3-fis =
-    buildMypyBoto3Package "fis" "1.35.12"
-      "sha256-rm0PB0oie7q+8pl+efohmHe8StLZVvSWYgLIajxd3Fo=";
+    buildMypyBoto3Package "fis" "1.35.59"
+      "sha256-Wha+Y0/PXM87u4t2fXD36pe+SrEomr7V9TaxyED6jyA=";

  mypy-boto3-fms =
    buildMypyBoto3Package "fms" "1.35.45"
@ -562,8 +562,8 @@ rec {
      "sha256-rPVWNk0+Xt9kMAl8xD0xM/EIbiYPSUL8Yc8b+2RcD4o=";

  mypy-boto3-gamelift =
-    buildMypyBoto3Package "gamelift" "1.35.13"
-      "sha256-Xd0jrg/w4CPn5mDgHTaahyRAu5RZxdMcpci0cx7/1sQ=";
+    buildMypyBoto3Package "gamelift" "1.35.59"
+      "sha256-OyORzgahpj8UmmKkbdl0FrYaRWtrS07/LSYIkYgcwOY=";

  mypy-boto3-glacier =
    buildMypyBoto3Package "glacier" "1.35.0"
@ -626,8 +626,8 @@ rec {
      "sha256-4QXRWahJ0y9Svi/WRIiRFfo36tkKM25bXCTMrZjE41g=";

  mypy-boto3-inspector2 =
-    buildMypyBoto3Package "inspector2" "1.35.4"
-      "sha256-NslpiIBwxTvcEe/Lh8wM2PJE31JNmu4qyCZMbB+9noE=";
+    buildMypyBoto3Package "inspector2" "1.35.58"
+      "sha256-jHZg5Y9hX7KinsiwNfwAs8bg8uO71JLIKFl6xDAQJwQ=";

  mypy-boto3-internetmonitor =
    buildMypyBoto3Package "internetmonitor" "1.35.8"
@ -770,8 +770,8 @@ rec {
      "sha256-QuVCDfj8bAtFhEnrsGqDYHFbl6awqAjLDjeJn5Rq0IM=";

  mypy-boto3-lambda =
-    buildMypyBoto3Package "lambda" "1.35.57"
-      "sha256-m6zdSyQbRTiCuoWH7GX7CQnZe0A2SMPb8gglgzzldYc=";
+    buildMypyBoto3Package "lambda" "1.35.58"
+      "sha256-xoBzY+4YV5s9bf98CQ9ktGKh8kO+Rv5oRzM2JOMeu/w=";

  mypy-boto3-lex-models =
    buildMypyBoto3Package "lex-models" "1.35.0"
@ -970,8 +970,8 @@ rec {
      "sha256-CwD0stU2217XD+SXTp+WRyf/qH3EOA5PuBSdTWcXOGU=";

  mypy-boto3-opensearch =
-    buildMypyBoto3Package "opensearch" "1.35.52"
-      "sha256-6a9zygN6Al1yEaOwUvO2Hq/swESKrLW315diz/sgH6c=";
+    buildMypyBoto3Package "opensearch" "1.35.58"
+      "sha256-8D48c4NG00r6zpgcoK8FjQqCpOBB4DNE653lwn/K36k=";

  mypy-boto3-opensearchserverless =
    buildMypyBoto3Package "opensearchserverless" "1.35.52"
@ -994,16 +994,16 @@ rec {
      "sha256-PdOH3KaQn9d455qCR565qFlyCb8t7R8x8wXBebHgtt8=";

  mypy-boto3-outposts =
-    buildMypyBoto3Package "outposts" "1.35.38"
-      "sha256-Adb8A8DVn3T00xuEtXXT+LHxwM4jh0IG3JLUiAi02ds=";
+    buildMypyBoto3Package "outposts" "1.35.58"
+      "sha256-L1Kge8GPBYFN7HkTimCTvBOEf1ge1s7FWa4nMM6gypU=";

  mypy-boto3-panorama =
    buildMypyBoto3Package "panorama" "1.35.0"
      "sha256-HFjrSRkc3cEqImMkqC4V/lfk/ArD9/2swrK7xo9Hut4=";

  mypy-boto3-payment-cryptography =
-    buildMypyBoto3Package "payment-cryptography" "1.35.0"
-      "sha256-b9gTTuQxsXE4CjZgRgbZn4xGSC7N/4v3eF4fF9fFSow=";
+    buildMypyBoto3Package "payment-cryptography" "1.35.59"
+      "sha256-WrQdJntSi1l0jLTGdx0icfUn6VLOn543GDz8WxX7h9k=";

  mypy-boto3-payment-cryptography-data =
    buildMypyBoto3Package "payment-cryptography-data" "1.35.45"
@ -1086,8 +1086,8 @@ rec {
      "sha256-85yUjKQ8oiECUYHhmmYrDssyFSQb6itfIRY2iuwCZdo=";

  mypy-boto3-rds =
-    buildMypyBoto3Package "rds" "1.35.50"
-      "sha256-doZ8u+pU5akzuLCa1T+qns/fxOakvsJR5Fj4TsrraBs=";
+    buildMypyBoto3Package "rds" "1.35.59"
+      "sha256-287lEFwBHJEvRK1b+heJrpOC6WouOoYyk1Sc1ogMVbo=";

  mypy-boto3-rds-data =
    buildMypyBoto3Package "rds-data" "1.35.28"
--- a/pkgs/development/python-modules/nlpo3/default.nix
+++ b/pkgs/development/python-modules/nlpo3/default.nix
@ -0,0 +1,74 @@
+{
+  lib,
+  stdenv,
+  buildPythonPackage,
+  pythonAtLeast,
+  unittestCheckHook,
+  rustPlatform,
+  fetchFromGitHub,
+  rustc,
+  cargo,
+  libiconv,
+  setuptools,
+  setuptools-rust,
+}:
+
+buildPythonPackage rec {
+  pname = "nlpo3";
+  version = "1.4.0-unstable-2024-11-11";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "PyThaiNLP";
+    repo = "nlpo3";
+    rev = "280c47b7f98e88319c1a4ac2c7a2e5f273c00621";
+    hash = "sha256-bEN2SaINfqvTIPSROXApR3zoLdjZY0h6bdAzbMHrJdM=";
+  };
+
+  postPatch = ''
+    substituteInPlace tests/test_tokenize.py \
+      --replace-fail "data/test_dict.txt" "$src/nlpo3-python/tests/data/test_dict.txt"
+  '';
+
+  sourceRoot = "${src.name}/nlpo3-python";
+
+  cargoDeps = rustPlatform.fetchCargoTarball {
+    inherit src sourceRoot;
+    hash = "sha256-PDDlG5nLedgA+HFZzkrxtfUjTwwioQhpsk5qlbAe3ws=";
+  };
+
+  preCheck = ''
+    rm -r nlpo3
+  '';
+
+  nativeBuildInputs = [
+    rustPlatform.cargoSetupHook
+    rustc
+    cargo
+  ];
+
+  buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ];
+
+  build-system = [
+    setuptools
+    setuptools-rust
+  ];
+
+  nativeCheckInputs = [ unittestCheckHook ];
+
+  unittestFlagsArray = [
+    "-s"
+    "tests"
+    "-v"
+  ];
+
+  pythonImportsCheck = [ "nlpo3" ];
+
+  meta = {
+    description = "Thai Natural Language Processing library in Rust, with Python and Node bindings";
+    homepage = "https://github.com/PyThaiNLP/nlpo3";
+    changelog = "https://github.com/PyThaiNLP/nlpo3/releases/tag/nlpo3-python-v${version}";
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ vizid ];
+  };
+}
--- a/pkgs/development/python-modules/playwrightcapture/default.nix
+++ b/pkgs/development/python-modules/playwrightcapture/default.nix
@ -22,7 +22,7 @@

 buildPythonPackage rec {
  pname = "playwrightcapture";
-  version = "1.27.0";
+  version = "1.27.1";
  pyproject = true;

  disabled = pythonOlder "3.9";
@ -31,7 +31,7 @@ buildPythonPackage rec {
    owner = "Lookyloo";
    repo = "PlaywrightCapture";
    rev = "refs/tags/v${version}";
-    hash = "sha256-cfgNeUZh492SkgfSJZyaDDeqxC3vHopdIe5UcKHFVck=";
+    hash = "sha256-2QF59YzveW4OJmueEs9v4qk+sONVQ/XgXhsT8nswNyo=";
  };

  pythonRelaxDeps = [
--- a/pkgs/development/python-modules/pybids/default.nix
+++ b/pkgs/development/python-modules/pybids/default.nix
@ -12,6 +12,7 @@
  nibabel,
  bids-validator,
  sqlalchemy,
+  universal-pathlib,
  pytestCheckHook,
  versioneer,
 }:
@ -31,12 +32,12 @@ buildPythonPackage rec {
    "sqlalchemy"
  ];

-  nativeBuildInputs = [
+  build-system = [
    setuptools
    versioneer
  ] ++ versioneer.optional-dependencies.toml;

-  propagatedBuildInputs = [
+  dependencies = [
    bids-validator
    click
    formulaic
@ -46,6 +47,7 @@ buildPythonPackage rec {
    pandas
    scipy
    sqlalchemy
+    universal-pathlib
  ];

  pythonImportsCheck = [ "bids" ];
@ -64,12 +66,12 @@ buildPythonPackage rec {
    "test_to_df"
  ];

-  meta = with lib; {
+  meta = {
    description = "Python tools for querying and manipulating BIDS datasets";
    homepage = "https://github.com/bids-standard/pybids";
    changelog = "https://github.com/bids-standard/pybids/blob/${version}/CHANGELOG.rst";
-    license = licenses.mit;
-    maintainers = [ ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ wegank ];
    mainProgram = "pybids";
  };
 }
--- a/pkgs/development/python-modules/pyvex/default.nix
+++ b/pkgs/development/python-modules/pyvex/default.nix
@ -12,14 +12,14 @@

 buildPythonPackage rec {
  pname = "pyvex";
-  version = "9.2.127";
+  version = "9.2.128";
  pyproject = true;

  disabled = pythonOlder "3.11";

  src = fetchPypi {
    inherit pname version;
-    hash = "sha256-pBbbYtI2ITky6xw09/MSMvCk7HZUCJaMP86GSFkSa1o=";
+    hash = "sha256-ASo1hqxLsX4UkdhXLOArKBQdxws/maUjGb/HotAoxzw=";
  };

  build-system = [ setuptools ];
--- a/pkgs/development/python-modules/templateflow/default.nix
+++ b/pkgs/development/python-modules/templateflow/default.nix
@ -4,6 +4,8 @@
  fetchFromGitHub,
  pythonOlder,
  setuptools-scm,
+  hatchling,
+  hatch-vcs,
  nipreps-versions,
  pybids,
  requests,
@ -24,8 +26,13 @@ buildPythonPackage rec {
    hash = "sha256-COS767n2aC65m6AJihZb4NhJ4ZK9YkTAZR7Hcnc/LMs=";
  };

-  nativeBuildInputs = [ setuptools-scm ];
-  propagatedBuildInputs = [
+  build-system = [
+    setuptools-scm
+    hatchling
+    hatch-vcs
+  ];
+
+  dependencies = [
    nipreps-versions
    pybids
    requests
@ -33,7 +40,12 @@ buildPythonPackage rec {
  ];

  doCheck = false; # most tests try to download data
-  #pythonImportsCheck = [ "templateflow" ];  # touches $HOME/.cache, hence needs https://github.com/NixOS/nixpkgs/pull/120300
+
+  postFixup = ''
+    export HOME=$(mktemp -d)
+  '';
+
+  pythonImportsCheck = [ "templateflow" ];

  meta = with lib; {
    homepage = "https://templateflow.org/python-client";
--- a/pkgs/development/python-modules/websockets/default.nix
+++ b/pkgs/development/python-modules/websockets/default.nix
@ -48,6 +48,7 @@ buildPythonPackage rec {
    + lib.optionalString (pythonOlder "3.11") ''
      # Our Python 3.10 and older raise SSLError instead of SSLCertVerificationError
      sed -i "s/def test_reject_invalid_server_certificate(/def skip_test_reject_invalid_server_certificate(/" tests/sync/test_client.py
+      sed -i "s/def test_reject_invalid_server_certificate(/def skip_test_reject_invalid_server_certificate(/" tests/asyncio/test_client.py
    '';

  nativeCheckInputs = [ unittestCheckHook ];
--- a/pkgs/development/tools/analysis/checkov/default.nix
+++ b/pkgs/development/tools/analysis/checkov/default.nix
@ -6,14 +6,14 @@

 python3.pkgs.buildPythonApplication rec {
  pname = "checkov";
-  version = "3.2.286";
+  version = "3.2.291";
  pyproject = true;

  src = fetchFromGitHub {
    owner = "bridgecrewio";
    repo = "checkov";
    rev = "refs/tags/${version}";
-    hash = "sha256-HW1maTuRqieOzvdpMAxs4h5SpTZ3FyKGmmDof0UItOE=";
+    hash = "sha256-CpLJD76FK2kX4p8M41S/GmGAwfTX1ugyyl10MEG4WNY=";
  };

  patches = [ ./flake8-compat-5.x.patch ];
--- a/pkgs/development/tools/build-managers/bazel/bazel_7/default.nix
+++ b/pkgs/development/tools/build-managers/bazel/bazel_7/default.nix
@ -47,7 +47,7 @@
  # Always assume all markers valid (this is needed because we remove markers; they are non-deterministic).
  # Also, don't clean up environment variables (so that NIX_ environment variables are passed to compilers).
  enableNixHacks ? false,
-  version ? "7.3.1",
+  version ? "7.4.0",
 }:

 let
@ -55,7 +55,7 @@ let

  src = fetchurl {
    url = "https://github.com/bazelbuild/bazel/releases/download/${version}/bazel-${version}-dist.zip";
-    hash = "sha256-8FAfkMn8dM1pM9vcWeF7jWJy1sCfi448QomFxYlxR8c=";
+    hash = "sha256-GY1wu3O5O7K2MMJv6wjE+DLnUgwjkHdmcqhT1o9G9Cg=";
  };

  defaultShellUtils =
@ -112,23 +112,23 @@ let
      if stdenv.hostPlatform.system == "x86_64-linux" then
        fetchurl {
          url = "https://github.com/bazelbuild/bazel/releases/download/${version}/bazel_nojdk-${version}-linux-x86_64";
-          hash = "sha256-05fHtz47OilpOVYawB17VRVEDpycfYTIHBmwYCOyPjI=";
+          hash = "sha256-0glQLNAU0aT7+3Hzv0+IzgvJlfs7y8wflEwFssIvnkk=";
        }
      else if stdenv.hostPlatform.system == "aarch64-linux" then
        fetchurl {
          url = "https://github.com/bazelbuild/bazel/releases/download/${version}/bazel_nojdk-${version}-linux-arm64";
-          hash = "sha256-olrlIia/oXWleXp12E+LGXv+F1m4/S4jj/t7p2/xGdM=";
+          hash = "sha256-736PrTFckHyChRh0Uv8zNtCppQYhfZWECl9+44cs6Qo=";
        }
      else if stdenv.hostPlatform.system == "x86_64-darwin" then
        fetchurl {
          url = "https://github.com/bazelbuild/bazel/releases/download/${version}/bazel-${version}-darwin-x86_64";
-          hash = "sha256-LraN6MSVJQ3NzkyeLl5LvGxf+VNDJiVo/dVJIkyF1jU=";
+          hash = "sha256-FX7ZKKG7uoteEvx0fBqpsoB3Gj0aJNaC2IXgJ2ffgz4=";
        }
      else
        fetchurl {
          # stdenv.hostPlatform.system == "aarch64-darwin"
          url = "https://github.com/bazelbuild/bazel/releases/download/${version}/bazel-${version}-darwin-arm64";
-          hash = "sha256-mB+CpHC60TSTIrb1HJxv+gqikdqxAU+sQRVDwS5mHf8=";
+          hash = "sha256-+EP+HssT4aISUZwLKkSuuXjGQm9lheNJDr7WZw1v0pU=";
        };

    nativeBuildInputs = defaultShellUtils;
@ -244,14 +244,14 @@ let
      outputHashMode = "recursive";
      outputHash =
        if stdenv.hostPlatform.system == "x86_64-linux" then
-          "sha256-II5R2YjaIejcO4Topdcz1H268eplYsYrW2oLJHKEkYw="
+          "sha256-yKy6IBIkjvN413kFMgkWCH3jAgF5AdpxrVnQyhgfWPA="
        else if stdenv.hostPlatform.system == "aarch64-linux" then
-          "sha256-n8RMKf8OxJsEkcxLe7xZgMu9RyeU58NESFF9F0nLNC4="
+          "sha256-NW/JMVC7k2jBW+d8syMl9L5tDB7SQENJtlMFjAKascI="
        else if stdenv.hostPlatform.system == "aarch64-darwin" then
-          "sha256-E6j31Sl+aGs6+Xdx+c0Xi6ryfYZ/ms5/HzIyc3QpMHY="
+          "sha256-QVk0Qr86U350oLJ5P50SE6CUYqn5XEqgGCXVf+89wVY="
        else
          # x86_64-darwin
-          "sha256-VVuNGY4+SFDhcv9iEo8JToYPzqk9NQCrYlLhhae89MM=";
+          "sha256-VDrqS9YByYxboF6AcjAR0BRZa5ioGgX1pjx09zPfWTE=";
      outputHashAlgo = "sha256";

    };
--- a/pkgs/games/mindustry/default.nix
+++ b/pkgs/games/mindustry/default.nix
@ -1,245 +0,0 @@
-{ lib
-, stdenv
-, fetchpatch
-, makeWrapper
-, makeDesktopItem
-, copyDesktopItems
-, fetchFromGitHub
-, gradle
-, jdk17
-, zenity
-
-# for arc
-, SDL2
-, pkg-config
-, ant
-, curl
-, wget
-, alsa-lib
-, alsa-plugins
-, glew
-
-# for soloud
-, libpulseaudio ? null
-, libjack2 ? null
-
-, nixosTests
-
-
-# Make the build version easily overridable.
-# Server and client build versions must match, and an empty build version means
-# any build is allowed, so this parameter acts as a simple whitelist.
-# Takes the package version and returns the build version.
-, makeBuildVersion ? (v: v)
-, enableClient ? true
-, enableServer ? true
-
-, enableWayland ? false
-}:
-
-let
-  pname = "mindustry";
-  version = "146";
-  buildVersion = makeBuildVersion version;
-
-  jdk = jdk17;
-
-  Mindustry = fetchFromGitHub {
-    owner = "Anuken";
-    repo = "Mindustry";
-    rev = "v${version}";
-    hash = "sha256-pJAJjb8rgDL5q2hfuXH2Cyb1Szu4GixeXoLMdnIAlno=";
-  };
-  Arc = fetchFromGitHub {
-    owner = "Anuken";
-    repo = "Arc";
-    rev = "v${version}";
-    hash = "sha256-L+5fshI1oo1lVdTMTBuPzqtEeR2dq1NORP84rZ83rT0=";
-  };
-  soloud = fetchFromGitHub {
-    owner = "Anuken";
-    repo = "soloud";
-    # This is pinned in Arc's arc-core/build.gradle
-    rev = "v0.9";
-    hash = "sha256-6KlqOtA19MxeqZttNyNrMU7pKqzlNiA4rBZKp9ekanc=";
-  };
-
-  desktopItem = makeDesktopItem {
-    name = "Mindustry";
-    desktopName = "Mindustry";
-    exec = "mindustry";
-    icon = "mindustry";
-    categories = [ "Game" ];
-  };
-
-in
-assert lib.assertMsg (enableClient || enableServer)
-  "mindustry: at least one of 'enableClient' and 'enableServer' must be true";
-stdenv.mkDerivation {
-  inherit pname version;
-
-  unpackPhase = ''
-    cp -r ${Mindustry} Mindustry
-    cp -r ${Arc} Arc
-    chmod -R u+w -- Mindustry Arc
-    cp -r ${soloud} Arc/arc-core/csrc/soloud
-    chmod -R u+w -- Arc/arc-core/csrc/soloud
-  '';
-
-  patches = [
-    ./0001-fix-include-path-for-SDL2-on-linux.patch
-    # Fix build with gradle 8.8, remove on next Arc release
-    (fetchpatch {
-      url = "https://github.com/Anuken/Arc/commit/2a91c51bf45d700091e397fd0b62384763901ae6.patch";
-      hash = "sha256-sSD78GmF14vBvNe+ajUJ4uIc4p857shTP/UkAK6Pyyg=";
-      extraPrefix = "Arc/";
-      stripLen = 1;
-    })
-    (fetchpatch {
-      url = "https://github.com/Anuken/Arc/commit/d7f8ea858c425410dbd43374271a703d4443b432.patch";
-      hash = "sha256-5LPgBOV0r/dUtpyxitTu3/9tMIqjeIKfGVJi3MEr7fQ=";
-      extraPrefix = "Arc/";
-      stripLen = 1;
-    })
-    (fetchpatch {
-      url = "https://github.com/Anuken/Mindustry/commit/695dad201fb4c2b4252f2ee5abde32e968169ba5.patch";
-      hash = "sha256-bbTjyfUl+XFG/dgD1XPddVKD/ImOP5ARAP3q0FPnt58=";
-      name = "always-use-local-arc-1.patch";
-      stripLen = 1; extraPrefix = "Mindustry/";
-    })
-    (fetchpatch {
-      url = "https://github.com/Anuken/Mindustry/commit/f6082225e859c759c8d9c944250b6ecd490151ed.patch";
-      hash = "sha256-xFHdAUTS1EiHNQqw6qfzYk2LMr/DjeHoEzQfcfOUcFs=";
-      name = "always-use-local-arc-2.patch";
-      stripLen = 1; extraPrefix = "Mindustry/";
-    })
-    (fetchpatch {
-      url = "https://github.com/Anuken/Mindustry/commit/e4eadbbb7f35db3093a0a3d13272bdfbedfaead3.patch";
-      hash = "sha256-L/XQAxh6UgKsTVTgQKDXNRIAdtVtaY4ameT/Yb/+1p8=";
-      name = "always-use-local-arc-3.patch";
-      stripLen = 1; extraPrefix = "Mindustry/";
-    })
-  ];
-
-  postPatch = ''
-    # Ensure the prebuilt shared objects don't accidentally get shipped
-    rm -r Arc/natives/natives-*/libs/*
-    rm -r Arc/backends/backend-*/libs/*
-
-    cd Mindustry
-
-    # Remove unbuildable iOS stuff
-    sed -i '/^project(":ios"){/,/^}/d' build.gradle
-    sed -i '/robo(vm|VM)/d' build.gradle
-    rm ios/build.gradle
-  '';
-
-  mitmCache = gradle.fetchDeps {
-    inherit pname;
-    data = ./deps.json;
-  };
-
-  __darwinAllowLocalNetworking = true;
-
-  buildInputs = lib.optionals enableClient [
-    SDL2
-    alsa-lib
-    glew
-  ];
-  nativeBuildInputs = [
-    pkg-config
-    gradle
-    makeWrapper
-    jdk
-  ] ++ lib.optionals enableClient [
-    ant
-    copyDesktopItems
-    curl
-    wget
-  ];
-
-  desktopItems = lib.optional enableClient desktopItem;
-
-  gradleFlags = [ "-Pbuildversion=${buildVersion}" "-Dorg.gradle.java.home=${jdk}" ];
-
-  buildPhase = lib.optionalString enableServer ''
-    gradle server:dist
-  '' + lib.optionalString enableClient ''
-    pushd ../Arc
-    gradle jnigenBuild
-    gradle jnigenJarNativesDesktop
-    glewlib=${lib.getLib glew}/lib/libGLEW.so
-    sdllib=${lib.getLib SDL2}/lib/libSDL2.so
-    patchelf backends/backend-sdl/libs/linux64/libsdl-arc*.so \
-      --add-needed $glewlib \
-      --add-needed $sdllib
-    # Put the freshly-built libraries where the pre-built libraries used to be:
-    cp arc-core/libs/*/* natives/natives-desktop/libs/
-    cp extensions/freetype/libs/*/* natives/natives-freetype-desktop/libs/
-    popd
-
-    gradle desktop:dist
-  '';
-
-  installPhase = let
-    installClient = ''
-      install -Dm644 desktop/build/libs/Mindustry.jar $out/share/mindustry.jar
-      mkdir -p $out/bin
-      makeWrapper ${jdk}/bin/java $out/bin/mindustry \
-        --add-flags "-jar $out/share/mindustry.jar" \
-        ${lib.optionalString stdenv.hostPlatform.isLinux "--suffix PATH : ${lib.makeBinPath [zenity]}"} \
-        --suffix LD_LIBRARY_PATH : ${lib.makeLibraryPath [libpulseaudio alsa-lib libjack2]} \
-        --set ALSA_PLUGIN_DIR ${alsa-plugins}/lib/alsa-lib/ ${lib.optionalString enableWayland ''
-          --set SDL_VIDEODRIVER wayland \
-          --set SDL_VIDEO_WAYLAND_WMCLASS Mindustry
-        ''}
-
-      # Retain runtime depends to prevent them from being cleaned up.
-      # Since a jar is a compressed archive, nix can't figure out that the dependency is actually in there,
-      # and will assume that it's not actually needed.
-      # This can cause issues.
-      # See https://github.com/NixOS/nixpkgs/issues/109798.
-      echo "# Retained runtime dependencies: " >> $out/bin/mindustry
-      for dep in ${SDL2.out} ${alsa-lib.out} ${glew.out}; do
-        echo "# $dep" >> $out/bin/mindustry
-      done
-
-      install -Dm644 core/assets/icons/icon_64.png $out/share/icons/hicolor/64x64/apps/mindustry.png
-    '';
-    installServer = ''
-      install -Dm644 server/build/libs/server-release.jar $out/share/mindustry-server.jar
-      mkdir -p $out/bin
-      makeWrapper ${jdk}/bin/java $out/bin/mindustry-server \
-        --add-flags "-jar $out/share/mindustry-server.jar"
-    '';
-  in ''
-    runHook preInstall
-  '' + lib.optionalString enableClient installClient
-     + lib.optionalString enableServer installServer
-     + ''
-    runHook postInstall
-  '';
-
-  postGradleUpdate = ''
-    # this fetches non-gradle dependencies
-    cd ../Arc
-    gradle preJni
-  '';
-
-  passthru.tests.nixosTest = nixosTests.mindustry;
-
-  meta = {
-    homepage = "https://mindustrygame.github.io/";
-    downloadPage = "https://github.com/Anuken/Mindustry/releases";
-    description = "Sandbox tower defense game";
-    sourceProvenance = with lib.sourceTypes; [
-      fromSource
-      binaryBytecode  # deps
-    ];
-    license = lib.licenses.gpl3Plus;
-    maintainers = with lib.maintainers; [ chkno fgaz thekostins ];
-    platforms = lib.platforms.all;
-    # TODO alsa-lib is linux-only, figure out what dependencies are required on Darwin
-    broken = enableClient && stdenv.hostPlatform.isDarwin;
-  };
-}
--- a/pkgs/os-specific/linux/hpuefi-mod/default.nix
+++ b/pkgs/os-specific/linux/hpuefi-mod/default.nix
@ -37,7 +37,7 @@ stdenv.mkDerivation (finalAttrs: {
    homepage = "https://ftp.hp.com/pub/caps-softpaq/cmit/linuxtools/HP_LinuxTools.html";
    description = "Kernel module for managing BIOS settings and updating BIOS firmware on supported HP computers";
    license = lib.licenses.gpl2Only; # See "License" section in ./non-rpms/hpuefi-mod-*.tgz/README
-    platforms = lib.platforms.linux;
+    platforms = [ "x86_64-linux" ];
    maintainers = with lib.maintainers; [ tomodachi94 ];
  };
 })
--- a/pkgs/os-specific/linux/zfs/unstable.nix
+++ b/pkgs/os-specific/linux/zfs/unstable.nix
@ -20,14 +20,14 @@ callPackage ./generic.nix args {
  # IMPORTANT: Always use a tagged release candidate or commits from the
  # zfs-<version>-staging branch, because this is tested by the OpenZFS
  # maintainers.
-  version = "2.3.0-rc2";
+  version = "2.3.0-rc3";
  # rev = "";

  tests = {
    inherit (nixosTests.zfs) unstable;
  };

-  hash = "sha256-/INlfiPpRm5JprcORzJJKyjpGIMY1LceY3yZ811uf2A=";
+  hash = "sha256-9s8Sb5+vksFsFI2Ra432QXexmbX3R17dzYzzLZviel0=";

  extraLongDescription = ''
    This is "unstable" ZFS, and will usually be a pre-release version of ZFS.
--- a/pkgs/servers/monitoring/grafana/default.nix
+++ b/pkgs/servers/monitoring/grafana/default.nix
@ -8,7 +8,7 @@

 buildGoModule rec {
  pname = "grafana";
-  version = "11.3.0";
+  version = "11.3.0+security-01";

  subPackages = [ "pkg/cmd/grafana" "pkg/cmd/grafana-server" "pkg/cmd/grafana-cli" ];

@ -16,7 +16,7 @@ buildGoModule rec {
    owner = "grafana";
    repo = "grafana";
    rev = "v${version}";
-    hash = "sha256-tPPhRCZ8auVaX68YhGzpkykxqln8zzqdAZiedpmYqlk=";
+    hash = "sha256-t8D5JHhWJdsnY+SR+eiHy+jHkasAg8b5+uQ38OEFyR4=";
  };

  # borrowed from: https://github.com/NixOS/nixpkgs/blob/d70d9425f49f9aba3c49e2c389fe6d42bac8c5b0/pkgs/development/tools/analysis/snyk/default.nix#L20-L22
--- a/pkgs/tools/inputmethods/fcitx5/fcitx5-skk.nix
+++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-skk.nix
@ -51,7 +51,7 @@ stdenv.mkDerivation rec {
    description = "Input method engine for Fcitx5, which uses libskk as its backend";
    homepage = "https://github.com/fcitx/fcitx5-skk";
    license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ milran ];
+    maintainers = with maintainers; [ wattmto ];
    platforms = platforms.linux;
  };
 }
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@ -1100,8 +1100,6 @@ with pkgs;
    inherit (darwin.apple_sdk_11_0.frameworks) AppKit CoreAudio CoreGraphics Foundation IOKit MediaPlayer Security;
  };

-  trimage = callPackage ../applications/graphics/trimage { inherit (qt5) wrapQtAppsHook; };
-
  ufolint = with python3Packages; toPythonApplication ufolint;

  valeronoi = qt6Packages.callPackage ../tools/misc/valeronoi { };
@ -3941,8 +3939,6 @@ with pkgs;

  internetarchive = with python3Packages; toPythonApplication internetarchive;

-  invidious = callPackage ../servers/invidious { };
-
  iocextract = with python3Packages; toPythonApplication iocextract;

  iocsearcher = with python3Packages; toPythonApplication iocsearcher;
@ -9540,9 +9536,7 @@ with pkgs;
    autoconf = buildPackages.autoconf269;
  };

-  gpac = callPackage ../applications/video/gpac {
-    inherit (darwin.apple_sdk.frameworks) Carbon;
-  };
+  gpac = callPackage ../applications/video/gpac { };

  gpgme = callPackage ../development/libraries/gpgme { };

@ -17229,12 +17223,11 @@ with pkgs;

  manaplus = callPackage ../games/manaplus { stdenv = gcc11Stdenv; };

-  mindustry = callPackage ../games/mindustry { };
-  mindustry-wayland = callPackage ../games/mindustry {
+  mindustry-wayland = callPackage ../by-name/mi/mindustry/package.nix {
    enableWayland = true;
  };

-  mindustry-server = callPackage ../games/mindustry {
+  mindustry-server = callPackage ../by-name/mi/mindustry/package.nix {
    enableClient = false;
    enableServer = true;
  };
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@ -1603,6 +1603,8 @@ self: super: with self; {

  bids-validator = callPackage ../development/python-modules/bids-validator { };

+  bidsschematools = callPackage ../development/python-modules/bidsschematools { };
+
  biliass = callPackage ../development/python-modules/biliass { };

  bilibili-api-python = callPackage ../development/python-modules/bilibili-api-python { };
@ -9123,6 +9125,8 @@ self: super: with self; {

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

+  nlpo3 =  callPackage ../development/python-modules/nlpo3 { };
+
  nltk = callPackage ../development/python-modules/nltk { };

  nnpdf = toPythonModule (pkgs.nnpdf.override {
--- a/pkgs/top-level/release.nix
+++ b/pkgs/top-level/release.nix
@ -334,6 +334,7 @@ let
        "ghc94"
        "ghc96"
        "ghc98"
+        "ghc910"
      ] (compilerName: {
        inherit (packagePlatforms pkgs.haskell.packages.${compilerName})
          haskell-language-server;