From f620b06647fdd0529ee2ceb23f86dfa16bcab058 Mon Sep 17 00:00:00 2001 From: Miroslav Vadkerti Date: Mon, 7 Jul 2025 13:09:14 +0200 Subject: [PATCH 01/42] maintainers: add thrix Signed-off-by: Miroslav Vadkerti --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 813c267fe665..785e153aee1f 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -25309,6 +25309,12 @@ githubId = 1761259; name = "Eric Roberts"; }; + thrix = { + email = "mvadkert@redhat.com"; + github = "thrix"; + githubId = 633969; + name = "Miroslav Vadkerti"; + }; thtrf = { email = "thtrf@proton.me"; github = "thtrf"; From 00cc60953c18c84550ac5c76eea9a5475547c0c5 Mon Sep 17 00:00:00 2001 From: Miroslav Vadkerti Date: Fri, 27 Jun 2025 02:35:18 +0200 Subject: [PATCH 02/42] toolhive: init at 0.0.47 Signed-off-by: Miroslav Vadkerti Co-authored-by: Acid Bong --- pkgs/by-name/to/toolhive/package.nix | 55 ++++++++++++++++++++++++++++ 1 file changed, 55 insertions(+) create mode 100644 pkgs/by-name/to/toolhive/package.nix diff --git a/pkgs/by-name/to/toolhive/package.nix b/pkgs/by-name/to/toolhive/package.nix new file mode 100644 index 000000000000..3271d421732c --- /dev/null +++ b/pkgs/by-name/to/toolhive/package.nix @@ -0,0 +1,55 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, + nix-update-script, + testers, + toolhive, +}: + +buildGoModule (finalAttrs: { + pname = "toolhive"; + version = "0.0.47"; + + src = fetchFromGitHub { + owner = "stacklok"; + repo = "toolhive"; + tag = "v${finalAttrs.version}"; + hash = "sha256-FXJUEEyCw7ChuzmSAzwXd2LoJXT6vpH+j3muXx5TjPI="; + }; + + vendorHash = "sha256-aP923ezK4/2zTaU9QQLUmNN6KIddOaTlpsYMT2flRaE="; + + # Build only the main CLI and operator binaries + subPackages = [ + "cmd/thv" + "cmd/thv-operator" + ]; + + doCheck = true; + + passthru = { + updateScript = nix-update-script { }; + tests = { + version = testers.testVersion { + package = toolhive; + command = "thv version"; + version = "ToolHive build-unknown"; + }; + }; + }; + + meta = { + description = "Run any MCP server — securely, instantly, anywhere"; + longDescription = '' + ToolHive is an open-source tool for deploying Model Context Protocol (MCP) + servers with a focus on security and ease of use. It provides a CLI to + discover and deploy MCP servers, run servers in isolated containers, + manage server configurations, and auto-configure clients like GitHub Copilot. + ''; + homepage = "https://github.com/stacklok/toolhive"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ thrix ]; + mainProgram = "thv"; + }; +}) From 1a12076d9cea0e5b4360ac5907d12606dbe0f58b Mon Sep 17 00:00:00 2001 From: Rafael Ieda Date: Sat, 27 Sep 2025 10:44:50 -0300 Subject: [PATCH 03/42] libfilezilla: 0.49.0 -> 0.51.1 --- pkgs/by-name/li/libfilezilla/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/li/libfilezilla/package.nix b/pkgs/by-name/li/libfilezilla/package.nix index 0f2b1fc9619b..2e13cea6a997 100644 --- a/pkgs/by-name/li/libfilezilla/package.nix +++ b/pkgs/by-name/li/libfilezilla/package.nix @@ -13,12 +13,12 @@ stdenv.mkDerivation { pname = "libfilezilla"; - version = "0.49.0"; + version = "0.51.1"; src = fetchsvn { url = "https://svn.filezilla-project.org/svn/libfilezilla/trunk"; - rev = "11192"; - hash = "sha256-fm1cenGwYcPz0TtMzbPXrZA7nAzwo8toBNA9cW2Gnh0="; + rev = "11305"; + hash = "sha256-s+KeMlKJMz88lQ6d3dpcgZhCkcPW0cHNHALteMWLhpk="; }; nativeBuildInputs = [ From f89373cf8e944d9d85b6e09c112dbfdba7ad2192 Mon Sep 17 00:00:00 2001 From: Rafael Ieda Date: Sat, 27 Sep 2025 10:45:24 -0300 Subject: [PATCH 04/42] filezilla: 3.68.1 -> 3.69.3 --- pkgs/by-name/fi/filezilla/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/fi/filezilla/package.nix b/pkgs/by-name/fi/filezilla/package.nix index 82906428ea9a..951112e82be5 100644 --- a/pkgs/by-name/fi/filezilla/package.nix +++ b/pkgs/by-name/fi/filezilla/package.nix @@ -22,12 +22,12 @@ stdenv.mkDerivation { pname = "filezilla"; - version = "3.68.1"; + version = "3.69.3"; src = fetchsvn { url = "https://svn.filezilla-project.org/svn/FileZilla3/trunk"; - rev = "11205"; - hash = "sha256-izaNfagJYUcPRPihZ1yXwLUTHunzVXuiMITW69KPSFE="; + rev = "11309"; + hash = "sha256-+wvdQnsYUsLS4pHoa3JVzkgTVxbeck/c7IaDt0VqU+8="; }; configureFlags = [ From 1f5bc04ff28961abdf9b709b12cd7a83e7e2e81a Mon Sep 17 00:00:00 2001 From: Rafael Ieda Date: Sat, 27 Sep 2025 10:48:01 -0300 Subject: [PATCH 05/42] libfilezilla: add maintainer iedame --- pkgs/by-name/li/libfilezilla/package.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/li/libfilezilla/package.nix b/pkgs/by-name/li/libfilezilla/package.nix index 2e13cea6a997..f9bb201a5a44 100644 --- a/pkgs/by-name/li/libfilezilla/package.nix +++ b/pkgs/by-name/li/libfilezilla/package.nix @@ -42,7 +42,10 @@ stdenv.mkDerivation { homepage = "https://lib.filezilla-project.org/"; description = "Modern C++ library, offering some basic functionality to build high-performing, platform-independent programs"; license = licenses.gpl2Plus; - maintainers = with maintainers; [ pSub ]; + maintainers = with maintainers; [ + pSub + iedame + ]; platforms = lib.platforms.unix; broken = stdenv.hostPlatform.isDarwin; }; From 3f5ecb4e279de09f647beb340916ee8cbf71c1ca Mon Sep 17 00:00:00 2001 From: Rafael Ieda Date: Sat, 27 Sep 2025 10:48:17 -0300 Subject: [PATCH 06/42] filezilla: add maintainer iedame --- pkgs/by-name/fi/filezilla/package.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/fi/filezilla/package.nix b/pkgs/by-name/fi/filezilla/package.nix index 951112e82be5..6f481421e95d 100644 --- a/pkgs/by-name/fi/filezilla/package.nix +++ b/pkgs/by-name/fi/filezilla/package.nix @@ -70,6 +70,9 @@ stdenv.mkDerivation { ''; license = licenses.gpl2; platforms = platforms.linux; - maintainers = with maintainers; [ pSub ]; + maintainers = with maintainers; [ + pSub + iedame + ]; }; } From 2eceead9e744c2b86014e990f8c2b677351e1929 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= Date: Fri, 3 Oct 2025 16:48:19 +0200 Subject: [PATCH 07/42] nixos/avahi: add debug option --- nixos/modules/services/networking/avahi-daemon.nix | 4 +++- nixos/tests/avahi.nix | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/networking/avahi-daemon.nix b/nixos/modules/services/networking/avahi-daemon.nix index ab54eafb6877..b1ed28980cfe 100644 --- a/nixos/modules/services/networking/avahi-daemon.nix +++ b/nixos/modules/services/networking/avahi-daemon.nix @@ -276,6 +276,8 @@ in Extra config to append to avahi-daemon.conf. ''; }; + + debug = lib.mkEnableOption "debug logging"; }; config = lib.mkIf cfg.enable { @@ -356,7 +358,7 @@ in NotifyAccess = "main"; BusName = "org.freedesktop.Avahi"; Type = "dbus"; - ExecStart = "${cfg.package}/sbin/avahi-daemon --syslog -f ${avahiDaemonConf}"; + ExecStart = "${cfg.package}/sbin/avahi-daemon --syslog -f ${avahiDaemonConf} ${lib.optionalString cfg.debug "--debug"}"; ConfigurationDirectory = "avahi/services"; # Hardening diff --git a/nixos/tests/avahi.nix b/nixos/tests/avahi.nix index 77cb1d5332cb..9568c4fffb55 100644 --- a/nixos/tests/avahi.nix +++ b/nixos/tests/avahi.nix @@ -24,6 +24,7 @@ publish.userServices = true; publish.workstation = true; extraServiceFiles.ssh = "${pkgs.avahi}/etc/avahi/services/ssh.service"; + debug = true; }; } // pkgs.lib.optionalAttrs networkd { From 66e2080e2394d85d2850daa589c5666d1f95cf7e Mon Sep 17 00:00:00 2001 From: Alexander Bantyev Date: Sat, 4 Oct 2025 19:12:38 +0400 Subject: [PATCH 08/42] intel-oneapi.{base,hpc}: init at 2025.2.1.44 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Introduces the two freeware Intel's OneApi toolkits. The Intel® oneAPI Base Toolkit (Base Kit) is a core set of tools and libraries for developing high-performance, data-centric applications across diverse architectures. It features an industry-leading C++ compiler that implements SYCL*, an evolution of C++ for heterogeneous computing. Intel® oneAPI HPC Toolkit delivers what developers need to build, analyze, optimize, and scale HPC (high-performance computing) applications with the latest techniques in vectorization, multithreading, multi-node parallelization, and memory optimization. They are packaged from official "offline" installers, which require some wrangling to get working due to their reliance on FHS. The resulting libraries and tools seem to work fine without FHS. --- lib/licenses.nix | 6 + pkgs/by-name/in/intel-oneapi/base.nix | 254 +++++++++++++++++++++++ pkgs/by-name/in/intel-oneapi/hpc.nix | 83 ++++++++ pkgs/by-name/in/intel-oneapi/package.nix | 179 ++++++++++++++++ 4 files changed, 522 insertions(+) create mode 100644 pkgs/by-name/in/intel-oneapi/base.nix create mode 100644 pkgs/by-name/in/intel-oneapi/hpc.nix create mode 100644 pkgs/by-name/in/intel-oneapi/package.nix diff --git a/lib/licenses.nix b/lib/licenses.nix index 3b2c368b9ba5..1c5bb05b3a9b 100644 --- a/lib/licenses.nix +++ b/lib/licenses.nix @@ -786,6 +786,12 @@ lib.mapAttrs mkLicense ( free = false; }; + intel-eula = { + fullName = "Intel End User License Agreement for Developer Tools"; + url = "https://software.intel.com/sites/manageability/AMT_Implementation_and_Reference_Guide/WordDocuments/intelamtsdklicense.htm"; + free = false; + }; + interbase = { spdxId = "Interbase-1.0"; fullName = "Interbase Public License v1.0"; diff --git a/pkgs/by-name/in/intel-oneapi/base.nix b/pkgs/by-name/in/intel-oneapi/base.nix new file mode 100644 index 000000000000..185b77127d8c --- /dev/null +++ b/pkgs/by-name/in/intel-oneapi/base.nix @@ -0,0 +1,254 @@ +{ + lib, + fetchurl, + zlib, + rdma-core, + libpsm2, + ucx, + numactl, + level-zero, + pkg-config, + libdrm, + elfutils, + xorg, + glib, + nss, + nspr, + dbus, + at-spi2-atk, + cups, + gtk3, + pango, + cairo, + mesa, + expat, + libxkbcommon, + eudev, + alsa-lib, + ncurses5, + bzip2, + gdbm, + libxcrypt-legacy, + freetype, + gtk2, + gdk-pixbuf, + fontconfig, + libuuid, + sqlite, + + # The list of components to install; + # Either [ "all" ], [ "default" ], or a custom list of components. + # If you want to install all default components plus an extra one, pass [ "default" ] + # Note that changing this will also change the `buildInputs` of the derivation. + # The default value is not "default" because some of the components in the defualt set are currently broken. + components ? [ + "intel.oneapi.lin.advisor" + "intel.oneapi.lin.dpcpp-cpp-compiler" + "intel.oneapi.lin.dpcpp_dbg" + "intel.oneapi.lin.vtune" + "intel.oneapi.lin.mkl.devel" + ], + + intel-oneapi, + + # For tests + runCommand, + libffi, + stdenv, +}: +intel-oneapi.mkIntelOneApi rec { + pname = "intel-oneapi-base-toolkit"; + + src = fetchurl { + url = "https://registrationcenter-download.intel.com/akdlm/IRC_NAS/3b7a16b3-a7b0-460f-be16-de0d64fa6b1e/intel-oneapi-base-toolkit-2025.2.1.44_offline.sh"; + sha256 = "0fg4mcp6syhmp2fhariv3raxlikakvm557w7ppc9vfdsj4ji2md1"; + }; + + versionYear = "2025"; + versionMajor = "2"; + versionMinor = "1"; + versionRel = "44"; + + inherit components; + + # Figured out by looking at autoPatchelfHook failure output + depsByComponent = rec { + advisor = [ + libdrm + zlib + gtk2 + gdk-pixbuf + at-spi2-atk + glib + pango + gdk-pixbuf + cairo + fontconfig + glib + freetype + xorg.libX11 + xorg.libXxf86vm + xorg.libXext + xorg.libxcb + xorg.libXcomposite + xorg.libXdamage + xorg.libXfixes + xorg.libXrandr + nss + dbus + cups + mesa + expat + libxkbcommon + eudev + alsa-lib + ncurses5 + bzip2 + libuuid + gdbm + libxcrypt-legacy + sqlite + nspr + ]; + dpcpp-cpp-compiler = [ + zlib + level-zero + ]; + dpcpp_dbg = [ + level-zero + zlib + ]; + dpcpp-ct = [ zlib ]; + mpi = [ + zlib + rdma-core + libpsm2 + ucx + libuuid + numactl + level-zero + libffi + ]; + pti = [ level-zero ]; + vtune = [ + libdrm + elfutils + zlib + xorg.libX11 + xorg.libXext + xorg.libxcb + xorg.libXcomposite + xorg.libXdamage + xorg.libXfixes + xorg.libXrandr + glib + nss + dbus + at-spi2-atk + cups + gtk3 + pango + cairo + mesa + expat + libxkbcommon + eudev + alsa-lib + at-spi2-atk + ncurses5 + bzip2 + libuuid + gdbm + libxcrypt-legacy + sqlite + nspr + ]; + mkl = mpi ++ pti; + }; + + autoPatchelfIgnoreMissingDeps = [ + # Needs to be dynamically loaded as it depends on the hardware + "libcuda.so.1" + # All too old, not in nixpkgs anymore + "libffi.so.6" + "libgdbm.so.4" + "libopencl-clang.so.14" + ]; + + passthru.updateScript = intel-oneapi.mkUpdateScript { + inherit pname; + file = "base.nix"; + downloadPage = "https://www.intel.com/content/www/us/en/developer/tools/oneapi/base-toolkit-download.html?packages=oneapi-toolkit&oneapi-toolkit-os=linux&oneapi-lin=offline"; + }; + + passthru.tests = { + mkl-libs = stdenv.mkDerivation { + name = "intel-oneapi-test-mkl-libs"; + unpackPhase = '' + cp ${./test.c} test.c + ''; + + nativeBuildInputs = [ + pkg-config + ]; + buildInputs = [ intel-oneapi ]; + + buildPhase = '' + # This will fail if no libs with mkl- in their name are found + libs="$(pkg-config --list-all | cut -d\ -f1 | grep mkl-)" + for lib in $libs; do + echo "Testing that the build succeeds with $lib" >&2 + gcc test.c -o test-with-$lib $(pkg-config --cflags --libs $lib) + done + ''; + + doCheck = true; + + checkPhase = '' + for lib in $libs; do + echo "Testing that the executable built with $lib runs" >&2 + ./test-with-$lib + done + ''; + + installPhase = '' + touch "$out" + ''; + }; + + all-binaries-run = runCommand "intel-oneapi-test-all-binaries-run" { } '' + # .*-32: 32-bit executables can't be properly patched by patchelf + # IMB-.*: all fail with a weird "bad file descriptor" error + # fi_info, fi_pingpong: exits with 1 even if ran with `--help` + # gdb-openapi: Python not initialized + # hydra_bstrap_proxy, hydra_nameserver, hydra_pmi_proxy: doesn't respect --help + # mpirun: can't find mpiexec.hydra for some reason + # sycl-ls, sycl-trace: doesn't respect --help + regex_skip="(.*-32)|(IMB-.*)|fi_info|fi_pingpong|gdb-oneapi|hydra_bstrap_proxy|hydra_nameserver|hydra_pmi_proxy|mpirun|sycl-ls|sycl-trace" + export I_MPI_ROOT="${intel-oneapi}/mpi/latest" + for bin in "${intel-oneapi}"/bin/*; do + if [[ "$bin" =~ $regex_skip ]] || [ ! -f "$bin" ] || [[ ! -x "$bin" ]]; then + echo "skipping $bin" + continue + fi + echo "trying to run $bin --help or -help" + "$bin" --help || "$bin" -help + done + touch "$out" + ''; + }; + + meta = with lib; { + description = "Intel oneAPI Base Toolkit"; + homepage = "https://software.intel.com/content/www/us/en/develop/tools/oneapi/base-toolkit.html"; + license = with lib.licenses; [ + intel-eula + issl + asl20 + ]; + maintainers = with lib.maintainers; [ + balsoft + ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/by-name/in/intel-oneapi/hpc.nix b/pkgs/by-name/in/intel-oneapi/hpc.nix new file mode 100644 index 000000000000..4454510ea5dd --- /dev/null +++ b/pkgs/by-name/in/intel-oneapi/hpc.nix @@ -0,0 +1,83 @@ +{ + lib, + fetchurl, + + # The list of components to install; + # Either [ "all" ], [ "default" ], or a custom list of components. + # If you want to install all default components plus an extra one, pass [ "default" ] + # Note that changing this will also change the `buildInputs` of the derivation. + # + # If you want other components listed of the toolkit, consider using intel-oneapi.base instead; + # This are specifically the components that are not present there. + components ? [ + "intel.oneapi.lin.dpcpp-cpp-compiler" + "intel.oneapi.lin.ifort-compiler" + "intel.oneapi.lin.mpi.devel" + "intel.oneapi.lin.tbb.devel" + ], + + intel-oneapi, + zlib, + rdma-core, + libpsm2, + ucx, + libuuid, + numactl, + level-zero, + libffi, +}: +intel-oneapi.mkIntelOneApi rec { + pname = "intel-oneapi-hpc-toolkit"; + + src = fetchurl { + url = "https://registrationcenter-download.intel.com/akdlm/IRC_NAS/2d2a6686-ff06-44ce-baf0-ab84f8dafa89/intel-oneapi-hpc-toolkit-2025.2.1.44_offline.sh"; + sha256 = "1ys8s2nh6snjiz7aglag7awy12ww01z026hzcidzy68kxq71wba8"; + }; + + versionYear = "2025"; + versionMajor = "2"; + versionMinor = "1"; + versionRel = "44"; + + inherit components; + + depsByComponent = { + mpi = [ + zlib + rdma-core + libpsm2 + ucx + libuuid + numactl + level-zero + libffi + ]; + pti = [ level-zero ]; + ifort-compiler = [ ]; + }; + + autoPatchelfIgnoreMissingDeps = [ + # Needs to be dynamically loaded as it depends on the hardware + "libcuda.so.1" + ]; + + passthru.updateScript = intel-oneapi.mkUpdateScript { + inherit pname; + file = "hpc.nix"; + downloadPage = "https://www.intel.com/content/www/us/en/developer/tools/oneapi/hpc-toolkit-download.html?packages=hpc-toolkit&hpc-toolkit-os=linux&hpc-toolkit-lin=offline"; + }; + + meta = with lib; { + description = "Intel oneAPI HPC Toolkit"; + homepage = "https://www.intel.com/content/www/us/en/developer/tools/oneapi/hpc-toolkit.html"; + license = with lib.licenses; [ + intel-eula + issl + asl20 + ]; + maintainers = with lib.maintainers; [ + balsoft + ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/by-name/in/intel-oneapi/package.nix b/pkgs/by-name/in/intel-oneapi/package.nix new file mode 100644 index 000000000000..22465fc41fae --- /dev/null +++ b/pkgs/by-name/in/intel-oneapi/package.nix @@ -0,0 +1,179 @@ +{ + lib, + callPackage, + stdenv, + ncurses5, + bc, + bubblewrap, + autoPatchelfHook, + python3, + libgcc, + glibc, + writeShellScript, + writeText, + writeTextFile, +}: + +{ + mkIntelOneApi = + { + pname, + versionYear, + versionMajor, + versionMinor, + versionRel, + src, + meta, + depsByComponent ? { }, + postInstall ? "", + components ? [ "default" ], + ... + }@args: + let + shortName = name: builtins.elemAt (lib.splitString "." name) 3; + in + stdenv.mkDerivation ( + fa: + { + version = "${fa.versionYear}.${fa.versionMajor}.${fa.versionMinor}.${fa.versionRel}"; + + nativeBuildInputs = [ + # Installer wants tput + ncurses5 + # Used to check if there's enough disk space + bc + bubblewrap + + autoPatchelfHook + + # For patchShebangs + python3 + ]; + + # autoPatchelfHook will add these libraries to RPATH as required + buildInputs = lib.concatLists ( + map ( + comp: + if comp == "all" || comp == "default" then + lib.concatLists (builtins.attrValues depsByComponent) + else + depsByComponent.${shortName comp} or [ ] + ) components + ); + + phases = [ + "installPhase" + "fixupPhase" + ]; + + # See https://software.intel.com/content/www/us/en/develop/documentation/installation-guide-for-intel-oneapi-toolkits-linux/top/installation/install-with-command-line.html + installPhase = '' + runHook preInstall + # The installer expects a writeable home directory, even if installing elsewhere + export HOME="$(mktemp -d)" + + # The installer expects that the installation directory is already present + mkdir -p "$out" + + # Required for the installer to find libstdc++ + export LD_LIBRARY_PATH="${lib.makeLibraryPath [ libgcc.lib ]}" + + # The installer is an insane four-stage rube goldberg machine: + # 1. Our $src (bash script) unpacks install.sh (bash script) + # 2. install.sh unpacks bootstrapper (dylinked binary with hardcoded interpreter in /lib) + # 3. bootstrapper unpacks installer (dylinked binary with hardcoded interpreter and libraries in /lib) + # 4. installer installs the actual components we need + # + # While stage 1 allows to "only extract", other stages always try running the next executable down, and remove stuff if they fail. + # I'm afraid this is the cleanest solution for now. + mkdir -p fhs-root/{lib,lib64} + ln -s "${glibc}/lib/"* fhs-root/lib/ + ln -s "${glibc}/lib/"* fhs-root/lib64/ + bwrap \ + --bind fhs-root / \ + --bind /nix /nix \ + --ro-bind /bin /bin \ + --dev /dev \ + --proc /proc \ + bash "$src" \ + -a \ + --silent \ + --eula accept \ + --install-dir "$out" \ + --components ${lib.concatStringsSep ":" components} + + # Non-reproducible + rm -rf "$out"/logs + # This contains broken symlinks and doesn't seem to be useful + rm -rf "$out"/.toolkit_linking_tool + + ln -s "$out/$versionYear.$versionMajor"/{lib,etc,bin,share,opt} "$out" + + runHook postInstall + ''; + } + // (builtins.removeAttrs args [ + "depsByComponent" + "components" + ]) + ); + + mkUpdateScript = + { + pname, + downloadPage, + file, + }: + writeTextFile { + name = "update-intel-oneapi"; + executable = true; + text = '' + #!/usr/bin/env nix-shell + #!nix-shell -i bash -p curl jq htmlq common-updater-scripts + + download_page=${lib.escapeShellArg downloadPage} + pname=${lib.escapeShellArg pname} + nixpkgs="$(git rev-parse --show-toplevel)" + packageDir="$nixpkgs/pkgs/by-name/in/intel-oneapi" + file="$packageDir"/${lib.escapeShellArg file} + + echo 'Figuring out the download URL' >&2 + + # Intel helpfully gives us a wget command to run so that we can download the toolkit installer, as part of their product page. + # This variable will contain that command (wget https://...), we will extract the URL from it. + wget_command="$(curl "$download_page" \ + | htmlq 'code' --text \ + | grep "wget.*$pname.*sh")" + + regex="wget (.*$pname.([0-9]+)[.]([0-9]+)[.]([0-9]+)[.]([0-9]+)_offline[.]sh)" + if [[ "$wget_command" =~ $regex ]]; then + url="''${BASH_REMATCH[1]}" + versionYear="''${BASH_REMATCH[2]}" + versionMajor="''${BASH_REMATCH[3]}" + versionMinor="''${BASH_REMATCH[4]}" + versionRel="''${BASH_REMATCH[5]}" + else + echo "'$wget_command' does not match the expected format $regex" >&2 + exit 1 + fi + + if [[ "$(grep 'url =' "$file")" =~ "$url" ]] && [[ "''${BASH_REMATCH[0]}" == "$url" ]]; then + echo "The URL is the same ($url), skipping prefetch" >&2 + sha256="$(jq .sha256 < "$outFile")" + else + echo "The new download URL is $url, prefetching it to store" >&2 + sha256=$(nix-prefetch-url --quiet "$url") + fi + + sed -i "s|versionYear = \".*\";|versionYear = \"$versionYear\";|" "$file" + sed -i "s|versionMajor = \".*\";|versionMajor = \"$versionMajor\";|" "$file" + sed -i "s|versionMinor = \".*\";|versionMinor = \"$versionMinor\";|" "$file" + sed -i "s|versionRel = \".*\";|versionRel = \"$versionRel\";|" "$file" + sed -i "s|url = \".*\";|url = \"$url\";|" "$file" + sed -i "s|sha256 = \".*\";|sha256 = \"$sha256\";|" "$file" + ''; + }; + + base = callPackage ./base.nix { }; + hpc = callPackage ./hpc.nix { }; +} From d1666ad1555418c93da362cdf9089710a2f61703 Mon Sep 17 00:00:00 2001 From: Luna Nova Date: Sat, 4 Oct 2025 18:47:45 -0700 Subject: [PATCH 09/42] adaptivecpp: unpin rocmPackages_6 adaptivecpp will work fine with ROCm 7, this pin was a holdover from when rocmPackages_5/6 coexisted. --- pkgs/by-name/ad/adaptivecpp/package.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/by-name/ad/adaptivecpp/package.nix b/pkgs/by-name/ad/adaptivecpp/package.nix index a59389109be1..3c17cb88edbf 100644 --- a/pkgs/by-name/ad/adaptivecpp/package.nix +++ b/pkgs/by-name/ad/adaptivecpp/package.nix @@ -10,7 +10,7 @@ makeWrapper, config, cudaPackages, - rocmPackages_6, + rocmPackages, ompSupport ? true, openclSupport ? false, rocmSupport ? config.rocmSupport, @@ -23,7 +23,6 @@ }: let inherit (llvmPackages) stdenv; - rocmPackages = rocmPackages_6; llvmPackages = llvmPackages_18; in stdenv.mkDerivation (finalAttrs: { From 84555f540cc93d75a668d9efa71c70c96deeeedf Mon Sep 17 00:00:00 2001 From: Vivek Date: Sun, 5 Oct 2025 11:19:34 -0700 Subject: [PATCH 10/42] nixos/vnstat: allow overriding package --- nixos/modules/services/monitoring/vnstat.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/monitoring/vnstat.nix b/nixos/modules/services/monitoring/vnstat.nix index 958a46e81730..73b0cf0049af 100644 --- a/nixos/modules/services/monitoring/vnstat.nix +++ b/nixos/modules/services/monitoring/vnstat.nix @@ -10,11 +10,12 @@ in { options.services.vnstat = { enable = lib.mkEnableOption "update of network usage statistics via vnstatd"; + package = lib.mkPackageOption pkgs "vnstat" { }; }; config = lib.mkIf cfg.enable { - environment.systemPackages = [ pkgs.vnstat ]; + environment.systemPackages = [ cfg.package ]; users = { groups.vnstatd = { }; @@ -37,7 +38,7 @@ in "man:vnstat.conf(5)" ]; serviceConfig = { - ExecStart = "${pkgs.vnstat}/bin/vnstatd -n"; + ExecStart = "${cfg.package}/bin/vnstatd -n"; ExecReload = "${pkgs.procps}/bin/kill -HUP $MAINPID"; # Hardening (from upstream example service) From cbf8458b90794b436e4c9ac770354405f0a03320 Mon Sep 17 00:00:00 2001 From: MithicSpirit Date: Sat, 16 Aug 2025 13:11:46 -0400 Subject: [PATCH 11/42] nixos/kdeconnect: nullable package Allows setting `programs.kdeconnect.package = null`, which is useful in case the user just wants to open the appropriate ports without picking any specific package to install system-wide. --- nixos/modules/programs/kdeconnect.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/nixos/modules/programs/kdeconnect.nix b/nixos/modules/programs/kdeconnect.nix index f51eeb9c6ced..2024c831821a 100644 --- a/nixos/modules/programs/kdeconnect.nix +++ b/nixos/modules/programs/kdeconnect.nix @@ -16,6 +16,7 @@ implementation if you use Gnome ''; package = lib.mkPackageOption pkgs [ "kdePackages" "kdeconnect-kde" ] { + nullable = true; example = "gnomeExtensions.gsconnect"; }; }; @@ -24,7 +25,7 @@ cfg = config.programs.kdeconnect; in lib.mkIf cfg.enable { - environment.systemPackages = [ + environment.systemPackages = lib.optional (cfg.package != null) [ cfg.package ]; networking.firewall = rec { From 8ff0f61cd91226f34c34246783d9d07552c69e50 Mon Sep 17 00:00:00 2001 From: Sigmanificient Date: Thu, 9 Oct 2025 22:41:25 +0200 Subject: [PATCH 12/42] ruby.withPackages: set mainProgram --- pkgs/development/ruby-modules/with-packages/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/ruby-modules/with-packages/default.nix b/pkgs/development/ruby-modules/with-packages/default.nix index 96bb7018cc29..8e63fa12edaa 100644 --- a/pkgs/development/ruby-modules/with-packages/default.nix +++ b/pkgs/development/ruby-modules/with-packages/default.nix @@ -96,6 +96,8 @@ let inherit wrappedRuby; gems = selected; }; + + meta.mainProgram = "ruby"; }; in From 17151f0728985828eebf8ab7a9aad96f868f7151 Mon Sep 17 00:00:00 2001 From: mksafavi Date: Mon, 6 Oct 2025 19:33:42 +0330 Subject: [PATCH 13/42] reaper-sws-extension: 2.14.0.3 -> 2.14.0.7 update to version 2.14.0.7 and marked darwin build as broken Co-authored-by: pancaek <20342389+pancaek@users.noreply.github.com> --- pkgs/by-name/re/reaper-sws-extension/darwin.nix | 8 ++++---- pkgs/by-name/re/reaper-sws-extension/linux.nix | 2 +- pkgs/by-name/re/reaper-sws-extension/package.nix | 3 ++- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/re/reaper-sws-extension/darwin.nix b/pkgs/by-name/re/reaper-sws-extension/darwin.nix index 1ad6b3688032..25faa71693d6 100644 --- a/pkgs/by-name/re/reaper-sws-extension/darwin.nix +++ b/pkgs/by-name/re/reaper-sws-extension/darwin.nix @@ -23,8 +23,8 @@ stdenvNoCC.mkDerivation (finalAttrs: { "https://github.com/reaper-oss/sws/releases/download/v${finalAttrs.version}/reaper_sws-${arch}.dylib"; hash = { - x86_64-darwin = "sha256-B185QWS9FaC/0XDhxUBbgr9zu2Ot8OIsfaPQ3sUHh4s="; - aarch64-darwin = "sha256-8gbyPlnIXdWtSD+Aj70xzacJhO34edTTG2IOryB67os="; + x86_64-darwin = "sha256-c0enRIXFN+dMDdxTQ3hFv0almTF0dfrSHILNigJp2Js="; + aarch64-darwin = "sha256-jmuob0qslYhxiE2ShfTwY4RJAKBLJSUb+VBEM0sQPbo="; } .${stdenvNoCC.hostPlatform.system}; }; @@ -33,11 +33,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { plugin (fetchurl { url = "https://github.com/reaper-oss/sws/releases/download/v${finalAttrs.version}/sws_python64.py"; - hash = "sha256-Yujj60+jOEfdSZ74cRU1Wxoh7RL2fo/IhJIpa+BDYV0="; + hash = "sha256-GDlvfARg1g5oTH2itEug6Auxr9iFlPDdGueInGmHqSI="; }) (fetchurl { url = "https://github.com/reaper-oss/sws/releases/download/v${finalAttrs.version}/sws_python32.py"; - hash = "sha256-QktzdIDpTvNs9IrH7TOI6LTIBkfuQ3cqw06iqLxSSTI="; + hash = "sha256-np2r568csSdIS7VZHDASroZlXhpfxXwNn0gROTinWU4="; }) ]; diff --git a/pkgs/by-name/re/reaper-sws-extension/linux.nix b/pkgs/by-name/re/reaper-sws-extension/linux.nix index c45de74689b8..892c40506ee6 100644 --- a/pkgs/by-name/re/reaper-sws-extension/linux.nix +++ b/pkgs/by-name/re/reaper-sws-extension/linux.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "reaper-oss"; repo = "sws"; tag = "v${finalAttrs.version}"; - hash = "sha256-37pBbNACQuuEk1HJTiUHdb0mDiR2+ZsEQUOhz7mrPPg="; + hash = "sha256-J2igVacDClHgKGZ2WATcd5XW2FkarKtALxVLgqa90Cs="; fetchSubmodules = true; }; diff --git a/pkgs/by-name/re/reaper-sws-extension/package.nix b/pkgs/by-name/re/reaper-sws-extension/package.nix index 4f8a4892cc17..fe563e260a99 100644 --- a/pkgs/by-name/re/reaper-sws-extension/package.nix +++ b/pkgs/by-name/re/reaper-sws-extension/package.nix @@ -9,7 +9,7 @@ in callPackage p { pname = "reaper-sws-extension"; - version = "2.14.0.3"; + version = "2.14.0.7"; meta = { description = "Reaper Plugin Extension"; longDescription = '' @@ -25,5 +25,6 @@ callPackage p { "x86_64-darwin" "aarch64-darwin" ]; + broken = stdenvNoCC.hostPlatform.isDarwin; }; } From 862b716d8f4bc2f1747ee8816616ebca07ba8a60 Mon Sep 17 00:00:00 2001 From: Linus Karl Date: Fri, 10 Oct 2025 18:46:51 +0200 Subject: [PATCH 14/42] indilib: 2.1.5.1 -> 2.1.6 --- .../science/astronomy/indilib/default.nix | 20 +++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/science/astronomy/indilib/default.nix b/pkgs/development/libraries/science/astronomy/indilib/default.nix index cbbddf3d33e4..527f716a686d 100644 --- a/pkgs/development/libraries/science/astronomy/indilib/default.nix +++ b/pkgs/development/libraries/science/astronomy/indilib/default.nix @@ -2,6 +2,7 @@ stdenv, lib, fetchFromGitHub, + fetchpatch2, bash, cmake, cfitsio, @@ -17,22 +18,36 @@ fftw, gtest, udevCheckHook, + versionCheckHook, indi-full, }: stdenv.mkDerivation (finalAttrs: { pname = "indilib"; - version = "2.1.5.1"; + version = "2.1.6"; src = fetchFromGitHub { owner = "indilib"; repo = "indi"; rev = "v${finalAttrs.version}"; - hash = "sha256-mbY3iDLRcQ+pis26u6pHzB43ureaKH7KYPkV0CwHU/E="; + hash = "sha256-0+ZC9NoanBDojYz/ufZUpUQB++vnMcUYtG1UmmVGbTg="; }; + # fixes version number. This commit is directly after the tagged commit in master + # should be removed with the next release + patches = [ + (fetchpatch2 { + url = "https://github.com/indilib/indi/commit/91e3e35250126887a856e90b6a0a30697fb01545.patch?full_index=1"; + hash = "sha256-ho1S+A6gTQ9ELy/QE14S6daXyMN+vASFbXa2vMWdqR8="; + }) + ]; + nativeBuildInputs = [ cmake + ]; + + nativeInstallCheckInputs = [ + versionCheckHook udevCheckHook ]; @@ -86,6 +101,7 @@ stdenv.mkDerivation (finalAttrs: { description = "Implementation of the INDI protocol for POSIX operating systems"; changelog = "https://github.com/indilib/indi/releases/tag/v${finalAttrs.version}"; license = licenses.lgpl2Plus; + mainProgram = "indiserver"; maintainers = with maintainers; [ sheepforce returntoreality From fc1c8dd7bde208b90fd6f9cfef60987cee530574 Mon Sep 17 00:00:00 2001 From: Sigmanificient Date: Sat, 11 Oct 2025 23:28:57 +0200 Subject: [PATCH 15/42] python313Packages.kiss-headers: fix build --- pkgs/development/python-modules/kiss-headers/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/kiss-headers/default.nix b/pkgs/development/python-modules/kiss-headers/default.nix index 79011b9660bf..8e858c60945a 100644 --- a/pkgs/development/python-modules/kiss-headers/default.nix +++ b/pkgs/development/python-modules/kiss-headers/default.nix @@ -29,9 +29,12 @@ buildPythonPackage rec { pytest-cov-stub ]; + preCheck = '' + rm -rf src # cause pycache conflict + ''; + disabledTestPaths = [ # Tests require internet access - "kiss_headers/__init__.py" "tests/test_serializer.py" "tests/test_with_http_request.py" ]; From 15d2ec50026f7ae70cf16935d75489e06a2be7ee Mon Sep 17 00:00:00 2001 From: Sigmanificient Date: Sat, 11 Oct 2025 23:52:54 +0200 Subject: [PATCH 16/42] python313Packages.mrsqm: 0.0.5 -> 0.0.7 --- pkgs/development/python-modules/mrsqm/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/mrsqm/default.nix b/pkgs/development/python-modules/mrsqm/default.nix index e8a2a0ffea8b..e6828479a5dd 100644 --- a/pkgs/development/python-modules/mrsqm/default.nix +++ b/pkgs/development/python-modules/mrsqm/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "mrsqm"; - version = "4"; + version = "0.0.7"; pyproject = true; build-system = [ @@ -28,8 +28,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "mlgig"; repo = "mrsqm"; - tag = "r${version}"; - hash = "sha256-59f18zItV3K6tXcg1v1q2Z8HYrQB8T0ntaaqjxeAEbM="; + tag = "v.${version}"; + hash = "sha256-5K6vCU0HExnmYNThZNDCbEtII9bUGauxDtKkJXe/85Q="; }; buildInputs = [ fftw ]; From 650299d09646e9137acb6526b21680bcdbdc2071 Mon Sep 17 00:00:00 2001 From: Sigmanificient Date: Sun, 12 Oct 2025 00:27:22 +0200 Subject: [PATCH 17/42] python313Packages.pynut2: fix build --- pkgs/development/python-modules/pynut2/default.nix | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pynut2/default.nix b/pkgs/development/python-modules/pynut2/default.nix index 44c687f12592..a00f3d32dcfb 100644 --- a/pkgs/development/python-modules/pynut2/default.nix +++ b/pkgs/development/python-modules/pynut2/default.nix @@ -3,12 +3,14 @@ buildPythonPackage, fetchFromGitHub, requests, + standard-telnetlib, + setuptools, }: buildPythonPackage rec { pname = "pynut2"; version = "2.1.2"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "mezz64"; @@ -17,7 +19,12 @@ buildPythonPackage rec { sha256 = "1lg7n1frndfgw73s0ssl1h7kc6zxm7fpiwlc6v6d60kxzaj1dphx"; }; - propagatedBuildInputs = [ requests ]; + build-system = [ setuptools ]; + + dependencies = [ + requests + standard-telnetlib + ]; pythonImportsCheck = [ "pynut2.nut2" ]; From 4979a82d1403ecdaf1cfb32e6893f13fb795216e Mon Sep 17 00:00:00 2001 From: Sigmanificient Date: Sun, 12 Oct 2025 00:58:55 +0200 Subject: [PATCH 18/42] python313Packages.segyio: fix build --- .../segyio/add_missing_cstdint.patch | 47 ------------------- .../python-modules/segyio/default.nix | 12 ++--- .../segyio/explicitly-cast.patch | 32 ------------- .../segyio/fix-setuptools.patch | 32 ------------- .../python-modules/segyio/numpy-2.patch | 34 -------------- 5 files changed, 6 insertions(+), 151 deletions(-) delete mode 100644 pkgs/development/python-modules/segyio/add_missing_cstdint.patch delete mode 100644 pkgs/development/python-modules/segyio/explicitly-cast.patch delete mode 100644 pkgs/development/python-modules/segyio/fix-setuptools.patch delete mode 100644 pkgs/development/python-modules/segyio/numpy-2.patch diff --git a/pkgs/development/python-modules/segyio/add_missing_cstdint.patch b/pkgs/development/python-modules/segyio/add_missing_cstdint.patch deleted file mode 100644 index 2c26d6e454b1..000000000000 --- a/pkgs/development/python-modules/segyio/add_missing_cstdint.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 64f06c0643f1f8691a8f2757496b60f1ab98c866 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Sa=C3=AFd=20Benaissa?= -Date: Fri, 8 Dec 2023 21:51:32 +0100 -Subject: [PATCH] Add include for cstdint, fix segyio build on fedora - ---- - lib/experimental/segyio/segyio.hpp | 1 + - python/segyio/segyio.cpp | 1 + - python/setup.py | 2 +- - 3 files changed, 3 insertions(+), 1 deletion(-) - -diff --git a/lib/experimental/segyio/segyio.hpp b/lib/experimental/segyio/segyio.hpp -index 706f07ff5..7ba3ffb99 100644 ---- a/lib/experimental/segyio/segyio.hpp -+++ b/lib/experimental/segyio/segyio.hpp -@@ -13,6 +13,7 @@ - #include - - #include -+#include - - /* - * KNOWN ISSUES AND TODOs: -diff --git a/python/segyio/segyio.cpp b/python/segyio/segyio.cpp -index 76da965c3..bd8a8622e 100644 ---- a/python/segyio/segyio.cpp -+++ b/python/segyio/segyio.cpp -@@ -16,6 +16,7 @@ - #include - #include - #include -+#include - - #if PY_MAJOR_VERSION >= 3 - #define IS_PY3K -diff --git a/python/setup.py b/python/setup.py -index 6c6553bc7..654075be9 100644 ---- a/python/setup.py -+++ b/python/setup.py -@@ -1,6 +1,6 @@ - import os - import sys --import skbuild -+import skbuild # pip install scikit-build - import setuptools - - long_description = """ diff --git a/pkgs/development/python-modules/segyio/default.nix b/pkgs/development/python-modules/segyio/default.nix index 1346623c9807..ed8276efe92f 100644 --- a/pkgs/development/python-modules/segyio/default.nix +++ b/pkgs/development/python-modules/segyio/default.nix @@ -2,6 +2,7 @@ lib, buildPythonPackage, fetchFromGitHub, + fetchpatch, cmake, ninja, scikit-build, @@ -15,12 +16,11 @@ buildPythonPackage rec { pyproject = false; # Built with cmake patches = [ - # https://github.com/equinor/segyio/pull/570 - ./add_missing_cstdint.patch - # https://github.com/equinor/segyio/pull/576/ - ./fix-setuptools.patch - ./explicitly-cast.patch - ./numpy-2.patch + # Bump minimum CMake version to 3.11 + (fetchpatch { + url = "https://github.com/equinor/segyio/commit/3e2cbe6ca6d4bc7d4f4d95666f5d2983836e8461.patch?full_index=1"; + hash = "sha256-sOBHi8meMSkxEZy0AXwebAnIVPatpwQHd+4Co5zIhLQ="; + }) ]; postPatch = '' diff --git a/pkgs/development/python-modules/segyio/explicitly-cast.patch b/pkgs/development/python-modules/segyio/explicitly-cast.patch deleted file mode 100644 index 7030f07e5f72..000000000000 --- a/pkgs/development/python-modules/segyio/explicitly-cast.patch +++ /dev/null @@ -1,32 +0,0 @@ -From eafe8476566e1d8e8b9a486ca808685cb439a767 Mon Sep 17 00:00:00 2001 -From: Sveinung Rundhovde -Date: Mon, 29 Jul 2024 10:46:35 +0200 -Subject: [PATCH] Explicitly cast from BinField to int - -Parsing segyio.BinField type as int in PyArg_ParseTuple is no longer -possible. ---- - python/segyio/open.py | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/python/segyio/open.py b/python/segyio/open.py -index cd902c15..80bc3a5b 100644 ---- a/python/segyio/open.py -+++ b/python/segyio/open.py -@@ -166,8 +166,8 @@ def open(filename, mode="r", iline = 189, - f = segyio.SegyFile(fd, - filename = str(filename), - mode = mode, -- iline = iline, -- xline = xline, -+ iline = int(iline), -+ xline = int(xline), - endian = endian, - ) - -@@ -189,4 +189,4 @@ def open(filename, mode="r", iline = 189, - if ignore_geometry: - return f - -- return infer_geometry(f, metrics, iline, xline, strict) -+ return infer_geometry(f, metrics, int(iline), int(xline), strict) diff --git a/pkgs/development/python-modules/segyio/fix-setuptools.patch b/pkgs/development/python-modules/segyio/fix-setuptools.patch deleted file mode 100644 index 42b4260434ad..000000000000 --- a/pkgs/development/python-modules/segyio/fix-setuptools.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 6df089258c2ef4356427263f652cff0c053c6173 Mon Sep 17 00:00:00 2001 -From: Sveinung Rundhovde -Date: Fri, 26 Jul 2024 15:03:33 +0200 -Subject: [PATCH] Fix attribute error in setup.py - -This line was causing a error due to an update to scikit-build. The -issue was that the setuptools.command.test module is not put into the -symbol table by the setuptools import, but it was put there during the -skbuild import causing it to be available. Due to changes in -scikit-build this is no longer the case and the line gives an -AttributError. - -The rationale for this line was that scikit-builds test command implied -develop (this was obnoxious), something that is no longer true. There is -thus no longer any reason to keep this line, so we can fix this issue by -simply removing it. ---- - python/setup.py | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/python/setup.py b/python/setup.py -index 6c6553bc..6bae62f0 100644 ---- a/python/setup.py -+++ b/python/setup.py -@@ -95,7 +95,6 @@ def src(x): - # supported OS X release 10.9 - '-DCMAKE_OSX_DEPLOYMENT_TARGET=10.9', - ], -- cmdclass = { 'test': setuptools.command.test.test }, - classifiers = [ - 'Development Status :: 5 - Production/Stable', - 'Environment :: Other Environment', diff --git a/pkgs/development/python-modules/segyio/numpy-2.patch b/pkgs/development/python-modules/segyio/numpy-2.patch deleted file mode 100644 index fa8b1d41002c..000000000000 --- a/pkgs/development/python-modules/segyio/numpy-2.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 75b2156a6414e2464eb15663004b8ab928374135 Mon Sep 17 00:00:00 2001 -From: Sveinung Rundhovde -Date: Tue, 30 Jul 2024 08:32:56 +0200 -Subject: [PATCH] Fix test failing due to Numpy 2.0 promotion rules - -From Numpy 2.0 adding a numpy.float32 and a Python numeric type returns -a numy.float32 when it previously returned a numpy.float64. This changes -the behavior when using the Python builtin sum function on a -numpy.float32 array as the internal computations now will be performed -as numpy.float32 additions when it used to be numpy.float64. - -Passing a numpy.double(0) as a start value to the innermost sum forces -the old behavior and provides consistent results for Numpy 1 and 2. ---- - python/test/segyio_c.py | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/python/test/segyio_c.py b/python/test/segyio_c.py -index 45fe95d89..b1e144d9d 100644 ---- a/python/test/segyio_c.py -+++ b/python/test/segyio_c.py -@@ -540,10 +540,10 @@ def read_line(f, metrics, iline_idx, xline_idx): - buf = numpy.zeros((len(iline_idx), samples), dtype=numpy.single) - - f.getline(xline_trace0, len(iline_idx), xline_stride, offsets, buf) -- assert sum(sum(buf)) == approx(800.061169624, abs=1e-6) -+ assert sum(sum(buf), numpy.double(0)) == approx(800.061169624, abs=1e-6) - - f.getline(iline_trace0, len(xline_idx), iline_stride, offsets, buf) -- assert sum(sum(buf)) == approx(305.061146736, abs=1e-6) -+ assert sum(sum(buf), numpy.double(0)) == approx(305.061146736, abs=1e-6) - - f.close() - From 947f79b2cc9e55c4e1f7be28cd968aa81bbff25a Mon Sep 17 00:00:00 2001 From: Alexander Bantyev Date: Sun, 12 Oct 2025 17:40:58 +0400 Subject: [PATCH 19/42] fixup! intel-oneapi.{base,hpc}: init at 2025.2.1.44 --- pkgs/by-name/in/intel-oneapi/base.nix | 14 +-- pkgs/by-name/in/intel-oneapi/hpc.nix | 10 +-- pkgs/by-name/in/intel-oneapi/package.nix | 105 ++++++++++++----------- pkgs/by-name/in/intel-oneapi/test.c | 12 +++ 4 files changed, 81 insertions(+), 60 deletions(-) create mode 100644 pkgs/by-name/in/intel-oneapi/test.c diff --git a/pkgs/by-name/in/intel-oneapi/base.nix b/pkgs/by-name/in/intel-oneapi/base.nix index 185b77127d8c..749009ad48b7 100644 --- a/pkgs/by-name/in/intel-oneapi/base.nix +++ b/pkgs/by-name/in/intel-oneapi/base.nix @@ -56,12 +56,12 @@ libffi, stdenv, }: -intel-oneapi.mkIntelOneApi rec { +intel-oneapi.mkIntelOneApi (fa: { pname = "intel-oneapi-base-toolkit"; src = fetchurl { url = "https://registrationcenter-download.intel.com/akdlm/IRC_NAS/3b7a16b3-a7b0-460f-be16-de0d64fa6b1e/intel-oneapi-base-toolkit-2025.2.1.44_offline.sh"; - sha256 = "0fg4mcp6syhmp2fhariv3raxlikakvm557w7ppc9vfdsj4ji2md1"; + hash = "sha256-oVURJZG6uZ3YvYefUuqeakbaVR47ZgWduBV6bS6r5Dk="; }; versionYear = "2025"; @@ -176,7 +176,7 @@ intel-oneapi.mkIntelOneApi rec { ]; passthru.updateScript = intel-oneapi.mkUpdateScript { - inherit pname; + inherit (fa) pname; file = "base.nix"; downloadPage = "https://www.intel.com/content/www/us/en/developer/tools/oneapi/base-toolkit-download.html?packages=oneapi-toolkit&oneapi-toolkit-os=linux&oneapi-lin=offline"; }; @@ -191,7 +191,7 @@ intel-oneapi.mkIntelOneApi rec { nativeBuildInputs = [ pkg-config ]; - buildInputs = [ intel-oneapi ]; + buildInputs = [ intel-oneapi.base ]; buildPhase = '' # This will fail if no libs with mkl- in their name are found @@ -225,7 +225,7 @@ intel-oneapi.mkIntelOneApi rec { # mpirun: can't find mpiexec.hydra for some reason # sycl-ls, sycl-trace: doesn't respect --help regex_skip="(.*-32)|(IMB-.*)|fi_info|fi_pingpong|gdb-oneapi|hydra_bstrap_proxy|hydra_nameserver|hydra_pmi_proxy|mpirun|sycl-ls|sycl-trace" - export I_MPI_ROOT="${intel-oneapi}/mpi/latest" + export I_MPI_ROOT="${intel-oneapi.base}/mpi/latest" for bin in "${intel-oneapi}"/bin/*; do if [[ "$bin" =~ $regex_skip ]] || [ ! -f "$bin" ] || [[ ! -x "$bin" ]]; then echo "skipping $bin" @@ -238,7 +238,7 @@ intel-oneapi.mkIntelOneApi rec { ''; }; - meta = with lib; { + meta = { description = "Intel oneAPI Base Toolkit"; homepage = "https://software.intel.com/content/www/us/en/develop/tools/oneapi/base-toolkit.html"; license = with lib.licenses; [ @@ -251,4 +251,4 @@ intel-oneapi.mkIntelOneApi rec { ]; platforms = [ "x86_64-linux" ]; }; -} +}) diff --git a/pkgs/by-name/in/intel-oneapi/hpc.nix b/pkgs/by-name/in/intel-oneapi/hpc.nix index 4454510ea5dd..181205a0ef76 100644 --- a/pkgs/by-name/in/intel-oneapi/hpc.nix +++ b/pkgs/by-name/in/intel-oneapi/hpc.nix @@ -26,12 +26,12 @@ level-zero, libffi, }: -intel-oneapi.mkIntelOneApi rec { +intel-oneapi.mkIntelOneApi (fa: { pname = "intel-oneapi-hpc-toolkit"; src = fetchurl { url = "https://registrationcenter-download.intel.com/akdlm/IRC_NAS/2d2a6686-ff06-44ce-baf0-ab84f8dafa89/intel-oneapi-hpc-toolkit-2025.2.1.44_offline.sh"; - sha256 = "1ys8s2nh6snjiz7aglag7awy12ww01z026hzcidzy68kxq71wba8"; + hash = "sha256-SC0eDu4TGf9bZB8aAX4AnIvguTpP0afOj9JqA63QSPs="; }; versionYear = "2025"; @@ -62,12 +62,12 @@ intel-oneapi.mkIntelOneApi rec { ]; passthru.updateScript = intel-oneapi.mkUpdateScript { - inherit pname; + inherit (fa) pname; file = "hpc.nix"; downloadPage = "https://www.intel.com/content/www/us/en/developer/tools/oneapi/hpc-toolkit-download.html?packages=hpc-toolkit&hpc-toolkit-os=linux&hpc-toolkit-lin=offline"; }; - meta = with lib; { + meta = { description = "Intel oneAPI HPC Toolkit"; homepage = "https://www.intel.com/content/www/us/en/developer/tools/oneapi/hpc-toolkit.html"; license = with lib.licenses; [ @@ -80,4 +80,4 @@ intel-oneapi.mkIntelOneApi rec { ]; platforms = [ "x86_64-linux" ]; }; -} +}) diff --git a/pkgs/by-name/in/intel-oneapi/package.nix b/pkgs/by-name/in/intel-oneapi/package.nix index 22465fc41fae..217756b9a9c1 100644 --- a/pkgs/by-name/in/intel-oneapi/package.nix +++ b/pkgs/by-name/in/intel-oneapi/package.nix @@ -12,28 +12,43 @@ writeShellScript, writeText, writeTextFile, + + # For the updater script + writeShellApplication, + curl, + jq, + htmlq, + common-updater-scripts, + writableTmpDirAsHomeHook, }: { - mkIntelOneApi = - { - pname, - versionYear, - versionMajor, - versionMinor, - versionRel, - src, - meta, - depsByComponent ? { }, - postInstall ? "", - components ? [ "default" ], - ... - }@args: - let - shortName = name: builtins.elemAt (lib.splitString "." name) 3; - in - stdenv.mkDerivation ( + mkIntelOneApi = lib.extendMkDerivation { + constructDrv = stdenv.mkDerivation; + + excludeDrvArgNames = [ + "depsByComponent" + "components" + ]; + + extendDrvArgs = fa: + { + pname, + versionYear, + versionMajor, + versionMinor, + versionRel, + src, + meta, + depsByComponent ? { }, + postInstall ? "", + components ? [ "default" ], + ... + }@args: + let + shortName = name: builtins.elemAt (lib.splitString "." name) 3; + in { version = "${fa.versionYear}.${fa.versionMajor}.${fa.versionMinor}.${fa.versionRel}"; @@ -45,21 +60,21 @@ bubblewrap autoPatchelfHook - - # For patchShebangs - python3 + writableTmpDirAsHomeHook ]; + buildInputs = [ + # For patchShebangs + python3 + ] # autoPatchelfHook will add these libraries to RPATH as required - buildInputs = lib.concatLists ( - map ( - comp: - if comp == "all" || comp == "default" then - lib.concatLists (builtins.attrValues depsByComponent) - else - depsByComponent.${shortName comp} or [ ] - ) components - ); + ++ lib.concatMap ( + comp: + if comp == "all" || comp == "default" then + lib.concatLists (builtins.attrValues depsByComponent) + else + depsByComponent.${shortName comp} or [ ] + ) components; phases = [ "installPhase" @@ -69,9 +84,6 @@ # See https://software.intel.com/content/www/us/en/develop/documentation/installation-guide-for-intel-oneapi-toolkits-linux/top/installation/install-with-command-line.html installPhase = '' runHook preInstall - # The installer expects a writeable home directory, even if installing elsewhere - export HOME="$(mktemp -d)" - # The installer expects that the installation directory is already present mkdir -p "$out" @@ -111,12 +123,8 @@ runHook postInstall ''; - } - // (builtins.removeAttrs args [ - "depsByComponent" - "components" - ]) - ); + }; + }; mkUpdateScript = { @@ -124,13 +132,15 @@ downloadPage, file, }: - writeTextFile { + writeShellApplication { name = "update-intel-oneapi"; - executable = true; + runtimeInputs = [ + curl + jq + htmlq + common-updater-scripts + ]; text = '' - #!/usr/bin/env nix-shell - #!nix-shell -i bash -p curl jq htmlq common-updater-scripts - download_page=${lib.escapeShellArg downloadPage} pname=${lib.escapeShellArg pname} nixpkgs="$(git rev-parse --show-toplevel)" @@ -158,11 +168,10 @@ fi if [[ "$(grep 'url =' "$file")" =~ "$url" ]] && [[ "''${BASH_REMATCH[0]}" == "$url" ]]; then - echo "The URL is the same ($url), skipping prefetch" >&2 - sha256="$(jq .sha256 < "$outFile")" + echo "The URL is the same ($url), skipping update" >&2 else echo "The new download URL is $url, prefetching it to store" >&2 - sha256=$(nix-prefetch-url --quiet "$url") + hash="$(nix-hash --to-sri --type sha256 "$(nix-prefetch-url --quiet "$url")")" fi sed -i "s|versionYear = \".*\";|versionYear = \"$versionYear\";|" "$file" @@ -170,7 +179,7 @@ sed -i "s|versionMinor = \".*\";|versionMinor = \"$versionMinor\";|" "$file" sed -i "s|versionRel = \".*\";|versionRel = \"$versionRel\";|" "$file" sed -i "s|url = \".*\";|url = \"$url\";|" "$file" - sed -i "s|sha256 = \".*\";|sha256 = \"$sha256\";|" "$file" + sed -i "s|hash = \".*\";|hash = \"$hash\";|" "$file" ''; }; diff --git a/pkgs/by-name/in/intel-oneapi/test.c b/pkgs/by-name/in/intel-oneapi/test.c new file mode 100644 index 000000000000..9413ac0c68e9 --- /dev/null +++ b/pkgs/by-name/in/intel-oneapi/test.c @@ -0,0 +1,12 @@ +#include + +#include + +int main() { + float u[] = {1., 2., 3.}; + float v[] = {4., 5., 6.}; + + float dp = cblas_sdot(3, u, 1, v, 1); + + assert(dp == 32.); +} From bfeccd009e56d65a67c358216e2421e8128d124a Mon Sep 17 00:00:00 2001 From: Linus Karl Date: Fri, 10 Oct 2025 18:47:31 +0200 Subject: [PATCH 20/42] indi-3rdparty: 2.1.5.1 -> 2.1.6.2 --- .../astronomy/indilib/indi-3rdparty.nix | 25 +++---------------- 1 file changed, 4 insertions(+), 21 deletions(-) diff --git a/pkgs/development/libraries/science/astronomy/indilib/indi-3rdparty.nix b/pkgs/development/libraries/science/astronomy/indilib/indi-3rdparty.nix index 57a0371090f6..45ee14aec7ed 100644 --- a/pkgs/development/libraries/science/astronomy/indilib/indi-3rdparty.nix +++ b/pkgs/development/libraries/science/astronomy/indilib/indi-3rdparty.nix @@ -9,7 +9,6 @@ coreutils, cfitsio, fetchFromGitHub, - fetchpatch, gtest, libusb1, libusb-compat-0_1, @@ -42,12 +41,13 @@ }: let + thirdparty_version = "2.1.6.2"; fxload = libusb1.override { withExamples = true; }; src-3rdparty = fetchFromGitHub { owner = "indilib"; repo = "indi-3rdparty"; - rev = "v${indilib.version}"; - hash = "sha256-+WBQdu1iWleHf6xC4SK69y505wqZ36IUM4xnh1fnc6s="; + rev = "v${thirdparty_version}"; + hash = "sha256-FMvdm7dkOkRlmbPNeQjh0jd+2bOinzW13QPP2NnOr/M="; }; buildIndi3rdParty = @@ -58,7 +58,7 @@ let cmakeFlags ? [ ], postInstall ? "", doCheck ? true, - version ? indilib.version, + version ? thirdparty_version, src ? src-3rdparty, meta ? { }, ... @@ -551,14 +551,6 @@ in indi-astarbox = buildIndi3rdParty { pname = "indi-astarbox"; buildInputs = [ indilib ]; - # TODO patch already upstream, remove with version > 2.1.5.1 - patches = [ - (fetchpatch { - url = "https://github.com/indilib/indi-3rdparty/commit/c347000ec227a5ef98911aab34c7b08a91509cba.patch"; - hash = "sha256-M3b4ySoGJRpfNmBaagjDaeEPKqwaVgRUWaQY626SGBI="; - stripLen = 1; - }) - ]; }; indi-astroasis = buildIndi3rdParty { @@ -713,15 +705,6 @@ in glib zlib ]; - # TODO patch already upstream, remove with version > 2.1.5.1 - patches = [ - (fetchpatch { - url = "https://github.com/indilib/indi-3rdparty/commit/c33c08b50093698e2aa73d73783d96f85df488a9.patch"; - hash = "sha256-EQ2G9gTexf9FESCAR28f2cwzvH4TOAA8bvyJCxFv/E8="; - stripLen = 1; - }) - ]; - }; indi-gphoto = buildIndi3rdParty { From 24f0b50927e13873a91e8080d31f042aec456e52 Mon Sep 17 00:00:00 2001 From: pancaek <20342389+pancaek@users.noreply.github.com> Date: Fri, 10 Oct 2025 23:24:51 -0700 Subject: [PATCH 21/42] reaper-sws-extension: fix darwin eval --- pkgs/by-name/re/reaper-sws-extension/darwin.nix | 8 +++++--- pkgs/by-name/re/reaper-sws-extension/package.nix | 1 - 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/re/reaper-sws-extension/darwin.nix b/pkgs/by-name/re/reaper-sws-extension/darwin.nix index 25faa71693d6..3011ad5e7ee6 100644 --- a/pkgs/by-name/re/reaper-sws-extension/darwin.nix +++ b/pkgs/by-name/re/reaper-sws-extension/darwin.nix @@ -41,12 +41,14 @@ stdenvNoCC.mkDerivation (finalAttrs: { }) ]; - dontUnpack = true; + unpackCmd = '' + cp $curSrc $(stripHash $curSrc) + ''; installPhase = '' runHook preInstall - install -D *.py -t $out/Scripts - install -D *.dylib -t $out/UserPlugins + install -D -t $out/Scripts *.py + install -D -t $out/UserPlugins *.dylib runHook postInstall ''; }) diff --git a/pkgs/by-name/re/reaper-sws-extension/package.nix b/pkgs/by-name/re/reaper-sws-extension/package.nix index fe563e260a99..f4f2a33aadee 100644 --- a/pkgs/by-name/re/reaper-sws-extension/package.nix +++ b/pkgs/by-name/re/reaper-sws-extension/package.nix @@ -25,6 +25,5 @@ callPackage p { "x86_64-darwin" "aarch64-darwin" ]; - broken = stdenvNoCC.hostPlatform.isDarwin; }; } From 6f80e9070507dc3c9451d108d6d4df844fea0a20 Mon Sep 17 00:00:00 2001 From: Alexander Bantyev Date: Thu, 16 Oct 2025 16:09:34 +0400 Subject: [PATCH 22/42] fixup! intel-oneapi.{base,hpc}: init at 2025.2.1.44 --- .../{by-name/in => development/libraries}/intel-oneapi/base.nix | 0 .../libraries/intel-oneapi/default.nix} | 0 pkgs/{by-name/in => development/libraries}/intel-oneapi/hpc.nix | 0 pkgs/{by-name/in => development/libraries}/intel-oneapi/test.c | 0 pkgs/top-level/all-packages.nix | 2 ++ 5 files changed, 2 insertions(+) rename pkgs/{by-name/in => development/libraries}/intel-oneapi/base.nix (100%) rename pkgs/{by-name/in/intel-oneapi/package.nix => development/libraries/intel-oneapi/default.nix} (100%) rename pkgs/{by-name/in => development/libraries}/intel-oneapi/hpc.nix (100%) rename pkgs/{by-name/in => development/libraries}/intel-oneapi/test.c (100%) diff --git a/pkgs/by-name/in/intel-oneapi/base.nix b/pkgs/development/libraries/intel-oneapi/base.nix similarity index 100% rename from pkgs/by-name/in/intel-oneapi/base.nix rename to pkgs/development/libraries/intel-oneapi/base.nix diff --git a/pkgs/by-name/in/intel-oneapi/package.nix b/pkgs/development/libraries/intel-oneapi/default.nix similarity index 100% rename from pkgs/by-name/in/intel-oneapi/package.nix rename to pkgs/development/libraries/intel-oneapi/default.nix diff --git a/pkgs/by-name/in/intel-oneapi/hpc.nix b/pkgs/development/libraries/intel-oneapi/hpc.nix similarity index 100% rename from pkgs/by-name/in/intel-oneapi/hpc.nix rename to pkgs/development/libraries/intel-oneapi/hpc.nix diff --git a/pkgs/by-name/in/intel-oneapi/test.c b/pkgs/development/libraries/intel-oneapi/test.c similarity index 100% rename from pkgs/by-name/in/intel-oneapi/test.c rename to pkgs/development/libraries/intel-oneapi/test.c diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f9caf1068efe..44282037e3d5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1912,6 +1912,8 @@ with pkgs; coreboot-configurator = libsForQt5.callPackage ../tools/misc/coreboot-configurator { }; + intel-oneapi = callPackage ../development/libraries/intel-oneapi { }; + sway-unwrapped = callPackage ../by-name/sw/sway-unwrapped/package.nix { wlroots = wlroots_0_19; }; From 977fa287f1b7ec009a3d38bd70da5dc1e6312a33 Mon Sep 17 00:00:00 2001 From: Alexander Bantyev Date: Thu, 16 Oct 2025 16:10:21 +0400 Subject: [PATCH 23/42] fixup! intel-oneapi.{base,hpc}: init at 2025.2.1.44 --- pkgs/development/libraries/intel-oneapi/base.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/intel-oneapi/base.nix b/pkgs/development/libraries/intel-oneapi/base.nix index 749009ad48b7..065c9dabe9c8 100644 --- a/pkgs/development/libraries/intel-oneapi/base.nix +++ b/pkgs/development/libraries/intel-oneapi/base.nix @@ -226,7 +226,7 @@ intel-oneapi.mkIntelOneApi (fa: { # sycl-ls, sycl-trace: doesn't respect --help regex_skip="(.*-32)|(IMB-.*)|fi_info|fi_pingpong|gdb-oneapi|hydra_bstrap_proxy|hydra_nameserver|hydra_pmi_proxy|mpirun|sycl-ls|sycl-trace" export I_MPI_ROOT="${intel-oneapi.base}/mpi/latest" - for bin in "${intel-oneapi}"/bin/*; do + for bin in "${intel-oneapi.base}"/bin/*; do if [[ "$bin" =~ $regex_skip ]] || [ ! -f "$bin" ] || [[ ! -x "$bin" ]]; then echo "skipping $bin" continue From 83cec4293d4a34e77cb254c8f1fd5ca389b65675 Mon Sep 17 00:00:00 2001 From: SZanko Date: Thu, 16 Oct 2025 22:44:01 +0100 Subject: [PATCH 24/42] mio: init at unstable-2023-03-03 --- pkgs/by-name/mi/mio/package.nix | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 pkgs/by-name/mi/mio/package.nix diff --git a/pkgs/by-name/mi/mio/package.nix b/pkgs/by-name/mi/mio/package.nix new file mode 100644 index 000000000000..845408564c58 --- /dev/null +++ b/pkgs/by-name/mi/mio/package.nix @@ -0,0 +1,30 @@ +{ + lib, + stdenv, + fetchFromGitHub, + cmake, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "mio"; + version = "unstable-2023-03-03"; + + src = fetchFromGitHub { + owner = "vimpunk"; + repo = "mio"; + rev = "8b6b7d878c89e81614d05edca7936de41ccdd2da"; + hash = "sha256-j/wbjyI2v/BsFz2RKi8ZxMKuT+7o5uI4I4yIkUran7I="; + }; + + nativeBuildInputs = [ + cmake + ]; + + meta = { + description = "Cross-platform C++11 header-only library for memory mapped file IO"; + homepage = "https://github.com/vimpunk/mio"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.szanko ]; + platforms = lib.platforms.all; + }; +}) From fd4a35fab7282684f018680642132aaf1705e32c Mon Sep 17 00:00:00 2001 From: misilelab Date: Fri, 17 Oct 2025 18:52:49 +0900 Subject: [PATCH 25/42] glab: 1.73.0 -> 1.74.0 https://gitlab.com/gitlab-org/cli/-/releases/v1.73.1 https://gitlab.com/gitlab-org/cli/-/releases/v1.74.0 Signed-off-by: misilelab --- pkgs/by-name/gl/glab/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/gl/glab/package.nix b/pkgs/by-name/gl/glab/package.nix index 0671c642a9f5..6eb10676c64d 100644 --- a/pkgs/by-name/gl/glab/package.nix +++ b/pkgs/by-name/gl/glab/package.nix @@ -13,13 +13,13 @@ buildGoModule (finalAttrs: { pname = "glab"; - version = "1.73.0"; + version = "1.74.0"; src = fetchFromGitLab { owner = "gitlab-org"; repo = "cli"; tag = "v${finalAttrs.version}"; - hash = "sha256-2beWB7QD2oeGZIjDWxKyqZLGzNJKWlRuqA1h7GRu1G4="; + hash = "sha256-4nQg7wb3+nc9Pxdf9ys8aMzSgF6boNzri+MmtDLS5jE="; leaveDotGit = true; postFetch = '' cd "$out" @@ -28,7 +28,7 @@ buildGoModule (finalAttrs: { ''; }; - vendorHash = "sha256-pQK3cRNxvGm+NH4zBlw8jm+fPgSg65FIe7zxZ99jl5Q="; + vendorHash = "sha256-htb/LAX3SOZEDHTYcu9WRcAkuY+fUMolODYfGE3qihY="; ldflags = [ "-s" From db44bc8cd41dc1a14bc02469f09cfcd9a5cb3b15 Mon Sep 17 00:00:00 2001 From: parth Date: Tue, 14 Oct 2025 18:57:31 -0400 Subject: [PATCH 26/42] lockbook: add dep nfs-utils --- pkgs/by-name/lo/lockbook/package.nix | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/lo/lockbook/package.nix b/pkgs/by-name/lo/lockbook/package.nix index b7a28602a8dc..60173444ec93 100644 --- a/pkgs/by-name/lo/lockbook/package.nix +++ b/pkgs/by-name/lo/lockbook/package.nix @@ -4,7 +4,12 @@ rustPlatform, fetchFromGitHub, installShellFiles, + nfs-utils ? null, # macOS doesn't need this + makeBinaryWrapper, }: +let + inherit (stdenv.hostPlatform) isLinux; +in rustPlatform.buildRustPackage rec { pname = "lockbook"; version = "25.10.13"; @@ -24,7 +29,16 @@ rustPlatform.buildRustPackage rec { "lockbook" ]; - nativeBuildInputs = [ installShellFiles ]; + nativeBuildInputs = [ + installShellFiles + ] + ++ lib.optionals isLinux [ makeBinaryWrapper ]; + + postFixup = lib.optionalString isLinux '' + wrapProgram $out/bin/lockbook \ + --prefix PATH : "${lib.makeBinPath [ nfs-utils ]}" + ''; + postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' installShellCompletion --bash --name lockbook.bash <($out/bin/lockbook completions bash) installShellCompletion --zsh --name _lockbook <($out/bin/lockbook completions zsh) From 69f785b04c5d08139ef25be1ef7633903c0bfb5b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 17 Oct 2025 14:15:51 +0000 Subject: [PATCH 27/42] androidStudioPackages.beta: 2025.1.4.7 -> 2025.2.1.6 --- pkgs/applications/editors/android-studio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix index 181471838a87..c7d329b85b15 100644 --- a/pkgs/applications/editors/android-studio/default.nix +++ b/pkgs/applications/editors/android-studio/default.nix @@ -20,8 +20,8 @@ let sha256Hash = "sha256-znRzVtUqNrLmpLYd9a96jFh85n+EgOsdteVLqxnMvfM="; }; betaVersion = { - version = "2025.1.4.7"; # "Android Studio Narwhal 4 Feature Drop | 2025.1.4 RC 2" - sha256Hash = "sha256-KrKUsA7wFeI7IBa9VOp+MERqWIiMnNzLFO8oF0rCiIw="; + version = "2025.2.1.6"; # "Android Studio Otter | 2025.2.1 RC 1" + sha256Hash = "sha256-l+bJ0AWIrJ3qNcKJWiE+onrl6ZpLb6YWFXE3HtIejUs="; }; latestVersion = { version = "2025.2.2.1"; # "Android Studio Otter 2 Feature Drop | 2025.2.2 Canary 1" From 9c5ec4acd1527f038e0bef55cb045cac3b95f3cb Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 17 Oct 2025 14:21:32 +0000 Subject: [PATCH 28/42] emmylua-doc-cli: 0.15.0 -> 0.16.0 --- pkgs/by-name/em/emmylua-doc-cli/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/em/emmylua-doc-cli/package.nix b/pkgs/by-name/em/emmylua-doc-cli/package.nix index 1d1ab9a96763..cbd96a27de53 100644 --- a/pkgs/by-name/em/emmylua-doc-cli/package.nix +++ b/pkgs/by-name/em/emmylua-doc-cli/package.nix @@ -6,18 +6,18 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "emmylua_doc_cli"; - version = "0.15.0"; + version = "0.16.0"; src = fetchFromGitHub { owner = "EmmyLuaLs"; repo = "emmylua-analyzer-rust"; tag = finalAttrs.version; - hash = "sha256-UfsSsS+yXpWY1L2Wcgcj+JxS/LNr3BYhHq2JzUdxwqE="; + hash = "sha256-6mcVIOKsC+1cboZ8e23J0m2ed/2ohR0F3LfrM9UlaR4="; }; buildAndTestSubdir = "crates/emmylua_doc_cli"; - cargoHash = "sha256-rVTxAOQOngeJaP2SDfgeqOuoc2T8dEvlpe9gKfu5tas="; + cargoHash = "sha256-d6dhrib4mz7KmHo3EbkUXBPpjEGu35GeYNkpIrJrKJI="; nativeInstallCheckInputs = [ versionCheckHook From 59f7ee48f0d2cdd4be032b4d6fed429119efa5b2 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 17 Oct 2025 18:33:50 +0200 Subject: [PATCH 29/42] python313Packages.pyvesync: 3.1.0 -> 3.1.2 Diff: https://github.com/webdjoe/pyvesync/compare/3.1.0...3.1.2 Changelog: https://github.com/webdjoe/pyvesync/releases/tag/3.1.2 --- pkgs/development/python-modules/pyvesync/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyvesync/default.nix b/pkgs/development/python-modules/pyvesync/default.nix index 3b1094388f60..a51d9d831cf8 100644 --- a/pkgs/development/python-modules/pyvesync/default.nix +++ b/pkgs/development/python-modules/pyvesync/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "pyvesync"; - version = "3.1.0"; + version = "3.1.2"; pyproject = true; src = fetchFromGitHub { owner = "webdjoe"; repo = "pyvesync"; tag = version; - hash = "sha256-ZoEQbMV3ofE5pV7nbYOqzXq3/7a2pkDKx88894kzU7Y="; + hash = "sha256-SZ1ZL79f1FHTnNEU9oew8JcWA20NphIX4fXr3NS7THU="; }; build-system = [ setuptools ]; From eb2e09c2fa777e326188cf5dace0ca6d24fa35a4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 17 Oct 2025 19:27:05 +0000 Subject: [PATCH 30/42] nakama: 3.32.0 -> 3.32.1 --- pkgs/by-name/na/nakama/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/na/nakama/package.nix b/pkgs/by-name/na/nakama/package.nix index 993d10579855..6ea82575b579 100644 --- a/pkgs/by-name/na/nakama/package.nix +++ b/pkgs/by-name/na/nakama/package.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "nakama"; - version = "3.32.0"; + version = "3.32.1"; src = fetchFromGitHub { owner = "heroiclabs"; repo = "nakama"; tag = "v${version}"; - hash = "sha256-Ly8NYqaJIC/ySPrCiEwwWR3+Zyk6dEW0r7SeyOS1CwE="; + hash = "sha256-guoKppChjT4f1IOM4Cxg6XZkJrYNVv9gwOTy57t7wDs="; }; vendorHash = null; From 5840e3a7f3b01c93a71eab148c5fc38386e61fd9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C2=B7=F0=90=91=91=F0=90=91=B4=F0=90=91=95=F0=90=91=91?= =?UTF-8?q?=F0=90=91=A9=F0=90=91=A4?= Date: Mon, 6 Oct 2025 19:03:40 +0700 Subject: [PATCH 31/42] =?UTF-8?q?h2o:=202.3.0-rolling-2025-09-24=20?= =?UTF-8?q?=E2=86=92=202.3.0-rolling-2025-10-06?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/by-name/h2/h2o/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/h2/h2o/package.nix b/pkgs/by-name/h2/h2o/package.nix index 8eec731135f6..e957b371be1e 100644 --- a/pkgs/by-name/h2/h2o/package.nix +++ b/pkgs/by-name/h2/h2o/package.nix @@ -23,13 +23,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "h2o"; - version = "2.3.0-rolling-2025-09-24"; + version = "2.3.0-rolling-2025-10-06"; src = fetchFromGitHub { owner = "h2o"; repo = "h2o"; - rev = "74012bb501f14e61e5ecc1e9860bd66ba6789e0d"; - hash = "sha256-zEibiI3BdhaTty5vZ3PPXTbHIRLsE2iUiwI6hRZfy8A="; + rev = "ea040e62db7dd5c66c9470b6554bcc7facec0d10"; + hash = "sha256-QiPnHtqxHPe428BFbEgu4IaIQBznSIj3r9Lr+uFnY58="; }; outputs = [ From 52e812cb38680d7110a2d356e8d6a8ed390d4210 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C2=B7=F0=90=91=91=F0=90=91=B4=F0=90=91=95=F0=90=91=91?= =?UTF-8?q?=F0=90=91=A9=F0=90=91=A4?= Date: Tue, 7 Oct 2025 19:53:33 +0700 Subject: [PATCH 32/42] =?UTF-8?q?h2o:=202.3.0-rolling-2025-10-06=20?= =?UTF-8?q?=E2=86=92=202.3.0-rolling-2025-10-07?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/by-name/h2/h2o/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/h2/h2o/package.nix b/pkgs/by-name/h2/h2o/package.nix index e957b371be1e..b5328bfae272 100644 --- a/pkgs/by-name/h2/h2o/package.nix +++ b/pkgs/by-name/h2/h2o/package.nix @@ -23,13 +23,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "h2o"; - version = "2.3.0-rolling-2025-10-06"; + version = "2.3.0-rolling-2025-10-07"; src = fetchFromGitHub { owner = "h2o"; repo = "h2o"; - rev = "ea040e62db7dd5c66c9470b6554bcc7facec0d10"; - hash = "sha256-QiPnHtqxHPe428BFbEgu4IaIQBznSIj3r9Lr+uFnY58="; + rev = "c58132197415a3cf285230de9c38940de48f5051"; + hash = "sha256-B4KQ+HV71jT8ZFFnZ4W4TT0EO2kbzZEmgycsb3b/heQ="; }; outputs = [ From 0780546a3860e2faf957356925b7e233eb321525 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C2=B7=F0=90=91=91=F0=90=91=B4=F0=90=91=95=F0=90=91=91?= =?UTF-8?q?=F0=90=91=A9=F0=90=91=A4?= Date: Fri, 17 Oct 2025 12:43:32 -0700 Subject: [PATCH 33/42] =?UTF-8?q?h2o:=202.3.0-rolling-2025-10-07=20?= =?UTF-8?q?=E2=86=92=202.3.0-rolling-2025-10-17?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/by-name/h2/h2o/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/h2/h2o/package.nix b/pkgs/by-name/h2/h2o/package.nix index b5328bfae272..a73f5a770eef 100644 --- a/pkgs/by-name/h2/h2o/package.nix +++ b/pkgs/by-name/h2/h2o/package.nix @@ -23,13 +23,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "h2o"; - version = "2.3.0-rolling-2025-10-07"; + version = "2.3.0-rolling-2025-10-17"; src = fetchFromGitHub { owner = "h2o"; repo = "h2o"; - rev = "c58132197415a3cf285230de9c38940de48f5051"; - hash = "sha256-B4KQ+HV71jT8ZFFnZ4W4TT0EO2kbzZEmgycsb3b/heQ="; + rev = "562d7bd089173da03e71bc4c0824468751c5b411"; + hash = "sha256-/P4S8ng1kQPPHNSNuqgLasu2c2Y9BD2Y9v0hlMiPCIM="; }; outputs = [ From 521e5ae2027feed4937c38fcfc5531c23d2e9184 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 17 Oct 2025 21:01:19 +0000 Subject: [PATCH 34/42] dprint-plugins.dprint-plugin-biome: 0.10.4 -> 0.10.5 --- pkgs/by-name/dp/dprint/plugins/dprint-plugin-biome.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/dp/dprint/plugins/dprint-plugin-biome.nix b/pkgs/by-name/dp/dprint/plugins/dprint-plugin-biome.nix index 2707f2da497b..829393d9bec0 100644 --- a/pkgs/by-name/dp/dprint/plugins/dprint-plugin-biome.nix +++ b/pkgs/by-name/dp/dprint/plugins/dprint-plugin-biome.nix @@ -1,7 +1,7 @@ { mkDprintPlugin }: mkDprintPlugin { description = "Biome (JS/TS) wrapper plugin"; - hash = "sha256-czgTZXlW+LdTKGtX7JJtG7qAbnWlQpunMY92WiC+X8A="; + hash = "sha256-GHl8Uo2U6K1yirfjwuD43ixkVtGdbZ2qxk0cySRLXys="; initConfig = { configExcludes = [ "**/node_modules" ]; configKey = "biome"; @@ -16,6 +16,6 @@ mkDprintPlugin { }; pname = "dprint-plugin-biome"; updateUrl = "https://plugins.dprint.dev/dprint/biome/latest.json"; - url = "https://plugins.dprint.dev/biome-0.10.4.wasm"; - version = "0.10.4"; + url = "https://plugins.dprint.dev/biome-0.10.5.wasm"; + version = "0.10.5"; } From 391cd8e5ce5d75902dbf8daafbb2727414bef095 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Fri, 17 Oct 2025 21:26:09 +0000 Subject: [PATCH 35/42] python3Packages.optimistix: 0.0.10 -> 0.0.11 Diff: https://github.com/patrick-kidger/optimistix/compare/v0.0.10...v0.0.11 Changelog: https://github.com/patrick-kidger/optimistix/releases/tag/v0.0.11 --- .../python-modules/optimistix/default.nix | 21 ++++++++++++------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/optimistix/default.nix b/pkgs/development/python-modules/optimistix/default.nix index c46ddfa1daf8..271ab8520c73 100644 --- a/pkgs/development/python-modules/optimistix/default.nix +++ b/pkgs/development/python-modules/optimistix/default.nix @@ -23,14 +23,14 @@ buildPythonPackage rec { pname = "optimistix"; - version = "0.0.10"; + version = "0.0.11"; pyproject = true; src = fetchFromGitHub { owner = "patrick-kidger"; repo = "optimistix"; tag = "v${version}"; - hash = "sha256-stVPHzv0XNd0I31N2Cj0QYrMmhImyx0cablqZfKBFrM="; + hash = "sha256-tTE/f1dYDpTmrqL1D7h7UyqT2gN9+Y1mNJZcjmdHtno="; }; build-system = [ hatchling ]; @@ -53,18 +53,23 @@ buildPythonPackage rec { pytest-xdist ]; - pytestFlags = [ - # Since jax 0.5.3: - # DeprecationWarning: shape requires ndarray or scalar arguments, got at position 0. In a future JAX release this will be an error. - "-Wignore::DeprecationWarning" - ]; - disabledTests = [ # assert Array(False, dtype=bool) # + where Array(False, dtype=bool) = tree_allclose(Array(0.12993518, dtype=float64), Array(0., dtype=float64, weak_type=True), atol=0.0001, rtol=0.0001) "test_least_squares" ]; + disabledTestPaths = [ + # Require circular dependency diffrax + "tests/test_compat.py" + "tests/test_fixed_point.py" + "tests/test_lbfgs_linear_operator.py" + "tests/test_least_squares.py" + "tests/test_minimise.py" + "tests/test_misc.py" + "tests/test_root_find.py" + ]; + meta = { description = "Nonlinear optimisation (root-finding, least squares, ...) in JAX+Equinox"; homepage = "https://github.com/patrick-kidger/optimistix"; From de134093514db5a22cca88bc7f3fc4a9fd3dbde5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 17 Oct 2025 23:38:17 +0000 Subject: [PATCH 36/42] node-gyp: 11.4.2 -> 11.5.0 --- pkgs/by-name/no/node-gyp/package-lock.json | 360 ++++++++++----------- pkgs/by-name/no/node-gyp/package.nix | 6 +- 2 files changed, 180 insertions(+), 186 deletions(-) diff --git a/pkgs/by-name/no/node-gyp/package-lock.json b/pkgs/by-name/no/node-gyp/package-lock.json index c5612067dc0d..8ec0df643c44 100644 --- a/pkgs/by-name/no/node-gyp/package-lock.json +++ b/pkgs/by-name/no/node-gyp/package-lock.json @@ -1,12 +1,12 @@ { "name": "node-gyp", - "version": "11.4.2", + "version": "11.5.0", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "node-gyp", - "version": "11.4.2", + "version": "11.5.0", "license": "MIT", "dependencies": { "env-paths": "^2.2.0", @@ -37,9 +37,9 @@ } }, "node_modules/@eslint-community/eslint-utils": { - "version": "4.7.0", - "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.7.0.tgz", - "integrity": "sha512-dyybb3AcajC7uha6CvhdVRJqaKyn7w2YKqKyAN37NKYgZT36w+iRb0Dymmc5qEJ549c/S31cMMSFd75bteCpCw==", + "version": "4.9.0", + "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.9.0.tgz", + "integrity": "sha512-ayVFHdtZ+hsq1t2Dy24wCmGXGe4q9Gu3smhLYALJrr473ZH27MsnSL+LKUlimp4BWJqMDMLmPpx/Q9R3OAlL4g==", "dev": true, "license": "MIT", "dependencies": { @@ -79,13 +79,13 @@ } }, "node_modules/@eslint/config-array": { - "version": "0.21.0", - "resolved": "https://registry.npmjs.org/@eslint/config-array/-/config-array-0.21.0.tgz", - "integrity": "sha512-ENIdc4iLu0d93HeYirvKmrzshzofPw6VkZRKQGe9Nv46ZnWUzcF1xV01dcvEg/1wXUR61OmmlSfyeyO7EvjLxQ==", + "version": "0.21.1", + "resolved": "https://registry.npmjs.org/@eslint/config-array/-/config-array-0.21.1.tgz", + "integrity": "sha512-aw1gNayWpdI/jSYVgzN5pL0cfzU02GT3NBpeT/DXbx1/1x7ZKxFPd9bwrzygx/qiwIQiJ1sw/zD8qY/kRvlGHA==", "dev": true, "license": "Apache-2.0", "dependencies": { - "@eslint/object-schema": "^2.1.6", + "@eslint/object-schema": "^2.1.7", "debug": "^4.3.1", "minimatch": "^3.1.2" }, @@ -94,19 +94,22 @@ } }, "node_modules/@eslint/config-helpers": { - "version": "0.3.1", - "resolved": "https://registry.npmjs.org/@eslint/config-helpers/-/config-helpers-0.3.1.tgz", - "integrity": "sha512-xR93k9WhrDYpXHORXpxVL5oHj3Era7wo6k/Wd8/IsQNnZUTzkGS29lyn3nAT05v6ltUuTFVCCYDEGfy2Or/sPA==", + "version": "0.4.1", + "resolved": "https://registry.npmjs.org/@eslint/config-helpers/-/config-helpers-0.4.1.tgz", + "integrity": "sha512-csZAzkNhsgwb0I/UAV6/RGFTbiakPCf0ZrGmrIxQpYvGZ00PhTkSnyKNolphgIvmnJeGw6rcGVEXfTzUnFuEvw==", "dev": true, "license": "Apache-2.0", + "dependencies": { + "@eslint/core": "^0.16.0" + }, "engines": { "node": "^18.18.0 || ^20.9.0 || >=21.1.0" } }, "node_modules/@eslint/core": { - "version": "0.15.2", - "resolved": "https://registry.npmjs.org/@eslint/core/-/core-0.15.2.tgz", - "integrity": "sha512-78Md3/Rrxh83gCxoUc0EiciuOHsIITzLy53m3d9UyiW8y9Dj2D29FeETqyKA+BRK76tnTp6RXWb3pCay8Oyomg==", + "version": "0.16.0", + "resolved": "https://registry.npmjs.org/@eslint/core/-/core-0.16.0.tgz", + "integrity": "sha512-nmC8/totwobIiFcGkDza3GIKfAw1+hLiYVrh3I1nIomQ8PEr5cxg34jnkmGawul/ep52wGRAcyeDCNtWKSOj4Q==", "dev": true, "license": "Apache-2.0", "dependencies": { @@ -141,9 +144,9 @@ } }, "node_modules/@eslint/js": { - "version": "9.34.0", - "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.34.0.tgz", - "integrity": "sha512-EoyvqQnBNsV1CWaEJ559rxXL4c8V92gxirbawSmVUOWXlsRxxQXl6LmCpdUblgxgSkDIqKnhzba2SjRTI/A5Rw==", + "version": "9.38.0", + "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.38.0.tgz", + "integrity": "sha512-UZ1VpFvXf9J06YG9xQBdnzU+kthors6KjhMAl6f4gH4usHyh31rUf2DLGInT8RFYIReYXNSydgPY0V2LuWgl7A==", "dev": true, "license": "MIT", "engines": { @@ -154,9 +157,9 @@ } }, "node_modules/@eslint/object-schema": { - "version": "2.1.6", - "resolved": "https://registry.npmjs.org/@eslint/object-schema/-/object-schema-2.1.6.tgz", - "integrity": "sha512-RBMg5FRL0I0gs51M/guSAj5/e14VQ4tpZnQNWwuDT66P14I43ItmPfIZRhO9fUVIPOAQXU47atlywZ/czoqFPA==", + "version": "2.1.7", + "resolved": "https://registry.npmjs.org/@eslint/object-schema/-/object-schema-2.1.7.tgz", + "integrity": "sha512-VtAOaymWVfZcmZbp6E2mympDIHvyjXs/12LqWYjVw6qjrfF+VK+fyG33kChz3nnK+SU5/NeHOqrTEHS8sXO3OA==", "dev": true, "license": "Apache-2.0", "engines": { @@ -164,13 +167,13 @@ } }, "node_modules/@eslint/plugin-kit": { - "version": "0.3.5", - "resolved": "https://registry.npmjs.org/@eslint/plugin-kit/-/plugin-kit-0.3.5.tgz", - "integrity": "sha512-Z5kJ+wU3oA7MMIqVR9tyZRtjYPr4OC004Q4Rw7pgOKUOKkJfZ3O24nz3WYfGRpMDNmcOi3TwQOmgm7B7Tpii0w==", + "version": "0.4.0", + "resolved": "https://registry.npmjs.org/@eslint/plugin-kit/-/plugin-kit-0.4.0.tgz", + "integrity": "sha512-sB5uyeq+dwCWyPi31B2gQlVlo+j5brPlWx4yZBrEaRo/nhdDE8Xke1gsGgtiBdaBTxuTkceLVuVt/pclrasb0A==", "dev": true, "license": "Apache-2.0", "dependencies": { - "@eslint/core": "^0.15.2", + "@eslint/core": "^0.16.0", "levn": "^0.4.1" }, "engines": { @@ -188,33 +191,19 @@ } }, "node_modules/@humanfs/node": { - "version": "0.16.6", - "resolved": "https://registry.npmjs.org/@humanfs/node/-/node-0.16.6.tgz", - "integrity": "sha512-YuI2ZHQL78Q5HbhDiBA1X4LmYdXCKCMQIfw0pw7piHJwyREFebJUvrQN4cMssyES6x+vfUbx1CIpaQUKYdQZOw==", + "version": "0.16.7", + "resolved": "https://registry.npmjs.org/@humanfs/node/-/node-0.16.7.tgz", + "integrity": "sha512-/zUx+yOsIrG4Y43Eh2peDeKCxlRt/gET6aHfaKpuq267qXdYDFViVHfMaLyygZOnl0kGWxFIgsBy8QFuTLUXEQ==", "dev": true, "license": "Apache-2.0", "dependencies": { "@humanfs/core": "^0.19.1", - "@humanwhocodes/retry": "^0.3.0" + "@humanwhocodes/retry": "^0.4.0" }, "engines": { "node": ">=18.18.0" } }, - "node_modules/@humanfs/node/node_modules/@humanwhocodes/retry": { - "version": "0.3.1", - "resolved": "https://registry.npmjs.org/@humanwhocodes/retry/-/retry-0.3.1.tgz", - "integrity": "sha512-JBxkERygn7Bv/GbN5Rv8Ul6LVknS+5Bp6RgDC/O8gEBU/yeH5Ui5C/OlWrTb6qct7LjjfT6Re2NxB0ln0yYybA==", - "dev": true, - "license": "Apache-2.0", - "engines": { - "node": ">=18.18" - }, - "funding": { - "type": "github", - "url": "https://github.com/sponsors/nzakas" - } - }, "node_modules/@humanwhocodes/gitignore-to-minimatch": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/@humanwhocodes/gitignore-to-minimatch/-/gitignore-to-minimatch-1.0.2.tgz", @@ -394,17 +383,17 @@ "license": "MIT" }, "node_modules/@typescript-eslint/eslint-plugin": { - "version": "8.41.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.41.0.tgz", - "integrity": "sha512-8fz6oa6wEKZrhXWro/S3n2eRJqlRcIa6SlDh59FXJ5Wp5XRZ8B9ixpJDcjadHq47hMx0u+HW6SNa6LjJQ6NLtw==", + "version": "8.46.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.46.1.tgz", + "integrity": "sha512-rUsLh8PXmBjdiPY+Emjz9NX2yHvhS11v0SR6xNJkm5GM1MO9ea/1GoDKlHHZGrOJclL/cZ2i/vRUYVtjRhrHVQ==", "dev": true, "license": "MIT", "dependencies": { "@eslint-community/regexpp": "^4.10.0", - "@typescript-eslint/scope-manager": "8.41.0", - "@typescript-eslint/type-utils": "8.41.0", - "@typescript-eslint/utils": "8.41.0", - "@typescript-eslint/visitor-keys": "8.41.0", + "@typescript-eslint/scope-manager": "8.46.1", + "@typescript-eslint/type-utils": "8.46.1", + "@typescript-eslint/utils": "8.46.1", + "@typescript-eslint/visitor-keys": "8.46.1", "graphemer": "^1.4.0", "ignore": "^7.0.0", "natural-compare": "^1.4.0", @@ -418,7 +407,7 @@ "url": "https://opencollective.com/typescript-eslint" }, "peerDependencies": { - "@typescript-eslint/parser": "^8.41.0", + "@typescript-eslint/parser": "^8.46.1", "eslint": "^8.57.0 || ^9.0.0", "typescript": ">=4.8.4 <6.0.0" } @@ -434,16 +423,16 @@ } }, "node_modules/@typescript-eslint/parser": { - "version": "8.41.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.41.0.tgz", - "integrity": "sha512-gTtSdWX9xiMPA/7MV9STjJOOYtWwIJIYxkQxnSV1U3xcE+mnJSH3f6zI0RYP+ew66WSlZ5ed+h0VCxsvdC1jJg==", + "version": "8.46.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.46.1.tgz", + "integrity": "sha512-6JSSaBZmsKvEkbRUkf7Zj7dru/8ZCrJxAqArcLaVMee5907JdtEbKGsZ7zNiIm/UAkpGUkaSMZEXShnN2D1HZA==", "dev": true, "license": "MIT", "dependencies": { - "@typescript-eslint/scope-manager": "8.41.0", - "@typescript-eslint/types": "8.41.0", - "@typescript-eslint/typescript-estree": "8.41.0", - "@typescript-eslint/visitor-keys": "8.41.0", + "@typescript-eslint/scope-manager": "8.46.1", + "@typescript-eslint/types": "8.46.1", + "@typescript-eslint/typescript-estree": "8.46.1", + "@typescript-eslint/visitor-keys": "8.46.1", "debug": "^4.3.4" }, "engines": { @@ -459,14 +448,14 @@ } }, "node_modules/@typescript-eslint/project-service": { - "version": "8.41.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/project-service/-/project-service-8.41.0.tgz", - "integrity": "sha512-b8V9SdGBQzQdjJ/IO3eDifGpDBJfvrNTp2QD9P2BeqWTGrRibgfgIlBSw6z3b6R7dPzg752tOs4u/7yCLxksSQ==", + "version": "8.46.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/project-service/-/project-service-8.46.1.tgz", + "integrity": "sha512-FOIaFVMHzRskXr5J4Jp8lFVV0gz5ngv3RHmn+E4HYxSJ3DgDzU7fVI1/M7Ijh1zf6S7HIoaIOtln1H5y8V+9Zg==", "dev": true, "license": "MIT", "dependencies": { - "@typescript-eslint/tsconfig-utils": "^8.41.0", - "@typescript-eslint/types": "^8.41.0", + "@typescript-eslint/tsconfig-utils": "^8.46.1", + "@typescript-eslint/types": "^8.46.1", "debug": "^4.3.4" }, "engines": { @@ -481,14 +470,14 @@ } }, "node_modules/@typescript-eslint/scope-manager": { - "version": "8.41.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.41.0.tgz", - "integrity": "sha512-n6m05bXn/Cd6DZDGyrpXrELCPVaTnLdPToyhBoFkLIMznRUQUEQdSp96s/pcWSQdqOhrgR1mzJ+yItK7T+WPMQ==", + "version": "8.46.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.46.1.tgz", + "integrity": "sha512-weL9Gg3/5F0pVQKiF8eOXFZp8emqWzZsOJuWRUNtHT+UNV2xSJegmpCNQHy37aEQIbToTq7RHKhWvOsmbM680A==", "dev": true, "license": "MIT", "dependencies": { - "@typescript-eslint/types": "8.41.0", - "@typescript-eslint/visitor-keys": "8.41.0" + "@typescript-eslint/types": "8.46.1", + "@typescript-eslint/visitor-keys": "8.46.1" }, "engines": { "node": "^18.18.0 || ^20.9.0 || >=21.1.0" @@ -499,9 +488,9 @@ } }, "node_modules/@typescript-eslint/tsconfig-utils": { - "version": "8.41.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/tsconfig-utils/-/tsconfig-utils-8.41.0.tgz", - "integrity": "sha512-TDhxYFPUYRFxFhuU5hTIJk+auzM/wKvWgoNYOPcOf6i4ReYlOoYN8q1dV5kOTjNQNJgzWN3TUUQMtlLOcUgdUw==", + "version": "8.46.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/tsconfig-utils/-/tsconfig-utils-8.46.1.tgz", + "integrity": "sha512-X88+J/CwFvlJB+mK09VFqx5FE4H5cXD+H/Bdza2aEWkSb8hnWIQorNcscRl4IEo1Cz9VI/+/r/jnGWkbWPx54g==", "dev": true, "license": "MIT", "engines": { @@ -516,15 +505,15 @@ } }, "node_modules/@typescript-eslint/type-utils": { - "version": "8.41.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.41.0.tgz", - "integrity": "sha512-63qt1h91vg3KsjVVonFJWjgSK7pZHSQFKH6uwqxAH9bBrsyRhO6ONoKyXxyVBzG1lJnFAJcKAcxLS54N1ee1OQ==", + "version": "8.46.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.46.1.tgz", + "integrity": "sha512-+BlmiHIiqufBxkVnOtFwjah/vrkF4MtKKvpXrKSPLCkCtAp8H01/VV43sfqA98Od7nJpDcFnkwgyfQbOG0AMvw==", "dev": true, "license": "MIT", "dependencies": { - "@typescript-eslint/types": "8.41.0", - "@typescript-eslint/typescript-estree": "8.41.0", - "@typescript-eslint/utils": "8.41.0", + "@typescript-eslint/types": "8.46.1", + "@typescript-eslint/typescript-estree": "8.46.1", + "@typescript-eslint/utils": "8.46.1", "debug": "^4.3.4", "ts-api-utils": "^2.1.0" }, @@ -541,9 +530,9 @@ } }, "node_modules/@typescript-eslint/types": { - "version": "8.41.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.41.0.tgz", - "integrity": "sha512-9EwxsWdVqh42afLbHP90n2VdHaWU/oWgbH2P0CfcNfdKL7CuKpwMQGjwev56vWu9cSKU7FWSu6r9zck6CVfnag==", + "version": "8.46.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.46.1.tgz", + "integrity": "sha512-C+soprGBHwWBdkDpbaRC4paGBrkIXxVlNohadL5o0kfhsXqOC6GYH2S/Obmig+I0HTDl8wMaRySwrfrXVP8/pQ==", "dev": true, "license": "MIT", "engines": { @@ -555,16 +544,16 @@ } }, "node_modules/@typescript-eslint/typescript-estree": { - "version": "8.41.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.41.0.tgz", - "integrity": "sha512-D43UwUYJmGhuwHfY7MtNKRZMmfd8+p/eNSfFe6tH5mbVDto+VQCayeAt35rOx3Cs6wxD16DQtIKw/YXxt5E0UQ==", + "version": "8.46.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.46.1.tgz", + "integrity": "sha512-uIifjT4s8cQKFQ8ZBXXyoUODtRoAd7F7+G8MKmtzj17+1UbdzFl52AzRyZRyKqPHhgzvXunnSckVu36flGy8cg==", "dev": true, "license": "MIT", "dependencies": { - "@typescript-eslint/project-service": "8.41.0", - "@typescript-eslint/tsconfig-utils": "8.41.0", - "@typescript-eslint/types": "8.41.0", - "@typescript-eslint/visitor-keys": "8.41.0", + "@typescript-eslint/project-service": "8.46.1", + "@typescript-eslint/tsconfig-utils": "8.46.1", + "@typescript-eslint/types": "8.46.1", + "@typescript-eslint/visitor-keys": "8.46.1", "debug": "^4.3.4", "fast-glob": "^3.3.2", "is-glob": "^4.0.3", @@ -610,16 +599,16 @@ } }, "node_modules/@typescript-eslint/utils": { - "version": "8.41.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.41.0.tgz", - "integrity": "sha512-udbCVstxZ5jiPIXrdH+BZWnPatjlYwJuJkDA4Tbo3WyYLh8NvB+h/bKeSZHDOFKfphsZYJQqaFtLeXEqurQn1A==", + "version": "8.46.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.46.1.tgz", + "integrity": "sha512-vkYUy6LdZS7q1v/Gxb2Zs7zziuXN0wxqsetJdeZdRe/f5dwJFglmuvZBfTUivCtjH725C1jWCDfpadadD95EDQ==", "dev": true, "license": "MIT", "dependencies": { "@eslint-community/eslint-utils": "^4.7.0", - "@typescript-eslint/scope-manager": "8.41.0", - "@typescript-eslint/types": "8.41.0", - "@typescript-eslint/typescript-estree": "8.41.0" + "@typescript-eslint/scope-manager": "8.46.1", + "@typescript-eslint/types": "8.46.1", + "@typescript-eslint/typescript-estree": "8.46.1" }, "engines": { "node": "^18.18.0 || ^20.9.0 || >=21.1.0" @@ -634,13 +623,13 @@ } }, "node_modules/@typescript-eslint/visitor-keys": { - "version": "8.41.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.41.0.tgz", - "integrity": "sha512-+GeGMebMCy0elMNg67LRNoVnUFPIm37iu5CmHESVx56/9Jsfdpsvbv605DQ81Pi/x11IdKUsS5nzgTYbCQU9fg==", + "version": "8.46.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.46.1.tgz", + "integrity": "sha512-ptkmIf2iDkNUjdeu2bQqhFPV1m6qTnFFjg7PPDjxKWaMaP0Z6I9l30Jr3g5QqbZGdw8YdYvLp+XnqnWWZOg/NA==", "dev": true, "license": "MIT", "dependencies": { - "@typescript-eslint/types": "8.41.0", + "@typescript-eslint/types": "8.46.1", "eslint-visitor-keys": "^4.2.1" }, "engines": { @@ -710,9 +699,9 @@ } }, "node_modules/ansi-regex": { - "version": "6.2.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.2.0.tgz", - "integrity": "sha512-TKY5pyBkHyADOPYlRT9Lx6F544mPl0vS5Ew7BJ45hA08Q+t3GjbueLliBWN3sMICk6+y7HdyxSzC4bWS8baBdg==", + "version": "6.2.2", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.2.2.tgz", + "integrity": "sha512-Bq3SmSpyFHaWjPk8If9yc6svM8c56dB5BAtW4Qbw5jHTwwXXcTLoRMkpDJp6VL0XzlWaCHTXrkFURMYmD0sLqg==", "license": "MIT", "engines": { "node": ">=12" @@ -1311,9 +1300,9 @@ } }, "node_modules/debug": { - "version": "4.4.1", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.1.tgz", - "integrity": "sha512-KcKCqiftBJcZr++7ykoDIEwSa3XWowTfNPo92BYxjXiyYEVrUQh2aLyhxBCwww+heortUFxEJYcRzosstTEBYQ==", + "version": "4.4.3", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.3.tgz", + "integrity": "sha512-RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA==", "license": "MIT", "dependencies": { "ms": "^2.1.3" @@ -1673,25 +1662,24 @@ } }, "node_modules/eslint": { - "version": "9.34.0", - "resolved": "https://registry.npmjs.org/eslint/-/eslint-9.34.0.tgz", - "integrity": "sha512-RNCHRX5EwdrESy3Jc9o8ie8Bog+PeYvvSR8sDGoZxNFTvZ4dlxUB3WzQ3bQMztFrSRODGrLLj8g6OFuGY/aiQg==", + "version": "9.38.0", + "resolved": "https://registry.npmjs.org/eslint/-/eslint-9.38.0.tgz", + "integrity": "sha512-t5aPOpmtJcZcz5UJyY2GbvpDlsK5E8JqRqoKtfiKE3cNh437KIqfJr3A3AKf5k64NPx6d0G3dno6XDY05PqPtw==", "dev": true, "license": "MIT", "dependencies": { - "@eslint-community/eslint-utils": "^4.2.0", + "@eslint-community/eslint-utils": "^4.8.0", "@eslint-community/regexpp": "^4.12.1", - "@eslint/config-array": "^0.21.0", - "@eslint/config-helpers": "^0.3.1", - "@eslint/core": "^0.15.2", + "@eslint/config-array": "^0.21.1", + "@eslint/config-helpers": "^0.4.1", + "@eslint/core": "^0.16.0", "@eslint/eslintrc": "^3.3.1", - "@eslint/js": "9.34.0", - "@eslint/plugin-kit": "^0.3.5", + "@eslint/js": "9.38.0", + "@eslint/plugin-kit": "^0.4.0", "@humanfs/node": "^0.16.6", "@humanwhocodes/module-importer": "^1.0.1", "@humanwhocodes/retry": "^0.4.2", "@types/estree": "^1.0.6", - "@types/json-schema": "^7.0.15", "ajv": "^6.12.4", "chalk": "^4.0.0", "cross-spawn": "^7.0.6", @@ -1772,9 +1760,9 @@ } }, "node_modules/eslint-plugin-n": { - "version": "17.21.3", - "resolved": "https://registry.npmjs.org/eslint-plugin-n/-/eslint-plugin-n-17.21.3.tgz", - "integrity": "sha512-MtxYjDZhMQgsWRm/4xYLL0i2EhusWT7itDxlJ80l1NND2AL2Vi5Mvneqv/ikG9+zpran0VsVRXTEHrpLmUZRNw==", + "version": "17.23.1", + "resolved": "https://registry.npmjs.org/eslint-plugin-n/-/eslint-plugin-n-17.23.1.tgz", + "integrity": "sha512-68PealUpYoHOBh332JLLD9Sj7OQUDkFpmcfqt8R9sySfFSeuGJjMTJQvCRRB96zO3A/PELRLkPrzsHmzEFQQ5A==", "dev": true, "license": "MIT", "dependencies": { @@ -1968,9 +1956,9 @@ } }, "node_modules/exponential-backoff": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/exponential-backoff/-/exponential-backoff-3.1.2.tgz", - "integrity": "sha512-8QxYTVXUkuy7fIIoitQkPwGonB8F3Zj8eEO8Sqg9Zv/bkI7RJAzowee4gr81Hak/dUTpA2Z7VfQgoijjPNlUZA==", + "version": "3.1.3", + "resolved": "https://registry.npmjs.org/exponential-backoff/-/exponential-backoff-3.1.3.tgz", + "integrity": "sha512-ZgEeZXj30q+I0EN+CbSSpIyPaJ5HVQD18Z1m+u1FXbAeT94mr1zw50q4q6jiiC447Nl/YTcIYSAftiGqetwXCA==", "license": "Apache-2.0" }, "node_modules/fast-deep-equal": { @@ -2217,6 +2205,16 @@ "url": "https://github.com/sponsors/ljharb" } }, + "node_modules/generator-function": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/generator-function/-/generator-function-2.0.1.tgz", + "integrity": "sha512-SFdFmIJi+ybC0vjlHN0ZGVGHc3lgE0DxPAT0djjVg+kjOnSqclqmj0KQ7ykTOLP6YxoqOvuAODGdcHJn+43q3g==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 0.4" + } + }, "node_modules/get-caller-file": { "version": "2.0.5", "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz", @@ -2285,9 +2283,9 @@ } }, "node_modules/get-tsconfig": { - "version": "4.10.1", - "resolved": "https://registry.npmjs.org/get-tsconfig/-/get-tsconfig-4.10.1.tgz", - "integrity": "sha512-auHyJ4AgMz7vgS8Hp3N6HXSmlMdUyhSUrfBF16w153rxtLIEOE+HGqaBppczZvnHLqQJfiHotCYpNhl0lUROFQ==", + "version": "4.12.0", + "resolved": "https://registry.npmjs.org/get-tsconfig/-/get-tsconfig-4.12.0.tgz", + "integrity": "sha512-LScr2aNr2FbjAjZh2C6X6BxRx1/x+aTDExct/xyq2XKbYOiG5c0aK7pMsSuyc0brz3ibr/lbQiHD9jzt4lccJw==", "dev": true, "license": "MIT", "dependencies": { @@ -2797,14 +2795,15 @@ } }, "node_modules/is-generator-function": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/is-generator-function/-/is-generator-function-1.1.0.tgz", - "integrity": "sha512-nPUB5km40q9e8UfN/Zc24eLlzdSf9OfKByBw9CIdw4H1giPMeA0OIJvbchsCu4npfI2QcMVBsGEBHKZ7wLTWmQ==", + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/is-generator-function/-/is-generator-function-1.1.2.tgz", + "integrity": "sha512-upqt1SkGkODW9tsGNG5mtXTXtECizwtS2kA161M+gJPc1xdb/Ax629af6YrTwcOeQHbewrPNlE5Dx7kzvXTizA==", "dev": true, "license": "MIT", "dependencies": { - "call-bound": "^1.0.3", - "get-proto": "^1.0.0", + "call-bound": "^1.0.4", + "generator-function": "^2.0.0", + "get-proto": "^1.0.1", "has-tostringtag": "^1.0.2", "safe-regex-test": "^1.1.0" }, @@ -2881,6 +2880,16 @@ "url": "https://github.com/sponsors/ljharb" } }, + "node_modules/is-path-inside": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.3.tgz", + "integrity": "sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, "node_modules/is-plain-obj": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-2.1.0.tgz", @@ -3449,9 +3458,9 @@ "license": "ISC" }, "node_modules/minizlib": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-3.0.2.tgz", - "integrity": "sha512-oG62iEk+CYt5Xj2YqI5Xi9xWUeZhDI8jjQmC5oThVH5JGCTgIjr7ciJDzC7MBzYd//WvR1OTmP5Q38Q8ShQtVA==", + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-3.1.0.tgz", + "integrity": "sha512-KZxYo1BUkWD2TVFLr0MQoM8vUUigWD3LlD83a/75BqC+4qE0Hb1Vo5v1FgcfaNXvfXzr+5EhQ6ing/CaBijTlw==", "license": "MIT", "dependencies": { "minipass": "^7.1.2" @@ -3460,25 +3469,10 @@ "node": ">= 18" } }, - "node_modules/mkdirp": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-3.0.1.tgz", - "integrity": "sha512-+NsyUUAZDmo6YVHzL/stxSu3t9YS1iljliy3BSDrXJ/dkn1KYdmtZODGGjLcc9XLgVVpH4KshHB8XmZgMhaBXg==", - "license": "MIT", - "bin": { - "mkdirp": "dist/cjs/src/bin.js" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, "node_modules/mocha": { - "version": "11.7.1", - "resolved": "https://registry.npmjs.org/mocha/-/mocha-11.7.1.tgz", - "integrity": "sha512-5EK+Cty6KheMS/YLPPMJC64g5V61gIR25KsRItHw6x4hEKT6Njp1n9LOlH4gpevuwMVS66SXaBBpg+RWZkza4A==", + "version": "11.7.4", + "resolved": "https://registry.npmjs.org/mocha/-/mocha-11.7.4.tgz", + "integrity": "sha512-1jYAaY8x0kAZ0XszLWu14pzsf4KV740Gld4HXkhNTXwcHx4AUEDkPzgEHg9CM5dVcW+zv036tjpsEbLraPJj4w==", "dev": true, "license": "MIT", "dependencies": { @@ -3490,6 +3484,7 @@ "find-up": "^5.0.0", "glob": "^10.4.5", "he": "^1.2.0", + "is-path-inside": "^3.0.3", "js-yaml": "^4.1.0", "log-symbols": "^4.1.0", "minimatch": "^9.0.5", @@ -4261,9 +4256,9 @@ "optional": true }, "node_modules/semver": { - "version": "7.7.2", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.2.tgz", - "integrity": "sha512-RF0Fw+rO5AMf9MAyaRXI4AV0Ulj5lMHqVxxdSgiVbixSCXoEmmX/jk0CuJw4+3SqroYO9VoUh+HcuJivvtJemA==", + "version": "7.7.3", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.3.tgz", + "integrity": "sha512-SdsKMrI9TdgjdweUSR9MweHA4EJ8YxHn8DFaDisvhVlUOe4BF1tLD7GAj0lIqWVl+dPb/rExr0Btby5loQm20Q==", "license": "ISC", "bin": { "semver": "bin/semver.js" @@ -4662,9 +4657,9 @@ } }, "node_modules/strip-ansi": { - "version": "7.1.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz", - "integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==", + "version": "7.1.2", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.2.tgz", + "integrity": "sha512-gmBGslpoQJtgnMAvOVqGZpEz9dyoKTCzy2nfz/n8aIFhN/jCE/rCmcxabB6jOOHV+0WNnylOxaxBQPSvcWklhA==", "license": "MIT", "dependencies": { "ansi-regex": "^6.0.1" @@ -4738,9 +4733,9 @@ } }, "node_modules/tapable": { - "version": "2.2.3", - "resolved": "https://registry.npmjs.org/tapable/-/tapable-2.2.3.tgz", - "integrity": "sha512-ZL6DDuAlRlLGghwcfmSn9sK3Hr6ArtyudlSAiCqQ6IfE+b+HHbydbYDIG15IfS5do+7XQQBdBiubF/cV2dnDzg==", + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/tapable/-/tapable-2.3.0.tgz", + "integrity": "sha512-g9ljZiwki/LfxmQADO3dEY1CbpmXT5Hm2fJ+QaGKwSXUylMybePR7/67YW7jOrrvjEgL1Fmz5kzyAjWVWLlucg==", "dev": true, "license": "MIT", "engines": { @@ -4752,16 +4747,15 @@ } }, "node_modules/tar": { - "version": "7.4.3", - "resolved": "https://registry.npmjs.org/tar/-/tar-7.4.3.tgz", - "integrity": "sha512-5S7Va8hKfV7W5U6g3aYxXmlPoZVAwUMy9AOKyF2fVuZa2UD3qZjg578OrLRt8PcNN1PleVaL/5/yYATNL0ICUw==", + "version": "7.5.1", + "resolved": "https://registry.npmjs.org/tar/-/tar-7.5.1.tgz", + "integrity": "sha512-nlGpxf+hv0v7GkWBK2V9spgactGOp0qvfWRxUMjqHyzrt3SgwE48DIv/FhqPHJYLHpgW1opq3nERbz5Anq7n1g==", "license": "ISC", "dependencies": { "@isaacs/fs-minipass": "^4.0.0", "chownr": "^3.0.0", "minipass": "^7.1.2", - "minizlib": "^3.0.1", - "mkdirp": "^3.0.1", + "minizlib": "^3.1.0", "yallist": "^5.0.0" }, "engines": { @@ -4769,13 +4763,13 @@ } }, "node_modules/tinyglobby": { - "version": "0.2.14", - "resolved": "https://registry.npmjs.org/tinyglobby/-/tinyglobby-0.2.14.tgz", - "integrity": "sha512-tX5e7OM1HnYr2+a2C/4V0htOcSQcoSTH9KgJnVvNm5zm/cyEWKJ7j7YutsH9CxMdtOkkLFy2AHrMci9IM8IPZQ==", + "version": "0.2.15", + "resolved": "https://registry.npmjs.org/tinyglobby/-/tinyglobby-0.2.15.tgz", + "integrity": "sha512-j2Zq4NyQYG5XMST4cbs02Ak8iJUdxRM0XI5QyxXuZOzKOINmWurp3smXu3y5wDcJrptwpSjgXHzIQxR0omXljQ==", "license": "MIT", "dependencies": { - "fdir": "^6.4.4", - "picomatch": "^4.0.2" + "fdir": "^6.5.0", + "picomatch": "^4.0.3" }, "engines": { "node": ">=12.0.0" @@ -4925,9 +4919,9 @@ } }, "node_modules/typescript": { - "version": "5.9.2", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.9.2.tgz", - "integrity": "sha512-CWBzXQrc/qOkhidw1OzBTQuYRbfyxDXJMVJ1XNwUHGROVmuaeiEm3OslpZ1RV96d7SKKjZKrSJu3+t/xlw3R9A==", + "version": "5.9.3", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.9.3.tgz", + "integrity": "sha512-jl1vZzPDinLr9eUt3J/t7V6FgNEw9QjvBPdysz9KfQDD41fQrC2Y4vKQdiaUpFT4bXlb1RHhLpp8wtm6M5TgSw==", "dev": true, "license": "Apache-2.0", "peer": true, @@ -4940,16 +4934,16 @@ } }, "node_modules/typescript-eslint": { - "version": "8.41.0", - "resolved": "https://registry.npmjs.org/typescript-eslint/-/typescript-eslint-8.41.0.tgz", - "integrity": "sha512-n66rzs5OBXW3SFSnZHr2T685q1i4ODm2nulFJhMZBotaTavsS8TrI3d7bDlRSs9yWo7HmyWrN9qDu14Qv7Y0Dw==", + "version": "8.46.1", + "resolved": "https://registry.npmjs.org/typescript-eslint/-/typescript-eslint-8.46.1.tgz", + "integrity": "sha512-VHgijW803JafdSsDO8I761r3SHrgk4T00IdyQ+/UsthtgPRsBWQLqoSxOolxTpxRKi1kGXK0bSz4CoAc9ObqJA==", "dev": true, "license": "MIT", "dependencies": { - "@typescript-eslint/eslint-plugin": "8.41.0", - "@typescript-eslint/parser": "8.41.0", - "@typescript-eslint/typescript-estree": "8.41.0", - "@typescript-eslint/utils": "8.41.0" + "@typescript-eslint/eslint-plugin": "8.46.1", + "@typescript-eslint/parser": "8.46.1", + "@typescript-eslint/typescript-estree": "8.46.1", + "@typescript-eslint/utils": "8.46.1" }, "engines": { "node": "^18.18.0 || ^20.9.0 || >=21.1.0" @@ -5131,9 +5125,9 @@ } }, "node_modules/workerpool": { - "version": "9.3.3", - "resolved": "https://registry.npmjs.org/workerpool/-/workerpool-9.3.3.tgz", - "integrity": "sha512-slxCaKbYjEdFT/o2rH9xS1hf4uRDch1w7Uo+apxhZ+sf/1d9e0ZVkn42kPNGP2dgjIx6YFvSevj0zHvbWe2jdw==", + "version": "9.3.4", + "resolved": "https://registry.npmjs.org/workerpool/-/workerpool-9.3.4.tgz", + "integrity": "sha512-TmPRQYYSAnnDiEB0P/Ytip7bFGvqnSU6I2BcuSw7Hx+JSg/DsUi5ebYfc8GYaSdpuvOcEs6dXxPurOYpe9QFwg==", "dev": true, "license": "Apache-2.0" }, @@ -5214,9 +5208,9 @@ } }, "node_modules/wrap-ansi/node_modules/ansi-styles": { - "version": "6.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.1.tgz", - "integrity": "sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==", + "version": "6.2.3", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.3.tgz", + "integrity": "sha512-4Dj6M28JB+oAH8kFkTLUo+a2jwOFkuqb3yucU0CANcRRUbxS0cP0nZYCGjcc3BNXwRIsUVmDGgzawme7zvJHvg==", "license": "MIT", "engines": { "node": ">=12" diff --git a/pkgs/by-name/no/node-gyp/package.nix b/pkgs/by-name/no/node-gyp/package.nix index ec2aa63bdf36..216f1e2b2646 100644 --- a/pkgs/by-name/no/node-gyp/package.nix +++ b/pkgs/by-name/no/node-gyp/package.nix @@ -8,16 +8,16 @@ (buildNpmPackage.override { inherit nodejs; }) rec { pname = "node-gyp"; - version = "11.4.2"; + version = "11.5.0"; src = fetchFromGitHub { owner = "nodejs"; repo = "node-gyp"; tag = "v${version}"; - hash = "sha256-IoW71RdjQRfIEr6Nh+xqDsgf28WhQ7vHTS1BB++3mdU="; + hash = "sha256-IymzSi9bQhtBX8AjtYAjHs0dN+5scywJuATz5IclSJs="; }; - npmDepsHash = "sha256-ixAelIVTKlTmXiXLA2iI9vJ/gp79wpd+wRvspUqEci4="; + npmDepsHash = "sha256-C8/pQ26gHToC0yq/6V385Uo1cM8SknoQ2h7u7i3Gy/Q="; postPatch = '' ln -s ${./package-lock.json} package-lock.json From 9cc5717441243d73339def70b441f8bf3b560cdd Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 17 Oct 2025 23:41:53 +0000 Subject: [PATCH 37/42] python3Packages.universal-silabs-flasher: 0.0.35 -> 0.0.36 --- .../python-modules/universal-silabs-flasher/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/universal-silabs-flasher/default.nix b/pkgs/development/python-modules/universal-silabs-flasher/default.nix index 797f9b71a849..36fa6c553bf5 100644 --- a/pkgs/development/python-modules/universal-silabs-flasher/default.nix +++ b/pkgs/development/python-modules/universal-silabs-flasher/default.nix @@ -28,14 +28,14 @@ buildPythonPackage rec { pname = "universal-silabs-flasher"; - version = "0.0.35"; + version = "0.0.36"; pyproject = true; src = fetchFromGitHub { owner = "NabuCasa"; repo = "universal-silabs-flasher"; tag = "v${version}"; - hash = "sha256-6NOcEH1UUicZHKOQ91o4l7JiC1Qwpc8vWyRR7TRENqs="; + hash = "sha256-NKsVgbcUHJsqGrpCqCbBT+LLJp9+BjUGKbE4Cx0uv8Y="; }; postPatch = '' From 47cea0ee9195ca4af67e1100989d7bc2d20d8e5e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 18 Oct 2025 00:26:32 +0000 Subject: [PATCH 38/42] atac: 0.22.0 -> 0.22.1 --- pkgs/by-name/at/atac/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/at/atac/package.nix b/pkgs/by-name/at/atac/package.nix index 789ef0d73019..cf4fafdb9f4e 100644 --- a/pkgs/by-name/at/atac/package.nix +++ b/pkgs/by-name/at/atac/package.nix @@ -7,16 +7,16 @@ }: rustPlatform.buildRustPackage rec { pname = "atac"; - version = "0.22.0"; + version = "0.22.1"; src = fetchFromGitHub { owner = "Julien-cpsn"; repo = "ATAC"; rev = "v${version}"; - hash = "sha256-zMCz0WRqIS2htf9TMfq6BlupU8dj5PrziEMxisjkOEc="; + hash = "sha256-PXSjyMe7Rcoeczm/cqFgn1Ra66T9cA34NdfaqLTljmc="; }; - cargoHash = "sha256-U+8JElXGNsiPUM9bLmqXYudRmg+K+VJLAgKLGqiVddc="; + cargoHash = "sha256-qjg5yxWRcNnmrl91kogUEOfFOs06tcgmK2hpqx6nftU="; nativeBuildInputs = [ pkg-config ]; From 863b38fef50501ff6661313a514e99e1684c7fc2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 18 Oct 2025 00:39:26 +0000 Subject: [PATCH 39/42] python3Packages.pymobiledevice3: 4.27.3 -> 4.27.5 --- pkgs/development/python-modules/pymobiledevice3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pymobiledevice3/default.nix b/pkgs/development/python-modules/pymobiledevice3/default.nix index 301251829f6a..4204cb8df42c 100644 --- a/pkgs/development/python-modules/pymobiledevice3/default.nix +++ b/pkgs/development/python-modules/pymobiledevice3/default.nix @@ -48,14 +48,14 @@ buildPythonPackage rec { pname = "pymobiledevice3"; - version = "4.27.3"; + version = "4.27.5"; pyproject = true; src = fetchFromGitHub { owner = "doronz88"; repo = "pymobiledevice3"; tag = "v${version}"; - hash = "sha256-YYRDsE/rfTAnjDrJ0sMLeTyKshhl8NXhdspQUql2RAE="; + hash = "sha256-dfbh1NvM/XccsGnJ7iTBzkdc31eOSaDs8671cibLI14="; }; build-system = [ From 520189dd20b5516596dbdd24ef4d26d0594b2857 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 18 Oct 2025 01:01:42 +0000 Subject: [PATCH 40/42] home-assistant-custom-lovelace-modules.advanced-camera-card: 7.18.3 -> 7.19.0 --- .../custom-lovelace-modules/advanced-camera-card/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/advanced-camera-card/package.nix b/pkgs/servers/home-assistant/custom-lovelace-modules/advanced-camera-card/package.nix index 71ae421cb9cf..f623b11c07c8 100644 --- a/pkgs/servers/home-assistant/custom-lovelace-modules/advanced-camera-card/package.nix +++ b/pkgs/servers/home-assistant/custom-lovelace-modules/advanced-camera-card/package.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { pname = "advanced-camera-card"; - version = "7.18.3"; + version = "7.19.0"; src = fetchzip { url = "https://github.com/dermotduffy/advanced-camera-card/releases/download/v${version}/advanced-camera-card.zip"; - hash = "sha256-eNyfXRSF2nSct4+iQoOCkbcN3vmzmIenlO/ng7ThPzM="; + hash = "sha256-3HWkKUPuQ6rSIxvMiyXe5MNvmKMIS3sCv+KYOGMEun8="; }; # TODO: build from source once yarn berry support lands in nixpkgs From 36b7d18471b8264465d727696c049807c1badaa2 Mon Sep 17 00:00:00 2001 From: magicquark <198001825+magicquark@users.noreply.github.com> Date: Sat, 18 Oct 2025 02:59:15 +0100 Subject: [PATCH 41/42] convertall: migrate to pkgs/by-name --- .../default.nix => by-name/co/convertall/package.nix} | 0 .../science/misc => by-name/co}/convertall/pubspec.lock.json | 0 pkgs/top-level/all-packages.nix | 2 -- 3 files changed, 2 deletions(-) rename pkgs/{applications/science/misc/convertall/default.nix => by-name/co/convertall/package.nix} (100%) rename pkgs/{applications/science/misc => by-name/co}/convertall/pubspec.lock.json (100%) diff --git a/pkgs/applications/science/misc/convertall/default.nix b/pkgs/by-name/co/convertall/package.nix similarity index 100% rename from pkgs/applications/science/misc/convertall/default.nix rename to pkgs/by-name/co/convertall/package.nix diff --git a/pkgs/applications/science/misc/convertall/pubspec.lock.json b/pkgs/by-name/co/convertall/pubspec.lock.json similarity index 100% rename from pkgs/applications/science/misc/convertall/pubspec.lock.json rename to pkgs/by-name/co/convertall/pubspec.lock.json diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d3c1ef173dd0..ea68d5d44bfc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14231,8 +14231,6 @@ with pkgs; inherit (gnome2) gtkglext; }; - convertall = qt5.callPackage ../applications/science/misc/convertall { }; - faissWithCuda = faiss.override { cudaSupport = true; }; From 9eb8e32cd385d3967ed1d99fcb78eca175d0dfd6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 18 Oct 2025 02:11:34 +0000 Subject: [PATCH 42/42] rumdl: 0.0.156 -> 0.0.162 --- pkgs/by-name/ru/rumdl/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ru/rumdl/package.nix b/pkgs/by-name/ru/rumdl/package.nix index e64a26b89c45..a0eac951ca98 100644 --- a/pkgs/by-name/ru/rumdl/package.nix +++ b/pkgs/by-name/ru/rumdl/package.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "rumdl"; - version = "0.0.156"; + version = "0.0.162"; src = fetchFromGitHub { owner = "rvben"; repo = "rumdl"; tag = "v${finalAttrs.version}"; - hash = "sha256-yHOfrX3iOq1oGwHtHchMyQblqLXreoUKLBTpxxh2FEE="; + hash = "sha256-aCduiCO49YWeqET3nezI1EYkz+IbTR+uIy7FXHbkYCo="; }; - cargoHash = "sha256-U8kb3fQjA3Prrpn1KmhsQl4S0hvhcY+5qlqT5ovbUZE="; + cargoHash = "sha256-o9NqTdMEoYFZC69Raf0v6fHUKnbN2K+rV3LK6rtjG/k="; cargoBuildFlags = [ "--bin=rumdl"