Merge staging-next into staging

nixos/modules/tasks/filesystems/zfs.nix

@@ -1,4 +1,4 @@
-{ config, lib, pkgs, utils, ... }:
+{ config, lib, options, pkgs, utils, ... }:
 #
 # TODO: zfs tunables
 
@@ -56,7 +56,9 @@ let
   # sufficient amount of time has passed that we can assume it won't be. In the
   # latter case it makes one last attempt at importing, allowing the system to
   # (eventually) boot even with a degraded pool.
-  importLib = {zpoolCmd, awkCmd, cfgZfs}: ''
+  importLib = {zpoolCmd, awkCmd, pool}: let
+    devNodes = if pool != null && cfgZfs.pools ? ${pool} then cfgZfs.pools.${pool}.devNodes else cfgZfs.devNodes;
+  in ''
     # shellcheck disable=SC2013
     for o in $(cat /proc/cmdline); do
       case $o in
@@ -67,7 +69,7 @@ let
     done
     poolReady() {
       pool="$1"
-      state="$("${zpoolCmd}" import -d "${cfgZfs.devNodes}" 2>/dev/null | "${awkCmd}" "/pool: $pool/ { found = 1 }; /state:/ { if (found == 1) { print \$2; exit } }; END { if (found == 0) { print \"MISSING\" } }")"
+      state="$("${zpoolCmd}" import -d "${devNodes}" 2>/dev/null | "${awkCmd}" "/pool: $pool/ { found = 1 }; /state:/ { if (found == 1) { print \$2; exit } }; END { if (found == 0) { print \"MISSING\" } }")"
       if [[ "$state" = "ONLINE" ]]; then
         return 0
       else
@@ -82,7 +84,7 @@ let
     poolImport() {
       pool="$1"
       # shellcheck disable=SC2086
-      "${zpoolCmd}" import -d "${cfgZfs.devNodes}" -N $ZFS_FORCE "$pool"
+      "${zpoolCmd}" import -d "${devNodes}" -N $ZFS_FORCE "$pool"
     }
   '';
 
@@ -143,7 +145,7 @@ let
         # See comments at importLib definition.
         zpoolCmd = "${cfgZfs.package}/sbin/zpool";
         awkCmd = "${pkgs.gawk}/bin/awk";
-        inherit cfgZfs;
+        inherit pool;
       }) + ''
         if ! poolImported "${pool}"; then
           echo -n "importing ZFS pool \"${pool}\"..."
@@ -269,10 +271,11 @@ in
         type = lib.types.path;
         default = "/dev/disk/by-id";
         description = ''
-          Name of directory from which to import ZFS devices.
+          Name of directory from which to import ZFS device, this is passed to `zpool import`
+          as the value of the `-d` option.
 
-          This should be a path under /dev containing stable names for all devices needed, as
+          For guidance on choosing this value, see
-          import may fail if device nodes are renamed concurrently with a device failing.
+          [the ZFS documentation](https://openzfs.github.io/openzfs-docs/Project%20and%20Community/FAQ.html#selecting-dev-names-when-creating-a-pool-linux).
         '';
       };
 
@@ -329,6 +332,23 @@ in
         '';
       };
 
+      pools = lib.mkOption {
+        type = lib.types.attrsOf (lib.types.submodule {
+          options = {
+            devNodes = lib.mkOption {
+              type = lib.types.path;
+              default = cfgZfs.devNodes;
+              defaultText = "config.boot.zfs.devNodes";
+              description = options.boot.zfs.devNodes.description;
+            };
+          };
+        });
+        default = { };
+        description = ''
+          Configuration for individual pools to override global defaults.
+        '';
+      };
+
       removeLinuxDRM = lib.mkOption {
         type = lib.types.bool;
         default = false;
@@ -610,7 +630,7 @@ in
             # See comments at importLib definition.
             zpoolCmd = "zpool";
             awkCmd = "awk";
-            inherit cfgZfs;
+            pool = null;
           })] ++ (map (pool: ''
             echo -n "importing root ZFS pool \"${pool}\"..."
             # Loop across the import until it succeeds, because the devices needed may not be discovered yet.

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

@@ -406,8 +406,8 @@ let
         mktplcRef = {
           name = "vscode-neovim";
           publisher = "asvetliakov";
-          version = "1.18.12";
+          version = "1.18.13";
-          hash = "sha256-3Nmk0MFIMFYQHrRyZ7ioFk9KfHSk0CSF7FwNaEJbsyg=";
+          hash = "sha256-FFgleWhzFaAE0UdKQ6lZsszBtJ46UZ3bfx1V3SopDNc=";
         };
         meta = {
           changelog = "https://marketplace.visualstudio.com/items/asvetliakov.vscode-neovim/changelog";
@@ -4958,8 +4958,8 @@ let
         mktplcRef = {
           name = "errorlens";
           publisher = "usernamehw";
-          version = "3.16.0";
+          version = "3.20.0";
-          hash = "sha256-Y3M/A5rYLkxQPRIZ0BUjhlkvixDae+wIRUsBn4tREFw=";
+          hash = "sha256-0gCT+u6rfkEcWcdzqRdc4EosROllD/Q0TIOQ4k640j0=";
         };
         meta = {
           changelog = "https://marketplace.visualstudio.com/items/usernamehw.errorlens/changelog";

pkgs/applications/graphics/inkscape/extensions/silhouette/default.nix

@@ -23,14 +23,14 @@ let
 in
 python3.pkgs.buildPythonApplication rec {
   pname = "inkscape-silhouette";
-  version = "1.28";
+  version = "1.29";
   format = "setuptools";
 
   src = fetchFromGitHub {
     owner = "fablabnbg";
     repo = pname;
-    rev = "v${version}";
+    rev = "refs/tags/v${version}";
-    sha256 = "sha256-uNVhdkZFadL7QNlCsXq51TbhzRKH9KYDPDNCFhw3cQs=";
+    sha256 = "sha256-MfR88BuaAx6n5XRIjslpIk4PnDf6TLU9AsmHxKkcFS0=";
   };
 
   patches = [

pkgs/applications/misc/ausweisapp/default.nix

@@ -12,16 +12,17 @@
   qttools,
   qtwayland,
   qtwebsockets,
+  gitUpdater
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "ausweisapp";
-  version = "2.2.1";
+  version = "2.2.2";
 
   src = fetchFromGitHub {
     owner = "Governikus";
     repo = "AusweisApp2";
     rev = finalAttrs.version;
-    hash = "sha256-+hkbtxw1Bj/lMgyf3OkwmRXyZL6CS3bTHUlGH9xxe/E=";
+    hash = "sha256-YjnMDHXzL16XMVwewoQztE5yjwn1MA1KAiEmEjIYoPY=";
   };
 
   nativeBuildInputs = [
@@ -45,9 +46,12 @@ stdenv.mkDerivation (finalAttrs: {
     qtwebsockets
   ];
 
-  passthru.tests.version = testers.testVersion {
+  passthru = {
-    package = finalAttrs.finalPackage;
+    tests.version = testers.testVersion {
-    command = "QT_QPA_PLATFORM=offscreen ${finalAttrs.meta.mainProgram} --version";
+      package = finalAttrs.finalPackage;
+      command = "QT_QPA_PLATFORM=offscreen ${finalAttrs.meta.mainProgram} --version";
+    };
+    updateScript = gitUpdater { };
   };
 
   meta = {

pkgs/applications/misc/dwmblocks/default.nix

@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation {
   pname = "dwmblocks";
-  version = "unstable-2020-12-27";
+  version = "0-unstable-2024-08-24";
 
   src = fetchFromGitHub {
     owner = "torrinfail";
     repo = "dwmblocks";
-    rev = "96cbb453e5373c05372fd4bf3faacfa53e409067";
+    rev = "8cedd220684064f1433749ed2a19a6184c22cf07";
-    sha256 = "00lxfxsrvhm60zzqlcwdv7xkqzya69mgpi2mr3ivzbc8s9h8nwqx";
+    hash = "sha256-QtYQB2mvw1k2LA8D+/cVnA8+GRDWjhIM6rxfi/IGjEw=";
   };
 
   buildInputs = [ libX11 ];

pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop-beta.nix

@@ -2,7 +2,7 @@
 callPackage ./generic.nix { } rec {
   pname = "signal-desktop-beta";
   dir = "Signal Beta";
-  version = "7.30.0-beta.2";
+  version = "7.32.0-beta.1";
   url = "https://updates.signal.org/desktop/apt/pool/s/signal-desktop-beta/signal-desktop-beta_${version}_amd64.deb";
-  hash = "sha256-mIdbaS4XNDh3wPTUHAyBqMQ67usp312e1McuFAGPrq0=";
+  hash = "sha256-WrHF7Y8OcEOr+W/Jhc+Hj5jCtOjKigZ02N9N/hE+XLA=";
 }

pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop.nix

@@ -2,7 +2,7 @@
 callPackage ./generic.nix { } rec {
   pname = "signal-desktop";
   dir = "Signal";
-  version = "7.29.0";
+  version = "7.31.0";
   url = "https://updates.signal.org/desktop/apt/pool/s/signal-desktop/signal-desktop_${version}_amd64.deb";
-  hash = "sha256-TftTt9pN4EjgZs3N94TlCzXK64g1g+oGPx1ZLVX02VA=";
+  hash = "sha256-7UumNusnexW3ujA65SzxKAdRrWxmKrgZFzK0GMlURaM=";
 }

pkgs/applications/networking/mailreaders/tutanota-desktop/default.nix

@@ -1,15 +1,16 @@
 { lib
 , appimageTools
 , fetchurl
+, gitUpdater
 }:
 
 appimageTools.wrapType2 rec {
   pname = "tutanota-desktop";
-  version = "235.240718.0";
+  version = "250.241025.0";
 
   src = fetchurl {
     url = "https://github.com/tutao/tutanota/releases/download/tutanota-desktop-release-${version}/tutanota-desktop-linux.AppImage";
-    hash = "sha256-Pycz05cwse2SUvJlaCXMA1/Trdt6ZGOJK3NRSPb6/VM=";
+    hash = "sha256-PhcrDjqRmR1NVBLVCuj5dcc+WskWeZ9dJXdtOUveyL0=";
   };
 
   extraPkgs = pkgs: [ pkgs.libsecret ];
@@ -24,6 +25,12 @@ appimageTools.wrapType2 rec {
         --replace 'Exec=AppRun' 'Exec=${pname}'
     '';
 
+  passthru.updateScript = gitUpdater {
+    url = "https://github.com/tutao/tutanota";
+    rev-prefix = "tutanota-desktop-release-";
+    allowedVersions = ".+\\.[0-9]{6}\\..+";
+  };
+
   meta = with lib; {
     description = "Tuta official desktop client";
     homepage = "https://tuta.com/";

pkgs/applications/radio/gnuradio/3.8.nix

@@ -7,7 +7,7 @@
 , pkg-config
 , volk
 , cppunit
-, swig
+, swig3
 , orc
 , boost
 , log4cpp
@@ -83,7 +83,7 @@ let
     python-support = {
       pythonRuntime = [ python.pkgs.six ];
       native = [
-        swig
+        swig3
         python
       ];
       cmakeEnableFlag = "PYTHON";
@@ -98,7 +98,7 @@ let
     gr-ctrlport = {
       cmakeEnableFlag = "GR_CTRLPORT";
       native = [
-        swig
+        swig3
       ];
       runtime = [
         thrift
@@ -159,7 +159,7 @@ let
       cmakeEnableFlag = "GR_CHANNELS";
     };
     gr-qtgui = {
-      runtime = [ qt5.qtbase libsForQt5.qwt ];
+      runtime = [ qt5.qtbase libsForQt5.qwt6_1 ];
       pythonRuntime = [ python.pkgs.pyqt5 ];
       cmakeEnableFlag = "GR_QTGUI";
     };
@@ -231,22 +231,9 @@ stdenv.mkDerivation (finalAttrs: (shared // {
   # Will still evaluate correctly if not used here. It only helps nix-update
   # find the right file in which version is defined.
   inherit (shared) src;
-  # Remove failing tests
+  # Some of the tests we know why they fail, but others simply hang-out and
-  preConfigure = (shared.preConfigure or "") + ''
+  # timeout...
-    # https://github.com/gnuradio/gnuradio/issues/3801
+  doCheck = false;
-    rm gr-blocks/python/blocks/qa_cpp_py_binding.py
-    rm gr-blocks/python/blocks/qa_cpp_py_binding_set.py
-    rm gr-blocks/python/blocks/qa_ctrlport_probes.py
-    # Tests that fail due to numpy deprecations upstream hasn't accomodated to yet.
-    rm gr-fec/python/fec/qa_polar_decoder_sc.py
-    rm gr-fec/python/fec/qa_polar_decoder_sc_list.py
-    rm gr-fec/python/fec/qa_polar_decoder_sc_systematic.py
-    rm gr-fec/python/fec/qa_polar_encoder.py
-    rm gr-fec/python/fec/qa_polar_encoder_systematic.py
-    rm gr-filter/python/filter/qa_freq_xlating_fft_filter.py
-    # Failed with libstdc++ from GCC 13
-    rm gr-filter/python/filter/qa_filterbank.py
-  '';
   patches = [
     # Not accepted upstream, see https://github.com/gnuradio/gnuradio/pull/5227
     ./modtool-newmod-permissions.3_8.patch
@@ -268,7 +255,7 @@ stdenv.mkDerivation (finalAttrs: (shared // {
   } // lib.optionalAttrs (hasFeature "gr-uhd") {
     inherit uhd;
   } // lib.optionalAttrs (hasFeature "gr-qtgui") {
-    inherit (libsForQt5) qwt;
+    qwt = libsForQt5.qwt6_1;
   };
   cmakeFlags = shared.cmakeFlags
     # From some reason, if these are not set, libcodec2 and gsm are not

pkgs/applications/radio/gnuradio/default.nix

@@ -9,6 +9,7 @@
 , orc
 , boost
 , spdlog
+, swig
 , mpir
 , doxygen
 , python

pkgs/applications/radio/uhd/default.nix

@@ -40,7 +40,7 @@ stdenv.mkDerivation (finalAttrs: {
   #
   #     nix-shell maintainers/scripts/update.nix --argstr package uhd --argstr commit true
   #
-  version = "4.6.0.0";
+  version = "4.7.0.0";
 
   outputs = [ "out" "dev" ];
 
@@ -50,7 +50,7 @@ stdenv.mkDerivation (finalAttrs: {
     rev = "v${finalAttrs.version}";
     # The updateScript relies on the `src` using `hash`, and not `sha256. To
     # update the correct hash for the `src` vs the `uhdImagesSrc`
-    hash = "sha256-9ZGt0ZrGbprCmpAuOue6pg2gliu4MvlRFHGxyMJeKAc=";
+    hash = "sha256-TX1iLs941z8sZY0yQEXuy9jGgsn6HU4uqIdxJmNNahU=";
   };
   # Firmware images are downloaded (pre-built) from the respective release on Github
   uhdImagesSrc = fetchurl {

pkgs/applications/radio/uhd/no-adapter-tests.patch

@@ -1,17 +1,17 @@
 diff --git i/host/tests/CMakeLists.txt w/host/tests/CMakeLists.txt
-index f40c252ad..b8a07d341 100644
+index bac599811..267f8e602 100644
---- i/host/tests/CMakeLists.txt
+--- a/host/tests/CMakeLists.txt
-+++ w/host/tests/CMakeLists.txt
++++ b/host/tests/CMakeLists.txt
-@@ -453,12 +453,6 @@ UHD_ADD_NONAPI_TEST(
+@@ -517,12 +517,6 @@ UHD_ADD_NONAPI_TEST(
      ${UHD_SOURCE_DIR}/lib/utils/compat_check.cpp
  )
- 
+
 -UHD_ADD_NONAPI_TEST(
 -    TARGET "xport_adapter_ctrl_test.cpp"
 -    EXTRA_SOURCES
 -    ${UHD_SOURCE_DIR}/lib/usrp/cores/xport_adapter_ctrl.cpp
 -)
 -
- ########################################################################
+ UHD_ADD_NONAPI_TEST(
- # demo of a loadable module
+     TARGET "custom_reg_test.cpp"
- ########################################################################
+     EXTRA_SOURCES

pkgs/applications/science/chemistry/apbs/default.nix

@@ -8,6 +8,7 @@
 , python3
 , libintl
 , libiconv
+, darwin
 }:
 let
   # this is a fork version of fetk (http://www.fetk.org/)
@@ -87,6 +88,7 @@ stdenv.mkDerivation (finalAttrs: {
   ] ++ lib.optionals stdenv.hostPlatform.isDarwin [
     libintl
     libiconv
+    darwin.libutil
   ];
 
   cmakeFlags = [

pkgs/applications/science/misc/cwltool/default.nix

@@ -1,41 +1,44 @@
-{ lib
+{
-, fetchFromGitHub
+  lib,
-, git
+  fetchFromGitHub,
-, nodejs
+  git,
-, python3
+  nodejs,
+  python3,
 }:
 
 python3.pkgs.buildPythonApplication rec {
   pname = "cwltool";
-  version = "3.1.20240708091337";
+  version = "3.1.20241024121129";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "common-workflow-language";
     repo = "cwltool";
     rev = "refs/tags/${version}";
-    hash = "sha256-Umxh8sRBy7fC6+GrcN1q4iO0KVpmUhGPtnqZZK/6c9M=";
+    hash = "sha256-MocgfELgis9b+byeDU7mDQcXnLhaWBtvGbqm7MtRdf8=";
   };
 
   postPatch = ''
     substituteInPlace setup.py \
-      --replace "ruamel.yaml >= 0.16, < 0.19" "ruamel.yaml" \
+      --replace-fail "ruamel.yaml >= 0.16, < 0.19" "ruamel.yaml" \
-      --replace "prov == 1.5.1" "prov" \
+      --replace-fail "prov == 1.5.1" "prov" \
-      --replace '"schema-salad >= 8.4.20230426093816, < 9",' "" \
+      --replace-fail '"schema-salad >= 8.7, < 9",' '"schema-salad",' \
-      --replace "PYTEST_RUNNER + " ""
+      --replace-fail "PYTEST_RUNNER + " ""
     substituteInPlace pyproject.toml \
-      --replace "ruamel.yaml>=0.16.0,<0.18" "ruamel.yaml" \
+      --replace-fail "ruamel.yaml>=0.16.0,<0.18" "ruamel.yaml" \
-      --replace "mypy==1.10.0" "mypy==1.10.*"
+      --replace-fail "mypy==1.13.0" "mypy"
   '';
 
-  nativeBuildInputs = [
+  nativeBuildInputs =
-    git
+    [
-  ] ++ (with python3.pkgs; [
+      git
-    setuptools
+    ]
-    setuptools-scm
+    ++ (with python3.pkgs; [
-  ]);
+      setuptools
+      setuptools-scm
+    ]);
 
-  propagatedBuildInputs = with python3.pkgs; [
+  dependencies = with python3.pkgs; [
     argcomplete
     bagit
     coloredlogs
@@ -84,10 +87,10 @@ python3.pkgs.buildPythonApplication rec {
 
   meta = with lib; {
     description = "Common Workflow Language reference implementation";
-    mainProgram = "cwltool";
     homepage = "https://www.commonwl.org";
     changelog = "https://github.com/common-workflow-language/cwltool/releases/tag/${version}";
     license = with licenses; [ asl20 ];
     maintainers = with maintainers; [ veprbl ];
+    mainProgram = "cwltool";
   };
 }

pkgs/applications/version-management/git-credential-oauth/default.nix

@@ -2,13 +2,13 @@
 
 buildGoModule rec {
   pname = "git-credential-oauth";
-  version = "0.13.2";
+  version = "0.13.3";
 
   src = fetchFromGitHub {
     owner = "hickford";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-pJ1Snq79bQvhE+D7U8pMmK4YyvoZIwv29kr5640jpns=";
+    hash = "sha256-vs+PRFyvzn25nM6oO4VybXkTr1frmSspA2isSXLJFQo=";
   };
 
   nativeBuildInputs = [ installShellFiles ];
@@ -19,7 +19,7 @@ buildGoModule rec {
     "-X main.version=${version}"
   ];
 
-  vendorHash = "sha256-ujsfEmDOOGCNErtBW5EyefQ+jXhfnAiwteYm8F7RLVE=";
+  vendorHash = "sha256-muK8UZW+8bhC6K0FvN6B7evTMeZnMeYlrIMJdJprPLM=";
 
   postInstall = ''
     installManPage $src/git-credential-oauth.1

pkgs/applications/virtualization/singularity/packages.nix

@@ -9,14 +9,14 @@ let
     callPackage
       (import ./generic.nix rec {
         pname = "apptainer";
-        version = "1.3.4";
+        version = "1.3.5";
         projectName = "apptainer";
 
         src = fetchFromGitHub {
           owner = "apptainer";
           repo = "apptainer";
           rev = "refs/tags/v${version}";
-          hash = "sha256-eByF0OpL1OKGq0wY7kw8Sv9sZuVE0K3TGIm4Chk9PC4=";
+          hash = "sha256-yBUCUHc9vgyKFqAOHXQjAYQnmN0yXSIvkpR/s3LNAmk=";
         };
 
         # Update by running

pkgs/applications/virtualization/virtualbox/default.nix

@@ -49,9 +49,6 @@
   yasm,
   glslang,
   nixosTests,
-  # If open-watcom-bin is not passed, VirtualBox will fall back to use
-  # the shipped alternative sources (assembly).
-  open-watcom-bin,
   makeself,
   perl,
   vulkan-loader,
@@ -295,7 +292,6 @@ stdenv.mkDerivation (finalAttrs: {
       ${optionalString (!enableHardening) "--disable-hardening"} \
       ${optionalString (!enable32bitGuests) "--disable-vmmraw"} \
       ${optionalString enableWebService "--enable-webservice"} \
-      ${optionalString (open-watcom-bin != null) "--with-ow-dir=${open-watcom-bin}"} \
       ${optionalString (enableKvm) "--with-kvm"} \
       ${extraConfigureFlags} \
       --disable-kmods

pkgs/by-name/am/amdgpu_top/package.nix

@@ -1,33 +1,35 @@
-{ lib
+{
-, rustPlatform
+  lib,
-, fetchFromGitHub
+  rustPlatform,
-, libdrm
+  fetchFromGitHub,
-, libX11
+  libdrm,
-, libGL
+  libX11,
-, wayland
+  libGL,
-, wayland-protocols
+  wayland,
-, libxkbcommon
+  wayland-protocols,
-, libXrandr
+  libxkbcommon,
-, libXi
+  libXrandr,
-, libXcursor
+  libXi,
+  libXcursor,
+  nix-update-script,
 }:
 
 rustPlatform.buildRustPackage rec {
   pname = "amdgpu_top";
-  version = "0.8.5";
+  version = "0.9.2";
 
   src = fetchFromGitHub {
     owner = "Umio-Yasuno";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-n1nOlFXI8UCJxEgbuSbmMUhkZaLS3D4jGQdKH82WGc8=";
+    hash = "sha256-eXUeXBFW2ejkOeMUujMwY0gidzdaX9yWWOfx1ZwA3lk=";
   };
 
   cargoLock = {
-    outputHashes = {
-      "libdrm_amdgpu_sys-0.7.3" = "sha256-4bwbwVoNV2yroh6OLNxBq8gKaFJtoin/b9xaRdh9QOk=";
-    };
     lockFile = ./Cargo.lock;
+    outputHashes = {
+      "libdrm_amdgpu_sys-0.7.5" = "sha256-IkA1kJggkaSWzdDBHpNjU8WZr6wpSQWohERiHWQS2UY=";
+    };
   };
 
   buildInputs = [
@@ -50,13 +52,15 @@ rustPlatform.buildRustPackage rec {
     patchelf --set-rpath "${lib.makeLibraryPath buildInputs}" $out/bin/${pname}
   '';
 
-  meta = with lib; {
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
     description = "Tool to display AMDGPU usage";
     homepage = "https://github.com/Umio-Yasuno/amdgpu_top";
     changelog = "https://github.com/Umio-Yasuno/amdgpu_top/releases";
-    license = licenses.mit;
+    license = lib.licenses.mit;
-    maintainers = with maintainers; [ geri1701 ];
+    maintainers = with lib.maintainers; [ geri1701 ];
-    platforms = platforms.linux;
+    platforms = lib.platforms.linux;
     mainProgram = "amdgpu_top";
   };
 }

pkgs/by-name/bu/bunbun/package.nix

@@ -4,24 +4,22 @@
   fetchFromGitHub,
   stdenv,
   darwin,
+  versionCheckHook,
   nix-update-script,
-  testers,
-  bunbun,
 }:
 
 rustPlatform.buildRustPackage rec {
   pname = "bunbun";
-  version = "1.4.0";
+  version = "1.5.0";
 
   src = fetchFromGitHub {
     owner = "devraza";
     repo = "bunbun";
-    # TODO: remove '-bump' at next release
+    rev = "refs/tags/v${version}";
-    rev = "refs/tags/v${version}-bump";
+    hash = "sha256-3f/G0Vx1uXeH3QMDVUAHWi4Pf/B88/4F+4XywVsp3/4=";
-    hash = "sha256-r4xBUfNY+Q3uAC919ZQbIDgiF981FVqZCOT8XNojZP4=";
   };
 
-  cargoHash = "sha256-CcGfaSyCMv0Wm4QsYASBwEnpX8fKbLHRqyEcUmj2w2o=";
+  cargoHash = "sha256-UEUK8GBkyzUv2J6uTjRdyoIiHVKLDYYj1aOnl+rgzmk=";
 
   buildInputs = lib.optionals stdenv.hostPlatform.isDarwin (
     with darwin.apple_sdk.frameworks;
@@ -32,9 +30,14 @@ rustPlatform.buildRustPackage rec {
     ]
   );
 
+  nativeInstallCheckInputs = [
+    versionCheckHook
+  ];
+  versionCheckProgramArg = [ "--version" ];
+  doInstallCheck = true;
+
   passthru = {
     updateScript = nix-update-script { };
-    tests.version = testers.testVersion { package = bunbun; };
   };
 
   meta = {

pkgs/by-name/ds/dsda-doom/package.nix

@@ -14,17 +14,18 @@
   libGLU,
   libzip,
   alsa-lib,
+  nix-update-script,
 }:
 
 stdenv.mkDerivation rec {
   pname = "dsda-doom";
-  version = "0.28.1";
+  version = "0.28.2";
 
   src = fetchFromGitHub {
     owner = "kraflab";
     repo = "dsda-doom";
     rev = "v${version}";
-    hash = "sha256-X2v9eKiIYX4Zi3C1hbUoW4mceRVa6sxpBsP4Npyo4hM=";
+    hash = "sha256-TuDiClIq8GLY/3qGildlPpwUUHmpFNATRz5CNTLpfeM=";
   };
 
   sourceRoot = "${src.name}/prboom2";
@@ -45,8 +46,11 @@ stdenv.mkDerivation rec {
     SDL2_mixer
   ];
 
+  passthru.updateScript = nix-update-script { };
+
   meta = {
     homepage = "https://github.com/kraflab/dsda-doom";
+    changelog = "https://github.com/kraflab/dsda-doom/releases/tag/v${version}";
     description = "Advanced Doom source port with a focus on speedrunning, successor of PrBoom+";
     mainProgram = "dsda-doom";
     license = lib.licenses.gpl2Plus;

pkgs/by-name/gr/gruvbox-gtk-theme/package.nix

@@ -68,13 +68,13 @@ lib.checkListOfEnum "${pname}: colorVariants" colorVariantList colorVariants lib
   stdenvNoCC.mkDerivation
   {
     inherit pname;
-    version = "0-unstable-2024-09-12";
+    version = "0-unstable-2024-10-29";
 
     src = fetchFromGitHub {
       owner = "Fausto-Korpsvart";
       repo = "Gruvbox-GTK-Theme";
-      rev = "48faf6afee9eea5f3b8c277c936bcb9f76bd95f7";
+      rev = "eed38589ce90aaca4c278e13087c2babaccea4da";
-      hash = "sha256-LAMVTDVCxjk+reS/StsVdTlsx0DrCxNLClWk6za5D5o=";
+      hash = "sha256-FXzD7wHqh9pZgjGXFYko43yaFCn+Y317N8xRsgt6RhE=";
     };
 
     propagatedUserEnvPkgs = [ gtk-engine-murrine ];

pkgs/by-name/ma/matrix-gtk-theme/package.nix

@@ -70,13 +70,13 @@ lib.checkListOfEnum "${pname}: colorVariants" colorVariantList colorVariants lib
   stdenvNoCC.mkDerivation
   {
     inherit pname;
-    version = "0-unstable-2024-07-22";
+    version = "0-unstable-2024-10-29";
 
     src = fetchFromGitHub {
       owner = "D3vil0p3r";
       repo = "Matrix-GTK-Theme";
-      rev = "f453093dffa0f46596b325c6a760afd6ea6cd810";
+      rev = "15a799b6e2bd7f3ad89eaffa7d26beebf09b9e68";
-      hash = "sha256-DfM4nsJZvcNyUUn0opu3OM46sxhsjeeyuUuliQPrU0I=";
+      hash = "sha256-gyKHOS3hEppOvc10u8T5wGWlVrFSC29MofMHjEcf8i4=";
     };
 
     propagatedUserEnvPkgs = [ gtk-engine-murrine ];

pkgs/by-name/ni/nightfox-gtk-theme/package.nix

@@ -70,13 +70,13 @@ lib.checkListOfEnum "${pname}: colorVariants" colorVariantList colorVariants lib
   stdenvNoCC.mkDerivation
   {
     inherit pname;
-    version = "0-unstable-2024-09-12";
+    version = "0-unstable-2024-10-29";
 
     src = fetchFromGitHub {
       owner = "Fausto-Korpsvart";
       repo = "Nightfox-GTK-Theme";
-      rev = "c1f8a03a50cef5a4479ecdb2e7887ab4181404f2";
+      rev = "14decf0378650b7a960f4761fd6178cda0d07aac";
-      hash = "sha256-2froJpEzniF0q7Tc6ruSFQ8I52FCKW6qkHaWWY0kq80=";
+      hash = "sha256-TWJyj5MlQtNqCuh1GD1LoXEQ4wcobhyKPQXZ31ALcMM=";
     };
 
     propagatedUserEnvPkgs = [ gtk-engine-murrine ];

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

@@ -1,30 +1,43 @@
-{ lib
+{
-, buildGoModule
+  lib,
-, fetchFromGitHub
+  buildGoModule,
+  fetchFromGitHub,
 }:
 
 buildGoModule rec {
   pname = "nilaway";
-  version = "0-unstable-2024-06-29";
+  version = "0-unstable-2024-10-10";
 
   src = fetchFromGitHub {
     owner = "uber-go";
     repo = "nilaway";
-    rev = "e90288479601315af13b7fdd3ccd6b50c53a8e7c";
+    rev = "ba14292918d814eeaea4de62da2ad0daae92f8b0";
-    hash = "sha256-6bArrCcAZc8DWJlDxKKmlHAbcEuU68HgqJTK9s7ZGig=";
+    hash = "sha256-HAfuhGxmnMJvkz2vxBZ5kWsgSIw5KKlZp36HCLfCRxo=";
   };
 
-  vendorHash = "sha256-rLyU2HdlkDFh+MBIVnbEIIlVR7/mq9heZWzN7GRw0Dc=";
+  vendorHash = "sha256-5qaEvQoK5S0svqzFAbJb8wy8yApyRpz4QE8sOhcjdaA=";
 
+  subPackages = [ "cmd/nilaway" ];
   excludedPackages = [ "tools" ];
 
-  ldflags = [ "-s" "-w" ];
+  ldflags = [
+    "-s"
+    "-w"
+  ];
+
+  preCheck = ''
+    # test all paths
+    unset subPackages
+  '';
 
   meta = with lib; {
     description = "Static Analysis tool to detect potential Nil panics in Go code";
     homepage = "https://github.com/uber-go/nilaway";
     license = licenses.asl20;
-    maintainers = with maintainers; [ prit342 jk ];
+    maintainers = with maintainers; [
+      prit342
+      jk
+    ];
     mainProgram = "nilaway";
   };
 }

pkgs/by-name/om/omnisharp-roslyn/package.nix

@@ -0,0 +1,125 @@
+{
+  buildDotnetModule,
+  dotnetCorePackages,
+  fetchFromGitHub,
+  lib,
+  stdenv,
+  runCommand,
+  expect,
+}:
+
+let
+  inherit (dotnetCorePackages) sdk_8_0 runtime_6_0;
+in
+let
+  finalPackage = buildDotnetModule rec {
+    pname = "omnisharp-roslyn";
+    version = "1.39.12";
+
+    src = fetchFromGitHub {
+      owner = "OmniSharp";
+      repo = "omnisharp-roslyn";
+      rev = "refs/tags/v${version}";
+      hash = "sha256-WQIBNqUqvVA0UhSoPdf179X+GYKp4LhPvYeEAet6TnY=";
+    };
+
+    projectFile = "src/OmniSharp.Stdio.Driver/OmniSharp.Stdio.Driver.csproj";
+    nugetDeps = ./deps.nix;
+
+    dotnet-sdk =
+      with dotnetCorePackages;
+      combinePackages [
+        sdk_6_0
+        sdk_8_0
+      ];
+    dotnet-runtime = sdk_8_0;
+
+    dotnetInstallFlags = [ "--framework net6.0" ];
+    dotnetBuildFlags = [
+      "--framework net6.0"
+      "--no-self-contained"
+    ];
+    dotnetFlags = [
+      # These flags are set by the cake build.
+      "-property:PackageVersion=${version}"
+      "-property:AssemblyVersion=${version}.0"
+      "-property:FileVersion=${version}.0"
+      "-property:InformationalVersion=${version}"
+      "-property:RuntimeFrameworkVersion=${runtime_6_0.version}"
+      "-property:RollForward=LatestMajor"
+    ];
+
+    postPatch = ''
+      # Relax the version requirement
+      rm global.json
+
+      # Patch the project files so we can compile them properly
+      for project in src/OmniSharp.Http.Driver/OmniSharp.Http.Driver.csproj src/OmniSharp.LanguageServerProtocol/OmniSharp.LanguageServerProtocol.csproj src/OmniSharp.Stdio.Driver/OmniSharp.Stdio.Driver.csproj; do
+        substituteInPlace $project \
+          --replace '<RuntimeIdentifiers>win7-x64;win7-x86;win10-arm64</RuntimeIdentifiers>' '<RuntimeIdentifiers>linux-x64;linux-arm64;osx-x64;osx-arm64</RuntimeIdentifiers>'
+      done
+    '';
+
+    useDotnetFromEnv = true;
+    executables = [ "OmniSharp" ];
+
+    passthru.tests =
+      let
+        with-sdk =
+          sdk:
+          runCommand "with-${if sdk ? version then sdk.version else "no"}-sdk"
+            {
+              nativeBuildInputs = [
+                finalPackage
+                sdk
+                expect
+              ];
+              meta.timeout = 60;
+            }
+            ''
+              HOME=$TMPDIR
+              expect <<"EOF"
+                spawn OmniSharp
+                expect_before timeout {
+                  send_error "timeout!\n"
+                  exit 1
+                }
+                expect ".NET Core SDK ${if sdk ? version then sdk.version else sdk_8_0.version}"
+                expect "{\"Event\":\"started\","
+                send \x03
+                expect eof
+                catch wait result
+                exit [lindex $result 3]
+              EOF
+              touch $out
+            '';
+      in
+      {
+        # Make sure we can run OmniSharp with any supported SDK version, as well as without
+        with-net6-sdk = with-sdk dotnetCorePackages.sdk_6_0;
+        with-net8-sdk = with-sdk dotnetCorePackages.sdk_8_0;
+        no-sdk = with-sdk null;
+      };
+
+    passthru.updateScript = ./update.sh;
+
+    meta = {
+      description = "OmniSharp based on roslyn workspaces";
+      homepage = "https://github.com/OmniSharp/omnisharp-roslyn";
+      sourceProvenance = with lib.sourceTypes; [
+        fromSource
+        binaryNativeCode # dependencies
+      ];
+      license = lib.licenses.mit;
+      maintainers = with lib.maintainers; [
+        corngood
+        ericdallo
+        gepbird
+        mdarocha
+        tesq0
+      ];
+      mainProgram = "OmniSharp";
+    };
+  };
+in
+finalPackage

pkgs/by-name/om/omnisharp-roslyn/update.sh

@@ -6,8 +6,8 @@ set -euo pipefail
 
 cd "$(dirname "${BASH_SOURCE[0]}")"
 
-new_version="$(curl -s "https://api.github.com/repos/OmniSharp/omnisharp-roslyn/releases?per_page=1" | jq -r '.[0].name')"
+new_version="$(curl -s "https://api.github.com/repos/OmniSharp/omnisharp-roslyn/releases/latest" | jq -r '.name')"
-old_version="$(sed -nE 's/\s*version = "(.*)".*/\1/p' ./default.nix)"
+old_version="$(sed -nE 's/\s*version = "(.*)".*/\1/p' ./package.nix)"
 
 if [[ "$new_version" == "$old_version" ]]; then
   echo "Already up to date!"

pkgs/by-name/py/pylyzer/Cargo.lock

@@ -99,9 +99,9 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
 
 [[package]]
 name = "cc"
-version = "1.1.30"
+version = "1.1.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b16803a61b81d9eabb7eae2588776c4c1e584b738ede45fdbb4c972cec1e9945"
+checksum = "c2e7962b54006dcfcc61cb72735f4d89bb97061dd6a7ed882ec6b8ee53714c6f"
 dependencies = [
  "shlex",
 ]
@@ -134,7 +134,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "rustc_version",
- "syn 2.0.79",
+ "syn 2.0.81",
 ]
 
 [[package]]
@@ -145,9 +145,9 @@ checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0"
 
 [[package]]
 name = "els"
-version = "0.1.59-nightly.2"
+version = "0.1.59-nightly.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a2f90c210a0919808e48b96ecffd370ac788386ab061203132872e9bf1ad9f7f"
+checksum = "4b4e110537afd761192ab9cbea35f98d2e1421c1d98520a7c7114d30805ebe8d"
 dependencies = [
  "erg_common",
  "erg_compiler",
@@ -161,9 +161,9 @@ dependencies = [
 
 [[package]]
 name = "erg_common"
-version = "0.6.47-nightly.2"
+version = "0.6.47-nightly.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d41f171eb77bf2763b119893966358ad9da72a3edd43cf278a78cf1c16daa2cf"
+checksum = "c17933aa843a988726e412295f030a501e1bf4c5c8ed1fa4bb5013a37bce9d8a"
 dependencies = [
  "backtrace-on-stack-overflow",
  "erg_proc_macros",
@@ -174,9 +174,9 @@ dependencies = [
 
 [[package]]
 name = "erg_compiler"
-version = "0.6.47-nightly.2"
+version = "0.6.47-nightly.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "93d0486bc668c120faf7af954dd4046224185c28821fb945a97eedcadf3e7d58"
+checksum = "d3a10f7dd0644d0378bf1ba45cd923d774552757ac6f19d5f9dee090f0ac668b"
 dependencies = [
  "erg_common",
  "erg_parser",
@@ -184,9 +184,9 @@ dependencies = [
 
 [[package]]
 name = "erg_parser"
-version = "0.6.47-nightly.2"
+version = "0.6.47-nightly.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "98c37f58f3aef2e765610e7281ada15dbba707beaa0262a71e7f6958ee058ed0"
+checksum = "8ca055f88af21585c301b93874cff818477c26e0343cb1dfe3b4c69c928bfe31"
 dependencies = [
  "erg_common",
  "erg_proc_macros",
@@ -195,9 +195,9 @@ dependencies = [
 
 [[package]]
 name = "erg_proc_macros"
-version = "0.6.47-nightly.2"
+version = "0.6.47-nightly.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "97fa545f626fd04abea193a07c364c4fca3903c228bbe9cca4895500944b5aaf"
+checksum = "8560abd2df3c3db6183e7495384f0c1d04d42e779bc0e1402589ab488ab0aaec"
 dependencies = [
  "quote",
  "syn 1.0.109",
@@ -266,7 +266,7 @@ dependencies = [
  "Inflector",
  "proc-macro2",
  "quote",
- "syn 2.0.79",
+ "syn 2.0.81",
 ]
 
 [[package]]
@@ -563,7 +563,7 @@ dependencies = [
 
 [[package]]
 name = "py2erg"
-version = "0.0.67"
+version = "0.0.68"
 dependencies = [
  "erg_common",
  "erg_compiler",
@@ -573,7 +573,7 @@ dependencies = [
 
 [[package]]
 name = "pylyzer"
-version = "0.0.67"
+version = "0.0.68"
 dependencies = [
  "els",
  "erg_common",
@@ -583,7 +583,7 @@ dependencies = [
 
 [[package]]
 name = "pylyzer_core"
-version = "0.0.67"
+version = "0.0.68"
 dependencies = [
  "erg_common",
  "erg_compiler",
@@ -594,7 +594,7 @@ dependencies = [
 
 [[package]]
 name = "pylyzer_wasm"
-version = "0.0.67"
+version = "0.0.68"
 dependencies = [
  "erg_common",
  "erg_compiler",
@@ -759,14 +759,14 @@ checksum = "243902eda00fad750862fc144cea25caca5e20d615af0a81bee94ca738f1df1f"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.79",
+ "syn 2.0.81",
 ]
 
 [[package]]
 name = "serde_json"
-version = "1.0.131"
+version = "1.0.132"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "67d42a0bd4ac281beff598909bb56a86acaf979b84483e1c79c10dcaf98f8cf3"
+checksum = "d726bfaff4b320266d395898905d0eba0345aae23b54aee3a737e260fd46db03"
 dependencies = [
  "itoa",
  "memchr",
@@ -782,7 +782,7 @@ checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.79",
+ "syn 2.0.81",
 ]
 
 [[package]]
@@ -822,9 +822,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.79"
+version = "2.0.81"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "89132cd0bf050864e1d38dc3bbc07a0eb8e7530af26344d3d2bbbef83499f590"
+checksum = "198514704ca887dd5a1e408c6c6cdcba43672f9b4062e1b24aa34e74e6d7faae"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1027,7 +1027,7 @@ dependencies = [
  "once_cell",
  "proc-macro2",
  "quote",
- "syn 2.0.79",
+ "syn 2.0.81",
  "wasm-bindgen-shared",
 ]
 
@@ -1049,7 +1049,7 @@ checksum = "26c6ab57572f7a24a4985830b120de1594465e5d500f24afe89e16b4e833ef68"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.79",
+ "syn 2.0.81",
  "wasm-bindgen-backend",
  "wasm-bindgen-shared",
 ]
@@ -1091,7 +1091,7 @@ checksum = "2bbd5b46c938e506ecbce286b6628a02171d56153ba733b6c741fc627ec9579b"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.79",
+ "syn 2.0.81",
 ]
 
 [[package]]
@@ -1102,7 +1102,7 @@ checksum = "053c4c462dc91d3b1504c6fe5a726dd15e216ba718e84a0e46a88fbe5ded3515"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.79",
+ "syn 2.0.81",
 ]
 
 [[package]]
@@ -1206,5 +1206,5 @@ checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.79",
+ "syn 2.0.81",
 ]

pkgs/by-name/py/pylyzer/package.nix

@@ -15,13 +15,13 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "pylyzer";
-  version = "0.0.67";
+  version = "0.0.68";
 
   src = fetchFromGitHub {
     owner = "mtshiba";
     repo = "pylyzer";
     rev = "refs/tags/v${version}";
-    hash = "sha256-UMNyztdcFr88wOpRMBtLigGJcxR+0uScN+8i0+WfeYU=";
+    hash = "sha256-xeQDyj18L9jCftne9S79kWjrW0K7Nkx86Cy2aFqePfA=";
   };
 
   cargoLock = {

pkgs/by-name/sh/shaka-packager/0001-Allow-external-declaration-of-packager-version.patch

@@ -1,12 +1,3 @@
-From e243cc17f48c5e1b8db29cab85ca98b033d972fb Mon Sep 17 00:00:00 2001
-From: Niklas Korz <niklas@niklaskorz.de>
-Date: Wed, 4 Sep 2024 14:51:30 +0200
-Subject: [PATCH 1/3] Allow external declaration of packager version
-
----
- packager/version/CMakeLists.txt | 2 ++
- 1 file changed, 2 insertions(+)
-
 diff --git a/packager/version/CMakeLists.txt b/packager/version/CMakeLists.txt
 index fba4fb8282..ad56e0a23b 100644
 --- a/packager/version/CMakeLists.txt
@@ -27,6 +18,4 @@ index fba4fb8282..ad56e0a23b 100644
  
  add_library(version STATIC version.cc)
  target_compile_definitions(version PRIVATE
--- 
-2.46.0
 

pkgs/by-name/sh/shaka-packager/0002-Unvendor-dependencies.patch

@@ -1,13 +1,3 @@
-From 4c7743f4fd231648d7bd1513c9db71a651ef7553 Mon Sep 17 00:00:00 2001
-From: Niklas Korz <niklas@niklaskorz.de>
-Date: Wed, 4 Sep 2024 14:52:23 +0200
-Subject: [PATCH 2/3] Unvendor dependencies
-
----
- CMakeLists.txt          | 24 ++++++++++++++++++++++++
- packager/CMakeLists.txt |  1 -
- 2 files changed, 24 insertions(+), 1 deletion(-)
-
 diff --git a/CMakeLists.txt b/CMakeLists.txt
 index 5b96a2429e..181df0bf2d 100644
 --- a/CMakeLists.txt
@@ -62,6 +52,27 @@ index 7238d243bb..722217bbc4 100644
  add_subdirectory(tools)
  add_subdirectory(utils)
  add_subdirectory(version)
--- 
+diff --git a/packager/tools/pssh/CMakeLists.txt b/packager/tools/pssh/CMakeLists.txt
-2.46.0
+index 9ec3a39d26..0b981cec29 100644
+--- a/packager/tools/pssh/CMakeLists.txt
++++ b/packager/tools/pssh/CMakeLists.txt
+@@ -14,7 +14,6 @@ set(PSSH_BOX_OUTPUTS
+ 
+ add_custom_command(
+     DEPENDS
+-        protobuf_py
+         widevine_protos
+         pssh-box.py
+     OUTPUT ${PSSH_BOX_OUTPUTS}
+@@ -26,10 +25,6 @@ add_custom_command(
+         ${CMAKE_BINARY_DIR}/packager/media/base/widevine_common_encryption_pb2.py
+         ${CMAKE_BINARY_DIR}/packager/media/base/widevine_pssh_data_pb2.py
+         ${CMAKE_BINARY_DIR}/packager/pssh-box-protos/
+-    COMMAND
+-        ${CMAKE_COMMAND} -E copy_directory
+-        ${CMAKE_BINARY_DIR}/packager/third_party/protobuf/py/google
+-        ${CMAKE_BINARY_DIR}/packager/pssh-box-protos/google
+     COMMAND
+         ${CMAKE_COMMAND} -E copy
+         ${CMAKE_CURRENT_SOURCE_DIR}/pssh-box.py
 

pkgs/by-name/sh/shaka-packager/0003-Fix-curl-deprecations.patch

@@ -1,25 +0,0 @@
-From c8b0b467a140d8a67157f5cee26a8510444706be Mon Sep 17 00:00:00 2001
-From: Niklas Korz <niklas@niklaskorz.de>
-Date: Wed, 4 Sep 2024 14:52:47 +0200
-Subject: [PATCH 3/3] Fix curl deprecations
-
----
- packager/file/http_file.cc | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/packager/file/http_file.cc b/packager/file/http_file.cc
-index b50fef6f07..dca43e26ca 100644
---- a/packager/file/http_file.cc
-+++ b/packager/file/http_file.cc
-@@ -311,7 +311,7 @@ void HttpFile::SetupRequest() {
-       curl_easy_setopt(curl, CURLOPT_POST, 1L);
-       break;
-     case HttpMethod::kPut:
--      curl_easy_setopt(curl, CURLOPT_PUT, 1L);
-+      curl_easy_setopt(curl, CURLOPT_UPLOAD, 1L);
-       break;
-   }
- 
--- 
-2.46.0
-

pkgs/by-name/sh/shaka-packager/package.nix

@@ -22,13 +22,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "shaka-packager";
-  version = "3.2.0";
+  version = "3.3.0";
 
   src = fetchFromGitHub {
     owner = "shaka-project";
     repo = "shaka-packager";
     rev = "refs/tags/v${finalAttrs.version}";
-    hash = "sha256-L10IMsc4dTMa5zwYq612F4J+uKOmEEChY8k/m09wuNE=";
+    hash = "sha256-5TDfIbguBipYciXusn0rDS0ZQl0+fDFfHYbrnYjxSdE=";
   };
 
   patches = [
@@ -46,10 +46,6 @@ stdenv.mkDerivation (finalAttrs: {
     # The last step is necessary to keep the patch size to a minimum, otherwise we'd have
     # to add the namespace identifiers everywhere a dependency is used.
     ./0002-Unvendor-dependencies.patch
-    # As nixpkgs ships with a newer version of libcurl than the one vendored in shaka-packager,
-    # we have to fix one deprecation.
-    # See https://curl.se/libcurl/c/CURLOPT_PUT.html for further information.
-    ./0003-Fix-curl-deprecations.patch
   ];
 
   nativeBuildInputs = [
@@ -58,7 +54,12 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   buildInputs = [
-    python3
+    (python3.withPackages (ps: [
+      # As we remove the vendored protobuf in our patch,
+      # we must re-add it to the python package used for
+      # pssh_box.py.
+      ps.protobuf
+    ]))
     abseil-cpp
     curl
     gtest
@@ -95,13 +96,13 @@ stdenv.mkDerivation (finalAttrs: {
     };
   };
 
-  meta = with lib; {
+  meta = {
     description = "Media packaging framework for VOD and Live DASH and HLS applications";
     homepage = "https://shaka-project.github.io/shaka-packager/html/";
     changelog = "https://github.com/shaka-project/shaka-packager/releases/tag/v${finalAttrs.version}";
-    license = licenses.bsd3;
+    license = lib.licenses.bsd3;
     mainProgram = "packager";
-    maintainers = with maintainers; [ niklaskorz ];
+    maintainers = with lib.maintainers; [ niklaskorz ];
-    platforms = platforms.all;
+    platforms = lib.platforms.all;
   };
 })

pkgs/by-name/sw/swig3/package.nix

@@ -0,0 +1,56 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  autoconf,
+  automake,
+  libtool,
+  bison,
+  pcre,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "swig";
+  version = "3.0.12";
+
+  src = fetchFromGitHub {
+    owner = "swig";
+    repo = "swig";
+    rev = "rel-${finalAttrs.version}";
+    sha256 = "1wyffskbkzj5zyhjnnpip80xzsjcr3p0q5486z3wdwabnysnhn8n";
+  };
+
+  # Not using autoreconfHook because it fails due to missing macros, contrary
+  # to this script
+  preConfigure = ''
+    ./autogen.sh
+  '';
+
+  nativeBuildInputs = [
+    autoconf
+    automake
+    libtool
+    bison
+  ];
+  buildInputs = [
+    pcre
+  ];
+
+  configureFlags = [
+    "--without-tcl"
+  ];
+
+  # Disable ccache documentation as it needs yodl
+  postPatch = ''
+    sed -i '/man1/d' CCache/Makefile.in
+  '';
+
+  meta = {
+    description = "Interface compiler that connects C/C++ code to higher-level languages";
+    homepage = "https://swig.org/";
+    # Different types of licenses available: http://www.swig.org/Release/LICENSE .
+    license = lib.licenses.gpl3Plus;
+    platforms = lib.platforms.unix;
+    maintainers = with lib.maintainers; [ doronbehar ];
+  };
+})

pkgs/by-name/ta/tailscale/package.nix

@@ -15,7 +15,7 @@
 }:
 
 let
-  version = "1.76.1";
+  version = "1.76.3";
 in
 buildGo123Module {
   pname = "tailscale";
@@ -27,7 +27,7 @@ buildGo123Module {
     owner = "tailscale";
     repo = "tailscale";
     rev = "v${version}";
-    hash = "sha256-tuD7GlBZdXPORZkBISp9QDj592a1OX3T+EVysuG+xWw=";
+    hash = "sha256-bSMtBIIpLVbADjHBojeO7VM/Ny+aWM1bz29ZuhOvjRY=";
   };
 
   patches = [

pkgs/by-name/to/tokyonight-gtk-theme/package.nix

@@ -71,13 +71,13 @@ lib.checkListOfEnum "${pname}: colorVariants" colorVariantList colorVariants lib
   stdenvNoCC.mkDerivation
   {
     inherit pname;
-    version = "0-unstable-2024-07-22";
+    version = "0-unstable-2024-10-29";
 
     src = fetchFromGitHub {
       owner = "Fausto-Korpsvart";
       repo = "Tokyonight-GTK-Theme";
-      rev = "a9a25010e9fbfca783c3c27258dbad76a9cc7842";
+      rev = "6c8f79f841550a463039e313535c6bc0d55dbde8";
-      hash = "sha256-HbrDDiMej4DjvskGItele/iCUY1NzlWlu3ZneA76feM=";
+      hash = "sha256-KVUcMffz/ZdCg5ivXC82WczodkckLH3XX73qm418pcE=";
     };
 
     propagatedUserEnvPkgs = [ gtk-engine-murrine ];

pkgs/by-name/ve/versatiles/package.nix

@@ -6,16 +6,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "versatiles";
-  version = "0.12.10"; # When updating: Replace with current version
+  version = "0.13.0"; # When updating: Replace with current version
 
   src = fetchFromGitHub {
     owner = "versatiles-org";
     repo = "versatiles-rs";
     rev = "refs/tags/v${version}"; # When updating: Replace with long commit hash of new version
-    hash = "sha256-LKUpxsAy39dX8hESlUEVs4rkOpYsd7kbATfnU1QYd9Q="; # When updating: Use `lib.fakeHash` for recomputing the hash once. Run: 'nix-build -A versatiles'. Swap with new hash and proceed.
+    hash = "sha256-6HuBKRvt6P4GpFaIiYsGO/8wcjML2UDdUFoYvIM/Z0k="; # When updating: Use `lib.fakeHash` for recomputing the hash once. Run: 'nix-build -A versatiles'. Swap with new hash and proceed.
   };
 
-  cargoHash = "sha256-dkFnoQY1+VNNrjS+o5Y0cvhWKoHt38KJKyNhCQ0dGaY="; # When updating: Same as above
+  cargoHash = "sha256-7kJf6BHNRfLDFRZp8Q2M2ZGXH0NzG/QBqw5/s20AIm4="; # When updating: Same as above
 
   # Testing only necessary for the `bins` and `lib` features
   cargoTestFlags = [

pkgs/by-name/vi/viddy/package.nix

@@ -6,21 +6,21 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "viddy";
-  version = "1.1.5";
+  version = "1.2.0";
 
   src = fetchFromGitHub {
     owner = "sachaos";
     repo = "viddy";
     rev = "v${version}";
-    hash = "sha256-RewzToI7vhaH8r6ZWDLgfSJOOCm26Udkzh9+xkJP2jE=";
+    hash = "sha256-r+zgZutBwNRLYNltdSaIB5lS4qHAhI5XL3iFF+FVd64=";
   };
 
-  cargoHash = "sha256-NhgiaUEUTfsbVqFkBgLPc3A8XmtwgQ5tp673zFD4TGI=";
+  cargoHash = "sha256-rEz3GFfqtSzZa0r4Nwbu3gEf7GhsOkfawaFaNplD/tE=";
 
   # requires nightly features
   env.RUSTC_BOOTSTRAP = 1;
 
-  env.VERGEN_BUILD_DATE = "2024-09-30"; # managed via the update script
+  env.VERGEN_BUILD_DATE = "2024-10-13"; # managed via the update script
   env.VERGEN_GIT_DESCRIBE = "Nixpkgs";
 
   passthru.updateScript.command = [ ./update.sh ];

pkgs/by-name/vi/viddy/update.sh

@@ -35,10 +35,10 @@ update-source-version viddy "${latestVersion}"
 
 pushd "$SCRIPT_DIR"
 # Build date
-sed -i 's#env.VERGEN_BUILD_DATE = "[^"]*"#env.VERGEN_BUILD_DATE = "'"${latestBuildDate}"'"#' default.nix
+sed -i 's#env.VERGEN_BUILD_DATE = "[^"]*"#env.VERGEN_BUILD_DATE = "'"${latestBuildDate}"'"#' package.nix
 
 # Hashes
 # https://github.com/msteen/nix-prefetch/issues/51
 cargoHash=$(nix-prefetch --option extra-experimental-features flakes "{ sha256 }: (import $NIXPKGS_DIR {}).viddy.cargoDeps.overrideAttrs (_: { outputHash = sha256; })")
-sed -i -E 's#\bcargoHash = ".*?"#cargoHash = "'"$cargoHash"'"#' default.nix
+sed -i -E 's#\bcargoHash = ".*?"#cargoHash = "'"$cargoHash"'"#' package.nix
 popd

pkgs/desktops/xfce/core/xfce4-dev-tools/setup-hook.sh

@@ -1,9 +1,3 @@
-xdtEnvHook() {
-    addToSearchPath ACLOCAL_PATH $1/share/aclocal
-}
-
-envHooks+=(xdtEnvHook)
-
 xdtAutogenPhase() {
     mkdir -p m4
     NOCONFIGURE=1 xdt-autogen

pkgs/development/compilers/open-watcom/bin.nix

@@ -1,4 +1,4 @@
-{ lib, stdenvNoCC, fetchurl, qemu, expect, writeScript, writeScriptBin, ncurses, bash, coreutils }:
+{ lib, stdenvNoCC, fetchurl, qemu, writeScript, writeScriptBin, ncurses, bash, coreutils, unixtools }:
 
 let
 
@@ -48,41 +48,6 @@ let
     exec ${wrapLegacyBinary} "$TARGET-unwrapped" "$TARGET"
   '';
 
-  # Do a scripted installation of OpenWatcom with its original installer.
-  #
-  # If maintaining this expect script turns out to be too much of a
-  # hassle, we can switch to just using `unzip' on the installer and
-  # the correct file permissions manually.
-  performInstall = writeScriptBin "performInstall" ''
-    #!${expect}/bin/expect -f
-
-    spawn [lindex $argv 0]
-
-    # Wait for button saying "I agree" with escape sequences.
-    expect "gree"
-
-    # Navigate to "I Agree!" and hit enter.
-    send "\t\t\n"
-
-    expect "Install Open Watcom"
-
-    # Where do we want to install to.
-    send "$env(out)\n"
-
-    expect "will be installed"
-
-    # Select Full Installation, Next
-    send "fn"
-
-    expect "Setup will now copy"
-
-    # Next
-    send "n"
-
-    expect "completed successfully"
-    send "\n"
-  '';
-
 in
 stdenvNoCC.mkDerivation rec {
   pname = "${passthru.prettyName}-unwrapped";
@@ -93,7 +58,7 @@ stdenvNoCC.mkDerivation rec {
     sha256 = "1wzkvc6ija0cjj5mcyjng5b7hnnc5axidz030c0jh05pgvi4nj7p";
   };
 
-  nativeBuildInputs = [ wrapInPlace performInstall ];
+  nativeBuildInputs = [ wrapInPlace unixtools.script ];
 
   dontUnpack = true;
   dontConfigure = true;
@@ -104,7 +69,9 @@ stdenvNoCC.mkDerivation rec {
   '';
 
   installPhase = ''
-    performInstall ./install-bin-unwrapped
+    # Command line options to do an unattended install are documented in
+    # https://github.com/open-watcom/open-watcom-v2/blob/master/bld/setupgui/setup.txt
+    script -c "./install-bin-unwrapped -dDstDir=$out -dFullInstall=1 -i"
 
     for e in $(find $out/binl -type f -executable); do
       echo "Wrapping $e"

pkgs/development/gnuradio-modules/grnet/default.nix

@@ -8,7 +8,7 @@
 , boost
 , logLib
 , python
-, swig
+, swig3
 , mpir
 , gmp
 , doxygen
@@ -78,7 +78,7 @@ mkDerivation {
     pybind11
     numpy
   ] else [
-    swig
+    swig3
     thrift
     python.pkgs.thrift
   ]);

pkgs/development/gnuradio-modules/gsm/default.nix

@@ -4,7 +4,7 @@
 , cmake
 , pkg-config
 , cppunit
-, swig
+, swig3
 , boost
 , logLib
 , python
@@ -27,7 +27,7 @@ mkDerivation {
   nativeBuildInputs = [
     cmake
     pkg-config
-    swig
+    swig3
     python
   ];
 

pkgs/development/gnuradio-modules/limesdr/default.nix

@@ -5,7 +5,7 @@
 , thrift
 , cmake
 , pkg-config
-, swig
+, swig3
 , python
 , logLib
 , mpir
@@ -38,7 +38,7 @@ in mkDerivation {
   nativeBuildInputs = [
     cmake
     pkg-config
-    swig
+    swig3
     python
   ];
   buildInputs = [

pkgs/development/gnuradio-modules/nacl/default.nix

@@ -4,7 +4,7 @@
 , cmake
 , pkg-config
 , cppunit
-, swig
+, swig3
 , boost
 , logLib
 , python
@@ -26,7 +26,7 @@ mkDerivation {
   nativeBuildInputs = [
     cmake
     pkg-config
-    swig
+    swig3
     python
   ];
 

pkgs/development/gnuradio-modules/osmosdr/default.nix

@@ -14,7 +14,7 @@
 , thrift
 , fftwFloat
 , python
-, swig
+, swig3
 , uhd
 , icu
 , airspy
@@ -85,7 +85,7 @@ in mkDerivation {
   nativeBuildInputs = [
     cmake
     pkg-config
-    swig
+    swig3
   ] ++ lib.optionals (gnuradio.hasFeature "python-support") [
       (if (gnuradio.versionAttr.major == "3.7") then
         python.pkgs.cheetah

pkgs/development/gnuradio-modules/rds/default.nix

@@ -4,7 +4,7 @@
 , gnuradio
 , cmake
 , pkg-config
-, swig
+, swig3
 , python
 , logLib
 , mpir
@@ -50,7 +50,7 @@ in mkDerivation {
   nativeBuildInputs = [
     cmake
     pkg-config
-    swig
+    swig3
     python
   ];
 

pkgs/development/libraries/libsidplayfp/default.nix

@@ -1,38 +1,35 @@
-{ stdenv
+{
-, lib
+  stdenv,
-, fetchFromGitHub
+  lib,
-, makeFontsConf
+  fetchFromGitHub,
-, nix-update-script
+  makeFontsConf,
-, testers
+  nix-update-script,
-, autoreconfHook
+  testers,
-, docSupport ? true
+  autoreconfHook,
-, doxygen
+  docSupport ? true,
-, graphviz
+  doxygen,
-, libexsid
+  graphviz,
-, libgcrypt
+  libexsid,
-, perl
+  libgcrypt,
-, pkg-config
+  perl,
-, unittest-cpp
+  pkg-config,
-, xa
+  unittest-cpp,
+  xa,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "libsidplayfp";
-  version = "2.9.0";
+  version = "2.10.1";
 
   src = fetchFromGitHub {
     owner = "libsidplayfp";
     repo = "libsidplayfp";
     rev = "v${finalAttrs.version}";
     fetchSubmodules = true;
-    hash = "sha256-m1bbbtNJvoY6l2+jMbEN/dR9V7LZ4f1lHHGnn0F4bmU=";
+    hash = "sha256-yZ2IiSzl78N/jrhKls/l2klnePJYKU1NCnZcBKUWiuU=";
   };
 
-  outputs = [
+  outputs = [ "out" ] ++ lib.optionals docSupport [ "doc" ];
-    "out"
-  ] ++ lib.optionals docSupport [
-    "doc"
-  ];
 
   postPatch = ''
     patchShebangs .
@@ -40,24 +37,24 @@ stdenv.mkDerivation (finalAttrs: {
 
   strictDeps = true;
 
-  nativeBuildInputs = [
+  nativeBuildInputs =
-    autoreconfHook
+    [
-    perl
+      autoreconfHook
-    pkg-config
+      perl
-    xa
+      pkg-config
-  ] ++ lib.optionals docSupport [
+      xa
-    doxygen
+    ]
-    graphviz
+    ++ lib.optionals docSupport [
-  ];
+      doxygen
+      graphviz
+    ];
 
   buildInputs = [
     libexsid
     libgcrypt
   ];
 
-  checkInputs = [
+  checkInputs = [ unittest-cpp ];
-    unittest-cpp
-  ];
 
   enableParallelBuilding = true;
 
@@ -69,18 +66,16 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   # Make Doxygen happy with the setup, reduce log noise
-  FONTCONFIG_FILE = lib.optionalString docSupport (makeFontsConf { fontDirectories = [ ]; });
+  env.FONTCONFIG_FILE = lib.optionalString docSupport (makeFontsConf {
+    fontDirectories = [ ];
+  });
 
   preBuild = ''
     # Reduce noise from fontconfig during doc building
     export XDG_CACHE_HOME=$TMPDIR
   '';
 
-  buildFlags = [
+  buildFlags = [ "all" ] ++ lib.optionals docSupport [ "doc" ];
-    "all"
-  ] ++ lib.optionals docSupport [
-    "doc"
-  ];
 
   doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform;
 
@@ -94,7 +89,7 @@ stdenv.mkDerivation (finalAttrs: {
     updateScript = nix-update-script { };
   };
 
-  meta = with lib; {
+  meta = {
     description = "Library to play Commodore 64 music derived from libsidplay2";
     longDescription = ''
       libsidplayfp is a C64 music player library which integrates
@@ -103,9 +98,13 @@ stdenv.mkDerivation (finalAttrs: {
       C64 system and the SID chips.
     '';
     homepage = "https://github.com/libsidplayfp/libsidplayfp";
-    license = with licenses; [ gpl2Plus ];
+    changelog = "https://github.com/libsidplayfp/libsidplayfp/releases/tag/v${finalAttrs.version}";
-    maintainers = with maintainers; [ ramkromberg OPNA2608 ];
+    license = with lib.licenses; [ gpl2Plus ];
-    platforms = platforms.all;
+    maintainers = with lib.maintainers; [
+      ramkromberg
+      OPNA2608
+    ];
+    platforms = lib.platforms.all;
     pkgConfigModules = [
       "libsidplayfp"
       "libstilview"

pkgs/development/python-modules/extract-msg/default.nix

@@ -16,7 +16,7 @@
 
 buildPythonPackage rec {
   pname = "extract-msg";
-  version = "0.50.1";
+  version = "0.52.0";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -25,7 +25,7 @@ buildPythonPackage rec {
     owner = "TeamMsgExtractor";
     repo = "msg-extractor";
     rev = "refs/tags/v${version}";
-    hash = "sha256-MWqJYdv+P87n5KtrtSJnyY59uuLtHL9EG8WyYRdfSTw=";
+    hash = "sha256-4jvzZkGa/xI5Sl9TBIm/BD3tGl+MZvwir6m/zrvA4tQ=";
   };
 
   pythonRelaxDeps = [

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

@@ -10,13 +10,14 @@
   pythonOlder,
   setuptools-scm,
   six,
+  setuptools,
   typecode,
 }:
 
 buildPythonPackage rec {
   pname = "extractcode";
   version = "31.0.0";
-  format = "setuptools";
+  pyproject = true;
 
   disabled = pythonOlder "3.6";
 
@@ -33,9 +34,9 @@ buildPythonPackage rec {
 
   dontConfigure = true;
 
-  nativeBuildInputs = [ setuptools-scm ];
+  build-system = [ setuptools-scm ];
 
-  propagatedBuildInputs = [
+  dependencies = [
     typecode
     patch
     extractcode-libarchive
@@ -67,16 +68,18 @@ buildPythonPackage rec {
     "test_patch_info_patch_patches_windows_plugin_explorer_patch"
     # AssertionError: assert [['linux-2.6...._end;', ...]]] == [['linux-2.6...._end;', ...]]]
     "test_patch_info_patch_patches_misc_linux_st710x_patches_motorola_rootdisk_c_patch"
+    # extractcode.libarchive2.ArchiveErrorRetryable: Damaged tar archive
+    "test_extract_python_testtar_tar_archive_with_special_files"
   ];
 
   pythonImportsCheck = [ "extractcode" ];
 
   meta = with lib; {
     description = "Universal archive extractor using z7zip, libarchive, other libraries and the Python standard library";
-    mainProgram = "extractcode";
+    homepage = "https://github.com/aboutcode-org/extractcode";
-    homepage = "https://github.com/nexB/extractcode";
+    changelog = "https://github.com/aboutcode-org/extractcode/releases/tag/v${version}";
-    changelog = "https://github.com/nexB/extractcode/releases/tag/v${version}";
     license = licenses.asl20;
     maintainers = [ ];
+    mainProgram = "extractcode";
   };
 }

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

@@ -3,24 +3,27 @@
   aiohttp,
   buildPythonPackage,
   fetchFromGitHub,
+  hatchling,
   jinja2,
   nltk,
-  setuptools,
+  pythonOlder,
 }:
 
 buildPythonPackage rec {
   pname = "hakuin";
-  version = "0-unstable-2024-03-31";
+  version = "0.1.10";
   pyproject = true;
 
+  disabled = pythonOlder "3.11";
+
   src = fetchFromGitHub {
     owner = "pruzko";
     repo = "hakuin";
-    rev = "3b7b76dcbfb8ab2b98e6dee08df02158327af772";
+    rev = "refs/tags/${version}";
-    hash = "sha256-tRjo9a0ZCBjKxbXTkiKFzfL4pL5awF5vXmsJlYxwoIw=";
+    hash = "sha256-l5YnGRPUZUQqOaRvQd4l4eowWGpuPBignjkDDT9q7fg=";
   };
 
-  build-system = [ setuptools ];
+  build-system = [ hatchling ];
 
   dependencies = [
     aiohttp

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

@@ -17,7 +17,7 @@
 
 buildPythonPackage rec {
   pname = "lacuscore";
-  version = "1.11.0";
+  version = "1.11.3";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -26,7 +26,7 @@ buildPythonPackage rec {
     owner = "ail-project";
     repo = "LacusCore";
     rev = "refs/tags/v${version}";
-    hash = "sha256-O9nB+hxMrIJDeK6BrxmX/yr0OoIXxshKJxz9fU6b2V0=";
+    hash = "sha256-eVcfJXkjrS752T18wKrIwfwEkCuR1eIoVZERMk/stgQ=";
   };
 
   pythonRelaxDeps = [

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

@@ -18,7 +18,7 @@
 
 buildPythonPackage rec {
   pname = "mashumaro";
-  version = "3.13.1";
+  version = "3.14";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -27,12 +27,12 @@ buildPythonPackage rec {
     owner = "Fatal1ty";
     repo = "mashumaro";
     rev = "refs/tags/v${version}";
-    hash = "sha256-Km3RuDU77L3N2RQBhpcEztOjYtQhTXFZoGKu70g5EPU=";
+    hash = "sha256-0THj22KdMvD5O3dNwXKxs2wRIJziPmojLo4BPa3fZ3Y=";
   };
 
-  nativeBuildInputs = [ setuptools ];
+  build-system = [ setuptools ];
 
-  propagatedBuildInputs = [ typing-extensions ];
+  dependencies = [ typing-extensions ];
 
   optional-dependencies = {
     orjson = [ orjson ];

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

@@ -6,23 +6,26 @@
   pyparsing,
   pytestCheckHook,
   pythonOlder,
+  setuptools,
 }:
 
 buildPythonPackage rec {
   pname = "packvers";
   version = "21.5";
-  format = "setuptools";
+  pyproject = true;
 
   disabled = pythonOlder "3.7";
 
   src = fetchFromGitHub {
     owner = "nexB";
-    repo = pname;
+    repo = "packvers";
     rev = "refs/tags/${version}";
     hash = "sha256-nCSYL0g7mXi9pGFt24pOXbmmYsaRuB+rRZrygf8DTLE=";
   };
 
-  propagatedBuildInputs = [ pyparsing ];
+  build-system = [ setuptools ];
+
+  dependencies = [ pyparsing ];
 
   nativeCheckInputs = [
     pretend
@@ -31,9 +34,14 @@ buildPythonPackage rec {
 
   pythonImportsCheck = [ "packvers" ];
 
+  disabledTests = [
+    # Failed: DID NOT RAISE <class 'packvers.requirements.InvalidRequirement'>
+    "test_invalid_file_urls"
+  ];
+
   meta = with lib; {
     description = "Module for version handling of modules";
-    homepage = "https://github.com/nexB/dparse2";
+    homepage = "https://github.com/aboutcode-org/packvers";
     changelog = "https://github.com/nexB/packvers/blob/${version}/CHANGELOG.rst";
     license = with licenses; [
       asl20 # and

pkgs/development/python-modules/pygame-ce/default.nix

@@ -24,11 +24,13 @@
   SDL2_mixer,
   SDL2_ttf,
   numpy,
+
+  pygame-gui,
 }:
 
 buildPythonPackage rec {
   pname = "pygame-ce";
-  version = "2.5.1";
+  version = "2.5.2";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -37,7 +39,7 @@ buildPythonPackage rec {
     owner = "pygame-community";
     repo = "pygame-ce";
     rev = "refs/tags/${version}";
-    hash = "sha256-bt/6ukXZU79CWFqov9JON9ktQ/c4NKLxhX4Jif3Enxs=";
+    hash = "sha256-9e02ZfBfk18jsVDKKhMwEJiTGMG7VdBEgVh4unMJguY=";
     # Unicode file cause different checksums on HFS+ vs. other filesystems
     postFetch = "rm -rf $out/docs/reST";
   };
@@ -67,10 +69,10 @@ buildPythonPackage rec {
     ''
       # cython was pinned to fix windows build hangs (pygame-community/pygame-ce/pull/3015)
       substituteInPlace pyproject.toml \
-        --replace-fail '"cython<=3.0.10",' '"cython",' \
+        --replace-fail '"meson<=1.5.1",' '"meson",' \
-        --replace-fail '"meson<=1.5.0",' '"meson",' \
+        --replace-fail '"ninja<=1.11.1.1",' "" \
-        --replace-fail '"sphinx<=7.2.6",' "" \
+        --replace-fail '"cython<=3.0.11",' '"cython",' \
-        --replace-fail '"ninja<=1.11.1.1",' ""
+        --replace-fail '"sphinx<=7.2.6",' ""
       substituteInPlace buildconfig/config_{unix,darwin}.py \
         --replace-fail 'from distutils' 'from setuptools._distutils'
       substituteInPlace src_py/sysfont.py \
@@ -151,12 +153,16 @@ buildPythonPackage rec {
     "pygame.version"
   ];
 
-  meta = with lib; {
+  passthru.tests = {
+    inherit pygame-gui;
+  };
+
+  meta = {
     description = "Pygame Community Edition (CE) - library for multimedia application built on SDL";
     homepage = "https://pyga.me/";
     changelog = "https://github.com/pygame-community/pygame-ce/releases/tag/${version}";
-    license = licenses.lgpl21Plus;
+    license = lib.licenses.lgpl21Plus;
-    maintainers = with maintainers; [ pbsds ];
+    maintainers = [ lib.maintainers.pbsds ];
-    platforms = platforms.unix;
+    platforms = lib.platforms.unix;
   };
 }

pkgs/development/python-modules/pygame-gui/default.nix

@@ -1,6 +1,7 @@
 {
   lib,
   pkgs,
+  stdenv,
   buildPythonPackage,
   nix-update-script,
   fetchFromGitHub,
@@ -53,6 +54,11 @@ buildPythonPackage rec {
     "test_process_event_text_ctrl_v_select_range"
     "test_process_event_text_ctrl_a"
     "test_process_event_text_ctrl_x"
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    # fails to determine "/" as an existing path
+    # https://github.com/MyreMylar/pygame_gui/issues/644
+    "test_process_event"
   ];
 
   disabledTestPaths = [ "tests/test_performance/test_text_performance.py" ];

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

@@ -9,16 +9,16 @@
 
 buildPythonPackage rec {
   pname = "pygmars";
-  version = "0.8.1";
+  version = "0.9.0";
   pyproject = true;
 
-  disabled = pythonOlder "3.7";
+  disabled = pythonOlder "3.9";
 
   src = fetchFromGitHub {
     owner = "nexB";
     repo = "pygmars";
     rev = "refs/tags/v${version}";
-    hash = "sha256-RwAZ1ZLh0zgGshSv7LleBHMotKapDFtD69ptqQnr0EA=";
+    hash = "sha256-OhmTD83p/4tCMoCXy35/0fy8Tw1usn27dJyzpOeGlkU=";
   };
 
   dontConfigure = true;
@@ -32,7 +32,7 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "Python lexing and parsing library";
     homepage = "https://github.com/nexB/pygmars";
-    changelog = "https://github.com/nexB/pygmars/releases/tag/v${version}";
+    changelog = "https://github.com/aboutcode-org/pygmars/blob/v${version}/CHANGELOG.rst";
     license = with licenses; [ asl20 ];
     maintainers = with maintainers; [ fab ];
   };

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

@@ -0,0 +1,58 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchPypi,
+  pythonOlder,
+  pytestCheckHook,
+  setuptools,
+  meson-python,
+  ninja,
+  meson,
+  poppler,
+  pkg-config,
+  pybind11,
+}:
+
+buildPythonPackage rec {
+  pname = "python-poppler";
+  version = "0.4.1";
+  pyproject = true;
+
+  disabled = pythonOlder "3.6";
+
+  src = fetchPypi {
+    inherit version;
+    pname = "python_poppler";
+    hash = "sha256-5spcI+wCNQvyzvhaa/nxsmF5ZDbbR4F2+dJPsU7uzGo=";
+  };
+
+  patches = [
+    # Prevent Meson from downloading pybind11, use system version instead
+    ./use_system_pybind11.patch
+  ];
+
+  build-system = [ meson-python ];
+
+  buildInputs = [ pybind11 ];
+
+  nativeBuildInputs = [
+    ninja
+    pkg-config
+  ];
+
+  propagatedBuildInputs = [ poppler ];
+
+  nativeCheckInputs = [ pytestCheckHook ];
+
+  pythonImportCheck = [ "poppler" ];
+
+  meta = {
+    description = "Python binding to poppler-cpp";
+    homepage = "https://github.com/cbrunet/python-poppler";
+    changelog = "https://cbrunet.net/python-poppler/changelog.html";
+    # Contradictory license definition
+    # https://github.com/cbrunet/python-poppler/issues/90
+    license = lib.licenses.gpl2Plus;
+    maintainers = [ lib.maintainers.onny ];
+  };
+}

pkgs/development/python-modules/python-poppler/use_system_pybind11.patch

@@ -0,0 +1,13 @@
+diff --git a/meson.build b/meson.build
+index c1ac57a..1d1ad1f 100644
+--- a/meson.build
++++ b/meson.build
+@@ -13,7 +13,6 @@ poppler_dep = dependency('poppler-cpp', version: '>=0.26.0')
+ python_mod = import('python')
+ python3 = python_mod.find_installation('python3', pure: false)
+ 
+-pybind11_proj = subproject('pybind11')
+-pybind11_dep = pybind11_proj.get_variable('pybind11_dep')
++pybind11_dep = dependency('pybind11')
+ 
+ subdir('src')

pkgs/development/python-modules/schema-salad/default.nix

@@ -22,21 +22,21 @@
 
 buildPythonPackage rec {
   pname = "schema-salad";
-  version = "8.7.20240905150001";
+  version = "8.7.20241021092521";
   pyproject = true;
 
-  disabled = pythonOlder "3.8";
+  disabled = pythonOlder "3.9";
 
   src = fetchFromGitHub {
     owner = "common-workflow-language";
     repo = "schema_salad";
     rev = "refs/tags/${version}";
-    hash = "sha256-hPqUD9gYO78NnG/QdD32uRkRPpN5UIhfzNHpUXnNOgE=";
+    hash = "sha256-1V73y+sp94QwoCz8T2LCMnf5iq8MtL9cvrhF949R+08=";
   };
 
   postPatch = ''
     substituteInPlace pyproject.toml \
-      --replace-fail "black>=19.10b0,<23.12" "black>=19.10b0"
+      --replace-fail "mypy[mypyc]==1.12.1" "mypy"
   '';
 
   build-system = [ setuptools-scm ];
@@ -57,7 +57,6 @@ buildPythonPackage rec {
     ++ cachecontrol.optional-dependencies.filecache
     ++ lib.optionals (pythonOlder "3.9") [ importlib-resources ];
 
-
   nativeCheckInputs = [ pytestCheckHook ] ++ optional-dependencies.pycodegen;
 
   preCheck = ''

pkgs/development/python-modules/types-requests/default.nix

@@ -9,12 +9,12 @@
 
 buildPythonPackage rec {
   pname = "types-requests";
-  version = "2.32.0.20240914";
+  version = "2.32.0.20241016";
   pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-KFDheNs5Gdm/gJ5DTu9luknQ5+M6yS1Yj0peKV//1AU=";
+    hash = "sha256-DZytLydRXQ4+PacTShtvKPuXEp2GuGfyTZxyZFJjTZU=";
   };
 
   build-system = [ setuptools ];

pkgs/development/tools/conftest/default.nix

@@ -6,15 +6,15 @@
 
 buildGoModule rec {
   pname = "conftest";
-  version = "0.55.0";
+  version = "0.56.0";
 
   src = fetchFromGitHub {
     owner = "open-policy-agent";
     repo = "conftest";
     rev = "refs/tags/v${version}";
-    hash = "sha256-cJY3NmZa+IBmadTAusvzHKXeGsnsKpRqvJwYPVnU68A=";
+    hash = "sha256-7R6qMjwPtlpnsm6xej7jQntv9709//q4VVbatuzLuwk=";
   };
-  vendorHash = "sha256-iPTyDqaodTFhnGRLEbEFpQjfz9r4DsFdue7fQNwq/pU=";
+  vendorHash = "sha256-QPFLHP4nyJqB7tVVk00J+V+1YXGSsRvCZ1aLEMg0kfc=";
 
   ldflags = [
     "-s"

pkgs/development/tools/espup/default.nix

@@ -15,16 +15,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "espup";
-  version = "0.12.2";
+  version = "0.13.0";
 
   src = fetchFromGitHub {
     owner = "esp-rs";
     repo = "espup";
     rev = "v${version}";
-    hash = "sha256-7rxT3Stbfec7oxZOBN87lICmq+V8OZMCXb5F6Ca6jS4=";
+    hash = "sha256-okB8K0ly3MvnkVve41eT0SNr5dPn5E5QXewqLHGL/Tc=";
   };
 
-  cargoHash = "sha256-GfoM2ngwnovQdbiEUQrkrrMpq4fo37VVOmnkK/5l+C8=";
+  cargoHash = "sha256-n2tLG3logtc73Ut/R1UGuLSm7MpZ4Bxp/08SOhGL+80=";
 
   nativeBuildInputs = [
     pkg-config

pkgs/development/tools/omnisharp-roslyn/default.nix

@@ -1,93 +0,0 @@
-{ buildDotnetModule
-, dotnetCorePackages
-, fetchFromGitHub
-, lib
-, stdenv
-, runCommand
-, expect
-}:
-let
-  inherit (dotnetCorePackages) sdk_8_0 runtime_6_0;
-in
-let finalPackage = buildDotnetModule rec {
-  pname = "omnisharp-roslyn";
-  version = "1.39.12";
-
-  src = fetchFromGitHub {
-    owner = "OmniSharp";
-    repo = "omnisharp-roslyn";
-    rev = "refs/tags/v${version}";
-    hash = "sha256-WQIBNqUqvVA0UhSoPdf179X+GYKp4LhPvYeEAet6TnY=";
-  };
-
-  projectFile = "src/OmniSharp.Stdio.Driver/OmniSharp.Stdio.Driver.csproj";
-  nugetDeps = ./deps.nix;
-
-  dotnet-sdk = with dotnetCorePackages; combinePackages [ sdk_6_0 sdk_8_0 ];
-  dotnet-runtime = sdk_8_0;
-
-  dotnetInstallFlags = [ "--framework net6.0" ];
-  dotnetBuildFlags = [ "--framework net6.0" "--no-self-contained" ];
-  dotnetFlags = [
-    # These flags are set by the cake build.
-    "-property:PackageVersion=${version}"
-    "-property:AssemblyVersion=${version}.0"
-    "-property:FileVersion=${version}.0"
-    "-property:InformationalVersion=${version}"
-    "-property:RuntimeFrameworkVersion=${runtime_6_0.version}"
-    "-property:RollForward=LatestMajor"
-  ];
-
-  postPatch = ''
-    # Relax the version requirement
-    rm global.json
-
-    # Patch the project files so we can compile them properly
-    for project in src/OmniSharp.Http.Driver/OmniSharp.Http.Driver.csproj src/OmniSharp.LanguageServerProtocol/OmniSharp.LanguageServerProtocol.csproj src/OmniSharp.Stdio.Driver/OmniSharp.Stdio.Driver.csproj; do
-      substituteInPlace $project \
-        --replace '<RuntimeIdentifiers>win7-x64;win7-x86;win10-arm64</RuntimeIdentifiers>' '<RuntimeIdentifiers>linux-x64;linux-arm64;osx-x64;osx-arm64</RuntimeIdentifiers>'
-    done
-  '';
-
-  useDotnetFromEnv = true;
-  executables = [ "OmniSharp" ];
-
-  passthru.tests = let
-    with-sdk = sdk: runCommand "with-${if sdk ? version then sdk.version else "no"}-sdk"
-      { nativeBuildInputs = [ finalPackage sdk expect ]; meta.timeout = 60; } ''
-      HOME=$TMPDIR
-      expect <<"EOF"
-        spawn OmniSharp
-        expect_before timeout {
-          send_error "timeout!\n"
-          exit 1
-        }
-        expect ".NET Core SDK ${if sdk ? version then sdk.version else sdk_8_0.version}"
-        expect "{\"Event\":\"started\","
-        send \x03
-        expect eof
-        catch wait result
-        exit [lindex $result 3]
-      EOF
-      touch $out
-    '';
-  in {
-    # Make sure we can run OmniSharp with any supported SDK version, as well as without
-    with-net6-sdk = with-sdk dotnetCorePackages.sdk_6_0;
-    with-net7-sdk = with-sdk dotnetCorePackages.sdk_7_0;
-    with-net8-sdk = with-sdk dotnetCorePackages.sdk_8_0;
-    no-sdk = with-sdk null;
-  };
-
-  meta = {
-    description = "OmniSharp based on roslyn workspaces";
-    homepage = "https://github.com/OmniSharp/omnisharp-roslyn";
-    sourceProvenance = with lib.sourceTypes; [
-      fromSource
-      binaryNativeCode # dependencies
-    ];
-    license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ tesq0 ericdallo corngood mdarocha ];
-    mainProgram = "OmniSharp";
-  };
-}; in finalPackage

pkgs/development/tools/tokio-console/default.nix

@@ -8,16 +8,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "tokio-console";
-  version = "0.1.10";
+  version = "0.1.13";
 
   src = fetchFromGitHub {
     owner = "tokio-rs";
     repo = "console";
     rev = "tokio-console-v${version}";
-    hash = "sha256-sjfdxOeaNANYJuJMjZ/tCGc2mWM+98d8yPHAVSl4cF4=";
+    hash = "sha256-KqX+s1oQIRyqAP+0iGrZiT8lB+cGviY1vtHaXy5Q6TA=";
   };
 
-  cargoHash = "sha256-86KQpRpYSCQs6SUeG0HV26b58x/QUyovoL+5fg8JCOI=";
+  cargoHash = "sha256-QJdTysoVIbeLsTMt62Q355S8zx8tNCikZAyeRs7cz4o=";
 
   buildAndTestSubdir = "tokio-console";
 

pkgs/development/web/nodejs/v23.nix

@@ -0,0 +1,52 @@
+{
+  callPackage,
+  fetchpatch2,
+  openssl,
+  python3,
+  enableNpm ? true,
+}:
+
+let
+  buildNodejs = callPackage ./nodejs.nix {
+    inherit openssl;
+    python = python3;
+  };
+in
+buildNodejs {
+  inherit enableNpm;
+  version = "23.1.0";
+  sha256 = "57cbfd3dd51f9300ea2b8e60a8ed215b1eaa71fbde4c3903a7d31a443a4a4423";
+  patches = [
+    ./configure-emulator.patch
+    ./configure-armv6-vfpv2.patch
+    ./disable-darwin-v8-system-instrumentation-node19.patch
+    ./bypass-darwin-xcrun-node16.patch
+    ./node-npm-build-npm-package-logic.patch
+    ./use-correct-env-in-tests.patch
+    ./bin-sh-node-run-v22.patch
+
+    # Those reverts are due to a mismatch with the libuv version used upstream
+    (fetchpatch2 {
+      url = "https://github.com/nodejs/node/commit/dcbc5fbe65b068a90c3d0970155d3a68774caa38.patch?full_index=1";
+      hash = "sha256-Q7YrooolMjsGflTQEj5ra6hRVGhMP6APaydf1MGH54Q=";
+      revert = true;
+      excludes = [ "doc/*" ];
+    })
+    (fetchpatch2 {
+      url = "https://github.com/nodejs/node/commit/ec867ac7ce4e4913a8415eda48a7af9fc226097d.patch?full_index=1";
+      hash = "sha256-zfnHxC7ZMZAiu0/6PsX7RFasTevHMETv+azhTZnKI64=";
+      revert = true;
+      excludes = [ "doc/*" ];
+    })
+    (fetchpatch2 {
+      url = "https://github.com/nodejs/node/commit/f97865fab436fba24b46dad14435ec4b482243a2.patch?full_index=1";
+      hash = "sha256-o5aPQqUXubtJKMX28jn8LdjZHw37/BqENkYt6RAR3kY=";
+      revert = true;
+    })
+    (fetchpatch2 {
+      url = "https://github.com/nodejs/node/commit/54d55f2337ebe04451da770935ad453accb147f9.patch?full_index=1";
+      hash = "sha256-gmIyiSyNzC3pClL1SM2YicckWM+/2tsbV1xv2S3d5G0=";
+      revert = true;
+    })
+  ];
+}

pkgs/os-specific/linux/system76-io/default.nix

@@ -1,7 +1,7 @@
 { lib, stdenv, fetchFromGitHub, kernel }:
 let
-  version = "1.0.2";
+  version = "1.0.4";
-  sha256 = "sha256-DWUjQmoojkzFv1p4Xyt0kOwwqQ216ocO5yR/ujhhMPA=";
+  hash = "sha256-VE6sCehjXlRuOVcK4EN2H+FhaVaBi/jrAYx4TZjbreA=";
 in
 stdenv.mkDerivation {
   name = "system76-io-module-${version}-${kernel.version}";
@@ -12,7 +12,7 @@ stdenv.mkDerivation {
     owner = "pop-os";
     repo = "system76-io-dkms";
     rev = version;
-    inherit sha256;
+    inherit hash;
   };
 
   hardeningDisable = [ "pic" ];
@@ -27,12 +27,12 @@ stdenv.mkDerivation {
     install -D system76-io.ko $out/lib/modules/${kernel.modDirVersion}/misc/system76-io.ko
   '';
 
-  meta = with lib; {
+  meta = {
-    maintainers = [ maintainers.khumba ];
+    maintainers = with lib.maintainers; [ khumba ahoneybun ];
-    license = [ licenses.gpl2Plus ];
+    license = lib.licenses.gpl2Plus;
-    platforms = [ "i686-linux" "x86_64-linux" ];
+    platforms = [ "i686-linux" "x86_64-linux" "aarch64-linux" ];
-    broken = versionOlder kernel.version "4.14";
+    broken = lib.versionOlder kernel.version "5.10";
-    description = "DKMS module for controlling System76 I/O board";
+    description = "DKMS module for controlling System76 Io board";
     homepage = "https://github.com/pop-os/system76-io-dkms";
   };
 }

pkgs/test/cc-wrapper/default.nix

@@ -8,7 +8,7 @@ let
     || (stdenv.cc.isGNU && stdenv.hostPlatform.isLinux)
   );
   staticLibc = lib.optionalString (stdenv.hostPlatform.libc == "glibc") "-L ${glibc.static}/lib";
-  emulator = stdenv.hostPlatform.emulator buildPackages;
+  emulator = lib.optionalString (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) (stdenv.hostPlatform.emulator buildPackages);
   isCxx = stdenv.cc.libcxx != null;
   libcxxStdenvSuffix = lib.optionalString isCxx "-libcxx";
   CC = "PATH= ${lib.getExe' stdenv.cc "${stdenv.cc.targetPrefix}cc"}";

pkgs/tools/misc/taoup/default.nix

@@ -4,13 +4,13 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "taoup";
-  version = "1.21";
+  version = "1.1.23";
 
   src = fetchFromGitHub {
     owner = "globalcitizen";
     repo = "taoup";
     rev = "v${version}";
-    hash = "sha256-UHo3c+DQn77CJONy/QXM55rpIdhVkJbhR82tqmUltPQ=";
+    hash = "sha256-9J46fKyeSZW71r67R8y9KVPeCH8fn27hOk/XpusqGmk=";
   };
 
   buildInputs = [ rubyEnv bash ncurses ];
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
      --subst-var-by pname taoup
     substituteInPlace taoup-fortune \
       --subst-var-by out $out \
-      --replace "/bin/bash" "${bash}/bin/bash"
+      --replace-fail "/bin/bash" "${bash}/bin/bash"
   '';
 
   dontConfigure = true;
@@ -48,7 +48,7 @@ stdenv.mkDerivation rec {
     EOF
     chmod +x $out/bin/taoup
 
-    # Populate the cache created by cachedir.patch above
+    # Populate the cache created by cachefile.patch above
     $out/bin/taoup > $out/lib/taoup/cache
 
     cp taoup-fortune $out/bin

pkgs/tools/misc/tmuxinator/default.nix

@@ -8,8 +8,8 @@ buildRubyGem rec {
   inherit ruby;
   name = "${gemName}-${version}";
   gemName = "tmuxinator";
-  version = "3.3.1";
+  version = "3.3.2";
-  source.sha256 = "sha256-xixLYzDIvX3D+vbe9SccST37TnyZx/YjePLPjagHsOU=";
+  source.sha256 = "sha256-q1VS4ChHVqIpHHO/fGANG5IjgwUfBT2VqT9WAkQeGh4=";
 
   erubi = buildRubyGem rec {
     inherit ruby;

pkgs/tools/security/kube-bench/default.nix

@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "kube-bench";
-  version = "0.8.0";
+  version = "0.9.0";
 
   src = fetchFromGitHub {
     owner = "aquasecurity";
     repo = pname;
     rev = "refs/tags/v${version}";
-    hash = "sha256-vP/BK3hOBrEAPrg+Bltg0GdyvAQyUffEtXoK3B3CEjs=";
+    hash = "sha256-x6xCrxePB/TR7BP1kLiVFjv4pLUJu9JVh5/Y0ebOjvY=";
   };
 
-  vendorHash = "sha256-bq8nz4i40xd4O6/r2ZiUyAEKxmsoLCNKctqRV/GPQEU=";
+  vendorHash = "sha256-d6GhZBHDSRgMVeglw8rhq5QF7gRH4hQOzTn0DZjvhiA=";
 
   nativeBuildInputs = [ installShellFiles ];
 

pkgs/tools/security/naabu/default.nix

@@ -6,16 +6,16 @@
 
 buildGoModule rec {
   pname = "naabu";
-  version = "2.3.1";
+  version = "2.3.2";
 
   src = fetchFromGitHub {
     owner = "projectdiscovery";
     repo = "naabu";
     rev = "refs/tags/v${version}";
-    hash = "sha256-BICNSizc5DD538ZUoRUC1jSDCEkyrh7iYOM4a6cBqkQ=";
+    hash = "sha256-zGZpXnMQ8KvY4oBn0729WmG80AQ4748Gz6UO/+O8i3o=";
   };
 
-  vendorHash = "sha256-GhnEjlV6b61VH/eswBQ9Lelc0IgGawjDRZHzGt7653Q=";
+  vendorHash = "sha256-Mcp3sfaCNTsBOiDYn3iVolSd9cK2LAGNscoUtYhsRkA=";
 
   buildInputs = [
     libpcap

pkgs/top-level/aliases.nix

@@ -583,7 +583,7 @@ mapAliases {
   LASzip = laszip; # Added 2024-06-12
   LASzip2 = laszip_2; # Added 2024-06-12
   latinmodern-math = lmmath;
-  leafpad = throw "'leafpad' has been removed due to lack of maintenance upstream. Consider using 'xfce.mouspad' instead"; # Added 2024-10-19
+  leafpad = throw "'leafpad' has been removed due to lack of maintenance upstream. Consider using 'xfce.mousepad' instead"; # Added 2024-10-19
   ledger_agent = ledger-agent; # Added 2024-01-07
   lfs = dysk; # Added 2023-07-03
   libAfterImage = throw "'libAfterImage' has been removed from nixpkgs, as it's no longer in development for a long time"; # Added 2024-06-01
@@ -1131,7 +1131,6 @@ mapAliases {
   swiPrologWithGui = lib.warn "swiPrologWithGui has been renamed to swi-prolog-gui" swi-prolog-gui; # Added 2024-09-07
   swig1 = throw "swig1 has been removed as it is obsolete"; # Added 2024-08-23
   swig2 = throw "swig2 has been removed as it is obsolete"; # Added 2024-08-23
-  swig3 = throw "swig3 has been removed as it is obsolete"; # Added 2024-09-12
   swig4 = swig; # Added 2024-09-12
   swigWithJava = throw "swigWithJava has been removed as the main swig package has supported Java since 2009"; # Added 2024-09-12
   swtpm-tpm2 = throw "'swtpm-tpm2' has been renamed to/replaced by 'swtpm'"; # Converted to throw 2024-10-17

pkgs/top-level/all-packages.nix

@@ -1465,8 +1465,6 @@ with pkgs;
 
   alsaequal = callPackage ../tools/audio/alsaequal { };
 
-  amdgpu_top = callPackage ../tools/system/amdgpu_top { };
-
   acquire = with python3Packages; toPythonApplication acquire;
 
   actdiag = with python3.pkgs; toPythonApplication actdiag;
@@ -9438,10 +9436,14 @@ with pkgs;
   nodejs-slim_22 = callPackage ../development/web/nodejs/v22.nix { enableNpm = false; };
   corepack_22 = hiPrio (callPackage ../development/web/nodejs/corepack.nix { nodejs = nodejs_22; });
 
+  nodejs_23 = callPackage ../development/web/nodejs/v23.nix { };
+  nodejs-slim_23 = callPackage ../development/web/nodejs/v23.nix { enableNpm = false; };
+  corepack_23 = hiPrio (callPackage ../development/web/nodejs/corepack.nix { nodejs = nodejs_23; });
+
   # Update this when adding the newest nodejs major version!
-  nodejs_latest = nodejs_22;
+  nodejs_latest = nodejs_23;
-  nodejs-slim_latest = nodejs-slim_22;
+  nodejs-slim_latest = nodejs-slim_23;
-  corepack_latest = hiPrio corepack_22;
+  corepack_latest = hiPrio corepack_23;
 
   buildNpmPackage = callPackage ../build-support/node/build-npm-package { };
 
@@ -38337,8 +38339,6 @@ with pkgs;
     nanoizeNewlib = true;
   };
 
-  omnisharp-roslyn = callPackage ../development/tools/omnisharp-roslyn { };
-
   wasmtime = callPackage ../development/interpreters/wasmtime {
     inherit (darwin.apple_sdk.frameworks) Security;
   };

pkgs/top-level/gnuradio-packages.nix

@@ -21,6 +21,7 @@ let
       volk
       logLib
       python
+      qwt
     ;
     inherit mkDerivationWith mkDerivation;
     inherit gnuradio;

pkgs/top-level/python-packages.nix

@@ -10501,6 +10501,8 @@ self: super: with self; {
 
   python-owasp-zap-v2-4 = callPackage ../development/python-modules/python-owasp-zap-v2-4 { };
 
+  python-poppler = callPackage ../development/python-modules/python-poppler { };
+
   python-pptx = callPackage ../development/python-modules/python-pptx { };
 
   python-songpal = callPackage ../development/python-modules/python-songpal { };

pkgs/top-level/splice.nix

@@ -128,6 +128,15 @@ let
     "packages"
   ];
 
+  packagesWithXorg = pkgs // builtins.removeAttrs pkgs.xorg [
+    "callPackage"
+    "newScope"
+    "overrideScope"
+    "packages"
+  ];
+
+  pkgsForCall = if actuallySplice then splicedPackagesWithXorg else packagesWithXorg;
+
 in
 
 {
@@ -138,9 +147,9 @@ in
   # `newScope' for sets of packages in `pkgs' (see e.g. `gnome' below).
   callPackage = pkgs.newScope { };
 
-  callPackages = lib.callPackagesWith splicedPackagesWithXorg;
+  callPackages = lib.callPackagesWith pkgsForCall;
 
-  newScope = extra: lib.callPackageWith (splicedPackagesWithXorg // extra);
+  newScope = extra: lib.callPackageWith (pkgsForCall // extra);
 
   # prefill 2 fields of the function for convenience
   makeScopeWithSplicing = lib.makeScopeWithSplicing splicePackages pkgs.newScope;
@@ -169,5 +178,5 @@ in
 
   # Haskell package sets need this because they reimplement their own
   # `newScope`.
-  __splicedPackages = splicedPackages // { recurseForDerivations = false; };
+  __splicedPackages = if actuallySplice then splicedPackages // { recurseForDerivations = false; } else pkgs;
 }