Merge remote-tracking branch 'origin/master' into staging-next

nixos/modules/image/repart-image.nix

@@ -81,6 +81,7 @@ let
     "erofs" = [ erofs-utils ];
     "btrfs" = [ btrfs-progs ];
     "xfs" = [ xfsprogs ];
+    "swap" = [ util-linux ];
   };
 
   fileSystemTools = builtins.concatMap (f: fileSystemToolMapping."${f}") fileSystems;

nixos/tests/appliance-repart-image.nix

@@ -73,6 +73,14 @@ in
               SizeMinBytes = if config.nixpkgs.hostPlatform.isx86_64 then "64M" else "96M";
             };
           };
+          "swap" = {
+            repartConfig = {
+              Type = "swap";
+              Format = "swap";
+              SizeMinBytes = "10M";
+              SizeMaxBytes = "10M";
+            };
+          };
           "root" = {
             storePaths = [ config.system.build.toplevel ];
             repartConfig = {

nixos/tests/zenohd.nix

@@ -82,7 +82,6 @@ import ./make-test-python.nix (
     };
 
     testScript = ''
-      start_all()
       router.wait_for_unit("zenohd.service")
       client.wait_for_unit("multi-user.target")
 

pkgs/applications/science/electronics/fritzing/default.nix

@@ -87,6 +87,9 @@ stdenv.mkDerivation {
     substituteInPlace phoenix.pro \
       --replace-fail "6.5.10" "${qtbase.version}"
 
+    substituteInPlace src/simulation/ngspice_simulator.cpp \
+      --replace-fail 'path + "/" + libName' '"${libngspice}/lib/libngspice.so"'
+
     mkdir parts
     cp -a ${parts}/* parts/
   '';

pkgs/build-support/rust/build-rust-package/default.nix

@@ -54,9 +54,6 @@
 
   depsExtraArgs ? { },
 
-  # Toggles whether a custom sysroot is created when the target is a .json file.
-  __internal_dontAddSysroot ? false,
-
   # Needed to `pushd`/`popd` into a subdir of a tarball if this subdir
   # contains a Cargo.toml, but isn't part of a workspace (which is e.g. the
   # case for `rustfmt`/etc from the `rust-sources).
@@ -125,21 +122,8 @@ let
 
   target = stdenv.hostPlatform.rust.rustcTargetSpec;
   targetIsJSON = lib.hasSuffix ".json" target;
-  useSysroot = targetIsJSON && !__internal_dontAddSysroot;
-
-  sysroot = callPackage ./sysroot { } {
-    inherit target;
-    shortTarget = stdenv.hostPlatform.rust.cargoShortTarget;
-    RUSTFLAGS = args.RUSTFLAGS or "";
-    originalCargoToml = src + /Cargo.toml; # profile info is later extracted
-  };
-
 in
 
-# Tests don't currently work for `no_std`, and all custom sysroots are currently built without `std`.
-# See https://os.phil-opp.com/testing/ for more information.
-assert useSysroot -> !(args.doCheck or true);
-
 stdenv.mkDerivation (
   (removeAttrs args [
     "depsExtraArgs"
@@ -147,14 +131,8 @@ stdenv.mkDerivation (
     "cargoDeps"
     "cargoLock"
   ])
-  // lib.optionalAttrs useSysroot {
-    RUSTFLAGS = "--sysroot ${sysroot} " + (args.RUSTFLAGS or "");
-  }
   // lib.optionalAttrs (stdenv.hostPlatform.isDarwin && buildType == "debug") {
-    RUSTFLAGS =
+    RUSTFLAGS = "-C split-debuginfo=packed " + (args.RUSTFLAGS or "");
-      "-C split-debuginfo=packed "
-      + lib.optionalString useSysroot "--sysroot ${sysroot} "
-      + (args.RUSTFLAGS or "");
   }
   // {
     cargoDeps = cargoDeps';

pkgs/build-support/rust/build-rust-package/sysroot/default.nix

@@ -1,52 +0,0 @@
-{
-  lib,
-  stdenv,
-  rustPlatform,
-  buildPackages,
-}:
-
-{
-  shortTarget,
-  originalCargoToml,
-  target,
-  RUSTFLAGS,
-}:
-
-let
-  cargoSrc = import ../../sysroot/src.nix {
-    inherit
-      lib
-      stdenv
-      rustPlatform
-      buildPackages
-      originalCargoToml
-      ;
-  };
-in
-rustPlatform.buildRustPackage {
-  inherit target RUSTFLAGS;
-
-  name = "custom-sysroot";
-  src = cargoSrc;
-
-  RUSTC_BOOTSTRAP = 1;
-  __internal_dontAddSysroot = true;
-  cargoHash = "sha256-zgkwevitxsu1C4OgGTsqNSc0gDxaNXYK1WPbfER48d0=";
-
-  doCheck = false;
-
-  installPhase = ''
-    export LIBS_DIR=$out/lib/rustlib/${shortTarget}/lib
-    mkdir -p $LIBS_DIR
-    for f in target/${shortTarget}/release/deps/*.{rlib,rmeta}; do
-      cp $f $LIBS_DIR
-    done
-
-    export RUST_SYSROOT=$(rustc --print=sysroot)
-    host=${stdenv.buildPlatform.rust.rustcTarget}
-    cp -r $RUST_SYSROOT/lib/rustlib/$host $out
-  '';
-
-  # allows support for cross-compilation
-  meta.platforms = lib.platforms.all;
-}

pkgs/build-support/rust/sysroot/Cargo.lock

@@ -1,44 +0,0 @@
-# This file is automatically @generated by Cargo.
-# It is not intended for manual editing.
-version = 3
-
-[[package]]
-name = "alloc"
-version = "0.0.0"
-dependencies = [
- "compiler_builtins",
- "core",
-]
-
-[[package]]
-name = "compiler_builtins"
-version = "0.1.87"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f867ce54c09855ccd135ad4a50c777182a0c7af5ff20a8f537617bd648b10d50"
-dependencies = [
- "rustc-std-workspace-core",
-]
-
-[[package]]
-name = "core"
-version = "0.0.0"
-
-[[package]]
-name = "nixpkgs-sysroot-stub-crate"
-version = "0.0.0"
-dependencies = [
- "alloc",
- "compiler_builtins",
- "core",
-]
-
-[[package]]
-name = "rustc-std-workspace-core"
-version = "1.99.0"
-dependencies = [
- "core",
-]
-
-[[patch.unused]]
-name = "rustc-std-workspace-alloc"
-version = "1.99.0"

pkgs/build-support/rust/sysroot/cargo.py

@@ -1,47 +0,0 @@
-import os
-import toml
-
-rust_src = os.environ['RUSTC_SRC']
-orig_cargo = os.environ['ORIG_CARGO'] if 'ORIG_CARGO' in os.environ else None
-
-base = {
-  'package': {
-    'name': 'nixpkgs-sysroot-stub-crate',
-    'version': '0.0.0',
-    'authors': ['The Rust Project Developers'],
-    'edition': '2018',
-  },
-  'dependencies': {
-    'compiler_builtins': {
-      'version': '0.1.0',
-      'features': ['rustc-dep-of-std', 'mem'],
-    },
-    'core': {
-      'path': os.path.join(rust_src, 'core'),
-    },
-    'alloc': {
-      'path': os.path.join(rust_src, 'alloc'),
-    },
-  },
-  'patch': {
-    'crates-io': {
-      'rustc-std-workspace-core': {
-        'path': os.path.join(rust_src, 'rustc-std-workspace-core'),
-      },
-      'rustc-std-workspace-alloc': {
-        'path': os.path.join(rust_src, 'rustc-std-workspace-alloc'),
-      },
-    },
-  },
-}
-
-if orig_cargo is not None:
-  with open(orig_cargo, 'r') as f:
-    src = toml.loads(f.read())
-    if 'profile' in src:
-      base['profile'] = src['profile']
-
-out = toml.dumps(base)
-
-with open('Cargo.toml', 'x') as f:
-  f.write(out)

pkgs/build-support/rust/sysroot/src.nix

@@ -1,31 +0,0 @@
-{
-  lib,
-  stdenv,
-  rustPlatform,
-  buildPackages,
-  originalCargoToml ? null,
-}:
-
-stdenv.mkDerivation {
-  name = "cargo-src";
-  preferLocalBuild = true;
-
-  unpackPhase = "true";
-  dontConfigure = true;
-  dontBuild = true;
-
-  installPhase =
-    ''
-      export RUSTC_SRC=${rustPlatform.rustLibSrc.override { }}
-    ''
-    + lib.optionalString (originalCargoToml != null) ''
-      export ORIG_CARGO=${originalCargoToml}
-    ''
-    + ''
-      ${buildPackages.python3.withPackages (ps: with ps; [ toml ])}/bin/python3 ${./cargo.py}
-      mkdir -p $out/src
-      echo '#![no_std]' > $out/src/lib.rs
-      cp Cargo.toml $out/Cargo.toml
-      cp ${./Cargo.lock} $out/Cargo.lock
-    '';
-}

pkgs/build-support/rust/sysroot/update-lockfile.sh

@@ -1,27 +0,0 @@
-#!/usr/bin/env nix-shell
-#!nix-shell -i bash -p python3 python3.pkgs.toml cargo
-
-set -eu pipefile
-
-HERE=$(readlink -e $(dirname "${BASH_SOURCE[0]}"))
-NIXPKGS_ROOT="$HERE/../../../.."
-
-# https://unix.stackexchange.com/a/84980/390173
-tempdir=$(mktemp -d 2>/dev/null || mktemp -d -t 'update-lockfile')
-cd "$tempdir"
-mkdir -p src
-touch src/lib.rs
-
-RUSTC_SRC=$(nix-build "${NIXPKGS_ROOT}" -A pkgs.rustPlatform.rustLibSrc --no-out-link)
-
-ln -s $RUSTC_SRC/{core,alloc} ./
-
-export RUSTC_SRC
-python3 "$HERE/cargo.py"
-
-export RUSTC_BOOTSTRAP=1
-cargo generate-lockfile
-
-cp Cargo.lock "$HERE"
-
-rm -rf "$tempdir"

pkgs/by-name/ae/aerospike/package.nix

@@ -12,13 +12,13 @@
 
 stdenv.mkDerivation rec {
   pname = "aerospike-server";
-  version = "7.2.0.6";
+  version = "8.0.0.1";
 
   src = fetchFromGitHub {
     owner = "aerospike";
     repo = "aerospike-server";
     rev = version;
-    hash = "sha256-YjX/2+0n+nrtNwQaZSY5PPYAOnhR+jrIMp02STcJHRY=";
+    hash = "sha256-uVHi1/cT/3Rr/r3JudA09d3TMaTPYjc0ZpvTlz4m8aU=";
     fetchSubmodules = true;
   };
 

pkgs/by-name/by/byedpi/package.nix

@@ -6,13 +6,13 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "byedpi";
-  version = "0.15";
+  version = "0.16";
 
   src = fetchFromGitHub {
     owner = "hufrea";
     repo = "byedpi";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-jsQFfIvWvpJRBewUSS5bhDGocfPTvtG6LiejUxdqk28=";
+    hash = "sha256-/K60znoC/5NNOJ5olQI7YZkjShkGZaJDdub+LwZ/FKc=";
   };
 
   installPhase = ''

pkgs/by-name/cn/cnquery/package.nix

@@ -6,18 +6,18 @@
 
 buildGoModule rec {
   pname = "cnquery";
-  version = "11.37.1";
+  version = "11.39.0";
 
   src = fetchFromGitHub {
     owner = "mondoohq";
     repo = "cnquery";
     tag = "v${version}";
-    hash = "sha256-H8qilsIlXA9NdPrdJYmkX+Ccc5fJHcEZThzPUo6Vi4M=";
+    hash = "sha256-xTeN6VGMqgUEsce9nh5xm5bF0tWgug/xFiXcQehP9iE=";
   };
 
   subPackages = [ "apps/cnquery" ];
 
-  vendorHash = "sha256-rqWGaENzFoC4+VhH1FRX9veLOXxXEAxdhcvrd2OoZY8=";
+  vendorHash = "sha256-l293xIerCnsDe/mau/0+hePJ+CyDlQb1kHmB946a9Do=";
 
   ldflags = [
     "-w"

pkgs/by-name/fo/fourmolu/package.nix

@@ -0,0 +1,11 @@
+{
+  haskellPackages,
+  haskell,
+}:
+
+let
+  inherit (haskell.lib.compose)
+    justStaticExecutables
+    ;
+in
+justStaticExecutables haskellPackages.fourmolu

pkgs/by-name/gu/gum/package.nix

@@ -29,17 +29,14 @@ buildGoModule rec {
     "-X=main.Version=${version}"
   ];
 
-  postInstall =
+  postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
-    ''
+    $out/bin/gum man > gum.1
-      $out/bin/gum man > gum.1
+    installManPage gum.1
-      installManPage gum.1
+    installShellCompletion --cmd gum \
-    ''
+      --bash <($out/bin/gum completion bash) \
-    + lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
+      --fish <($out/bin/gum completion fish) \
-      installShellCompletion --cmd gum \
+      --zsh <($out/bin/gum completion zsh)
-        --bash <($out/bin/gum completion bash) \
+  '';
-        --fish <($out/bin/gum completion fish) \
-        --zsh <($out/bin/gum completion zsh)
-    '';
 
   meta = with lib; {
     description = "Tasty Bubble Gum for your shell";

pkgs/by-name/hy/hyprls/package.nix

@@ -6,13 +6,13 @@
 }:
 buildGoModule rec {
   pname = "hyprls";
-  version = "0.4.1";
+  version = "0.5.0";
 
   src = fetchFromGitHub {
     owner = "hyprland-community";
     repo = "hyprls";
     rev = "v${version}";
-    hash = "sha256-PW1AXt8swS86Ucxad8R4exKOJ0Kww23Q1UKBmsKlsc8=";
+    hash = "sha256-uMBy+R7PUBreRyOTMa0wPOiO8VSyLaRFzoIKYU6niU8=";
   };
 
   vendorHash = "sha256-rG+oGJOABA9ee5nIpC5/U0mMsPhwvVtQvJBlQWfxi5Y=";

pkgs/by-name/ke/keyguard/package.nix

@@ -3,11 +3,8 @@
   stdenv,
   fetchFromGitHub,
   gradle,
-  binutils,
-  fakeroot,
   jdk17,
   fontconfig,
-  autoPatchelfHook,
   libXinerama,
   libXrandr,
   file,
@@ -19,40 +16,28 @@
   makeDesktopItem,
   copyDesktopItems,
 }:
+
 stdenv.mkDerivation (finalAttrs: {
   pname = "keyguard";
-  version = "1.7.2";
+  version = "1.7.6";
 
   src = fetchFromGitHub {
     owner = "AChep";
     repo = "keyguard-app";
-    tag = "r20241223";
+    tag = "r20250128";
-    hash = "sha256-7fMSpTKEEjSXfYotZ/qxX1m+i8GheCLboo+XoA3gTbc=";
+    hash = "sha256-/z7ihmZecIc7Wjd2M9aHcSFYyg2YsWiC9Ia09Ey42qQ=";
   };
 
+  postPatch = ''
+    substituteInPlace desktopLibJvm/build.gradle.kts \
+      --replace-fail 'resources.srcDir(rootDir.resolve("desktopLibNative/build/bin/universal"))' "" \
+      --replace-fail 'resourcesTask.dependsOn(":desktopLibNative:''${Tasks.compileNativeUniversal}")' ""
+  '';
+
   gradleBuildTask = ":desktopApp:createDistributable";
 
   gradleUpdateTask = finalAttrs.gradleBuildTask;
 
-  desktopItems = [
-    (makeDesktopItem {
-      name = "keyguard";
-      exec = "Keyguard";
-      icon = "keyguard";
-      comment = "Keyguard";
-      desktopName = "Keyguard";
-    })
-  ];
-
-  nativeBuildInputs = [
-    gradle
-    binutils
-    fakeroot
-    jdk17
-    autoPatchelfHook
-    copyDesktopItems
-  ];
-
   mitmCache = gradle.fetchDeps {
     inherit (finalAttrs) pname;
     data = ./deps.json;
@@ -60,13 +45,15 @@ stdenv.mkDerivation (finalAttrs: {
     useBwrap = false;
   };
 
-  passthru.updateScript = ./update.sh;
+  env.JAVA_HOME = jdk17;
-
-  doCheck = false;
 
   gradleFlags = [ "-Dorg.gradle.java.home=${jdk17}" ];
 
-  env.JAVA_HOME = jdk17;
+  nativeBuildInputs = [
+    gradle
+    jdk17
+    copyDesktopItems
+  ];
 
   buildInputs = [
     fontconfig
@@ -80,15 +67,29 @@ stdenv.mkDerivation (finalAttrs: {
     alsa-lib
   ];
 
+  doCheck = false;
+
+  desktopItems = [
+    (makeDesktopItem {
+      name = "keyguard";
+      exec = "Keyguard";
+      icon = "keyguard";
+      comment = "Keyguard";
+      desktopName = "Keyguard";
+    })
+  ];
+
   installPhase = ''
     runHook preInstall
 
-    cp -r ./desktopApp/build/compose/binaries/main/app/Keyguard $out
+    cp -r desktopApp/build/compose/binaries/main/app/Keyguard $out
     install -Dm0644 $out/lib/Keyguard.png $out/share/pixmaps/keyguard.png
 
     runHook postInstall
   '';
 
+  passthru.updateScript = ./update.sh;
+
   meta = {
     description = "Alternative client for the Bitwarden platform, created to provide the best user experience possible";
     homepage = "https://github.com/AChep/keyguard-app";

pkgs/by-name/ke/keyguard/update.sh

@@ -1,5 +1,5 @@
 #!/usr/bin/env nix-shell
-#!nix-shell -I nixpkgs=./. -i bash -p bash nixVersions.latest curl coreutils jq common-updater-scripts
+#!nix-shell -I nixpkgs=./. -i bash -p bash nix curl coreutils jq common-updater-scripts
 
 set -eou pipefail
 

pkgs/by-name/mm/mmex/package.nix

@@ -21,25 +21,16 @@
 
 stdenv.mkDerivation rec {
   pname = "money-manager-ex";
-  version = "1.8.0";
+  version = "1.8.1";
 
   src = fetchFromGitHub {
     owner = "moneymanagerex";
     repo = "moneymanagerex";
     rev = "v${version}";
     fetchSubmodules = true;
-    hash = "sha256-jV1jW0aFx95JpwzywEVajstnMKVcEtBdvyL7y6OLl+k=";
+    hash = "sha256-TOT5dFDCF3F1L8P2u+9Ve3/N9mtBD2/KirzF0pyfdIA=";
   };
 
-  patches = [
-    (fetchpatch {
-      # https://github.com/moneymanagerex/moneymanagerex/pull/6716
-      name = "workaround-appstream-1.0.3.patch";
-      url = "https://github.com/moneymanagerex/moneymanagerex/commit/bb98eab92d95b7315d27f4e59ae59b50587106d8.patch";
-      hash = "sha256-98OyFO2nnGBRTIirxZ3jX1NPvsw5kVT8nsCSSmyfabo=";
-    })
-  ];
-
   postPatch = ''
     substituteInPlace src/dbwrapper.cpp src/model/Model_Report.cpp \
       --replace-fail "sqlite3mc_amalgamation.h" "sqlite3.h"

pkgs/by-name/ni/nixci/package.nix

@@ -2,7 +2,6 @@
   lib,
   stdenv,
   rustPlatform,
-  fetchCrate,
   fetchFromGitHub,
   openssl,
   pkg-config,
@@ -17,10 +16,11 @@ rustPlatform.buildRustPackage rec {
   pname = "nixci";
   version = "1.0.0";
 
-  src = fetchCrate {
+  src = fetchFromGitHub {
-    inherit version;
+    owner = "srid";
-    pname = "nixci";
+    repo = "nixci";
-    hash = "sha256-49I09hXYoVo6vzv1b6mkeiFwzfj6g1SkXTL/tCEdOYc=";
+    tag = version;
+    hash = "sha256-0VvZFclqwAcKN95eusQ3lgV0pp1NRUDcVXpVUC0P4QI=";
   };
 
   useFetchCargoVendor = true;
@@ -54,15 +54,15 @@ rustPlatform.buildRustPackage rec {
   env.DEVOUR_FLAKE = fetchFromGitHub {
     owner = "srid";
     repo = "devour-flake";
-    rev = "v4";
+    tag = "v4";
     hash = "sha256-Vey9n9hIlWiSAZ6CCTpkrL6jt4r2JvT2ik9wa2bjeC0=";
   };
 
-  meta = with lib; {
+  meta = {
     description = "Define and build CI for Nix projects anywhere";
     homepage = "https://github.com/srid/nixci";
-    license = licenses.agpl3Only;
+    license = lib.licenses.agpl3Only;
-    maintainers = with maintainers; [
+    maintainers = with lib.maintainers; [
       srid
       shivaraj-bh
       rsrohitsingh682

pkgs/by-name/po/poedit/package.nix

@@ -24,13 +24,13 @@
 
 stdenv.mkDerivation rec {
   pname = "poedit";
-  version = "3.4.4";
+  version = "3.5.2";
 
   src = fetchFromGitHub {
     owner = "vslavik";
     repo = "poedit";
     rev = "v${version}-oss";
-    hash = "sha256-SZjsJQYJCXQendzQ2Tobg+IgkWL6lFX5YnMfruPt7UA=";
+    hash = "sha256-FYLTHVoqXypW1QhnVmIWMp9u+/8pbdUoV7v9GSWEMIU=";
   };
 
   nativeBuildInputs = [

pkgs/by-name/pr/pretender/package.nix

@@ -6,16 +6,16 @@
 
 buildGoModule rec {
   pname = "pretender";
-  version = "1.2.0";
+  version = "1.3.0";
 
   src = fetchFromGitHub {
     owner = "RedTeamPentesting";
     repo = pname;
     tag = "v${version}";
-    hash = "sha256-adWdUlsReRptSgRAjNH9bWy9dpwpuAWtVxlbDL2pMmk=";
+    hash = "sha256-msxGCQkF5u5sIjvy4GCRBIivzoiIDsOjesIf3d8goVI=";
   };
 
-  vendorHash = "sha256-kDHRjd3Y90ocBGSJ0B2jAM9tO+iDSXoUOzLEWX2G0J4=";
+  vendorHash = "sha256-UzKprzkxqG7FOPWcFQGuZtn+gHMeMy4jqCLUSdyO2l0=";
 
   # Tests require network access
   doCheck = false;

pkgs/by-name/pr/privatebin/package.nix

@@ -3,16 +3,18 @@
   stdenvNoCC,
   fetchFromGitHub,
   nixosTests,
+  nix-update-script,
 }:
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "privatebin";
-  version = "1.7.5";
+  version = "1.7.6";
+
   src = fetchFromGitHub {
     owner = "PrivateBin";
     repo = "PrivateBin";
     tag = finalAttrs.version;
-    hash = "sha256-LdTteUED/pq4Z4IOBttLPm3K9gx1xVqP24QQ48uvuyI=";
+    hash = "sha256-tKzuPpll1GOMlaIDfs5udXrHcTko6jmWJq4dPuPYy6Y=";
   };
 
   installPhase = ''
@@ -22,13 +24,28 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     runHook postInstall
   '';
 
-  passthru.tests = nixosTests.privatebin;
+  passthru = {
+    tests = nixosTests.privatebin;
+    updateScript = nix-update-script { };
+  };
 
   meta = {
     changelog = "https://github.com/PrivateBin/PrivateBin/releases/tag/${finalAttrs.version}";
-    description = "Minimalist, open source online pastebin where the server has zero knowledge of pasted data.";
+    description = "Minimalist, open source online pastebin where the server has zero knowledge of pasted data";
     homepage = "https://privatebin.info";
-    license = lib.licenses.gpl2;
+    license = with lib.licenses; [
-    maintainers = [ lib.maintainers.savyajha ];
+      # privatebin
+      zlib
+      # dependencies, see https://github.com/PrivateBin/PrivateBin/blob/master/LICENSE.md
+      gpl2Only
+      bsd3
+      mit
+      asl20
+      cc-by-40
+    ];
+    maintainers = with lib.maintainers; [
+      savyajha
+      defelo
+    ];
   };
 })

pkgs/by-name/pr/prrte/package.nix

@@ -35,6 +35,13 @@ stdenv.mkDerivation rec {
 
   postPatch = ''
     patchShebangs ./autogen.pl ./config
+
+    # This is needed for multi-node jobs.
+    # mpirun/srun/prterun does not have "prted" in its path unless
+    # it is actively pulled in. Hard-coding the nix store path
+    # as a default universally solves this issue.
+    substituteInPlace src/runtime/prte_mca_params.c --replace-fail \
+      "prte_launch_agent = \"prted\"" "prte_launch_agent = \"$out/bin/prted\""
   '';
 
   preConfigure = ''

pkgs/by-name/ri/ripunzip/package.nix

@@ -13,17 +13,17 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "ripunzip";
-  version = "2.0.0";
+  version = "2.0.1";
 
   src = fetchFromGitHub {
     owner = "google";
     repo = "ripunzip";
     rev = "v${version}";
-    hash = "sha256-O9R7SmhKQ6VB9TWbLsQmK/0tDWhJ1QWIPwW7VtibqAk=";
+    hash = "sha256-Y4p3CFE8MyEQJ/af0g2/EL4kto/VZABvD5OS0rRuo8g=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-LceInjbsZR/DjZpA4mqGrfsIC+e4soehPTAQNdWFwrw=";
+  cargoHash = "sha256-lhStxg8H2T29eFYDFAZhFjOyH4hfRwEmcewm7Ec/oTw=";
 
   buildInputs =
     [ openssl ]
@@ -36,6 +36,21 @@ rustPlatform.buildRustPackage rec {
     );
   nativeBuildInputs = [ pkg-config ];
 
+  checkFlags = [
+    # Skip tests involving network
+    "--skip=unzip::http_range_reader::tests::test_with_accept_range"
+    "--skip=unzip::http_range_reader::tests::test_without_accept_range"
+    "--skip=unzip::seekable_http_reader::tests::test_big_readahead"
+    "--skip=unzip::seekable_http_reader::tests::test_random_access"
+    "--skip=unzip::seekable_http_reader::tests::test_small_readahead"
+    "--skip=unzip::seekable_http_reader::tests::test_unlimited_readahead"
+    "--skip=unzip::tests::test_extract_biggish_zip_from_ranges_server"
+    "--skip=unzip::tests::test_extract_from_server"
+    "--skip=unzip::tests::test_small_zip_from_no_content_length_server"
+    "--skip=unzip::tests::test_small_zip_from_no_range_server"
+    "--skip=unzip::tests::test_small_zip_from_ranges_server"
+  ];
+
   setupHook = ./setup-hook.sh;
 
   passthru.tests = {

pkgs/by-name/rn/rns/package.nix

@@ -0,0 +1 @@
+{ python3Packages }: with python3Packages; toPythonApplication rns

pkgs/by-name/rs/rsop/package.nix

@@ -11,18 +11,18 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "rsop";
-  version = "0.5.0";
+  version = "0.6.0";
 
   src = fetchFromGitea {
     domain = "codeberg.org";
     owner = "heiko";
     repo = "rsop";
     rev = "rsop/v${version}";
-    hash = "sha256-Jh2SrIyMduODr3e3War0jCwHH6UwfU8764txzrImCaA=";
+    hash = "sha256-IYL4xeP8Hd7atMPTgmgijg9jeKAfnHlqZrLGL5eCQO4=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-upeYQ96CLBBqwguar3ytQ+l0nncqV8ulCwIMKgNIlBk=";
+  cargoHash = "sha256-yuL7L+QTYiHCfFGppZ6VRAlvFpj4KUWuOBHY2Lwmxq8=";
 
   nativeBuildInputs = [ pkg-config ];
 

pkgs/by-name/ze/zenoh-backend-filesystem/package.nix

@@ -5,22 +5,22 @@
   pkg-config,
   bzip2,
   zstd,
-  rocksdb_8_11,
+  rocksdb,
 }:
 
 rustPlatform.buildRustPackage rec {
   pname = "zenoh-backend-filesystem";
-  version = "1.1.1";
+  version = "1.2.0";
 
   src = fetchFromGitHub {
     owner = "eclipse-zenoh";
     repo = "zenoh-backend-filesystem";
     tag = version;
-    hash = "sha256-V35nqrTUQb5Emn6kgGubvVkTHYQHDz82p3S7pk0Aagg=";
+    hash = "sha256-e7jVje4kI3/xRNk1s1z8WtpUIwPdMleyb0PvDz+vJ08=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-EXI3x9u7OWKVGaAv8lOefR3vEyNSRmMpHJVFjTXutIQ=";
+  cargoHash = "sha256-88QVaneHBV9Lubd8M1c/HHWj4V3d2i1z8+tWY9CMA5c=";
 
   nativeBuildInputs = [
     pkg-config
@@ -33,8 +33,8 @@ rustPlatform.buildRustPackage rec {
   ];
 
   env = {
-    ROCKSDB_INCLUDE_DIR = "${rocksdb_8_11}/include";
+    ROCKSDB_INCLUDE_DIR = "${rocksdb}/include";
-    ROCKSDB_LIB_DIR = "${rocksdb_8_11}/lib";
+    ROCKSDB_LIB_DIR = "${rocksdb}/lib";
     ZSTD_SYS_USE_PKG_CONFIG = true;
   };
 

pkgs/by-name/ze/zenoh-backend-influxdb/package.nix

@@ -6,17 +6,17 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "zenoh-backend-influxdb";
-  version = "1.1.1";
+  version = "1.2.0";
 
   src = fetchFromGitHub {
     owner = "eclipse-zenoh";
     repo = "zenoh-backend-influxdb";
     tag = version;
-    hash = "sha256-X8COHoAf+VG5RXg6KLozxe39a/4oVuiEJLESnEKaCEE=";
+    hash = "sha256-npkQEr1tzY+CW9dDRe+JipXnWa5y38wv7J+kUMlcH54=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-orTq5cfkCBedUCu0HeCb7VoMaW6GHCXowSzVxiy5EPA=";
+  cargoHash = "sha256-k4EakfuONQxj9jz39pnyp3Ofu+V/oyIFLHpfQqg0q+8=";
 
   meta = {
     description = "Backend and Storages for zenoh using InfluxDB";

pkgs/by-name/ze/zenoh-backend-rocksdb/package.nix

@@ -5,22 +5,22 @@
   pkg-config,
   bzip2,
   zstd,
-  rocksdb_8_11,
+  rocksdb,
 }:
 
 rustPlatform.buildRustPackage rec {
   pname = "zenoh-backend-rocksdb";
-  version = "1.1.1";
+  version = "1.2.0";
 
   src = fetchFromGitHub {
     owner = "eclipse-zenoh";
     repo = "zenoh-backend-rocksdb";
     tag = version;
-    hash = "sha256-+dA/4VA1oHhTiMcSXful2Z1B+IYykPMC/2p0mjEbako=";
+    hash = "sha256-YZf3riWMzcyguZbfGheIbAlCijML7zPG+XAJso6ku9E=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-JYBhaPROsk8+df0tIO2i7hp0Ms1DEGZ2ykL7Fiyddd4=";
+  cargoHash = "sha256-SstJKOx52JHnDsqbb9CcejYDsfQfKHF2FKfGVxBQPmw=";
 
   nativeBuildInputs = [
     pkg-config
@@ -33,8 +33,8 @@ rustPlatform.buildRustPackage rec {
   ];
 
   env = {
-    ROCKSDB_INCLUDE_DIR = "${rocksdb_8_11}/include";
+    ROCKSDB_INCLUDE_DIR = "${rocksdb}/include";
-    ROCKSDB_LIB_DIR = "${rocksdb_8_11}/lib";
+    ROCKSDB_LIB_DIR = "${rocksdb}/lib";
     ZSTD_SYS_USE_PKG_CONFIG = true;
   };
 

pkgs/by-name/ze/zenoh-plugin-mqtt/package.nix

@@ -6,17 +6,17 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "zenoh-plugin-mqtt";
-  version = "1.1.1";
+  version = "1.2.0";
 
   src = fetchFromGitHub {
     owner = "eclipse-zenoh";
     repo = "zenoh-plugin-mqtt";
     tag = version;
-    hash = "sha256-boe4AI0U0JHNuChhHOlfCMlKJ0Zo5yUGG3xubR/Msrc=";
+    hash = "sha256-ath1RWr+5nU2GJY6rlWPPBKHX9K/92DFUhgQWVXoWb8=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-prkF0x6JRh+YsakwDR9acm2xJxyrfHPPccvAVVstsho=";
+  cargoHash = "sha256-Sj50OcIbpP9O+cp5FxmmOg/9iYBFvqh8s2cOOaDwHSA=";
 
   # Some test time out
   doCheck = false;

pkgs/by-name/ze/zenoh-plugin-webserver/package.nix

@@ -6,17 +6,17 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "zenoh-plugin-webserver";
-  version = "1.1.1";
+  version = "1.2.0";
 
   src = fetchFromGitHub {
     owner = "eclipse-zenoh";
     repo = "zenoh-plugin-webserver";
     tag = version;
-    hash = "sha256-DduYSy8jO0LtpEadhBhVFW5uht9LFmTbmSJ0jGTh/TQ=";
+    hash = "sha256-+2ta3LdT1YwRs62dyrbmJDCfKDhpWdig1bX0Qq8EoCY=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-YFCu3e3SGAelAneJ/LwXZy3c6kz76qG4B8tsBVOPynI=";
+  cargoHash = "sha256-5gN1BzNqB4xWV0a2Qh1PLzw+bOnln9Nua1+NGes6jaQ=";
 
   meta = {
     description = "Implements an HTTP server mapping URLs to zenoh paths";

pkgs/by-name/ze/zenoh/package.nix

@@ -8,17 +8,17 @@
 }:
 rustPlatform.buildRustPackage rec {
   pname = "zenoh";
-  version = "1.1.1";
+  version = "1.2.0";
 
   src = fetchFromGitHub {
     owner = "eclipse-zenoh";
     repo = "zenoh";
     rev = version;
-    hash = "sha256-5lFs/t1Otmp8C0j5LQN/GV19ukfLq4alBpgwsA934FU=";
+    hash = "sha256-X/jUANTwuOHIA+m8LB4UuJDJ0PwZuMQHtSdgSPiPYNI=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-A0xjYn9+Xt+K1U1Z1J8mAegw4mR4cB5T2mYIOBu4AbE=";
+  cargoHash = "sha256-hCon4ydLLwvdglVfNn+eWMbDaTpcPZxzLWINPULYZwI=";
 
   cargoBuildFlags = [
     "--workspace"

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

@@ -12,13 +12,13 @@
 buildPythonPackage rec {
   pname = "branca";
   version = "0.8.1";
-  format = "setuptools";
+  pyproject = true;
 
-  disabled = pythonOlder "3.7";
+  disabled = pythonOlder "3.8";
 
   src = fetchFromGitHub {
     owner = "python-visualization";
-    repo = pname;
+    repo = "branca";
     tag = "v${version}";
     hash = "sha256-Gnr3ONqWpUNOGiOlyq77d9PxcDT8TjqTHYBGxH+V+xc=";
   };
@@ -28,9 +28,9 @@ buildPythonPackage rec {
     rm setup.cfg
   '';
 
-  nativeBuildInputs = [ setuptools-scm ];
+  build-system = [ setuptools-scm ];
 
-  propagatedBuildInputs = [ jinja2 ];
+  dependencies = [ jinja2 ];
 
   nativeCheckInputs = [
     pytestCheckHook
@@ -42,6 +42,7 @@ buildPythonPackage rec {
   disabledTestPaths = [
     # Some tests require a browser
     "tests/test_utilities.py"
+    "tests/test_iframe.py"
   ];
 
   disabledTests = [

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

@@ -1,13 +1,19 @@
 {
   lib,
-  poetry-core,
   buildPythonPackage,
   fetchFromGitHub,
-  pythonOlder,
+
-  importlib-metadata,
+  # build-system
+  poetry-core,
+
+  # dependencies
   packaging,
-  pytestCheckHook,
+
+  # tests
+  addBinToPathHook,
   gitMinimal,
+  pytestCheckHook,
+  writableTmpDirAsHomeHook,
 }:
 
 buildPythonPackage rec {
@@ -15,8 +21,6 @@ buildPythonPackage rec {
   version = "1.23.0";
   pyproject = true;
 
-  disabled = pythonOlder "3.7";
-
   src = fetchFromGitHub {
     owner = "mtkennerly";
     repo = "dunamai";
@@ -24,22 +28,20 @@ buildPythonPackage rec {
     hash = "sha256-JuW/VL8kfzz5mSXRHtrg/hHykgcewaQYfDuO2PALbWc=";
   };
 
-  nativeBuildInputs = [ poetry-core ];
+  build-system = [ poetry-core ];
 
-  propagatedBuildInputs = [ packaging ] ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata ];
+  dependencies = [ packaging ];
 
-  # needs to be able to run dunami from PATH
   preCheck = ''
-    export PATH=$PATH:$out/bin
-    export HOME=$(mktemp -d)
-
     git config --global user.email "nobody@example.com"
     git config --global user.name "Nobody"
   '';
 
   nativeCheckInputs = [
+    addBinToPathHook
     gitMinimal
     pytestCheckHook
+    writableTmpDirAsHomeHook
   ];
 
   disabledTests = [
@@ -49,12 +51,12 @@ buildPythonPackage rec {
 
   pythonImportsCheck = [ "dunamai" ];
 
-  meta = with lib; {
+  meta = {
     description = "Dynamic version generation";
     mainProgram = "dunamai";
     homepage = "https://github.com/mtkennerly/dunamai";
-    changelog = "https://github.com/mtkennerly/dunamai/blob/${src.tag}/CHANGELOG.md";
+    changelog = "https://github.com/mtkennerly/dunamai/blob/v${version}/CHANGELOG.md";
-    license = licenses.mit;
+    license = lib.licenses.mit;
-    maintainers = with maintainers; [ jmgilman ];
+    maintainers = with lib.maintainers; [ jmgilman ];
   };
 }

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

@@ -16,7 +16,6 @@
   selenium,
   setuptools,
   setuptools-scm,
-  wheel,
   xyzservices,
 }:
 
@@ -34,13 +33,12 @@ buildPythonPackage rec {
     hash = "sha256-qTTJK12nHIhcMkPu4rb2IYWm96EjRafftacrlfeGqZg=";
   };
 
-  nativeBuildInputs = [
+  build-system = [
     setuptools
     setuptools-scm
-    wheel
   ];
 
-  propagatedBuildInputs = [
+  dependencies = [
     branca
     jinja2
     numpy
@@ -55,7 +53,6 @@ buildPythonPackage rec {
     pandas
     pillow
     pytestCheckHook
-    selenium
   ];
 
   disabledTests = [
@@ -71,6 +68,11 @@ buildPythonPackage rec {
     "test_timedynamic_geo_json"
   ];
 
+  disabledTestPaths = [
+    # Import issue with selenium.webdriver.common.fedcm
+    "tests/selenium"
+  ];
+
   pythonImportsCheck = [ "folium" ];
 
   meta = {

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

@@ -1,15 +1,21 @@
 {
   lib,
-  bleak,
   buildPythonPackage,
-  cryptography,
-  esptool,
   fetchFromGitHub,
+  replaceVars,
+  esptool,
+
+  # build-system
+  setuptools,
+
+  # dependencies
+  bleak,
+  cryptography,
   netifaces,
   pyserial,
-  pythonOlder,
+
-  replaceVars,
+  # tests
-  setuptools,
+  versionCheckHook,
 }:
 
 buildPythonPackage rec {
@@ -17,8 +23,6 @@ buildPythonPackage rec {
   version = "0.9.1";
   pyproject = true;
 
-  disabled = pythonOlder "3.7";
-
   src = fetchFromGitHub {
     owner = "markqvist";
     repo = "Reticulum";
@@ -41,17 +45,20 @@ buildPythonPackage rec {
     pyserial
   ];
 
-  # Module has no tests
-  doCheck = false;
-
   pythonImportsCheck = [ "RNS" ];
 
-  meta = with lib; {
+  nativeCheckInputs = [
+    versionCheckHook
+  ];
+  versionCheckProgram = "${placeholder "out"}/bin/rncp";
+  versionCheckProgramArg = [ "--version" ];
+
+  meta = {
     description = "Cryptography-based networking stack for wide-area networks";
-    homepage = "https://github.com/markqvist/Reticulum";
+    homepage = "https://reticulum.network";
-    changelog = "https://github.com/markqvist/Reticulum/releases/tag/${version}";
+    changelog = "https://github.com/markqvist/Reticulum/blob/${version}/Changelog.md";
-    license = licenses.mit;
+    license = lib.licenses.mit;
-    maintainers = with maintainers; [
+    maintainers = with lib.maintainers; [
       fab
       qbit
     ];

pkgs/development/python-modules/uv-dynamic-versioning/default.nix

@@ -0,0 +1,71 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+
+  # build-system
+  hatchling,
+
+  # dependencies
+  dunamai,
+  eval-type-backport,
+  pydantic,
+  returns,
+  tomlkit,
+
+  # tests
+  gitpython,
+  pytestCheckHook,
+  writableTmpDirAsHomeHook,
+}:
+
+buildPythonPackage rec {
+  pname = "uv-dynamic-versioning";
+  version = "0.4.1";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "ninoseki";
+    repo = "uv-dynamic-versioning";
+    tag = "v${version}";
+    # Tests perform mock operations on the local repo
+    leaveDotGit = true;
+    hash = "sha256-5pc05yazeHyQvmNk0uy6XkLrmX4ZQF6Lj7fDDtVcpu4=";
+  };
+
+  build-system = [
+    hatchling
+  ];
+
+  dependencies = [
+    dunamai
+    eval-type-backport
+    hatchling
+    pydantic
+    returns
+    tomlkit
+  ];
+
+  pythonImportsCheck = [
+    "uv_dynamic_versioning"
+  ];
+
+  preCheck = ''
+    git config --global user.email "nobody@example.com"
+    git config --global user.name "Nobody"
+  '';
+
+  nativeCheckInputs = [
+    gitpython
+    pytestCheckHook
+    writableTmpDirAsHomeHook
+  ];
+
+  meta = {
+    description = "Dynamic versioning based on VCS tags for uv/hatch project";
+    homepage = "https://github.com/ninoseki/uv-dynamic-versioning";
+    changelog = "https://github.com/ninoseki/uv-dynamic-versioning/releases/tag/v${version}";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ GaetanLepage ];
+  };
+}

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

@@ -11,19 +11,19 @@
 
 buildPythonPackage rec {
   pname = "zenoh";
-  version = "1.1.1";
+  version = "1.2.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "eclipse-zenoh";
     repo = "zenoh-python";
     rev = version;
-    hash = "sha256-pLdAlQBq/d9fohkPgGV/bR7rOl4RreenbHXYdde8q/0=";
+    hash = "sha256-N82KcLMYTOzkeFR6NLNR/g4MDjXk2aZRaAVMggXKwf0=";
   };
 
   cargoDeps = rustPlatform.fetchCargoVendor {
     inherit src pname version;
-    hash = "sha256-R6Vux4cNL9/Fxi7UvItZT8E539cz5cAupT9X0UkdwR4=";
+    hash = "sha256-5JdqANf5roFY3J+iPxg+WhmAyTWARhgav+/jt7rttqg=";
   };
 
   build-system = [

pkgs/os-specific/linux/kernel/kernels-org.json

@@ -4,35 +4,35 @@
         "hash": "sha256:12c9bd0ikppkdpqmvg7g2062s60ks9p0qxx1jis29wl9swr74120"
     },
     "6.1": {
-        "version": "6.1.127",
+        "version": "6.1.128",
-        "hash": "sha256:0xkqpwhvz6qhaxzg1j993lv1iyvb2zydgq6d8mhdbfkz38fx9c0q"
+        "hash": "sha256:1wshgkgcxaf4mnm4ngngsj8gq1cg8kq56f5kqsdfcw0m339nfkc7"
     },
     "5.15": {
-        "version": "5.15.177",
+        "version": "5.15.178",
-        "hash": "sha256:1q56w3lqwi3ynny6z7siqzv3h8nryksyw70r3fhghca2il4bi7pa"
+        "hash": "sha256:0hkw2l4gr5m6jw2adxcgm2sb6kl0w51r6s4hcbn6rlm4bvmzgsgg"
     },
     "5.10": {
-        "version": "5.10.233",
+        "version": "5.10.234",
-        "hash": "sha256:0lkz2g8r032f027j3gih3f7crx991mrpng9qgqc5k4cc1wl5g7i3"
+        "hash": "sha256:1rgb4v6dvqlw1mgzsli0hxaj2d5d4m1nylgcrwm4bkpiwbzc95wm"
     },
     "5.4": {
-        "version": "5.4.289",
+        "version": "5.4.290",
-        "hash": "sha256:043dl195h06hs3zdjd6j1m1zgvmky3s0plrpma75zqf8ab05yghy"
+        "hash": "sha256:0mm4q8f6kbqddy4zaxjf5xyqpnla5qprvsf7v3vq01gmlzr3rivc"
     },
     "6.6": {
-        "version": "6.6.74",
+        "version": "6.6.75",
-        "hash": "sha256:0ka9snxl0y57fajy8vszwa4ggn48pid8m1879d4vl3mbicd2nppi"
+        "hash": "sha256:1402g6qjk1242gsl6n8xlbg01m0nb19n30ac1ffi7fhnjzxb3pzp"
     },
     "6.11": {
         "version": "6.11.11",
         "hash": "sha256:1z2913y38clnlmhvwj49h7p4pic24s4d8np7nmd4lk7m2xz8w532"
     },
     "6.12": {
-        "version": "6.12.11",
+        "version": "6.12.12",
-        "hash": "sha256:0jgczvy1kr55s4bs8n2vmxnxnfvp5rkm4yd54gqm78c7ppyp4la7"
+        "hash": "sha256:1zwfw3lci3ihandx2cpq3h12x7l94jzr4xkd5lzkn1ppgv8l52g9"
     },
     "6.13": {
-        "version": "6.13",
+        "version": "6.13.1",
-        "hash": "sha256:0vhdz1as27kxav81rkf6fm85sqrbj5hjhz5hpyxcd5b6p1pcr7g7"
+        "hash": "sha256:0smnalhyrgh5s3mw60q56r1jxj993ckfpldxvfrz27a7xb4gc4gh"
     }
 }

pkgs/os-specific/linux/kernel/xanmod-kernels.nix

@@ -76,7 +76,6 @@ let
             moni
             lovesegfault
             atemu
-            shawn8901
             zzzsy
             eljamm
           ];

pkgs/servers/monitoring/grafana/default.nix

@@ -60,7 +60,8 @@ buildGoModule rec {
       cacert
       jq
       moreutils
-      python3
+      # required to run old node-gyp
+      (python3.withPackages (ps: [ ps.distutils ]))
       git
       # @esfx/equatable@npm:1.0.2 fails to build on darwin as it requires `xcbuild`
     ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ xcbuild.xcbuild ];
@@ -102,7 +103,8 @@ buildGoModule rec {
     jq
     moreutils
     removeReferencesTo
-    python3
+    # required to run old node-gyp
+    (python3.withPackages (ps: [ ps.distutils ]))
     faketty
   ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ xcbuild.xcbuild ];
 

pkgs/shells/fish/plugins/forgit.nix

@@ -6,13 +6,13 @@
 
 buildFishPlugin rec {
   pname = "forgit";
-  version = "25.01.0";
+  version = "25.02.0";
 
   src = fetchFromGitHub {
     owner = "wfxr";
     repo = "forgit";
     rev = version;
-    hash = "sha256-x+Y1o+K6I9DWbn202jNAr40vS71ZAXbS7ztsH+bPGBI=";
+    hash = "sha256-vVsJe/MycQrwHLJOlBFLCuKuVDwQfQSMp56Y7beEUyg=";
   };
 
   postInstall = ''

pkgs/tools/security/cnspec/default.nix

@@ -6,18 +6,18 @@
 
 buildGoModule rec {
   pname = "cnspec";
-  version = "11.37.1";
+  version = "11.39.0";
 
   src = fetchFromGitHub {
     owner = "mondoohq";
     repo = "cnspec";
     tag = "v${version}";
-    hash = "sha256-NZbNkqYAjtfF+XP1EcblsT8cLqJEDovQTOwc4JQUNQc=";
+    hash = "sha256-SnWKaQ/wH04HmqM6WhMIn7tRszIwDz9sQxqMXA4ux8k=";
   };
 
   proxyVendor = true;
 
-  vendorHash = "sha256-N99aOt7SsyAUWnvfgsweLABmLX7obnepEvHSTKa/2hg=";
+  vendorHash = "sha256-uymDz+jlEO7AYurAUiUswZD2X7hjEFW6m2aQ73k/B3Q=";
 
   subPackages = [ "apps/cnspec" ];
 

pkgs/top-level/all-packages.nix

@@ -4741,10 +4741,6 @@ with pkgs;
     inherit (darwin) autoSignDarwinBinariesHook;
   };
 
-  poedit = callPackage ../tools/text/poedit {
-    wxGTK32 = wxGTK32.override { withWebKit = true; };
-  };
-
   polaris = callPackage ../servers/polaris { };
 
   polaris-web = callPackage ../servers/polaris/web.nix { };
@@ -17811,7 +17807,7 @@ with pkgs;
 
   nix-visualize = python3.pkgs.callPackage ../tools/package-management/nix-visualize { };
 
-  nixci = callPackage ../tools/nix/nixci {
+  nixci = callPackage ../by-name/ni/nixci/package.nix {
     inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration IOKit;
   };
 

pkgs/top-level/python-packages.nix

@@ -17806,6 +17806,8 @@ self: super: with self; {
 
   uv = callPackage ../development/python-modules/uv { };
 
+  uv-dynamic-versioning = callPackage ../development/python-modules/uv-dynamic-versioning { };
+
   uvcclient = callPackage ../development/python-modules/uvcclient { };
 
   uvicorn = callPackage ../development/python-modules/uvicorn { };