Merge master into staging-next

2025-04-14 04:27:41 +00:00 · 2024-10-24 12:05:54 +00:00 · 2024-10-24 12:05:54 +00:00 · e60fd6d56f
commit e60fd6d56f
parent a63f4fdd8a c5636b77af
80 changed files with 7337 additions and 960 deletions
--- a/nixos/doc/manual/release-notes/rl-2411.section.md
+++ b/nixos/doc/manual/release-notes/rl-2411.section.md
@ -108,6 +108,8 @@

 - [Flood](https://flood.js.org/), a beautiful WebUI for various torrent clients. Available as [services.flood](options.html#opt-services.flood).

+- [Niri](https://github.com/YaLTeR/niri), a scrollable-tiling Wayland compositor. Available as [programs.niri](options.html#opt-programs.niri.enable).
+
 - [Firefly-iii Data Importer](https://github.com/firefly-iii/data-importer), a data importer for Firefly-III. Available as [services.firefly-iii-data-importer](options.html#opt-services.firefly-iii-data-importer)

 - [QGroundControl], a ground station support and configuration manager for the PX4 and APM Flight Stacks. Available as [programs.qgroundcontrol](options.html#opt-programs.qgroundcontrol.enable).
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@ -312,6 +312,7 @@
  ./programs/wayland/hyprland.nix
  ./programs/wayland/labwc.nix
  ./programs/wayland/miracle-wm.nix
+  ./programs/wayland/niri.nix
  ./programs/wayland/river.nix
  ./programs/wayland/sway.nix
  ./programs/wayland/uwsm.nix
--- a/nixos/modules/programs/wayland/niri.nix
+++ b/nixos/modules/programs/wayland/niri.nix
@ -0,0 +1,55 @@
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+let
+  cfg = config.programs.niri;
+in
+{
+  options.programs.niri = {
+    enable = lib.mkEnableOption "Niri, a scrollable-tiling Wayland compositor";
+
+    package = lib.mkPackageOption pkgs "niri" { };
+  };
+
+  config = lib.mkIf cfg.enable (
+    lib.mkMerge [
+      {
+        environment.systemPackages = [ cfg.package ];
+
+        services = {
+          displayManager.sessionPackages = [ cfg.package ];
+
+          # Recommended by upstream
+          # https://github.com/YaLTeR/niri/wiki/Important-Software#portals
+          gnome.gnome-keyring.enable = lib.mkDefault true;
+        };
+
+        systemd.packages = [ cfg.package ];
+
+        xdg.portal = {
+          enable = lib.mkDefault true;
+
+          configPackages = [ cfg.package ];
+
+          # Recommended by upstream, required for screencast support
+          # https://github.com/YaLTeR/niri/wiki/Important-Software#portals
+          extraPortals = [ pkgs.xdg-desktop-portal-gnome ];
+        };
+      }
+
+      (import ./wayland-session.nix {
+        inherit lib pkgs;
+        enableWlrPortal = false;
+        enableXWayland = false;
+      })
+    ]
+  );
+
+  meta.maintainers = with lib.maintainers; [
+    getchoo
+    sodiboo
+  ];
+}
--- a/nixos/modules/services/web-servers/nginx/default.nix
+++ b/nixos/modules/services/web-servers/nginx/default.nix
@ -1218,6 +1218,7 @@ in
      ++ lib.optional cfg.recommendedZstdSettings pkgs.nginxModules.zstd;

    services.nginx.virtualHosts.localhost = mkIf cfg.statusPage {
+      serverAliases = [ "127.0.0.1" ] ++ lib.optional config.networking.enableIPv6 "[::1]";
      listenAddresses = lib.mkDefault ([
        "0.0.0.0"
      ] ++ lib.optional enableIPv6 "[::]");
--- a/pkgs/applications/audio/cava/default.nix
+++ b/pkgs/applications/audio/cava/default.nix
@ -1,61 +0,0 @@
-{ lib
-, stdenv
-, fetchFromGitHub
-, autoreconfHook
-, autoconf-archive
-, alsa-lib
-, fftw
-, iniparser
-, libpulseaudio
-, pipewire
-, ncurses
-, pkgconf
-, SDL2
-, libGL
-, withSDL2 ? false
-, withPipewire ? true
-}:
-
-stdenv.mkDerivation rec {
-  pname = "cava";
-  version = "0.10.2";
-
-  src = fetchFromGitHub {
-    owner = "karlstav";
-    repo = "cava";
-    rev = version;
-    hash = "sha256-y6RslsU/zmr0Ai/rnr73N3OtjuBcWa3JCwh9P5GkNss=";
-  };
-
-  buildInputs = [
-    alsa-lib
-    fftw
-    libpulseaudio
-    ncurses
-    iniparser
-  ] ++ lib.optionals withSDL2 [
-    SDL2
-    libGL
-  ] ++ lib.optionals withPipewire [
-    pipewire
-  ];
-
-  nativeBuildInputs = [
-    autoreconfHook
-    autoconf-archive
-    pkgconf
-  ];
-
-  preAutoreconf = ''
-    echo ${version} > version
-  '';
-
-  meta = with lib; {
-    description = "Console-based Audio Visualizer for Alsa";
-    homepage = "https://github.com/karlstav/cava";
-    license = licenses.mit;
-    maintainers = with maintainers; [ offline mirrexagon ];
-    platforms = platforms.linux;
-    mainProgram = "cava";
-  };
-}
--- a/pkgs/applications/audio/psst/Cargo.lock
+++ b/pkgs/applications/audio/psst/Cargo.lock
--- a/pkgs/applications/audio/psst/default.nix
+++ b/pkgs/applications/audio/psst/default.nix
@ -16,13 +16,13 @@ let
 in
 rustPlatform.buildRustPackage rec {
  pname = "psst";
-  version = "unstable-2024-08-19";
+  version = "unstable-2024-10-07";

  src = fetchFromGitHub {
    owner = "jpochyla";
    repo = pname;
-    rev = "11bef15e66a3c9b0b991207d09a67c071b3dda02";
-    hash = "sha256-lKxWIUDouUUul7CpuTy30z/cLJAjFE9e0J1zyZ/PnIo=";
+    rev = "38d1c75d59848c54cb88896a93e05da3c71c7df4";
+    hash = "sha256-iMtrZ1Mto3j4lFXI2Sm2R85+m8LpR7V1WoJ3X5JyF60=";
  };

  cargoLock = {
--- a/pkgs/applications/audio/psst/make-build-reproducible.patch
+++ b/pkgs/applications/audio/psst/make-build-reproducible.patch
@ -1,9 +1,9 @@
 diff --git a/psst-core/build.rs b/psst-core/build.rs
 deleted file mode 100644
-index e05191d..0000000
+index cac2c23..0000000
 --- a/psst-core/build.rs
 +++ /dev/null
-@@ -1,39 +0,0 @@
+@@ -1,41 +0,0 @@
 -use std::{env, fs, io::Write};
 -
 -fn main() {
@ -13,12 +13,14 @@ index e05191d..0000000
 -    let mut fh = fs::File::create(outfile).unwrap();
 -    write!(fh, r#""{}""#, chrono::Local::now()).ok();
 -
-    let git_config = gix_config::File::from_git_dir("../.git/".into()).expect("Git Config not found!");
+-    let git_config =
+-        gix_config::File::from_git_dir("../.git/".into()).expect("Git Config not found!");
 -    // Get Git's 'Origin' URL
 -    let mut remote_url = git_config
-        .raw_value("remote", Some("origin".as_ref()), "url")
+-        .raw_value("remote.origin.url")
 -        .expect("Couldn't extract origin url!")
 -        .to_string();
+-
 -    // Check whether origin is accessed via ssh
 -    if remote_url.contains('@') {
 -        // If yes, strip the `git@` prefix and split the domain and path
@ -44,7 +46,7 @@ index e05191d..0000000
 -    write!(file, r#""{}""#, remote_url).ok();
 -}
 diff --git a/psst-core/src/lib.rs b/psst-core/src/lib.rs
-index fcbd491..8f6e6f0 100644
+index 2faa317..7d7501d 100644
 --- a/psst-core/src/lib.rs
 +++ b/psst-core/src/lib.rs
@@ -2,9 +2,9 @@
@ -54,7 +56,7 @@ index fcbd491..8f6e6f0 100644
 -pub const GIT_VERSION: &str = git_version!();
 -pub const BUILD_TIME: &str = include!(concat!(env!("OUT_DIR"), "/build-time.txt"));
 -pub const REMOTE_URL: &str = include!(concat!(env!("OUT_DIR"), "/remote-url.txt"));
-+pub const GIT_VERSION: &str = "11bef15e66a3c9b0b991207d09a67c071b3dda02";
+pub const GIT_VERSION: &str = "38d1c75d59848c54cb88896a93e05da3c71c7df4";
 +pub const BUILD_TIME: &str = "1970-01-01 00:00:00";
 +pub const REMOTE_URL: &str = "https://github.com/jpochyla/psst";
 
--- a/pkgs/applications/editors/vscode/extensions/visualjj.visualjj/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/visualjj.visualjj/default.nix
@ -7,28 +7,28 @@
 }:

 let
-  version = "0.11.8";
+  version = "0.12.0";

  sources = {
    "x86_64-linux" = {
      arch = "linux-x64";
      url = "https://download.visualjj.com/visualjj-linux-x64-${version}.vsix";
-      hash = "sha256-L46ORW4iZnZ1GNQSU4opp1bTIh036j9JNmkATjTt/qM=";
+      hash = "sha256-7zIe5yTSpAhkG4S+k2SAnp4ZOrbbSsdxExpRfMG5EAo=";
    };
    "x86_64-darwin" = {
      arch = "darwin-x64";
      url = "https://download.visualjj.com/visualjj-darwin-x64-${version}.vsix";
-      hash = "sha256-h15HMZiV/bCVgoajEBe8XLSmFD7EsU2JVlpqiN6ntjQ=";
+      hash = "sha256-0mBNcrfDUqdPfQyc38/Z8YppFP8u9tbxpOLWrQriviE=";
    };
    "aarch64-linux" = {
      arch = "linux-arm64";
      url = "https://download.visualjj.com/visualjj-linux-arm64-${version}.vsix";
-      hash = "sha256-1h/xBMFXtHn/QA0FpZcuUFKxU65AMvaqds6Q9aNaW3s=";
+      hash = "sha256-YvKTs+kA4PghQkduq3aIx20bnGv1VnCtMqLmkLADfbE=";
    };
    "aarch64-darwin" = {
      arch = "darwin-arm64";
      url = "https://download.visualjj.com/visualjj-darwin-arm64-${version}.vsix";
-      hash = "sha256-9SagMPdkB8d2GeGR/R1EmH5y6VNZtYydst9S82kAQlA=";
+      hash = "sha256-gV8VKwPBsgUCDd/A02ASNozuBl/tt5FW0xKOgVKVgAM=";
    };
  };
 in
--- a/pkgs/applications/networking/appgate-sdp/default.nix
+++ b/pkgs/applications/networking/appgate-sdp/default.nix
@ -86,11 +86,11 @@ let
 in
 stdenv.mkDerivation rec {
  pname = "appgate-sdp";
-  version = "6.3.2";
+  version = "6.4.0";

  src = fetchurl {
    url = "https://bin.appgate-sdp.com/${lib.versions.majorMinor version}/client/appgate-sdp_${version}_amd64.deb";
-    sha256 = "sha256-7W2iUilSK4awrtgZc/c40oivzlyz3RN5U5TUicqavsc=";
+    sha256 = "sha256-0h6Mz3B7fADGL5tGbrKNYpVIAvRu7Xx0n9OvjOeVCds=";
  };

  # just patch interpreter
--- a/pkgs/applications/networking/browsers/chromium/common.nix
+++ b/pkgs/applications/networking/browsers/chromium/common.nix
@ -1,7 +1,6 @@
 { stdenv, lib, fetchpatch
 , recompressTarball
 , buildPackages
-, buildPlatform
 , pkgsBuildBuild
 # Channel data:
 , channel, upstream-info
--- a/pkgs/applications/networking/cluster/opentofu/default.nix
+++ b/pkgs/applications/networking/cluster/opentofu/default.nix
@ -14,13 +14,13 @@
 let
  package =  buildGoModule rec {
    pname = "opentofu";
-    version = "1.8.3";
+    version = "1.8.4";

    src = fetchFromGitHub {
      owner = "opentofu";
      repo = "opentofu";
      rev = "v${version}";
-      hash = "sha256-+1ctvUz1Prhon+w5fGO+IQCYl7uEMZwAYMfQut7fmO4=";
+      hash = "sha256-YUN+JBYn8Bq4glZNBdlr++WJgGpGSKK1PjWqaduF8bg=";
    };

    vendorHash = "sha256-cM2DSP2ss3vleUhPBIdyxKeWJxtHpdjL5b5HVS/iC6o=";
--- a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix
+++ b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix
@ -1,9 +1,9 @@
-{ hostPlatform, callPackage }:
+{ stdenv, callPackage }:
 {
  signal-desktop =
-    if hostPlatform.system == "aarch64-linux" then
+    if stdenv.hostPlatform.system == "aarch64-linux" then
      callPackage ./signal-desktop-aarch64.nix { }
-    else if hostPlatform.isDarwin then
+    else if stdenv.hostPlatform.isDarwin then
      callPackage ./signal-desktop-darwin.nix { }
    else
      callPackage ./signal-desktop.nix { };
--- a/pkgs/applications/virtualization/rust-hypervisor-firmware/default.nix
+++ b/pkgs/applications/virtualization/rust-hypervisor-firmware/default.nix
@ -1,11 +1,11 @@
 { lib
 , fetchFromGitHub
-, hostPlatform
+, stdenv
 , lld
 }:

 let
-  arch = hostPlatform.qemuArch;
+  arch = stdenv.hostPlatform.qemuArch;

  target = ./. + "/${arch}-unknown-none.json";

@ -15,7 +15,7 @@ assert lib.assertMsg (builtins.pathExists target) "Target spec not found";

 let
  cross = import ../../../.. {
-    system = hostPlatform.system;
+    system = stdenv.hostPlatform.system;
    crossSystem = lib.systems.examples."${arch}-embedded" // {
      rust.rustcTarget = "${arch}-unknown-none";
      rust.platform = lib.importJSON target;
--- a/pkgs/by-name/bo/bombsquad/package.nix
+++ b/pkgs/by-name/bo/bombsquad/package.nix
@ -1,7 +1,6 @@
 {
  lib,
  stdenv,
-  targetPlatform,
  fetchurl,
  python312,
  SDL2,
@ -30,7 +29,7 @@ let
        hash = "sha256-o1Yg0C5k07NZzc9jQrHXR+kkQl8HZ55U9/fqcpe3Iyw=";
      };
    }
-    .${targetPlatform.system} or (throw "${targetPlatform.system} is unsupported.");
+    .${stdenv.targetPlatform.system} or (throw "${stdenv.targetPlatform.system} is unsupported.");
 in
 stdenv.mkDerivation (finalAttrs: {
  pname = "bombsquad";
--- a/pkgs/by-name/ca/cargo-rdme/package.nix
+++ b/pkgs/by-name/ca/cargo-rdme/package.nix
@ -2,18 +2,18 @@

 rustPlatform.buildRustPackage rec {
  pname = "cargo-rdme";
-  version = "1.4.4";
+  version = "1.4.5";

  src = fetchCrate {
    inherit pname version;
-    hash = "sha256-AARkXr6qOq9u/nmcmCnA4P+Q+MPPChCXoRaYiLwCNPs=";
+    hash = "sha256-IB+n9abFeWLgJLdo3NjffcGrIxXhNdZ2moyfIG+gMoc=";
  };

  buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [
    Security
  ];

-  cargoHash = "sha256-myTh+zOtAt9h/irld7OHSXKMv0V+LAR4h/afYKvXeXg=";
+  cargoHash = "sha256-mD95+Q6xaL0LFk5841LBrQqzFU7KFJbUgHB96zXy2KU=";

  meta = with lib; {
    description = "Cargo command to create the README.md from your crate's documentation";
--- a/pkgs/by-name/ca/cava/package.nix
+++ b/pkgs/by-name/ca/cava/package.nix
@ -0,0 +1,80 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  autoreconfHook,
+  autoconf-archive,
+  alsa-lib,
+  fftw,
+  iniparser,
+  libGL,
+  libpulseaudio,
+  libtool,
+  ncurses,
+  pipewire,
+  pkgconf,
+  portaudio,
+  SDL2,
+  versionCheckHook,
+  withSDL2 ? false,
+  withPipewire ? stdenv.hostPlatform.isLinux,
+}:
+
+stdenv.mkDerivation rec {
+  pname = "cava";
+  version = "0.10.2";
+
+  src = fetchFromGitHub {
+    owner = "karlstav";
+    repo = "cava";
+    rev = version;
+    hash = "sha256-y6RslsU/zmr0Ai/rnr73N3OtjuBcWa3JCwh9P5GkNss=";
+  };
+
+  buildInputs =
+    [
+      fftw
+      iniparser
+      libpulseaudio
+      libtool
+      ncurses
+    ]
+    ++ lib.optionals stdenv.hostPlatform.isLinux [
+      alsa-lib
+    ]
+    ++ lib.optionals stdenv.hostPlatform.isDarwin [
+      portaudio
+    ]
+    ++ lib.optionals withSDL2 [
+      libGL
+      SDL2
+    ]
+    ++ lib.optionals withPipewire [
+      pipewire
+    ];
+
+  nativeBuildInputs = [
+    autoreconfHook
+    autoconf-archive
+    pkgconf
+    versionCheckHook
+  ];
+  doInstallCheck = true;
+  versionCheckProgramArg = "-v";
+
+  preAutoreconf = ''
+    echo ${version} > version
+  '';
+
+  meta = with lib; {
+    description = "Console-based Audio Visualizer for Alsa";
+    homepage = "https://github.com/karlstav/cava";
+    license = licenses.mit;
+    maintainers = with maintainers; [
+      offline
+      mirrexagon
+    ];
+    platforms = platforms.unix;
+    mainProgram = "cava";
+  };
+}
--- a/pkgs/by-name/cl/clang-uml/package.nix
+++ b/pkgs/by-name/cl/clang-uml/package.nix
@ -11,6 +11,7 @@
  yaml-cpp,
  elfutils,
  libunwind,
+  versionCheckHook,
  enableLibcxx ? false,
  debug ? false,
 }:
@ -43,6 +44,7 @@ stdenv.mkDerivation (finalAttrs: {

  cmakeFlags = [
    "-DCUSTOM_COMPILE_OPTIONS=-Wno-error=sign-compare"
+    "-DGIT_VERSION=${finalAttrs.version}"
  ];

  buildInputs = [
@ -72,6 +74,10 @@ stdenv.mkDerivation (finalAttrs: {
  dontFixup = debug;
  dontStrip = debug;

+  nativeInstallCheckInputs = [ versionCheckHook ];
+  doInstallCheck = true;
+  versionCheckProgramArg = "--version";
+
  meta = {
    description = "Customizable automatic UML diagram generator for C++ based on Clang";
    longDescription = ''
@ -84,5 +90,6 @@ stdenv.mkDerivation (finalAttrs: {
    homepage = "https://clang-uml.github.io/";
    license = lib.licenses.asl20;
    platforms = lib.platforms.all;
+    mainProgram = "clang-uml";
  };
 })
--- a/pkgs/by-name/cl/cliqr/package.nix
+++ b/pkgs/by-name/cl/cliqr/package.nix
@ -0,0 +1,33 @@
+{
+  lib,
+  buildGoModule,
+  fetchFromGitHub,
+}:
+
+buildGoModule rec {
+  pname = "cliqr";
+  version = "0.1.25";
+
+  src = fetchFromGitHub {
+    owner = "paepckehh";
+    repo = "cliqr";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-iPNI92kCNFXRiV5NV7Yj0gznwNeFoW02yh6QLrkBYO0=";
+  };
+
+  vendorHash = null;
+
+  ldflags = [
+    "-s"
+    "-w"
+  ];
+
+  meta = {
+    changelog = "https://github.com/paepckehh/cliqr/releases/tag/v${version}";
+    homepage = "https://paepcke.de/cliqr";
+    description = "Transfer, share data & secrets via console qr codes";
+    license = lib.licenses.bsd3;
+    mainProgram = "cliqr";
+    maintainers = with lib.maintainers; [ paepcke ];
+  };
+}
--- a/pkgs/by-name/co/code-cursor/package.nix
+++ b/pkgs/by-name/co/code-cursor/package.nix
@ -8,11 +8,11 @@
 }:
 let
  pname = "cursor";
-  version = "0.41.3";
+  version = "0.42.3";
  appKey = "230313mzl4w4u92";
  src = fetchurl {
-    url = "https://download.todesktop.com/230313mzl4w4u92/cursor-0.41.3-build-240925fkhcqg263-x86_64.AppImage";
-    hash = "sha256-WtfyiNGnUn8g1HR0TQPyn3SMJmjqe+otAYeyokMIO+w=";
+    url = "https://download.todesktop.com/230313mzl4w4u92/cursor-0.42.3-build-241016kxu9umuir-x86_64.AppImage";
+    hash = "sha256-GWkilBlpXube//jbxRjmKJjYcmB42nhMY8K0OgkvtwA=";
  };
  appimageContents = appimageTools.extractType2 { inherit version pname src; };
 in
--- a/pkgs/by-name/gu/guile-goblins/package.nix
+++ b/pkgs/by-name/gu/guile-goblins/package.nix
@ -10,11 +10,11 @@
 }:
 stdenv.mkDerivation rec {
  pname = "guile-goblins";
-  version = "0.13.0";
+  version = "0.14.0";

  src = fetchurl {
    url = "https://spritely.institute/files/releases/guile-goblins/guile-goblins-${version}.tar.gz";
-    hash = "sha256-efmyOtPAz1ZPdMCuVaGALR6e0lg7gcjt81BUMBVUKug=";
+    hash = "sha256-jR+pWk7NXvOF0CvDwa1rYg0yu5ktyq440qyRgivqHr8=";
  };

  strictDeps = true;
--- a/pkgs/by-name/i2/i2p/package.nix
+++ b/pkgs/by-name/i2/i2p/package.nix
@ -13,7 +13,7 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "i2p";
-  version = "2.6.1";
+  version = "2.7.0";

  src = fetchzip {
    urls = [
@ -23,7 +23,7 @@ stdenv.mkDerivation (finalAttrs: {
      "https://files.i2p-projekt.de/"
      "https://download.i2p2.no/releases/"
    ]);
-    hash = "sha256-ntjTXdpgcTReEVxzDEoq9r3NAqS7q4m+rlJXp7is1k0=";
+    hash = "sha256-gw1i6jrmTfz9CZlCjtOUdH5R4vD57ysDeQxyyWifieg=";
  };

  strictDeps = true;
--- a/pkgs/by-name/ko/koboldcpp/package.nix
+++ b/pkgs/by-name/ko/koboldcpp/package.nix
@ -141,6 +141,10 @@ effectiveStdenv.mkDerivation (finalAttrs: {
    cp *.so "$out/bin"
    cp *.embd "$out/bin"

+    ${lib.optionalString metalSupport ''
+      cp *.metal "$out/bin"
+    ''}
+
    ${lib.optionalString (!koboldLiteSupport) ''
      rm "$out/bin/kcpp_docs.embd"
      rm "$out/bin/klite.embd"
--- a/pkgs/by-name/op/opnborg/package.nix
+++ b/pkgs/by-name/op/opnborg/package.nix
@ -0,0 +1,32 @@
+{
+  lib,
+  buildGoModule,
+  fetchFromGitHub,
+}:
+buildGoModule rec {
+  pname = "opnborg";
+  version = "0.1.2";
+
+  src = fetchFromGitHub {
+    owner = "paepckehh";
+    repo = "opnborg";
+    rev = "v${version}";
+    hash = "sha256-R8yl7dI+VNeY1OVoBo+CN88+2eSePjlzet/Zowj0cQs=";
+  };
+
+  vendorHash = "sha256-REXJryUcu+/AdVx1aK0nJ98Wq/EdhrZqL24kC1wK6mc=";
+
+  ldflags = [
+    "-s"
+    "-w"
+  ];
+
+  meta = {
+    changelog = "https://github.com/paepckehh/opnborg/releases/tag/v${version}";
+    homepage = "https://paepcke.de/opnborg";
+    description = "Sefhosted OPNSense Appliance Backup & Configuration Management Portal";
+    license = lib.licenses.bsd3;
+    mainProgram = "opnborg";
+    maintainers = with lib.maintainers; [ paepcke ];
+  };
+}
--- a/pkgs/by-name/os/oscar/package.nix
+++ b/pkgs/by-name/os/oscar/package.nix
@ -7,13 +7,13 @@
 }:
 stdenv.mkDerivation rec {
  pname = "oscar";
-  version = "1.5.1";
+  version = "1.5.3";

  src = fetchFromGitLab {
    owner = "pholy";
    repo = "OSCAR-code";
-    rev = "v${version}";
-    hash = "sha256-FBHbPtMZeIgcR1pQflfEWK2FS8bquctXaeY/yaZofHg=";
+    rev = "${version}";
+    hash = "sha256-ukd2pni4qEwWxG4lr8KUliZO/R2eziTTuSvDo8uigxQ=";
  };

  buildInputs = [
--- a/pkgs/by-name/pa/patch-package/package.nix
+++ b/pkgs/by-name/pa/patch-package/package.nix
@ -0,0 +1,45 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  fetchYarnDeps,
+  yarnConfigHook,
+  yarnBuildHook,
+  yarnInstallHook,
+  nodejs,
+  nix-update-script,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "patch-package";
+  version = "8.0.0";
+
+  src = fetchFromGitHub {
+    owner = "ds300";
+    repo = "patch-package";
+    rev = "v${finalAttrs.version}";
+    hash = "sha256-QuCgdQGqy27wyLUI6w6p8EWLn1XA7QbkjpLJwFXSex8=";
+  };
+
+  yarnOfflineCache = fetchYarnDeps {
+    yarnLock = "${finalAttrs.src}/yarn.lock";
+    hash = "sha256-WF9gJkj4wyrBeGPIzTOw3nG6Se7tFb0YLcAM8Uv9YNI=";
+  };
+
+  nativeBuildInputs = [
+    yarnConfigHook
+    yarnBuildHook
+    yarnInstallHook
+    nodejs
+  ];
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "Fix broken node modules instantly";
+    mainProgram = "patch-package";
+    homepage = "https://github.com/ds300/patch-package";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ pyrox0 ];
+  };
+})
--- a/pkgs/by-name/po/pop-launcher/Cargo.lock
+++ b/pkgs/by-name/po/pop-launcher/Cargo.lock
--- a/pkgs/by-name/po/pop-launcher/package.nix
+++ b/pkgs/by-name/po/pop-launcher/package.nix
@ -1,22 +1,64 @@
-{ rustPlatform
-, fetchFromGitHub
-, lib
-, fd
-, libqalculate
+{
+  stdenv,
+  rustPlatform,
+  fetchFromGitHub,
+  lib,
+  just,
+  pkg-config,
+  fd,
+  libqalculate,
+  libxkbcommon,
 }:

 rustPlatform.buildRustPackage rec {
  pname = "pop-launcher";
-  version = "1.2.1";
+  version = "1.2.4";

  src = fetchFromGitHub {
    owner = "pop-os";
    repo = "launcher";
    rev = version;
-    hash = "sha256-BQAO9IodZxGgV8iBmUaOF0yDbAMVDFslKCqlh3pBnb0=";
+    hash = "sha256-CLpquNgdtnGMlMpGLv72WZmizalvYPfMWlE/qLprVrs=";
  };

+  nativeBuildInputs = [
+    just
+    pkg-config
+  ];
+  buildInputs = [
+    libxkbcommon
+  ];
+
+  cargoLock = {
+    lockFile = ./Cargo.lock;
+    outputHashes = {
+      "cosmic-client-toolkit-0.1.0" = "sha256-6XM6kcM2CEGAziCkal4uO0EL1nEWOKb3rFs7hFh6r7Y=";
+      "switcheroo-control-0.1.0" = "sha256-mklNPKVMO6iFrxki2DwiL5K78KiWpGxksisYldaASIE=";
+    };
+  };
+  cargoBuildFlags = [
+    "--package"
+    "pop-launcher-bin"
+  ];
+  cargoTestFlags = [
+    "--package"
+    "pop-launcher-bin"
+  ];
+
+  dontUseJustBuild = true;
+  dontUseJustCheck = true;
+  justFlags = [
+    "--set"
+    "base-dir"
+    (placeholder "out")
+    "--set"
+    "target-dir"
+    "target/${stdenv.hostPlatform.rust.cargoShortTarget}/release"
+  ];
+
  postPatch = ''
+    substituteInPlace justfile --replace-fail '#!/usr/bin/env' "#!$(command -v env)"
+
    substituteInPlace src/lib.rs \
        --replace-fail '/usr/lib/pop-launcher' "$out/share/pop-launcher"
    substituteInPlace plugins/src/scripts/mod.rs \
@ -29,28 +71,6 @@ rustPlatform.buildRustPackage rec {
        --replace-fail '/usr/bin/gnome-terminal' 'gnome-terminal'
  '';

-  cargoHash = "sha256-cTvrq0fH057UIx/O9u8zHMsg+psMGg1q9klV5OMxtok=";
-
-  cargoBuildFlags = [ "--package" "pop-launcher-bin" ];
-
-  postInstall = ''
-    mv $out/bin/pop-launcher{-bin,}
-
-    plugins_dir=$out/share/pop-launcher/plugins
-    scripts_dir=$out/share/pop-launcher/scripts
-    mkdir -p $plugins_dir $scripts_dir
-
-    for plugin in $(find plugins/src -mindepth 1 -maxdepth 1 -type d -printf '%f\n'); do
-      mkdir $plugins_dir/$plugin
-      cp plugins/src/$plugin/*.ron $plugins_dir/$plugin
-      ln -sf $out/bin/pop-launcher $plugins_dir/$plugin/$(echo $plugin | sed 's/_/-/')
-    done
-
-    for script in scripts/*; do
-      cp -r $script $scripts_dir
-    done
-  '';
-
  meta = with lib; {
    description = "Modular IPC-based desktop launcher service";
    homepage = "https://github.com/pop-os/launcher";
--- a/pkgs/by-name/pr/preserves-tools/package.nix
+++ b/pkgs/by-name/pr/preserves-tools/package.nix
@ -1,19 +1,32 @@
-{ lib, rustPlatform, fetchCrate }:
+{
+  lib,
+  stdenv,
+  rustPlatform,
+  fetchCrate,
+  installShellFiles,
+}:

 rustPlatform.buildRustPackage rec {
  pname = "preserves-tools";
-  version = "4.994.0";
+  version = "4.996.1";

  src = fetchCrate {
    inherit pname version;
-    hash = "sha256-+I2uxdAe4SHg8ZLRvkIUr862FH6GvCwnyhxcCPD3JBA=";
+    hash = "sha256-Uyh5mXCypX3TDxxJtnTe6lBoVI8aqdG56ywn7htDGUY=";
  };

-  cargoHash = "sha256-09uxXD9EZzzk42tBYbuqaLRFyGmOUuvC7G0XMDjsK6E=";
+  cargoHash = "sha256-rDo/jA4b+GV90SKM82JcGTX1pcAQUeBrLvGwU/geGOw=";
+
+  nativeBuildInputs = [ installShellFiles ];
+  postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
+    installShellCompletion --cmd preserves-tool \
+      --bash <($out/bin/preserves-tool completions bash) \
+      --fish <($out/bin/preserves-tool completions fish) \
+      --zsh <($out/bin/preserves-tool completions zsh)
+  '';

  meta = {
-    description =
-      "Command-line utilities for working with Preserves documents";
+    description = "Command-line utilities for working with Preserves documents";
    homepage = "https://preserves.dev/doc/preserves-tool.html";
    license = lib.licenses.asl20;
    maintainers = with lib.maintainers; [ ehmry ];
--- a/pkgs/by-name/pu/pupdate/package.nix
+++ b/pkgs/by-name/pu/pupdate/package.nix
@ -5,7 +5,6 @@
 , dotnetCorePackages
 , openssl
 , zlib
-, hostPlatform
 , nix-update-script
 }:

@ -30,7 +29,7 @@ buildDotnetModule rec {
  patches = [ ./add-runtime-identifier.patch ];
  postPatch = ''
    substituteInPlace pupdate.csproj \
-      --replace @RuntimeIdentifier@ "${dotnetCorePackages.systemToDotnetRid hostPlatform.system}"
+      --replace @RuntimeIdentifier@ "${dotnetCorePackages.systemToDotnetRid stdenv.hostPlatform.system}"
  '';

  projectFile = "pupdate.csproj";
--- a/pkgs/by-name/va/vapoursynth/nix-plugin-loader.patch
+++ b/pkgs/by-name/va/vapoursynth/nix-plugin-loader.patch
@ -1,28 +0,0 @@
-diff --git a/src/core/vscore.cpp b/src/core/vscore.cpp
-index 73e2eafc..66a01326 100644
--- a/src/core/vscore.cpp
-+++ b/src/core/vscore.cpp
-@@ -1779,6 +1779,12 @@ void VSCore::isPortableInit() {
- }
- #endif
- 
-+void __attribute__((weak)) VSLoadPluginsNix(void (*load)(VSCore *core, const std::filesystem::path &), VSCore *);
-+
-+static void VSLoadPluginsNixCallback(VSCore *core, const std::filesystem::path &path) {
-+    core->loadAllPluginsInPath(path);
-+}
-+
- VSCore::VSCore(int flags) :
-     numFilterInstances(1),
-     numFunctionInstances(0),
-@@ -1890,6 +1896,10 @@ VSCore::VSCore(int flags) :
- #endif
-     }
- 
-+    if (VSLoadPluginsNix != nullptr) {
-+        VSLoadPluginsNix(VSLoadPluginsNixCallback, this);
-+    };
-+
-     VSMap *settings = readSettings(configFile);
-     const char *error = vs_internal_vsapi.mapGetError(settings);
-     if (error) {
--- a/pkgs/by-name/va/vapoursynth/package.nix
+++ b/pkgs/by-name/va/vapoursynth/package.nix
@ -8,7 +8,6 @@
  runCommandCC,
  runCommand,
  vapoursynth,
-  writeText,
  buildEnv,
  zimg,
  libass,
@ -29,8 +28,6 @@ stdenv.mkDerivation rec {
    hash = "sha256-T2bCVNH0dLM9lFYChXzvD6AJM3xEtOVCb2tI10tIXJs=";
  };

-  patches = [ ./nix-plugin-loader.patch ];
-
  nativeBuildInputs = [
    pkg-config
    autoreconfHook
@ -53,6 +50,7 @@ stdenv.mkDerivation rec {
    ];

  enableParallelBuilding = true;
+  doInstallCheck = true;

  passthru = rec {
    # If vapoursynth is added to the build inputs of mpv and then
@ -66,7 +64,6 @@ stdenv.mkDerivation rec {
        lib
        python3
        buildEnv
-        writeText
        runCommandCC
        stdenv
        runCommand
@ -83,6 +80,14 @@ stdenv.mkDerivation rec {
    };
  };

+  postPatch = ''
+    # Export weak symbol nixPluginDir to permit override of default plugin path
+    sed -E -i \
+      -e 's/(VS_PATH_PLUGINDIR)/(nixPluginDir ? nixPluginDir : \1)/g' \
+      -e '1i\extern char const __attribute__((weak)) nixPluginDir[];' \
+      src/core/vscore.cpp
+  '';
+
  postInstall = ''
    wrapProgram $out/bin/vspipe \
        --prefix PYTHONPATH : $out/${python3.sitePackages}
@ -92,6 +97,18 @@ stdenv.mkDerivation rec {
    mkdir $out/lib/vapoursynth
  '';

+  installCheckPhase = ''
+    runHook preInstallCheck
+
+    libv="$out/lib/libvapoursynth${stdenv.hostPlatform.extensions.sharedLibrary}"
+    if ! $NM -g -P "$libv" | grep -q '^nixPluginDir w'; then
+      echo "Weak symbol nixPluginDir is missing from $libv." >&2
+      exit 1
+    fi
+
+    runHook postInstallCheck
+  '';
+
  meta = with lib; {
    broken = stdenv.hostPlatform.isDarwin; # see https://github.com/NixOS/nixpkgs/pull/189446 for partial fix
    description = "Video processing framework with the future in mind";
--- a/pkgs/by-name/va/vapoursynth/plugin-interface.nix
+++ b/pkgs/by-name/va/vapoursynth/plugin-interface.nix
@ -2,7 +2,6 @@
  lib,
  python3,
  buildEnv,
-  writeText,
  runCommandCC,
  stdenv,
  runCommand,
@ -35,29 +34,19 @@ let
    paths = deepPlugins;
  };

-  pluginLoader =
-    let
-      source = writeText "vapoursynth-nix-plugins.cpp" ''
-        #include <filesystem>
-
-        struct VSCore;
-
-        void VSLoadPluginsNix(void (*load)(VSCore *, const std::filesystem::path &), VSCore *core) {
-        ${lib.concatMapStrings (
-          path: ''load(core, std::filesystem::u8path("${path}/lib/vapoursynth"));''
-        ) deepPlugins}
-        }
-      '';
-    in
-    runCommandCC "vapoursynth-plugin-loader"
+  # Override default plugin path through nixPluginDir symbol
+  nixPlugins =
+    runCommandCC "libvapoursynth-nix-plugins${ext}"
      {
        executable = true;
        preferLocalBuild = true;
        allowSubstitutes = false;
+        src = ''
+          char const nixPluginDir[] = "${pluginsEnv}/lib/vapoursynth";
+        '';
      }
      ''
-        mkdir -p $out/lib
-        $CXX -std=c++17 -shared -fPIC ${source} -o "$out/lib/libvapoursynth-nix-plugins${ext}"
+        $CC -x c -shared -fPIC - -o "$out" <<<"$src"
      '';

  ext = stdenv.hostPlatform.extensions.sharedLibrary;
@ -123,9 +112,7 @@ runCommand "${vapoursynth.name}-with-plugins"
            ${vapoursynth}/$binaryFile
    done

-    ln -s \
-        ${pluginLoader}/lib/libvapoursynth-nix-plugins${ext} \
-        $out/lib/libvapoursynth-nix-plugins${ext}
+    ln -s ${nixPlugins} $out/lib/libvapoursynth-nix-plugins${ext}
    ln -s ${vapoursynth}/include $out/include
    ln -s ${vapoursynth}/lib/vapoursynth/* $out/lib/vapoursynth
    ln -s \
--- a/pkgs/desktops/deepin/core/dde-shell/default.nix
+++ b/pkgs/desktops/deepin/core/dde-shell/default.nix
@ -33,6 +33,7 @@ stdenv.mkDerivation (finalAttrs: {

  patches = [
    ./fix-path-for-nixos.diff
+    ./fix-dock-can-not-show-with-qt6_8.diff
  ];

  postPatch = ''
--- a/pkgs/desktops/deepin/core/dde-shell/fix-dock-can-not-show-with-qt6_8.diff
+++ b/pkgs/desktops/deepin/core/dde-shell/fix-dock-can-not-show-with-qt6_8.diff
@ -0,0 +1,20 @@
+diff --git a/panels/dock/OverflowContainer.qml b/panels/dock/OverflowContainer.qml
+index 74ca966..312f2a0 100644
+--- a/panels/dock/OverflowContainer.qml
+++ b/panels/dock/OverflowContainer.qml
+@@ -52,13 +52,13 @@ Item {
+         for (let child of listView.contentItem.visibleChildren) {
+             width = calculateImplicitWidth(width, child.implicitWidth)
+         }
+-        return width
+        return Math.max(width, 1)
+     }
+     implicitHeight: {
+         let height = 0
+         for (let child of listView.contentItem.visibleChildren) {
+             height = calculateImplicitHeight(height, child.implicitHeight)
+         }
+-        return height
+        return Math.max(height, 1)
+     }
+ }
--- a/pkgs/development/compilers/flutter/engine/package.nix
+++ b/pkgs/development/compilers/flutter/engine/package.nix
@ -3,12 +3,10 @@
  callPackage,
  writeText,
  symlinkJoin,
-  targetPlatform,
-  buildPlatform,
  darwin,
  clang,
  llvm,
-  tools ? callPackage ./tools.nix { inherit buildPlatform; },
+  tools ? callPackage ./tools.nix { },
  stdenv,
  stdenvNoCC,
  dart,
@ -53,7 +51,7 @@ let

  expandDeps = deps: lib.flatten (map expandSingleDep deps);

-  constants = callPackage ./constants.nix { platform = targetPlatform; };
+  constants = callPackage ./constants.nix { platform = stdenv.targetPlatform; };

  python3 = if lib.versionAtLeast flutterVersion "3.20" then python312 else python39;

@ -64,8 +62,6 @@ let
      version
      hashes
      url
-      targetPlatform
-      buildPlatform
      ;
  };

@ -253,7 +249,7 @@ stdenv.mkDerivation (finalAttrs: {
      "--embedder-for-target"
      "--no-goma"
    ]
-    ++ lib.optionals (targetPlatform.isx86_64 == false) [
+    ++ lib.optionals (stdenv.targetPlatform.isx86_64 == false) [
      "--linux"
      "--linux-cpu ${constants.alt-arch}"
    ]
@ -278,7 +274,7 @@ stdenv.mkDerivation (finalAttrs: {
        --out-dir $out \
        --target-sysroot $toolchain \
        --target-dir $outName \
-        --target-triple ${targetPlatform.config} \
+        --target-triple ${stdenv.targetPlatform.config} \
        --enable-fontconfig

      runHook postConfigure
--- a/pkgs/development/compilers/flutter/engine/source.nix
+++ b/pkgs/development/compilers/flutter/engine/source.nix
@ -1,9 +1,7 @@
 {
+  stdenv,
  lib,
  callPackage,
-  buildPlatform,
-  targetPlatform,
-  hostPlatform,
  fetchgit,
  tools ? null,
  curl,
@ -19,13 +17,14 @@
  url,
 }@pkgs:
 let
-  target-constants = callPackage ./constants.nix { platform = targetPlatform; };
-  build-constants = callPackage ./constants.nix { platform = buildPlatform; };
-  tools = pkgs.tools or (callPackage ./tools.nix { inherit hostPlatform buildPlatform; });
+  target-constants = callPackage ./constants.nix { platform = stdenv.targetPlatform; };
+  build-constants = callPackage ./constants.nix { platform = stdenv.buildPlatform; };
+  tools = pkgs.tools or (callPackage ./tools.nix { });

  boolOption = value: if value then "True" else "False";
 in
-runCommand "flutter-engine-source-${version}-${buildPlatform.system}-${targetPlatform.system}"
+runCommand
+  "flutter-engine-source-${version}-${stdenv.buildPlatform.system}-${stdenv.targetPlatform.system}"
  {
    pname = "flutter-engine-source";
    inherit version;
@ -53,7 +52,7 @@ runCommand "flutter-engine-source-${version}-${buildPlatform.system}-${targetPla
        "custom_vars": {
          "download_fuchsia_deps": False,
          "download_android_deps": False,
-          "download_linux_deps": ${boolOption targetPlatform.isLinux},
+          "download_linux_deps": ${boolOption stdenv.targetPlatform.isLinux},
          "setup_githooks": False,
          "download_esbuild": False,
          "download_dart_sdk": False,
@ -83,8 +82,8 @@ runCommand "flutter-engine-source-${version}-${buildPlatform.system}-${targetPla
    outputHashAlgo = "sha256";
    outputHashMode = "recursive";
    outputHash =
-      (hashes."${buildPlatform.system}" or { })."${targetPlatform.system}"
-        or (throw "Hash not set for ${targetPlatform.system} on ${buildPlatform.system}");
+      (hashes."${stdenv.buildPlatform.system}" or { })."${stdenv.targetPlatform.system}"
+        or (throw "Hash not set for ${stdenv.targetPlatform.system} on ${stdenv.buildPlatform.system}");
  }
  ''
    source ${../../../../build-support/fetchgit/deterministic-git}
--- a/pkgs/development/compilers/flutter/engine/tools.nix
+++ b/pkgs/development/compilers/flutter/engine/tools.nix
@ -5,8 +5,6 @@
  fetchurl,
  writeText,
  runCommand,
-  buildPlatform,
-  hostPlatform,
  darwin,
  writeShellScriptBin,
  depot_toolsCommit ? "7d95eb2eb054447592585c73a8ff7adad97ecba1",
@ -31,8 +29,8 @@
  },
 }:
 let
-  constants = callPackage ./constants.nix { platform = buildPlatform; };
-  host-constants = callPackage ./constants.nix { platform = hostPlatform; };
+  constants = callPackage ./constants.nix { platform = stdenv.buildPlatform; };
+  host-constants = callPackage ./constants.nix { platform = stdenv.hostPlatform; };
  stdenv-constants = callPackage ./constants.nix { platform = stdenv.hostPlatform; };
 in
 {
--- a/pkgs/development/compilers/zig/cc.nix
+++ b/pkgs/development/compilers/zig/cc.nix
@ -3,7 +3,7 @@
  wrapCCWith,
  makeWrapper,
  runCommand,
-  targetPlatform,
+  stdenv,
  targetPackages,
  zig,
 }:
@ -34,9 +34,9 @@ wrapCCWith {
  nixSupport.cc-cflags =
    [
      "-target"
-      "${targetPlatform.parsed.cpu.name}-${targetPlatform.parsed.kernel.name}-${targetPlatform.parsed.abi.name}"
+      "${stdenv.targetPlatform.parsed.cpu.name}-${stdenv.targetPlatform.parsed.kernel.name}-${stdenv.targetPlatform.parsed.abi.name}"
    ]
    ++ lib.optional (
-      targetPlatform.isLinux && !(targetPackages.isStatic or false)
+      stdenv.targetPlatform.isLinux && !(targetPackages.isStatic or false)
    ) "-Wl,-dynamic-linker=${targetPackages.stdenv.cc.bintools.dynamicLinker}";
 }
--- a/pkgs/development/interpreters/tclreadline/default.nix
+++ b/pkgs/development/interpreters/tclreadline/default.nix
@ -10,13 +10,13 @@

 tcl.mkTclDerivation rec {
  pname = "tclreadline";
-  version = "2.3.8";
+  version = "2.4.0";

  src = fetchFromGitHub {
    owner = "flightaware";
    repo = "tclreadline";
    rev = "v${version}";
-    sha256 = "18jl56p0hwgynxpvr0v7b5mvvzc1m64fn61c0957bgb45mc250yq";
+    sha256 = "sha256-rB2bR0yu/ZFf/WOgo1LeLmciaQA42/LulnqSczmzea8=";
  };

  nativeBuildInputs = [
--- a/pkgs/development/node-packages/aliases.nix
+++ b/pkgs/development/node-packages/aliases.nix
@ -144,6 +144,7 @@ mapAliases {
  inherit (pkgs) npm-check-updates; # added 2023-08-22
  ocaml-language-server = throw "ocaml-language-server was removed because it was abandoned upstream"; # added 2023-09-04
  parcel-bundler = self.parcel; # added 2023-09-04
+  inherit (pkgs) patch-package; # added 2024-06-29
  pkg = pkgs.vercel-pkg; # added 2023-10-04
  inherit (pkgs) pm2; # added 2024-01-22
  inherit (pkgs) pnpm; # added 2024-06-26
--- a/pkgs/development/node-packages/node-packages.json
+++ b/pkgs/development/node-packages/node-packages.json
@ -148,7 +148,6 @@
 , "orval"
 , "parcel"
 , "parsoid"
-, "patch-package"
 , "peerflix"
 , "peerflix-server"
 , "poor-mans-t-sql-formatter-cli"
--- a/pkgs/development/node-packages/node-packages.nix
+++ b/pkgs/development/node-packages/node-packages.nix
@ -32335,15 +32335,6 @@ let
        sha512 = "0Fo5oir+O9jnXu5EefYbVK+mHMBeEVEy2cmctR1O1NECcCkPRreJKrS6Qt/j3KC2C148Dfo9i3pCmCMsdqGr0g==";
      };
    };
-    "klaw-sync-6.0.0" = {
-      name = "klaw-sync";
-      packageName = "klaw-sync";
-      version = "6.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/klaw-sync/-/klaw-sync-6.0.0.tgz";
-        sha512 = "nIeuVSzdCCs6TDPTqI8w1Yre34sSq7AkZ4B3sfOBbI2CgVSB4Du4aLQijFU2+lhAFCwt9+42Hel6lQNIv6AntQ==";
-      };
-    };
    "kleur-3.0.3" = {
      name = "kleur";
      packageName = "kleur";
@ -77053,90 +77044,6 @@ in
    bypassCache = true;
    reconstructLock = true;
  };
-  patch-package = nodeEnv.buildNodePackage {
-    name = "patch-package";
-    packageName = "patch-package";
-    version = "8.0.0";
-    src = fetchurl {
-      url = "https://registry.npmjs.org/patch-package/-/patch-package-8.0.0.tgz";
-      sha512 = "da8BVIhzjtgScwDJ2TtKsfT5JFWz1hYoBl9rUQ1f38MC2HwnEIkK8VN3dKMKcP7P7bvvgzNDbfNHtx3MsQb5vA==";
-    };
-    dependencies = [
-      sources."@yarnpkg/lockfile-1.1.0"
-      sources."ansi-styles-4.3.0"
-      sources."at-least-node-1.0.0"
-      sources."balanced-match-1.0.2"
-      sources."brace-expansion-1.1.11"
-      sources."braces-3.0.3"
-      sources."call-bind-1.0.7"
-      sources."chalk-4.1.2"
-      sources."ci-info-3.9.0"
-      sources."color-convert-2.0.1"
-      sources."color-name-1.1.4"
-      sources."concat-map-0.0.1"
-      sources."cross-spawn-7.0.3"
-      sources."define-data-property-1.1.4"
-      sources."es-define-property-1.0.0"
-      sources."es-errors-1.3.0"
-      sources."fill-range-7.1.1"
-      sources."find-yarn-workspace-root-2.0.0"
-      sources."fs-extra-9.1.0"
-      sources."fs.realpath-1.0.0"
-      sources."function-bind-1.1.2"
-      sources."get-intrinsic-1.2.4"
-      sources."glob-7.2.3"
-      sources."gopd-1.0.1"
-      sources."graceful-fs-4.2.11"
-      sources."has-flag-4.0.0"
-      sources."has-property-descriptors-1.0.2"
-      sources."has-proto-1.0.3"
-      sources."has-symbols-1.0.3"
-      sources."hasown-2.0.2"
-      sources."inflight-1.0.6"
-      sources."inherits-2.0.4"
-      sources."is-docker-2.2.1"
-      sources."is-number-7.0.0"
-      sources."is-wsl-2.2.0"
-      sources."isarray-2.0.5"
-      sources."isexe-2.0.0"
-      sources."json-stable-stringify-1.1.1"
-      sources."jsonfile-6.1.0"
-      sources."jsonify-0.0.1"
-      sources."klaw-sync-6.0.0"
-      sources."micromatch-4.0.8"
-      sources."minimatch-3.1.2"
-      sources."minimist-1.2.8"
-      sources."object-keys-1.1.1"
-      sources."once-1.4.0"
-      sources."open-7.4.2"
-      sources."os-tmpdir-1.0.2"
-      sources."path-is-absolute-1.0.1"
-      sources."path-key-3.1.1"
-      sources."picomatch-2.3.1"
-      sources."rimraf-2.7.1"
-      sources."semver-7.6.3"
-      sources."set-function-length-1.2.2"
-      sources."shebang-command-2.0.0"
-      sources."shebang-regex-3.0.0"
-      sources."slash-2.0.0"
-      sources."supports-color-7.2.0"
-      sources."tmp-0.0.33"
-      sources."to-regex-range-5.0.1"
-      sources."universalify-2.0.1"
-      sources."which-2.0.2"
-      sources."wrappy-1.0.2"
-      sources."yaml-2.5.1"
-    ];
-    buildInputs = globalBuildInputs;
-    meta = {
-      description = "Fix broken node modules with no fuss";
-      homepage = "https://github.com/ds300/patch-package#readme";
-      license = "MIT";
-    };
-    production = true;
-    bypassCache = true;
-    reconstructLock = true;
-  };
  peerflix = nodeEnv.buildNodePackage {
    name = "peerflix";
    packageName = "peerflix";
--- 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.122";
+  version = "9.2.124";
  pyproject = true;

  disabled = pythonOlder "3.11";
@ -18,7 +18,7 @@ buildPythonPackage rec {
    owner = "angr";
    repo = "ailment";
    rev = "refs/tags/v${version}";
-    hash = "sha256-e+SDgi0bhiE0MdhRxxFlkKU0N5ExfehbEOOyO4+wAzQ=";
+    hash = "sha256-wGpLRaoW6rZIT+vEpbjtjSJhBZbNNrpxt/+q6zTuJ9A=";
  };

  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.119";
+  version = "9.2.124";
  pyproject = true;

  disabled = pythonOlder "3.11";
@ -45,7 +45,7 @@ buildPythonPackage rec {
    owner = "angr";
    repo = "angr";
    rev = "refs/tags/v${version}";
-    hash = "sha256-GwfQj8KU6M5ylgJPN1Blz8Chz2zEDTZayFdvjXXWoHY=";
+    hash = "sha256-tjopUg0EZved31bYfrxchqOfQwzEo7dKxX/uUhngJzc=";
  };

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

 buildPythonPackage rec {
  pname = "angrop";
-  version = "9.2.10";
+  version = "9.2.11";
  pyproject = true;

  disabled = pythonOlder "3.6";
@ -20,7 +20,7 @@ buildPythonPackage rec {
    owner = "angr";
    repo = "angrop";
    rev = "refs/tags/v${version}";
-    hash = "sha256-+epX+tCSv5Kit4lncDNtjokehCSl+tO7rbi3L+RrI+E=";
+    hash = "sha256-wL6H4UqBqOHMQU91q0uJrgeS/wVvIbinpF9IBtli3Ig=";
  };

  build-system = [ setuptools ];
--- 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.122";
+  version = "9.2.124";
  pyproject = true;

  disabled = pythonOlder "3.8";
@ -19,7 +19,7 @@ buildPythonPackage rec {
    owner = "angr";
    repo = "archinfo";
    rev = "refs/tags/v${version}";
-    hash = "sha256-WmwKpd1c53o/wanvyVPIkXwdwEmKtXvaCa2YIcIsGIU=";
+    hash = "sha256-h0qZdFgDyowcr79YXkqww2dkUv+wRFCxY7gS4Nu2b6s=";
  };

  build-system = [ setuptools ];
--- a/pkgs/development/python-modules/base58/default.nix
+++ b/pkgs/development/python-modules/base58/default.nix
@ -5,19 +5,23 @@
  pyhamcrest,
  pytestCheckHook,
  pythonOlder,
+  setuptools,
 }:

 buildPythonPackage rec {
  pname = "base58";
  version = "2.1.1";
-  format = "setuptools";
-  disabled = pythonOlder "3.5";
+  pyproject = true;
+
+  disabled = pythonOlder "3.10";

  src = fetchPypi {
    inherit pname version;
-    sha256 = "c5d0cb3f5b6e81e8e35da5754388ddcc6d0d14b6c6a132cb93d69ed580a7278c";
+    hash = "sha256-xdDLP1tugejjXaV1Q4jdzG0NFLbGoTLLk9ae1YCnJ4w=";
  };

+  build-system = [ setuptools ];
+
  nativeCheckInputs = [
    pyhamcrest
    pytestCheckHook
@ -33,9 +37,10 @@ buildPythonPackage rec {

  meta = with lib; {
    description = "Base58 and Base58Check implementation";
-    mainProgram = "base58";
    homepage = "https://github.com/keis/base58";
+    changelog = "https://github.com/keis/base58/blob/v${version}/CHANGELOG.md";
    license = licenses.mit;
    maintainers = with maintainers; [ nyanloutre ];
+    mainProgram = "base58";
  };
 }
--- a/pkgs/development/python-modules/bugsnag/default.nix
+++ b/pkgs/development/python-modules/bugsnag/default.nix
@ -5,22 +5,25 @@
  fetchPypi,
  flask,
  pythonOlder,
+  setuptools,
  webob,
 }:

 buildPythonPackage rec {
  pname = "bugsnag";
  version = "4.7.1";
-  format = "setuptools";
+  pyproject = true;

-  disabled = pythonOlder "3.5";
+  disabled = pythonOlder "3.10";

  src = fetchPypi {
    inherit pname version;
    hash = "sha256-mECP4X1KfzAKVlNUB6ZEi5hE2bUoxEUnkIho/DZG6HM=";
  };

-  propagatedBuildInputs = [ webob ];
+  build-system = [ setuptools ];
+
+  dependencies = [ webob ];

  optional-dependencies = {
    flask = [
--- 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.122";
+  version = "9.2.124";
  pyproject = true;

  disabled = pythonOlder "3.11";
@ -23,7 +23,7 @@ buildPythonPackage rec {
    owner = "angr";
    repo = "claripy";
    rev = "refs/tags/v${version}";
-    hash = "sha256-UxWPOyrV8Yzzi9TKFlCenP8ZXXjf6sd92naALkqgmkA=";
+    hash = "sha256-N14I2wJ0wGbBniplC9Q0oMcR7m5qTX3SDtXSjfLmNM8=";
  };

  # 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
@ -18,14 +18,14 @@

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

  # 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-/TGedNB6JNYjIy0a8yyyZtuUyLEYFJ2CBmvWS/PS1jA=";
+    hash = "sha256-eUx71aCk0DHtD735YmHS8+awcoN6WYZi1fA8+pS8mXo=";
  };
 in
 buildPythonPackage rec {
@ -39,7 +39,7 @@ buildPythonPackage rec {
    owner = "angr";
    repo = "cle";
    rev = "refs/tags/v${version}";
-    hash = "sha256-G/5KYB6np4Y5RTA65WyGvT1I5LyQ2WXJmu5OtXdKmLg=";
+    hash = "sha256-qwItp8HHqvjzXJIGfEtGAM09eOhz0GEKPYwgbXJBdXw=";
  };

  build-system = [ setuptools ];
--- a/pkgs/development/python-modules/conda/default.nix
+++ b/pkgs/development/python-modules/conda/default.nix
@ -1,7 +1,7 @@
 {
  lib,
  buildPythonPackage,
-  hostPlatform,
+  stdenv,
  fetchFromGitHub,
  # build dependencies
  hatchling,
@ -72,7 +72,7 @@ buildPythonPackage rec {
  pythonImportsCheck = [ "conda" ];

  # menuinst is currently not packaged
-  pythonRemoveDeps = lib.optionals (!hostPlatform.isWindows) [ "menuinst" ];
+  pythonRemoveDeps = lib.optionals (!stdenv.hostPlatform.isWindows) [ "menuinst" ];

  meta = {
    description = "OS-agnostic, system-level binary package manager";
--- a/pkgs/development/python-modules/djangorestframework-jsonp/default.nix
+++ b/pkgs/development/python-modules/djangorestframework-jsonp/default.nix
@ -0,0 +1,56 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  django,
+  python,
+  pytest-django,
+  pytestCheckHook,
+  djangorestframework,
+  setuptools,
+}:
+
+buildPythonPackage rec {
+  pname = "djangorestframework-jsonp";
+  version = "1.0.2";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "jpadilla";
+    repo = "django-rest-framework-jsonp";
+    rev = "refs/tags/${version}";
+    hash = "sha256-4mIO69GhtvbQBtztHVQYIDDDSZpKg0g7BFNHEupiYTs=";
+  };
+
+  build-system = [ setuptools ];
+
+  dependencies = [
+    django
+    djangorestframework
+  ];
+
+  checkInputs = [
+    pytestCheckHook
+    pytest-django
+  ];
+
+  # Test fail with Django >=4
+  # https://github.com/jpadilla/django-rest-framework-jsonp/issues/14
+  doCheck = false;
+
+  checkPhase = ''
+    runHook preCheck
+    rm tests/test_renderers.py
+    ${python.interpreter} runtests.py
+    runHook postCheck
+  '';
+
+  pythonImportsCheck = [ "rest_framework_jsonp" ];
+
+  meta = {
+    description = "JSONP support for Django REST Framework";
+    homepage = "https://jpadilla.github.io/django-rest-framework-jsonp/";
+    license = lib.licenses.bsd3;
+    maintainers = [ lib.maintainers.onny ];
+  };
+}
--- a/pkgs/development/python-modules/dmt-core/default.nix
+++ b/pkgs/development/python-modules/dmt-core/default.nix
@ -0,0 +1,84 @@
+{
+  buildPythonPackage,
+  colormath,
+  cycler,
+  fetchPypi,
+  h5py,
+  joblib,
+  lib,
+  more-itertools,
+  numpy,
+  pandas,
+  pint,
+  pyarrow,
+  pytest,
+  pyyaml,
+  reprint,
+  requests,
+  scikit-rf,
+  scipy,
+  semver,
+  setuptools,
+  verilogae,
+}:
+
+buildPythonPackage rec {
+  pname = "dmt-core";
+  version = "2.1.0";
+  pyproject = true;
+
+  src = fetchPypi {
+    inherit version;
+    pname = "DMT_core";
+    hash = "sha256-489E+uNn4NgyCwxsUMEPH/1ZuM+5uNq4zx8F88rkHMU=";
+  };
+
+  build-system = [
+    setuptools
+  ];
+
+  dependencies = [
+    colormath
+    cycler
+    h5py
+    joblib
+    more-itertools
+    pandas
+    pint
+    pyarrow
+    pytest
+    pyyaml
+    requests
+    scikit-rf
+    scipy
+    setuptools
+    numpy
+    semver
+  ];
+
+  nativeBuildInputs = [
+    reprint
+    verilogae
+  ];
+
+  preConfigure = ''
+    export HOME=$(mktemp -d)
+  '';
+
+  pythonImportsCheck = [
+    "DMT.core"
+    "reprint"
+    "verilogae"
+  ];
+
+  meta = {
+    changelog = "https://gitlab.com/dmt-development/dmt-core/-/blob/Version_${version}/CHANGELOG?ref_type=tags";
+    description = "Tool to help modeling engineers extract model parameters, run circuit and TCAD simulations and automate infrastructure";
+    homepage = "https://gitlab.com/dmt-development/dmt-core";
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [
+      jasonodoom
+      jleightcap
+    ];
+  };
+}
--- a/pkgs/development/python-modules/docker-pycreds/default.nix
+++ b/pkgs/development/python-modules/docker-pycreds/default.nix
@ -1,28 +1,44 @@
 {
  lib,
  buildPythonPackage,
-  fetchPypi,
+  fetchFromGitHub,
+  setuptools,
  six,
+  pythonAtLeast,
+  distutils,
 }:

 buildPythonPackage rec {
  pname = "docker-pycreds";
  version = "0.4.0";
-  format = "setuptools";
+  pyproject = true;

-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "6ce3270bcaf404cc4c3e27e4b6c70d3521deae82fb508767870fdbf772d584d4";
+  src = fetchFromGitHub {
+    owner = "shin-";
+    repo = "dockerpy-creds";
+    rev = "refs/tags/${version}";
+    hash = "sha256-yYsMsRW6Bb8vmwT0mPjs0pRqBbznGtHnGb3JNHjLjys=";
  };

+  build-system = [
+    setuptools
+  ];
+
+  dependencies =
+    [ six ]
+    ++ lib.optionals (pythonAtLeast "3.12") [
+      distutils
+    ];
+
+  pythonImportsCheck = [ "dockerpycreds" ];
+
  # require docker-credential-helpers binaries
  doCheck = false;

-  propagatedBuildInputs = [ six ];
-
-  meta = with lib; {
+  meta = {
    description = "Python bindings for the docker credentials store API";
    homepage = "https://github.com/shin-/dockerpy-creds";
-    license = licenses.asl20;
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ GaetanLepage ];
  };
 }
--- a/pkgs/development/python-modules/kubernetes-asyncio/default.nix
+++ b/pkgs/development/python-modules/kubernetes-asyncio/default.nix
@ -0,0 +1,69 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  coreutils,
+
+  # build-system
+  setuptools,
+
+  # dependencies
+  aiohttp,
+  certifi,
+  python-dateutil,
+  pyyaml,
+  six,
+  urllib3,
+
+  # tests
+  pytestCheckHook,
+}:
+
+buildPythonPackage rec {
+  pname = "kubernetes-asyncio";
+  version = "31.1.0";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "tomplus";
+    repo = "kubernetes_asyncio";
+    rev = "refs/tags/${version}";
+    hash = "sha256-YKBqhUeLqLiQ6bK235zTm4salnSLUxl4DUiFLQSjWqw=";
+  };
+
+  postPatch = ''
+    substituteInPlace kubernetes_asyncio/config/google_auth_test.py \
+      --replace-fail "/bin/echo" "${lib.getExe' coreutils "echo"}"
+  '';
+
+  build-system = [
+    setuptools
+  ];
+
+  dependencies = [
+    aiohttp
+    certifi
+    python-dateutil
+    pyyaml
+    six
+    urllib3
+  ];
+
+  pythonImportsCheck = [
+    "kubernetes_asyncio"
+  ];
+
+  nativeCheckInputs = [
+    pytestCheckHook
+  ];
+
+  __darwinAllowLocalNetworking = true;
+
+  meta = {
+    description = "Python asynchronous client library for Kubernetes http://kubernetes.io";
+    homepage = "https://github.com/tomplus/kubernetes_asyncio";
+    changelog = "https://github.com/tomplus/kubernetes_asyncio/blob/${src.rev}/CHANGELOG.md";
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ GaetanLepage ];
+  };
+}
--- a/pkgs/development/python-modules/llm/default.nix
+++ b/pkgs/development/python-modules/llm/default.nix
@ -1,13 +1,9 @@
 {
  lib,
-  buildPythonApplication,
  buildPythonPackage,
  fetchFromGitHub,
-  makeWrapper,
  pytestCheckHook,
-  python,
  pythonOlder,
-  ruff,
  setuptools,
  click-default-group,
  numpy,
--- 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.123";
+  version = "9.2.124";
  pyproject = true;

  disabled = pythonOlder "3.11";

  src = fetchPypi {
    inherit pname version;
-    hash = "sha256-uojU1x4VfiYFM3ZSwSy5qPpWBSEq9CKwByk2HFAXvXA=";
+    hash = "sha256-8hjgwsJz1jj9POnHj5Im30Hjxi4wYmCwIv5wcu6SY8c=";
  };

  build-system = [ setuptools ];
--- a/pkgs/development/python-modules/reprint/default.nix
+++ b/pkgs/development/python-modules/reprint/default.nix
@ -0,0 +1,49 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  setuptools,
+  colorama,
+  six,
+}:
+
+buildPythonPackage rec {
+  pname = "reprint";
+  version = "0.6.0";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "Yinzo";
+    repo = "reprint";
+    rev = "${version}";
+    hash = "sha256-99FC12LcvvRRwNAxDSvWo9vRYmieL0JHSaCJqO/UGEs=";
+  };
+
+  postPatch = ''
+    substituteInPlace setup.py \
+      --replace-fail "'backports.shutil_get_terminal_size', " ""
+  '';
+
+  build-system = [
+    setuptools
+  ];
+
+  dependencies = [
+    colorama
+    six
+  ];
+
+  pythonImportsCheck = [
+    "reprint"
+  ];
+
+  meta = {
+    description = "Module for binding variables and refreshing multi-line output in terminal";
+    homepage = "https://github.com/Yinzo/reprint";
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [
+      jasonodoom
+      jleightcap
+    ];
+  };
+}
--- a/pkgs/development/python-modules/spotifyaio/default.nix
+++ b/pkgs/development/python-modules/spotifyaio/default.nix
@ -17,7 +17,7 @@

 buildPythonPackage rec {
  pname = "spotifyaio";
-  version = "0.7.0";
+  version = "0.7.1";
  pyproject = true;

  disabled = pythonOlder "3.11";
@ -26,7 +26,7 @@ buildPythonPackage rec {
    owner = "joostlek";
    repo = "python-spotify";
    rev = "refs/tags/v${version}";
-    hash = "sha256-SWI2lXJ+JeoYsVaripSuL9pz5m9nRj+1986s3cEgVjE=";
+    hash = "sha256-L5S7adnOOJQ0b+yUcL8rw9XkZS0meN2gN1Bi2WYOJks=";
  };

  build-system = [ poetry-core ];
--- a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix
+++ b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix
@ -10,7 +10,7 @@

 buildPythonPackage rec {
  pname = "tencentcloud-sdk-python";
-  version = "3.0.1255";
+  version = "3.0.1256";
  pyproject = true;

  disabled = pythonOlder "3.9";
@ -19,7 +19,7 @@ buildPythonPackage rec {
    owner = "TencentCloud";
    repo = "tencentcloud-sdk-python";
    rev = "refs/tags/${version}";
-    hash = "sha256-l0k8fyQ4ba+9uyQiIAsPKTKjmZ0p/QIlC0seqP6LBZY=";
+    hash = "sha256-V6ov3ukP0o5lCDPtGgWk07E/bCv1w9f3bkLHuEX9/iI=";
  };

  build-system = [ setuptools ];
--- a/pkgs/development/python-modules/transformers/default.nix
+++ b/pkgs/development/python-modules/transformers/default.nix
@ -58,14 +58,14 @@

 buildPythonPackage rec {
  pname = "transformers";
-  version = "4.45.2";
+  version = "4.46.0";
  pyproject = true;

  src = fetchFromGitHub {
    owner = "huggingface";
    repo = "transformers";
    rev = "refs/tags/v${version}";
-    hash = "sha256-5Ric+pEbBf6HswsPb8cdVLdqTRgicFjzcrk0oO2PtC0=";
+    hash = "sha256-R+uHo98K+uOXbxE4Axam/FONZgeFyyPfe0IZiOCpFF4=";
  };

  build-system = [ setuptools ];
@ -173,7 +173,6 @@ buildPythonPackage rec {
      # natten = [ natten ];
      # codecarbon = [ codecarbon ];
      video = [
-        # decord
        av
      ];
      sentencepiece = [
--- a/pkgs/development/python-modules/verilogae/Cargo.lock
+++ b/pkgs/development/python-modules/verilogae/Cargo.lock
--- a/pkgs/development/python-modules/verilogae/default.nix
+++ b/pkgs/development/python-modules/verilogae/default.nix
@ -0,0 +1,79 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  setuptools-rust,
+  rustPlatform,
+  cargo,
+  rustc,
+  autoPatchelfHook,
+  pkg-config,
+  llvmPackages_15,
+  libxml2,
+  ncurses,
+  zlib,
+}:
+
+buildPythonPackage rec {
+  pname = "verilogae";
+  version = "1.0.0";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "pascalkuthe";
+    repo = "OpenVAF";
+    rev = "VerilogAE-v${version}";
+    hash = "sha256-TILKKmgSyhyxp88sdflDXAoH++iP6CMpdoXN1/1fsjU=";
+  };
+
+  postPatch = ''
+    substituteInPlace openvaf/llvm/src/initialization.rs \
+      --replace-fail "i8" "libc::c_char"
+    substituteInPlace openvaf/osdi/build.rs \
+      --replace-fail "-fPIC" ""
+  '';
+
+  cargoDeps = rustPlatform.importCargoLock {
+    lockFile = ./Cargo.lock;
+    outputHashes = {
+      "salsa-0.17.0-pre.2" = "sha256-6GssvV76lFr5OzAUekz2h6f82Tn7usz5E8MSZ5DmgJw=";
+    };
+  };
+
+  nativeBuildInputs = [
+    setuptools-rust
+    rustPlatform.cargoSetupHook
+    rustPlatform.bindgenHook
+    cargo
+    rustc
+    autoPatchelfHook
+    pkg-config
+    llvmPackages_15.clang
+    llvmPackages_15.llvm
+  ];
+
+  buildInputs = [
+    libxml2.dev
+    llvmPackages_15.libclang
+    ncurses
+    zlib
+  ];
+
+  cargoBuildType = "release";
+
+  pythonImportsCheck = [ "verilogae" ];
+
+  hardeningDisable = [ "pic" ];
+
+  meta = {
+    description = "Verilog-A tool useful for compact model parameter extraction";
+    homepage = "https://man.sr.ht/~dspom/openvaf_doc/verilogae/";
+    license = lib.licenses.gpl3Only;
+    maintainers = with lib.maintainers; [
+      jasonodoom
+      jleightcap
+    ];
+    platforms = lib.platforms.linux;
+    sourceProvenance = [ lib.sourceTypes.binaryBytecode ];
+  };
+}
--- a/pkgs/development/python-modules/wandb/default.nix
+++ b/pkgs/development/python-modules/wandb/default.nix
@ -1,322 +1,324 @@
 {
  lib,
  stdenv,
-  appdirs,
-  azure-containerregistry,
+  fetchFromGitHub,
+
+  ## wandb-core
+  buildGoModule,
+  git,
+  versionCheckHook,
+
+  ## gpu-stats
+  rustPlatform,
+  darwin,
+
+  ## wandb
+  buildPythonPackage,
+  substituteAll,
+
+  # build-system
+  hatchling,
+
+  # dependencies
+  click,
+  docker-pycreds,
+  gitpython,
+  platformdirs,
+  protobuf,
+  psutil,
+  pyyaml,
+  requests,
+  sentry-sdk_2,
+  setproctitle,
+  setuptools,
+  pythonOlder,
+  typing-extensions,
+
+  # tests
+  pytestCheckHook,
  azure-core,
+  azure-containerregistry,
  azure-identity,
  azure-storage-blob,
  bokeh,
  boto3,
-  buildPythonPackage,
-  click,
-  docker-pycreds,
-  fetchFromGitHub,
+  coverage,
  flask,
-  git,
-  gitpython,
  google-cloud-artifact-registry,
  google-cloud-compute,
  google-cloud-storage,
  hypothesis,
-  imageio,
-  jsonref,
  jsonschema,
-  keras,
  kubernetes,
+  kubernetes-asyncio,
  matplotlib,
-  mlflow,
  moviepy,
-  nbclient,
-  nbformat,
  pandas,
  parameterized,
-  protobuf,
-  psutil,
+  pillow,
+  plotly,
  pydantic,
  pyfakefs,
+  pyte,
+  pytest-asyncio,
+  pytest-cov-stub,
  pytest-mock,
+  pytest-timeout,
  pytest-xdist,
-  pytestCheckHook,
-  pythonOlder,
-  pyyaml,
-  requests,
+  rdkit,
  responses,
  scikit-learn,
-  sentry-sdk,
-  setproctitle,
-  setuptools,
  soundfile,
-  substituteAll,
+  tenacity,
  torch,
  tqdm,
 }:

+let
+  version = "0.18.5";
+  src = fetchFromGitHub {
+    owner = "wandb";
+    repo = "wandb";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-nx50baneYSSIWPAIOkUk4cGCNpWAhv7IwFDQJ4vUMiw=";
+  };
+
+  gpu-stats = rustPlatform.buildRustPackage rec {
+    pname = "gpu-stats";
+    version = "0.2.0";
+    inherit src;
+
+    sourceRoot = "${src.name}/gpu_stats";
+
+    cargoHash = "sha256-4udGG4I2Hr8r84c4WX6QGG/+bcHK4csXqwddvIiKmkw=";
+
+    buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [
+      darwin.apple_sdk.frameworks.IOKit
+    ];
+
+    nativeInstallCheckInputs = [
+      versionCheckHook
+    ];
+    versionCheckProgram = "${placeholder "out"}/bin/gpu_stats";
+    versionCheckProgramArg = [ "--version" ];
+    doInstallCheck = true;
+
+    meta = {
+      mainProgram = "gpu_stats";
+      # ld: library not found for -lIOReport
+      # TODO: succeeds on https://github.com/NixOS/nixpkgs/pull/348827, so try again once it lands on master
+      broken = stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64;
+    };
+  };
+
+  wandb-core = buildGoModule rec {
+    pname = "wandb-core";
+    inherit src version;
+
+    sourceRoot = "${src.name}/core";
+
+    # hardcode the `gpu_stats` binary path.
+    postPatch = ''
+      substituteInPlace pkg/monitor/gpu.go \
+        --replace-fail \
+          'cmdPath, err := getGPUStatsCmdPath()' \
+          'cmdPath, err := "${lib.getExe gpu-stats}", error(nil)'
+    '';
+
+    vendorHash = null;
+
+    nativeBuildInputs = [
+      git
+    ];
+
+    nativeInstallCheckInputs = [
+      versionCheckHook
+    ];
+    versionCheckProgramArg = [ "--version" ];
+    doInstallCheck = true;
+
+    __darwinAllowLocalNetworking = true;
+
+    meta.mainProgram = "wandb-core";
+  };
+in
+
 buildPythonPackage rec {
  pname = "wandb";
-  version = "0.16.0";
-  format = "pyproject";
+  pyproject = true;

-  disabled = pythonOlder "3.6";
-
-  src = fetchFromGitHub {
-    owner = pname;
-    repo = pname;
-    rev = "refs/tags/v${version}";
-    hash = "sha256-XXs9KjiAPzZ932r4UJ87RpM+qhg/bNDWEYsq2Ua6SRw=";
-  };
+  inherit src version;

  patches = [
    # Replace git paths
    (substituteAll {
      src = ./hardcode-git-path.patch;
-      git = "${lib.getBin git}/bin/git";
+      git = lib.getExe git;
    })
  ];

-  nativeBuildInputs = [
-    setuptools
+  # Hard-code the path to the `wandb-core` binary in the code.
+  postPatch = ''
+    substituteInPlace wandb/util.py \
+      --replace-fail \
+        'bin_path = pathlib.Path(__file__).parent / "bin" / "wandb-core"' \
+        'bin_path = pathlib.Path("${lib.getExe wandb-core}")'
+  '';
+
+  env = {
+    # Prevent the install script to try building and embedding the `gpu_stats` and `wandb-core`
+    # binaries in the wheel.
+    # Their path have been patched accordingly in the `wandb-core` and `wanbd` source codes.
+    # https://github.com/wandb/wandb/blob/v0.18.5/hatch_build.py#L37-L47
+    WANDB_BUILD_SKIP_GPU_STATS = true;
+    WANDB_BUILD_UNIVERSAL = true;
+  };
+
+  build-system = [
+    hatchling
  ];

-  # setuptools is necessary since pkg_resources is required at runtime.
-  propagatedBuildInputs = [
-    appdirs
-    click
-    docker-pycreds
-    gitpython
-    protobuf
-    psutil
-    pyyaml
-    requests
-    sentry-sdk
-    setproctitle
-    setuptools
-  ];
+  dependencies =
+    [
+      click
+      docker-pycreds
+      gitpython
+      platformdirs
+      protobuf
+      psutil
+      pyyaml
+      requests
+      sentry-sdk_2
+      setproctitle
+      # setuptools is necessary since pkg_resources is required at runtime.
+      setuptools
+    ]
+    ++ lib.optionals (pythonOlder "3.12") [
+      typing-extensions
+    ];

  __darwinAllowLocalNetworking = true;

  nativeCheckInputs = [
-    azure-containerregistry
+    pytestCheckHook
    azure-core
+    azure-containerregistry
    azure-identity
    azure-storage-blob
-    bokeh
    boto3
+    bokeh
+    coverage
    flask
    google-cloud-artifact-registry
    google-cloud-compute
    google-cloud-storage
    hypothesis
-    imageio
-    jsonref
    jsonschema
-    keras
    kubernetes
+    kubernetes-asyncio
    matplotlib
-    mlflow
    moviepy
-    nbclient
-    nbformat
    pandas
    parameterized
+    pillow
+    plotly
    pydantic
    pyfakefs
+    pyte
+    pytest-asyncio
+    pytest-cov-stub
    pytest-mock
+    pytest-timeout
    pytest-xdist
-    pytestCheckHook
+    rdkit
    responses
    scikit-learn
    soundfile
+    tenacity
    torch
    tqdm
  ];

-  # Set BOKEH_CDN_VERSION to stop bokeh throwing an exception in tests
  preCheck = ''
    export HOME=$(mktemp -d)
-    export BOKEH_CDN_VERSION=${bokeh.version}
  '';

-  pythonRelaxDeps = [ "protobuf" ];
-
-  pytestFlagsArray = [
-    # We want to run only unit tests
-    "tests/pytest_tests"
+  disabledTestPaths = [
+    # Require docker access
+    "tests/release_tests/test_launch"
+    "tests/system_tests"
  ];

-  disabledTestPaths =
-    [
-      # Tests that try to get chatty over sockets or spin up servers, not possible in the nix build environment.
-      "tests/pytest_tests/system_tests/test_notebooks/test_notebooks.py"
-      "tests/pytest_tests/unit_tests_old/test_cli.py"
-      "tests/pytest_tests/unit_tests_old/test_data_types.py"
-      "tests/pytest_tests/unit_tests_old/test_file_stream.py"
-      "tests/pytest_tests/unit_tests_old/test_file_upload.py"
-      "tests/pytest_tests/unit_tests_old/test_footer.py"
-      "tests/pytest_tests/unit_tests_old/test_internal_api.py"
-      "tests/pytest_tests/unit_tests_old/test_metric_internal.py"
-      "tests/pytest_tests/unit_tests_old/test_public_api.py"
-      "tests/pytest_tests/unit_tests_old/test_runtime.py"
-      "tests/pytest_tests/unit_tests_old/test_sender.py"
-      "tests/pytest_tests/unit_tests_old/test_summary.py"
-      "tests/pytest_tests/unit_tests_old/test_tb_watcher.py"
-      "tests/pytest_tests/unit_tests_old/test_time_resolution.py"
-      "tests/pytest_tests/unit_tests_old/test_wandb_agent.py"
-      "tests/pytest_tests/unit_tests_old/test_wandb_integration.py"
-      "tests/pytest_tests/unit_tests_old/test_wandb_run.py"
-      "tests/pytest_tests/unit_tests_old/test_wandb.py"
-      "tests/pytest_tests/unit_tests_old/tests_launch/test_launch_aws.py"
-      "tests/pytest_tests/unit_tests_old/tests_launch/test_launch_cli.py"
-      "tests/pytest_tests/unit_tests_old/tests_launch/test_launch_docker.py"
-      "tests/pytest_tests/unit_tests_old/tests_launch/test_launch.py"
-      "tests/pytest_tests/unit_tests/test_cli.py"
-      "tests/pytest_tests/unit_tests/test_data_types.py"
-      "tests/pytest_tests/unit_tests/test_internal_api.py"
-      "tests/pytest_tests/unit_tests/test_mode_disabled.py"
-      "tests/pytest_tests/unit_tests/test_model_workflows.py"
-      "tests/pytest_tests/unit_tests/test_plots.py"
-      "tests/pytest_tests/unit_tests/test_public_api.py"
-      "tests/pytest_tests/unit_tests/test_sender.py"
-      "tests/pytest_tests/unit_tests/test_util.py"
-      "tests/pytest_tests/unit_tests/test_wandb_verify.py"
-
-      # Requires docker access
-      "tests/pytest_tests/system_tests/test_artifacts/test_artifact_saver.py"
-      "tests/pytest_tests/system_tests/test_artifacts/test_misc.py"
-      "tests/pytest_tests/system_tests/test_artifacts/test_misc2.py"
-      "tests/pytest_tests/system_tests/test_artifacts/test_object_references.py"
-      "tests/pytest_tests/system_tests/test_artifacts/test_wandb_artifacts_full.py"
-      "tests/pytest_tests/system_tests/test_artifacts/test_wandb_artifacts.py"
-      "tests/pytest_tests/system_tests/test_core/test_cli_full.py"
-      "tests/pytest_tests/system_tests/test_core/test_data_types_full.py"
-      "tests/pytest_tests/system_tests/test_core/test_file_stream_internal.py"
-      "tests/pytest_tests/system_tests/test_core/test_file_upload.py"
-      "tests/pytest_tests/system_tests/test_core/test_footer.py"
-      "tests/pytest_tests/system_tests/test_core/test_keras_full.py"
-      "tests/pytest_tests/system_tests/test_core/test_label_full.py"
-      "tests/pytest_tests/system_tests/test_core/test_metric_full.py"
-      "tests/pytest_tests/system_tests/test_core/test_metric_internal.py"
-      "tests/pytest_tests/system_tests/test_core/test_mode_disabled_full.py"
-      "tests/pytest_tests/system_tests/test_core/test_model_workflow.py"
-      "tests/pytest_tests/system_tests/test_core/test_mp_full.py"
-      "tests/pytest_tests/system_tests/test_core/test_public_api.py"
-      "tests/pytest_tests/system_tests/test_core/test_redir_full.py"
-      "tests/pytest_tests/system_tests/test_core/test_report_api.py"
-      "tests/pytest_tests/system_tests/test_core/test_save_policies.py"
-      "tests/pytest_tests/system_tests/test_core/test_sender.py"
-      "tests/pytest_tests/system_tests/test_core/test_start_method.py"
-      "tests/pytest_tests/system_tests/test_core/test_system_info.py"
-      "tests/pytest_tests/system_tests/test_core/test_tb_watcher.py"
-      "tests/pytest_tests/system_tests/test_core/test_telemetry_full.py"
-      "tests/pytest_tests/system_tests/test_core/test_time_resolution.py"
-      "tests/pytest_tests/system_tests/test_core/test_torch_full.py"
-      "tests/pytest_tests/system_tests/test_core/test_validation_data_logger.py"
-      "tests/pytest_tests/system_tests/test_core/test_wandb_init.py"
-      "tests/pytest_tests/system_tests/test_core/test_wandb_integration.py"
-      "tests/pytest_tests/system_tests/test_core/test_wandb_run.py"
-      "tests/pytest_tests/system_tests/test_core/test_wandb_settings.py"
-      "tests/pytest_tests/system_tests/test_core/test_wandb_tensorflow.py"
-      "tests/pytest_tests/system_tests/test_core/test_wandb_verify.py"
-      "tests/pytest_tests/system_tests/test_core/test_wandb.py"
-      "tests/pytest_tests/system_tests/test_importers/test_import_mlflow.py"
-      "tests/pytest_tests/system_tests/test_launch/test_github_reference.py"
-      "tests/pytest_tests/system_tests/test_launch/test_job_status_tracker.py"
-      "tests/pytest_tests/system_tests/test_launch/test_job.py"
-      "tests/pytest_tests/system_tests/test_launch/test_launch_add.py"
-      "tests/pytest_tests/system_tests/test_launch/test_launch_cli.py"
-      "tests/pytest_tests/system_tests/test_launch/test_launch_kubernetes.py"
-      "tests/pytest_tests/system_tests/test_launch/test_launch_local_container.py"
-      "tests/pytest_tests/system_tests/test_launch/test_launch_run.py"
-      "tests/pytest_tests/system_tests/test_launch/test_launch_sagemaker.py"
-      "tests/pytest_tests/system_tests/test_launch/test_launch_sweep_cli.py"
-      "tests/pytest_tests/system_tests/test_launch/test_launch_sweep.py"
-      "tests/pytest_tests/system_tests/test_launch/test_launch_vertex.py"
-      "tests/pytest_tests/system_tests/test_launch/test_launch.py"
-      "tests/pytest_tests/system_tests/test_launch/test_wandb_reference.py"
-      "tests/pytest_tests/system_tests/test_nexus/test_nexus.py"
-      "tests/pytest_tests/system_tests/test_sweep/test_public_api.py"
-      "tests/pytest_tests/system_tests/test_sweep/test_sweep_scheduler.py"
-      "tests/pytest_tests/system_tests/test_sweep/test_sweep_utils.py"
-      "tests/pytest_tests/system_tests/test_sweep/test_wandb_agent_full.py"
-      "tests/pytest_tests/system_tests/test_sweep/test_wandb_agent.py"
-      "tests/pytest_tests/system_tests/test_sweep/test_wandb_sweep.py"
-      "tests/pytest_tests/system_tests/test_system_metrics/test_open_metrics.py"
-      "tests/pytest_tests/system_tests/test_system_metrics/test_system_monitor.py"
-
-      # Tries to access /homeless-shelter
-      "tests/pytest_tests/unit_tests/test_tables.py"
-
-      # E       AssertionError: assert 'Cannot use both --async and --queue with wandb launch' in 'wandb: ERROR Find detailed error logs at: /build/source/wandb/debug-cli.nixbld.log\nError: The wandb service process exited with 1. Ensure that `sys.executable` is a valid python interpreter. You can override it with the `_executable` setting or with the `WANDB__EXECUTABLE` environment variable.\n'
-      # E        +  where 'wandb: ERROR Find detailed error logs at: /build/source/wandb/debug-cli.nixbld.log\nError: The wandb service process exited with 1. Ensure that `sys.executable` is a valid python interpreter. You can override it with the `_executable` setting or with the `WANDB__EXECUTABLE` environment variable.\n' = <Result SystemExit(1)>.output
-      "tests/pytest_tests/unit_tests_old/tests_launch/test_launch_jobs.py"
-
-      # Requires google-cloud-aiplatform which is not packaged as of 2023-04-25.
-      "tests/pytest_tests/unit_tests/test_launch/test_runner/test_vertex.py"
-
-      # Requires google-cloud-artifact-registry which is not packaged as of 2023-04-25.
-      "tests/pytest_tests/unit_tests/test_launch/test_registry/test_gcp_artifact_registry.py"
-
-      # Requires kfp which is not packaged as of 2023-04-25.
-      "tests/pytest_tests/system_tests/test_core/test_kfp.py"
-
-      # Requires kubernetes_asyncio which is not packaged as of 2024-01-14.
-      "tests/pytest_tests/unit_tests/test_launch/test_builder/test_kaniko.py"
-      "tests/pytest_tests/unit_tests/test_launch/test_runner/test_kubernetes.py"
-      "tests/pytest_tests/unit_tests/test_launch/test_runner/test_safe_watch.py"
-
-      # Requires metaflow which is not packaged as of 2023-04-25.
-      "tests/pytest_tests/unit_tests/test_metaflow.py"
-
-      # Requires tensorflow which is broken as of 2023-09-03
-      "tests/pytest_tests/unit_tests/test_keras.py"
-
-      # Try to get hardware information, not possible in the nix build environment
-      "tests/pytest_tests/unit_tests/test_system_metrics/test_disk.py"
-
-      # See https://github.com/wandb/wandb/issues/5423
-      "tests/pytest_tests/unit_tests/test_docker.py"
-      "tests/pytest_tests/unit_tests/test_library_public.py"
-
-      # See https://github.com/wandb/wandb/issues/6836
-      "tests/pytest_tests/unit_tests_old/test_logging.py"
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      # Same as above
-      "tests/pytest_tests/unit_tests/test_artifacts/test_storage.py"
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      # Same as above
-      "tests/pytest_tests/unit_tests/test_lib/test_filesystem.py"
-    ];
-
  disabledTests =
    [
-      # Timing sensitive
-      "test_login_timeout"
+      # Probably failing because of lack of internet access
+      # AttributeError: module 'wandb.sdk.launch.registry' has no attribute 'azure_container_registry'. Did you mean: 'elastic_container_registry'?
+      "test_registry_from_uri"

-      # Tensorflow 2.13 is too old for the current version of keras
-      # ModuleNotFoundError: No module named 'keras.api._v2'
-      "test_saved_model_keras"
-      "test_sklearn_saved_model"
-      "test_pytorch_saved_model"
-      "test_tensorflow_keras_saved_model"
+      # Require docker
+      "test_get_requirements_section_pyproject"
+      "test_local_custom_env"
+      "test_local_custom_port"
+      "test_local_default"
+
+      # Expects python binary to be named `python3` but nix provides `python3.12`
+      # AssertionError: assert ['python3.12', 'main.py'] == ['python3', 'main.py']
+      "test_get_entrypoint"
+
+      # Require internet access
+      "test_audio_refs"
+      "test_bind_image"
+      "test_check_cors_configuration"
+      "test_check_wandb_version"
+      "test_from_path_project_type"
+      "test_image_accepts_bounding_boxes"
+      "test_image_accepts_bounding_boxes_optional_args"
+      "test_image_accepts_masks"
+      "test_image_accepts_masks_without_class_labels"
+      "test_image_seq_to_json"
+      "test_max_images"
+      "test_media_keys_escaped_as_glob_for_publish"
+      "test_parse_path"
+      "test_parse_project_path"
+      "test_translates_azure_err_to_normal_err"
+
+      # Tries to access a storage disk but there are none in the sandbox
+      # psutil.test_disk_out() returns None
+      "test_disk_in"
+      "test_disk_out"
+
+      # AssertionError: assert is_available('http://localhost:9400/metrics')
+      "test_dcgm"
+
+      # Error in the moviepy package:
+      # TypeError: must be real number, not NoneType
+      "test_video_numpy_mp4"
    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      # Disable test that fails on darwin due to issue with python3Packages.psutil:
-      # https://github.com/giampaolo/psutil/issues/1219
-      "test_tpu_system_stats"
+    ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) [
+      # AssertionError: assert not copy2_mock.called
+      "test_copy_or_overwrite_changed_no_copy"
+
+      # Fatal Python error: Aborted
+      "test_convert_plots"
+      "test_gpu_apple"
+      "test_image_from_matplotlib_with_image"
+      "test_make_plot_media_from_matplotlib_with_image"
+      "test_make_plot_media_from_matplotlib_without_image"
+      "test_matplotlib_contains_images"
+      "test_matplotlib_image"
+      "test_matplotlib_plotly_with_multiple_axes"
+      "test_matplotlib_to_plotly"
+      "test_plotly_from_matplotlib_with_image"
    ];

  pythonImportsCheck = [ "wandb" ];

-  # unmaintainable list of disabled tests
-  passthru.skipBulkUpdate = true;
-
-  meta = with lib; {
+  meta = {
    description = "CLI and library for interacting with the Weights and Biases API";
    homepage = "https://github.com/wandb/wandb";
    changelog = "https://github.com/wandb/wandb/raw/v${version}/CHANGELOG.md";
-    license = licenses.mit;
-    maintainers = with maintainers; [ samuela ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ samuela ];
+    broken = gpu-stats.meta.broken || wandb-core.meta.broken;
  };
 }
--- a/pkgs/development/python-modules/wandb/hardcode-git-path.patch
+++ b/pkgs/development/python-modules/wandb/hardcode-git-path.patch
@ -1,7 +1,7 @@
-diff --git a/tests/functional_tests/t0_main/kfp/wandb_probe.py b/tests/functional_tests/t0_main/kfp/wandb_probe.py
-index 82fadfe1..25c1454c 100644
--- a/tests/functional_tests/t0_main/kfp/wandb_probe.py
-+++ b/tests/functional_tests/t0_main/kfp/wandb_probe.py
+diff --git a/landfill/functional_tests/kfp/wandb_probe.py b/landfill/functional_tests/kfp/wandb_probe.py
+index 86b18a438..23e237e3b 100644
+--- a/landfill/functional_tests/kfp/wandb_probe.py
+++ b/landfill/functional_tests/kfp/wandb_probe.py
@@ -5,7 +5,7 @@ import subprocess
 def wandb_probe_package():
     if not os.environ.get("WB_PROBE_PACKAGE"):
@ -12,20 +12,20 @@ index 82fadfe1..25c1454c 100644
         return
     wandb_local = f"git+https://github.com/wandb/wandb.git@{o}#egg=wandb"
 diff --git a/wandb/cli/cli.py b/wandb/cli/cli.py
-index 5767e61c..56009fec 100644
+index 1453100cc..9dc468201 100644
 --- a/wandb/cli/cli.py
 +++ b/wandb/cli/cli.py
-@@ -1919,7 +1919,7 @@ def restore(ctx, run, no_git, branch, project, entity):
+@@ -2531,7 +2531,7 @@ def restore(ctx, run, no_git, branch, project, entity):
     commit, json_config, patch_content, metadata = api.run_config(
         project, run=run, entity=entity
     )
 -    repo = metadata.get("git", {}).get("repo")
 +    repo = metadata.get("@git@", {}).get("repo")
     image = metadata.get("docker")
-     restore_message = (
-         """`wandb restore` needs to be run from the same git repository as the original run.
-@@ -1938,7 +1938,7 @@ Run `git clone %s` and restore from there or pass the --no-git flag."""
-
+     restore_message = """`wandb restore` needs to be run from the same git repository as the original run.
+ Run `git clone {}` and restore from there or pass the --no-git flag.""".format(repo)
+@@ -2547,7 +2547,7 @@ Run `git clone {}` and restore from there or pass the --no-git flag.""".format(r
+ 
     if commit and api.git.enabled:
         wandb.termlog(f"Fetching origin and finding commit: {commit}")
 -        subprocess.check_call(["git", "fetch", "--all"])
@ -33,7 +33,7 @@ index 5767e61c..56009fec 100644
         try:
             api.git.repo.commit(commit)
         except ValueError:
-@@ -1992,7 +1992,7 @@ Run `git clone %s` and restore from there or pass the --no-git flag."""
+@@ -2604,7 +2604,7 @@ Run `git clone {}` and restore from there or pass the --no-git flag.""".format(r
             # --reject is necessary or else this fails any time a binary file
             # occurs in the diff
             exit_code = subprocess.call(
@ -42,16 +42,16 @@ index 5767e61c..56009fec 100644
             )
             if exit_code == 0:
                 wandb.termlog("Applied patch")
-diff --git a/wandb/vendor/graphql-core-1.1/wandb_graphql/pyutils/version.py b/wandb/vendor/graphql-core-1.1/wandb_graphql/pyutils/version.py
-index 614df9f5..38db460b 100644
--- a/wandb/vendor/graphql-core-1.1/wandb_graphql/pyutils/version.py
-+++ b/wandb/vendor/graphql-core-1.1/wandb_graphql/pyutils/version.py
-@@ -67,7 +67,7 @@ def get_git_changeset():
+diff --git a/wandb/vendor/promise-2.3.0/wandb_promise/pyutils/version.py b/wandb/vendor/promise-2.3.0/wandb_promise/pyutils/version.py
+index 47d439145..16118feb0 100644
+--- a/wandb/vendor/promise-2.3.0/wandb_promise/pyutils/version.py
+++ b/wandb/vendor/promise-2.3.0/wandb_promise/pyutils/version.py
+@@ -69,7 +69,7 @@ def get_git_changeset():
     repo_dir = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
     try:
         git_log = subprocess.Popen(
-            'git log --pretty=format:%ct --quiet -1 HEAD',
-+            '@git@ log --pretty=format:%ct --quiet -1 HEAD',
-             stdout=subprocess.PIPE, stderr=subprocess.PIPE,
-             shell=True, cwd=repo_dir, universal_newlines=True,
-         )
+-            "git log --pretty=format:%ct --quiet -1 HEAD",
+            "@git@ log --pretty=format:%ct --quiet -1 HEAD",
+             stdout=subprocess.PIPE,
+             stderr=subprocess.PIPE,
+             shell=True,
--- a/pkgs/development/tools/continuous-integration/buildbot/default.nix
+++ b/pkgs/development/tools/continuous-integration/buildbot/default.nix
@ -5,15 +5,7 @@
 }:
 # Take packages from self first, then python.pkgs (and secondarily pkgs)
 lib.makeScope (self: newScope (self.python.pkgs // self)) (self: {
-  python = python3.override {
-    self = self.python;
-    packageOverrides = self: super: {
-      moto = super.moto.overridePythonAttrs (oldAttrs: {
-        # a lot of tests -> very slow, we already build them when building python packages
-        doCheck = false;
-      });
-    };
-  };
+  python = python3;

  buildbot-pkg = self.callPackage ./pkg.nix { };

--- a/pkgs/development/tools/protoc-gen-go-grpc/default.nix
+++ b/pkgs/development/tools/protoc-gen-go-grpc/default.nix
@ -21,6 +21,6 @@ buildGoModule rec {
    description = "Go language implementation of gRPC. HTTP/2 based RPC";
    mainProgram = "protoc-gen-go-grpc";
    license = licenses.asl20;
-    maintainers = [ maintainers.raboof ];
+    maintainers = [ ];
  };
 }
--- a/pkgs/development/tools/rust/cargo-generate/default.nix
+++ b/pkgs/development/tools/rust/cargo-generate/default.nix
@ -11,16 +11,16 @@

 rustPlatform.buildRustPackage rec {
  pname = "cargo-generate";
-  version = "0.21.3";
+  version = "0.22.0";

  src = fetchFromGitHub {
    owner = "cargo-generate";
    repo = "cargo-generate";
    rev = "v${version}";
-    sha256 = "sha256-1F/865UgdqwfpITFhXCuL7CmducL7w0lVDyfui9UzjU=";
+    sha256 = "sha256-oiXv6MbQpmWFi2cTN3a1Zx7Bjr0Y+f6/O+0FQNidbBg=";
  };

-  cargoHash = "sha256-szPO1V09EThpo2N03Ll+ZJUpvjp2b+/C/sviOzFfG+k=";
+  cargoHash = "sha256-8yLGxydU7jjoG13I+h7qjtabcCxzjnEiE8tAbH56pp4=";

  nativeBuildInputs = [ pkg-config ];

@ -44,6 +44,11 @@ rustPlatform.buildRustPackage rec {
  # - should_canonicalize: the test assumes that it will be called from the /Users/<project_dir>/ folder on darwin variant.
  checkFlags = [
    "--skip=favorites::favorites_default_to_git_if_not_defined"
+    "--skip=git_instead_of::should_read_the_instead_of_config_and_rewrite_an_git_at_url_to_https"
+    "--skip=git_instead_of::should_read_the_instead_of_config_and_rewrite_an_ssh_url_to_https"
+    "--skip=git_over_ssh::it_should_retrieve_the_private_key_from_ssh_agent"
+    "--skip=git_over_ssh::it_should_support_a_public_repo"
+    "--skip=git_over_ssh::it_should_use_a_ssh_key_provided_by_identity_argument"
  ] ++ lib.optionals stdenv.hostPlatform.isDarwin [
    "--skip=git::utils::should_canonicalize"
  ];
--- a/pkgs/servers/home-assistant/custom-lovelace-modules/universal-remote-card/default.nix
+++ b/pkgs/servers/home-assistant/custom-lovelace-modules/universal-remote-card/default.nix
@ -5,18 +5,18 @@

 buildNpmPackage rec {
  pname = "universal-remote-card";
-  version = "4.1.1";
+  version = "4.1.2";

  src = fetchFromGitHub {
    owner = "Nerwyn";
    repo = "android-tv-card";
    rev = version;
-    hash = "sha256-h7U39dpgEsTboYjfpWxcdP3BkXNB2dQNuSiTCD7zPR0=";
+    hash = "sha256-2bDVeqp6g5tkzdZqbHpTjsVlCTjwLK7ZSOFPtso1LKM=";
  };

  patches = [ ./dont-call-git.patch ];

-  npmDepsHash = "sha256-X4PuMvQ/ZmyUafLE7ADBPIKIB8ul5M1P23gOQEikTAg=";
+  npmDepsHash = "sha256-84IO1JT/mrU2w5IqPNB31ai19QbMmwOGurK8n6wO4Hg=";

  installPhase = ''
    runHook preInstall
--- a/pkgs/tools/networking/burpsuite/default.nix
+++ b/pkgs/tools/networking/burpsuite/default.nix
@ -9,20 +9,20 @@
 }:

 let
-  version = "2024.8.4";
+  version = "2024.8.5";

  product =
    if proEdition then
      {
        productName = "pro";
        productDesktop = "Burp Suite Professional Edition";
-        hash = "sha256-JWG0iNnQJgMqNsMSZIzFCmss6JhvZ9r7lFHuX46+3Mg=";
+        hash = "sha256-bG1+U16qRNnHHhjloUIMxBH7/zKRo0b3tEX1ebsClL4=";
      }
    else
      {
        productName = "community";
        productDesktop = "Burp Suite Community Edition";
-        hash = "sha256-a+TozSXpwyBlxPztASb4fqGZGn8Asg2/GxKzhIpEuyE=";
+        hash = "sha256-rUDG2L/MC6vX58If7rLHKd73hyV2lSdO1ZZu9tDaznM=";
      };

  src = fetchurl {
--- a/pkgs/tools/networking/libreswan/default.nix
+++ b/pkgs/tools/networking/libreswan/default.nix
@ -45,11 +45,11 @@ in

 stdenv.mkDerivation rec {
  pname = "libreswan";
-  version = "5.0";
+  version = "5.1";

  src = fetchurl {
    url = "https://download.libreswan.org/${pname}-${version}.tar.gz";
-    hash = "sha256-ELwK3JC56YGjDf77p9r/IAhB7LmRD51nHxN//BQUKGo=";
+    hash = "sha256-HO6dQSyJeZ64v3EUUA1cFOAUPpVGBWFj7r45YOf0Y3w=";
  };

  strictDeps = true;
--- a/pkgs/tools/networking/rosenpass/default.nix
+++ b/pkgs/tools/networking/rosenpass/default.nix
@ -2,7 +2,7 @@
 , fetchFromGitHub
 , nixosTests
 , rustPlatform
-, hostPlatform
+, stdenv
 , installShellFiles
 , cmake
 , libsodium
@ -32,7 +32,7 @@ rustPlatform.buildRustPackage rec {

  # nix defaults to building for aarch64 _without_ the armv8-a
  # crypto extensions, but liboqs depends on these
-  preBuild = lib.optionalString hostPlatform.isAarch64 ''
+  preBuild = lib.optionalString stdenv.hostPlatform.isAarch64 ''
    NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -march=armv8-a+crypto"
  '';

--- a/pkgs/tools/text/difftastic/Cargo.lock
+++ b/pkgs/tools/text/difftastic/Cargo.lock
@ -91,9 +91,12 @@ checksum = "7f30e7476521f6f8af1a1c4c0b8cc94f0bee37d91763d0ca2665f299b6cd8aec"

 [[package]]
 name = "cc"
-version = "1.1.5"
+version = "1.1.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "324c74f2155653c90b04f25b2a47a8a631360cb908f92a772695f430c7e31052"
+checksum = "b16803a61b81d9eabb7eae2588776c4c1e584b738ede45fdbb4c972cec1e9945"
+dependencies = [
+ "shlex",
+]

 [[package]]
 name = "cfg-if"
@ -211,7 +214,7 @@ checksum = "6184e33543162437515c2e2b48714794e37845ec9851711914eec9d308f6ebe8"

 [[package]]
 name = "difftastic"
-version = "0.60.0"
+version = "0.61.0"
 dependencies = [
 "assert_cmd",
 "bumpalo",
@ -852,6 +855,12 @@ dependencies = [
 "serde",
 ]

+[[package]]
+name = "shlex"
+version = "1.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64"
+
 [[package]]
 name = "signal-hook"
 version = "0.3.17"
@ -983,9 +992,9 @@ dependencies = [

 [[package]]
 name = "tree_magic_mini"
-version = "3.1.4"
+version = "3.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "77ee137597cdb361b55a4746983e4ac1b35ab6024396a419944ad473bb915265"
+checksum = "469a727cac55b41448315cc10427c069c618ac59bb6a4480283fcd811749bdc2"
 dependencies = [
 "fnv",
 "home",
--- a/pkgs/tools/text/difftastic/default.nix
+++ b/pkgs/tools/text/difftastic/default.nix
@ -17,13 +17,13 @@ let
 in
 rustPlatform.buildRustPackage rec {
  pname = "difftastic";
-  version = "0.60.0";
+  version = "0.61.0";

  src = fetchFromGitHub {
    owner = "wilfred";
    repo = pname;
    rev = version;
-    hash = "sha256-eIHwmSCAY9Fn9Du7DJxZyGqJ3SUEyZ6VEtwxphGnSHw=";
+    hash = "sha256-hhkcujMuirBTIwUP3RMZ+F76T1TLcjMqa5l328xrwRg=";
  };

  cargoLock = {
--- a/pkgs/tools/virtualization/distrobuilder/default.nix
+++ b/pkgs/tools/virtualization/distrobuilder/default.nix
@ -32,15 +32,15 @@ let
 in
 buildGoModule rec {
  pname = "distrobuilder";
-  version = "3.0";
+  version = "3.1";

-  vendorHash = "sha256-pFrEkZnrcx0d3oM1klQrNHH+MiLvO4V1uFQdE0kXUqM=";
+  vendorHash = "sha256-3oHLvOdHbOdaL2FTo+a5HmayNi/i3zoAsU/du9h1N30=";

  src = fetchFromGitHub {
    owner = "lxc";
    repo = "distrobuilder";
    rev = "refs/tags/distrobuilder-${version}";
-    sha256 = "sha256-JfME9VaqaQnrhnzhSLGUy9uU+tki1hXdnwqBUD/5XH0=";
+    sha256 = "sha256-cIzIoLQmg1kgI1QRAmFh/ca88PJBW2yIY92BKHKwTMk=";
    fetchSubmodules = false;
  };

--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@ -26021,9 +26021,11 @@ with pkgs;
    fetchurl = import ../build-support/fetchurl/boot.nix {
      inherit (stdenv.buildPlatform) system;
    };
-    checkMeta = callPackage ../stdenv/generic/check-meta.nix { };
+    checkMeta = callPackage ../stdenv/generic/check-meta.nix { inherit (stdenv) hostPlatform; };
  });
-  minimal-bootstrap-sources = callPackage ../os-specific/linux/minimal-bootstrap/stage0-posix/bootstrap-sources.nix { };
+  minimal-bootstrap-sources = callPackage ../os-specific/linux/minimal-bootstrap/stage0-posix/bootstrap-sources.nix {
+    inherit (stdenv) hostPlatform;
+  };
  make-minimal-bootstrap-sources = callPackage ../os-specific/linux/minimal-bootstrap/stage0-posix/make-bootstrap-sources.nix {
    inherit (stdenv) hostPlatform;
  };
@ -28457,8 +28459,6 @@ with pkgs;

  catt = callPackage ../applications/video/catt { };

-  cava = callPackage ../applications/audio/cava { };
-
  cb2bib = libsForQt5.callPackage ../applications/office/cb2bib { };

  cbatticon = callPackage ../applications/misc/cbatticon { };
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@ -3526,6 +3526,8 @@ self: super: with self; {

  djangorestframework-guardian2 = callPackage ../development/python-modules/djangorestframework-guardian2 { };

+  djangorestframework-jsonp = callPackage ../development/python-modules/djangorestframework-jsonp { };
+
  djangorestframework-recursive = callPackage ../development/python-modules/djangorestframework-recursive { };

  djangorestframework-simplejwt = callPackage ../development/python-modules/djangorestframework-simplejwt { };
@ -3612,6 +3614,8 @@ self: super: with self; {

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

+  dmt-core = callPackage ../development/python-modules/dmt-core { };
+
  dm-control = callPackage ../development/python-modules/dm-control { };

  dm-env = callPackage ../development/python-modules/dm-env { };
@ -6849,6 +6853,8 @@ self: super: with self; {

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

+  kubernetes-asyncio = callPackage ../development/python-modules/kubernetes-asyncio { };
+
  kurbopy = callPackage ../development/python-modules/kurbopy { };

  l18n = callPackage ../development/python-modules/l18n { };
@ -13585,6 +13591,8 @@ self: super: with self; {

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

+  reprint = callPackage ../development/python-modules/reprint { };
+
  reprshed = callPackage ../development/python-modules/reprshed { };

  reptor = callPackage ../development/python-modules/reptor { };
@ -17208,6 +17216,8 @@ self: super: with self; {

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

+  verilogae = callPackage ../development/python-modules/verilogae { };
+
  verlib2 = callPackage ../development/python-modules/verlib2 { };

  versioneer = callPackage ../development/python-modules/versioneer { };
--- a/pkgs/top-level/release-unfree-redistributable.nix
+++ b/pkgs/top-level/release-unfree-redistributable.nix
@ -0,0 +1,122 @@
+/*
+  Nixpkgs unfree+redistributable packages.
+
+  NOTE: This file is used by the sister nix-community project.
+
+  The official Hydra instance only builds and provides binary caches for free
+  packages (as in OSI-approved).
+
+  Some unfree packages such as MongoDB, ZeroTier, ... take a while to be
+  built. While their license is not free, they allow redistribution of
+  build artefacts.
+
+  The sister project nix-community will build and distribute those packages
+  for a subset of the channels to <https://nix-community.cachix.org>.
+
+  See also:
+
+  * <https://hydra.nix-community.org/jobset/nixpkgs/unfree-redistributable>
+  * <https://github.com/nix-community/infra/pull/1406>
+
+  Test for example like this:
+
+    $ hydra-eval-jobs pkgs/top-level/release-unfree-redistributable.nix -I .
+*/
+
+{
+  # The platforms for which we build Nixpkgs.
+  supportedSystems ? [
+    "x86_64-linux"
+    "aarch64-linux"
+  ],
+  # Attributes passed to nixpkgs.
+  nixpkgsArgs ? {
+    config = {
+      allowAliases = false;
+      allowUnfree = true;
+      cudaSupport = true;
+      inHydra = true;
+    };
+  },
+  # We only build the full package set on infrequently releasing channels.
+  full ? false,
+}:
+
+let
+  release-lib = import ./release-lib.nix {
+    inherit supportedSystems nixpkgsArgs;
+  };
+
+  inherit (release-lib)
+    lib
+    mapTestOn
+    pkgs
+    ;
+
+  # similar to release-lib.packagePlatforms, but also includes some condition for which package to pick
+  packagesWith =
+    prefix: cond:
+    lib.mapAttrs (
+      name: value:
+      let
+        attrPath = if prefix == "" then name else "${prefix}.${name}";
+        res = builtins.tryEval (
+          if lib.isDerivation value then
+            lib.optionals (cond attrPath value) (
+              # logic copied from release-lib packagePlatforms
+              value.meta.hydraPlatforms
+                or (lib.subtractLists (value.meta.badPlatforms or [ ]) (value.meta.platforms or [ "x86_64-linux" ]))
+            )
+          else if
+            value.recurseForDerivations or false
+            || value.recurseForRelease or false
+            || value.__recurseIntoDerivationForReleaseJobs or false
+          then
+            # Recurse
+            packagesWith attrPath cond value
+          else
+            [ ]
+        );
+      in
+      lib.optionals res.success res.value
+    );
+
+  # Unfree is any license not OSI-approved.
+  isUnfree = pkg: lib.lists.any (l: !(l.free or true)) (lib.lists.toList (pkg.meta.license or [ ]));
+
+  # Whenever the license allows re-distribution of the binaries
+  isRedistributable =
+    pkg: lib.lists.any (l: l.redistributable or false) (lib.lists.toList (pkg.meta.license or [ ]));
+
+  isSource =
+    pkg: !lib.lists.any (x: !(x.isSource)) (lib.lists.toList (pkg.meta.sourceProvenance or [ ]));
+
+  isNotLinuxKernel =
+    attrPath: !(lib.hasPrefix "linuxKernel" attrPath || lib.hasPrefix "linuxPackages" attrPath);
+
+  # This is handled by release-cuda.nix
+  isNotCudaPackage = attrPath: !(lib.hasPrefix "cuda" attrPath);
+
+  canSubstituteSrc =
+    pkg:
+    # requireFile don't allow using substituters and are therefor skipped
+    pkg.src.allowSubstitutes or true;
+
+  cond =
+    attrPath: pkg:
+    (isUnfree pkg)
+    && (isRedistributable pkg)
+    && (isSource pkg)
+    && (canSubstituteSrc pkg)
+    && (
+      full
+      ||
+        # We only build these heavy packages on releases
+        ((isNotCudaPackage attrPath) && (isNotLinuxKernel attrPath))
+    );
+
+  packages = packagesWith "" cond pkgs;
+
+  jobs = mapTestOn packages;
+in
+jobs
--- a/pkgs/top-level/splice.nix
+++ b/pkgs/top-level/splice.nix
@ -119,7 +119,6 @@ let
      pkgsTargetTarget
      buildPackages pkgs targetPackages
      ;
-    inherit (pkgs.stdenv) buildPlatform targetPlatform hostPlatform;
  };

  splicedPackagesWithXorg = splicedPackages // builtins.removeAttrs splicedPackages.xorg [