From f83f6a25ce92fd1b6b331f3473f91bb5626ce67f Mon Sep 17 00:00:00 2001 From: Martin Schwaighofer Date: Sun, 2 Feb 2025 13:12:04 +0100 Subject: [PATCH 01/96] installer: fix broken search suggestion in default config --- nixos/modules/installer/tools/tools.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/modules/installer/tools/tools.nix b/nixos/modules/installer/tools/tools.nix index e4d03f39018e..70a93aa51a28 100644 --- a/nixos/modules/installer/tools/tools.nix +++ b/nixos/modules/installer/tools/tools.nix @@ -117,8 +117,8 @@ let # programs.firefox.enable = true; - # List packages installed in system profile. To search, run: - # \$ nix search wget + # List packages installed in system profile. + # You can use https://search.nixos.org/ to find more packages (and options). # environment.systemPackages = with pkgs; [ # vim # Do not forget to add an editor to edit configuration.nix! The Nano editor is also installed by default. # wget From 7b66e42b862174b71619e0efef892b0e7c4ef327 Mon Sep 17 00:00:00 2001 From: Zexin Yuan Date: Sat, 3 May 2025 17:22:05 +0800 Subject: [PATCH 02/96] blender: use openvdb 12 Co-authored-by: Pavol Rusnak --- pkgs/by-name/bl/blender/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/bl/blender/package.nix b/pkgs/by-name/bl/blender/package.nix index 95f7ca7ddfc8..4c1980c6bd0a 100644 --- a/pkgs/by-name/bl/blender/package.nix +++ b/pkgs/by-name/bl/blender/package.nix @@ -63,7 +63,7 @@ openjpeg, openpgl, opensubdiv, - openvdb_11, + openvdb, openxr-loader, pkg-config, potrace, @@ -255,7 +255,7 @@ stdenv'.mkDerivation (finalAttrs: { openjpeg openpgl (opensubdiv.override { inherit cudaSupport; }) - openvdb_11 + openvdb potrace pugixml python3 From a781b7fb52a05a16b3912de6ea4c11878a0372ff Mon Sep 17 00:00:00 2001 From: Zexin Yuan Date: Sat, 3 May 2025 17:26:27 +0800 Subject: [PATCH 03/96] openvdb_11: drop --- pkgs/development/libraries/openvdb/11.nix | 19 ------------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 1 - 3 files changed, 1 insertion(+), 20 deletions(-) delete mode 100644 pkgs/development/libraries/openvdb/11.nix diff --git a/pkgs/development/libraries/openvdb/11.nix b/pkgs/development/libraries/openvdb/11.nix deleted file mode 100644 index a65bb286ae2e..000000000000 --- a/pkgs/development/libraries/openvdb/11.nix +++ /dev/null @@ -1,19 +0,0 @@ -{ - lib, - fetchFromGitHub, - openvdb, -}: - -openvdb.overrideAttrs (old: rec { - name = "${old.pname}-${version}"; - version = "11.0.0"; - src = fetchFromGitHub { - owner = "AcademySoftwareFoundation"; - repo = "openvdb"; - rev = "v${version}"; - sha256 = "sha256-wDDjX0nKZ4/DIbEX33PoxR43dJDj2NF3fm+Egug62GQ="; - }; - meta = old.meta // { - license = lib.licenses.mpl20; - }; -}) diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 88f642fd6f50..1e873539d832 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1356,6 +1356,7 @@ mapAliases { openssl_3_0 = openssl_3; # Added 2022-06-27 opensycl = lib.warnOnInstantiate "'opensycl' has been renamed to 'adaptivecpp'" adaptivecpp; # Added 2024-12-04 opensyclWithRocm = lib.warnOnInstantiate "'opensyclWithRocm' has been renamed to 'adaptivecppWithRocm'" adaptivecppWithRocm; # Added 2024-12-04 + openvdb_11 = throw "'openvdb_11' has been removed in favor of the latest version'"; # Added 2025-05-03 orchis = throw "'orchis' has been renamed to/replaced by 'orchis-theme'"; # Converted to throw 2024-10-17 onlyoffice-bin = onlyoffice-desktopeditors; # Added 2024-09-20 onlyoffice-bin_latest = onlyoffice-bin; # Added 2024-07-03 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e64a670a0ebd..ef569893d3f7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10626,7 +10626,6 @@ with pkgs; zunclient = with python312Packages; toPythonApplication python-zunclient; openvdb = callPackage ../development/libraries/openvdb { }; - openvdb_11 = callPackage ../development/libraries/openvdb/11.nix { }; openvr = callPackage ../by-name/op/openvr/package.nix { inherit (darwin.apple_sdk.frameworks) Foundation AppKit; From ff10dc67d9168b0d155af92c282cdcc038e783be Mon Sep 17 00:00:00 2001 From: qbisi Date: Fri, 2 May 2025 02:56:56 +0800 Subject: [PATCH 04/96] python312Packages.mpi-pytest: init at 2025.4.0 --- .../python-modules/mpi-pytest/default.nix | 59 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 61 insertions(+) create mode 100644 pkgs/development/python-modules/mpi-pytest/default.nix diff --git a/pkgs/development/python-modules/mpi-pytest/default.nix b/pkgs/development/python-modules/mpi-pytest/default.nix new file mode 100644 index 000000000000..0d7933098a1f --- /dev/null +++ b/pkgs/development/python-modules/mpi-pytest/default.nix @@ -0,0 +1,59 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + setuptools, + mpi4py, + pytest, + pytestCheckHook, + mpiCheckPhaseHook, +}: + +buildPythonPackage rec { + pname = "mpi-pytest"; + version = "2025.4.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "firedrakeproject"; + repo = "mpi-pytest"; + tag = "v${version}"; + hash = "sha256-r9UB5H+qAJc6k2SVAiOCI2yRDLNv2zKRmfrAan+cX9I="; + }; + + # A temporary fixup to support fork mode with openmpi implemention + # See https://github.com/firedrakeproject/mpi-pytest/pull/17 + postPatch = lib.optionalString (mpi4py.mpi.pname == "openmpi") '' + substituteInPlace pytest_mpi/plugin.py \ + --replace-fail '"-genv", CHILD_PROCESS_FLAG, "1"' '"-x", f"{CHILD_PROCESS_FLAG}=1"' + ''; + + build-system = [ + setuptools + ]; + + dependencies = [ + mpi4py + pytest + ]; + + pythonImportsCheck = [ + "pytest_mpi" + ]; + + nativeCheckInputs = [ + pytestCheckHook + mpiCheckPhaseHook + mpi4py.mpi + ]; + + __darwinAllowLocalNetworking = true; + + meta = { + homepage = "https://github.com/firedrakeproject/mpi-pytest"; + description = "Pytest plugin that lets you run tests in parallel with MPI"; + changelog = "https://github.com/firedrakeproject/mpi-pytest/releases/tag/${src.tag}"; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ qbisi ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 1613dfd9e0b5..0d1b444b63c3 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -9102,6 +9102,8 @@ self: super: with self; { mpegdash = callPackage ../development/python-modules/mpegdash { }; + mpi-pytest = callPackage ../development/python-modules/mpi-pytest { }; + mpi4py = callPackage ../development/python-modules/mpi4py { }; mpire = callPackage ../development/python-modules/mpire { }; From 1e8cb718e81d819ed7eee0f0333b6a7eb9a5f4b7 Mon Sep 17 00:00:00 2001 From: Zexin Yuan Date: Sat, 3 May 2025 17:38:26 +0800 Subject: [PATCH 05/96] blender: fix darwin build --- pkgs/by-name/bl/blender/darwin.patch | 68 +++++++++++++++++++--------- pkgs/by-name/bl/blender/package.nix | 5 +- 2 files changed, 50 insertions(+), 23 deletions(-) diff --git a/pkgs/by-name/bl/blender/darwin.patch b/pkgs/by-name/bl/blender/darwin.patch index 192516758c94..187c7b42d2c2 100644 --- a/pkgs/by-name/bl/blender/darwin.patch +++ b/pkgs/by-name/bl/blender/darwin.patch @@ -1,17 +1,21 @@ ---- a/CMakeLists.txt 2024-03-01 08:08:05 -+++ b/CMakeLists.txt 2024-04-24 15:45:30 -@@ -2134,7 +2134,7 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 0611614fe18..a6dcb2f04b6 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -2567,7 +2567,7 @@ if(WITH_COMPILER_SHORT_FILE_MACRO) ) if(C_MACRO_PREFIX_MAP AND CXX_MACRO_PREFIX_MAP) if(APPLE) - if(XCODE AND ${XCODE_VERSION} VERSION_LESS 12.0) + if(FALSE) - # Developers may have say LLVM Clang-10.0.1 toolchain (which supports the flag) - # with Xcode-11 (the Clang of which doesn't support the flag). + # Developers may have say LLVM Clang-10.0.1 toolchain (which supports the flag) + # with Xcode-11 (the Clang of which doesn't support the flag). message( ---- a/build_files/cmake/platform/platform_apple.cmake 2024-02-22 15:31:36 -+++ b/build_files/cmake/platform/platform_apple.cmake 2024-04-24 16:06:13 -@@ -55,7 +55,6 @@ +diff --git a/build_files/cmake/platform/platform_apple.cmake b/build_files/cmake/platform/platform_apple.cmake +index b2db64bbd2e..aac4b552655 100644 +--- a/build_files/cmake/platform/platform_apple.cmake ++++ b/build_files/cmake/platform/platform_apple.cmake +@@ -55,7 +55,6 @@ if(NOT DEFINED LIBDIR) endif() endif() if(NOT EXISTS "${LIBDIR}/.git") @@ -19,7 +23,7 @@ endif() if(FIRST_RUN) message(STATUS "Using pre-compiled LIBDIR: ${LIBDIR}") -@@ -115,10 +114,6 @@ +@@ -121,10 +120,6 @@ if(WITH_CODEC_SNDFILE) find_library(_sndfile_VORBIS_LIBRARY NAMES vorbis HINTS ${LIBDIR}/ffmpeg/lib) find_library(_sndfile_VORBISENC_LIBRARY NAMES vorbisenc HINTS ${LIBDIR}/ffmpeg/lib) list(APPEND LIBSNDFILE_LIBRARIES @@ -30,35 +34,35 @@ ) print_found_status("SndFile libraries" "${LIBSNDFILE_LIBRARIES}") -@@ -162,9 +157,7 @@ +@@ -168,9 +163,7 @@ if(WITH_CODEC_FFMPEG) set(FFMPEG_ROOT_DIR ${LIBDIR}/ffmpeg) set(FFMPEG_FIND_COMPONENTS avcodec avdevice avformat avutil - mp3lame ogg opus swresample swscale - theora theoradec theoraenc vorbis vorbisenc - vorbisfile vpx x264) -+ swresample swscale) ++ swresample swscale) if(EXISTS ${LIBDIR}/ffmpeg/lib/libaom.a) list(APPEND FFMPEG_FIND_COMPONENTS aom) endif() -@@ -275,7 +268,6 @@ +@@ -285,7 +278,6 @@ endif() add_bundled_libraries(boost/lib) - if(WITH_INTERNATIONAL OR WITH_CODEC_FFMPEG) -- string(APPEND PLATFORM_LINKFLAGS " -liconv") # boost_locale and ffmpeg needs it ! + if(WITH_CODEC_FFMPEG) +- string(APPEND PLATFORM_LINKFLAGS " -liconv") # ffmpeg needs it ! endif() if(WITH_PUGIXML) -@@ -350,7 +342,7 @@ - +@@ -361,7 +353,7 @@ endif() # CMake FindOpenMP doesn't know about AppleClang before 3.12, so provide custom flags. if(WITH_OPENMP) -- if(CMAKE_C_COMPILER_ID MATCHES "Clang") -+ if(FALSE) - # Use OpenMP from our precompiled libraries. - message(STATUS "Using ${LIBDIR}/openmp for OpenMP") - set(OPENMP_CUSTOM ON) -@@ -427,7 +419,7 @@ + if(CMAKE_C_COMPILER_ID MATCHES "Clang") +- if(${CMAKE_C_COMPILER_VERSION} VERSION_GREATER_EQUAL 17.0) ++ if(FALSE) # clang in nix was compatible with openmp + if(WITH_STRICT_BUILD_OPTIONS) + message(SEND_ERROR "OpenMP library is not compatible with the current Clang version") + else() +@@ -446,7 +438,7 @@ string(APPEND PLATFORM_LINKFLAGS " -Wl,-unexported_symbols_list,'${PLATFORM_SYMBOLS_MAP}'" ) @@ -67,3 +71,23 @@ if("${CMAKE_OSX_ARCHITECTURES}" STREQUAL "x86_64") # Silence "no platform load command found in , assuming: macOS". string(APPEND PLATFORM_LINKFLAGS " -Wl,-ld_classic") +diff --git a/source/blender/blendthumb/CMakeLists.txt b/source/blender/blendthumb/CMakeLists.txt +index 935b3f94ee1..f3d73637f71 100644 +--- a/source/blender/blendthumb/CMakeLists.txt ++++ b/source/blender/blendthumb/CMakeLists.txt +@@ -65,15 +65,6 @@ elseif(APPLE) + # Prevent Xcode from overwriting the signature. + XCODE_ATTRIBUTE_CODE_SIGN_IDENTITY "" + ) +- # CMake needs the target defined in the same file as add_custom_command. +- # It needs to be code-signed (ad-hoc in this case) +- # even on developer machine to generate thumbnails. +- # Command taken from XCode build process. +- add_custom_command( +- TARGET blender-thumbnailer POST_BUILD +- COMMAND codesign --deep --force --sign - --entitlements "${CMAKE_SOURCE_DIR}/release/darwin/thumbnailer_entitlements.plist" +- --timestamp=none $ +- ) + elseif(UNIX) + # ----------------------------------------------------------------------------- + # Build `blender-thumbnailer` executable diff --git a/pkgs/by-name/bl/blender/package.nix b/pkgs/by-name/bl/blender/package.nix index 4c1980c6bd0a..89a9826a2c67 100644 --- a/pkgs/by-name/bl/blender/package.nix +++ b/pkgs/by-name/bl/blender/package.nix @@ -7,6 +7,7 @@ SDL, addDriverRunpath, alembic, + apple-sdk_15, blender, boost, brotli, @@ -287,6 +288,9 @@ stdenv'.mkDerivation (finalAttrs: { OpenAL OpenGL SDL + # blender chooses Metal features based on runtime system version + # lets use the latest SDK and let Blender handle falling back on older systems. + apple-sdk_15 brotli llvmPackages.openmp sse2neon @@ -432,7 +436,6 @@ stdenv'.mkDerivation (finalAttrs: { "x86_64-linux" "aarch64-darwin" ]; - broken = stdenv.hostPlatform.isDarwin; # fails due to too-old SDK, using newer SDK fails to compile maintainers = with lib.maintainers; [ amarshall veprbl From 4f477c2ffe68cecac4b8926fa261f43bb0a39e5b Mon Sep 17 00:00:00 2001 From: Zexin Yuan Date: Sat, 3 May 2025 17:38:50 +0800 Subject: [PATCH 06/96] blender: remove legacy darwin sdk stubs --- pkgs/by-name/bl/blender/package.nix | 10 ---------- pkgs/top-level/all-packages.nix | 7 ------- 2 files changed, 17 deletions(-) diff --git a/pkgs/by-name/bl/blender/package.nix b/pkgs/by-name/bl/blender/package.nix index 89a9826a2c67..e1230cc648d1 100644 --- a/pkgs/by-name/bl/blender/package.nix +++ b/pkgs/by-name/bl/blender/package.nix @@ -1,9 +1,4 @@ { - Cocoa, - CoreGraphics, - ForceFeedback, - OpenAL, - OpenGL, SDL, addDriverRunpath, alembic, @@ -282,11 +277,6 @@ stdenv'.mkDerivation (finalAttrs: { ] else [ - Cocoa - CoreGraphics - ForceFeedback - OpenAL - OpenGL SDL # blender chooses Metal features based on runtime system version # lets use the latest SDK and let Blender handle falling back on older systems. diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ef569893d3f7..8a3cf1969514 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13633,13 +13633,6 @@ with pkgs; blender = callPackage ../by-name/bl/blender/package.nix { python3Packages = python311Packages; - inherit (darwin.apple_sdk.frameworks) - Cocoa - CoreGraphics - ForceFeedback - OpenAL - OpenGL - ; }; blender-hip = blender.override { hipSupport = true; }; From 333e4edcc1340c2fd4950f5fafc350d3d20e011a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 5 May 2025 18:44:59 +0000 Subject: [PATCH 07/96] osc: 0.4.7 -> 0.4.8 --- pkgs/by-name/os/osc/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/os/osc/package.nix b/pkgs/by-name/os/osc/package.nix index 24078c23e5a8..e6f6e23cd7cb 100644 --- a/pkgs/by-name/os/osc/package.nix +++ b/pkgs/by-name/os/osc/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "osc"; - version = "0.4.7"; + version = "0.4.8"; src = fetchFromGitHub { owner = "theimpostor"; repo = "osc"; tag = "v${version}"; - hash = "sha256-MfEBbYT99tEtlOMmdl3iq2d07KYsN1tu5tDRFW3676g="; + hash = "sha256-XVFNcQH4MFZKmuOD9b3t320/hE+s+3igjlyHBWGKr0Q="; }; - vendorHash = "sha256-POtQWIjPObsfa3YZ1dLZgedZFUcc4HeTWjU20AucoKc="; + vendorHash = "sha256-k+4m9y7oAZqTr8S0zldJk5FeI3+/nN9RggKIfiyxzDI="; meta = { description = "Command line tool to access the system clipboard from anywhere using the ANSI OSC52 sequence"; From f6eed7be2ef127cdc5e6a0d058511c705d55e63c Mon Sep 17 00:00:00 2001 From: qbisi Date: Tue, 6 May 2025 07:09:16 +0800 Subject: [PATCH 08/96] python312Packages.firedrake-fiat: init at 2025.4.0 --- .../python-modules/firedrake-fiat/default.nix | 72 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 74 insertions(+) create mode 100644 pkgs/development/python-modules/firedrake-fiat/default.nix diff --git a/pkgs/development/python-modules/firedrake-fiat/default.nix b/pkgs/development/python-modules/firedrake-fiat/default.nix new file mode 100644 index 000000000000..45fbe6ad8841 --- /dev/null +++ b/pkgs/development/python-modules/firedrake-fiat/default.nix @@ -0,0 +1,72 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + fetchFromBitbucket, + setuptools, + numpy, + scipy, + sympy, + recursivenodes, + symengine, + fenics-ufl, + pytestCheckHook, +}: + +buildPythonPackage rec { + pname = "firdrake-fiat"; + version = "2025.4.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "firedrakeproject"; + repo = "fiat"; + tag = version; + hash = "sha256-i+hDpeg4SYRF7OK6uh1p1gVscyuJ4FjmyUUiLR7P7/A="; + }; + + postPatch = + let + fiat-reference-data = fetchFromBitbucket { + owner = "fenics-project"; + repo = "fiat-reference-data"; + rev = "0c8c97f7e4919402129e5ff3b54e3f0b9e902b7c"; + hash = "sha256-vdCkmCkKvLSYACF6MnZ/WuKuCNAoC3uu1A/9m9KwBK8="; + }; + in + '' + ln -s ${fiat-reference-data} test/FIAT/regression/fiat-reference-data + ''; + + build-system = [ setuptools ]; + + dependencies = [ + numpy + scipy + sympy + recursivenodes + fenics-ufl + symengine + ]; + + pythonImportsCheck = [ + "FIAT" + "finat" + "finat.ufl" + "gem" + ]; + + nativeCheckInputs = [ pytestCheckHook ]; + + pytestFlagsArray = [ + "--skip-download" + ]; + + meta = { + description = "FInite element Automatic Tabulator"; + homepage = "http://fenics-fiat.readthedocs.org/"; + downloadPage = "https://github.com/firedrakeproject/fiat"; + license = lib.licenses.lgpl3Plus; + maintainers = with lib.maintainers; [ qbisi ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 353e1f53da5e..510d978552ec 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4925,6 +4925,8 @@ self: super: with self; { firecrawl-py = callPackage ../development/python-modules/firecrawl-py { }; + firedrake-fiat = callPackage ../development/python-modules/firedrake-fiat { }; + fireflyalgorithm = callPackage ../development/python-modules/fireflyalgorithm { }; firetv = callPackage ../development/python-modules/firetv { }; From e8da861e122f5ebddc54272ebeb801cf8b8b4556 Mon Sep 17 00:00:00 2001 From: codgician <15964984+codgician@users.noreply.github.com> Date: Wed, 7 May 2025 09:00:02 +0000 Subject: [PATCH 09/96] waagent: 2.12.0.4 -> 2.13.1.1 --- pkgs/by-name/wa/waagent/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/wa/waagent/package.nix b/pkgs/by-name/wa/waagent/package.nix index dab0a9cc2384..67d87e8125c2 100644 --- a/pkgs/by-name/wa/waagent/package.nix +++ b/pkgs/by-name/wa/waagent/package.nix @@ -14,12 +14,12 @@ let in python.pkgs.buildPythonApplication rec { pname = "waagent"; - version = "2.12.0.4"; + version = "2.13.1.1"; src = fetchFromGitHub { owner = "Azure"; repo = "WALinuxAgent"; tag = "v${version}"; - hash = "sha256-L8W/ijBHkNukM2G9HBRVx2wFXzgkR8gbFBljNVPs6xA="; + hash = "sha256-W2NXxQOxRhJD/D/w58xknA9X8YYnQxwIhhjXzlCVVWA="; }; patches = [ # Suppress the following error when waagent tries to configure sshd: From 16a7d7e982a3c39323a2af824048816cc92a0249 Mon Sep 17 00:00:00 2001 From: codgician <15964984+codgician@users.noreply.github.com> Date: Wed, 7 May 2025 17:07:53 +0800 Subject: [PATCH 10/96] waagent: support AutoUpdate.UpdateToLatestVersion in module --- nixos/modules/virtualisation/waagent.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/modules/virtualisation/waagent.nix b/nixos/modules/virtualisation/waagent.nix index d09bb99939b6..4929b8435170 100644 --- a/nixos/modules/virtualisation/waagent.nix +++ b/nixos/modules/virtualisation/waagent.nix @@ -228,11 +228,11 @@ let }; }; - AutoUpdate.Enable = lib.mkOption { + AutoUpdate.UpdateToLatestVersion = lib.mkOption { type = types.bool; default = false; description = '' - Whether or not to enable autoupdate for goal state processing. + Whether or not to enable auto-update of the Extension Handler. ''; }; }; From 97ae53798f6a7c7c3c259ad8c2cbcede6ca34b2a Mon Sep 17 00:00:00 2001 From: Tobias Mayer Date: Wed, 7 May 2025 13:30:49 +0200 Subject: [PATCH 11/96] arrow-cpp: 19.0.1 -> 20.0.0 --- pkgs/by-name/ar/arrow-cpp/package.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/ar/arrow-cpp/package.nix b/pkgs/by-name/ar/arrow-cpp/package.nix index 5f47bd7d26d8..44c23d06329c 100644 --- a/pkgs/by-name/ar/arrow-cpp/package.nix +++ b/pkgs/by-name/ar/arrow-cpp/package.nix @@ -68,19 +68,19 @@ let name = "arrow-testing"; owner = "apache"; repo = "arrow-testing"; - rev = "4d209492d514c2d3cb2d392681b9aa00e6d8da1c"; - hash = "sha256-IkiCbuy0bWyClPZ4ZEdkEP7jFYLhM7RCuNLd6Lazd4o="; + rev = "d2a13712303498963395318a4eb42872e66aead7"; + hash = "sha256-c8FL37kG0uo7o0Zp71WjCl7FD5BnVgqUCCXXX9gI0lg="; }; parquet-testing = fetchFromGitHub { name = "parquet-testing"; owner = "apache"; repo = "parquet-testing"; - rev = "c7cf1374cf284c0c73024cd1437becea75558bf8"; - hash = "sha256-DThjyZ34LajHwXZy1IhYKUGUG/ejQ9WvBNuI8eUKmSs="; + rev = "18d17540097fca7c40be3d42c167e6bfad90763c"; + hash = "sha256-gKEQc2RKpVp39RmuZbIeIXAwiAXDHGnLXF6VQuJtnRA="; }; - version = "19.0.1"; + version = "20.0.0"; in stdenv.mkDerivation (finalAttrs: { pname = "arrow-cpp"; @@ -90,7 +90,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "apache"; repo = "arrow"; rev = "apache-arrow-${version}"; - hash = "sha256-toHwUIOZRpgR0K7pQtT5nqWpO9G7AuHYTcvA6UVg9lA="; + hash = "sha256-JFPdKraCU+xRkBTAHyY4QGnBVlOjQ1P5+gq9uxyqJtk="; }; sourceRoot = "${finalAttrs.src.name}/cpp"; From fc0ec9f09458bfd0b4636d8c5106c409d9a776e5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 8 May 2025 01:02:14 +0000 Subject: [PATCH 12/96] pdns: 4.9.4 -> 4.9.5 --- pkgs/by-name/pd/pdns/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/pd/pdns/package.nix b/pkgs/by-name/pd/pdns/package.nix index b889ad441072..4fd873d03374 100644 --- a/pkgs/by-name/pd/pdns/package.nix +++ b/pkgs/by-name/pd/pdns/package.nix @@ -24,11 +24,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "pdns"; - version = "4.9.4"; + version = "4.9.5"; src = fetchurl { url = "https://downloads.powerdns.com/releases/pdns-${finalAttrs.version}.tar.bz2"; - hash = "sha256-ysRm18sFZDTGBjLlVL5QVDywzs2dOzO7V4XBSbWXn8E="; + hash = "sha256-Zpu3uZgjsyw5ATN9abOMn4Bz8vwC6HZJM7jFwJdOJyQ="; }; # redact configure flags from version output to reduce closure size patches = [ ./version.patch ]; From 25f122b8fdfddf9e2369f8f3a3c56d36b58a6e63 Mon Sep 17 00:00:00 2001 From: PhiliPdB Date: Wed, 7 May 2025 21:08:34 +0200 Subject: [PATCH 13/96] python3Packages.firebase-messaging: unbreak --- pkgs/development/python-modules/firebase-messaging/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/firebase-messaging/default.nix b/pkgs/development/python-modules/firebase-messaging/default.nix index 502dab1746b7..e0f69f7d4e68 100644 --- a/pkgs/development/python-modules/firebase-messaging/default.nix +++ b/pkgs/development/python-modules/firebase-messaging/default.nix @@ -51,6 +51,7 @@ buildPythonPackage rec { pythonRelaxDeps = [ "http-ece" + "protobuf" ]; dependencies = [ From 7540858926326668b4b14d4da3fcd9b55b24554c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 8 May 2025 17:33:17 +0000 Subject: [PATCH 14/96] home-assistant-custom-components.xiaomi_miot: 1.0.17 -> 1.0.18 --- .../home-assistant/custom-components/xiaomi_miot/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/home-assistant/custom-components/xiaomi_miot/package.nix b/pkgs/servers/home-assistant/custom-components/xiaomi_miot/package.nix index 99f3845722b5..271f860592e8 100644 --- a/pkgs/servers/home-assistant/custom-components/xiaomi_miot/package.nix +++ b/pkgs/servers/home-assistant/custom-components/xiaomi_miot/package.nix @@ -11,13 +11,13 @@ buildHomeAssistantComponent rec { owner = "al-one"; domain = "xiaomi_miot"; - version = "1.0.17"; + version = "1.0.18"; src = fetchFromGitHub { owner = "al-one"; repo = "hass-xiaomi-miot"; rev = "v${version}"; - hash = "sha256-jiskzH2MsddF1rdCnrdJyALQQxFrFUBpOjdR/zbTxh0="; + hash = "sha256-eKh3oa/dPmOIywdTkRhItzP4LQNLguNDfkQWMJjQkpo="; }; dependencies = [ From 1d6b5d02c98d3d035a8ab784a3860fe7531c4329 Mon Sep 17 00:00:00 2001 From: Sarah Clark Date: Thu, 8 May 2025 11:45:14 -0700 Subject: [PATCH 15/96] python312Packages.langchain-core: disable update script It's not working as expected when called by r-ryantm: it's generating a single commit when it's supposed to generate a list of commits. Disabling for now while I keep working on it. --- .../python-modules/langchain-core/default.nix | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/langchain-core/default.nix b/pkgs/development/python-modules/langchain-core/default.nix index 9226ed18530e..f0fe6b2ec3bb 100644 --- a/pkgs/development/python-modules/langchain-core/default.nix +++ b/pkgs/development/python-modules/langchain-core/default.nix @@ -29,6 +29,9 @@ pytest-xdist, pytestCheckHook, syrupy, + + # passthru + nix-update-script, }: buildPythonPackage rec { @@ -85,9 +88,11 @@ buildPythonPackage rec { doCheck = true; }); - updateScript = { - command = [ ./update.sh ]; - supportedFeatures = [ "commit" ]; + updateScript = nix-update-script { + extraArgs = [ + "--version-regex" + "langchain-core==([0-9.]+)" + ]; }; }; From 36506ea5716a81a6b68c91e27319f2c6e89199a3 Mon Sep 17 00:00:00 2001 From: Sarah Clark Date: Thu, 8 May 2025 11:50:50 -0700 Subject: [PATCH 16/96] python3Packages.langchain-core: 0.3.56 -> 0.3.59 changelog: https://github.com/langchain-ai/langchain/releases/tag/langchain-core%3D%3D0.3.59 diff: https://github.com/langchain-ai/langchain/compare/langchain-core%3D%3D0.3.56...langchain-core%3D%3D0.3.59 --- pkgs/development/python-modules/langchain-core/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/langchain-core/default.nix b/pkgs/development/python-modules/langchain-core/default.nix index f0fe6b2ec3bb..2ae93d91c052 100644 --- a/pkgs/development/python-modules/langchain-core/default.nix +++ b/pkgs/development/python-modules/langchain-core/default.nix @@ -36,14 +36,14 @@ buildPythonPackage rec { pname = "langchain-core"; - version = "0.3.56"; + version = "0.3.59"; pyproject = true; src = fetchFromGitHub { owner = "langchain-ai"; repo = "langchain"; tag = "langchain-core==${version}"; - hash = "sha256-gsjYr22Phb71oKN4iVGsi6r1iETDhFHCKKOiwp0SuLU="; + hash = "sha256-qfNt6rH2nHIFfzqZCTsIhWfXntRXvSKnzfQrNS3LWcs="; }; sourceRoot = "${src.name}/libs/core"; From 686f8bb6cbb64a92d48587adeb29e43e02a58eed Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 8 May 2025 20:20:35 +0000 Subject: [PATCH 17/96] python3Packages.ossfs: 2023.12.0 -> 2025.5.0 --- pkgs/development/python-modules/ossfs/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/ossfs/default.nix b/pkgs/development/python-modules/ossfs/default.nix index 89aea5f39c7c..047c607a340a 100644 --- a/pkgs/development/python-modules/ossfs/default.nix +++ b/pkgs/development/python-modules/ossfs/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "ossfs"; - version = "2023.12.0"; + version = "2025.5.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "fsspec"; repo = pname; tag = version; - hash = "sha256-N1NkpI8inGJCf0xuc+FFmVX85CS7vqzoNddxZ9kqEk0="; + hash = "sha256-2i7zxLCi4wNCwzWNUbC6lvvdRkK+ksUWds+H6QG6bW4="; }; pythonRelaxDeps = [ @@ -47,7 +47,7 @@ buildPythonPackage rec { meta = with lib; { description = "Filesystem for Alibaba Cloud (Aliyun) Object Storage System (OSS)"; homepage = "https://github.com/fsspec/ossfs"; - changelog = "https://github.com/fsspec/ossfs/releases/tag/${version}"; + changelog = "https://github.com/fsspec/ossfs/releases/tag/${src.tag}"; license = licenses.asl20; maintainers = with maintainers; [ fab ]; }; From 12ad5b8a09765576307fa75eb6b15f9b614ebdb1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 8 May 2025 20:28:10 +0000 Subject: [PATCH 18/96] python3Packages.junos-eznc: 2.7.3 -> 2.7.4 --- pkgs/development/python-modules/junos-eznc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/junos-eznc/default.nix b/pkgs/development/python-modules/junos-eznc/default.nix index b4430bcf6635..c31d92037709 100644 --- a/pkgs/development/python-modules/junos-eznc/default.nix +++ b/pkgs/development/python-modules/junos-eznc/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { pname = "junos-eznc"; - version = "2.7.3"; + version = "2.7.4"; pyproject = true; disabled = pythonOlder "3.8"; @@ -33,7 +33,7 @@ buildPythonPackage rec { owner = "Juniper"; repo = "py-junos-eznc"; tag = version; - hash = "sha256-mBcqDEU6ynxDTUP+PqhOy/5n4aJuxUl9g/z0Ef5PN5g="; + hash = "sha256-iuCVfzS8k/TZ58v/OPJfSpIMYwwKRj1zyd4FF/KLjjI="; }; build-system = [ setuptools ]; From 41689bbcd9050cd49bd38863415c2110287b4daf Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 8 May 2025 22:30:48 +0200 Subject: [PATCH 19/96] python313Packages.pysmartthings: 3.2.0 -> 3.2.1 Diff: https://github.com/andrewsayre/pysmartthings/compare/refs/tags/v3.2.0...refs/tags/v3.2.1 Changelog: https://github.com/andrewsayre/pysmartthings/releases/tag/v3.2.1 --- pkgs/development/python-modules/pysmartthings/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pysmartthings/default.nix b/pkgs/development/python-modules/pysmartthings/default.nix index 347a7e0b280a..61453f087d00 100644 --- a/pkgs/development/python-modules/pysmartthings/default.nix +++ b/pkgs/development/python-modules/pysmartthings/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "pysmartthings"; - version = "3.2.0"; + version = "3.2.1"; pyproject = true; disabled = pythonOlder "3.12"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "andrewsayre"; repo = "pysmartthings"; tag = "v${version}"; - hash = "sha256-b8DUptzmXGGjuQrNRHp9KC4aQnoVj+Wu7ixyiNjuvqk="; + hash = "sha256-KgwNXIzQWae91R0qmInlm6m+NwrSJgP9SY80WSneTY4="; }; build-system = [ poetry-core ]; From 299494a6a53fa71b913595e3e83c9dc0a5cc7a38 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 8 May 2025 21:18:13 +0000 Subject: [PATCH 20/96] rav1d: 1.0.0 -> 1.1.0 --- pkgs/by-name/ra/rav1d/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ra/rav1d/package.nix b/pkgs/by-name/ra/rav1d/package.nix index 192732b0fcaa..8c2b204f672d 100644 --- a/pkgs/by-name/ra/rav1d/package.nix +++ b/pkgs/by-name/ra/rav1d/package.nix @@ -12,16 +12,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "rav1d"; - version = "1.0.0"; + version = "1.1.0"; src = fetchFromGitHub { owner = "memorysafety"; repo = "rav1d"; tag = "v${finalAttrs.version}"; - hash = "sha256-8Moj3v7cxPluzNPmOmGhYuz/Qh48BnBjN7Vt4f8aY2o="; + hash = "sha256-OAfuUeScdjL7xIpf6pclNyo4ugRLIIcTjjf0AwoF+7o="; }; - cargoHash = "sha256-M0j0zgDqElhG3Jgetjx2sL3rxLrShK0zTMmOXwNxBEI="; + cargoHash = "sha256-13j0++XHcNjkVc3VZxv2ukQvhiu+heZPgaTsA1U4MGQ="; nativeBuildInputs = [ nasm From 84bdc17cc5b4e48832c9fb3d8937e72269af3b82 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 8 May 2025 21:21:31 +0000 Subject: [PATCH 21/96] ligolo-ng: 0.8 -> 0.8.1 --- pkgs/by-name/li/ligolo-ng/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/li/ligolo-ng/package.nix b/pkgs/by-name/li/ligolo-ng/package.nix index aef7204e97c6..a1b35fa48cec 100644 --- a/pkgs/by-name/li/ligolo-ng/package.nix +++ b/pkgs/by-name/li/ligolo-ng/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "ligolo-ng"; - version = "0.8"; + version = "0.8.1"; src = fetchFromGitHub { owner = "tnpitsecurity"; repo = "ligolo-ng"; tag = "v${version}"; - hash = "sha256-9+n6d9bY9VJiMsgvFNhbdkZ5S1Eo0YxyakuOocMvCdE="; + hash = "sha256-+d5dBhB0ABYrGQHZ5ta5hxsAqQop7H/5P4pxNF4MIc0="; }; - vendorHash = "sha256-1K9T7jbQxrnf9j/oa8UvZFatYOiDnJCrMc0DoFGo73U="; + vendorHash = "sha256-oc85xNPMFeaPC7TMcSh3i3Msd8sCJ5QGFmi2fKjcyvk="; postConfigure = '' export CGO_ENABLED=0 From 16dcdf1ecc191fadc7249ea0554b7feb8ed6cb32 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 8 May 2025 22:38:48 +0000 Subject: [PATCH 22/96] prowlarr: 1.34.1.5021 -> 1.35.1.5034 --- pkgs/by-name/pr/prowlarr/package.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/pr/prowlarr/package.nix b/pkgs/by-name/pr/prowlarr/package.nix index 8f87eb79c254..85180da593bf 100644 --- a/pkgs/by-name/pr/prowlarr/package.nix +++ b/pkgs/by-name/pr/prowlarr/package.nix @@ -37,16 +37,16 @@ let hash = { - aarch64-darwin = "sha256-V9i3n/q8GrPQ9qt0AzKJPedAZeeiUm9A5IQ/8FD62b4="; - aarch64-linux = "sha256-Qhx/zh9E+5oBjf7vMvvAVQF05rJI0aB0KcBMXZaYlDA="; - x86_64-darwin = "sha256-eVu3RCFTHz/uVyt3aBnXBlpCtH5Jdnil0PTEREnxZvs="; - x86_64-linux = "sha256-1tZq12F676RhbMvl4ubDirpNjU1a9yOLxd0DAK2xNqY="; + aarch64-darwin = "sha256-zHaYgR9UXKnyikt5z3UUmh6oTNoNv5mqtnAId9kCzgE="; + aarch64-linux = "sha256-xChYbzs4zTWe71xwn3TfUZHGTOHHjzDwbkzPgQEfQZk="; + x86_64-darwin = "sha256-mual72UuFh9h7Hc/hHqSUeFInwm09f+UptX8jqknXlg="; + x86_64-linux = "sha256-UCiHeg46ncRQA6rDW4uxoFRqC7cuwMdr33OrN7yj51o="; } .${stdenv.hostPlatform.system} or unsupported; in stdenv.mkDerivation rec { inherit pname; - version = "1.34.1.5021"; + version = "1.35.1.5034"; src = fetchurl { url = "https://github.com/Prowlarr/Prowlarr/releases/download/v${version}/Prowlarr.master.${version}.${os}-core-${arch}.tar.gz"; From ae8180b1c5ae366a447c3c946200ad4c06f6e97d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 8 May 2025 23:02:37 +0000 Subject: [PATCH 23/96] terraform-providers.auth0: 1.16.0 -> 1.19.1 --- .../networking/cluster/terraform-providers/providers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 558386318a90..e10ddbdf5f60 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -90,13 +90,13 @@ "vendorHash": "sha256-YIn8akPW+DCVF0eYZxsmJxmrJuYhK4QLG/uhmmrXd4c=" }, "auth0": { - "hash": "sha256-ZSbanDR9PpvHHVr7uObGbf0nQD3CzKzT5QKCEwJojH8=", + "hash": "sha256-T8Ob7wv/GgAR+5/AoD0SJ0k+xRvpK5lTWKrhJkme2wg=", "homepage": "https://registry.terraform.io/providers/auth0/auth0", "owner": "auth0", "repo": "terraform-provider-auth0", - "rev": "v1.16.0", + "rev": "v1.19.1", "spdx": "MPL-2.0", - "vendorHash": "sha256-ZBvIfLUMgGXJM5VgsOrerfN3TiMou3VFUrMqzMAwWaA=" + "vendorHash": "sha256-8jUEFJz2m8orL4n/w+c+hzwiQJkZia9TpVfYhkgyrrY=" }, "avi": { "hash": "sha256-e8yzc3nRP0ktcuuKyBXydS9NhoceYZKzJcqCWOfaPL0=", From 8996d874aeb562c1daa4d1a7d74301b4a92103e7 Mon Sep 17 00:00:00 2001 From: Sarah Clark Date: Thu, 8 May 2025 11:55:08 -0700 Subject: [PATCH 24/96] python3Packages.langchain-tests: 0.3.17 -> 0.3.19 Also replaced passthru.updateScript with the correct expression. changelog: https://github.com/langchain-ai/langchain/releases/tag/langchain-tests%3D%3D0.3.19 diff: https://github.com/langchain-ai/langchain/compare/langchain-tests%3D%3D0.3.17...langchain-tests%3D%3D0.3.19 --- .../python-modules/langchain-tests/default.nix | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/langchain-tests/default.nix b/pkgs/development/python-modules/langchain-tests/default.nix index 77ef7dcac9f3..51b591b4e83b 100644 --- a/pkgs/development/python-modules/langchain-tests/default.nix +++ b/pkgs/development/python-modules/langchain-tests/default.nix @@ -19,18 +19,21 @@ pytest-asyncio, pytest-socket, pytestCheckHook, + + # passthru + nix-update-script, }: buildPythonPackage rec { pname = "langchain-tests"; - version = "0.3.17"; + version = "0.3.19"; pyproject = true; src = fetchFromGitHub { owner = "langchain-ai"; repo = "langchain"; tag = "langchain-tests==${version}"; - hash = "sha256-jhdCpZsRvCxDIfaZpdqAdx+rxJTU6QHDgNKc4w7XmR8="; + hash = "sha256-DSTngWRFseJ6kSAY7Lxxkh77QFr0jhHxG3mH89QmdxA="; }; sourceRoot = "${src.name}/libs/standard-tests"; @@ -61,8 +64,11 @@ buildPythonPackage rec { pytestCheckHook ]; - passthru = { - inherit (langchain-core) updateScript; + passthru.updateScript = nix-update-script { + extraArgs = [ + "--version-regex" + "langchain-tests==([0-9.]+)" + ]; }; meta = { From ab653420c5921cf11d85d70eb12e9832ba64f808 Mon Sep 17 00:00:00 2001 From: Sarah Clark Date: Thu, 8 May 2025 12:03:58 -0700 Subject: [PATCH 25/96] python3Packages.langchain-text-splitters: 0.3.7 -> 0.3.8 changelog: https://github.com/langchain-ai/langchain/releases/tag/langchain-text-splitters%3D%3D0.3.8 diff: https://github.com/langchain-ai/langchain/compare/langchain-text-splitters%3D%3D0.3.7...langchain-text-splitters%3D%3D0.3.8 --- .../python-modules/langchain-text-splitters/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/langchain-text-splitters/default.nix b/pkgs/development/python-modules/langchain-text-splitters/default.nix index e15c3e6e30a1..78936ef99755 100644 --- a/pkgs/development/python-modules/langchain-text-splitters/default.nix +++ b/pkgs/development/python-modules/langchain-text-splitters/default.nix @@ -18,14 +18,14 @@ buildPythonPackage rec { pname = "langchain-text-splitters"; - version = "0.3.7"; + version = "0.3.8"; pyproject = true; src = fetchFromGitHub { owner = "langchain-ai"; repo = "langchain"; tag = "langchain-text-splitters==${version}"; - hash = "sha256-tIX1nxmXU3xhJuM2Q3Tm4fbCoJwI0A8+G1aSyLcoNo0="; + hash = "sha256-Ia3ZZ94uLZUVr1/w4HLPZLM6u8leA4OJtAwUf7eSAE0="; }; sourceRoot = "${src.name}/libs/text-splitters"; From fb56094984322ce9f01743503373021a92d75075 Mon Sep 17 00:00:00 2001 From: Sarah Clark Date: Thu, 8 May 2025 12:07:51 -0700 Subject: [PATCH 26/96] python3Packages.langchain-openai: 0.3.12 -> 0.3.16 diff: https://github.com/langchain-ai/langchain/compare/langchain-openai%3D%3D0.3.12...langchain-openai%3D%3D0.3.16 --- .../python-modules/langchain-openai/default.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/langchain-openai/default.nix b/pkgs/development/python-modules/langchain-openai/default.nix index 7bf2ebebd1cb..532d7079bed1 100644 --- a/pkgs/development/python-modules/langchain-openai/default.nix +++ b/pkgs/development/python-modules/langchain-openai/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, fetchFromGitHub, - nix-update-script, # build-system pdm-backend, @@ -25,18 +24,21 @@ responses, syrupy, toml, + + # passthru + nix-update-script, }: buildPythonPackage rec { pname = "langchain-openai"; - version = "0.3.12"; + version = "0.3.16"; pyproject = true; src = fetchFromGitHub { owner = "langchain-ai"; repo = "langchain"; tag = "langchain-openai==${version}"; - hash = "sha256-pIXdXGrYOoE8sF+cKpX82QfTaYna8kbzUv0n+yR7uHE="; + hash = "sha256-e8y5rL+OUFOAPfXTC+XHn/wVfsecPInsS8hBxm1USAw="; }; sourceRoot = "${src.name}/libs/partners/openai"; @@ -88,6 +90,7 @@ buildPythonPackage rec { "test_azure_openai_uses_actual_secret_value_from_secretstr" "test_azure_serialized_secrets" "test_chat_openai_get_num_tokens" + "test_embed_documents_with_custom_chunk_size" "test_get_num_tokens_from_messages" "test_get_token_ids" "test_init_o1" @@ -99,7 +102,7 @@ buildPythonPackage rec { passthru.updateScript = nix-update-script { extraArgs = [ "--version-regex" - "^langchain-openai==([0-9.]+)$" + "langchain-openai==([0-9.]+)" ]; }; From a91784d608a752fc6e7c89b97e86a3844a27da09 Mon Sep 17 00:00:00 2001 From: Sarah Clark Date: Thu, 8 May 2025 12:14:04 -0700 Subject: [PATCH 27/96] python3Packages.langchain-ollama: 0.3.1 -> 0.3.2 changelog: https://github.com/langchain-ai/langchain/releases/tag/langchain-ollama%3D%3D0.3.2 diff: https://github.com/langchain-ai/langchain/compare/langchain-ollama%3D%3D0.3.1...langchain-ollama%3D%3D0.3.2 --- .../python-modules/langchain-ollama/default.nix | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/langchain-ollama/default.nix b/pkgs/development/python-modules/langchain-ollama/default.nix index cc88f4308649..954c1b3fb711 100644 --- a/pkgs/development/python-modules/langchain-ollama/default.nix +++ b/pkgs/development/python-modules/langchain-ollama/default.nix @@ -5,7 +5,6 @@ # build-system pdm-backend, - poetry-core, # dependencies langchain-core, @@ -17,26 +16,26 @@ pytest-asyncio, syrupy, + # passthru nix-update-script, }: buildPythonPackage rec { pname = "langchain-ollama"; - version = "0.3.1"; + version = "0.3.2"; pyproject = true; src = fetchFromGitHub { owner = "langchain-ai"; repo = "langchain"; tag = "langchain-ollama==${version}"; - hash = "sha256-nKLz9eCGaonECmr3Uby3j4ul5jQZaqUH3PD20z/JKek="; + hash = "sha256-GRaWwUR26yZqjtO5f5p8abj/4KSrQE2uGAECGjeDxPY="; }; sourceRoot = "${src.name}/libs/partners/ollama"; build-system = [ pdm-backend - poetry-core ]; pythonRelaxDeps = [ @@ -64,7 +63,7 @@ buildPythonPackage rec { passthru.updateScript = nix-update-script { extraArgs = [ "--version-regex" - "langchain-ollama==(.*)" + "langchain-ollama==([0-9.]+)" ]; }; From cbb91e846ca6d015541e0dcd1c6a09dba4fa085b Mon Sep 17 00:00:00 2001 From: Sarah Clark Date: Thu, 8 May 2025 12:23:02 -0700 Subject: [PATCH 28/96] python3Packages.langchain-huggingface: 0.1.2 -> 0.2.0 changelog: https://github.com/langchain-ai/langchain/releases/tag/langchain-huggingface%3D%3D0.2.0 diff: https://github.com/langchain-ai/langchain/compare/langchain-huggingface%3D%3D0.1.2...langchain-huggingface%3D%3D0.2.0 --- .../langchain-huggingface/default.nix | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/langchain-huggingface/default.nix b/pkgs/development/python-modules/langchain-huggingface/default.nix index 2cf86baccf0f..d9ef22aee8fb 100644 --- a/pkgs/development/python-modules/langchain-huggingface/default.nix +++ b/pkgs/development/python-modules/langchain-huggingface/default.nix @@ -2,10 +2,9 @@ lib, buildPythonPackage, fetchFromGitHub, - nix-update-script, # build-system - poetry-core, + pdm-backend, # dependencies huggingface-hub, @@ -27,23 +26,26 @@ responses, syrupy, toml, + + # passthru + nix-update-script, }: buildPythonPackage rec { pname = "langchain-huggingface"; - version = "0.1.2"; + version = "0.2.0"; pyproject = true; src = fetchFromGitHub { owner = "langchain-ai"; repo = "langchain"; tag = "langchain-huggingface==${version}"; - hash = "sha256-ACR+JzKcnYXROGOQe6DlZeqcYd40KlesgXSUOybOT20="; + hash = "sha256-TqxssbqqjJV+/ynM2wo3C1aCV6wy0DsvdEuiTvVqNa8="; }; sourceRoot = "${src.name}/libs/partners/huggingface"; - build-system = [ poetry-core ]; + build-system = [ pdm-backend ]; pythonRelaxDeps = [ # Each component release requests the exact latest core. @@ -81,7 +83,7 @@ buildPythonPackage rec { passthru.updateScript = nix-update-script { extraArgs = [ "--version-regex" - "^langchain-huggingface==([0-9.]+)$" + "langchain-huggingface==([0-9.]+)" ]; }; From 0698ec4f184f77b360e07a40e7433784bd748380 Mon Sep 17 00:00:00 2001 From: Sarah Clark Date: Thu, 8 May 2025 12:27:25 -0700 Subject: [PATCH 29/96] python3Packages.langchain-chroma: 0.2.2 -> 0.2.3 changelog: https://github.com/langchain-ai/langchain/releases/tag/langchain-chroma%3D%3D0.2.3 diff: https://github.com/langchain-ai/langchain/compare/langchain-chroma%3D%3D0.2.2...langchain-chroma%3D%3D0.2.3 --- .../development/python-modules/langchain-chroma/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/langchain-chroma/default.nix b/pkgs/development/python-modules/langchain-chroma/default.nix index bbb07eb7e686..b6fc144cc255 100644 --- a/pkgs/development/python-modules/langchain-chroma/default.nix +++ b/pkgs/development/python-modules/langchain-chroma/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "langchain-chroma"; - version = "0.2.2"; + version = "0.2.3"; pyproject = true; src = fetchFromGitHub { owner = "langchain-ai"; repo = "langchain"; tag = "langchain-chroma==${version}"; - hash = "sha256-GFDaUA0E25YDHYLwrpsAuOiBWFvHByl61XhwK5NmJbg="; + hash = "sha256-6WOViBKXZ844g2M6pYohHsXnzJiWbTNgj9EjN+z+B+4="; }; sourceRoot = "${src.name}/libs/partners/chroma"; @@ -59,7 +59,7 @@ buildPythonPackage rec { passthru.updateScript = nix-update-script { extraArgs = [ "--version-regex" - "^langchain-chroma==([0-9.]+)$" + "langchain-chroma==([0-9.]+)" ]; }; From 5f6cacadf0e5eaca0d2d144c523e64e0bde7a3ee Mon Sep 17 00:00:00 2001 From: Sarah Clark Date: Thu, 8 May 2025 16:23:50 -0700 Subject: [PATCH 30/96] python3Packages.langchain: 0.3.24 -> 0.3.25 changelog: https://github.com/langchain-ai/langchain/releases/tag/langchain%3D%3D0.3.25 diff: https://github.com/langchain-ai/langchain/compare/langchain%3D%3D0.3.24...langchain%3D%3D0.3.25 --- pkgs/development/python-modules/langchain/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/langchain/default.nix b/pkgs/development/python-modules/langchain/default.nix index cb67f1450edd..29138323fb55 100644 --- a/pkgs/development/python-modules/langchain/default.nix +++ b/pkgs/development/python-modules/langchain/default.nix @@ -42,14 +42,14 @@ buildPythonPackage rec { pname = "langchain"; - version = "0.3.24"; + version = "0.3.25"; pyproject = true; src = fetchFromGitHub { owner = "langchain-ai"; repo = "langchain"; tag = "langchain==${version}"; - hash = "sha256-Up/pH2TxLPiPO49oIa2ZlNeH3TyN9sZSlNsqOIRmlxc="; + hash = "sha256-B2Kg8kC6Qlu89hZVMhgqPU32BwFvgAti0IIYUdosT1A="; }; sourceRoot = "${src.name}/libs/langchain"; From bab44e877a699bcbdcd0d80b7698afde3b28d62b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 8 May 2025 23:56:44 +0000 Subject: [PATCH 31/96] prometheus-pve-exporter: 3.5.3 -> 3.5.4 --- pkgs/servers/monitoring/prometheus/pve-exporter.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/monitoring/prometheus/pve-exporter.nix b/pkgs/servers/monitoring/prometheus/pve-exporter.nix index 16a72743ffcc..045aa4886e9c 100644 --- a/pkgs/servers/monitoring/prometheus/pve-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/pve-exporter.nix @@ -7,11 +7,11 @@ python3.pkgs.buildPythonApplication rec { pname = "prometheus_pve_exporter"; - version = "3.5.3"; + version = "3.5.4"; src = fetchPypi { inherit pname version; - hash = "sha256-8QFXhGQWmkrKdZQwlIrdTa76NrNlC/lW3BI0taybpOI="; + hash = "sha256-eaBjvcnhqgb/FeD/J919T4WjM4Ft9yYYrLtBFFH/CBo="; }; propagatedBuildInputs = with python3.pkgs; [ From 22e8c468d750ce5fd753c65768f7ce153744ae1b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 9 May 2025 00:06:46 +0000 Subject: [PATCH 32/96] nwg-look: 1.0.4 -> 1.0.5 --- pkgs/by-name/nw/nwg-look/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/nw/nwg-look/package.nix b/pkgs/by-name/nw/nwg-look/package.nix index ad5a42a26d99..96a9e5b19964 100644 --- a/pkgs/by-name/nw/nwg-look/package.nix +++ b/pkgs/by-name/nw/nwg-look/package.nix @@ -14,16 +14,16 @@ buildGoModule rec { pname = "nwg-look"; - version = "1.0.4"; + version = "1.0.5"; src = fetchFromGitHub { owner = "nwg-piotr"; repo = "nwg-look"; rev = "v${version}"; - hash = "sha256-oP+qcOu03ZKQRdvPKCRVL187QP3gAg2dyvRO94N7+GE="; + hash = "sha256-SyGyW4Hq0zT+jBrCmsuG+9Smcu4ruP6+aR3VUK205MM="; }; - vendorHash = "sha256-KzAozP9pfqoFOgK+/xmwsI0m2QWAVW/b+hoWHlQoVX0="; + vendorHash = "sha256-8ooWJTOC4fmuu+/Dy7JOaGSO5YlsMfKcf2lyv2ojJIw="; ldflags = [ "-s" From a9dc1053f2c3a038af8ca37fbd4cd3d9f0f2dbd8 Mon Sep 17 00:00:00 2001 From: DontEatOreo <57304299+DontEatOreo@users.noreply.github.com> Date: Fri, 9 May 2025 03:18:00 +0300 Subject: [PATCH 33/96] raycast: 1.97.0 -> 1.98.0 Changelog: https://www.raycast.com/changelog/1-98-0 --- pkgs/by-name/ra/raycast/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ra/raycast/package.nix b/pkgs/by-name/ra/raycast/package.nix index d78cee20c01b..3425277776a4 100644 --- a/pkgs/by-name/ra/raycast/package.nix +++ b/pkgs/by-name/ra/raycast/package.nix @@ -12,19 +12,19 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "raycast"; - version = "1.97.0"; + version = "1.98.0"; src = { aarch64-darwin = fetchurl { name = "Raycast.dmg"; url = "https://releases.raycast.com/releases/${finalAttrs.version}/download?build=arm"; - hash = "sha256-cmaih5QYhdSNcYiVrfOkyOO+KMwClvrVkRykY6E9bQ4="; + hash = "sha256-cHTGXuzi7YVAPeeMHugL7uvR9BHJ5xR7I9NE63H3vcg="; }; x86_64-darwin = fetchurl { name = "Raycast.dmg"; url = "https://releases.raycast.com/releases/${finalAttrs.version}/download?build=x86_64"; - hash = "sha256-iJz3WIDh1n0ZgDgeHYZgxkysVjxJnbFF+48rzCLc4pw="; + hash = "sha256-KYMjr8SA8a0B19hmdsKLLz+smBpB687e+BLRRCRM+AM="; }; } .${stdenvNoCC.system} or (throw "raycast: ${stdenvNoCC.system} is unsupported."); From 8dc14e4c13288b30fe2a8176a6ab63ce43092b72 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 9 May 2025 00:36:43 +0000 Subject: [PATCH 34/96] brev-cli: 0.6.308 -> 0.6.309 --- pkgs/by-name/br/brev-cli/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/br/brev-cli/package.nix b/pkgs/by-name/br/brev-cli/package.nix index f4bc9b3468ec..7da193de3857 100644 --- a/pkgs/by-name/br/brev-cli/package.nix +++ b/pkgs/by-name/br/brev-cli/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "brev-cli"; - version = "0.6.308"; + version = "0.6.309"; src = fetchFromGitHub { owner = "brevdev"; repo = pname; rev = "v${version}"; - sha256 = "sha256-gqx/aOTpoN7nfstlFl4EulQ9Kzm/YlYOOiyrWIoJvcU="; + sha256 = "sha256-T94hJqNnCsJO1Gd+CXjKXri++NZqlFjke27Xnkfz+0U="; }; - vendorHash = "sha256-DMkBRya1Dxn8mcpuG/vtIt+v/9iVmb58iNe3fPY/xv4="; + vendorHash = "sha256-7MXZVdpsPHfHk8hNZM2CT0FW8gTKt3oUap7CTVYMNfI="; env.CGO_ENABLED = 0; subPackages = [ "." ]; From 01cf1551724146fb3f76735fbe46a0f2b76c2e64 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 9 May 2025 01:15:14 +0000 Subject: [PATCH 35/96] gobgpd: 3.36.0 -> 3.37.0 --- pkgs/by-name/go/gobgpd/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/go/gobgpd/package.nix b/pkgs/by-name/go/gobgpd/package.nix index d2256be1cbe3..b4142da76fd4 100644 --- a/pkgs/by-name/go/gobgpd/package.nix +++ b/pkgs/by-name/go/gobgpd/package.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "gobgpd"; - version = "3.36.0"; + version = "3.37.0"; src = fetchFromGitHub { owner = "osrg"; repo = "gobgp"; tag = "v${version}"; - hash = "sha256-vyMC3FcfMHVsRosLkTYgCawiTIcJs0R5GgSZERRPHnE="; + hash = "sha256-Nh4JmyZHrT7uPi9+CbmS3h6ezKoicCvEByUJVULMac4="; }; - vendorHash = "sha256-bR6msi2IyNmYgmpLrbn/hnX4EzLOBa2UHTzwDJFasos="; + vendorHash = "sha256-HpATJztX31mNWkpeDqOE4rTzhCk3c7E1PtZnKW8Axyo="; postConfigure = '' export CGO_ENABLED=0 From 8e4cedd16595209de1f57bacda257d569186418a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 9 May 2025 01:40:30 +0000 Subject: [PATCH 36/96] python3Packages.kaggle: 1.7.4.2 -> 1.7.4.5 --- pkgs/development/python-modules/kaggle/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/kaggle/default.nix b/pkgs/development/python-modules/kaggle/default.nix index 7d61254006cb..d2276e0cf35e 100644 --- a/pkgs/development/python-modules/kaggle/default.nix +++ b/pkgs/development/python-modules/kaggle/default.nix @@ -21,12 +21,12 @@ buildPythonPackage rec { pname = "kaggle"; - version = "1.7.4.2"; + version = "1.7.4.5"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-CxRDWPQYe96D6KAzVUm/c2+0ZmlycqE1qYXrbSxvnLY="; + hash = "sha256-HZghvWpqFHB0HHbSZJWhhHW1p7/gyAsZGRJUsnNdQd0="; }; build-system = [ hatchling ]; From c43901a0275066499ed84db4a0079a01e1b8a34d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 9 May 2025 01:52:40 +0000 Subject: [PATCH 37/96] noseyparker: 0.23.0 -> 0.24.0 --- pkgs/by-name/no/noseyparker/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/no/noseyparker/package.nix b/pkgs/by-name/no/noseyparker/package.nix index d59e4e355b2a..fe9cebb960c6 100644 --- a/pkgs/by-name/no/noseyparker/package.nix +++ b/pkgs/by-name/no/noseyparker/package.nix @@ -12,17 +12,17 @@ rustPlatform.buildRustPackage rec { pname = "noseyparker"; - version = "0.23.0"; + version = "0.24.0"; src = fetchFromGitHub { owner = "praetorian-inc"; repo = "noseyparker"; rev = "v${version}"; - hash = "sha256-n+lX49BwipIPQ2ZeQT+DFO2ILHHAU2VsOnhASOGX5RE="; + hash = "sha256-6GxkIxLEgbIgg4nSHvmRedm8PAPBwVxLQUnQzh3NonA="; }; useFetchCargoVendor = true; - cargoHash = "sha256-eAJlbJyGILc3veVxJNKqrTeZGQsAymAGYNCTU+Kakos="; + cargoHash = "sha256-hVBHIm/12WU6g45QMxxuGk41B0kwThk7A84fOxArvno="; nativeCheckInputs = [ git From 325c0a40728000ac872e7feb79cf821f924f8280 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 9 May 2025 03:18:36 +0000 Subject: [PATCH 38/96] buildkit: 0.21.0 -> 0.21.1 --- pkgs/by-name/bu/buildkit/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/bu/buildkit/package.nix b/pkgs/by-name/bu/buildkit/package.nix index abd9b401f6ba..3442fa8a862a 100644 --- a/pkgs/by-name/bu/buildkit/package.nix +++ b/pkgs/by-name/bu/buildkit/package.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "buildkit"; - version = "0.21.0"; + version = "0.21.1"; src = fetchFromGitHub { owner = "moby"; repo = "buildkit"; rev = "v${version}"; - hash = "sha256-0QzbRswTPfO2U6lrClpAsH2QbTfE7JcMjv1Qt033UZs="; + hash = "sha256-qLErgFS/Vos99Yx7gUeLa0ysO6Anzm+kDIgKQQbQL3w="; }; vendorHash = null; From f73dcdc9407eb5cf59cc11b1bdd28b80f349860a Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 9 May 2025 05:47:04 +0200 Subject: [PATCH 39/96] zsh-powerlevel10k: drop maintainership --- pkgs/by-name/zs/zsh-powerlevel10k/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/zs/zsh-powerlevel10k/package.nix b/pkgs/by-name/zs/zsh-powerlevel10k/package.nix index 8dbcdf74b3f8..89f960a77a79 100644 --- a/pkgs/by-name/zs/zsh-powerlevel10k/package.nix +++ b/pkgs/by-name/zs/zsh-powerlevel10k/package.nix @@ -46,6 +46,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/romkatv/powerlevel10k"; license = lib.licenses.mit; platforms = lib.platforms.unix; - maintainers = with lib.maintainers; [ hexa ]; + maintainers = with lib.maintainers; [ ]; }; } From b65738195b416cd92be6412e62f8f3e9e48ae816 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 9 May 2025 05:47:38 +0200 Subject: [PATCH 40/96] gitstatus: drop maintainership --- pkgs/by-name/gi/gitstatus/package.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/by-name/gi/gitstatus/package.nix b/pkgs/by-name/gi/gitstatus/package.nix index 6be2cb9f6f0f..a116407ca52a 100644 --- a/pkgs/by-name/gi/gitstatus/package.nix +++ b/pkgs/by-name/gi/gitstatus/package.nix @@ -128,7 +128,6 @@ stdenv.mkDerivation rec { license = licenses.gpl3Only; maintainers = with maintainers; [ mmlb - hexa SuperSandro2000 ]; platforms = platforms.all; From dc7830ca54820bce4b7684ada2fb7cfa16e46ba8 Mon Sep 17 00:00:00 2001 From: Florian Brandes Date: Fri, 9 May 2025 06:15:31 +0200 Subject: [PATCH 41/96] kodiPackages.inputstreamer-adaptive: 21.5.9 -> 21.5.13 Signed-off-by: Florian Brandes --- .../video/kodi/addons/inputstream-adaptive/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/kodi/addons/inputstream-adaptive/default.nix b/pkgs/applications/video/kodi/addons/inputstream-adaptive/default.nix index 09f2b4e67ef1..0be4e6e98eb5 100644 --- a/pkgs/applications/video/kodi/addons/inputstream-adaptive/default.nix +++ b/pkgs/applications/video/kodi/addons/inputstream-adaptive/default.nix @@ -23,13 +23,13 @@ in buildKodiBinaryAddon rec { pname = "inputstream-adaptive"; namespace = "inputstream.adaptive"; - version = "21.5.9"; + version = "21.5.13"; src = fetchFromGitHub { owner = "xbmc"; repo = "inputstream.adaptive"; tag = "${version}-${rel}"; - hash = "sha256-OArvp/MgJGsRs3Z59JfgOkfwyhQ3ArC1yf37z7Y7khg="; + hash = "sha256-XcRg0FtoN7SXRVEBWM9gIlLOMGT3x64s9WD12UJdblw="; }; extraCMakeFlags = [ From 4ff1faee8a614294a15fad0848e28a2f08eeef65 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 9 May 2025 08:05:34 +0000 Subject: [PATCH 42/96] wasmi: 0.44.0 -> 0.46.0 --- pkgs/by-name/wa/wasmi/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/wa/wasmi/package.nix b/pkgs/by-name/wa/wasmi/package.nix index f7febba5cbfa..9afcafba9ce6 100644 --- a/pkgs/by-name/wa/wasmi/package.nix +++ b/pkgs/by-name/wa/wasmi/package.nix @@ -7,18 +7,18 @@ rustPlatform.buildRustPackage rec { pname = "wasmi"; - version = "0.44.0"; + version = "0.46.0"; src = fetchFromGitHub { owner = "paritytech"; repo = "wasmi"; tag = "v${version}"; - hash = "sha256-tKUkcuVT2945+pf7qdCgbUYbtiZmfE7tfzRlf8H/GkU="; + hash = "sha256-H/nuV4OMj2xCVej1u8zh9c9sp+XH+Zdpb080ZoA3xvc="; fetchSubmodules = true; }; useFetchCargoVendor = true; - cargoHash = "sha256-1p/cibicoH39+/Xrf28W2jOWK23LVu7L0nnsVDgvIV8="; + cargoHash = "sha256-IDoZ6A5c/ayCusdb9flR3S/CBxJIWHQlEYP8ILRWXFw="; passthru.updateScript = nix-update-script { }; meta = with lib; { From 40cd870caf98dcb2cff71bea72f416fb52577327 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 9 May 2025 08:55:41 +0000 Subject: [PATCH 43/96] nwg-menu: 0.1.7 -> 0.1.8 --- pkgs/by-name/nw/nwg-menu/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/nw/nwg-menu/package.nix b/pkgs/by-name/nw/nwg-menu/package.nix index 1499989b0451..7942430a26db 100644 --- a/pkgs/by-name/nw/nwg-menu/package.nix +++ b/pkgs/by-name/nw/nwg-menu/package.nix @@ -14,16 +14,16 @@ buildGoModule rec { pname = "nwg-menu"; - version = "0.1.7"; + version = "0.1.8"; src = fetchFromGitHub { owner = "nwg-piotr"; repo = "nwg-menu"; rev = "v${version}"; - sha256 = "sha256-pWdLSoTeRgr5FPdBWMTVdsnijuwu8fLuNkyIRZ+JEe8="; + sha256 = "sha256-Ce8hxFVCj/No2Sb6avQ9ogMPTJXDcWxa3GFfsczq1+E="; }; - vendorHash = "sha256-iR+ytThRwmCvFEMcpSELPRwiramN5jPXAjaJtda4pOw="; + vendorHash = "sha256-53lRO4Ct20jYJY7JRElx9MWzb+TEm8KIIJZF3OfL1kQ="; doCheck = false; From a94f205192999348987a91b3bbd132d0c9f55c57 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 9 May 2025 09:07:55 +0000 Subject: [PATCH 44/96] uhk-agent: 6.0.0 -> 7.0.0 --- pkgs/by-name/uh/uhk-agent/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/uh/uhk-agent/package.nix b/pkgs/by-name/uh/uhk-agent/package.nix index a0ae7eeb18f0..7c07479c0095 100644 --- a/pkgs/by-name/uh/uhk-agent/package.nix +++ b/pkgs/by-name/uh/uhk-agent/package.nix @@ -13,12 +13,12 @@ let pname = "uhk-agent"; - version = "6.0.0"; + version = "7.0.0"; src = fetchurl { url = "https://github.com/UltimateHackingKeyboard/agent/releases/download/v${version}/UHK.Agent-${version}-linux-x86_64.AppImage"; name = "${pname}-${version}.AppImage"; - sha256 = "sha256-UOW0TkJ+lPOMK38pjSMTrJqVWu/wRPhD7xETBeb0SUc="; + sha256 = "sha256-C/ngBu9Fr4oqp2YB54c2VGVqsYfH9d03YEnGa/+Z2XI="; }; appimageContents = appimageTools.extract { From f65f7d88c7fe5ef55a10b318055f95e35a73c71c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 9 May 2025 09:43:20 +0000 Subject: [PATCH 45/96] cargo-binstall: 1.12.3 -> 1.12.4 --- pkgs/by-name/ca/cargo-binstall/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ca/cargo-binstall/package.nix b/pkgs/by-name/ca/cargo-binstall/package.nix index 809edb20ac34..22ffe6b66a08 100644 --- a/pkgs/by-name/ca/cargo-binstall/package.nix +++ b/pkgs/by-name/ca/cargo-binstall/package.nix @@ -10,17 +10,17 @@ rustPlatform.buildRustPackage rec { pname = "cargo-binstall"; - version = "1.12.3"; + version = "1.12.4"; src = fetchFromGitHub { owner = "cargo-bins"; repo = "cargo-binstall"; rev = "v${version}"; - hash = "sha256-c/8cqHl+Z7+0SDSb6PhrVueKyWZFA1FGQaFwT3G9vFM="; + hash = "sha256-rojiGrWUG0zk506HzwHLB1L5oJCHNUscdl6ogzFE5gk="; }; useFetchCargoVendor = true; - cargoHash = "sha256-JXsLvo/G2GCdQuseu6TdXKdKbJ0B4yPYRNlZdjG65AU="; + cargoHash = "sha256-+G9L5eMLQsgO5GIRU1BQkr5OwEOYPXCtSAah8l9wwr8="; nativeBuildInputs = [ pkg-config From 7d64a14bd0b81a3c6ceb85a72e36307b89b92e48 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 9 May 2025 10:47:25 +0000 Subject: [PATCH 46/96] matrix-alertmanager-receiver: 2025.4.16 -> 2025.4.23 --- pkgs/by-name/ma/matrix-alertmanager-receiver/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ma/matrix-alertmanager-receiver/package.nix b/pkgs/by-name/ma/matrix-alertmanager-receiver/package.nix index e1299887cea5..60c4157e8faa 100644 --- a/pkgs/by-name/ma/matrix-alertmanager-receiver/package.nix +++ b/pkgs/by-name/ma/matrix-alertmanager-receiver/package.nix @@ -7,16 +7,16 @@ buildGo124Module rec { pname = "matrix-alertmanager-receiver"; - version = "2025.4.16"; + version = "2025.4.23"; src = fetchFromGitHub { owner = "metio"; repo = "matrix-alertmanager-receiver"; tag = version; - hash = "sha256-QxBe9WkUg6TTAgxC29kLyQzJSR6m0to0ayH+0vT9pgQ="; + hash = "sha256-ubSrj8mUc0b6fwRuvaw8oapTyIbDRvlzEqpjIFEY1FQ="; }; - vendorHash = "sha256-okaNjcA1fFChqaCooviPDW2VZTae9pUEGKNOTUxSSQ0="; + vendorHash = "sha256-8LQ4SJ1zapBRuFDX8VxYUvA6jzukVml8Jr+B3zQKFOs="; ldflags = [ "-s" From a40156de6b84f43a59e7db437eca2216637cd4f1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9ana=20=E6=B1=9F?= Date: Fri, 9 May 2025 12:45:57 +0200 Subject: [PATCH 47/96] nixosTests.zram-generator: fix test --- nixos/tests/zram-generator.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/tests/zram-generator.nix b/nixos/tests/zram-generator.nix index 46414efee4b3..5f6432a78857 100644 --- a/nixos/tests/zram-generator.nix +++ b/nixos/tests/zram-generator.nix @@ -38,9 +38,9 @@ machine.wait_for_unit("systemd-zram-setup@zram0.service") machine.wait_for_unit("systemd-zram-setup@zram1.service") zram = machine.succeed("zramctl --noheadings --raw") - swap = machine.succeed("swapon --show --noheadings") + swap = machine.succeed("swapon --show --noheadings --raw") for i in range(2): assert f"/dev/zram{i} lz4 10M" in zram - assert f"/dev/zram{i} partition 10M" in swap + assert f"/dev/zram{i} partition 10M" in swap ''; } From 8dcaa1bb44e73c6f2a95f7676da2d2469d77858f Mon Sep 17 00:00:00 2001 From: Martin Joerg Date: Fri, 9 May 2025 11:08:51 +0000 Subject: [PATCH 48/96] iotop-c: restore the old binary name The change in 1c851f12e8e08008f9d314c61a77123e28e2722a is not compatible with the expected mainProgram and the programs.iotop.package option. --- pkgs/by-name/io/iotop-c/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/io/iotop-c/package.nix b/pkgs/by-name/io/iotop-c/package.nix index 3afe7dc65691..1c2b360d2bc0 100644 --- a/pkgs/by-name/io/iotop-c/package.nix +++ b/pkgs/by-name/io/iotop-c/package.nix @@ -22,6 +22,7 @@ stdenv.mkDerivation rec { buildInputs = [ ncurses ]; makeFlags = [ + "TARGET=iotop-c" "PREFIX=${placeholder "out"}" "BINDIR=${placeholder "out"}/bin" ]; From 732dbc33362c438fba2f9dd6ce78ec264999b75d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 9 May 2025 11:27:48 +0000 Subject: [PATCH 49/96] python3Packages.evdev: 1.9.1 -> 1.9.2 --- pkgs/development/python-modules/evdev/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/evdev/default.nix b/pkgs/development/python-modules/evdev/default.nix index 24bbd2bc6ec3..74bdd90f7c2c 100644 --- a/pkgs/development/python-modules/evdev/default.nix +++ b/pkgs/development/python-modules/evdev/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "evdev"; - version = "1.9.1"; + version = "1.9.2"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-3GQKBkyxyf4fi5cNwgOZRaKidde37mIoS/QnI4q+Re4="; + hash = "sha256-XTJ4iSzh+Sp01r+IjMhSXZ9or4Xb4zbJXRyH+49CMGk="; }; patchPhase = '' From b62454fc80a4c7956440fbb259ab7eaa9da85896 Mon Sep 17 00:00:00 2001 From: langsjo Date: Fri, 9 May 2025 15:18:42 +0300 Subject: [PATCH 50/96] rmw: disable asan and ubsan from subproject The subproject "canfigger" has asan and ubsan enabled by default, this commit adds a flag for meson to disable them --- pkgs/by-name/rm/rmw/package.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/by-name/rm/rmw/package.nix b/pkgs/by-name/rm/rmw/package.nix index f405ef621d92..67834a1d65f6 100644 --- a/pkgs/by-name/rm/rmw/package.nix +++ b/pkgs/by-name/rm/rmw/package.nix @@ -30,6 +30,11 @@ stdenv.mkDerivation rec { ncurses ]; + # The subproject "canfigger" has asan and ubsan enabled by default, disable it here + mesonFlags = [ + "-Dcanfigger:b_sanitize=none" + ]; + meta = with lib; { description = "Trashcan/ recycle bin utility for the command line"; homepage = "https://github.com/theimpossibleastronaut/rmw"; From b748223eacbac2cc57aa9eed43ef3dd3ac866d4e Mon Sep 17 00:00:00 2001 From: langsjo Date: Fri, 9 May 2025 15:19:54 +0300 Subject: [PATCH 51/96] rmw: add `gettext` to buildInputs for Darwin --- pkgs/by-name/rm/rmw/package.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/rm/rmw/package.nix b/pkgs/by-name/rm/rmw/package.nix index 67834a1d65f6..84f5f602f0d0 100644 --- a/pkgs/by-name/rm/rmw/package.nix +++ b/pkgs/by-name/rm/rmw/package.nix @@ -6,6 +6,7 @@ ninja, pkg-config, ncurses, + gettext, }: stdenv.mkDerivation rec { @@ -28,7 +29,7 @@ stdenv.mkDerivation rec { buildInputs = [ ncurses - ]; + ] ++ lib.optional stdenv.hostPlatform.isDarwin gettext; # The subproject "canfigger" has asan and ubsan enabled by default, disable it here mesonFlags = [ From 5ed9d4002a9ac5ed755f03751920051f018157d1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 9 May 2025 12:46:44 +0000 Subject: [PATCH 52/96] sqlboiler: 4.18.0 -> 4.19.0 --- pkgs/by-name/sq/sqlboiler/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/sq/sqlboiler/package.nix b/pkgs/by-name/sq/sqlboiler/package.nix index aa16c98ba795..d5a26d9c8a88 100644 --- a/pkgs/by-name/sq/sqlboiler/package.nix +++ b/pkgs/by-name/sq/sqlboiler/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "sqlboiler"; - version = "4.18.0"; + version = "4.19.0"; src = fetchFromGitHub { owner = "volatiletech"; repo = "sqlboiler"; tag = "v${version}"; - hash = "sha256-gpRegyW6LrKj45MDl+eOKrTqTo1wn7JOd4zPDexOB6M="; + hash = "sha256-vsrC/i8ekjlKMVjH91XT9iizZaSD5Mi/p/4AFWBfAlQ="; }; - vendorHash = "sha256-BTrQPWThfJ7gWXi/Y1l/s2BmkW5lVYS/PP0WRwntQxA="; + vendorHash = "sha256-K1Bo2aENteZYjx7jRczqdcoYZn5G8ywtCtHkVB7Reus="; tags = [ "mysql" From ae7bf824bb0177e2f92862bb021488595c3fe480 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 9 May 2025 14:58:48 +0200 Subject: [PATCH 53/96] memray: 1.17.1 -> 1.17.2 Diff: https://github.com/bloomberg/memray/compare/refs/tags/v1.17.1...refs/tags/v1.17.2 Changelog: https://github.com/bloomberg/memray/releases/tag/v1.17.2 --- pkgs/by-name/me/memray/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/me/memray/package.nix b/pkgs/by-name/me/memray/package.nix index cec89938e5e4..c97d0a233013 100644 --- a/pkgs/by-name/me/memray/package.nix +++ b/pkgs/by-name/me/memray/package.nix @@ -10,14 +10,14 @@ python3Packages.buildPythonApplication rec { pname = "memray"; - version = "1.17.1"; + version = "1.17.2"; pyproject = true; src = fetchFromGitHub { owner = "bloomberg"; repo = "memray"; tag = "v${version}"; - hash = "sha256-2gFnVILOqjsBY7dmtoN+1BLInPj0wW8u9jOs2ExmIZM="; + hash = "sha256-n000m2jIJJFZFTjfECS3gFrO6xHauZW46xe1tDqI6Lg="; }; build-system = with python3Packages; [ From b57f49e3e093b72f6ff3bafe694f2b3954517736 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 9 May 2025 14:59:18 +0200 Subject: [PATCH 54/96] python312Packages.mypy-boto3-cloudfront: 1.38.4 -> 1.38.12 --- pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix index 9122a98b331f..104ff58b43df 100644 --- a/pkgs/development/python-modules/mypy-boto3/default.nix +++ b/pkgs/development/python-modules/mypy-boto3/default.nix @@ -230,8 +230,8 @@ rec { "sha256-VjOZFmwH6R4GlfseWBA6JIsr7g214sPwcVV3bdYxGAU="; mypy-boto3-cloudfront = - buildMypyBoto3Package "cloudfront" "1.38.4" - "sha256-bXulSRWwE2XEXXtpRflwsWn4PlFAyfiqR/Ed0/pMPQ4="; + buildMypyBoto3Package "cloudfront" "1.38.12" + "sha256-2ilPIDK1bdMkn69PXs2Q4HUhfG67XWjPWZHPr9ZyXvs="; mypy-boto3-cloudhsm = buildMypyBoto3Package "cloudhsm" "1.38.0" From 2f4255a217f39af576d4aba880c59d6a5fb023ae Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 9 May 2025 14:59:22 +0200 Subject: [PATCH 55/96] python312Packages.mypy-boto3-codepipeline: 1.38.0 -> 1.38.12 --- pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix index 104ff58b43df..98aa91a963a1 100644 --- a/pkgs/development/python-modules/mypy-boto3/default.nix +++ b/pkgs/development/python-modules/mypy-boto3/default.nix @@ -294,8 +294,8 @@ rec { "sha256-twmdIgbVpRFwUcRu0Kyoti+Y1KCPmRgaCsf6Kozhmg8="; mypy-boto3-codepipeline = - buildMypyBoto3Package "codepipeline" "1.38.0" - "sha256-xZ4+zTLVTEmfQ6nLwglF4pjeBqoz3dywPjhgBFr89ng="; + buildMypyBoto3Package "codepipeline" "1.38.12" + "sha256-HTZJEjSM1J/lQPFSDIRDQZW8DdskT4L9Te6zPUoqT8c="; mypy-boto3-codestar = buildMypyBoto3Package "codestar" "1.35.0" From f3b84dbee52f212401513a027b4189e89ef11f92 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 9 May 2025 14:59:32 +0200 Subject: [PATCH 56/96] python312Packages.mypy-boto3-ec2: 1.38.11 -> 1.38.12 --- pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix index 98aa91a963a1..cd86fee61d81 100644 --- a/pkgs/development/python-modules/mypy-boto3/default.nix +++ b/pkgs/development/python-modules/mypy-boto3/default.nix @@ -446,8 +446,8 @@ rec { "sha256-RQh46jrXqj4bXTRJ+tPR9sql7yUn7Ek9u4p0OU0A7b0="; mypy-boto3-ec2 = - buildMypyBoto3Package "ec2" "1.38.11" - "sha256-ZNev1egHwJsXGa8HQBaxZUma2ZEnrFqT6xK+68dExgw="; + buildMypyBoto3Package "ec2" "1.38.12" + "sha256-NpOkYFCgUxUbk6SJXYWYN5/FMGs8aIzBVe/NhkLUoR0="; mypy-boto3-ec2-instance-connect = buildMypyBoto3Package "ec2-instance-connect" "1.38.0" From ed5a3c33943dcc8df079b8c77c748f3d57ec2c2c Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 9 May 2025 14:59:40 +0200 Subject: [PATCH 57/96] python312Packages.mypy-boto3-glue: 1.38.0 -> 1.38.12 --- pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix index cd86fee61d81..22b16df3f48b 100644 --- a/pkgs/development/python-modules/mypy-boto3/default.nix +++ b/pkgs/development/python-modules/mypy-boto3/default.nix @@ -574,8 +574,8 @@ rec { "sha256-abALPaOoxM8dvwqd8j41mTT1Zmcn/sEVzlopSMc+fYM="; mypy-boto3-glue = - buildMypyBoto3Package "glue" "1.38.0" - "sha256-J6eSeVhhaNmtSqxvQ7w3F5EfVpGsliKn73AQSGo361k="; + buildMypyBoto3Package "glue" "1.38.12" + "sha256-0McJ3i8jtqknfsA7sN9P7+IOMqbHSFMQScF9g0m8Wgk="; mypy-boto3-grafana = buildMypyBoto3Package "grafana" "1.38.0" From 2e6bc89a3d77c8320be3f39777363020c89f5ed1 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 9 May 2025 14:59:42 +0200 Subject: [PATCH 58/96] python312Packages.mypy-boto3-guardduty: 1.38.0 -> 1.38.12 --- pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix index 22b16df3f48b..26cb59463a4a 100644 --- a/pkgs/development/python-modules/mypy-boto3/default.nix +++ b/pkgs/development/python-modules/mypy-boto3/default.nix @@ -594,8 +594,8 @@ rec { "sha256-GkC4iF96d4nQMNZZx2JHBvgdFvzqujmH2YLzEuiM1n8="; mypy-boto3-guardduty = - buildMypyBoto3Package "guardduty" "1.38.0" - "sha256-2R+q3YsJFStb5pUj9LNPwZOZd3HqP54q5j1RhcJj3cA="; + buildMypyBoto3Package "guardduty" "1.38.12" + "sha256-mKzD4xUXunOsxxTXJIoV0ardgVkhvr57KqRLxj2KhPk="; mypy-boto3-health = buildMypyBoto3Package "health" "1.38.0" From 949d87c51627e8a29aa5bc04594d26b392586e47 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 9 May 2025 15:00:22 +0200 Subject: [PATCH 59/96] python312Packages.mypy-boto3-sso-admin: 1.38.0 -> 1.38.12 --- pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix index 26cb59463a4a..5fda034a1feb 100644 --- a/pkgs/development/python-modules/mypy-boto3/default.nix +++ b/pkgs/development/python-modules/mypy-boto3/default.nix @@ -1314,8 +1314,8 @@ rec { "sha256-qiG1fAHlB0AfSzdQXaLWpyQW9AB2BUfU/aUWW6NbKl8="; mypy-boto3-sso-admin = - buildMypyBoto3Package "sso-admin" "1.38.0" - "sha256-sZDz1F8V9XfebNZ+fsfOAGR8rqymD4O7b0/v6sV3FTs="; + buildMypyBoto3Package "sso-admin" "1.38.12" + "sha256-RU8IFZVVcJeO4lRa9DG87ue5YPhkqtJB6qjBKG4FZeo="; mypy-boto3-sso-oidc = buildMypyBoto3Package "sso-oidc" "1.38.0" From 7d2b470816381a518ea8e903064cf9a75fa9d2c5 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 9 May 2025 15:00:32 +0200 Subject: [PATCH 60/96] python313Packages.botocore-stubs: 1.38.11 -> 1.38.12 --- pkgs/development/python-modules/botocore-stubs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/botocore-stubs/default.nix b/pkgs/development/python-modules/botocore-stubs/default.nix index 42511dd45173..23814df88032 100644 --- a/pkgs/development/python-modules/botocore-stubs/default.nix +++ b/pkgs/development/python-modules/botocore-stubs/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "botocore-stubs"; - version = "1.38.11"; + version = "1.38.12"; pyproject = true; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "botocore_stubs"; inherit version; - hash = "sha256-WJjdhVrhUnJdYP9I4fQA/CPRj7D/C5vUpFRYryxEbr4="; + hash = "sha256-2GVra+ICCPu/1C/e6BuMU3TIrjF6AEbfbBVRQKYGpX4="; }; nativeBuildInputs = [ setuptools ]; From 48ddc23e036bda7502c47510036a9ab6336f4631 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 9 May 2025 15:00:36 +0200 Subject: [PATCH 61/96] python313Packages.boto3-stubs: 1.38.11 -> 1.38.12 --- pkgs/development/python-modules/boto3-stubs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/boto3-stubs/default.nix b/pkgs/development/python-modules/boto3-stubs/default.nix index ca7bf982db30..59e68ead0e79 100644 --- a/pkgs/development/python-modules/boto3-stubs/default.nix +++ b/pkgs/development/python-modules/boto3-stubs/default.nix @@ -359,7 +359,7 @@ buildPythonPackage rec { pname = "boto3-stubs"; - version = "1.38.11"; + version = "1.38.12"; pyproject = true; disabled = pythonOlder "3.7"; @@ -367,7 +367,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "boto3_stubs"; inherit version; - hash = "sha256-QnrqRjn7YptC1BjhOXLc0VahE9oEKQkgeHLrgBqPCcM="; + hash = "sha256-QJSYymyeTOnzLhFTUhe5f6xc1BPlYDOfQAHAJuu3mVI="; }; build-system = [ setuptools ]; From 7c45a0b7dae25a584df9c690319a9e91c4522dcc Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 9 May 2025 13:48:45 +0000 Subject: [PATCH 62/96] goa: 3.20.1 -> 3.21.0 --- pkgs/by-name/go/goa/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/go/goa/package.nix b/pkgs/by-name/go/goa/package.nix index b97d284f4e37..2079ec3d323e 100644 --- a/pkgs/by-name/go/goa/package.nix +++ b/pkgs/by-name/go/goa/package.nix @@ -6,15 +6,15 @@ buildGoModule rec { pname = "goa"; - version = "3.20.1"; + version = "3.21.0"; src = fetchFromGitHub { owner = "goadesign"; repo = "goa"; rev = "v${version}"; - hash = "sha256-+MAK/qRvwMfjifeXmBjDWKmQ75LAbIUjZ6rvqw1Xv3I="; + hash = "sha256-yHls7qGZhQIIYbPWCs0dm3W2DgKZq4fJbnNCPTqUy/s="; }; - vendorHash = "sha256-/5tcIvJpJPVMOL6XBAjXbiHeCwpB0YOLv5hRhd5zG7Q="; + vendorHash = "sha256-mKFKZuAIQdDwDJ2DMtW18NgFn6Sd35TQHBY4xVKzoUs="; subPackages = [ "cmd/goa" ]; From 31eed9f5e6ef513f11eccbf40678a16ddc5565a6 Mon Sep 17 00:00:00 2001 From: MadMaurice Date: Fri, 9 May 2025 16:30:51 +0200 Subject: [PATCH 63/96] perlPackages.mod_perl2: 2.012 -> 2.013 fixes build --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index b1543f44f992..d0b49254e8ec 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -22396,10 +22396,10 @@ with self; mod_perl2 = buildPerlPackage { pname = "mod_perl"; - version = "2.0.12"; + version = "2.0.13"; src = fetchurl { - url = "mirror://cpan/authors/id/S/SH/SHAY/mod_perl-2.0.12.tar.gz"; - hash = "sha256-9bghtZsP3JZw5G7Q/PMtiRHyUSYYmotowWUvkiHu4mk="; + url = "mirror://cpan/authors/id/S/SH/SHAY/mod_perl-2.0.13.tar.gz"; + hash = "sha256-reO+McRHuESIaf7N/KziWNbVh7jGx3PF8ic19w2C1to="; }; makeMakerFlags = [ "MP_AP_DESTDIR=$out" ]; From 3c1015c99c06a9a5ec7a21aff908a9031abf90e8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 9 May 2025 15:33:54 +0000 Subject: [PATCH 64/96] python3Packages.nexia: 2.8.0 -> 2.10.0 --- pkgs/development/python-modules/nexia/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/nexia/default.nix b/pkgs/development/python-modules/nexia/default.nix index 8c9ff607cc02..013fecf4bc60 100644 --- a/pkgs/development/python-modules/nexia/default.nix +++ b/pkgs/development/python-modules/nexia/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "nexia"; - version = "2.8.0"; + version = "2.10.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "bdraco"; repo = "nexia"; tag = version; - hash = "sha256-nDlOMcBCmPHKvbLLrfRNPBpG9qFpJqzdkluOLnyxUfs="; + hash = "sha256-5gx66PVyrpL/9EXEWsHxKZVHmpfOKluN3LLok2qW3oU="; }; build-system = [ setuptools ]; From 157db2c5609eedb03abff704a8234a69c91728a9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 9 May 2025 15:57:55 +0000 Subject: [PATCH 65/96] python3Packages.testrail-api: 1.13.2 -> 1.13.3 --- pkgs/development/python-modules/testrail-api/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/testrail-api/default.nix b/pkgs/development/python-modules/testrail-api/default.nix index fdedcc5feb41..309f46fd27db 100644 --- a/pkgs/development/python-modules/testrail-api/default.nix +++ b/pkgs/development/python-modules/testrail-api/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "testrail-api"; - version = "1.13.2"; + version = "1.13.3"; pyproject = true; disabled = pythonOlder "3.8"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "tolstislon"; repo = "testrail-api"; tag = version; - hash = "sha256-GR1yhky33XZZFcPEO2WRvVUkmekG9HoM00doVgTCD+0="; + hash = "sha256-jsdxKcXFjP9ifQLwRN3M2xpx1a+KpGv469Ag6NNph6w="; }; build-system = [ @@ -41,7 +41,7 @@ buildPythonPackage rec { meta = { description = "Python wrapper of the TestRail API"; homepage = "https://github.com/tolstislon/testrail-api"; - changelog = "https://github.com/tolstislon/testrail-api/releases/tag/${version}"; + changelog = "https://github.com/tolstislon/testrail-api/releases/tag/${src.tag}"; license = with lib.licenses; [ mit ]; maintainers = with lib.maintainers; [ aanderse ]; }; From 8cd25658f68dc874cf866429b8537c6c599b8ac8 Mon Sep 17 00:00:00 2001 From: Martin Fischer Date: Fri, 9 May 2025 18:13:46 +0200 Subject: [PATCH 66/96] t4kcommon: add u8_mbtouc_unsafe workaround Building it was failing with: /build/source/src/linebreak/linebreak.c: In function 'u8_possible_linebreaks': /build/source/src/linebreak/linebreak.c:163:19: error: implicit declaration of function 'u8_mbtouc_unsafe' [] 163 | int count = u8_mbtouc_unsafe (&uc, s, s_end - s); | ^~~~~~~~~~~~~~~~ --- pkgs/by-name/t4/t4kcommon/package.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/by-name/t4/t4kcommon/package.nix b/pkgs/by-name/t4/t4kcommon/package.nix index d5e07eb4bbde..17ee971bc351 100644 --- a/pkgs/by-name/t4/t4kcommon/package.nix +++ b/pkgs/by-name/t4/t4kcommon/package.nix @@ -38,8 +38,7 @@ stdenv.mkDerivation rec { # gcc-10. Otherwise build fails as: # ld: CMakeFiles/t4k_common.dir/t4k_throttle.c.o:(.bss+0x0): multiple definition of # `wrapped_lines'; CMakeFiles/t4k_common.dir/t4k_audio.c.o:(.bss+0x0): first defined here - # TODO: revisit https://github.com/tux4kids/t4kcommon/pull/10 when merged. - env.NIX_CFLAGS_COMPILE = "-fcommon"; + env.NIX_CFLAGS_COMPILE = "-fcommon -DGNULIB_UNISTR_U8_MBTOUC_UNSAFE -Wno-incompatible-pointer-types"; nativeBuildInputs = [ cmake From 7e78cfc77a2e11cca6075ff0fa75e8802f114dee Mon Sep 17 00:00:00 2001 From: Ava Gordon Date: Fri, 9 May 2025 17:15:14 +0100 Subject: [PATCH 67/96] maintainers: remove old maintainer --- maintainers/maintainer-list.nix | 6 ------ pkgs/by-name/yo/yojimbo/package.nix | 2 +- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 4db5037b957c..5b2421139d61 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -18552,12 +18552,6 @@ githubId = 16345849; name = "Parthiv Seetharaman"; }; - paddygord = { - email = "pgpatrickgordon@gmail.com"; - github = "avagordon01"; - githubId = 10776658; - name = "Patrick Gordon"; - }; paepcke = { email = "git@paepcke.de"; github = "paepckehh"; diff --git a/pkgs/by-name/yo/yojimbo/package.nix b/pkgs/by-name/yo/yojimbo/package.nix index 287de4a052bc..ce32f0bd82ea 100644 --- a/pkgs/by-name/yo/yojimbo/package.nix +++ b/pkgs/by-name/yo/yojimbo/package.nix @@ -61,6 +61,6 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://github.com/mas-bandwidth/yojimbo"; license = licenses.bsd3; platforms = platforms.x86_64; - maintainers = with maintainers; [ paddygord ]; + maintainers = with maintainers; [ ]; }; }) From 8d2321ce7740703efb6d05b410e2572080c0aa2a Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 9 May 2025 18:25:40 +0200 Subject: [PATCH 68/96] python313Packages.forecast-solar: 4.1.0 -> 4.2.0 https://github.com/home-assistant-libs/forecast_solar/releases/tag/v4.2.0 --- pkgs/development/python-modules/forecast-solar/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/forecast-solar/default.nix b/pkgs/development/python-modules/forecast-solar/default.nix index ce8b07eb1065..eebede67f426 100644 --- a/pkgs/development/python-modules/forecast-solar/default.nix +++ b/pkgs/development/python-modules/forecast-solar/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "forecast-solar"; - version = "4.1.0"; + version = "4.2.0"; pyproject = true; disabled = pythonOlder "3.11"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "home-assistant-libs"; repo = "forecast_solar"; tag = "v${version}"; - hash = "sha256-1oPcYEwjkkK+hAemUXaG/LFleBtsjbPUZ1b2W9/BNlg="; + hash = "sha256-ZBkuhONvn1/QpD+ml3HJinMIdg1HFpVj5KZAlUt/qR4="; }; build-system = [ poetry-core ]; From db616437fa9911fd433dfd7d1e55c365461813b9 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 9 May 2025 18:26:07 +0200 Subject: [PATCH 69/96] python313Packages.pylamarzocco: 2.0.0 -> 2.0.1 https://github.com/zweckj/pylamarzocco/releases/tag/v2.0.1 --- pkgs/development/python-modules/pylamarzocco/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pylamarzocco/default.nix b/pkgs/development/python-modules/pylamarzocco/default.nix index 91f1f84a2ab8..51f25930e54b 100644 --- a/pkgs/development/python-modules/pylamarzocco/default.nix +++ b/pkgs/development/python-modules/pylamarzocco/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "pylamarzocco"; - version = "2.0.0"; + version = "2.0.1"; pyproject = true; disabled = pythonOlder "3.12"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "zweckj"; repo = "pylamarzocco"; tag = "v${version}"; - hash = "sha256-iOqYCX7cwAePGepJ0nAG3iApz1A/9Cn6hy3mo4uPl7w="; + hash = "sha256-ZfixljgkRElDZFkSbZrFK7EO6NGU7jsal+Ra52/N82A="; }; build-system = [ setuptools ]; From 2b0fd6cfc3dc081d8be43dfa3e6db10db0a3c3f6 Mon Sep 17 00:00:00 2001 From: Rhys-T <108157737+Rhys-T@users.noreply.github.com> Date: Fri, 9 May 2025 12:26:45 -0400 Subject: [PATCH 70/96] python3Packages.pygame-ce: unbreak on darwin again Originally fixed in 66ebd9e90e5982f1e09572d96577b8b1101749a8, but it seems to have been lost in c8c30c91d58754804d3388650128c42ada90ee2f. --- .../development/python-modules/pygame-ce/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/pygame-ce/default.nix b/pkgs/development/python-modules/pygame-ce/default.nix index 5af23c4c2491..eb1f645fa346 100644 --- a/pkgs/development/python-modules/pygame-ce/default.nix +++ b/pkgs/development/python-modules/pygame-ce/default.nix @@ -19,9 +19,9 @@ libX11, portmidi, SDL2_classic, - SDL2_image, - SDL2_mixer, - SDL2_ttf, + SDL2_classic_image, + SDL2_classic_mixer_2_0, + SDL2_classic_ttf, numpy, pygame-gui, @@ -99,9 +99,9 @@ buildPythonPackage rec { libpng portmidi SDL2_classic - (SDL2_image.override { enableSTB = false; }) - SDL2_mixer - SDL2_ttf + (SDL2_classic_image.override { enableSTB = false; }) + SDL2_classic_mixer_2_0 + SDL2_classic_ttf ]; nativeCheckInputs = [ From 95680262aae1bfa575a12ce5e3b2fd2f213ee763 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 9 May 2025 17:05:26 +0000 Subject: [PATCH 71/96] firebase-tools: 14.2.1 -> 14.3.0 --- pkgs/by-name/fi/firebase-tools/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/fi/firebase-tools/package.nix b/pkgs/by-name/fi/firebase-tools/package.nix index ce38c96f34a2..288d145f9202 100644 --- a/pkgs/by-name/fi/firebase-tools/package.nix +++ b/pkgs/by-name/fi/firebase-tools/package.nix @@ -10,16 +10,16 @@ buildNpmPackage rec { pname = "firebase-tools"; - version = "14.2.1"; + version = "14.3.0"; src = fetchFromGitHub { owner = "firebase"; repo = "firebase-tools"; tag = "v${version}"; - hash = "sha256-3eAzLtVNlgjktnuQ1ZJIyE2CsKZISPRuGjUTHZxX/6k="; + hash = "sha256-Y3+Nw6+ZCnHOJeoMRhWafBVi0yrb41NX/4FcpqHk4eA="; }; - npmDepsHash = "sha256-/mij1GjkRldQWaBv1YEwxMWoP6CG3ydLV2aI+K2R+t4="; + npmDepsHash = "sha256-+rAwYopIP/NEb602TVuZEZUY+dQPzkuTXpWCBeLCjmg="; postPatch = '' ln -s npm-shrinkwrap.json package-lock.json From 7940544efbe442aeca01a408166d5284681a9d43 Mon Sep 17 00:00:00 2001 From: PhiliPdB Date: Thu, 8 May 2025 19:51:52 +0200 Subject: [PATCH 72/96] python3Packages.awacs: unbreak, modernize unbreak by adding pytestCheckHook --- .../python-modules/awacs/default.nix | 26 ++++++++++--------- 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/pkgs/development/python-modules/awacs/default.nix b/pkgs/development/python-modules/awacs/default.nix index c669c94f3056..e19d947907f0 100644 --- a/pkgs/development/python-modules/awacs/default.nix +++ b/pkgs/development/python-modules/awacs/default.nix @@ -3,35 +3,37 @@ buildPythonPackage, fetchPypi, pythonOlder, - python, - typing-extensions, + setuptools, + pytestCheckHook, }: buildPythonPackage rec { pname = "awacs"; version = "2.5.0"; - format = "setuptools"; + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.9"; src = fetchPypi { inherit pname version; hash = "sha256-mdU88KH1bxsJROG70tS2FYvRSrlHlBK9GKxR4gg1OFw="; }; - propagatedBuildInputs = lib.lists.optionals (pythonOlder "3.8") [ typing-extensions ]; - - checkPhase = '' - ${python.interpreter} -m unittest discover - ''; + build-system = [ + setuptools + ]; pythonImportsCheck = [ "awacs" ]; - meta = with lib; { + nativeCheckInputs = [ + pytestCheckHook + ]; + + meta = { description = "AWS Access Policy Language creation library"; homepage = "https://github.com/cloudtools/awacs"; changelog = "https://github.com/cloudtools/awacs/blob/${version}/CHANGELOG.md"; - license = licenses.bsd2; - maintainers = with maintainers; [ jlesquembre ]; + license = lib.licenses.bsd2; + maintainers = with lib.maintainers; [ jlesquembre ]; }; } From bd262567d786e44127bf9b5ede1c81dc2a661c61 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 9 May 2025 18:14:36 +0000 Subject: [PATCH 73/96] terraform-providers.azurerm: 4.27.0 -> 4.28.0 --- .../networking/cluster/terraform-providers/providers.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 2bc1c10d3f01..885f72601aff 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -135,11 +135,11 @@ "vendorHash": null }, "azurerm": { - "hash": "sha256-r2ttKyaV/cjIXYECwYmKuTe2Z1HYgiJFfMzd58Se99g=", + "hash": "sha256-jc8mv1W9586jPaxUmmUUBk824kvQbuG7vcEbZ1k64yw=", "homepage": "https://registry.terraform.io/providers/hashicorp/azurerm", "owner": "hashicorp", "repo": "terraform-provider-azurerm", - "rev": "v4.27.0", + "rev": "v4.28.0", "spdx": "MPL-2.0", "vendorHash": null }, From 8f6b1ac340cab430cb428635f1ee0340f9beae86 Mon Sep 17 00:00:00 2001 From: squat Date: Fri, 9 May 2025 20:21:06 +0200 Subject: [PATCH 74/96] nixos/lib: fix typo in documentation for systemd This commit fixes a small typo in the documentation for the `asDropinIfExists` option and clarifies the comment. Signed-off-by: squat --- nixos/lib/systemd-unit-options.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/lib/systemd-unit-options.nix b/nixos/lib/systemd-unit-options.nix index 27d2e5d18391..0ddae4e20198 100644 --- a/nixos/lib/systemd-unit-options.nix +++ b/nixos/lib/systemd-unit-options.nix @@ -99,7 +99,7 @@ rec { Defines how unit configuration is provided for systemd: `asDropinIfExists` creates a unit file when no unit file is provided by the package - otherwise a drop-in file name `overrides.conf`. + otherwise it creates a drop-in file named `overrides.conf`. `asDropin` creates a drop-in file named `overrides.conf`. Mainly needed to define instances for systemd template units (e.g. `systemd-nspawn@mycontainer.service`). From b3e469b9afc67e219b87e160dbbe2c54828b460e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 9 May 2025 18:26:16 +0000 Subject: [PATCH 75/96] rime-ls: 0.4.2 -> 0.4.3 --- pkgs/by-name/ri/rime-ls/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ri/rime-ls/package.nix b/pkgs/by-name/ri/rime-ls/package.nix index c65b9b63e245..7d022eab8212 100644 --- a/pkgs/by-name/ri/rime-ls/package.nix +++ b/pkgs/by-name/ri/rime-ls/package.nix @@ -7,17 +7,17 @@ }: rustPlatform.buildRustPackage rec { pname = "rime-ls"; - version = "0.4.2"; + version = "0.4.3"; src = fetchFromGitHub { owner = "wlh320"; repo = "rime-ls"; rev = "v${version}"; - hash = "sha256-bVpFE25Maady0oyrwWf2l7FCW/VHN6mJsnEefmStxIU="; + hash = "sha256-jDn41hSDcQQO1d4G0XV6B/JZkryHtuoHUOYpmdE1Kxo="; }; useFetchCargoVendor = true; - cargoHash = "sha256-j3wAGbKJCcv88C3P8iMoFlDhjXufulFXCnVpwWIAHyU="; + cargoHash = "sha256-lmvIH6ssEqbkcDETzHL+Spd04B576o8dijigUR88l9c="; nativeBuildInputs = [ rustPlatform.bindgenHook ]; From 1c66ae60b992f423076e2fd858ecace03505b035 Mon Sep 17 00:00:00 2001 From: Rebecca Turner Date: Thu, 8 May 2025 11:42:34 -0700 Subject: [PATCH 76/96] nix-direnv: 3.0.6 -> 3.0.7 `direnv` 2.36.0 [changed how logging worked][1]. As a result, the `$DIRENV_LOG_FORMAT` variable is no longer set when the `nix-direnv` `direnvrc` is sourced. Previously, setting `$DIRENV_LOG_FORMAT` to the empty string was [the recommended solution for disabling all log output][2]. Therefore, `nix-direnv`'s warnings are completely silenced when using the latest `direnv`. `nix-direnv` 3.0.7 fixes this issue. Warnings being silenced leads to very surprising behavior and output. We use an `.envrc` that looks like this: nix_direnv_manual_reload use flake `nix_direnv_manual_reload` means that `use flake` is ignored unless a cache already exists. It's supposed to print a warning making this clear, which looks like this: $ direnv allow direnv: loading ~/my-repo/.envrc direnv: using flake direnv: nix-direnv: cache does not exist. use "nix-direnv-reload" to create it direnv: export ~PATH However, with the latest `direnv`, it prints this output instead: $ direnv allow direnv: loading ~/my-repo/.envrc direnv: using flake direnv: export ~PATH This is very misleading; it prints `using flake` as if it's loading the Flake, but actually nothing is happening and the Flake is being ignored entirely! [1]: https://github.com/direnv/direnv/pull/1336 [2]: https://github.com/direnv/direnv/issues/68#issuecomment-42525172 --- pkgs/by-name/ni/nix-direnv/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ni/nix-direnv/package.nix b/pkgs/by-name/ni/nix-direnv/package.nix index ff56c097c29a..0298c0fd3ec3 100644 --- a/pkgs/by-name/ni/nix-direnv/package.nix +++ b/pkgs/by-name/ni/nix-direnv/package.nix @@ -11,13 +11,13 @@ # https://github.com/abathur/resholve/issues/107 resholve.mkDerivation rec { pname = "nix-direnv"; - version = "3.0.6"; + version = "3.0.7"; src = fetchFromGitHub { owner = "nix-community"; repo = "nix-direnv"; rev = version; - hash = "sha256-oNqhPqgQT92yxbKmcgX4F3e2yTUPyXYG7b2xQm3TvQw="; + hash = "sha256-H59MMmyQ9Tl9CLKKkXIv2NZddrrJNLv8XOOI2e4pG64="; }; installPhase = '' From 13fa0b92c1efee34e63673de56512b4d0999ba76 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 9 May 2025 18:41:10 +0000 Subject: [PATCH 77/96] url-parser: 2.1.5 -> 2.1.6 --- pkgs/by-name/ur/url-parser/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ur/url-parser/package.nix b/pkgs/by-name/ur/url-parser/package.nix index bd274af50f68..5b51ff56362b 100644 --- a/pkgs/by-name/ur/url-parser/package.nix +++ b/pkgs/by-name/ur/url-parser/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "url-parser"; - version = "2.1.5"; + version = "2.1.6"; src = fetchFromGitHub { owner = "thegeeklab"; repo = "url-parser"; tag = "v${version}"; - hash = "sha256-Kwjub9qAfHhqNL3mRzlJws1wnwVPAJ3jPYh0s/cu7+8="; + hash = "sha256-pmsF2wYEjJ8//sUvkW0psj4ULOjwp8s3hzxVKXCM0Ok="; }; - vendorHash = "sha256-MR8SjQ8IrHC6hZTvmnqXvqJ6odo0+RIMDtMpYwY+iMs="; + vendorHash = "sha256-873EOiS57LKZDehtDZyc3ACEXhUFOtIX6v+D2LUarwE="; ldflags = [ "-s" From 464c1b91b24f4651d2505378ada20bf46fb15a6b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 9 May 2025 18:44:58 +0000 Subject: [PATCH 78/96] tippecanoe: 2.77.0 -> 2.78.0 --- pkgs/by-name/ti/tippecanoe/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ti/tippecanoe/package.nix b/pkgs/by-name/ti/tippecanoe/package.nix index dbda51f3709a..c14d07caa3fc 100644 --- a/pkgs/by-name/ti/tippecanoe/package.nix +++ b/pkgs/by-name/ti/tippecanoe/package.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "tippecanoe"; - version = "2.77.0"; + version = "2.78.0"; src = fetchFromGitHub { owner = "felt"; repo = "tippecanoe"; tag = finalAttrs.version; - hash = "sha256-7yRrUn1U0iERlix/8/oaMaizlpzqdiSIHj298ykaJjE="; + hash = "sha256-RSth1mFiVHtiZkGVvaIRxNQ3nYtV/GAL64D7fFB1NYs="; }; buildInputs = [ From 2fe5d205d7341afd2aeb96b1c1c04471b84b464d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 9 May 2025 18:57:23 +0000 Subject: [PATCH 79/96] remnote: 1.19.22 -> 1.19.24 --- pkgs/by-name/re/remnote/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/re/remnote/package.nix b/pkgs/by-name/re/remnote/package.nix index 28e43ea60c01..90686ae038e4 100644 --- a/pkgs/by-name/re/remnote/package.nix +++ b/pkgs/by-name/re/remnote/package.nix @@ -6,10 +6,10 @@ }: let pname = "remnote"; - version = "1.19.22"; + version = "1.19.24"; src = fetchurl { url = "https://download2.remnote.io/remnote-desktop2/RemNote-${version}.AppImage"; - hash = "sha256-ecMAHUD/qZaWquO65WcSoiAGQEXaJpTjm12z/raf0AA="; + hash = "sha256-+ZNQ94itLdSuw7HS3cLPgJNqVcQ1OfPHF68hFwHpaDQ="; }; appimageContents = appimageTools.extractType2 { inherit pname version src; }; in From 7c1682d702bac863642cefdd374a0a882ef58a71 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 9 May 2025 19:07:08 +0000 Subject: [PATCH 80/96] tex-fmt: 0.5.2 -> 0.5.4 --- pkgs/by-name/te/tex-fmt/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/te/tex-fmt/package.nix b/pkgs/by-name/te/tex-fmt/package.nix index 58f6b21a2eca..309bb7e1af23 100644 --- a/pkgs/by-name/te/tex-fmt/package.nix +++ b/pkgs/by-name/te/tex-fmt/package.nix @@ -7,17 +7,17 @@ rustPlatform.buildRustPackage rec { pname = "tex-fmt"; - version = "0.5.2"; + version = "0.5.4"; src = fetchFromGitHub { owner = "WGUNDERWOOD"; repo = "tex-fmt"; tag = "v${version}"; - hash = "sha256-3kRtBfIT6QcdZ1+h2WwvxsAv/UJLtwSodF5zvCUDbHQ="; + hash = "sha256-CAuhIJbe483Qu+wnNfXTkQ3ERAbkt07QzZ7z7pcbl10="; }; useFetchCargoVendor = true; - cargoHash = "sha256-4kx3co9doFYD9SjJhL17hgf6ll4niKnF57evv/eNeM0="; + cargoHash = "sha256-ZXoaQYUYut11r6zvvIihZ3myL4B4y5yKq6P1BBtky/c="; nativeBuildInputs = [ installShellFiles ]; From 5040abe52791fc093448415bf486ce353eb61a95 Mon Sep 17 00:00:00 2001 From: fmbearmf <77757734+fmbearmf@users.noreply.github.com> Date: Tue, 6 May 2025 22:25:49 -0700 Subject: [PATCH 81/96] widevine-cdm: 4.10.2830.0 -> 4.10.2891.0 --- pkgs/by-name/wi/widevine-cdm/x86_64-linux.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/wi/widevine-cdm/x86_64-linux.nix b/pkgs/by-name/wi/widevine-cdm/x86_64-linux.nix index 07432c73527f..00c1b625c32d 100644 --- a/pkgs/by-name/wi/widevine-cdm/x86_64-linux.nix +++ b/pkgs/by-name/wi/widevine-cdm/x86_64-linux.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "widevine-cdm"; - version = "4.10.2830.0"; + version = "4.10.2891.0"; src = fetchzip { url = "https://dl.google.com/widevine-cdm/${finalAttrs.version}-linux-x64.zip"; - hash = "sha256-XDnsan1ulnIK87Owedb2s9XWLzk1K2viGGQe9LN/kcE="; + hash = "sha256-ZO6FmqJUnB9VEJ7caJt58ym8eB3/fDATri3iOWCULRI="; stripRoot = false; }; From a6159a44c2ce87db936e31ee5fd5f8411ede3276 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 9 May 2025 19:19:55 +0000 Subject: [PATCH 82/96] node-pre-gyp: 2.0.0 -> 2.0.1 --- pkgs/by-name/no/node-pre-gyp/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/no/node-pre-gyp/package.nix b/pkgs/by-name/no/node-pre-gyp/package.nix index 3e570fa323de..b0f6a990dea4 100644 --- a/pkgs/by-name/no/node-pre-gyp/package.nix +++ b/pkgs/by-name/no/node-pre-gyp/package.nix @@ -6,16 +6,16 @@ buildNpmPackage rec { pname = "node-pre-gyp"; - version = "2.0.0"; + version = "2.0.1"; src = fetchFromGitHub { owner = "mapbox"; repo = "node-pre-gyp"; tag = "v${version}"; - hash = "sha256-i7iBy+X9zBKrrbIwVa61y9cbmHJmqeacXrZk+XGRok8="; + hash = "sha256-9MADe6oY28MBAdQsu/ddVveZYwD4xeVNKUffhcvK+Q0="; }; - npmDepsHash = "sha256-0Xa5bByTskrQ8v2O1FUxtQzRb1ZEV0TvUhe8hh05QHI="; + npmDepsHash = "sha256-yNu66HlkOVsYv60saTf7M4QuN9B2euYFu5WB7UAwhUw="; dontNpmBuild = true; From 991733922fd7563896901fe1fcc528d87af60db0 Mon Sep 17 00:00:00 2001 From: FKouhai Date: Fri, 9 May 2025 21:15:05 +0200 Subject: [PATCH 83/96] vimPlugins.timerly: init at 2025-04-16 --- pkgs/applications/editors/vim/plugins/generated.nix | 13 +++++++++++++ pkgs/applications/editors/vim/plugins/overrides.nix | 4 ++++ .../editors/vim/plugins/vim-plugin-names | 1 + 3 files changed, 18 insertions(+) diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index 069972b55c15..931c835b7fa2 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -14545,6 +14545,19 @@ final: prev: { meta.hydraPlatforms = [ ]; }; + timerly = buildVimPlugin { + pname = "timerly"; + version = "2025-04-16"; + src = fetchFromGitHub { + owner = "nvzone"; + repo = "timerly"; + rev = "17299a4d332c483ce09052fe8478b41b992f2594"; + sha256 = "0nfyw98nb95df0dpnxlaipgar92b8z2z3rxfih2fc86m6gxv2mm2"; + }; + meta.homepage = "https://github.com/nvzone/timerly/"; + meta.hydraPlatforms = [ ]; + }; + timestamp-vim = buildVimPlugin { pname = "timestamp.vim"; version = "2010-11-06"; diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix index 80661c30f724..8b8a4ad9da4e 100644 --- a/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/overrides.nix @@ -3353,6 +3353,10 @@ in ]; }; + timerly = super.timerly.overrideAttrs { + dependencies = [ self.nvzone-volt ]; + }; + tmux-complete-vim = super.tmux-complete-vim.overrideAttrs { # Vim plugin with optional nvim-compe lua module nvimSkipModules = [ "compe_tmux" ]; diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index 65b55ee08c1b..93311ced4a63 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -1116,6 +1116,7 @@ https://github.com/johmsalas/text-case.nvim/,HEAD, https://github.com/vhsconnect/themed-tabs.nvim/,HEAD, https://github.com/ron89/thesaurus_query.vim/,, https://github.com/itchyny/thumbnail.vim/,, +https://github.com/nvzone/timerly/,HEAD, https://github.com/vim-scripts/timestamp.vim/,, https://github.com/levouh/tint.nvim/,HEAD, https://github.com/tinted-theming/tinted-vim/,HEAD, From 095ed9871604f1f718796af33bafab342d1f22ca Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 9 May 2025 19:48:10 +0000 Subject: [PATCH 84/96] ipfs-cluster: 1.1.2 -> 1.1.3 --- pkgs/by-name/ip/ipfs-cluster/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ip/ipfs-cluster/package.nix b/pkgs/by-name/ip/ipfs-cluster/package.nix index 813f40030fa4..8c176a4dac41 100644 --- a/pkgs/by-name/ip/ipfs-cluster/package.nix +++ b/pkgs/by-name/ip/ipfs-cluster/package.nix @@ -6,15 +6,15 @@ buildGoModule rec { pname = "ipfs-cluster"; - version = "1.1.2"; + version = "1.1.3"; - vendorHash = "sha256-y8eE1GYFiHbLY5zeSSQO86I4buZZJROGp7KzXbKjMqI="; + vendorHash = "sha256-VVejr6B7eDNNQF34PS/PaQ50mBNZgzJS50aNzbLJgCg="; src = fetchFromGitHub { owner = "ipfs-cluster"; repo = "ipfs-cluster"; rev = "v${version}"; - hash = "sha256-CpMnhqRlikKdPT3/tsLpKdKm6icePDsmqEnUEBwvCT0="; + hash = "sha256-C3bBtZsDcYy6I0wmaYIDwhmGJVNcWq+rCdi5WHUzvB8="; }; meta = with lib; { From e0d3d5fd1b6b7c8c5b9b77c0b265753b778da778 Mon Sep 17 00:00:00 2001 From: Arsenii Zorin Date: Fri, 9 May 2025 22:50:23 +0300 Subject: [PATCH 85/96] pulumi-bin: 3.168.0 -> 3.169.0 --- pkgs/tools/admin/pulumi-bin/data.nix | 66 ++++++++++++++-------------- 1 file changed, 33 insertions(+), 33 deletions(-) diff --git a/pkgs/tools/admin/pulumi-bin/data.nix b/pkgs/tools/admin/pulumi-bin/data.nix index 0900d309ce17..66bc37845e86 100644 --- a/pkgs/tools/admin/pulumi-bin/data.nix +++ b/pkgs/tools/admin/pulumi-bin/data.nix @@ -1,12 +1,12 @@ # DO NOT EDIT! This file is generated automatically by update.sh { }: { - version = "3.168.0"; + version = "3.169.0"; pulumiPkgs = { x86_64-linux = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v3.168.0-linux-x64.tar.gz"; - sha256 = "1qiz9444zr8sil0i255bkfcalzzaxb6vk1x8yn35r8hz8ashynsc"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v3.169.0-linux-x64.tar.gz"; + sha256 = "03vjcmhkpxibjz9gkjvr6p2wjfg1gf6xb52gqqvw0qmnlrw3yg01"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.37.0-linux-amd64.tar.gz"; @@ -57,8 +57,8 @@ sha256 = "1ccjfr1v88hc2x845z7h3bxkgxqn6f134d422qdz9bgqdlyrr2dk"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.43.0-linux-amd64.tar.gz"; - sha256 = "1fpf1qr9rsh37lk9mz761xkkj5glj314hwwij7izwv5fx1v8j3np"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.44.0-linux-amd64.tar.gz"; + sha256 = "0a3ldv9wbsym8vhb0rk0l0c8f03vi13qzqydli7ap7alhc4i1jvc"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v4.6.2-linux-amd64.tar.gz"; @@ -97,8 +97,8 @@ sha256 = "08i1k8m59dp56lafx8b0ggmgxl7dfqv8f4nljy4dh95h3bs7fdl2"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v4.38.0-linux-amd64.tar.gz"; - sha256 = "0q3rs7qvjs0grhb29a2ajgbdwzhflcjfg2wdball0vfwxhnv0flp"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v4.39.0-linux-amd64.tar.gz"; + sha256 = "1gvhsmf6avr3d9c3byr4drmf5jzarrzi3cr333l7hf81arsvpbjm"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v3.5.9-linux-amd64.tar.gz"; @@ -125,8 +125,8 @@ sha256 = "1z9d3ng3aqz1gpd3l0akva7lfyq8l94xd4z4jg3r29w3m274xbz4"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.118.1-linux-amd64.tar.gz"; - sha256 = "0190xsldp4xvadfsivvk1d9ap3bkjgaliz052abj58b63czpkvmi"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.119.0-linux-amd64.tar.gz"; + sha256 = "10ws1zpyrqbdaw8qr3flib307gfs4l39zpbznp8hz9f7s4yrg3a5"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-sumologic-v1.0.9-linux-amd64.tar.gz"; @@ -163,8 +163,8 @@ ]; x86_64-darwin = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v3.168.0-darwin-x64.tar.gz"; - sha256 = "1vn7mn5kpsa0x7174q23h557yf7d9vqfqmbijz4pc7xrmcig2q4l"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v3.169.0-darwin-x64.tar.gz"; + sha256 = "0hsi1635731bbic7apxvs9m4q3c40ih0i62v2sjw7lmw5i073c7i"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.37.0-darwin-amd64.tar.gz"; @@ -215,8 +215,8 @@ sha256 = "0w71myfi4j5kwqrdjf7s8674m7zbfzpk2lz10iyhdr404jawb7rg"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.43.0-darwin-amd64.tar.gz"; - sha256 = "0ql0y3kpyqwm1zispjci6d372mzyg91ig2pmgr3509f97zzm1ql6"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.44.0-darwin-amd64.tar.gz"; + sha256 = "1bsyiw9pxqpv4ngapndk6wfa5jq9p783llwk3xjrwzd14mw2dbmn"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v4.6.2-darwin-amd64.tar.gz"; @@ -255,8 +255,8 @@ sha256 = "1pdvqyfv4cn25h0hg830r2mv5d7g16032badf6f16azscdri81lv"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v4.38.0-darwin-amd64.tar.gz"; - sha256 = "03rly4qwkbv82vl251dnzvz4n9clbdn516yflx0j8ybph7z2kv29"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v4.39.0-darwin-amd64.tar.gz"; + sha256 = "1mxlvp95fq1hqiw7b9lxsfa518hqlx263w1kblp2nnbvjrvhpnl7"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v3.5.9-darwin-amd64.tar.gz"; @@ -283,8 +283,8 @@ sha256 = "11pj11zbdcsacxlkasc6n2wwz7qniirhy8kg53ir5s1crwpddf6p"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.118.1-darwin-amd64.tar.gz"; - sha256 = "0r2mbwav0hm9r9vzcsy4wmx6bf0phr2fgsdnwig9bpv6afnw18h5"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.119.0-darwin-amd64.tar.gz"; + sha256 = "03j155ia44lkcc8mjda9pj6w6qwqqyd9g8xw9j9hsflhb2j3zjh0"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-sumologic-v1.0.9-darwin-amd64.tar.gz"; @@ -321,8 +321,8 @@ ]; aarch64-linux = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v3.168.0-linux-arm64.tar.gz"; - sha256 = "17sn6hl1pda3sqj797j44incq681fbmlgwjgn712pl3vjk055rlx"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v3.169.0-linux-arm64.tar.gz"; + sha256 = "1y3kk01ir3f2rdf3wbrbz9khcm111d0ixgiw88zfdq8jaclyxih2"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.37.0-linux-arm64.tar.gz"; @@ -373,8 +373,8 @@ sha256 = "0mazlc88jcbpikvdcph0qk64riq5lfkcypgbsmckwz0ij9y7x15h"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.43.0-linux-arm64.tar.gz"; - sha256 = "16s3rmhzgyhh2wxmylfdj64xmpv1h9kjq80vpv2z47rsf16sbrvp"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.44.0-linux-arm64.tar.gz"; + sha256 = "1hwgp7s93l1hk7llic2fndafjhibp973hvgh59xfnahk20yxv70c"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v4.6.2-linux-arm64.tar.gz"; @@ -413,8 +413,8 @@ sha256 = "0kqxz7y1n9zzpw3rv15kb55qvp14rvxh0vymddlrja7iqcvb8nd8"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v4.38.0-linux-arm64.tar.gz"; - sha256 = "05p6p134pl0dn9q322mksqvxk7md27jdigyp7sda9np6r52vghar"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v4.39.0-linux-arm64.tar.gz"; + sha256 = "13s9bfybmbzkrpydjmpbnhwaxyyzz1zcfa512iwbmp3d3hpyw58g"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v3.5.9-linux-arm64.tar.gz"; @@ -441,8 +441,8 @@ sha256 = "0kpvd7vvi8h28mlz4lr8p5p4ccpc4k7wmh669g969dxi53n54vmw"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.118.1-linux-arm64.tar.gz"; - sha256 = "14s33njaz7cv4bvj9i77bw6wa594fnkz1yxw4fwvr5i8sa97l4zz"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.119.0-linux-arm64.tar.gz"; + sha256 = "1cn63479qlk6pdzf1vzfmq0kr57gm0xs77xjwa5s3546kcbk4jzi"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-sumologic-v1.0.9-linux-arm64.tar.gz"; @@ -479,8 +479,8 @@ ]; aarch64-darwin = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v3.168.0-darwin-arm64.tar.gz"; - sha256 = "0fznw919inkyljf7vck2lav7xp0h1q4sm3scyrinf6mj4vy4y64c"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v3.169.0-darwin-arm64.tar.gz"; + sha256 = "0zy5118lcasnp2mhn0mjhz6y6yl9szrlf7v1s5kdwwzjlgz4a4a2"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.37.0-darwin-arm64.tar.gz"; @@ -531,8 +531,8 @@ sha256 = "1z6j18n9w9gh7zw2d76ra623miqc0dy4gf3p61x3iqhid2znc5pl"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.43.0-darwin-arm64.tar.gz"; - sha256 = "177h75jj53x630qfmcjikzpbp1bdbpbfc57yl2lf0ycdmd9s7a5w"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.44.0-darwin-arm64.tar.gz"; + sha256 = "1ml703nn4y705i33s9czd2hsbasfl812427sriqq605pb197v7y1"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v4.6.2-darwin-arm64.tar.gz"; @@ -571,8 +571,8 @@ sha256 = "17fl8apnlz4ifjzp1sq0fi4y1knxh1x2fvhlrg8j568f3svp41f8"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v4.38.0-darwin-arm64.tar.gz"; - sha256 = "0lzp3ddbdm6jicw4w2lhjwz34rl29qrzwdl8s41arqf02hdq3shc"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v4.39.0-darwin-arm64.tar.gz"; + sha256 = "1zrqg24vpkrdz1ji43idb7jxc0vkqbsdl3rxvfwip2fvkh7c7pzi"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v3.5.9-darwin-arm64.tar.gz"; @@ -599,8 +599,8 @@ sha256 = "0ccsgh89z0zbxxns4zc24l71ylkr536xcdyz4rglkzqhklrhgl89"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.118.1-darwin-arm64.tar.gz"; - sha256 = "0fabjrwsrsi5lnj57jl32ikr4c96bh705hr44v6n2w3wa5wwm267"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.119.0-darwin-arm64.tar.gz"; + sha256 = "04f3wwcgc8w691iscfshskccsb4s459xxqdmcfvspjpwcgbqi89m"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-sumologic-v1.0.9-darwin-arm64.tar.gz"; From 7db1e8551eb0bbc41103ec0b1646e1679c5ff88a Mon Sep 17 00:00:00 2001 From: azahi Date: Fri, 9 May 2025 01:06:53 +0300 Subject: [PATCH 86/96] nelm: init at 1.3.0 --- pkgs/by-name/ne/nelm/package.nix | 68 ++++++++++++++++++++++++++++++++ 1 file changed, 68 insertions(+) create mode 100644 pkgs/by-name/ne/nelm/package.nix diff --git a/pkgs/by-name/ne/nelm/package.nix b/pkgs/by-name/ne/nelm/package.nix new file mode 100644 index 000000000000..b0aa0d15648a --- /dev/null +++ b/pkgs/by-name/ne/nelm/package.nix @@ -0,0 +1,68 @@ +{ + buildGoModule, + buildPackages, + fetchFromGitHub, + installShellFiles, + lib, + stdenv, + versionCheckHook, +}: +buildGoModule (finalAttrs: { + pname = "nelm"; + version = "1.3.0"; + + src = fetchFromGitHub { + owner = "werf"; + repo = "nelm"; + tag = "v${finalAttrs.version}"; + hash = "sha256-voSGwr4wpei9U5L/6uAcapjNZ5CVn49mwngfsXMcxB0="; + }; + + vendorHash = "sha256-kLFQtRAsxA7fdQIgpa0eV3hSpX5pAGT1DTGeGkawvVk="; + + subPackages = [ "cmd/nelm" ]; + + ldflags = [ + "-s" + "-w" + "-X github.com/werf/nelm/internal/common.Brand=Nelm" + "-X github.com/werf/nelm/internal/common.Version=${finalAttrs.version}" + ]; + + nativeBuildInputs = [ installShellFiles ]; + + preCheck = '' + # Test all packages. + unset subPackages + ''; + + postInstall = lib.optionalString (stdenv.hostPlatform.emulatorAvailable buildPackages) ( + let + emulator = stdenv.hostPlatform.emulator buildPackages; + in + '' + for shell in bash fish zsh; do + installShellCompletion \ + --cmd nelm \ + --$shell <(${emulator} $out/bin/nelm completion $shell) + done + '' + ); + + nativeInstallCheckInputs = [ versionCheckHook ]; + doInstallCheck = true; + versionCheckProgramArg = "version"; + + meta = { + description = "Kubernetes deployment tool, alternative to Helm 3"; + longDescription = '' + Nelm is a Helm 3 alternative. It is a Kubernetes deployment tool that + manages Helm Charts and deploys them to Kubernetes. + ''; + homepage = "https://github.com/werf/nelm"; + changelog = "https://github.com/werf/nelm/releases/tag/v${finalAttrs.version}"; + license = lib.licenses.asl20; + maintainers = [ lib.maintainers.azahi ]; + mainProgram = "nelm"; + }; +}) From 874b1d39f6c1c5bdab6124000600eb426f957aee Mon Sep 17 00:00:00 2001 From: Anton Mosich Date: Fri, 9 May 2025 21:57:47 +0200 Subject: [PATCH 87/96] vdrPlugins.fritzbox: pin boost to 1.86 --- pkgs/applications/video/vdr/plugins.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/vdr/plugins.nix b/pkgs/applications/video/vdr/plugins.nix index ef35f18b2f86..05f1b637f101 100644 --- a/pkgs/applications/video/vdr/plugins.nix +++ b/pkgs/applications/video/vdr/plugins.nix @@ -4,7 +4,7 @@ vdr, fetchFromGitHub, graphicsmagick, - boost, + boost186, libgcrypt, ncurses, callPackage, @@ -155,7 +155,7 @@ in buildInputs = [ vdr - boost + boost186 libgcrypt ]; From b1fbdbcb82bcb0710577ea0242f5e804c34d005e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 9 May 2025 19:00:17 +0000 Subject: [PATCH 88/96] snakemake: 9.3.3 -> 9.3.4 --- pkgs/by-name/sn/snakemake/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/sn/snakemake/package.nix b/pkgs/by-name/sn/snakemake/package.nix index 86e26c2b85ac..fb5946819044 100644 --- a/pkgs/by-name/sn/snakemake/package.nix +++ b/pkgs/by-name/sn/snakemake/package.nix @@ -10,14 +10,14 @@ python3Packages.buildPythonApplication rec { pname = "snakemake"; - version = "9.3.3"; + version = "9.3.4"; pyproject = true; src = fetchFromGitHub { owner = "snakemake"; repo = "snakemake"; tag = "v${version}"; - hash = "sha256-XmKwK52njnREOogI/kSIaMoZSbYmMGXiL0tPmJvVutA="; + hash = "sha256-7yU1vhPrcuZC2d15VileZJpweDhB0rEEGVHjhm6Gmgc="; }; postPatch = '' From 033c68ec6c4b7ae4e21e583a241490c41e4fdc20 Mon Sep 17 00:00:00 2001 From: Connor Baker Date: Fri, 9 May 2025 20:44:04 +0000 Subject: [PATCH 89/96] maintainers.connorbaker: update email address Signed-off-by: Connor Baker --- maintainers/maintainer-list.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 4db5037b957c..b596a1bab6e4 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -4992,7 +4992,7 @@ githubId = 15233006; }; connorbaker = { - email = "connor.baker@tweag.io"; + email = "ConnorBaker01@gmail.com"; matrix = "@connorbaker:matrix.org"; github = "ConnorBaker"; name = "Connor Baker"; From 710e189c6e3d4a8d04fd040b70353819c541080a Mon Sep 17 00:00:00 2001 From: Gabriel Smith Date: Wed, 16 Apr 2025 14:59:37 +0000 Subject: [PATCH 90/96] nixos/ups: run upsmon as non-root user "nutmon" by default NUT documentation strongly suggests running `upsmon` as a non-root user with very limited permissions. This includes only read access to `upsmon.conf`. Previously the `RUN_AS_USER` setting could be overwritten with `mkForce`, but this left the system with technically incorrect permissions on `upsmon.conf` that would prevent reloading. This patch provides a way to change the user that `upsmon` runs as while maintaining correct permissions on `upsmon.conf`. Fixes #318582 --- nixos/modules/services/monitoring/ups.nix | 46 +++++++++++++---------- 1 file changed, 27 insertions(+), 19 deletions(-) diff --git a/nixos/modules/services/monitoring/ups.nix b/nixos/modules/services/monitoring/ups.nix index b3b3632385db..a652d41587ee 100644 --- a/nixos/modules/services/monitoring/ups.nix +++ b/nixos/modules/services/monitoring/ups.nix @@ -74,9 +74,9 @@ let }; installSecrets = - source: target: secrets: + source: target: owner: secrets: pkgs.writeShellScript "installSecrets.sh" '' - install -m0600 -D ${source} "${target}" + install -m0600 -o${owner} -D ${source} "${target}" ${lib.concatLines ( lib.forEach secrets (name: '' ${pkgs.replace-secret}/bin/replace-secret \ @@ -327,6 +327,23 @@ let description = "Whether to enable `upsmon`."; }; + user = lib.mkOption { + type = lib.types.str; + default = "nutmon"; + description = '' + User to run `upsmon` as. `upsmon.conf` will have its owner set to this + user. If not specified, a default user will be created. + ''; + }; + group = lib.mkOption { + type = lib.types.str; + default = "nutmon"; + description = '' + Group for the default `nutmon` user. If the default user is created + and this is not specified, a default group will be created. + ''; + }; + monitor = lib.mkOption { type = with lib.types; attrsOf (submodule monitorOptions); default = { }; @@ -344,7 +361,6 @@ let MONITOR = NOTIFYCMD = "''${pkgs.nut}/bin/upssched"; POWERDOWNFLAG = "/run/killpower"; - RUN_AS_USER = "root"; SHUTDOWNCMD = "''${pkgs.systemd}/bin/shutdown now"; } ''; @@ -382,7 +398,6 @@ let ); NOTIFYCMD = lib.mkDefault "${pkgs.nut}/bin/upssched"; POWERDOWNFLAG = lib.mkDefault "/run/killpower"; - RUN_AS_USER = "root"; # TODO: replace 'root' by another username. SHUTDOWNCMD = lib.mkDefault "${pkgs.systemd}/bin/shutdown now"; }; }; @@ -581,7 +596,7 @@ in systemd.services.upsmon = let secrets = lib.mapAttrsToList (name: monitor: "upsmon_password_${name}") cfg.upsmon.monitor; - createUpsmonConf = installSecrets upsmonConf "/run/nut/upsmon.conf" secrets; + createUpsmonConf = installSecrets upsmonConf "/run/nut/upsmon.conf" cfg.upsmon.user secrets; in { enable = cfg.upsmon.enable; @@ -591,7 +606,7 @@ in serviceConfig = { Type = "forking"; ExecStartPre = "${createUpsmonConf}"; - ExecStart = "${pkgs.nut}/sbin/upsmon"; + ExecStart = "${pkgs.nut}/sbin/upsmon -u ${cfg.upsmon.user}"; ExecReload = "${pkgs.nut}/sbin/upsmon -c reload"; LoadCredential = lib.mapAttrsToList ( name: monitor: "upsmon_password_${name}:${monitor.passwordFile}" @@ -604,7 +619,7 @@ in systemd.services.upsd = let secrets = lib.mapAttrsToList (name: user: "upsdusers_password_${name}") cfg.users; - createUpsdUsers = installSecrets upsdUsers "/run/nut/upsd.users" secrets; + createUpsdUsers = installSecrets upsdUsers "/run/nut/upsd.users" "root" secrets; in { enable = cfg.upsd.enable; @@ -696,18 +711,11 @@ in services.udev.packages = [ pkgs.nut ]; - /* - users.users.nut = - { uid = 84; - home = "/var/lib/nut"; - createHome = true; - group = "nut"; - description = "UPnP A/V Media Server user"; - }; - - users.groups."nut" = - { gid = 84; }; - */ + users.users.nutmon = lib.mkIf (cfg.upsmon.user == "nutmon") { + isSystemUser = true; + group = cfg.upsmon.group; + }; + users.groups.nutmon = lib.mkIf (cfg.upsmon.user == "nutmon" && cfg.upsmon.group == "nutmon") { }; }; } From bf766a2d972d83ab217b95328a11db77d299485d Mon Sep 17 00:00:00 2001 From: Connor Baker Date: Fri, 9 May 2025 17:40:26 +0000 Subject: [PATCH 91/96] tree-wide: use named CUDA versions and CUDA version utilities Signed-off-by: Connor Baker --- pkgs/by-name/ca/catboost/package.nix | 2 +- pkgs/by-name/ti/tiny-cuda-nn/package.nix | 4 +-- pkgs/development/cuda-modules/aliases.nix | 14 ++++---- .../cuda-modules/cuda-samples/extension.nix | 7 ++-- .../cuda-modules/cuda-samples/generic.nix | 4 +-- .../cuda-modules/cuda/extension.nix | 6 ++-- .../cuda-modules/cudatoolkit/default.nix | 4 +-- .../cudatoolkit/redist-wrapper.nix | 6 ++-- .../cuda-modules/cusparselt/extension.nix | 11 +----- .../cuda-modules/cutensor/extension.nix | 9 +++-- .../development/cuda-modules/fixups/cudnn.nix | 4 +-- .../cuda-modules/fixups/tensorrt.nix | 8 ++--- pkgs/development/cuda-modules/flags.nix | 22 ++++++------ .../generic-builders/multiplex.nix | 6 ++-- .../cuda-modules/packages/backendStdenv.nix | 4 +-- .../cuda-modules/packages/nccl-tests.nix | 17 +++++----- .../libraries/ctranslate2/default.nix | 2 +- .../python-modules/bitsandbytes/default.nix | 10 +++--- .../python-modules/cupy/default.nix | 2 +- .../jax-cuda12-pjrt/default.nix | 5 ++- .../jax-cuda12-plugin/default.nix | 5 ++- .../python-modules/jaxlib/default.nix | 4 +-- .../python-modules/tensorflow/default.nix | 2 +- .../python-modules/torch/source/default.nix | 11 +++--- .../python-modules/vllm/default.nix | 2 +- pkgs/top-level/all-packages.nix | 34 +++++++++---------- pkgs/top-level/cuda-packages.nix | 27 ++++++++------- 27 files changed, 113 insertions(+), 119 deletions(-) diff --git a/pkgs/by-name/ca/catboost/package.nix b/pkgs/by-name/ca/catboost/package.nix index c69411830c67..d79ad9ef84cb 100644 --- a/pkgs/by-name/ca/catboost/package.nix +++ b/pkgs/by-name/ca/catboost/package.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation (finalAttrs: { shopt -s globstar for cmakelists in **/CMakeLists.*; do sed -i "s/OpenSSL::OpenSSL/OpenSSL::SSL/g" $cmakelists - ${lib.optionalString (lib.versionOlder cudaPackages.cudaVersion "11.8") '' + ${lib.optionalString (cudaPackages.cudaOlder "11.8") '' sed -i 's/-gencode=arch=compute_89,code=sm_89//g' $cmakelists sed -i 's/-gencode=arch=compute_90,code=sm_90//g' $cmakelists ''} diff --git a/pkgs/by-name/ti/tiny-cuda-nn/package.nix b/pkgs/by-name/ti/tiny-cuda-nn/package.nix index fea13b07a791..924d691e52bd 100644 --- a/pkgs/by-name/ti/tiny-cuda-nn/package.nix +++ b/pkgs/by-name/ti/tiny-cuda-nn/package.nix @@ -13,7 +13,7 @@ }: let inherit (lib) lists strings; - inherit (cudaPackages) backendStdenv cudaVersion flags; + inherit (cudaPackages) backendStdenv cudaAtLeast flags; cuda-common-redist = with cudaPackages; [ (lib.getDev cuda_cudart) # cuda_runtime.h @@ -62,7 +62,7 @@ stdenv.mkDerivation (finalAttrs: { # Remove this once a release is made with # https://github.com/NVlabs/tiny-cuda-nn/commit/78a14fe8c292a69f54e6d0d47a09f52b777127e1 - postPatch = lib.optionals (strings.versionAtLeast cudaVersion "11.0") '' + postPatch = lib.optionals (cudaAtLeast "11.0") '' substituteInPlace bindings/torch/setup.py --replace-fail \ "-std=c++14" "-std=c++17" ''; diff --git a/pkgs/development/cuda-modules/aliases.nix b/pkgs/development/cuda-modules/aliases.nix index 4e25dc44ca9a..b2bbaf68a33c 100644 --- a/pkgs/development/cuda-modules/aliases.nix +++ b/pkgs/development/cuda-modules/aliases.nix @@ -1,14 +1,16 @@ # Packages which have been deprecated or removed from cudaPackages -final: prev: +final: _: let - inherit (prev.lib) warn; - inherit (builtins) mapAttrs; - mkRenamed = oldName: { path, package }: - warn "cudaPackages.${oldName} is deprecated, use ${path} instead" package; + final.lib.warn "cudaPackages.${oldName} is deprecated, use ${path} instead" package; in -mapAttrs mkRenamed { +builtins.mapAttrs mkRenamed { # A comment to prevent empty { } from collapsing into a single line + + cudaVersion = { + path = "cudaPackages.cudaMajorMinorVersion"; + package = final.cudaMajorMinorVersion; + }; } diff --git a/pkgs/development/cuda-modules/cuda-samples/extension.nix b/pkgs/development/cuda-modules/cuda-samples/extension.nix index 0a8a3f9ff6ea..1cd9883c2123 100644 --- a/pkgs/development/cuda-modules/cuda-samples/extension.nix +++ b/pkgs/development/cuda-modules/cuda-samples/extension.nix @@ -1,5 +1,5 @@ { - cudaVersion, + cudaMajorMinorVersion, lib, stdenv, }: @@ -27,7 +27,7 @@ let # Samples are built around the CUDA Toolkit, which is not available for # aarch64. Check for both CUDA version and platform. - cudaVersionIsSupported = cudaVersionToHash ? ${cudaVersion}; + cudaVersionIsSupported = cudaVersionToHash ? ${cudaMajorMinorVersion}; platformIsSupported = hostPlatform.isx86_64; isSupported = cudaVersionIsSupported && platformIsSupported; @@ -36,8 +36,7 @@ let final: _: lib.attrsets.optionalAttrs isSupported { cuda-samples = final.callPackage ./generic.nix { - inherit cudaVersion; - hash = cudaVersionToHash.${cudaVersion}; + hash = cudaVersionToHash.${cudaMajorMinorVersion}; }; }; in diff --git a/pkgs/development/cuda-modules/cuda-samples/generic.nix b/pkgs/development/cuda-modules/cuda-samples/generic.nix index b27b993aa083..295fd55164b4 100644 --- a/pkgs/development/cuda-modules/cuda-samples/generic.nix +++ b/pkgs/development/cuda-modules/cuda-samples/generic.nix @@ -3,7 +3,7 @@ backendStdenv, cmake, cudatoolkit, - cudaVersion, + cudaMajorMinorVersion, fetchFromGitHub, fetchpatch, freeimage, @@ -20,7 +20,7 @@ backendStdenv.mkDerivation (finalAttrs: { strictDeps = true; pname = "cuda-samples"; - version = cudaVersion; + version = cudaMajorMinorVersion; src = fetchFromGitHub { owner = "NVIDIA"; diff --git a/pkgs/development/cuda-modules/cuda/extension.nix b/pkgs/development/cuda-modules/cuda/extension.nix index 4c7298bab354..09d8999270a2 100644 --- a/pkgs/development/cuda-modules/cuda/extension.nix +++ b/pkgs/development/cuda-modules/cuda/extension.nix @@ -1,4 +1,4 @@ -{ cudaVersion, lib }: +{ cudaMajorMinorVersion, lib }: let inherit (lib) attrsets modules trivial; redistName = "cuda"; @@ -23,10 +23,10 @@ let }; # Check if the current CUDA version is supported. - cudaVersionMappingExists = builtins.hasAttr cudaVersion cudaVersionMap; + cudaVersionMappingExists = builtins.hasAttr cudaMajorMinorVersion cudaVersionMap; # fullCudaVersion : String - fullCudaVersion = cudaVersionMap.${cudaVersion}; + fullCudaVersion = cudaVersionMap.${cudaMajorMinorVersion}; evaluatedModules = modules.evalModules { modules = [ diff --git a/pkgs/development/cuda-modules/cudatoolkit/default.nix b/pkgs/development/cuda-modules/cudatoolkit/default.nix index c4ec71750f40..47d905b576fb 100644 --- a/pkgs/development/cuda-modules/cudatoolkit/default.nix +++ b/pkgs/development/cuda-modules/cudatoolkit/default.nix @@ -1,5 +1,5 @@ { - cudaVersion, + cudaMajorMinorVersion, runPatches ? [ ], autoPatchelfHook, autoAddDriverRunpath, @@ -54,7 +54,7 @@ let # Version info for the classic cudatoolkit packages that contain everything that is in redist. releases = builtins.import ./releases.nix; - release = releases.${cudaVersion}; + release = releases.${cudaMajorMinorVersion}; in backendStdenv.mkDerivation rec { diff --git a/pkgs/development/cuda-modules/cudatoolkit/redist-wrapper.nix b/pkgs/development/cuda-modules/cudatoolkit/redist-wrapper.nix index b8906b3dc59b..b9a58b8d6b36 100644 --- a/pkgs/development/cuda-modules/cudatoolkit/redist-wrapper.nix +++ b/pkgs/development/cuda-modules/cudatoolkit/redist-wrapper.nix @@ -4,7 +4,7 @@ backendStdenv, cudaOlder, cudatoolkit-legacy-runfile, - cudaVersion, + cudaMajorMinorVersion, cuda_cccl ? null, cuda_cudart ? null, cuda_cuobjdump ? null, @@ -66,8 +66,8 @@ if cudaOlder "11.4" then cudatoolkit-legacy-runfile else symlinkJoin rec { - name = "cuda-merged-${cudaVersion}"; - version = cudaVersion; + name = "cuda-merged-${cudaMajorMinorVersion}"; + version = cudaMajorMinorVersion; paths = builtins.concatMap getAllOutputs allPackages; diff --git a/pkgs/development/cuda-modules/cusparselt/extension.nix b/pkgs/development/cuda-modules/cusparselt/extension.nix index 07b368c653c7..e72be0d7cb99 100644 --- a/pkgs/development/cuda-modules/cusparselt/extension.nix +++ b/pkgs/development/cuda-modules/cusparselt/extension.nix @@ -3,7 +3,7 @@ { lib, stdenv, - cudaVersion, + cudaMajorMinorVersion, flags, mkVersionedPackageName, }: @@ -54,15 +54,6 @@ let releaseGrabber ]) cusparseltVersions; - # Our cudaVersion tells us which version of CUDA we're building against. - # The subdirectories in lib/ tell us which versions of CUDA are supported. - # Typically the names will look like this: - # - # - 10.2 - # - 11 - # - 11.0 - # - 12 - # A release is supported if it has a libPath that matches our CUDA version for our platform. # LibPath are not constant across the same release -- one platform may support fewer # CUDA versions than another. diff --git a/pkgs/development/cuda-modules/cutensor/extension.nix b/pkgs/development/cuda-modules/cutensor/extension.nix index 82af5bbe48c3..deb6cc7e8e51 100644 --- a/pkgs/development/cuda-modules/cutensor/extension.nix +++ b/pkgs/development/cuda-modules/cutensor/extension.nix @@ -13,7 +13,7 @@ # - Instead of providing different releases for each version of CUDA, CuTensor has multiple subdirectories in `lib` # -- one for each version of CUDA. { - cudaVersion, + cudaMajorMinorVersion, flags, lib, mkVersionedPackageName, @@ -73,7 +73,7 @@ let releaseGrabber ]) cutensorVersions; - # Our cudaVersion tells us which version of CUDA we're building against. + # Our cudaMajorMinorVersion tells us which version of CUDA we're building against. # The subdirectories in lib/ tell us which versions of CUDA are supported. # Typically the names will look like this: # @@ -85,10 +85,9 @@ let # libPath :: String libPath = let - cudaMajorMinor = versions.majorMinor cudaVersion; - cudaMajor = versions.major cudaVersion; + cudaMajorVersion = versions.major cudaMajorMinorVersion; in - if cudaMajorMinor == "10.2" then cudaMajorMinor else cudaMajor; + if cudaMajorMinorVersion == "10.2" then cudaMajorMinorVersion else cudaMajorVersion; # A release is supported if it has a libPath that matches our CUDA version for our platform. # LibPath are not constant across the same release -- one platform may support fewer diff --git a/pkgs/development/cuda-modules/fixups/cudnn.nix b/pkgs/development/cuda-modules/fixups/cudnn.nix index f4294789732f..489142ba2d47 100644 --- a/pkgs/development/cuda-modules/fixups/cudnn.nix +++ b/pkgs/development/cuda-modules/fixups/cudnn.nix @@ -1,7 +1,7 @@ { cudaOlder, cudatoolkit, - cudaVersion, + cudaMajorMinorVersion, fetchurl, lib, libcublas ? null, # cuDNN uses CUDA Toolkit on old releases, where libcublas is not available. @@ -25,7 +25,7 @@ finalAttrs: prevAttrs: { cudaTooOld = cudaOlder finalAttrs.passthru.featureRelease.minCudaVersion; cudaTooNew = (finalAttrs.passthru.featureRelease.maxCudaVersion != null) - && strings.versionOlder finalAttrs.passthru.featureRelease.maxCudaVersion cudaVersion; + && strings.versionOlder finalAttrs.passthru.featureRelease.maxCudaVersion cudaMajorMinorVersion; in prevAttrs.badPlatformsConditions or { } // { diff --git a/pkgs/development/cuda-modules/fixups/tensorrt.nix b/pkgs/development/cuda-modules/fixups/tensorrt.nix index 02e1ad097075..a836debf0604 100644 --- a/pkgs/development/cuda-modules/fixups/tensorrt.nix +++ b/pkgs/development/cuda-modules/fixups/tensorrt.nix @@ -1,7 +1,7 @@ { cudaOlder, cudaPackages, - cudaVersion, + cudaMajorMinorVersion, lib, mkVersionedPackageName, patchelf, @@ -30,7 +30,7 @@ finalAttrs: prevAttrs: { cudaTooOld = cudaOlder finalAttrs.passthru.featureRelease.minCudaVersion; cudaTooNew = (finalAttrs.passthru.featureRelease.maxCudaVersion != null) - && strings.versionOlder finalAttrs.passthru.featureRelease.maxCudaVersion cudaVersion; + && strings.versionOlder finalAttrs.passthru.featureRelease.maxCudaVersion cudaMajorMinorVersion; cudnnVersionIsSpecified = finalAttrs.passthru.featureRelease.cudnnVersion != null; cudnnVersionSpecified = versions.majorMinor finalAttrs.passthru.featureRelease.cudnnVersion; cudnnVersionProvided = versions.majorMinor finalAttrs.passthru.cudnn.version; @@ -52,7 +52,7 @@ finalAttrs: prevAttrs: { inherit (finalAttrs.passthru.redistribRelease) hash; message = '' To use the TensorRT derivation, you must join the NVIDIA Developer Program and - download the ${finalAttrs.version} TAR package for CUDA ${cudaVersion} from + download the ${finalAttrs.version} TAR package for CUDA ${cudaMajorMinorVersion} from ${finalAttrs.meta.homepage}. Once you have downloaded the file, add it to the store with the following @@ -96,7 +96,7 @@ finalAttrs: prevAttrs: { ''; passthru = prevAttrs.passthru or { } // { - useCudatoolkitRunfile = strings.versionOlder cudaVersion "11.3.999"; + useCudatoolkitRunfile = strings.versionOlder cudaMajorMinorVersion "11.3.999"; # The CUDNN used with TensorRT. # If null, the default cudnn derivation will be used. # If a version is specified, the cudnn derivation with that version will be used, diff --git a/pkgs/development/cuda-modules/flags.nix b/pkgs/development/cuda-modules/flags.nix index 93952a66216b..980f33c7863f 100644 --- a/pkgs/development/cuda-modules/flags.nix +++ b/pkgs/development/cuda-modules/flags.nix @@ -6,7 +6,7 @@ cudaCapabilities ? (config.cudaCapabilities or [ ]), cudaForwardCompat ? (config.cudaForwardCompat or true), lib, - cudaVersion, + cudaMajorMinorVersion, stdenv, # gpus :: List Gpu gpus, @@ -44,9 +44,9 @@ let gpu: let inherit (gpu) minCudaVersion maxCudaVersion; - lowerBoundSatisfied = strings.versionAtLeast cudaVersion minCudaVersion; + lowerBoundSatisfied = strings.versionAtLeast cudaMajorMinorVersion minCudaVersion; upperBoundSatisfied = - (maxCudaVersion == null) || !(strings.versionOlder maxCudaVersion cudaVersion); + (maxCudaVersion == null) || !(strings.versionOlder maxCudaVersion cudaMajorMinorVersion); in lowerBoundSatisfied && upperBoundSatisfied; @@ -57,7 +57,7 @@ let let inherit (gpu) dontDefaultAfter isJetson; newGpu = dontDefaultAfter == null; - recentGpu = newGpu || strings.versionAtLeast dontDefaultAfter cudaVersion; + recentGpu = newGpu || strings.versionAtLeast dontDefaultAfter cudaMajorMinorVersion; in recentGpu && !isJetson; @@ -289,12 +289,14 @@ assert }; actualWrapped = (builtins.tryEval (builtins.deepSeq actual actual)).value; in - asserts.assertMsg ((strings.versionAtLeast cudaVersion "11.2") -> (expected == actualWrapped)) '' - This test should only fail when using a version of CUDA older than 11.2, the first to support - 8.6. - Expected: ${builtins.toJSON expected} - Actual: ${builtins.toJSON actualWrapped} - ''; + asserts.assertMsg + ((strings.versionAtLeast cudaMajorMinorVersion "11.2") -> (expected == actualWrapped)) + '' + This test should only fail when using a version of CUDA older than 11.2, the first to support + 8.6. + Expected: ${builtins.toJSON expected} + Actual: ${builtins.toJSON actualWrapped} + ''; # Check mixed Jetson and non-Jetson devices assert let diff --git a/pkgs/development/cuda-modules/generic-builders/multiplex.nix b/pkgs/development/cuda-modules/generic-builders/multiplex.nix index 5d3e8d03156e..187da29e2ee1 100644 --- a/pkgs/development/cuda-modules/generic-builders/multiplex.nix +++ b/pkgs/development/cuda-modules/generic-builders/multiplex.nix @@ -1,7 +1,7 @@ { # callPackage-provided arguments lib, - cudaVersion, + cudaMajorMinorVersion, flags, stdenv, # Expected to be passed by the caller @@ -69,8 +69,8 @@ let isSupported = package: redistArch == package.redistArch - && strings.versionAtLeast cudaVersion package.minCudaVersion - && strings.versionAtLeast package.maxCudaVersion cudaVersion; + && strings.versionAtLeast cudaMajorMinorVersion package.minCudaVersion + && strings.versionAtLeast package.maxCudaVersion cudaMajorMinorVersion; # Get all of the packages for our given platform. # redistArch :: String diff --git a/pkgs/development/cuda-modules/packages/backendStdenv.nix b/pkgs/development/cuda-modules/packages/backendStdenv.nix index 9fd705f98193..b3595835fe38 100644 --- a/pkgs/development/cuda-modules/packages/backendStdenv.nix +++ b/pkgs/development/cuda-modules/packages/backendStdenv.nix @@ -7,7 +7,7 @@ # E.g. for cudaPackages_11_8 we use gcc11 with gcc12's libstdc++ # Cf. https://github.com/NixOS/nixpkgs/pull/218265 for context { - cudaVersion, + cudaMajorMinorVersion, lib, nvccCompatibilities, pkgs, @@ -16,7 +16,7 @@ }: let - gccMajorVersion = nvccCompatibilities.${cudaVersion}.gccMaxMajorVersion; + gccMajorVersion = nvccCompatibilities.${cudaMajorMinorVersion}.gccMaxMajorVersion; cudaStdenv = stdenvAdapters.useLibsFrom stdenv pkgs."gcc${gccMajorVersion}Stdenv"; passthruExtra = { # cudaPackages.backendStdenv.nixpkgsCompatibleLibstdcxx has been removed, diff --git a/pkgs/development/cuda-modules/packages/nccl-tests.nix b/pkgs/development/cuda-modules/packages/nccl-tests.nix index 0f4145ba5a0a..84f048a706ef 100644 --- a/pkgs/development/cuda-modules/packages/nccl-tests.nix +++ b/pkgs/development/cuda-modules/packages/nccl-tests.nix @@ -17,8 +17,9 @@ let cuda_cccl cuda_cudart cuda_nvcc + cudaAtLeast + cudaOlder cudatoolkit - cudaVersion nccl ; in @@ -43,25 +44,25 @@ backendStdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ which ] - ++ lib.optionals (lib.versionOlder cudaVersion "11.4") [ cudatoolkit ] - ++ lib.optionals (lib.versionAtLeast cudaVersion "11.4") [ cuda_nvcc ]; + ++ lib.optionals (cudaOlder "11.4") [ cudatoolkit ] + ++ lib.optionals (cudaAtLeast "11.4") [ cuda_nvcc ]; buildInputs = [ nccl ] - ++ lib.optionals (lib.versionOlder cudaVersion "11.4") [ cudatoolkit ] - ++ lib.optionals (lib.versionAtLeast cudaVersion "11.4") [ + ++ lib.optionals (cudaOlder "11.4") [ cudatoolkit ] + ++ lib.optionals (cudaAtLeast "11.4") [ cuda_nvcc # crt/host_config.h cuda_cudart ] - ++ lib.optionals (lib.versionAtLeast cudaVersion "12.0") [ + ++ lib.optionals (cudaAtLeast "12.0") [ cuda_cccl # ] ++ lib.optionals mpiSupport [ mpi ]; makeFlags = [ "NCCL_HOME=${nccl}" ] - ++ lib.optionals (lib.versionOlder cudaVersion "11.4") [ "CUDA_HOME=${cudatoolkit}" ] - ++ lib.optionals (lib.versionAtLeast cudaVersion "11.4") [ "CUDA_HOME=${cuda_nvcc}" ] + ++ lib.optionals (cudaOlder "11.4") [ "CUDA_HOME=${cudatoolkit}" ] + ++ lib.optionals (cudaAtLeast "11.4") [ "CUDA_HOME=${cuda_nvcc}" ] ++ lib.optionals mpiSupport [ "MPI=1" ]; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/ctranslate2/default.nix b/pkgs/development/libraries/ctranslate2/default.nix index f90b17c72c05..2850a1890eb5 100644 --- a/pkgs/development/libraries/ctranslate2/default.nix +++ b/pkgs/development/libraries/ctranslate2/default.nix @@ -98,6 +98,6 @@ stdenv.mkDerivation rec { hexa misuzu ]; - broken = (lib.versionOlder cudaPackages.cudaVersion "11.4") || !(withCuDNN -> withCUDA); + broken = (cudaPackages.cudaOlder "11.4") || !(withCuDNN -> withCUDA); }; } diff --git a/pkgs/development/python-modules/bitsandbytes/default.nix b/pkgs/development/python-modules/bitsandbytes/default.nix index 3dd4c485f7ef..49bc8150d6e4 100644 --- a/pkgs/development/python-modules/bitsandbytes/default.nix +++ b/pkgs/development/python-modules/bitsandbytes/default.nix @@ -14,9 +14,9 @@ let version = "0.45.1"; inherit (torch) cudaPackages cudaSupport; - inherit (cudaPackages) cudaVersion; + inherit (cudaPackages) cudaMajorMinorVersion; - cudaVersionString = lib.replaceStrings [ "." ] [ "" ] (lib.versions.majorMinor cudaVersion); + cudaMajorMinorVersionString = lib.replaceStrings [ "." ] [ "" ] cudaMajorMinorVersion; # NOTE: torchvision doesn't use cudnn; torch does! # For this reason it is not included. @@ -32,7 +32,7 @@ let ]; cuda-native-redist = symlinkJoin { - name = "cuda-native-redist-${cudaVersion}"; + name = "cuda-native-redist-${cudaMajorMinorVersion}"; paths = with cudaPackages; [ @@ -45,7 +45,7 @@ let }; cuda-redist = symlinkJoin { - name = "cuda-redist-${cudaVersion}"; + name = "cuda-redist-${cudaMajorMinorVersion}"; paths = cuda-common-redist; }; in @@ -73,7 +73,7 @@ buildPythonPackage { --replace-fail "if cuda_specs:" "if True:" \ --replace-fail \ "cuda_binary_path = get_cuda_bnb_library_path(cuda_specs)" \ - "cuda_binary_path = PACKAGE_DIR / 'libbitsandbytes_cuda${cudaVersionString}.so'" + "cuda_binary_path = PACKAGE_DIR / 'libbitsandbytes_cuda${cudaMajorMinorVersionString}.so'" ''; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/cupy/default.nix b/pkgs/development/python-modules/cupy/default.nix index c624ce1742ab..a8f0cde1f0ca 100644 --- a/pkgs/development/python-modules/cupy/default.nix +++ b/pkgs/development/python-modules/cupy/default.nix @@ -45,7 +45,7 @@ let # cusparselt ]; cudatoolkit-joined = symlinkJoin { - name = "cudatoolkit-joined-${cudaPackages.cudaVersion}"; + name = "cudatoolkit-joined-${cudaPackages.cudaMajorMinorVersion}"; paths = outpaths ++ lib.concatMap (f: lib.map f outpaths) [ diff --git a/pkgs/development/python-modules/jax-cuda12-pjrt/default.nix b/pkgs/development/python-modules/jax-cuda12-pjrt/default.nix index 160158d0ed39..5ab1564d9049 100644 --- a/pkgs/development/python-modules/jax-cuda12-pjrt/default.nix +++ b/pkgs/development/python-modules/jax-cuda12-pjrt/default.nix @@ -13,7 +13,7 @@ }: let inherit (jaxlib) version; - inherit (cudaPackages) cudaVersion; + inherit (cudaPackages) cudaAtLeast; cudaLibPath = lib.makeLibraryPath ( with cudaPackages; @@ -101,7 +101,6 @@ buildPythonPackage rec { platforms = lib.platforms.linux; # see CUDA compatibility matrix # https://jax.readthedocs.io/en/latest/installation.html#pip-installation-nvidia-gpu-cuda-installed-locally-harder - broken = - !(lib.versionAtLeast cudaVersion "12.1") || !(lib.versionAtLeast cudaPackages.cudnn.version "9.1"); + broken = !(cudaAtLeast "12.1") || !(lib.versionAtLeast cudaPackages.cudnn.version "9.1"); }; } diff --git a/pkgs/development/python-modules/jax-cuda12-plugin/default.nix b/pkgs/development/python-modules/jax-cuda12-plugin/default.nix index 3103feb271e4..c7d55d07d594 100644 --- a/pkgs/development/python-modules/jax-cuda12-plugin/default.nix +++ b/pkgs/development/python-modules/jax-cuda12-plugin/default.nix @@ -13,7 +13,7 @@ }: let inherit (jaxlib) version; - inherit (cudaPackages) cudaVersion; + inherit (cudaPackages) cudaAtLeast; inherit (jax-cuda12-pjrt) cudaLibPath; getSrcFromPypi = @@ -133,7 +133,6 @@ buildPythonPackage { platforms = lib.platforms.linux; # see CUDA compatibility matrix # https://jax.readthedocs.io/en/latest/installation.html#pip-installation-nvidia-gpu-cuda-installed-locally-harder - broken = - !(lib.versionAtLeast cudaVersion "12.1") || !(lib.versionAtLeast cudaPackages.cudnn.version "9.1"); + broken = !(cudaAtLeast "12.1") || !(lib.versionAtLeast cudaPackages.cudnn.version "9.1"); }; } diff --git a/pkgs/development/python-modules/jaxlib/default.nix b/pkgs/development/python-modules/jaxlib/default.nix index c2c06e7385bc..e54c27d317ed 100644 --- a/pkgs/development/python-modules/jaxlib/default.nix +++ b/pkgs/development/python-modules/jaxlib/default.nix @@ -53,7 +53,7 @@ let inherit (cudaPackages) cudaFlags - cudaVersion + cudaMajorMinorVersion nccl ; @@ -317,7 +317,7 @@ let build --action_env CUDA_TOOLKIT_PATH="${cuda_build_deps_joined}" build --action_env CUDNN_INSTALL_PATH="${cudnnMerged}" build --action_env TF_CUDA_PATHS="${cuda_build_deps_joined},${cudnnMerged},${lib.getDev nccl}" - build --action_env TF_CUDA_VERSION="${lib.versions.majorMinor cudaVersion}" + build --action_env TF_CUDA_VERSION="${cudaMajorMinorVersion}" build --action_env TF_CUDNN_VERSION="${lib.versions.major cudaPackages.cudnn.version}" build:cuda --action_env TF_CUDA_COMPUTE_CAPABILITIES="${builtins.concatStringsSep "," cudaFlags.realArches}" '' diff --git a/pkgs/development/python-modules/tensorflow/default.nix b/pkgs/development/python-modules/tensorflow/default.nix index f378389fc45f..7c67fbd8792a 100644 --- a/pkgs/development/python-modules/tensorflow/default.nix +++ b/pkgs/development/python-modules/tensorflow/default.nix @@ -149,7 +149,7 @@ let ]; cudatoolkitDevMerged = symlinkJoin { - name = "cuda-${cudaPackages.cudaVersion}-dev-merged"; + name = "cuda-${cudaPackages.cudaMajorMinorVersion}-dev-merged"; paths = lib.concatMap (p: [ (lib.getBin p) (lib.getDev p) diff --git a/pkgs/development/python-modules/torch/source/default.nix b/pkgs/development/python-modules/torch/source/default.nix index 187d7821b2cd..05df9deab01c 100644 --- a/pkgs/development/python-modules/torch/source/default.nix +++ b/pkgs/development/python-modules/torch/source/default.nix @@ -232,7 +232,8 @@ let # effectiveMagma.cudaPackages, making torch too strict in cudaPackages. # In particular, this triggered warnings from cuda's `aliases.nix` "Magma cudaPackages does not match cudaPackages" = - cudaSupport && (effectiveMagma.cudaPackages.cudaVersion != cudaPackages.cudaVersion); + cudaSupport + && (effectiveMagma.cudaPackages.cudaMajorMinorVersion != cudaPackages.cudaMajorMinorVersion); }; unroll-src = writeShellScript "unroll-src" '' @@ -414,12 +415,12 @@ buildPythonPackage rec { [ (lib.cmakeFeature "PYTHON_SIX_SOURCE_DIR" "${six.src}") # (lib.cmakeBool "CMAKE_FIND_DEBUG_MODE" true) - (lib.cmakeFeature "CUDAToolkit_VERSION" cudaPackages.cudaVersion) + (lib.cmakeFeature "CUDAToolkit_VERSION" cudaPackages.cudaMajorMinorVersion) ] ++ lib.optionals cudaSupport [ # Unbreaks version discovery in enable_language(CUDA) when wrapping nvcc with ccache # Cf. https://gitlab.kitware.com/cmake/cmake/-/issues/26363 - (lib.cmakeFeature "CMAKE_CUDA_COMPILER_TOOLKIT_VERSION" cudaPackages.cudaVersion) + (lib.cmakeFeature "CMAKE_CUDA_COMPILER_TOOLKIT_VERSION" cudaPackages.cudaMajorMinorVersion) ]; preBuild = '' @@ -529,10 +530,10 @@ buildPythonPackage rec { # Some platforms do not support NCCL (i.e., Jetson) nccl # Provides nccl.h AND a static copy of NCCL! ] - ++ lists.optionals (strings.versionOlder cudaVersion "11.8") [ + ++ lists.optionals (cudaOlder "11.8") [ cuda_nvprof # ] - ++ lists.optionals (strings.versionAtLeast cudaVersion "11.8") [ + ++ lists.optionals (cudaAtLeast "11.8") [ cuda_profiler_api # ] ) diff --git a/pkgs/development/python-modules/vllm/default.nix b/pkgs/development/python-modules/vllm/default.nix index 187f2884d97d..973268de510b 100644 --- a/pkgs/development/python-modules/vllm/default.nix +++ b/pkgs/development/python-modules/vllm/default.nix @@ -379,7 +379,7 @@ buildPythonPackage rec { (lib.cmakeFeature "CUTLASS_NVCC_ARCHS_ENABLED" "${cudaPackages.cudaFlags.cmakeCudaArchitecturesString }") (lib.cmakeFeature "CUDA_TOOLKIT_ROOT_DIR" "${symlinkJoin { - name = "cuda-merged-${cudaPackages.cudaVersion}"; + name = "cuda-merged-${cudaPackages.cudaMajorMinorVersion}"; paths = builtins.concatMap getAllOutputs mergedCudaLibraries; }}") (lib.cmakeFeature "CAFFE2_USE_CUDNN" "ON") diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 73cf4369dcba..9538b5fb347f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2745,25 +2745,25 @@ with pkgs; cron = isc-cron; - cudaPackages_11_0 = callPackage ./cuda-packages.nix { cudaVersion = "11.0"; }; - cudaPackages_11_1 = callPackage ./cuda-packages.nix { cudaVersion = "11.1"; }; - cudaPackages_11_2 = callPackage ./cuda-packages.nix { cudaVersion = "11.2"; }; - cudaPackages_11_3 = callPackage ./cuda-packages.nix { cudaVersion = "11.3"; }; - cudaPackages_11_4 = callPackage ./cuda-packages.nix { cudaVersion = "11.4"; }; - cudaPackages_11_5 = callPackage ./cuda-packages.nix { cudaVersion = "11.5"; }; - cudaPackages_11_6 = callPackage ./cuda-packages.nix { cudaVersion = "11.6"; }; - cudaPackages_11_7 = callPackage ./cuda-packages.nix { cudaVersion = "11.7"; }; - cudaPackages_11_8 = callPackage ./cuda-packages.nix { cudaVersion = "11.8"; }; + cudaPackages_11_0 = callPackage ./cuda-packages.nix { cudaMajorMinorVersion = "11.0"; }; + cudaPackages_11_1 = callPackage ./cuda-packages.nix { cudaMajorMinorVersion = "11.1"; }; + cudaPackages_11_2 = callPackage ./cuda-packages.nix { cudaMajorMinorVersion = "11.2"; }; + cudaPackages_11_3 = callPackage ./cuda-packages.nix { cudaMajorMinorVersion = "11.3"; }; + cudaPackages_11_4 = callPackage ./cuda-packages.nix { cudaMajorMinorVersion = "11.4"; }; + cudaPackages_11_5 = callPackage ./cuda-packages.nix { cudaMajorMinorVersion = "11.5"; }; + cudaPackages_11_6 = callPackage ./cuda-packages.nix { cudaMajorMinorVersion = "11.6"; }; + cudaPackages_11_7 = callPackage ./cuda-packages.nix { cudaMajorMinorVersion = "11.7"; }; + cudaPackages_11_8 = callPackage ./cuda-packages.nix { cudaMajorMinorVersion = "11.8"; }; cudaPackages_11 = recurseIntoAttrs cudaPackages_11_8; - cudaPackages_12_0 = callPackage ./cuda-packages.nix { cudaVersion = "12.0"; }; - cudaPackages_12_1 = callPackage ./cuda-packages.nix { cudaVersion = "12.1"; }; - cudaPackages_12_2 = callPackage ./cuda-packages.nix { cudaVersion = "12.2"; }; - cudaPackages_12_3 = callPackage ./cuda-packages.nix { cudaVersion = "12.3"; }; - cudaPackages_12_4 = callPackage ./cuda-packages.nix { cudaVersion = "12.4"; }; - cudaPackages_12_5 = callPackage ./cuda-packages.nix { cudaVersion = "12.5"; }; - cudaPackages_12_6 = callPackage ./cuda-packages.nix { cudaVersion = "12.6"; }; - cudaPackages_12_8 = callPackage ./cuda-packages.nix { cudaVersion = "12.8"; }; + cudaPackages_12_0 = callPackage ./cuda-packages.nix { cudaMajorMinorVersion = "12.0"; }; + cudaPackages_12_1 = callPackage ./cuda-packages.nix { cudaMajorMinorVersion = "12.1"; }; + cudaPackages_12_2 = callPackage ./cuda-packages.nix { cudaMajorMinorVersion = "12.2"; }; + cudaPackages_12_3 = callPackage ./cuda-packages.nix { cudaMajorMinorVersion = "12.3"; }; + cudaPackages_12_4 = callPackage ./cuda-packages.nix { cudaMajorMinorVersion = "12.4"; }; + cudaPackages_12_5 = callPackage ./cuda-packages.nix { cudaMajorMinorVersion = "12.5"; }; + cudaPackages_12_6 = callPackage ./cuda-packages.nix { cudaMajorMinorVersion = "12.6"; }; + cudaPackages_12_8 = callPackage ./cuda-packages.nix { cudaMajorMinorVersion = "12.8"; }; cudaPackages_12 = cudaPackages_12_8; # Latest supported by cudnn cudaPackages = recurseIntoAttrs cudaPackages_12; diff --git a/pkgs/top-level/cuda-packages.nix b/pkgs/top-level/cuda-packages.nix index 89315d25ac39..d0d64f69dc71 100644 --- a/pkgs/top-level/cuda-packages.nix +++ b/pkgs/top-level/cuda-packages.nix @@ -22,7 +22,7 @@ # I've (@connorbaker) attempted to do that, though I'm unsure of how this will interact with overrides. { config, - cudaVersion, + cudaMajorMinorVersion, lib, newScope, pkgs, @@ -44,7 +44,7 @@ let flags = import ../development/cuda-modules/flags.nix { inherit config - cudaVersion + cudaMajorMinorVersion gpus lib stdenv @@ -56,7 +56,7 @@ let passthruFunction = final: { inherit - cudaVersion + cudaMajorMinorVersion fixups flags gpus @@ -64,10 +64,9 @@ let nvccCompatibilities pkgs ; - cudaMajorVersion = versions.major cudaVersion; - cudaMajorMinorVersion = versions.majorMinor cudaVersion; - cudaOlder = strings.versionOlder cudaVersion; - cudaAtLeast = strings.versionAtLeast cudaVersion; + cudaMajorVersion = versions.major cudaMajorMinorVersion; + cudaOlder = strings.versionOlder cudaMajorMinorVersion; + cudaAtLeast = strings.versionAtLeast cudaMajorMinorVersion; # NOTE: mkVersionedPackageName is an internal, implementation detail and should not be relied on by outside consumers. # It may be removed in the future. @@ -144,10 +143,10 @@ let directory = ../development/cuda-modules/packages; } ) - (import ../development/cuda-modules/cuda/extension.nix { inherit cudaVersion lib; }) + (import ../development/cuda-modules/cuda/extension.nix { inherit cudaMajorMinorVersion lib; }) (import ../development/cuda-modules/generic-builders/multiplex.nix { inherit - cudaVersion + cudaMajorMinorVersion flags lib mkVersionedPackageName @@ -160,7 +159,7 @@ let }) (import ../development/cuda-modules/cutensor/extension.nix { inherit - cudaVersion + cudaMajorMinorVersion flags lib mkVersionedPackageName @@ -169,7 +168,7 @@ let }) (import ../development/cuda-modules/cusparselt/extension.nix { inherit - cudaVersion + cudaMajorMinorVersion flags lib mkVersionedPackageName @@ -178,7 +177,7 @@ let }) (import ../development/cuda-modules/generic-builders/multiplex.nix { inherit - cudaVersion + cudaMajorMinorVersion flags lib mkVersionedPackageName @@ -189,7 +188,9 @@ let releasesModule = ../development/cuda-modules/tensorrt/releases.nix; shimsFn = ../development/cuda-modules/tensorrt/shims.nix; }) - (import ../development/cuda-modules/cuda-samples/extension.nix { inherit cudaVersion lib stdenv; }) + (import ../development/cuda-modules/cuda-samples/extension.nix { + inherit cudaMajorMinorVersion lib stdenv; + }) (import ../development/cuda-modules/cuda-library-samples/extension.nix { inherit lib stdenv; }) ] ++ lib.optionals config.allowAliases [ (import ../development/cuda-modules/aliases.nix) ] From 69ca7055ae35b751e62099e51200fcb280b8f448 Mon Sep 17 00:00:00 2001 From: Pierre Villemot Date: Fri, 9 May 2025 00:26:08 +0200 Subject: [PATCH 92/96] Install dllcamlzip.so into the stublibs directory camlzip installs this file in `site-lib/zip` but dune expects to find it in `site-lib/stublibs`. --- pkgs/development/ocaml-modules/camlzip/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/ocaml-modules/camlzip/default.nix b/pkgs/development/ocaml-modules/camlzip/default.nix index e36453d216fe..5c7158673043 100644 --- a/pkgs/development/ocaml-modules/camlzip/default.nix +++ b/pkgs/development/ocaml-modules/camlzip/default.nix @@ -63,8 +63,6 @@ stdenv.mkDerivation { inherit (param) patches; - createFindlibDestdir = true; - postPatch = param.postPatchInit + '' @@ -78,6 +76,10 @@ stdenv.mkDerivation { "allopt" ]; + preInstall = '' + mkdir -p $out/lib/ocaml/${ocaml.version}/site-lib/stublibs + ''; + postInstall = '' ln -s $out/lib/ocaml/${ocaml.version}/site-lib/{,caml}zip ''; From 030575ecb20dc23ba3b0fcdc7e53bf746d3f06a3 Mon Sep 17 00:00:00 2001 From: Connor Baker Date: Fri, 9 May 2025 20:14:26 +0000 Subject: [PATCH 93/96] cuda-modules: fix and clean up multiplex builder package selection logic Signed-off-by: Connor Baker --- .../generic-builders/multiplex.nix | 104 +++++++++--------- 1 file changed, 50 insertions(+), 54 deletions(-) diff --git a/pkgs/development/cuda-modules/generic-builders/multiplex.nix b/pkgs/development/cuda-modules/generic-builders/multiplex.nix index 187da29e2ee1..3e2958449dc0 100644 --- a/pkgs/development/cuda-modules/generic-builders/multiplex.nix +++ b/pkgs/development/cuda-modules/generic-builders/multiplex.nix @@ -30,16 +30,7 @@ shimsFn ? (throw "shimsFn must be provided"), }: let - inherit (lib) - attrsets - lists - modules - strings - ; - - inherit (stdenv) hostPlatform; - - evaluatedModules = modules.evalModules { + evaluatedModules = lib.modules.evalModules { modules = [ ../modules releasesModule @@ -50,49 +41,55 @@ let # - Releases: ../modules/${pname}/releases/releases.nix # - Package: ../modules/${pname}/releases/package.nix - # FIXME: do this at the module system level - propagatePlatforms = lib.mapAttrs ( - redistArch: packages: map (p: { inherit redistArch; } // p) packages - ); + # redistArch :: String + # Value is `"unsupported"` if the platform is not supported. + redistArch = flags.getRedistArch stdenv.hostPlatform.system; - # All releases across all platforms + # Check whether a package supports our CUDA version. + # satisfiesCudaVersion :: Package -> Bool + satisfiesCudaVersion = + package: + lib.versionAtLeast cudaMajorMinorVersion package.minCudaVersion + && lib.versionAtLeast package.maxCudaVersion cudaMajorMinorVersion; + + # Releases for our platform and CUDA version. # See ../modules/${pname}/releases/releases.nix - releaseSets = propagatePlatforms evaluatedModules.config.${pname}.releases; + # allPackages :: List Package + allPackages = lib.filter satisfiesCudaVersion ( + evaluatedModules.config.${pname}.releases.${redistArch} or [ ] + ); # Compute versioned attribute name to be used in this package set # Patch version changes should not break the build, so we only use major and minor # computeName :: Package -> String - computeName = { version, ... }: mkVersionedPackageName pname version; + computeName = package: mkVersionedPackageName pname package.version; - # Check whether a package supports our CUDA version and platform. - # isSupported :: Package -> Bool - isSupported = - package: - redistArch == package.redistArch - && strings.versionAtLeast cudaMajorMinorVersion package.minCudaVersion - && strings.versionAtLeast package.maxCudaVersion cudaMajorMinorVersion; - - # Get all of the packages for our given platform. - # redistArch :: String - # Value is `"unsupported"` if the platform is not supported. - redistArch = flags.getRedistArch hostPlatform.system; - - preferable = - p1: p2: (isSupported p2 -> isSupported p1) && (strings.versionOlder p2.version p1.version); - - # All the supported packages we can build for our platform. - # perSystemReleases :: List Package - allReleases = lib.pipe releaseSets [ - (lib.attrValues) - (lists.flatten) - (lib.groupBy (p: lib.versions.majorMinor p.version)) - (lib.mapAttrs (_: builtins.sort preferable)) - (lib.mapAttrs (_: lib.take 1)) - (lib.attrValues) - (lib.concatMap lib.trivial.id) - ]; - - newest = builtins.head (builtins.sort preferable allReleases); + # The newest package for each major-minor version, with newest first. + # newestPackages :: List Package + newestPackages = + let + newestForEachMajorMinorVersion = lib.foldl' ( + newestPackages: package: + let + majorMinorVersion = lib.versions.majorMinor package.version; + existingPackage = newestPackages.${majorMinorVersion} or null; + in + newestPackages + // { + ${majorMinorVersion} = + # Only keep the existing package if it is newer than the one we are considering. + if existingPackage != null && lib.versionOlder package.version existingPackage.version then + existingPackage + else + package; + } + ) { } allPackages; + in + # Sort the packages by version so the newest is first. + # NOTE: builtins.sort requires a strict weak ordering, so we must use versionOlder rather than versionAtLeast. + lib.sort (p1: p2: lib.versionOlder p2.version p1.version) ( + lib.attrValues newestForEachMajorMinorVersion + ); extension = final: _: @@ -102,25 +99,24 @@ let buildPackage = package: let - shims = final.callPackage shimsFn { - inherit package; - inherit (package) redistArch; - }; + shims = final.callPackage shimsFn { inherit package redistArch; }; name = computeName package; drv = final.callPackage ./manifest.nix { inherit pname redistName; inherit (shims) redistribRelease featureRelease; }; in - attrsets.nameValuePair name drv; + lib.nameValuePair name drv; # versionedDerivations :: AttrSet Derivation - versionedDerivations = builtins.listToAttrs (lists.map buildPackage allReleases); + versionedDerivations = builtins.listToAttrs (lib.map buildPackage newestPackages); defaultDerivation = { - ${pname} = (buildPackage newest).value; + ${pname} = (buildPackage (lib.head newestPackages)).value; }; in - versionedDerivations // defaultDerivation; + # NOTE: Must condition on the length of newestPackages to avoid non-total function lib.head aborting if + # newestPackages is empty. + lib.optionalAttrs (lib.length newestPackages > 0) (versionedDerivations // defaultDerivation); in extension From 5d69558f0de61336e028a5f117e8d9ea65133b59 Mon Sep 17 00:00:00 2001 From: K900 Date: Sat, 10 May 2025 00:50:36 +0300 Subject: [PATCH 94/96] Revert "nixos/udev: verify udev rules using udevadm" --- nixos/modules/services/hardware/udev.nix | 9 --------- 1 file changed, 9 deletions(-) diff --git a/nixos/modules/services/hardware/udev.nix b/nixos/modules/services/hardware/udev.nix index b122c1f65807..1284dc86f0a7 100644 --- a/nixos/modules/services/hardware/udev.nix +++ b/nixos/modules/services/hardware/udev.nix @@ -55,10 +55,6 @@ let preferLocalBuild = true; allowSubstitutes = false; packages = lib.unique (map toString udevPackages); - - nativeBuildInputs = [ - pkgs.systemdMinimal - ]; } '' mkdir -p $out @@ -151,11 +147,6 @@ let exit 1 fi - # Verify all the udev rules - echo "Verifying udev rules using udevadm verify..." - udevadm verify --resolve-names=never --no-style $out - echo "OK" - # If auto-configuration is disabled, then remove # udev's 80-drivers.rules file, which contains rules for # automatically calling modprobe. From 2003eb30e4ce960b9146b370445dd5bd4e53b873 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 9 May 2025 18:26:20 +0200 Subject: [PATCH 95/96] home-assistant: 2025.5.0 -> 2025.5.1 https://github.com/home-assistant/core/releases/tag/2025.5.1 --- pkgs/servers/home-assistant/component-packages.nix | 2 +- pkgs/servers/home-assistant/default.nix | 13 +++---------- pkgs/servers/home-assistant/frontend.nix | 4 ++-- 3 files changed, 6 insertions(+), 13 deletions(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index aea580836e7b..c30d27c73863 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -2,7 +2,7 @@ # Do not edit! { - version = "2025.5.0"; + version = "2025.5.1"; components = { "3_day_blinds" = ps: with ps; [ diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index d9a3b2049738..a64e1de81eb6 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -3,7 +3,6 @@ lib, callPackage, fetchFromGitHub, - fetchpatch, fetchPypi, python313, replaceVars, @@ -368,7 +367,7 @@ let extraBuildInputs = extraPackages python.pkgs; # Don't forget to run update-component-packages.py after updating - hassVersion = "2025.5.0"; + hassVersion = "2025.5.1"; in python.pkgs.buildPythonApplication rec { @@ -389,13 +388,13 @@ python.pkgs.buildPythonApplication rec { owner = "home-assistant"; repo = "core"; tag = version; - hash = "sha256-aypBPEI9AOAW9BUkcjJtXa9ssLo4jwEeX47m8320/Gg="; + hash = "sha256-/ItMm6/SV0MazK16NfW53XPcIV7ERUUabjcwHBC4c7Y="; }; # Secondary source is pypi sdist for translations sdist = fetchPypi { inherit pname version; - hash = "sha256-7bRBKCchBjAKmW4fjSzShr1RdNRQ677Dd1FXW6sqOQQ="; + hash = "sha256-zllQ0h1Ws+HNyfBvAAoKtovQtwkr0fNNtnF2pAjRrqM="; }; build-system = with python.pkgs; [ @@ -411,12 +410,6 @@ python.pkgs.buildPythonApplication rec { # leave this in, so users don't have to constantly update their downstream patch handling patches = [ - (fetchpatch { - name = "fix-point-import-error.patch"; - url = "https://github.com/home-assistant/core/commit/3c4c3dc08e306b75dce486f5f5236a731fd04cf4.patch"; - hash = "sha256-ke04kJWuBHMANVZo75QL5QwU51DZtO4FBBNu4Szu9q8="; - }) - # Follow symlinks in /var/lib/hass/www ./patches/static-follow-symlinks.patch diff --git a/pkgs/servers/home-assistant/frontend.nix b/pkgs/servers/home-assistant/frontend.nix index 801fbda96548..2ec702c8272b 100644 --- a/pkgs/servers/home-assistant/frontend.nix +++ b/pkgs/servers/home-assistant/frontend.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { # the frontend version corresponding to a specific home-assistant version can be found here # https://github.com/home-assistant/home-assistant/blob/master/homeassistant/components/frontend/manifest.json pname = "home-assistant-frontend"; - version = "20250507.0"; + version = "20250509.0"; format = "wheel"; src = fetchPypi { @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "home_assistant_frontend"; dist = "py3"; python = "py3"; - hash = "sha256-9haMRgP7LxngEciafhTaOX/iSbiNZuqzBakJ3YNAWMo="; + hash = "sha256-tlBdUA3Gj7P6KTjY2UNnWjQqpnwgvAlXC09P7QFR0r0="; }; # there is nothing to strip in this package From cc149521a060687bfd84a0c2c11556a5424446a4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 9 May 2025 20:57:06 +0000 Subject: [PATCH 96/96] editorconfig-checker: 3.2.1 -> 3.3.0 --- pkgs/by-name/ed/editorconfig-checker/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ed/editorconfig-checker/package.nix b/pkgs/by-name/ed/editorconfig-checker/package.nix index b9cda0e91a62..cfc462d9a84d 100644 --- a/pkgs/by-name/ed/editorconfig-checker/package.nix +++ b/pkgs/by-name/ed/editorconfig-checker/package.nix @@ -9,16 +9,16 @@ buildGoModule rec { pname = "editorconfig-checker"; - version = "3.2.1"; + version = "3.3.0"; src = fetchFromGitHub { owner = "editorconfig-checker"; repo = "editorconfig-checker"; rev = "v${version}"; - hash = "sha256-LoOuP98vRj/kzyWKKsXNPfE+9IELrKBtdSZvP7GtMew="; + hash = "sha256-TRbUehdHzgjc87O8/kZyC9c9ouxJrs/nSN24E5BOrzU="; }; - vendorHash = "sha256-3mcz7tstVfIb1ATuCwDdQ5IyCtjSGaDWNw2qCmY/ObE="; + vendorHash = "sha256-g7SSy55IKxfM1cjyy1n7As278HU+GdNeq1vSSM4B8GM="; doCheck = false;