diff --git a/nixos/modules/services/networking/ncps.nix b/nixos/modules/services/networking/ncps.nix index 589d115a5632..2d31dc92fae9 100644 --- a/nixos/modules/services/networking/ncps.nix +++ b/nixos/modules/services/networking/ncps.nix @@ -66,6 +66,14 @@ let max-open-conns = cfg.cache.database.pool.maxOpenConns; max-idle-conns = cfg.cache.database.pool.maxIdleConns; }; + cdc = { + inherit (cfg.cache.cdc) + enabled + min + avg + max + ; + }; max-size = cfg.cache.maxSize; lru = { schedule = cfg.cache.lru.schedule; @@ -215,6 +223,36 @@ in to the cache. ''; + cdc = { + enabled = lib.mkEnableOption '' + Whether to enable Content-Defined Chunking (CDC) for deduplication (experimental). + ''; + + min = lib.mkOption { + type = lib.types.ints.u32; + default = 16384; + description = '' + The minimum chunk size for CDC in bytes. + ''; + }; + + avg = lib.mkOption { + type = lib.types.ints.u32; + default = 65536; + description = '' + The average chunk size for CDC in bytes. + ''; + }; + + max = lib.mkOption { + type = lib.types.ints.u32; + default = 262144; + description = '' + The maximum chunk size for CDC in bytes. + ''; + }; + }; + hostName = lib.mkOption { type = lib.types.str; description = '' diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 89c15211cf8b..7892274095aa 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -1050,6 +1050,10 @@ in defaults.services.ncps.cache.storage.local = "/path/to/ncps"; }; ncps-ha-pg-redis = runTest ./ncps-ha-pg-redis.nix; + ncps-ha-pg-redis-cdc = runTest { + imports = [ ./ncps-ha-pg-redis.nix ]; + defaults.services.ncps.cache.cdc.enabled = true; + }; ndppd = runTest ./ndppd.nix; nebula-lighthouse-service = runTest ./nebula-lighthouse-service.nix; nebula.connectivity = runTest ./nebula/connectivity.nix; diff --git a/nixos/tests/pppd.nix b/nixos/tests/pppd.nix index 20cc03bfc7e7..346fd062fc99 100644 --- a/nixos/tests/pppd.nix +++ b/nixos/tests/pppd.nix @@ -27,7 +27,7 @@ in ]; after = [ "network.target" ]; serviceConfig = { - ExecStart = "${pkgs.rpPPPoE}/sbin/pppoe-server -F -O /etc/ppp/pppoe-server-options -q ${pkgs.ppp}/sbin/pppd -I eth1 -L 192.0.2.1 -R 192.0.2.2"; + ExecStart = "${pkgs.rp-pppoe}/sbin/pppoe-server -F -O /etc/ppp/pppoe-server-options -q ${pkgs.ppp}/sbin/pppd -I eth1 -L 192.0.2.1 -R 192.0.2.2"; }; wantedBy = [ "multi-user.target" ]; }; diff --git a/pkgs/applications/editors/vscode/extensions/jjk.jjk/default.nix b/pkgs/applications/editors/vscode/extensions/jjk.jjk/default.nix index 52a946b69041..4bc81ccee41c 100644 --- a/pkgs/applications/editors/vscode/extensions/jjk.jjk/default.nix +++ b/pkgs/applications/editors/vscode/extensions/jjk.jjk/default.nix @@ -7,8 +7,8 @@ vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { name = "jjk"; publisher = "jjk"; - version = "0.8.2"; - hash = "sha256-6Fb6HP0vGxuskg+mox4sKutX0nEX4PSmgF49cuJ5vtI="; + version = "0.9.0"; + hash = "sha256-Eoz9K7bet/cJ1WY6QK05YrRnukOs0gpvVD0kY92LEsk="; }; meta = { changelog = "https://github.com/keanemind/jjk/releases"; diff --git a/pkgs/applications/networking/browsers/chromium/info.json b/pkgs/applications/networking/browsers/chromium/info.json index 1cef64c95685..c62a1fa2ba25 100644 --- a/pkgs/applications/networking/browsers/chromium/info.json +++ b/pkgs/applications/networking/browsers/chromium/info.json @@ -823,7 +823,7 @@ } }, "ungoogled-chromium": { - "version": "145.0.7632.109", + "version": "145.0.7632.116", "deps": { "depot_tools": { "rev": "fb0b652edba70f5c4ac867f3beca9e535f905b4c", @@ -835,16 +835,16 @@ "hash": "sha256-SoXVnpCuNee80N4YdsTEHQd3jZNoHOwKVP6O8a67Ym0=" }, "ungoogled-patches": { - "rev": "145.0.7632.109-1", - "hash": "sha256-IKt/88bzppdwewWJpim8JL7u6N42o6W2VygvWd+XdVo=" + "rev": "145.0.7632.116-1", + "hash": "sha256-5rixK6Hp5Czz0I+UISyhi2hPgPhgt+f4JFqd8ERvCV0=" }, "npmHash": "sha256-13sgV/5BD7QvDLBAEmoLN5vongw+S5v5znvZcctxhWc=" }, "DEPS": { "src": { "url": "https://chromium.googlesource.com/chromium/src.git", - "rev": "61eff07de4f37ac1c6969c91034a447ef6cd394d", - "hash": "sha256-b498JyyvsN/+0Gqjdrq+eT1HW54/ayEENRHa1Sw69Xw=", + "rev": "7d28075c6a9ba147e6df449209001258bb82a122", + "hash": "sha256-ljqK297kBByDGHKwH+yz6XcLO7l0+GDIrR0Hznh6X8c=", "recompress": true }, "src/third_party/clang-format/script": { @@ -954,8 +954,8 @@ }, "src/third_party/dawn": { "url": "https://dawn.googlesource.com/dawn.git", - "rev": "d9f5a980bb5a4baeb7d9c1fef89a39789a6cd9fb", - "hash": "sha256-DaNsRQm9bR2lfbiP6vWr2R7KD8mYWOaJ72VJyrUkJvI=" + "rev": "3df397b5b33f950da92787d9a6ac655e0601bca2", + "hash": "sha256-UAKnxnEScteAj+14i56K6VA34JM+J4KCpG4HbY2bT4s=" }, "src/third_party/dawn/third_party/glfw": { "url": "https://chromium.googlesource.com/external/github.com/glfw/glfw", @@ -1639,8 +1639,8 @@ }, "src/v8": { "url": "https://chromium.googlesource.com/v8/v8.git", - "rev": "a8b42c8fae7c7f1ce4e32b08ee61c22775185c01", - "hash": "sha256-HZ4JbSoMNVqUrCWoxk0/AxzlcpMgKhe/HJ7DGeTeE9M=" + "rev": "ce21eb288e9b86bf6a294968a5113a2646d7b8dd", + "hash": "sha256-ayAzZOrJYOLqGunDs9t/x6HBUy32y+0ISjaGkEUK+hk=" } } } diff --git a/pkgs/applications/version-management/sublime-merge/default.nix b/pkgs/applications/version-management/sublime-merge/default.nix index 7526a19f0dba..353b27eb27a8 100644 --- a/pkgs/applications/version-management/sublime-merge/default.nix +++ b/pkgs/applications/version-management/sublime-merge/default.nix @@ -5,9 +5,9 @@ let in { sublime-merge = common { - buildVersion = "2121"; - aarch64sha256 = "WAT2gmAg63cu3FJIw5D3rRa+SNonymfsLaTY8ALa1ec="; - x64sha256 = "yWrrlDe5C90EMQVdpENWnGURcVEdxJlFkalEfPpztzQ="; + buildVersion = "2123"; + aarch64sha256 = "9ceHfTutGJAZlIwRUXJvpli7LtZFuz6vuDgIi7i9+kM="; + x64sha256 = "HxKKwc4dOX1ADPl0axn5bDr21yG5FsrrzMyK95p6sy4="; } { }; sublime-merge-dev = common { diff --git a/pkgs/by-name/bb/bbedit/package.nix b/pkgs/by-name/bb/bbedit/package.nix index 4609b860fbef..313dd0129c50 100644 --- a/pkgs/by-name/bb/bbedit/package.nix +++ b/pkgs/by-name/bb/bbedit/package.nix @@ -7,11 +7,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "bbedit"; - version = "15.5.4"; + version = "15.5.5"; src = fetchurl { url = "https://s3.amazonaws.com/BBSW-download/BBEdit_${finalAttrs.version}.dmg"; - hash = "sha256-GMPgnT14L7bTQ8XlUlV8syrspW1mzUs8yyqr148NLq8="; + hash = "sha256-DsrGj2id9XUf3n55s0OHoJnX4AQY5AqiP9skaXysghk="; }; sourceRoot = "."; diff --git a/pkgs/by-name/bo/bootdev-cli/package.nix b/pkgs/by-name/bo/bootdev-cli/package.nix index 42a36a49ad4d..fc3ede6b6bfc 100644 --- a/pkgs/by-name/bo/bootdev-cli/package.nix +++ b/pkgs/by-name/bo/bootdev-cli/package.nix @@ -11,16 +11,16 @@ buildGoModule (finalAttrs: { pname = "bootdev-cli"; - version = "1.22.1"; + version = "1.24.0"; src = fetchFromGitHub { owner = "bootdotdev"; repo = "bootdev"; tag = "v${finalAttrs.version}"; - hash = "sha256-eOyJx99TwjG7UWTvzYtelLsN1BwhORZD9zkyA13VYSY="; + hash = "sha256-/vVT2daJCxJDmJr9Xi27POCAKURCS171ORb7UJp/CqU="; }; - vendorHash = "sha256-jhRoPXgfntDauInD+F7koCaJlX4XDj+jQSe/uEEYIMM="; + vendorHash = "sha256-ZDioEU5uPCkd+kC83cLlpgzyOsnpj2S7N+lQgsQb8uY="; ldflags = [ "-s" diff --git a/pkgs/by-name/ca/cargo-shear/package.nix b/pkgs/by-name/ca/cargo-shear/package.nix index 3b5ac115fac6..4b7e7daf2093 100644 --- a/pkgs/by-name/ca/cargo-shear/package.nix +++ b/pkgs/by-name/ca/cargo-shear/package.nix @@ -38,7 +38,7 @@ rustPlatform.buildRustPackage (finalAttrs: { }; meta = { - description = "Detect and remove unused dependencies from Cargo.toml"; + description = "Detect and fix unused/misplaced dependencies from Cargo.toml"; mainProgram = "cargo-shear"; homepage = "https://github.com/Boshen/cargo-shear"; changelog = "https://github.com/Boshen/cargo-shear/blob/v${finalAttrs.version}/CHANGELOG.md"; diff --git a/pkgs/by-name/ce/celestegame/celeste.nix b/pkgs/by-name/ce/celestegame/celeste.nix index 351fb2b042f9..2c7900602d20 100644 --- a/pkgs/by-name/ce/celestegame/celeste.nix +++ b/pkgs/by-name/ce/celestegame/celeste.nix @@ -1,7 +1,7 @@ { lib, stdenvNoCC, - requireFile, + fetchItchIo, makeWrapper, copyDesktopItems, makeDesktopItem, @@ -57,11 +57,11 @@ stdenvNoCC.mkDerivation { src = if overrideSrc == null then - # TODO: Replace this with fetchItchIo - requireFile { + fetchItchIo { name = "celeste-linux.zip"; + gameUrl = downloadPage; + upload = "12748042"; hash = "sha256-phNDBBHb7zwMRaBHT5D0hFEilkx9F31p6IllvLhHQb8="; - url = downloadPage; } else overrideSrc; diff --git a/pkgs/by-name/co/codespelunker/package.nix b/pkgs/by-name/co/codespelunker/package.nix index 9ee29d176198..016da6473715 100644 --- a/pkgs/by-name/co/codespelunker/package.nix +++ b/pkgs/by-name/co/codespelunker/package.nix @@ -6,13 +6,13 @@ buildGoModule (finalAttrs: { pname = "codespelunker"; - version = "2.0.0"; + version = "3.0.0"; src = fetchFromGitHub { owner = "boyter"; repo = "cs"; rev = "v${finalAttrs.version}"; - hash = "sha256-knsEEpmBuFO5UkUenjVilSg8h+MMGnmbDX0DrAlg98s="; + hash = "sha256-iRp5H+lZXks3MUxA1v/ZLMJnh/4T2KljOCylBcL05yc="; }; vendorHash = null; diff --git a/pkgs/by-name/co/coin3d/package.nix b/pkgs/by-name/co/coin3d/package.nix index 8fd16c4d4281..6c561d42a1bf 100644 --- a/pkgs/by-name/co/coin3d/package.nix +++ b/pkgs/by-name/co/coin3d/package.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "coin"; - version = "4.0.6"; + version = "4.0.7"; src = fetchFromGitHub { owner = "coin3d"; repo = "coin"; rev = "v${finalAttrs.version}"; - hash = "sha256-XBkb8CbfAXBwOO9JkExpsy8HxtbZo3/fnU6cReuSETI="; + hash = "sha256-Sb0WWuUKgKaBvOXChEoWt2CeTqSq4gXig4eGxvtN+/M="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/by-name/co/commitizen/package.nix b/pkgs/by-name/co/commitizen/package.nix index 9fa4a2fed7da..b910a8af7a29 100644 --- a/pkgs/by-name/co/commitizen/package.nix +++ b/pkgs/by-name/co/commitizen/package.nix @@ -12,14 +12,14 @@ python3Packages.buildPythonPackage rec { pname = "commitizen"; - version = "4.13.6"; + version = "4.13.8"; pyproject = true; src = fetchFromGitHub { owner = "commitizen-tools"; repo = "commitizen"; tag = "v${version}"; - hash = "sha256-f0fB5FkWG4fkV7ccMPJ8z5MBFVYBwE33BDa4Cz94K4M="; + hash = "sha256-xRje/iCXeUJSmt1qdQ8cOTC8vqJSW8XFIIkplgzMpCo="; }; postPatch = '' diff --git a/pkgs/by-name/da/daggerfall-unity/package.nix b/pkgs/by-name/da/daggerfall-unity/package.nix index 637c37756931..2a94cbc6b451 100644 --- a/pkgs/by-name/da/daggerfall-unity/package.nix +++ b/pkgs/by-name/da/daggerfall-unity/package.nix @@ -6,18 +6,19 @@ fetchzip, lib, libGL, - libxscrnsaver, + libpulseaudio, + libudev0-shim, libxcursor, libxi, libxinerama, libxrandr, + libxscrnsaver, libxxf86vm, - libpulseaudio, - libudev0-shim, makeDesktopItem, nix-update-script, stdenv, vulkan-loader, + zlib, pname ? "daggerfall-unity", includeUnfree ? false, }: @@ -56,15 +57,16 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ alsa-lib libGL - libxscrnsaver + libpulseaudio + libudev0-shim libxcursor libxi libxinerama libxrandr + libxscrnsaver libxxf86vm - libpulseaudio - libudev0-shim vulkan-loader + zlib ]; strictDeps = true; diff --git a/pkgs/by-name/dn/dnscontrol/package.nix b/pkgs/by-name/dn/dnscontrol/package.nix index e27e65f4d3f7..90c611f6996d 100644 --- a/pkgs/by-name/dn/dnscontrol/package.nix +++ b/pkgs/by-name/dn/dnscontrol/package.nix @@ -9,16 +9,16 @@ buildGoModule (finalAttrs: { pname = "dnscontrol"; - version = "4.34.0"; + version = "4.35.0"; src = fetchFromGitHub { owner = "StackExchange"; repo = "dnscontrol"; tag = "v${finalAttrs.version}"; - hash = "sha256-Qi/xg7yo/3r9AyY7r+bx7M95zWF+qjWlVrxix1pYfjM="; + hash = "sha256-txaPNitqRTYIuG4hU6GPcOFKmq6BBzgQDgYxsFRfK3M="; }; - vendorHash = "sha256-lYi8rWFEAYQx9muy+JAknoCgEL2xVGSJ6npCTU+hdr8="; + vendorHash = "sha256-oE1tbQ3KEqm0vub9XAqUiORJPVgIV8zNAfsfLl4aqrg="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/dy/dyff/package.nix b/pkgs/by-name/dy/dyff/package.nix index dfa73c4c3484..fd8d7a29d9d0 100644 --- a/pkgs/by-name/dy/dyff/package.nix +++ b/pkgs/by-name/dy/dyff/package.nix @@ -8,16 +8,16 @@ buildGoModule (finalAttrs: { pname = "dyff"; - version = "1.10.4"; + version = "1.10.5"; src = fetchFromGitHub { owner = "homeport"; repo = "dyff"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-3BW6uvxnwmvbzqoYnXKO85hMEFXPp+QsrAoGj/ksn/g="; + sha256 = "sha256-6DmRNaquyAKaitmgkw6wXS4127PpMgSrFep/2d0yegY="; }; - vendorHash = "sha256-vZI56PKtwmCqqWwPGuWApAZ2lBv17vin1aD36Ym3HOg="; + vendorHash = "sha256-3aaiiT87hPa3+u3E2wQrdLDb+eM49z3VnehQoxn/tbI="; subPackages = [ "cmd/dyff" diff --git a/pkgs/by-name/eg/egctl/package.nix b/pkgs/by-name/eg/egctl/package.nix index a8d1bcaa8d1f..032a53b40d98 100644 --- a/pkgs/by-name/eg/egctl/package.nix +++ b/pkgs/by-name/eg/egctl/package.nix @@ -9,13 +9,13 @@ buildGoModule (finalAttrs: { pname = "egctl"; - version = "1.6.2"; + version = "1.6.4"; src = fetchFromGitHub { owner = "envoyproxy"; repo = "gateway"; tag = "v${finalAttrs.version}"; - hash = "sha256-c9kCYLzshCqOAKyRp+GsOtoB9KSnURR6xQstzVHJpWs="; + hash = "sha256-zHw/8NyZ6nsPGd2gDtbTLjvlm7CdsX8TvDF1WSbqM4M="; }; vendorHash = "sha256-oFuxY7bQ4O/hc8r1Z6K7PRYG4dOqpt0zLgT2N4cvARE="; diff --git a/pkgs/by-name/gi/git-unroll/package.nix b/pkgs/by-name/gi/git-unroll/package.nix index 0a526fc5839a..770fb128b206 100644 --- a/pkgs/by-name/gi/git-unroll/package.nix +++ b/pkgs/by-name/gi/git-unroll/package.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchFromCodeberg, + fetchpatch, makeWrapper, bash, @@ -24,6 +25,17 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-Mpc2p+W8PqQ6Os9AJJJwvL00a4cjFKBUTBG5bF+IzL4="; }; + patches = [ + # Discovered when bumping pytorch to 2.10.0 + # See https://github.com/NixOS/nixpkgs/pull/484881#issuecomment-3814200207 + # https://codeberg.org/gm6k/git-unroll/pulls/2 + (fetchpatch { + name = "fix-name-decollision-for-multi-parent-submodules"; + url = "https://codeberg.org/glepage/git-unroll/commit/3a16e138a6c4bc9d8226f025fb53e281c80fc1ef.patch"; + hash = "sha256-mHDqpDh6aiQRDgfxeZs/ufa5Af0lDFDRGpSlmD1+kEo="; + }) + ]; + postPatch = '' substituteInPlace unroll \ --replace-fail "#! /usr/bin/env nix-shell" "#!/usr/bin/env bash" \ diff --git a/pkgs/by-name/he/heaptrack/boost-189.patch b/pkgs/by-name/he/heaptrack/boost-189.patch new file mode 100644 index 000000000000..463a8e1015db --- /dev/null +++ b/pkgs/by-name/he/heaptrack/boost-189.patch @@ -0,0 +1,26 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index b859fbd..4ed051c 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -25,7 +25,7 @@ if (APPIMAGE_BUILD) + endif() + + include(FeatureSummary) +-find_package(Boost 1.60.0 ${REQUIRED_IN_APPIMAGE} COMPONENTS system filesystem iostreams container) ++find_package(Boost 1.60.0 ${REQUIRED_IN_APPIMAGE} COMPONENTS filesystem iostreams container) + set_package_properties(Boost PROPERTIES TYPE RECOMMENDED PURPOSE "Boost container libraries can greatly improve performance (via pmr allocators)") + find_package(Threads REQUIRED) + find_package(ZLIB REQUIRED) +diff --git a/src/analyze/CMakeLists.txt b/src/analyze/CMakeLists.txt +index 8e16ff2..340eb7f 100644 +--- a/src/analyze/CMakeLists.txt ++++ b/src/analyze/CMakeLists.txt +@@ -2,7 +2,7 @@ if (ECM_FOUND) + include(ECMEnableSanitizers) + endif() + +-find_package(Boost 1.41.0 REQUIRED COMPONENTS iostreams program_options system filesystem) ++find_package(Boost 1.41.0 REQUIRED COMPONENTS iostreams program_options filesystem) + + configure_file(analyze_config.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/analyze_config.h) + diff --git a/pkgs/by-name/he/heaptrack/cmake-minimum-required.patch b/pkgs/by-name/he/heaptrack/cmake-minimum-required.patch new file mode 100644 index 000000000000..5e055fa6ba53 --- /dev/null +++ b/pkgs/by-name/he/heaptrack/cmake-minimum-required.patch @@ -0,0 +1,10 @@ +diff --git a/3rdparty/robin-map/CMakeLists.txt b/3rdparty/robin-map/CMakeLists.txt +index fab865a..6cbd8c9 100644 +--- a/3rdparty/robin-map/CMakeLists.txt ++++ b/3rdparty/robin-map/CMakeLists.txt +@@ -1,4 +1,4 @@ +-cmake_minimum_required(VERSION 3.5) ++cmake_minimum_required(VERSION 3.10) + + project(tsl-robin-map VERSION 1.3.0 LANGUAGES CXX) + diff --git a/pkgs/by-name/he/heaptrack/package.nix b/pkgs/by-name/he/heaptrack/package.nix index f19cbeeaf608..e1b45533a019 100644 --- a/pkgs/by-name/he/heaptrack/package.nix +++ b/pkgs/by-name/he/heaptrack/package.nix @@ -25,6 +25,11 @@ stdenv.mkDerivation { hash = "sha256-8NLpp/+PK3wIB5Sx0Z1185DCDQ18zsGj9Wp5YNKgX8E="; }; + patches = [ + ./boost-189.patch + ./cmake-minimum-required.patch + ]; + nativeBuildInputs = [ cmake kdePackages.extra-cmake-modules diff --git a/pkgs/by-name/im/imsprog/package.nix b/pkgs/by-name/im/imsprog/package.nix index 63678303c20a..8b7f96fe887c 100644 --- a/pkgs/by-name/im/imsprog/package.nix +++ b/pkgs/by-name/im/imsprog/package.nix @@ -64,7 +64,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { changelog = "https://github.com/bigbigmdm/IMSProg/releases/tag/v${finalAttrs.version}"; - description = "Free I2C EEPROM programmer tool for CH341A device"; + description = "Free I2C, MicroWire and SPI EEPROM/Flash chip programmer tool for CH341A device"; homepage = "https://github.com/bigbigmdm/IMSProg"; license = with lib.licenses; [ gpl3Plus diff --git a/pkgs/by-name/jm/jmol/package.nix b/pkgs/by-name/jm/jmol/package.nix index 1460ada7eac2..bbece5ed904e 100644 --- a/pkgs/by-name/jm/jmol/package.nix +++ b/pkgs/by-name/jm/jmol/package.nix @@ -31,7 +31,7 @@ let }; in stdenv.mkDerivation (finalAttrs: { - version = "16.3.47"; + version = "16.3.49"; pname = "jmol"; src = @@ -40,7 +40,7 @@ stdenv.mkDerivation (finalAttrs: { in fetchurl { url = "mirror://sourceforge/jmol/Jmol/Version%20${baseVersion}/Jmol%20${finalAttrs.version}/Jmol-${finalAttrs.version}-binary.tar.gz"; - hash = "sha256-THQ67rqlcADtQtq3/vNfV0pUhzFHGFE3Lzf8CLFNuSU="; + hash = "sha256-OOHqRgkgG51o8mxo7lDAEQeCFoBSxdwdX72CUYdmRKw="; }; patchPhase = '' diff --git a/pkgs/by-name/ka/kanban/package.nix b/pkgs/by-name/ka/kanban/package.nix index f0b5c5169f94..c4f9ff3d37cc 100644 --- a/pkgs/by-name/ka/kanban/package.nix +++ b/pkgs/by-name/ka/kanban/package.nix @@ -29,7 +29,7 @@ rustPlatform.buildRustPackage (finalAttrs: { built with Rust. Features include file persistence, keyboard-driven navigation, multi-select capabilities, and sprint management. ''; - homepage = "https://github.com/fulsomenko/kanban"; + homepage = "https://kanban.yoon.se"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ fulsomenko ]; mainProgram = "kanban"; diff --git a/pkgs/by-name/le/lexical/package.nix b/pkgs/by-name/le/lexical/package.nix deleted file mode 100644 index fd386e4b87a6..000000000000 --- a/pkgs/by-name/le/lexical/package.nix +++ /dev/null @@ -1,63 +0,0 @@ -{ - lib, - beamPackages, - fetchFromGitHub, - nix-update-script, - versionCheckHook, -}: - -beamPackages.mixRelease rec { - pname = "lexical"; - version = "0.7.3"; - - src = fetchFromGitHub { - owner = "lexical-lsp"; - repo = "lexical"; - tag = "v${version}"; - hash = "sha256-p8XSJBX1igwC+ssEJGD8wb/ZYaEgLGozlY8N6spo3cA="; - }; - - mixFodDeps = beamPackages.fetchMixDeps { - inherit pname version src; - - hash = "sha256-g6BZGJ33oBDXmjbb/kBfPhart4En/iDlt4yQJYeuBzw="; - }; - - installPhase = '' - runHook preInstall - - mix do compile --no-deps-check, package --path "$out" - - runHook postInstall - ''; - - postInstall = '' - substituteInPlace "$out/bin/start_lexical.sh" \ - --replace-fail 'elixir_command=' 'elixir_command="${beamPackages.elixir}/bin/"' - - mv "$out/bin" "$out/libexec" - makeWrapper "$out/libexec/start_lexical.sh" "$out/bin/lexical" \ - --set RELEASE_COOKIE lexical - ''; - - nativeInstallCheckInputs = [ - versionCheckHook - ]; - doInstallCheck = true; - - __darwinAllowLocalNetworking = true; - - passthru = { - updateScript = nix-update-script { }; - }; - - meta = { - description = "Next-generation elixir language server"; - homepage = "https://github.com/lexical-lsp/lexical"; - changelog = "https://github.com/lexical-lsp/lexical/releases/tag/v${version}"; - license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ GaetanLepage ]; - mainProgram = "lexical"; - platforms = beamPackages.erlang.meta.platforms; - }; -} diff --git a/pkgs/by-name/li/librewolf-bin-unwrapped/package.nix b/pkgs/by-name/li/librewolf-bin-unwrapped/package.nix index 5f042c43f9ce..9ec657637745 100644 --- a/pkgs/by-name/li/librewolf-bin-unwrapped/package.nix +++ b/pkgs/by-name/li/librewolf-bin-unwrapped/package.nix @@ -36,7 +36,7 @@ let pname = "librewolf-bin-unwrapped"; - version = "147.0.4-1"; + version = "148.0-1"; in stdenv.mkDerivation { @@ -46,8 +46,8 @@ stdenv.mkDerivation { url = "https://codeberg.org/api/packages/librewolf/generic/librewolf/${version}/librewolf-${version}-${arch}-package.tar.xz"; hash = { - x86_64-linux = "sha256-zqWq8FgdSLWAaoWvmCnIc9FlTmQtcCgLoK9XuXsWS4M="; - aarch64-linux = "sha256-SieZ3R0tqrVLpxClWEiznjPk1YS/37MHaJYHF/UyAvk="; + x86_64-linux = "sha256-UV9laKmAvyafNXXcCGrEr51dlyO1DaV3iHJy981OR9M="; + aarch64-linux = "sha256-EZFNcshCdx3xje3/RWXJVYf3IFxeNXbZSoWjoQhoa7I="; } .${stdenv.hostPlatform.system} or throwSystem; }; diff --git a/pkgs/by-name/mh/mhabit/package.nix b/pkgs/by-name/mh/mhabit/package.nix index 4d7552d03a40..59776340c09e 100644 --- a/pkgs/by-name/mh/mhabit/package.nix +++ b/pkgs/by-name/mh/mhabit/package.nix @@ -12,13 +12,13 @@ }: let - version = "1.23.6+145"; + version = "1.23.8+148"; src = fetchFromGitHub { owner = "FriesI23"; repo = "mhabit"; tag = "v${version}"; - hash = "sha256-9+UXMOogySW3f9LPaj0YSfov1cSgLb3I+jWvAV8yEsM="; + hash = "sha256-JOVznx4z6G2q7IOs/5uyQ8q0+D7oq9jOS0f8u26YrP4="; }; in flutter338.buildFlutterApplication { diff --git a/pkgs/by-name/na/navidrome/package.nix b/pkgs/by-name/na/navidrome/package.nix index d1b8ce1c8f47..ed97690bac4e 100644 --- a/pkgs/by-name/na/navidrome/package.nix +++ b/pkgs/by-name/na/navidrome/package.nix @@ -19,23 +19,23 @@ buildGoModule (finalAttrs: { pname = "navidrome"; - version = "0.60.0"; + version = "0.60.3"; src = fetchFromGitHub { owner = "navidrome"; repo = "navidrome"; rev = "v${finalAttrs.version}"; - hash = "sha256-K7Cen0gADYQc0jxd2keBpTJlyQyuYL02j7/yiNtjZvQ="; + hash = "sha256-DwVmNJKjwEhTKIVPYFqaUR9SD4HpACkK4XJoFfQVRus="; }; - vendorHash = "sha256-DCz/WKZXnZy109WgStCK7NJg8VpR3IJEaQZLMDXdegk="; + vendorHash = "sha256-StI4CfWN/OnbYFktRriTJWMHTuJkCinpYk9qgsxMGG8="; npmRoot = "ui"; npmDeps = fetchNpmDeps { inherit (finalAttrs) src; sourceRoot = "${finalAttrs.src.name}/ui"; - hash = "sha256-Z1kSRNSG1zeLA6rtbcTdLJnNWclsVTS5Xfc4D9M0dl4="; + hash = "sha256-EA2WM7xaqP7rS0pjx+yXwpjdauaduvDefmFH73eByxI="; }; nativeBuildInputs = [ @@ -66,6 +66,9 @@ buildGoModule (finalAttrs: { env = lib.optionalAttrs stdenv.cc.isGNU { CGO_CFLAGS = toString [ "-Wno-return-local-addr" ]; + # Workaround for https://github.com/golang/go/issues/77387 + # Remove when go1.25.8 has been merged + CGO_CFLAGS_ALLOW = "--define-prefix"; }; postPatch = '' diff --git a/pkgs/by-name/nc/ncps/package.nix b/pkgs/by-name/nc/ncps/package.nix index 197ffc0c52e0..53e5602d51ca 100644 --- a/pkgs/by-name/nc/ncps/package.nix +++ b/pkgs/by-name/nc/ncps/package.nix @@ -3,7 +3,6 @@ curl, dbmate, fetchFromGitHub, - go, jq, lib, makeWrapper, @@ -21,25 +20,16 @@ buildGoModule (finalAttrs: { pname = "ncps"; - version = "0.9.1"; + version = "0.9.2"; src = fetchFromGitHub { owner = "kalbasit"; repo = "ncps"; tag = "v${finalAttrs.version}"; - hash = "sha256-cu7fgzQTpo8aLpK0/kJ3xcCVFCmFMQ6RKwUWW5Zwu6s="; + hash = "sha256-LRabKv+4xYQn2XH4AIacFkn3ewUd2S3UlVWCA6MUweU="; }; - # XXX: ncps is built with Go 1.25.6 that is available in release-25.11 but - # master is currently still using 1.25.5 (update waiting in the - # staging/staging-next branches.) This is a workaround for this issue and - # will automatically becomes no-op once Go is updated. - preBuild = lib.optionalString (go.version == "1.25.5") '' - sed -e 's:go 1.25.6:go 1.25.5:g' -i go.mod - sed -e 's:go 1.25.6:go 1.25.5:g' -i nix/dbmate-wrapper/src/go.mod - ''; - - vendorHash = "sha256-QZikr0kE/kvnI4RG02lxVpG4teTg3Uo68st9xLlbfm0="; + vendorHash = "sha256-PpHSkD7+csPfUXoYRuKhBm1iBtTSwJhOxuW/4ayv9hY="; ldflags = [ "-X github.com/kalbasit/ncps/pkg/ncps.Version=v${finalAttrs.version}" @@ -112,14 +102,6 @@ buildGoModule (finalAttrs: { src = "${finalAttrs.src}/nix/dbmate-wrapper/src"; - # XXX: ncps is built with Go 1.25.6 that is available in release-25.11 but - # master is currently still using 1.25.5 (update waiting in the - # staging/staging-next branches.) This is a workaround for this issue and - # will automatically becomes no-op once Go is updated. - preBuild = lib.optionalString (go.version == "1.25.5") '' - sed -e 's:go 1.25.6:go 1.25.5:g' -i go.mod - ''; - vendorHash = null; buildInputs = lib.singleton dbmate; @@ -139,6 +121,7 @@ buildGoModule (finalAttrs: { ncps-custom-sqlite-directory ncps-custom-storage-local ncps-ha-pg-redis + ncps-ha-pg-redis-cdc ; }; diff --git a/pkgs/by-name/ne/next-ls/package.nix b/pkgs/by-name/ne/next-ls/package.nix deleted file mode 100644 index 7771bae3a195..000000000000 --- a/pkgs/by-name/ne/next-ls/package.nix +++ /dev/null @@ -1,46 +0,0 @@ -{ - lib, - - beamPackages, - fetchFromGitHub, -}: - -beamPackages.mixRelease rec { - pname = "next-ls"; - version = "0.23.2"; - - src = fetchFromGitHub { - owner = "elixir-tools"; - repo = "next-ls"; - tag = "v${version}"; - hash = "sha256-2KzBOzrfoQQIqjEtYufvhT9bBibfEjNDiC+d3l5eaUc="; - }; - - mixFodDeps = beamPackages.fetchMixDeps { - inherit src version; - pname = "next-ls-deps"; - hash = "sha256-4Rt5Q0fX+fbncvxyXdpIhgEvn9VYX/QDxDdnbanT21Q="; - }; - - removeCookie = false; - - # replace installPhase to change release target - installPhase = '' - runHook preInstall - - mix release --no-deps-check --path $out plain - makeWrapper $out/bin/plain $out/bin/nextls --add-flags "eval \"System.no_halt(true); Application.ensure_all_started(:next_ls)\"" - - runHook postInstall - ''; - - meta = { - homepage = "https://www.elixir-tools.dev/next-ls/"; - changelog = "https://github.com/elixir-tools/next-ls/releases/tag/v${version}"; - description = "Language server for Elixir that just works"; - license = lib.licenses.mit; - mainProgram = "nextls"; - maintainers = [ lib.maintainers.adamcstephens ]; - platforms = beamPackages.erlang.meta.platforms; - }; -} diff --git a/pkgs/by-name/ni/nix-olde/package.nix b/pkgs/by-name/ni/nix-olde/package.nix new file mode 100644 index 000000000000..4f206e138da4 --- /dev/null +++ b/pkgs/by-name/ni/nix-olde/package.nix @@ -0,0 +1,27 @@ +{ + lib, + rustPlatform, + fetchFromGitHub, +}: + +rustPlatform.buildRustPackage (finalAttrs: { + pname = "nix-olde"; + version = "0.2.3"; + + src = fetchFromGitHub { + owner = "trofi"; + repo = "nix-olde"; + tag = "v${finalAttrs.version}"; + hash = "sha256-Q5M9/tW5Kz4ILm0MKhx540iPrFaH5Y5gQawZ13l2hg0="; + }; + + cargoHash = "sha256-jCaDTLF3U3Ov1EBsoz27UlA2KYXnDTD9GRcj0isueNQ="; + + meta = { + description = "Show details about outdated packages in your NixOS system"; + homepage = "https://github.com/trofi/nix-olde"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ qweered ]; + mainProgram = "nix-olde"; + }; +}) diff --git a/pkgs/by-name/op/openvino/package.nix b/pkgs/by-name/op/openvino/package.nix index becaa95f1160..92e6639ecf6e 100644 --- a/pkgs/by-name/op/openvino/package.nix +++ b/pkgs/by-name/op/openvino/package.nix @@ -55,14 +55,14 @@ in stdenv.mkDerivation (finalAttrs: { pname = "openvino"; - version = "2025.4.2"; + version = "2026.0.0"; src = fetchFromGitHub { owner = "openvinotoolkit"; repo = "openvino"; tag = finalAttrs.version; fetchSubmodules = true; - hash = "sha256-DDzY3o3ehYf/JYxh3AK25z1/UcuDrbQpaYFRWxPvpmk="; + hash = "sha256-CGlcFqv2KZKZD35BIOCRntDaDoT6Nv4VmPXE8mTeiDg="; }; outputs = [ diff --git a/pkgs/by-name/pa/paho-mqtt-cpp/package.nix b/pkgs/by-name/pa/paho-mqtt-cpp/package.nix index 2d0981a47593..032786f81c6a 100644 --- a/pkgs/by-name/pa/paho-mqtt-cpp/package.nix +++ b/pkgs/by-name/pa/paho-mqtt-cpp/package.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "paho.mqtt.cpp"; - version = "1.5.3"; + version = "1.6.0"; src = fetchFromGitHub { owner = "eclipse"; repo = "paho.mqtt.cpp"; tag = "v${finalAttrs.version}"; - hash = "sha256-vwfWcJqAWY4Em4MxZVcvOi6pzXAYYlOrKh6peMtjcXo="; + hash = "sha256-WpuI0BPGPCuV1riviUGy2CLshW0RSVIxcjgFmmH2SqA="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/by-name/pa/paper-age/package.nix b/pkgs/by-name/pa/paper-age/package.nix index aeb53316b63d..43305785979f 100644 --- a/pkgs/by-name/pa/paper-age/package.nix +++ b/pkgs/by-name/pa/paper-age/package.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "paper-age"; - version = "1.3.4"; + version = "1.4.0"; src = fetchFromGitHub { owner = "matiaskorhonen"; repo = "paper-age"; rev = "v${finalAttrs.version}"; - hash = "sha256-xoxrNNlpDFXuQwltZ52SkGe0z6+B4h1Jy4XRtvQDiAg="; + hash = "sha256-wKhq7AtplQ+Yl5/pVaBY2gLu3KklPXqUEd6cVabHtVo="; }; - cargoHash = "sha256-FO69bmUhP6S3MRbVZllxmpn1GuM8fplciAka46Dz2Yg="; + cargoHash = "sha256-LcGTnWgccTjrfDGKsnArxtSksr8lMG392HhYKVy1Lew="; meta = { description = "Easy and secure paper backups of secrets"; diff --git a/pkgs/by-name/pi/pihole-ftl/package.nix b/pkgs/by-name/pi/pihole-ftl/package.nix index c6838e9ea700..21b9aef7bfb9 100644 --- a/pkgs/by-name/pi/pihole-ftl/package.nix +++ b/pkgs/by-name/pi/pihole-ftl/package.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "pihole-ftl"; - version = "6.2.3"; + version = "6.4.1"; src = fetchFromGitHub { owner = "pi-hole"; repo = "FTL"; tag = "v${finalAttrs.version}"; - hash = "sha256-d1kpkBKuc30oIT1dRac8gkzh36Yyg80cizNRbyZ4424="; + hash = "sha256-OpbBd+HS/gwcWNe/6VB3glout1sifJ8o5EnKuXfyZ/o="; }; patches = [ diff --git a/pkgs/by-name/pr/prometheus-opnsense-exporter/package.nix b/pkgs/by-name/pr/prometheus-opnsense-exporter/package.nix index 6997aa43e1d7..d8a06e10a11d 100644 --- a/pkgs/by-name/pr/prometheus-opnsense-exporter/package.nix +++ b/pkgs/by-name/pr/prometheus-opnsense-exporter/package.nix @@ -6,13 +6,13 @@ }: buildGoModule (finalAttrs: { pname = "prometheus-opnsense-exporter"; - version = "0.0.12"; + version = "0.0.13"; src = fetchFromGitHub { owner = "AthennaMind"; repo = "opnsense-exporter"; tag = "v${finalAttrs.version}"; - hash = "sha256-k+o7zvCJypzbBdZQWlTosauvdk1E207H75+fjtE/Ckk="; + hash = "sha256-x2WQxS3TRhJCnDFFAnE4ayKmlNCRYabK9VBH29SPlFA="; }; ldflags = [ diff --git a/pkgs/by-name/rp/rpPPPoE/package.nix b/pkgs/by-name/rp/rp-pppoe/package.nix similarity index 100% rename from pkgs/by-name/rp/rpPPPoE/package.nix rename to pkgs/by-name/rp/rp-pppoe/package.nix diff --git a/pkgs/by-name/ru/runescape/package.nix b/pkgs/by-name/ru/runescape/package.nix deleted file mode 100644 index a566c6e6e964..000000000000 --- a/pkgs/by-name/ru/runescape/package.nix +++ /dev/null @@ -1,154 +0,0 @@ -{ - stdenv, - lib, - autoPatchelfHook, - buildFHSEnv, - cairo, - dpkg, - fetchurl, - gcc-unwrapped, - glib, - glibc, - gtk2-x11, - libGL, - libpulseaudio, - libsm, - libxxf86vm, - libx11, - openssl_1_1, - pango, - SDL2, - wrapGAppsHook3, - xdg-utils, - xorg_sys_opengl, - zlib, -}: -let - - runescape = stdenv.mkDerivation rec { - pname = "runescape-launcher"; - version = "2.2.11"; - - # Packages: https://content.runescape.com/downloads/ubuntu/dists/trusty/non-free/binary-amd64/Packages - # upstream is https://content.runescape.com/downloads/ubuntu/pool/non-free/r/${pname}/${pname}_${version}_amd64.deb - src = fetchurl { - url = "https://archive.org/download/${pname}_${version}_amd64/${pname}_${version}_amd64.deb"; - sha256 = "0dyilgbsr28zqpf711wygg706vn7sqxklnsnbghwkxfzzjppz2xw"; - }; - - nativeBuildInputs = [ - autoPatchelfHook - dpkg - wrapGAppsHook3 - ]; - - buildInputs = [ - cairo - gcc-unwrapped - glib - glibc - gtk2-x11 - libsm - libxxf86vm - libx11 - openssl_1_1 - pango - zlib - ]; - - runtimeDependencies = [ - libGL - libpulseaudio - SDL2 - openssl_1_1 - xdg-utils # The launcher uses `xdg-open` to open HTTP URLs in the user's browser - xorg_sys_opengl - zlib - ]; - - dontUnpack = true; - - preBuild = '' - export DH_VERBOSE=1 - ''; - - envVarsWithXmodifiers = '' - export MESA_GLSL_CACHE_DIR=~/Jagex - export GDK_SCALE=2 - unset XMODIFIERS - ''; - - installPhase = '' - mkdir -p $out/bin $out/share - dpkg -x $src $out - - patchShebangs $out/usr/bin/runescape-launcher - substituteInPlace $out/usr/bin/runescape-launcher \ - --replace "unset XMODIFIERS" "$envVarsWithXmodifiers" \ - --replace "/usr/share/games/runescape-launcher/runescape" "$out/share/games/runescape-launcher/runescape" - - cp -r $out/usr/bin $out/ - cp -r $out/usr/share $out/ - - rm -r $out/usr - ''; - - meta = { - description = "Launcher for RuneScape 3, the current main RuneScape"; - homepage = "https://www.runescape.com/"; - sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; - license = lib.licenses.unfree; - maintainers = [ ]; - platforms = [ "x86_64-linux" ]; - }; - }; - -in - -/* - * We can patch the runescape launcher, but it downloads a client at runtime and checks it for changes. - * For that we need use a buildFHSEnv. - * FHS simulates a classic linux shell -*/ -buildFHSEnv { - pname = "RuneScape"; - inherit (runescape) version; - targetPkgs = pkgs: [ - runescape - cairo - dpkg - gcc-unwrapped - glib - glibc - gtk2-x11 - libGL - libpulseaudio - libsm - libxxf86vm - libx11 - openssl_1_1 - pango - SDL2 - xdg-utils - libx11 - xorg_sys_opengl - zlib - ]; - multiPkgs = pkgs: [ libGL ]; - runScript = "runescape-launcher"; - extraInstallCommands = '' - mkdir -p "$out/share/applications" - cp ${runescape}/share/applications/runescape-launcher.desktop "$out/share/applications" - cp -r ${runescape}/share/icons "$out/share/icons" - substituteInPlace "$out/share/applications/runescape-launcher.desktop" \ - --replace "/usr/bin/runescape-launcher" "RuneScape" - ''; - - meta = { - description = "RuneScape Game Client (NXT) - Launcher for RuneScape 3"; - homepage = "https://www.runescape.com/"; - license = lib.licenses.unfree; - maintainers = [ ]; - platforms = [ "x86_64-linux" ]; - }; -} diff --git a/pkgs/by-name/sa/sage/sage-src.nix b/pkgs/by-name/sa/sage/sage-src.nix index 07c2957c14cd..1694721ef286 100644 --- a/pkgs/by-name/sa/sage/sage-src.nix +++ b/pkgs/by-name/sa/sage/sage-src.nix @@ -96,6 +96,41 @@ stdenv.mkDerivation rec { url = "https://github.com/sagemath/sage/commit/9bd5304f1a222e215d7006a04854ff66616748bf.patch?full_index=1"; hash = "sha256-7bgouXV3pM20IX5PM24ZpJWOBlZjQksGtjopgouEbyg="; }) + + # https://github.com/sagemath/sage/pull/41078, landed in 10.8.beta8 + (fetchpatch2 { + name = "docutils-0.22-update.patch"; + url = "https://github.com/sagemath/sage/commit/e206e205a6841cc5251dfb37fdd36ed29345fba4.patch?full_index=1"; + hash = "sha256-Y8DqwGBkRnL+6ejZibCmkEJ7q/Qs0wD2KGmAefVdd94="; + }) + + # https://github.com/sagemath/sage/pull/41342, landed in 10.9.beta1 + (fetchpatch2 { + name = "numpy-2.4-update.patch"; + url = "https://github.com/sagemath/sage/commit/97ceea842a39fa2f2e9098daae2738a2f2765b9e.patch?full_index=1"; + hash = "sha256-/Tk3tIy0syOjaNRMCyot6kma3jj4288QJ3zypS79jZo="; + }) + + # https://github.com/sagemath/sage/pull/41346, landed in 10.9.beta2 + (fetchpatch2 { + name = "ipython-9.8-updte.patch"; + url = "https://github.com/sagemath/sage/commit/380949e6eeda80cca6e5dd971e2c6f367647a863.patch?full_index=1"; + hash = "sha256-e4zmgfHrenOixgbUS1uFHzftmwNGGoSb7yFhYmqT0yc="; + }) + + # https://github.com/sagemath/sage/pull/41395, landed in 10.9.beta2 + (fetchpatch2 { + name = "pyparsing-3.3-update.patch"; + url = "https://github.com/sagemath/sage/commit/1b5a5dd78b5dcb4b3c7d1f94461ddbc647c5679f.patch?full_index=1"; + hash = "sha256-kFXg2O3IpwaOwAaNIy6Wscx8/XSDWXrqAXS2ZJgdqsg="; + }) + + # https://github.com/sagemath/sage/pull/41433, landed in 10.9.beta3 + (fetchpatch2 { + name = "scipy-1.17-update.patch"; + url = "https://github.com/sagemath/sage/commit/ff58afe27c80c067a8965e1d70966e25d0355aaf.patch?full_index=1"; + hash = "sha256-gWoXwhUVXL2RSVLPRbxtlP0LCSEkJ9z1PJ1wKLXef1k="; + }) ]; patches = nixPatches ++ bugfixPatches ++ packageUpgradePatches; diff --git a/pkgs/by-name/sa/sage/sagelib.nix b/pkgs/by-name/sa/sage/sagelib.nix index f9a30e5c3159..ddc9da0d8a98 100644 --- a/pkgs/by-name/sa/sage/sagelib.nix +++ b/pkgs/by-name/sa/sage/sagelib.nix @@ -106,7 +106,7 @@ buildPythonPackage rec { ]; pythonRelaxDeps = [ - "networkx" + "sphinx" ]; buildInputs = [ diff --git a/pkgs/by-name/sh/sherpa-onnx/espeak.patch b/pkgs/by-name/sh/sherpa-onnx/espeak.patch new file mode 100644 index 000000000000..32ab4c2701d2 --- /dev/null +++ b/pkgs/by-name/sh/sherpa-onnx/espeak.patch @@ -0,0 +1,18 @@ +diff --git a/cmake/espeak-ng-for-piper.cmake b/cmake/espeak-ng-for-piper.cmake +index b54a0a6..3576360 100644 +--- a/cmake/espeak-ng-for-piper.cmake ++++ b/cmake/espeak-ng-for-piper.cmake +@@ -108,11 +108,13 @@ function(download_espeak_ng_for_piper) + -Wno-format-truncation + -Wno-uninitialized + -Wno-format ++ -Wno-error=format-security + ) + + if(TARGET espeak-ng-bin) + target_compile_options(espeak-ng-bin PRIVATE + -Wno-unused-result ++ -Wno-error=format-security + ) + endif() + endif() diff --git a/pkgs/by-name/sh/sherpa-onnx/package.nix b/pkgs/by-name/sh/sherpa-onnx/package.nix new file mode 100644 index 000000000000..c2b83cd8ad23 --- /dev/null +++ b/pkgs/by-name/sh/sherpa-onnx/package.nix @@ -0,0 +1,225 @@ +{ + lib, + config, + stdenv, + fetchFromGitHub, + fetchurl, + cmake, + python3Packages ? { }, + nix-update-script, + + # dependencies + alsa-lib, + eigen, + gtest, + nlohmann_json, + onnxruntime, + + # optional features + cudaSupport ? config.cudaSupport, + websocketSupport ? true, + pythonSupport ? true, + +}: + +let + # Pre-fetched dependencies for cmake FetchContent. + # These are copied into the source tree so cmake finds them locally + # instead of trying to download them (which fails in the sandbox). + cache = [ + { + name = "espeak-ng-f6fed6c58b5e0998b8e68c6610125e2d07d595a7.zip"; + src = fetchurl { + url = "https://github.com/csukuangfj/espeak-ng/archive/f6fed6c58b5e0998b8e68c6610125e2d07d595a7.zip"; + hash = "sha256-cMv0BQ56AUquGRQLBeVySdpHIPVhKEWfvjqTvq+XGuY="; + }; + } + { + name = "kaldi-native-fbank-1.22.3.tar.gz"; + src = fetchurl { + url = "https://github.com/csukuangfj/kaldi-native-fbank/archive/refs/tags/v1.22.3.tar.gz"; + hash = "sha256-kXbMZvx84e34XPNVsG4yDFfbYpffdCd/V1GDRoiTz2E="; + }; + } + { + name = "simple-sentencepiece-0.7.tar.gz"; + src = fetchurl { + url = "https://github.com/pkufool/simple-sentencepiece/archive/refs/tags/v0.7.tar.gz"; + hash = "sha256-F0ioIgYKNbqp9mCfhO/I61TcDnS57OPYI2e3EZ/cda8="; + }; + } + { + name = "kaldifst-1.7.17.tar.gz"; + src = fetchurl { + url = "https://github.com/k2-fsa/kaldifst/archive/refs/tags/v1.7.17.tar.gz"; + hash = "sha256-xLcBojpAC9qAMlhrAsfg1egTp2WDLfYMI+bfnmKwEPQ="; + }; + } + { + name = "kaldi-decoder-0.2.11.tar.gz"; + src = fetchurl { + url = "https://github.com/k2-fsa/kaldi-decoder/archive/refs/tags/v0.2.11.tar.gz"; + hash = "sha256-hcpGJTVZJUHrW6bSGEMAnPNHOPUbKLcfhIgqNpS1KL8="; + }; + } + { + name = "cargs-1.0.3.tar.gz"; + src = fetchurl { + url = "https://github.com/likle/cargs/archive/refs/tags/v1.0.3.tar.gz"; + hash = "sha256-3bolvTXpxsdbxwbBJgAbjOjghNQO83BQ5qppY+g264s="; + }; + } + { + name = "piper-phonemize-78a788e0b719013401572d70fef372e77bff8e43.zip"; + src = fetchurl { + url = "https://github.com/csukuangfj/piper-phonemize/archive/78a788e0b719013401572d70fef372e77bff8e43.zip"; + hash = "sha256-iWQaRkiaSJh1RkPOV72pybVLTKRkhf3AK/DchLhmZF0="; + }; + } + { + name = "openfst-sherpa-onnx-2024-06-19.tar.gz"; + src = fetchurl { + url = "https://github.com/csukuangfj/openfst/archive/refs/tags/sherpa-onnx-2024-06-19.tar.gz"; + hash = "sha256-XJjoLMUJxWGFAt3khguOoE2EOFDtV+bWtZC2RLJohT0="; + }; + } + { + name = "hclust-cpp-2024-09-29.tar.gz"; + src = fetchurl { + url = "https://github.com/csukuangfj/hclust-cpp/archive/refs/tags/2024-09-29.tar.gz"; + hash = "sha256-q6tRRIo8tUJyquB1IpcDBuCyzGR51Z17Geeu5NbO3TM="; + }; + } + { + name = "kissfft-febd4caeed32e33ad8b2e0bb5ea77542c40f18ec.zip"; + src = fetchurl { + url = "https://github.com/mborgerding/kissfft/archive/febd4caeed32e33ad8b2e0bb5ea77542c40f18ec.zip"; + hash = "sha256-SXED5mQWjr45WAt1etvmFvbPhaFlcq9YHKe8QtCrE/0="; + }; + } + ] + ++ lib.optionals websocketSupport [ + { + name = "asio-asio-1-24-0.tar.gz"; + src = fetchurl { + url = "https://github.com/chriskohlhoff/asio/archive/refs/tags/asio-1-24-0.tar.gz"; + hash = "sha256-y8qroPZnInh7Gnwzr+G++zoBK1rzrX2n/w9rjJt6ils="; + }; + } + { + name = "websocketpp-b9aeec6eaf3d5610503439b4fae3581d9aff08e8.zip"; + src = fetchurl { + url = "https://github.com/zaphoyd/websocketpp/archive/b9aeec6eaf3d5610503439b4fae3581d9aff08e8.zip"; + hash = "sha256-E4UTXt6Bkaf7757ICZ48Wmc9SN8MFDlYIWzRaQVn9YM="; + }; + } + ]; +in +stdenv.mkDerivation (finalAttrs: { + pname = "sherpa-onnx"; + version = "1.12.25"; + + src = fetchFromGitHub { + owner = "k2-fsa"; + repo = "sherpa-onnx"; + tag = "v${finalAttrs.version}"; + hash = "sha256-NRiqk/YMk3vhlBRrmeMsJ544Xv1b7GCSMQD2ec+xi+k="; + }; + + outputs = [ "out" ] ++ lib.optionals pythonSupport [ "python" ]; + + separateDebugInfo = true; + + patches = [ + ./espeak.patch + ]; + + nativeBuildInputs = [ + cmake + ] + ++ lib.optionals pythonSupport ( + with python3Packages; + [ + python + ] + ); + + buildInputs = [ + onnxruntime + ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ + alsa-lib + ]; + + nativeCheckInputs = lib.optionals pythonSupport ( + with python3Packages; + [ + numpy + soundfile + ] + ); + + # Populate pre-fetched dependencies so cmake FetchContent finds them + # locally instead of attempting network downloads. + preConfigure = '' + ${lib.concatMapStringsSep "\n" (s: "cp ${s.src} ./${s.name}") cache} + ''; + + cmakeFlags = [ + (lib.cmakeBool "FETCHCONTENT_QUIET" false) + (lib.cmakeBool "BUILD_SHARED_LIBS" true) + (lib.cmakeBool "SHERPA_ONNX_ENABLE_WEBSOCKET" websocketSupport) + (lib.cmakeBool "SHERPA_ONNX_ENABLE_PORTAUDIO" false) + (lib.cmakeBool "SHERPA_ONNX_ENABLE_PYTHON" pythonSupport) + (lib.cmakeBool "SHERPA_ONNX_BUILD_C_API_EXAMPLES" false) + (lib.cmakeBool "SHERPA_ONNX_ENABLE_TESTS" true) + (lib.cmakeFeature "onnxruntime_SOURCE_DIR" "${onnxruntime.dev}") + (lib.cmakeBool "SHERPA_ONNX_ENABLE_GPU" cudaSupport) + # Use nixpkgs sources instead of vendored downloads where possible. + (lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_JSON" "${nlohmann_json.src}") + (lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_EIGEN" "${eigen.src}") + (lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_GOOGLETEST" "${gtest.src}") + "-Wno-dev" + ] + ++ lib.optionals pythonSupport [ + (lib.cmakeFeature "PYTHON_EXECUTABLE" (lib.getExe python3Packages.python)) + (lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_PYBIND11" "${python3Packages.pybind11.src}") + ]; + + # Place the native extension alongside the Python source so that both + # checkPhase and postInstall can find a complete sherpa_onnx package. + # Upstream's __init__.py imports from sherpa_onnx.lib._sherpa_onnx. + postBuild = lib.optionalString pythonSupport '' + mkdir -p ../sherpa-onnx/python/sherpa_onnx/lib + cp lib/_sherpa_onnx*.so ../sherpa-onnx/python/sherpa_onnx/lib/ + ''; + + doCheck = true; + + # Use ctest directly because the default `make check` target includes clang-tidy. + checkPhase = '' + runHook preCheck + ctest --output-on-failure + runHook postCheck + ''; + + postInstall = lib.optionalString pythonSupport '' + mkdir -p $python + cp -r ../sherpa-onnx/python/sherpa_onnx $python/ + rm $out/lib/_sherpa_onnx*.so + ''; + + passthru = { + updateScript = nix-update-script { }; + }; + + meta = { + description = "Speech-to-text, text-to-speech, and speaker recognition using next-gen Kaldi with onnxruntime"; + homepage = "https://github.com/k2-fsa/sherpa-onnx"; + changelog = "https://github.com/k2-fsa/sherpa-onnx/releases/tag/v${finalAttrs.version}"; + license = lib.licenses.asl20; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ jaredmontoya ]; + mainProgram = "sherpa-onnx"; + }; +}) diff --git a/pkgs/by-name/so/sourcegit/package.nix b/pkgs/by-name/so/sourcegit/package.nix index e71bee15ac31..c172e11f4501 100644 --- a/pkgs/by-name/so/sourcegit/package.nix +++ b/pkgs/by-name/so/sourcegit/package.nix @@ -8,6 +8,7 @@ makeDesktopItem, libicns, + libGL, libxcursor, libxext, libxi, @@ -53,8 +54,10 @@ buildDotnetModule (finalAttrs: { # these are dlopen-ed at runtime # libxi is needed for right-click support + # libGL is needed for GPU-accelerated rendering (without it, Avalonia falls back to software rendering) # not sure about what the other ones are needed for, but I'll include them anyways runtimeDeps = [ + libGL libxcursor libxext libxi diff --git a/pkgs/by-name/st/stackit-cli/package.nix b/pkgs/by-name/st/stackit-cli/package.nix index 0411648ef130..9222b9af5fb2 100644 --- a/pkgs/by-name/st/stackit-cli/package.nix +++ b/pkgs/by-name/st/stackit-cli/package.nix @@ -12,13 +12,13 @@ buildGoModule (finalAttrs: { pname = "stackit-cli"; - version = "0.54.0"; + version = "0.54.1"; src = fetchFromGitHub { owner = "stackitcloud"; repo = "stackit-cli"; rev = "v${finalAttrs.version}"; - hash = "sha256-nSSL6NnuehKmGa4pYLy4uD+cu9J/8uvQF9VJywwi56s="; + hash = "sha256-yXWwOQ+cOKxXW+Ez7lJSt/9gpqOR1+QX4IJprGhdXBk="; }; vendorHash = "sha256-Hvwq6P7y5lNWX+uClrb5uk9d2ODs4Tavjf7m6A2DDrg="; diff --git a/pkgs/by-name/su/surface-control/package.nix b/pkgs/by-name/su/surface-control/package.nix index 4a2c337507df..3fcfe7e94fe8 100644 --- a/pkgs/by-name/su/surface-control/package.nix +++ b/pkgs/by-name/su/surface-control/package.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "surface-control"; - version = "0.4.12-1"; + version = "0.5.0-1"; src = fetchFromGitHub { owner = "linux-surface"; repo = "surface-control"; tag = "v${version}"; - hash = "sha256-SHueVZdughQ+EK2hcBYiYZIieQAQOkTc8b5uSOc6LOY="; + hash = "sha256-XPIHGDpq2x+P8i8b4nLlobR/BysdZX+7N9Pu2l/U4Gs="; }; - cargoHash = "sha256-KdlGlKCFnCFVUaeUV4YqPYEZ0zkVDqx/To9gMRs11y0="; + cargoHash = "sha256-K9nfDIEoI/p8DDKe2sFQjFn12zzb5VhKX4mTc0+Y8dE="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/tr/triton-llvm/package.nix b/pkgs/by-name/tr/triton-llvm/package.nix index 833609e70713..b8072db53644 100644 --- a/pkgs/by-name/tr/triton-llvm/package.nix +++ b/pkgs/by-name/tr/triton-llvm/package.nix @@ -68,7 +68,7 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "triton-llvm"; - version = "22.0.0-unstable-2025-07-15"; # See https://github.com/llvm/llvm-project/blob/main/cmake/Modules/LLVMVersion.cmake + version = "22.0.0-unstable-2025-09-26"; # See https://github.com/llvm/llvm-project/blob/main/cmake/Modules/LLVMVersion.cmake outputs = [ "out" @@ -84,8 +84,8 @@ stdenv.mkDerivation (finalAttrs: { src = fetchFromGitHub { owner = "llvm"; repo = "llvm-project"; - rev = "7d5de3033187c8a3bb4d2e322f5462cdaf49808f"; - hash = "sha256-ayW6sOZGvP3SBjfmpXvYQJrPOAElY0MEHPFvj2fq+bM="; + rev = "f6ded0be897e2878612dd903f7e8bb85448269e5"; + hash = "sha256-T76zHZZ2bp3Ye9GTV+MgbKqMbtmMGElMFsWuCkiWqrM="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/un/unified-memory-framework/package.nix b/pkgs/by-name/un/unified-memory-framework/package.nix index a41bf4644056..d384de438bd7 100644 --- a/pkgs/by-name/un/unified-memory-framework/package.nix +++ b/pkgs/by-name/un/unified-memory-framework/package.nix @@ -1,7 +1,6 @@ { stdenv, fetchFromGitHub, - fetchpatch, lib, cmake, ninja, @@ -25,7 +24,7 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "unified-memory-framework"; - version = "1.0.3"; + version = "1.1.0"; nativeBuildInputs = [ cmake @@ -60,17 +59,9 @@ stdenv.mkDerivation (finalAttrs: { owner = "oneapi-src"; repo = "unified-memory-framework"; tag = "v${finalAttrs.version}"; - hash = "sha256-j7qQwBetICf1sTz+ssZQLm9P0SiH68lcEvtV1YLuW5s="; + hash = "sha256-1Z65rNsUNeaeSJmxwpEHPbiU4KEDvyrWL9LyAWFsR1c="; }; - patches = [ - (fetchpatch { - name = "gtest-use-find_package.patch"; - url = "https://github.com/oneapi-src/unified-memory-framework/commit/503d302a72f719a3f11fce0e610f07a3793549d9.patch"; - hash = "sha256-T29pJuWGcj/Kfw3VNW5lNBG5OrBsB1UAvwroQ+km4Vs="; - }) - ]; - postPatch = '' # The CMake tries to find out the version via git. # Since we're not in a clone, git describe won't work. diff --git a/pkgs/by-name/ya/yamlscript/package.nix b/pkgs/by-name/ya/yamlscript/package.nix index bd4df58d6396..edd2c83b2d39 100644 --- a/pkgs/by-name/ya/yamlscript/package.nix +++ b/pkgs/by-name/ya/yamlscript/package.nix @@ -6,11 +6,11 @@ buildGraalvmNativeImage (finalAttrs: { pname = "yamlscript"; - version = "0.2.9"; + version = "0.2.8"; src = fetchurl { url = "https://github.com/yaml/yamlscript/releases/download/${finalAttrs.version}/yamlscript.cli-${finalAttrs.version}-standalone.jar"; - hash = "sha256-N3F2lZ81hcs2ul4AndSxSPic4hmeGAPXDS/K8iDihtw="; + hash = "sha256-qA8j14xUWtg2988ahklawnRZl9u3pvogjjXXs8byE2g="; }; extraNativeImageBuildArgs = [ diff --git a/pkgs/development/beam-modules/build-rebar3.nix b/pkgs/development/beam-modules/build-rebar3.nix index a4c9ca4eb8df..11b1c8b44e52 100644 --- a/pkgs/development/beam-modules/build-rebar3.nix +++ b/pkgs/development/beam-modules/build-rebar3.nix @@ -1,132 +1,85 @@ { + erlang, + beamCopySourceHook, + beamModuleInstallHook, + rebar3CompileHook, + rebar3WithPlugins, + rebarDevendorPatchHook, + + libyaml, + openssl, + + lib, stdenv, writeText, - erlang, - rebar3WithPlugins, - openssl, - libyaml, - lib, }: -{ - name, - version, - src, - setupHook ? null, - buildInputs ? [ ], - beamDeps ? [ ], - buildPlugins ? [ ], - postPatch ? "", - installPhase ? null, - buildPhase ? null, - configurePhase ? null, - meta ? { }, - erlangCompilerOptions ? [ ], - # Deterministic Erlang builds remove full system paths from debug information - # among other things to keep builds more reproducible. See their docs for more: - # https://www.erlang.org/doc/man/compile - erlangDeterministicBuilds ? true, - ... -}@attrs: +lib.extendMkDerivation { + constructDrv = stdenv.mkDerivation; + excludeDrvArgNames = [ + "beamDeps" + "buildPlugins" + ]; + extendDrvArgs = + finalAttrs: + { + beamDeps ? [ ], + buildPlugins ? [ ], -let - rebar3 = rebar3WithPlugins { - plugins = buildPlugins; - }; + enableDebugInfo ? false, + erlangCompilerOptions ? [ ], + # Deterministic Erlang builds remove full system paths from debug information + # among other things to keep builds more reproducible. See their docs for more: + # https://www.erlang.org/doc/man/compile + erlangDeterministicBuilds ? true, + ... + }@args: + let + rebar3Custom = rebar3WithPlugins { + plugins = buildPlugins; + }; + in + { + pname = args.name; + name = "erlang${erlang.version}-${args.name}-${finalAttrs.version}"; - shell = - drv: - stdenv.mkDerivation { - name = "interactive-shell-${drv.name}"; - buildInputs = [ drv ]; - }; + nativeBuildInputs = (args.nativeBuildInputs or [ ]) ++ [ + rebarDevendorPatchHook + beamCopySourceHook + beamModuleInstallHook + rebar3CompileHook + ]; - customPhases = lib.filterAttrs (_: v: v != null) { - inherit - setupHook - configurePhase - buildPhase - installPhase - ; - }; + buildInputs = (args.buildInputs or [ ]) ++ [ + erlang + rebar3Custom + openssl + libyaml + ]; - pkg = - self: - stdenv.mkDerivation ( - attrs - // { - - pname = name; - name = "${name}-${version}"; - inherit version; - - buildInputs = buildInputs ++ [ - erlang - rebar3 - openssl - libyaml - ]; - propagatedBuildInputs = lib.unique beamDeps; - - inherit src; + propagatedBuildInputs = lib.unique beamDeps; + env = { ERL_COMPILER_OPTIONS = let options = erlangCompilerOptions ++ lib.optionals erlangDeterministicBuilds [ "deterministic" ]; in "[${lib.concatStringsSep "," options}]"; - # stripping does not have any effect on beam files - # it is however needed for dependencies with NIFs - # false is the default but we keep this for readability - dontStrip = false; + beamModuleName = args.name; + }; - setupHook = writeText "setupHook.sh" '' - addToSearchPath ERL_LIBS "$1/lib/erlang/lib/" - ''; + setupHook = writeText "setupHook.sh" '' + addToSearchPath ERL_LIBS "$1/lib/erlang/lib/" + ''; - postPatch = '' - rm -f rebar rebar3 - '' - + postPatch; - - preConfigure = '' - # Copy the source so it can be used by mix projects - # do this before building to avoid build artifacts but after patching - # to include any modifications - mkdir -p $out/src - cp -r "." "$out/src" - ''; - - buildPhase = '' - runHook preBuild - HOME=. rebar3 bare compile --paths "." - runHook postBuild - ''; - - installPhase = '' - runHook preInstall - mkdir -p "$out/lib/erlang/lib/${name}-${version}" - for reldir in src ebin priv include; do - [ -d "$reldir" ] || continue - # $out/lib/erlang/lib is a convention used in nixpkgs for compiled BEAM packages - cp -Hrt "$out/lib/erlang/lib/${name}-${version}" "$reldir" - done - runHook postInstall - ''; - - meta = { - inherit (erlang.meta) platforms; - } - // meta; - - passthru = { - packageName = name; - env = shell self; - inherit beamDeps; - }; + meta = { + inherit (erlang.meta) platforms; } - // customPhases - ); -in -lib.fix pkg + // (args.meta or { }); + + passthru = { + inherit beamDeps; + }; + }; +} diff --git a/pkgs/development/beam-modules/default.nix b/pkgs/development/beam-modules/default.nix index 3982e43a1486..7a309226187d 100644 --- a/pkgs/development/beam-modules/default.nix +++ b/pkgs/development/beam-modules/default.nix @@ -89,6 +89,7 @@ let }; elixir-ls = callPackage ./elixir-ls { inherit elixir; }; + expert = callPackage ./expert { }; lfe = callPackage ../interpreters/lfe { inherit erlang buildRebar3 fetchHex; }; @@ -105,6 +106,8 @@ let mixBuildDirHook mixCompileHook mixAppConfigPatchHook + rebar3CompileHook + rebarDevendorPatchHook ; }; in diff --git a/pkgs/development/beam-modules/expert/default.nix b/pkgs/development/beam-modules/expert/default.nix new file mode 100644 index 000000000000..057994457b85 --- /dev/null +++ b/pkgs/development/beam-modules/expert/default.nix @@ -0,0 +1,75 @@ +{ + erlang, + fetchFromGitHub, + mixRelease, + lib, + fetchMixDeps, +}: +let + version = "0.1.0-rc.2"; + + src = fetchFromGitHub { + owner = "elixir-lang"; + repo = "expert"; + tag = "v${version}"; + hash = "sha256-5BGI0bLGCvYyMT4GNHLalin1jg9UW6qtFC7B8OssHCc="; + }; + + engineDeps = fetchMixDeps { + pname = "mix-deps-expert-engine"; + + inherit src version; + hash = "sha256-PTyPLyo85N0BltX9oIRhHDGKgmNScb10N129wC8o6Q4="; + + preConfigure = '' + cd apps/engine + ''; + }; +in +mixRelease rec { + pname = "expert"; + inherit src version; + + mixFodDeps = fetchMixDeps { + pname = "mix-deps-${pname}"; + inherit src version; + hash = "sha256-T5OSjoglZfQa1lMO2lOZJ7yWoyxf6m33rKGuy4zq2AE="; + + preConfigure = '' + cd apps/expert + ''; + }; + + mixReleaseName = "plain"; + + preConfigure = '' + ln -sv ${engineDeps} apps/engine/deps + + cd apps/expert + ''; + + postInstall = '' + mv $out/bin/plain $out/bin/expert + + wrapProgram $out/bin/expert --add-flag "eval" --add-flag "System.no_halt(true); Application.ensure_all_started(:xp_expert)" + ''; + + removeCookie = false; + + passthru = { + inherit engineDeps; + }; + + meta = { + homepage = "https://github.com/elixir-lang/expert"; + changelog = "https://github.com/elixir-lang/expert/releases/tag/v${version}"; + description = "Official Elixir Language Server Protocol implementation"; + longDescription = '' + Expert is the official language server implementation for the Elixir programming language. + ''; + license = lib.licenses.asl20; + inherit (erlang.meta) platforms; + mainProgram = "expert"; + teams = [ lib.teams.beam ]; + }; +} diff --git a/pkgs/development/beam-modules/hooks/beam-module-install-hook.sh b/pkgs/development/beam-modules/hooks/beam-module-install-hook.sh index 6591f4bb70f7..ba66032751bc 100644 --- a/pkgs/development/beam-modules/hooks/beam-module-install-hook.sh +++ b/pkgs/development/beam-modules/hooks/beam-module-install-hook.sh @@ -9,7 +9,15 @@ beamModuleInstallHook() { mkdir -p "$out/lib/erlang/lib/${beamModuleName}-${version}" - for reldir in _build/{$MIX_BUILD_PREFIX,shared}/lib/${beamModuleName}/{src,ebin,priv,include}; do + # default to rebar3 + local fromDir=(./{ebin,priv,include}) + + # replace if mix project + if [ -n "$MIX_BUILD_PREFIX" ]; then + fromDir=(_build/{$MIX_BUILD_PREFIX,shared}/lib/"${beamModuleName}"/{src,ebin,priv,include}) + fi + + for reldir in "${fromDir[@]}"; do if test -d "$reldir"; then # Some builds produce symlinks (eg: phoenix priv directory). They must # be followed with -H flag. diff --git a/pkgs/development/beam-modules/hooks/default.nix b/pkgs/development/beam-modules/hooks/default.nix index 000363c9d150..1be544b2f2c7 100644 --- a/pkgs/development/beam-modules/hooks/default.nix +++ b/pkgs/development/beam-modules/hooks/default.nix @@ -19,4 +19,12 @@ mixAppConfigPatchHook = makeSetupHook { name = "mix-config-patch-hook.sh"; } ./mix-app-config-patch-hook.sh; + + rebar3CompileHook = makeSetupHook { + name = "rebar3-compile-hook.sh"; + } ./rebar3-compile-hook.sh; + + rebarDevendorPatchHook = makeSetupHook { + name = "rebar-devendor-patch-hook.sh"; + } ./rebar-devendor-patch-hook.sh; } diff --git a/pkgs/development/beam-modules/hooks/rebar-devendor-patch-hook.sh b/pkgs/development/beam-modules/hooks/rebar-devendor-patch-hook.sh new file mode 100644 index 000000000000..032bf9b986fe --- /dev/null +++ b/pkgs/development/beam-modules/hooks/rebar-devendor-patch-hook.sh @@ -0,0 +1,13 @@ +# shellcheck shell=bash +# +# It's common to vendor a copy of rebar/rebar3 in repos, but we want to remove those + +rebarDevendorPatchHook() { + echo "Executing rebarDevendorPatchHook" + + rm -f rebar rebar + + echo "Finished rebarDevendorPatchHook" +} + +prePatchHooks+=(rebarDevendorPatchHook) diff --git a/pkgs/development/beam-modules/hooks/rebar3-compile-hook.sh b/pkgs/development/beam-modules/hooks/rebar3-compile-hook.sh new file mode 100755 index 000000000000..2ef0c864ece2 --- /dev/null +++ b/pkgs/development/beam-modules/hooks/rebar3-compile-hook.sh @@ -0,0 +1,17 @@ +# shellcheck shell=bash + +rebar3CompileHook() { + echo "Executing rebar3CompileHook" + + runHook preBuild + + HOME=. rebar3 bare compile --paths "." + + runHook postBuild + + echo "Finished rebar3CompileHook" +} + +if [ -z "${dontRebar3Compile-}" ] && [ -z "${buildPhase-}" ]; then + buildPhase=rebar3CompileHook +fi diff --git a/pkgs/development/libraries/libinput/default.nix b/pkgs/development/libraries/libinput/default.nix index 2d474b660a1d..7da2a96338ca 100644 --- a/pkgs/development/libraries/libinput/default.nix +++ b/pkgs/development/libraries/libinput/default.nix @@ -9,7 +9,7 @@ libevdev, mtdev, udev, - wacomSupport ? true, + wacomSupport ? stdenv.hostPlatform.isLinux, libwacom, documentationSupport ? false, doxygen, @@ -26,6 +26,8 @@ nixosTests, wayland-scanner, udevCheckHook, + epoll-shim, + libudev-devd, }: let @@ -95,6 +97,9 @@ stdenv.mkDerivation rec { ] )) ] + ++ lib.optionals stdenv.hostPlatform.isFreeBSD [ + epoll-shim + ] ++ lib.optionals wacomSupport [ libwacom ] @@ -106,9 +111,9 @@ stdenv.mkDerivation rec { wayland-scanner ]; - propagatedBuildInputs = [ - udev - ]; + propagatedBuildInputs = + lib.optional stdenv.hostPlatform.isLinux udev + ++ lib.optional stdenv.hostPlatform.isFreeBSD libudev-devd; nativeCheckInputs = [ check @@ -122,6 +127,9 @@ stdenv.mkDerivation rec { (mkFlag wacomSupport "libwacom") "--sysconfdir=/etc" "--libexecdir=${placeholder "bin"}/libexec" + ] + ++ lib.optionals stdenv.hostPlatform.isBSD [ + "-Depoll-dir=${epoll-shim}" ]; doCheck = testsSupport && stdenv.hostPlatform == stdenv.buildPlatform; @@ -152,7 +160,7 @@ stdenv.mkDerivation rec { mainProgram = "libinput"; homepage = "https://www.freedesktop.org/wiki/Software/libinput/"; license = lib.licenses.mit; - platforms = lib.platforms.linux; + platforms = lib.platforms.linux ++ lib.platforms.freebsd; maintainers = [ ]; teams = [ lib.teams.freedesktop ]; changelog = "https://gitlab.freedesktop.org/libinput/libinput/-/releases/${version}"; diff --git a/pkgs/development/python-modules/compressed-tensors/default.nix b/pkgs/development/python-modules/compressed-tensors/default.nix index c2c93147d64a..5b827940bd6a 100644 --- a/pkgs/development/python-modules/compressed-tensors/default.nix +++ b/pkgs/development/python-modules/compressed-tensors/default.nix @@ -1,14 +1,18 @@ { lib, + stdenv, buildPythonPackage, fetchFromGitHub, + pythonAtLeast, # build-system setuptools, setuptools-scm, + llvmPackages, # dependencies frozendict, + loguru, pydantic, torch, transformers, @@ -19,7 +23,7 @@ pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "compressed-tensors"; version = "0.13.0"; pyproject = true; @@ -28,10 +32,13 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "neuralmagic"; repo = "compressed-tensors"; - tag = version; + tag = finalAttrs.version; hash = "sha256-XsQRP186ISarMMES3P+ov4t/1KKJdl0tXBrfpjyM3XA="; }; + # RuntimeError("torch.compile is not supported on Python 3.14+") + disabled = pythonAtLeast "3.14"; + postPatch = '' substituteInPlace pyproject.toml \ --replace-fail "setuptools_scm==8.2.0" "setuptools_scm" @@ -42,8 +49,11 @@ buildPythonPackage rec { setuptools-scm ]; + buildInputs = lib.optional stdenv.cc.isClang llvmPackages.openmp; + dependencies = [ frozendict + loguru pydantic torch transformers @@ -72,18 +82,24 @@ buildPythonPackage rec { "test_model_forward_pass" "test_save_compressed_model" "test_target_prioritization" + "test_expand_targets_with_llama_stories" ]; disabledTestPaths = [ # these try to download models from HF Hub "tests/test_quantization/lifecycle/test_apply.py" + # RuntimeError: The weights trying to be saved contained shared tensors + "tests/test_transform/factory/test_serialization.py::test_serialization[True-hadamard]" + "tests/test_transform/factory/test_serialization.py::test_serialization[True-random-hadamard]" + "tests/test_transform/factory/test_serialization.py::test_serialization[False-hadamard]" + "tests/test_transform/factory/test_serialization.py::test_serialization[False-random-hadamard]" ]; meta = { description = "Safetensors extension to efficiently store sparse quantized tensors on disk"; homepage = "https://github.com/neuralmagic/compressed-tensors"; - changelog = "https://github.com/neuralmagic/compressed-tensors/releases/tag/${src.tag}"; + changelog = "https://github.com/neuralmagic/compressed-tensors/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.asl20; - maintainers = [ ]; + maintainers = with lib.maintainers; [ sarahec ]; }; -} +}) diff --git a/pkgs/development/python-modules/flatlatex/default.nix b/pkgs/development/python-modules/flatlatex/default.nix index 78ae40b72ee6..3cf6702109fc 100644 --- a/pkgs/development/python-modules/flatlatex/default.nix +++ b/pkgs/development/python-modules/flatlatex/default.nix @@ -2,6 +2,7 @@ lib, buildPythonPackage, fetchPypi, + pythonAtLeast, setuptools, pytestCheckHook, regex, @@ -17,6 +18,8 @@ buildPythonPackage rec { hash = "sha256-UXDhvNT8y1K9vf8wCxS2hzBIO8RvaiqJ964rsCTk0Tk="; }; + disabled = pythonAtLeast "3.14"; + build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/gguf/default.nix b/pkgs/development/python-modules/gguf/default.nix index def6e73ea671..e1adc1ffe18f 100644 --- a/pkgs/development/python-modules/gguf/default.nix +++ b/pkgs/development/python-modules/gguf/default.nix @@ -10,26 +10,27 @@ numpy, pyside6, pyyaml, + requests, sentencepiece, tqdm, - # check inputs + # tests pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "gguf"; - version = "7789"; + version = "8147"; pyproject = true; src = fetchFromGitHub { owner = "ggml-org"; repo = "llama.cpp"; - tag = "b${version}"; - hash = "sha256-EQYyRSptjEmhe6AaOs3KV0N4aoGvK8Z+WBKacEYW8Wo="; + tag = "b${finalAttrs.version}"; + hash = "sha256-/r/lWt+G14BsNqTBqeK4Po4QHU0GkpEBbIvt5rqB4jc="; }; - sourceRoot = "${src.name}/gguf-py"; + sourceRoot = "${finalAttrs.src.name}/gguf-py"; build-system = [ poetry-core ]; @@ -37,6 +38,7 @@ buildPythonPackage rec { numpy pyside6 pyyaml + requests sentencepiece tqdm ]; @@ -54,4 +56,4 @@ buildPythonPackage rec { sarahec ]; }; -} +}) diff --git a/pkgs/development/python-modules/iamdata/default.nix b/pkgs/development/python-modules/iamdata/default.nix index d2d6d91078fd..7cbd712f0911 100644 --- a/pkgs/development/python-modules/iamdata/default.nix +++ b/pkgs/development/python-modules/iamdata/default.nix @@ -8,14 +8,14 @@ buildPythonPackage (finalAttrs: { pname = "iamdata"; - version = "0.1.202602221"; + version = "0.1.202602241"; pyproject = true; src = fetchFromGitHub { owner = "cloud-copilot"; repo = "iam-data-python"; tag = "v${finalAttrs.version}"; - hash = "sha256-KvNyKluF+xKaGRcommJYZcnFetOdBZUhEcIx6YjM2y8="; + hash = "sha256-iPKGnuyzPG9fRipdcJFWrWuen02f6xHr1NyUdBFyQiI="; }; __darwinAllowLocalNetworking = true; diff --git a/pkgs/development/python-modules/inscriptis/default.nix b/pkgs/development/python-modules/inscriptis/default.nix index c07234e0ae06..57318a912e09 100644 --- a/pkgs/development/python-modules/inscriptis/default.nix +++ b/pkgs/development/python-modules/inscriptis/default.nix @@ -2,11 +2,12 @@ lib, buildPythonPackage, fetchFromGitHub, - poetry-core, + hatchling, lxml, fastapi, httpx, pytestCheckHook, + pytest-cov-stub, requests, }: @@ -22,7 +23,7 @@ buildPythonPackage rec { hash = "sha256-m1LZiGu79I9fMQXtL1MuzHxUd6KSwuc87Edkt9sp0DE="; }; - build-system = [ poetry-core ]; + build-system = [ hatchling ]; dependencies = [ lxml @@ -33,8 +34,11 @@ buildPythonPackage rec { fastapi httpx pytestCheckHook + pytest-cov-stub ]; + pythonRelaxDeps = [ "lxml" ]; + pythonImportsCheck = [ "inscriptis" ]; meta = { diff --git a/pkgs/development/python-modules/jupyter-sphinx/default.nix b/pkgs/development/python-modules/jupyter-sphinx/default.nix index ecde744368d1..4637ea3f1146 100644 --- a/pkgs/development/python-modules/jupyter-sphinx/default.nix +++ b/pkgs/development/python-modules/jupyter-sphinx/default.nix @@ -42,10 +42,15 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; disabledTests = [ - # https://github.com/jupyter/jupyter-sphinx/issues/280" + # https://github.com/jupyter/jupyter-sphinx/issues/280 "test_builder_priority" ]; + pytestFlags = [ + # https://github.com/jupyter/jupyter-sphinx/issues/287 + "-Wignore::sphinx.deprecation.RemovedInSphinx11Warning" + ]; + preCheck = '' export HOME=$TMPDIR ''; diff --git a/pkgs/development/python-modules/jupytext/default.nix b/pkgs/development/python-modules/jupytext/default.nix index c4fc55b2bd62..e84ff2351ff3 100644 --- a/pkgs/development/python-modules/jupytext/default.nix +++ b/pkgs/development/python-modules/jupytext/default.nix @@ -108,7 +108,11 @@ buildPythonPackage rec { "tests/external" ]; - disabledTests = lib.optionals stdenv.hostPlatform.isDarwin [ + disabledTests = [ + # Fails due to whitespace differences in the outputs + "test_async_and_sync_files_are_in_sync" + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ # requires access to trash "test_load_save_rename" ]; diff --git a/pkgs/development/python-modules/llm-gemini/default.nix b/pkgs/development/python-modules/llm-gemini/default.nix index 8f456428bd64..087136ba0b7e 100644 --- a/pkgs/development/python-modules/llm-gemini/default.nix +++ b/pkgs/development/python-modules/llm-gemini/default.nix @@ -15,14 +15,14 @@ }: buildPythonPackage rec { pname = "llm-gemini"; - version = "0.28.2"; + version = "0.29"; pyproject = true; src = fetchFromGitHub { owner = "simonw"; repo = "llm-gemini"; tag = version; - hash = "sha256-lPap9EWVue7VdqDQ5io5Al53gzfChuylJChDUIMBDow="; + hash = "sha256-6UqQJDPJIprxpZCrPT/pGpghvCWQpseodrJfcKgRtaA="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/mkdocs-jupyter/default.nix b/pkgs/development/python-modules/mkdocs-jupyter/default.nix index b03f7196e234..6d7f0ee85296 100644 --- a/pkgs/development/python-modules/mkdocs-jupyter/default.nix +++ b/pkgs/development/python-modules/mkdocs-jupyter/default.nix @@ -11,6 +11,7 @@ pygments, pytestCheckHook, pytest-cov-stub, + writableTmpDirAsHomeHook, }: buildPythonPackage rec { @@ -24,10 +25,17 @@ buildPythonPackage rec { hash = "sha256-DpJy/0lH4OxoPJJCOkv7QqJkd8EDqxpquCd+LcyPev4="; }; - pythonRelaxDeps = [ "nbconvert" ]; + pythonRelaxDeps = [ + "ipykernel" + "nbconvert" + ]; build-system = [ hatchling ]; + nativeBuildInputs = [ + writableTmpDirAsHomeHook + ]; + dependencies = [ ipykernel jupytext diff --git a/pkgs/development/python-modules/ocrmypdf/default.nix b/pkgs/development/python-modules/ocrmypdf/default.nix index 8081bd64140a..9daae19eef05 100644 --- a/pkgs/development/python-modules/ocrmypdf/default.nix +++ b/pkgs/development/python-modules/ocrmypdf/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { pname = "ocrmypdf"; - version = "17.1.0"; + version = "17.3.0"; pyproject = true; src = fetchFromGitHub { @@ -45,7 +45,7 @@ buildPythonPackage rec { postFetch = '' rm "$out/.git_archival.txt" ''; - hash = "sha256-MlsrssmuEzFXy+N6kWjkF3wtcDCncjYmAi43PUeYuJg="; + hash = "sha256-/R/W8TMBaFBTjPiOIroZ1CNQAKMTLJH+cQvY2177e0U="; }; patches = [ diff --git a/pkgs/development/python-modules/ocrmypdf/paths.patch b/pkgs/development/python-modules/ocrmypdf/paths.patch index 164b7f66a4dc..ad3741760b43 100644 --- a/pkgs/development/python-modules/ocrmypdf/paths.patch +++ b/pkgs/development/python-modules/ocrmypdf/paths.patch @@ -1,8 +1,8 @@ diff --git a/src/ocrmypdf/_exec/ghostscript.py b/src/ocrmypdf/_exec/ghostscript.py -index eaa48117..30201d97 100644 +index ec9017ca..0986641d 100644 --- a/src/ocrmypdf/_exec/ghostscript.py +++ b/src/ocrmypdf/_exec/ghostscript.py -@@ -31,7 +31,7 @@ COLOR_CONVERSION_STRATEGIES = frozenset( +@@ -35,7 +35,7 @@ COLOR_CONVERSION_STRATEGIES = frozenset( ] ) # Ghostscript executable - gswin32c is not supported @@ -12,7 +12,7 @@ index eaa48117..30201d97 100644 log = logging.getLogger(__name__) diff --git a/src/ocrmypdf/_exec/jbig2enc.py b/src/ocrmypdf/_exec/jbig2enc.py -index 1c6dd5fe..b689a091 100644 +index 736de67e..d8c24ebd 100644 --- a/src/ocrmypdf/_exec/jbig2enc.py +++ b/src/ocrmypdf/_exec/jbig2enc.py @@ -15,7 +15,7 @@ from ocrmypdf.subprocess import get_version, run @@ -24,16 +24,7 @@ index 1c6dd5fe..b689a091 100644 except CalledProcessError as e: # TeX Live for Windows provides an incompatible jbig2.EXE which may # be on the PATH. -@@ -33,7 +33,7 @@ def available(): - - def convert_group(cwd, infiles, out_prefix, threshold): - args = [ -- 'jbig2', -+ '@jbig2@', - '-b', - out_prefix, - '--symbol-mode', # symbol mode (lossy) -@@ -50,7 +50,7 @@ def convert_group(cwd, infiles, out_prefix, threshold): +@@ -32,7 +32,7 @@ def available(): def convert_single(cwd, infile, outfile, threshold): @@ -65,10 +56,10 @@ index 5b8600d0..fcad771b 100644 '--skip-if-larger', '--quality', diff --git a/src/ocrmypdf/_exec/tesseract.py b/src/ocrmypdf/_exec/tesseract.py -index 102bdab8..bfef4400 100644 +index d41a0af7..b189b0de 100644 --- a/src/ocrmypdf/_exec/tesseract.py +++ b/src/ocrmypdf/_exec/tesseract.py -@@ -95,7 +95,7 @@ class TesseractVersion(Version): +@@ -116,7 +116,7 @@ class TesseractVersion(Version): def version() -> Version: @@ -77,7 +68,7 @@ index 102bdab8..bfef4400 100644 def has_thresholding() -> bool: -@@ -113,7 +113,7 @@ def get_languages() -> set[str]: +@@ -134,7 +134,7 @@ def get_languages() -> set[str]: msg += output return msg @@ -86,7 +77,7 @@ index 102bdab8..bfef4400 100644 try: proc = run( args_tess, -@@ -135,7 +135,7 @@ def get_languages() -> set[str]: +@@ -156,7 +156,7 @@ def get_languages() -> set[str]: def tess_base_args(langs: list[str], engine_mode: int | None) -> list[str]: @@ -96,10 +87,10 @@ index 102bdab8..bfef4400 100644 args.extend(['-l', '+'.join(langs)]) if engine_mode is not None: diff --git a/src/ocrmypdf/_exec/unpaper.py b/src/ocrmypdf/_exec/unpaper.py -index a5a92f4c..6cf56eb3 100644 +index 065fc9ef..4fab9313 100644 --- a/src/ocrmypdf/_exec/unpaper.py +++ b/src/ocrmypdf/_exec/unpaper.py -@@ -48,7 +48,7 @@ class UnpaperImageTooLargeError(Exception): +@@ -47,7 +47,7 @@ class UnpaperImageTooLargeError(Exception): def version() -> Version: @@ -108,7 +99,7 @@ index a5a92f4c..6cf56eb3 100644 @contextmanager -@@ -70,7 +70,7 @@ def _setup_unpaper_io(input_file: Path) -> Iterator[tuple[Path, Path, Path]]: +@@ -69,7 +69,7 @@ def _setup_unpaper_io(input_file: Path) -> Iterator[tuple[Path, Path, Path]]: def run_unpaper( input_file: Path, output_file: Path, *, dpi: DecFloat, mode_args: list[str] ) -> None: diff --git a/pkgs/development/python-modules/openvino/default.nix b/pkgs/development/python-modules/openvino/default.nix index a06892972b21..59fc50051a24 100644 --- a/pkgs/development/python-modules/openvino/default.nix +++ b/pkgs/development/python-modules/openvino/default.nix @@ -26,7 +26,6 @@ buildPythonPackage { pythonImportsCheck = [ "openvino" - "openvino.runtime" ]; meta = { diff --git a/pkgs/development/python-modules/pyiceberg/default.nix b/pkgs/development/python-modules/pyiceberg/default.nix index 874b44bc91c5..7487cae06d0c 100644 --- a/pkgs/development/python-modules/pyiceberg/default.nix +++ b/pkgs/development/python-modules/pyiceberg/default.nix @@ -209,6 +209,8 @@ buildPythonPackage (finalAttrs: { pytestFlags = [ # ResourceWarning: unclosed database in "-Wignore::ResourceWarning" + # Using `@model_validator` with mode='after' on a classmethod is deprecated + "-Wignore::pydantic.warnings.PydanticDeprecatedSince212" ]; preCheck = '' @@ -282,6 +284,10 @@ buildPythonPackage (finalAttrs: { # Hangs forever (from tests/io/test_pyarrow.py) "test_getting_length_of_file_gcs" + + # Timing sensitive + # AssertionError: assert 8 == 5 + "test_hive_wait_for_lock" ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ # ImportError: The pyarrow installation is not built with support for 'GcsFileSystem' diff --git a/pkgs/development/python-modules/pywemo/default.nix b/pkgs/development/python-modules/pywemo/default.nix index 09c14f283361..30583112b1c0 100644 --- a/pkgs/development/python-modules/pywemo/default.nix +++ b/pkgs/development/python-modules/pywemo/default.nix @@ -15,14 +15,14 @@ buildPythonPackage (finalAttrs: { pname = "pywemo"; - version = "2.1.1"; + version = "2.1.2"; pyproject = true; src = fetchFromGitHub { owner = "pywemo"; repo = "pywemo"; tag = finalAttrs.version; - hash = "sha256-IyUahdExD6YNl4vG/bogiLlO8JaRUEslmc5/ZAUMomQ="; + hash = "sha256-/F9MhPmWSLT/ieI21rzJXvjEkH8xBttJYPaQ1wcVWOk="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/ray/default.nix b/pkgs/development/python-modules/ray/default.nix index 964f00238393..9213f9e49d88 100644 --- a/pkgs/development/python-modules/ray/default.nix +++ b/pkgs/development/python-modules/ray/default.nix @@ -71,12 +71,9 @@ tensorboardx, }: -let +buildPythonPackage (finalAttrs: { pname = "ray"; - version = "2.53.0"; -in -buildPythonPackage rec { - inherit pname version; + version = "2.54.0"; format = "wheel"; disabled = pythonAtLeast "3.14"; @@ -93,27 +90,24 @@ buildPythonPackage rec { # Results are in ./ray-hashes.nix hashes = { x86_64-linux = { - cp310 = "sha256-TbtfzhNkdj8pdBBV9Qq+M89yY5cUH5zA6EXdPMlj5FU="; - cp311 = "sha256-6wAMF/cwEHH90VxExM06wPeVO7THwifmFxn+cEgZW80="; - cp312 = "sha256-FPRjY+m0zwwci02GI+wzfFvUCDd4MbXltQBnkwE3u8o="; - cp313 = "sha256-c9u6p5Yqf144qoz5SD4OmBcgXpiao9yFnHOMKvGuAd8="; + cp311 = "sha256-kouwkkWjxvfDwRO6jq/Gn5SNqWAtfzPoJR7N+XwVdhU="; + cp312 = "sha256-qXKv1ao92pnQsvNptfYuXdlYZat9N78uCg4NLPvZsyU="; + cp313 = "sha256-q4nmCJq7bkb7mP3ZbTmbMahS15EnzYrAB0bGHZPe+iw="; }; aarch64-linux = { - cp310 = "sha256-QQgoDYocuQ19aOXJVMNeY7i7mkuhX4jF59oOICVkdxI="; - cp311 = "sha256-oLu5iwsPJaPuB1yhAXHhJg5wtrxpDNUJ7NfOEiivhU0="; - cp312 = "sha256-ZeLOWNPca6o89Fgk2InBlo695WXuVN/YCpivjzGvjko="; - cp313 = "sha256-cZblNY38yCEb6GT0Xm3+SCcgLfKUrzx6dv+PvAgOBSI="; + cp311 = "sha256-SRrlargNiCLE6vTVu5bc8ypiMdjXt264A0QA65vhuxg="; + cp312 = "sha256-eVriHWt2QkXT9SG8WDNEbVhWnn396cV3dBfrKF2HRQ8="; + cp313 = "sha256-iVLCOoqpTxByjC0W4Nw3MtCaoOYlSAF1f/SUmEohT0U="; }; aarch64-darwin = { - cp310 = "sha256-TbkUoKbdYI+knAZpKaEoJ0Wi29c8ruZ9e4D+aEymW90="; - cp311 = "sha256-vT7Ew0J3bdrCOuKxCMZPWTn0F8zEh1kA1YbHyXhGMmk="; - cp312 = "sha256-2LldBH2UdJOAP7hBeuoxIl3KzasVr9x1uKI4kBlJ1Fc="; - cp313 = "sha256-hbRyq2+48RifjO+BkT/ZGyTdabP6fcyn4USCe9kk9sA="; + cp311 = "sha256-jjndVrR6Chgg1aWlQ4W75U0dZ+EJNzbRLY7U6Z0PpFU="; + cp312 = "sha256-z1wztLE4UOwkpb1fnZ4KgWH45Ya/0pflKRPRcN7ER/4="; + cp313 = "sha256-Wtd5Yf6hbGl6D7DlEhbdOcC+wohozeVKxmjt1Y0SuK4="; }; }; in fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; format = "wheel"; dist = pyShortVersion; python = pyShortVersion; @@ -265,7 +259,7 @@ buildPythonPackage rec { meta = { description = "Unified framework for scaling AI and Python applications"; homepage = "https://github.com/ray-project/ray"; - changelog = "https://github.com/ray-project/ray/releases/tag/ray-${version}"; + changelog = "https://github.com/ray-project/ray/releases/tag/ray-${finalAttrs.version}"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ billhuang ]; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; @@ -275,4 +269,4 @@ buildPythonPackage rec { "x86_64-linux" ]; }; -} +}) diff --git a/pkgs/development/python-modules/ray/prefetch.sh b/pkgs/development/python-modules/ray/prefetch.sh index 6be6d515c0b6..4bc36502e2e4 100755 --- a/pkgs/development/python-modules/ray/prefetch.sh +++ b/pkgs/development/python-modules/ray/prefetch.sh @@ -21,7 +21,7 @@ prefetch() { for system in "x86_64-linux" "aarch64-linux" "aarch64-darwin"; do echo "${system} = {" >>$outfile - for python_version in "310" "311" "312" "313"; do + for python_version in "311" "312" "313"; do prefetch "$python_version" "$system" done echo "};" >>$outfile diff --git a/pkgs/development/python-modules/rpy2-robjects/default.nix b/pkgs/development/python-modules/rpy2-robjects/default.nix index b2bd03fc682d..01e9e2e16602 100644 --- a/pkgs/development/python-modules/rpy2-robjects/default.nix +++ b/pkgs/development/python-modules/rpy2-robjects/default.nix @@ -53,6 +53,11 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; + pytestFlags = [ + # https://github.com/rpy2/rpy2/issues/1218 + "-Wignore::pytest.PytestRemovedIn9Warning" + ]; + meta = { homepage = "https://rpy2.github.io/"; description = "Python interface to R"; diff --git a/pkgs/development/python-modules/sherpa-onnx/default.nix b/pkgs/development/python-modules/sherpa-onnx/default.nix new file mode 100644 index 000000000000..cc35b5687bb2 --- /dev/null +++ b/pkgs/development/python-modules/sherpa-onnx/default.nix @@ -0,0 +1,31 @@ +{ + buildPythonPackage, + sherpa-onnx, + numpy, + python, +}: + +buildPythonPackage { + pname = "sherpa-onnx"; + inherit (sherpa-onnx) version; + pyproject = false; + + src = sherpa-onnx.python; + + dependencies = [ numpy ]; + + installPhase = '' + runHook preInstall + + mkdir -p $out/${python.sitePackages} + cp -Rv * $out/${python.sitePackages}/ + + runHook postInstall + ''; + + pythonImportsCheck = [ "sherpa_onnx" ]; + + meta = removeAttrs sherpa-onnx.meta [ "mainProgram" ] // { + description = "Python bindings for sherpa-onnx speech recognition"; + }; +} diff --git a/pkgs/development/python-modules/sphinx-prompt/default.nix b/pkgs/development/python-modules/sphinx-prompt/default.nix index 25f1ef9c4b0d..ab71f1e4733e 100644 --- a/pkgs/development/python-modules/sphinx-prompt/default.nix +++ b/pkgs/development/python-modules/sphinx-prompt/default.nix @@ -30,6 +30,9 @@ buildPythonPackage rec { postPatch = '' substituteInPlace pyproject.toml --replace-fail 'version = "0.0.0"' 'version = "${version}"' + # create the old sphinx-prompt directory for compatibility + # https://github.com/sbrunner/sphinx-prompt/issues/612 + cp -r sphinx{_,-}prompt ''; build-system = [ diff --git a/pkgs/development/python-modules/sqlcipher3/default.nix b/pkgs/development/python-modules/sqlcipher3/default.nix index 397b01d0e767..b4e4bfcd6787 100644 --- a/pkgs/development/python-modules/sqlcipher3/default.nix +++ b/pkgs/development/python-modules/sqlcipher3/default.nix @@ -19,6 +19,14 @@ buildPythonPackage { hash = "sha256-orZ1KJuoiJ84liWiHzoB8f8VmlUbW4j7qP2S2g4COAo="; }; + postPatch = '' + # Remove conan from build dependencies; it is used upstream to fetch + # OpenSSL at build time, but we provide it via buildInputs instead. + # setup.py already handles the missing conan case gracefully. + substituteInPlace pyproject.toml \ + --replace-fail '"conan>=2.0",' "" + ''; + build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/termgraph/default.nix b/pkgs/development/python-modules/termgraph/default.nix index 8eeef9940d16..1ed4c7eeb11d 100644 --- a/pkgs/development/python-modules/termgraph/default.nix +++ b/pkgs/development/python-modules/termgraph/default.nix @@ -2,6 +2,7 @@ buildPythonPackage, colorama, fetchFromGitHub, + hatchling, lib, pytestCheckHook, }: @@ -9,7 +10,7 @@ buildPythonPackage rec { pname = "termgraph"; version = "0.7.5"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "mkaz"; @@ -18,6 +19,8 @@ buildPythonPackage rec { hash = "sha256-DptokK79yAfQDuhN2d/HfcaRq//0pF81VkhMfz05Hb0="; }; + build-system = [ hatchling ]; + propagatedBuildInputs = [ colorama ]; nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/torch/source/default.nix b/pkgs/development/python-modules/torch/source/default.nix index d78c4ddba654..f16d1cb2cc82 100644 --- a/pkgs/development/python-modules/torch/source/default.nix +++ b/pkgs/development/python-modules/torch/source/default.nix @@ -5,6 +5,7 @@ fetchFromGitLab, git-unroll, buildPythonPackage, + fetchpatch, python, runCommand, writeShellScript, @@ -280,7 +281,7 @@ in buildPythonPackage.override { inherit stdenv; } (finalAttrs: { pname = "torch"; # Don't forget to update torch-bin to the same version. - version = "2.9.1"; + version = "2.10.0"; pyproject = true; outputs = [ @@ -304,16 +305,19 @@ buildPythonPackage.override { inherit stdenv; } (finalAttrs: { patches = [ ./clang19-template-warning.patch + # [CPUBLAS] Fix UB: use vector::resize() instead of reserve() before operator[] access + # Merged in https://github.com/pytorch/pytorch/pull/175315 + # TODO: drop at the next release + (fetchpatch { + name = "fix-ub-in-cpublas"; + url = "https://github.com/pytorch/pytorch/commit/f08aafa9e82c5ae142b97dbfcac1ebd5d9ca7fde.patch"; + hash = "sha256-J9QNKDWytA0nBpKr5q4kVnufyMEJHev0mfmyQCxog/w="; + }) ] ++ lib.optionals cudaSupport [ ./fix-cmake-cuda-toolkit.patch ./nvtx3-hpp-path-fix.patch ] - ++ lib.optionals stdenv.hostPlatform.isLinux [ - # Propagate CUPTI to Kineto by overriding the search path with environment variables. - # https://github.com/pytorch/pytorch/pull/108847 - ./pytorch-pr-108847.patch - ] ++ lib.optionals (lib.getName blas.provider == "mkl") [ # The CMake install tries to add some hardcoded rpaths, incompatible # with the Nix store, which fails. Simply remove this step to get diff --git a/pkgs/development/python-modules/torch/source/pytorch-pr-108847.patch b/pkgs/development/python-modules/torch/source/pytorch-pr-108847.patch deleted file mode 100644 index 9511191ca926..000000000000 --- a/pkgs/development/python-modules/torch/source/pytorch-pr-108847.patch +++ /dev/null @@ -1,31 +0,0 @@ -From bf4050edab9f294a8e0060c47f906cd7a80f25a2 Mon Sep 17 00:00:00 2001 -From: Samuel Ainsworth -Date: Sat, 9 Sep 2023 02:04:09 +0000 -Subject: [PATCH] Dependencies.cmake: support building against CUPTI outside of - CUDA_SOURCE_DIR - -Limitation discovered in https://github.com/NixOS/nixpkgs/pull/249259. ---- - cmake/Dependencies.cmake | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/cmake/Dependencies.cmake b/cmake/Dependencies.cmake -index 0602d534dc4c14..5f6a5f79f3e3dc 100644 ---- a/cmake/Dependencies.cmake -+++ b/cmake/Dependencies.cmake -@@ -1879,6 +1879,7 @@ if(USE_KINETO) - ${CUDA_SOURCE_DIR}/extras/CUPTI/lib64 - ${CUDA_SOURCE_DIR}/lib - ${CUDA_SOURCE_DIR}/lib64 -+ $ENV{CUPTI_LIBRARY_DIR} - NO_DEFAULT_PATH) - - find_path(CUPTI_INCLUDE_DIR cupti.h PATHS -@@ -1886,6 +1887,7 @@ if(USE_KINETO) - ${CUDA_INCLUDE_DIRS} - ${CUDA_SOURCE_DIR} - ${CUDA_SOURCE_DIR}/include -+ $ENV{CUPTI_INCLUDE_DIR} - NO_DEFAULT_PATH) - - if(CUPTI_LIBRARY_PATH AND CUPTI_INCLUDE_DIR) diff --git a/pkgs/development/python-modules/torch/source/src.nix b/pkgs/development/python-modules/torch/source/src.nix index 7c58cf8dd775..8f62bfc0d954 100644 --- a/pkgs/development/python-modules/torch/source/src.nix +++ b/pkgs/development/python-modules/torch/source/src.nix @@ -4,7 +4,7 @@ fetchFromGitHub, runCommand, }: -assert version == "2.9.1"; +assert version == "2.10.0"; rec { src_aiter = fetchFromGitHub { owner = "ROCm"; @@ -42,6 +42,12 @@ rec { rev = "eefb26f82b233268fc98577d265352720d477ba4"; hash = "sha256-Qh6BGPk7a01YzCeX42+Og9M+fjXRs7kzNUCyT4mYab4="; }; + src_civetweb_prometheus-cpp_dynolog = fetchFromGitHub { + owner = "civetweb"; + repo = "civetweb"; + rev = "d7ba35bbb649209c66e582d5a0244ba988a15159"; + hash = "sha256-eXb5f2jhtfxDORG+JniSy17kzB7A4vM0UnUQAfKTquU="; + }; src_clang-cindex-python3 = fetchFromGitHub { owner = "wjakob"; repo = "clang-cindex-python3"; @@ -60,12 +66,6 @@ rec { rev = "cffe8fa2a442ac8e80dd236a1a5d24fe3d7e0cbf"; hash = "sha256-KDmSs9NDFYbyE4wzBedVDBZGhI1BAoJHWOStFkuEk9U="; }; - src_composable_kernel_fbgemm = fetchFromGitHub { - owner = "jwfromm"; - repo = "composable_kernel"; - rev = "b1281b8b08d973a7064f864f47eeb30f3e2596e9"; - hash = "sha256-ZWfTZ9UxnIpkoRnTmB5e3H/LY5a2HixkCCIMcnpc+Gw="; - }; src_composable_kernel_flash-attention = fetchFromGitHub { owner = "ROCm"; repo = "composable_kernel"; @@ -87,8 +87,8 @@ rec { src_cpuinfo = fetchFromGitHub { owner = "pytorch"; repo = "cpuinfo"; - rev = "5e3d2445e6a84d9599bee2bf78edbb4d80865e1d"; - hash = "sha256-muclbtayPbbxmjTBKJlvTk2Apsx8YwhTu76nKMlSnL0="; + rev = "f858c30bcb16f8effd5ff46996f0514539e17abc"; + hash = "sha256-9eXqsdgGl4oZEC8uJgiyqrvD3HVyUuNcSkJ8VTmZBj8="; }; src_cpuinfo_fbgemm = fetchFromGitHub { owner = "pytorch"; @@ -99,20 +99,20 @@ rec { src_cudnn-frontend = fetchFromGitHub { owner = "NVIDIA"; repo = "cudnn-frontend"; - rev = "243c7ff63be1ce6dd5bf9047668b5d4de83f55f6"; - hash = "sha256-yJgJ4ecN7Fv5VlGyGtzoktkkBUZvxe2kbrsmaiQQmVA="; + rev = "0258951d4d512f4714eb1574496f4d57669b1b93"; + hash = "sha256-SxdxVpUNTfjptcBcezeu4VglWFSvLfAqL492ETJzdwU="; }; src_cutlass = fetchFromGitHub { owner = "NVIDIA"; repo = "cutlass"; - rev = "e51efbfe18fe4f4cbb66ab814c55bf4aa0185491"; - hash = "sha256-ZY+6Tg/CC6fqvU764k6QNudYDpY+s8OQklG+1aXQuns="; + rev = "f88806b1e31dfa579842638740216dd41fc6c588"; + hash = "sha256-2+jUA2M6MmUAAPUYNxdgI464Z48/cIgTi4fOBvf4RZA="; }; src_cutlass_fbgemm = fetchFromGitHub { owner = "jwfromm"; repo = "cutlass"; - rev = "311f3c8e51dc0eb56310cfc6980bf63d0fbd7917"; - hash = "sha256-JSr48FkrYE9mvm1+ikrqUxrYuV4Bok2EOdcyeTsMdiA="; + rev = "a54461186bc30c39bf89bc433f89198892ad9e5f"; + hash = "sha256-me+IKK79OJz4tCioc1GxJxp620KFL4yYk5r85XHj3zQ="; }; src_cutlass_flash-attention = fetchFromGitHub { owner = "NVIDIA"; @@ -129,14 +129,14 @@ rec { src_dynolog = fetchFromGitHub { owner = "facebookincubator"; repo = "dynolog"; - rev = "7d04a0053a845370ae06ce317a22a48e9edcc74e"; - hash = "sha256-Je6wAz+uJ/AiAnSZVQ4+pGajZ8DymS0qI9ekB8fGYOo="; + rev = "d2ffe0a4e3acace628db49974246b66fc3e85fb1"; + hash = "sha256-AebAZeDE9mXvg1XsgDm/4DIAMDIkbd+HGgcTmxV+HX0="; }; src_fbgemm = fetchFromGitHub { owner = "pytorch"; repo = "fbgemm"; - rev = "4b39c551efe15e6bbade20565b0ceb2d8ce3352d"; - hash = "sha256-a7oNR2RMQWiaX9jLAy5Y4aniByqj7f9g65snOjPPwK0="; + rev = "a4a112c26ac01c78a86317cf54c69481478d95d2"; + hash = "sha256-Iy06EIWQ0ThLfO1xmkn3xaO3qWPhhbthff3JxL6P748="; }; src_fbjni = fetchFromGitHub { owner = "facebookincubator"; @@ -159,8 +159,8 @@ rec { src_fmt = fetchFromGitHub { owner = "fmtlib"; repo = "fmt"; - rev = "40626af88bd7df9a5fb80be7b25ac85b122d6c21"; - hash = "sha256-sAlU5L/olxQUYcv8euVYWTTB8TrVeQgXLHtXy8IMEnU="; + rev = "407c905e45ad75fc29bf0f9bb7c5c2fd3475976f"; + hash = "sha256-ZmI1Dv0ZabPlxa02OpERI47jp7zFfjpeWCy1WyuPYZ0="; }; src_fmt_dynolog = fetchFromGitHub { owner = "fmtlib"; @@ -171,8 +171,8 @@ rec { src_fmt_kineto = fetchFromGitHub { owner = "fmtlib"; repo = "fmt"; - rev = "0041a40c1350ba702d475b9c4ad62da77caea164"; - hash = "sha256-PtzSB2mekUT7bjhXC/+F5UpSUvcdIkXTWnIz+jkAUuU="; + rev = "40626af88bd7df9a5fb80be7b25ac85b122d6c21"; + hash = "sha256-sAlU5L/olxQUYcv8euVYWTTB8TrVeQgXLHtXy8IMEnU="; }; src_FP16 = fetchFromGitHub { owner = "Maratyszcza"; @@ -222,25 +222,13 @@ rec { rev = "52eb8108c5bdec04579160ae17225d66034bd723"; hash = "sha256-HIHMxAUR4bjmFLoltJeIAVSulVQ6kVuIT2Ku+lwAx/4="; }; - src_googletest_dynolog = fetchFromGitHub { - owner = "google"; - repo = "googletest"; - rev = "58d77fa8070e8cec2dc1ed015d66b454c8d78850"; - hash = "sha256-W+OxRTVtemt2esw4P7IyGWXOonUN5ZuscjvzqkYvZbM="; - }; - src_googletest_kineto = fetchFromGitHub { - owner = "google"; - repo = "googletest"; - rev = "7aca84427f224eeed3144123d5230d5871e93347"; - hash = "sha256-ML144v86Kb9KSyxpqn8+XdKeU8r53PiMyh2ZzNYDyZU="; - }; src_googletest_opentelemetry-cpp = fetchFromGitHub { owner = "google"; repo = "googletest"; rev = "b796f7d44681514f58a683a3a71ff17c94edb0c1"; hash = "sha256-LVLEn+e7c8013pwiLzJiiIObyrlbBHYaioO/SWbItPQ="; }; - src_googletest_prometheus-cpp = fetchFromGitHub { + src_googletest_prometheus-cpp_prometheus-cpp_dynolog = fetchFromGitHub { owner = "google"; repo = "googletest"; rev = "e2239ee6043f73722e7aa812a459f54a28552929"; @@ -309,14 +297,14 @@ rec { src_kineto = fetchFromGitHub { owner = "pytorch"; repo = "kineto"; - rev = "5e7501833f1021ce6f618572d3baf657b6319658"; - hash = "sha256-MQNGrWKU1l/lXo4G2hDFaQeNtyQj+pB5sTqm3piPYrY="; + rev = "31f85df8fbd89c188f14ef10f1ec65379786b943"; + hash = "sha256-4H0T8le73QX17kThG9gJEIvCSbRg/WQOF2TDoaXstEQ="; }; src_kleidiai = fetchFromGitHub { owner = "ARM-software"; repo = "kleidiai"; - rev = "cca02c2f69dd18e1f12647c1c0bdc8cf90e680c7"; - hash = "sha256-+75YvMEJN57cz/jzbqC3E0O7BalfaIfzswRZdpOMx0Q="; + rev = "d7770c89632329a9914ef1a90289917597639cbe"; + hash = "sha256-5/LkO8ihQCeA6nok68OrzurOcIgjFgXntO1C3By5HUw="; }; src_libnop = fetchFromGitHub { owner = "google"; @@ -351,8 +339,8 @@ rec { src_NVTX = fetchFromGitHub { owner = "NVIDIA"; repo = "NVTX"; - rev = "2942f167cc30c5e3a44a2aecd5b0d9c07ff61a07"; - hash = "sha256-MXluy/I5+SaRx2aF64qF4XZ+u67ERAB9TftbOvYt4GE="; + rev = "3ebbc93ded7285963bff932c678fa367eb393ba6"; + hash = "sha256-F1TD1lK0sE6UWMhelF1q147T5Jk3xFUHwsmKoE+WnXY="; }; src_onnx = fetchFromGitHub { owner = "onnx"; @@ -402,6 +390,12 @@ rec { rev = "c9ffcdda9086ffd9e1283ea7a0276d831f3c8a8d"; hash = "sha256-qx6oBxd0YrUyFq+7ArnKBqOwrl5X8RS9nErhRDUJ7+8="; }; + src_prometheus-cpp_dynolog = fetchFromGitHub { + owner = "jupp0r"; + repo = "prometheus-cpp"; + rev = "b1234816facfdda29845c46696a02998a4af115a"; + hash = "sha256-Dj+adszXnWHOcZJ/QTOX214N86pjy71tLuPU6bHcMPg="; + }; src_protobuf = fetchFromGitHub { owner = "protocolbuffers"; repo = "protobuf"; @@ -441,8 +435,8 @@ rec { src_pytorch = fetchFromGitHub { owner = "pytorch"; repo = "pytorch"; - rev = "v2.9.1"; - hash = "sha256-9DJsjsxT+KLdSBnV08MXSVAhjg6kXkHdOAjRsq+ocd8="; + rev = "v2.10.0"; + hash = "sha256-3c/1lrKgAVD9lCFGYv8tilg1cL7Z64lkfiOG6kIs/BY="; }; src_sleef = fetchFromGitHub { owner = "shibatch"; @@ -453,8 +447,8 @@ rec { src_tensorpipe = fetchFromGitHub { owner = "pytorch"; repo = "tensorpipe"; - rev = "af0118d13e52f5a08841464a768e01a0bf3e3075"; - hash = "sha256-X2YfYfDKxG0i2K8Uf7gpSb+LU2y0d4VBZM3lTa/ff1w="; + rev = "2b4cd91092d335a697416b2a3cb398283246849d"; + hash = "sha256-ZidonG6q621rbdRrlW6ad7WdH0os81GNBBuPE5kQEsU="; }; src_vcpkg = fetchFromGitHub { owner = "Microsoft"; @@ -484,10 +478,10 @@ rec { src_benchmark_opentelemetry-cpp_recursive = src_benchmark_opentelemetry-cpp; src_benchmark_protobuf_recursive = src_benchmark_protobuf; src_civetweb_recursive = src_civetweb; + src_civetweb_prometheus-cpp_dynolog_recursive = src_civetweb_prometheus-cpp_dynolog; src_clang-cindex-python3_recursive = src_clang-cindex-python3; src_composable_kernel_recursive = src_composable_kernel; src_composable_kernel_aiter_recursive = src_composable_kernel_aiter; - src_composable_kernel_fbgemm_recursive = src_composable_kernel_fbgemm; src_composable_kernel_flash-attention_recursive = src_composable_kernel_flash-attention; src_cpp-httplib_recursive = src_cpp-httplib; src_cpr_recursive = src_cpr; @@ -511,18 +505,20 @@ rec { chmod u+w $out/third_party/glog cp -r ${src_glog_recursive}/* $out/third_party/glog chmod u+w $out/third_party/googletest - cp -r ${src_googletest_dynolog_recursive}/* $out/third_party/googletest + cp -r ${src_googletest_recursive}/* $out/third_party/googletest chmod u+w $out/third_party/json cp -r ${src_json_dynolog_recursive}/* $out/third_party/json chmod u+w $out/third_party/pfs cp -r ${src_pfs_recursive}/* $out/third_party/pfs + chmod u+w $out/third_party/prometheus-cpp + cp -r ${src_prometheus-cpp_dynolog_recursive}/* $out/third_party/prometheus-cpp ''; src_fbgemm_recursive = runCommand "fbgemm" { } '' cp -r ${src_fbgemm} $out chmod u+w $out/external/asmjit cp -r ${src_asmjit_recursive}/* $out/external/asmjit chmod u+w $out/external/composable_kernel - cp -r ${src_composable_kernel_fbgemm_recursive}/* $out/external/composable_kernel + cp -r ${src_composable_kernel_recursive}/* $out/external/composable_kernel chmod u+w $out/external/cpuinfo cp -r ${src_cpuinfo_fbgemm_recursive}/* $out/external/cpuinfo chmod u+w $out/external/cutlass @@ -558,10 +554,9 @@ rec { src_glog_recursive = src_glog; src_gloo_recursive = src_gloo; src_googletest_recursive = src_googletest; - src_googletest_dynolog_recursive = src_googletest_dynolog; - src_googletest_kineto_recursive = src_googletest_kineto; src_googletest_opentelemetry-cpp_recursive = src_googletest_opentelemetry-cpp; - src_googletest_prometheus-cpp_recursive = src_googletest_prometheus-cpp; + src_googletest_prometheus-cpp_prometheus-cpp_dynolog_recursive = + src_googletest_prometheus-cpp_prometheus-cpp_dynolog; src_googletest_protobuf_recursive = src_googletest_protobuf; src_googletest_tensorpipe_recursive = src_googletest_tensorpipe; src_GSL_recursive = src_GSL; @@ -583,7 +578,7 @@ rec { chmod u+w $out/libkineto/third_party/fmt cp -r ${src_fmt_kineto_recursive}/* $out/libkineto/third_party/fmt chmod u+w $out/libkineto/third_party/googletest - cp -r ${src_googletest_kineto_recursive}/* $out/libkineto/third_party/googletest + cp -r ${src_googletest_recursive}/* $out/libkineto/third_party/googletest ''; src_kleidiai_recursive = src_kleidiai; src_libnop_recursive = src_libnop; @@ -626,7 +621,14 @@ rec { chmod u+w $out/3rdparty/civetweb cp -r ${src_civetweb_recursive}/* $out/3rdparty/civetweb chmod u+w $out/3rdparty/googletest - cp -r ${src_googletest_prometheus-cpp_recursive}/* $out/3rdparty/googletest + cp -r ${src_googletest_prometheus-cpp_prometheus-cpp_dynolog_recursive}/* $out/3rdparty/googletest + ''; + src_prometheus-cpp_dynolog_recursive = runCommand "prometheus-cpp_dynolog" { } '' + cp -r ${src_prometheus-cpp_dynolog} $out + chmod u+w $out/3rdparty/civetweb + cp -r ${src_civetweb_prometheus-cpp_dynolog_recursive}/* $out/3rdparty/civetweb + chmod u+w $out/3rdparty/googletest + cp -r ${src_googletest_prometheus-cpp_prometheus-cpp_dynolog_recursive}/* $out/3rdparty/googletest ''; src_protobuf_recursive = runCommand "protobuf" { } '' cp -r ${src_protobuf} $out diff --git a/pkgs/development/python-modules/torchaudio/default.nix b/pkgs/development/python-modules/torchaudio/default.nix index a340c67d262b..581f288a5236 100644 --- a/pkgs/development/python-modules/torchaudio/default.nix +++ b/pkgs/development/python-modules/torchaudio/default.nix @@ -3,7 +3,6 @@ symlinkJoin, buildPythonPackage, fetchFromGitHub, - fetchpatch, # nativeBuildInputs cmake, @@ -76,7 +75,7 @@ let ); stdenv = torch.stdenv; in -buildPythonPackage.override { inherit stdenv; } rec { +buildPythonPackage.override { inherit stdenv; } (finalAttrs: { pname = "torchaudio"; version = "2.10.0"; pyproject = true; @@ -84,7 +83,7 @@ buildPythonPackage.override { inherit stdenv; } rec { src = fetchFromGitHub { owner = "pytorch"; repo = "audio"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-b1sjHVFXdNFDbdtXWSM2KisSRE/8IbzJI4rvzYQ4UMg="; }; @@ -156,7 +155,7 @@ buildPythonPackage.override { inherit stdenv; } rec { meta = { description = "PyTorch audio library"; homepage = "https://pytorch.org/"; - changelog = "https://github.com/pytorch/audio/releases/tag/${src.tag}"; + changelog = "https://github.com/pytorch/audio/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.bsd2; platforms = lib.platforms.linux ++ lib.optionals (!cudaSupport && !rocmSupport) lib.platforms.darwin; @@ -165,4 +164,4 @@ buildPythonPackage.override { inherit stdenv; } rec { junjihashimoto ]; }; -} +}) diff --git a/pkgs/development/python-modules/torchvision/default.nix b/pkgs/development/python-modules/torchvision/default.nix index 372ac01463a1..c3a3d2cb9346 100644 --- a/pkgs/development/python-modules/torchvision/default.nix +++ b/pkgs/development/python-modules/torchvision/default.nix @@ -1,9 +1,7 @@ { lib, - stdenv, torch, buildPythonPackage, - darwinMinVersionHook, fetchFromGitHub, # nativeBuildInputs @@ -27,17 +25,16 @@ let inherit (torch) cudaCapabilities cudaPackages cudaSupport; +in +buildPythonPackage.override { stdenv = torch.stdenv; } (finalAttrs: { pname = "torchvision"; version = "0.25.0"; -in -buildPythonPackage.override { stdenv = torch.stdenv; } { - format = "setuptools"; - inherit pname version; + pyproject = true; src = fetchFromGitHub { owner = "pytorch"; repo = "vision"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-oktJHcT6T4f58pUO+HSBpbyS1ISH3zDlTsXQh6PcMy4="; }; @@ -87,9 +84,9 @@ buildPythonPackage.override { stdenv = torch.stdenv; } { meta = { description = "PyTorch vision library"; homepage = "https://pytorch.org/"; - changelog = "https://github.com/pytorch/vision/releases/tag/v${version}"; + changelog = "https://github.com/pytorch/vision/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.bsd3; platforms = with lib.platforms; linux ++ lib.optionals (!cudaSupport) darwin; maintainers = with lib.maintainers; [ GaetanLepage ]; }; -} +}) diff --git a/pkgs/development/python-modules/triton/default.nix b/pkgs/development/python-modules/triton/default.nix index fcc9e19d3dc8..20151128fa89 100644 --- a/pkgs/development/python-modules/triton/default.nix +++ b/pkgs/development/python-modules/triton/default.nix @@ -44,7 +44,7 @@ buildPythonPackage (finalAttrs: { pname = "triton"; - version = "3.5.1"; + version = "3.6.0"; pyproject = true; # Remember to bump triton-llvm as well! @@ -52,7 +52,7 @@ buildPythonPackage (finalAttrs: { owner = "triton-lang"; repo = "triton"; tag = "v${finalAttrs.version}"; - hash = "sha256-dyNRtS1qtU8C/iAf0Udt/1VgtKGSvng1+r2BtvT9RB4="; + hash = "sha256-JFSpQn+WsNnh7CAPlcpOcUp0nyKXNbJEANdXqmkt4Tc="; }; patches = [ @@ -151,12 +151,6 @@ buildPythonPackage (finalAttrs: { setuptools ]; - NIX_CFLAGS_COMPILE = lib.optionals cudaSupport [ - # Pybind11 started generating strange errors since python 3.12. Observed only in the CUDA branch. - # https://gist.github.com/SomeoneSerge/7d390b2b1313957c378e99ed57168219#file-gistfile0-txt-L1042 - "-Wno-stringop-overread" - ]; - preConfigure = # Ensure that the build process uses the requested number of cores '' @@ -171,6 +165,12 @@ buildPythonPackage (finalAttrs: { CC = lib.getExe' cudaPackages.backendStdenv.cc "cc"; CXX = lib.getExe' cudaPackages.backendStdenv.cc "c++"; + NIX_CFLAGS_COMPILE = toString [ + # Pybind11 started generating strange errors since python 3.12. Observed only in the CUDA branch. + # https://gist.github.com/SomeoneSerge/7d390b2b1313957c378e99ed57168219#file-gistfile0-txt-L1042 + "-Wno-stringop-overread" + ]; + # TODO: Unused because of how TRITON_OFFLINE_BUILD currently works (subject to change) TRITON_PTXAS_PATH = lib.getExe' cudaPackages.cuda_nvcc "ptxas"; # Make sure cudaPackages is the right version each update (See python/setup.py) TRITON_CUOBJDUMP_PATH = lib.getExe' cudaPackages.cuda_cuobjdump "cuobjdump"; diff --git a/pkgs/development/python-modules/ultralytics/default.nix b/pkgs/development/python-modules/ultralytics/default.nix index 42323f68dc8c..b458204c3915 100644 --- a/pkgs/development/python-modules/ultralytics/default.nix +++ b/pkgs/development/python-modules/ultralytics/default.nix @@ -34,14 +34,14 @@ buildPythonPackage (finalAttrs: { pname = "ultralytics"; - version = "8.4.14"; + version = "8.4.15"; pyproject = true; src = fetchFromGitHub { owner = "ultralytics"; repo = "ultralytics"; tag = "v${finalAttrs.version}"; - hash = "sha256-P6NNEWCpwSN2FU9Nc+XHwjx3xC2kmhbZ/71utEBBjuM="; + hash = "sha256-VVspIg9/d6FJwbIGR5OQ85h2UH7SykW8I3+LutsOOQw="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/grammar-sources.nix b/pkgs/development/tools/parsing/tree-sitter/grammars/grammar-sources.nix index d034b612a02d..ddd1e0082771 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/grammar-sources.nix +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/grammar-sources.nix @@ -72,9 +72,8 @@ }; awk = { - version = "0-unstable-2024-11-02"; + version = "0.7.2"; url = "github:Beaglefoot/tree-sitter-awk"; - rev = "34bbdc7cce8e803096f47b625979e34c1be38127"; hash = "sha256-MDfAtG6ZC0KttJ5bdW71Jgts+SAJitRnwu8xQ26N9K0="; meta = { license = lib.licenses.mit; @@ -126,9 +125,8 @@ }; bicep = { - version = "0-unstable-2024-12-22"; + version = "1.1.0"; url = "github:tree-sitter-grammars/tree-sitter-bicep"; - rev = "bff59884307c0ab009bd5e81afd9324b46a6c0f9"; hash = "sha256-+qvhJgYqs8aj/Kmojr7lmjbXmskwVvbYBn4ia9wOv3k="; meta = { license = lib.licenses.mit; @@ -148,9 +146,8 @@ }; blade = { - version = "0-unstable-2025-08-25"; + version = "0.12.3"; url = "github:EmranMR/tree-sitter-blade"; - rev = "cc764dadcbbceb3f259396fef66f970c72e94f96"; hash = "sha256-3/gY68F+xOF5Fv6rK9cEIJCVDzg/3ap1/gzkEacGuy4="; meta = { license = lib.licenses.mit; @@ -224,7 +221,7 @@ }; capnp = { - version = "0-unstable-2024-04-20"; + version = "1.5.0-unstable-2024-04-20"; url = "github:amaanq/tree-sitter-capnp"; rev = "7b0883c03e5edd34ef7bcf703194204299d7099f"; hash = "sha256-WKrZuOMxmdGlvUI9y8JgwCNMdJ8MULucMhkmW8JCiXM="; @@ -263,7 +260,7 @@ }; clarity = { - version = "0-unstable-2025-11-17"; + version = "0.0.5-unstable-2025-11-17"; url = "github:xlittlerag/tree-sitter-clarity"; rev = "cbb3ffe8688aca558286fd45ed46857a1f3207bb"; hash = "sha256-iylkAIBEpMPzRYHXyFQKMIEZJbqij/8tLdq9z/UPgN8="; @@ -354,9 +351,8 @@ }; csv = { - version = "0-unstable-2025-03-13"; + version = "1.0.0"; url = "github:weartist/rainbow-csv-tree-sitter"; - rev = "fbf125bcedb15080980e8afaf69c4374412e5844"; hash = "sha256-caWf6cIx0CcDP2u84ncfdTSlWvhVawnYAIW4m5bzRQY="; meta = { license = lib.licenses.mit; @@ -385,7 +381,7 @@ }; cylc = { - version = "0-unstable-2025-09-08"; + version = "0.2.0-unstable-2025-09-08"; url = "github:elliotfontaine/tree-sitter-cylc"; rev = "6d1d81137112299324b526477ce1db989ab58fb8"; hash = "sha256-jgQCTM36S8UwSyT4LAfcX4DUIl2OYVMeQdDg3zRrw00="; @@ -398,7 +394,7 @@ }; d = { - version = "0-unstable-2025-06-29"; + version = "0.8.2-unstable-2025-06-29"; url = "github:gdamore/tree-sitter-d"; rev = "fb028c8f14f4188286c2eef143f105def6fbf24f"; hash = "sha256-Xi8out5j4L5pAArA9zmLA7aGhma++G+AaVLgFW+TEAo="; @@ -421,9 +417,8 @@ }; dbml = { - version = "0-unstable-2023-11-02"; + version = "0.1.0"; url = "github:dynamotn/tree-sitter-dbml"; - rev = "2e2fa5640268c33c3d3f27f7e676f631a9c68fd9"; hash = "sha256-IxxUW6YYxP1hkwA9NEojEEE3c8pwvAI6juX8aF7NfMw="; meta = { license = lib.licenses.mit; @@ -456,7 +451,7 @@ }; dhall = { - version = "0-unstable-2025-04-13"; + version = "1.0.0-unstable-2025-04-13"; url = "github:jbellerb/tree-sitter-dhall"; rev = "62013259b26ac210d5de1abf64cf1b047ef88000"; hash = "sha256-4xbz7DDUlLGgLW5V6Yyvo7dkE9MOk3mCQEBTYyRbNuM="; @@ -469,9 +464,8 @@ }; diff = { - version = "0-unstable-2025-10-29"; + version = "0.1.0"; url = "github:the-mikedavis/tree-sitter-diff"; - rev = "2520c3f934b3179bb540d23e0ef45f75304b5fed"; hash = "sha256-8rYLNGgoZSvvfqO2++nAgFKmvbkKJ3m+9B8bTXp6Us4="; meta = { license = lib.licenses.mit; @@ -720,7 +714,7 @@ }; fsharp = { - version = "0-unstable-2025-07-05"; + version = "0.1.0-unstable-2025-07-05"; url = "github:ionide/tree-sitter-fsharp"; rev = "5141851c278a99958469eb1736c7afc4ec738e47"; hash = "sha256-cJpbO9PjGtJu4RCDsmQ0qjys765/z397y/wbfGxTY9Y="; @@ -733,7 +727,7 @@ }; gas = { - version = "0-unstable-2023-09-15"; + version = "0.0.1-unstable-2023-09-15"; url = "github:sirius94/tree-sitter-gas"; rev = "60f443646b20edee3b7bf18f3a4fb91dc214259a"; hash = "sha256-HyLNnmK4jud2Ndkc+5MY9MlASh/ehPA/eQATsCVGcUw="; @@ -777,7 +771,7 @@ }; ghostty = { - version = "0-unstable-2025-11-27"; + version = "1.2-unstable-2025-11-27"; url = "github:bezhermoso/tree-sitter-ghostty"; rev = "c2f7af6d7250f63f01401a6d84b3e353e71ff3c3"; hash = "sha256-d9cJWhEHiAMxyNhUt7VR5IU5z/5oXn3m9aMsknexaNM="; @@ -829,9 +823,8 @@ }; gitcommit = { - version = "0-unstable-2025-03-13"; + version = "0.4.0"; url = "github:gbprod/tree-sitter-gitcommit"; - rev = "a716678c0f00645fed1e6f1d0eb221481dbd6f6d"; hash = "sha256-KYfcs99p03b0RiPYnZeKJf677fmVf658FLZcFk2v2Ws="; meta = { license = lib.licenses.wtfpl; @@ -976,7 +969,7 @@ }; gren = { - version = "0-unstable-2025-05-03"; + version = "2.0.0-unstable-2025-05-03"; url = "github:MaeBrooks/tree-sitter-gren"; rev = "c36aac51a915fdfcaf178128ba1e9c2205b25930"; hash = "sha256-XtLP2ncpwAiubHug6k4sJCYRZo5f+Nu02tho/4tVD/k="; @@ -1078,7 +1071,7 @@ }; hoon = { - version = "0-unstable-2024-12-17"; + version = "0.0.3-unstable-2024-12-17"; url = "github:urbit-pilled/tree-sitter-hoon"; rev = "1545137aadcc63660c47db9ad98d02fa602655d0"; hash = "sha256-RkSPoscrinmuSTWHzXkRNaiqECDXpKAbQ4z7a6Tpvek="; @@ -1113,7 +1106,7 @@ }; htmldjango = { - version = "0-unstable-2025-04-16"; + version = "1.0.0-unstable-2025-04-16"; url = "github:interdependence/tree-sitter-htmldjango"; rev = "3a643167ad9afac5d61e092f08ff5b054576fadf"; hash = "sha256-sQV7olTaQ68wixzvKV44myVvDUXXjBZh9N3jvDFUSvE="; @@ -1135,9 +1128,8 @@ }; hurl = { - version = "0-unstable-2025-09-13"; + version = "1.7.0"; url = "github:pfeiferj/tree-sitter-hurl"; - rev = "597efbd7ce9a814bb058f48eabd055b1d1e12145"; hash = "sha256-sQjjx3DGfi0l8/XNOIoyFYAcDpaQOkD4Ics3g6vkgjM="; meta = { license = lib.licenses.asl20; @@ -1170,7 +1162,7 @@ }; ini = { - version = "0-unstable-2025-12-08"; + version = "1.4.0-unstable-2025-12-08"; url = "github:justinmk/tree-sitter-ini"; rev = "e4018b5176132b4f3c5d6e61cea383f42288d0f5"; hash = "sha256-8WCyIaApsLPOybe+cntF4ISyQKN41L2IRAATd9KmzL0="; @@ -1183,7 +1175,7 @@ }; ink = { - version = "0-unstable-2025-02-05"; + version = "0.1.1-unstable-2025-02-05"; url = "github:rhizoome/tree-sitter-ink"; rev = "3bafa20b888b97a505164fa9ee3812c331b2b809"; hash = "sha256-i+e+eaiAzTx2n9A0mlQ1SStGTbcS4LQJfmK8uNpzNiI="; @@ -1196,10 +1188,9 @@ }; inko = { - version = "0-unstable-2025-12-06"; + version = "0.5.1"; url = "github:inko-lang/tree-sitter-inko"; - rev = "20e2842680dd0d47dd2ee976bc320e4399f65fe1"; - hash = "sha256-qgB2s/ghmOGjJ+MH7p3ZQKa+RMxx58642Z9lYC1wlq4="; + hash = "sha256-bt/T6O/7of8r9DrA6DU8pM4vWlBCgWWzw89GZbDyJnw="; meta = { license = lib.licenses.mpl20; maintainers = with lib.maintainers; [ @@ -1360,7 +1351,7 @@ }; koto = { - version = "0-unstable-2025-11-17"; + version = "0.16.0-unstable-2025-11-17"; url = "github:koto-lang/tree-sitter-koto"; rev = "f8b3f62c0eed185dca1559789e78759d4bee60e5"; hash = "sha256-vv5HMDXMcSi91loIppsx/5Hu6jJ7/cedtTyahOBP780="; @@ -1561,7 +1552,7 @@ }; matlab = { - version = "0-unstable-2025-11-22"; + version = "1.3.0-unstable-2025-11-22"; url = "github:acristoffers/tree-sitter-matlab"; rev = "1bccabdbd420a9c3c3f96f36d7f9e65b3d9c88ef"; hash = "sha256-V7GOXiR//JgxjTOxRi+PpfRGvunX4r3C0Bu1CrN+/K4="; @@ -1669,7 +1660,7 @@ }; nim = { - version = "0-unstable-2025-07-29"; + version = "0.6.2-unstable-2025-07-29"; url = "github:alaviss/tree-sitter-nim"; rev = "4ad352773688deb84a95eeaa9872acda5b466439"; hash = "sha256-dinMmbD36o1QkcLk2mgycgHZ9sW5Mg6lfnxssynaj58="; @@ -1736,7 +1727,7 @@ }; odin = { - version = "0-unstable-2025-01-12"; + version = "1.3.0-unstable-2025-01-12"; url = "github:tree-sitter-grammars/tree-sitter-odin"; rev = "d2ca8efb4487e156a60d5bd6db2598b872629403"; hash = "sha256-aPeaGERAP1Fav2QAjZy1zXciCuUTQYrsqXaSQsYG0oU="; @@ -1775,7 +1766,7 @@ }; openscad = { - version = "0-unstable-2025-11-25"; + version = "0.7.0-unstable-2025-11-25"; url = "github:openscad/tree-sitter-openscad"; rev = "09ed1478aa98a11df06367e91f2d310e334e39fb"; hash = "sha256-tRBUGfcEdEnym1mrpPs7YdWvbBgeLQoZLgb47XtoGd8="; @@ -1788,7 +1779,7 @@ }; org = { - version = "0-unstable-2023-06-19"; + version = "1.3.1-unstable-2023-06-19"; url = "github:milisims/tree-sitter-org"; rev = "64cfbc213f5a83da17632c95382a5a0a2f3357c1"; hash = "sha256-/03eZBbv23W5s/GbDgPgaJV5TyK+/lrWUVeINRS5wtA="; @@ -1811,10 +1802,9 @@ }; pascal = { - version = "0-unstable-2025-05-17"; + version = "0.10.2"; url = "github:Isopod/tree-sitter-pascal"; - rev = "5054931bcd022860dd5936864f981e359fb63aef"; - hash = "sha256-+5HzlNL54/Wdr7b1vRwZzIU3Z8vqFP9FzmEO1qwxJrk="; + hash = "sha256-jqpY3g19YzX5T2rD4EFUAs594XrUdmk5DjkgGO6MC2g="; meta = { license = lib.licenses.mit; maintainers = with lib.maintainers; [ @@ -1859,9 +1849,8 @@ }; pest = { - version = "0-unstable-2025-10-06"; + version = "0.1.0"; url = "github:pest-parser/tree-sitter-pest"; - rev = "c19629a0c50e6ca2485c3b154b1dde841a08d169"; hash = "sha256-S5qg/LLPlMmNtRTTi7vW8y/c+zcId7ADmMqIt0gqJBo="; meta = { license = lib.licenses.mit; @@ -1902,7 +1891,7 @@ }; php-only = { - version = "0-unstable-2025-11-24"; + version = "0.24.2-unstable-2025-11-24"; url = "github:tree-sitter/tree-sitter-php"; rev = "7d07b41ce2d442ca9a90ed85d0075eccc17ae315"; hash = "sha256-XEKlsqC7HJ3mShmcwmfpezNP9DHE8f73f7/ru4MuxEo="; @@ -1925,7 +1914,7 @@ }; pkl = { - version = "0-unstable-2025-12-12"; + version = "0.20.0-unstable-2025-12-12"; url = "github:apple/tree-sitter-pkl"; rev = "ac58931956c000d3aeefbb55a81fc3c5bd6aecf0"; hash = "sha256-R0p9ceNjd9xnikxaCjDFwN4HkfRr+4ezVSlXqLP/YuQ="; @@ -1965,9 +1954,8 @@ }; ponylang = { - version = "0-unstable-2023-03-13"; + version = "0.0.2"; url = "github:mfelsche/tree-sitter-ponylang"; - rev = "cc8a0ff12f4f9e56f8a0d997c55155b702938dfe"; hash = "sha256-/Qyr6TPmYPVQuWUmkb/77k94DK7nzlAA3hjSjeF6MeI="; meta = { license = lib.licenses.mit; @@ -1978,9 +1966,8 @@ }; powershell = { - version = "0-unstable-2025-12-08"; + version = "0.25.10"; url = "github:airbus-cert/tree-sitter-powershell"; - rev = "7212f47716ced384ac012b2cc428fd9f52f7c5d4"; hash = "sha256-xzDM1CdBY95XgLsEjqKWrwuIf/s6/2Q0XbxJRvOuL2o="; meta = { license = lib.licenses.mit; @@ -2000,7 +1987,7 @@ }; prolog = { - version = "0-unstable-2025-03-23"; + version = "3.0.2-unstable-2025-03-23"; url = "codeberg:foxy/tree-sitter-prolog"; rev = "d8d415f6a1cf80ca138524bcc395810b176d40fa"; hash = "sha256-SEqqmkfV/wsr1ObcBN5My29RY9TWfxnQlsnEEIZyR18="; @@ -2013,7 +2000,7 @@ }; properties = { - version = "0-unstable-2025-07-14"; + version = "0.3.0-unstable-2025-07-14"; url = "github:tree-sitter-grammars/tree-sitter-properties"; rev = "6310671b24d4e04b803577b1c675d765cbd5773b"; hash = "sha256-LRutvpXXVK7z+xrnLQVvLY+VRg8IB/VK572PNgvsQfc="; @@ -2059,9 +2046,8 @@ }; purescript = { - version = "0-unstable-2025-06-17"; + version = "0.3.0"; url = "github:postsolar/tree-sitter-purescript"; - rev = "f541f95ffd6852fbbe88636317c613285bc105af"; hash = "sha256-tONS2Eai/eVDecn6ow4nN9F7++UjY6OAKezeCco8hYU="; meta = { license = lib.licenses.mit; @@ -2183,7 +2169,7 @@ }; rescript = { - version = "0-unstable-2025-03-03"; + version = "5.0.0-unstable-2025-03-03"; url = "github:rescript-lang/tree-sitter-rescript"; rev = "d2df8a285fff95de56a91d2f8152aeceb66f40ef"; hash = "sha256-yNZrihl4BNvLu0Zqr4lSqvdZCeXU3KnCY7ZYC1U42R0="; @@ -2206,10 +2192,9 @@ }; robot = { - version = "0-unstable-2025-05-01"; + version = "1.1.2"; url = "github:Hubro/tree-sitter-robot"; - rev = "e34def7cb0d8a66a59ec5057fe17bb4e6b17b56a"; - hash = "sha256-fTV45TQp2Z+ivh2YWphlJjyuBh0iMCpaNDyKoHrNAh0="; + hash = "sha256-M0Um0JYvxQDYC3kqIENCiEIdEPOPNa05/2idih/fWas="; meta = { license = lib.licenses.isc; maintainers = with lib.maintainers; [ @@ -2219,7 +2204,7 @@ }; ron = { - version = "0-unstable-2024-05-05"; + version = "0.2.0-unstable-2024-05-05"; url = "github:tree-sitter-grammars/tree-sitter-ron"; rev = "78938553b93075e638035f624973083451b29055"; hash = "sha256-Sp0g6AWKHNjyUmL5k3RIU+5KtfICfg3o/DH77XRRyI0="; @@ -2300,7 +2285,7 @@ }; slang = { - version = "0-unstable-2025-09-01"; + version = "0.3.1-unstable-2025-09-01"; url = "github:tree-sitter-grammars/tree-sitter-slang"; rev = "1dbcc4abc7b3cdd663eb03d93031167d6ed19f56"; hash = "sha256-UsZpXEJwbKn5M9dqbAv5eJgsCdNbsllbFWtNnDPvtoE="; @@ -2323,7 +2308,7 @@ }; smali = { - version = "0-unstable-2024-05-05"; + version = "1.0.0-unstable-2024-05-05"; url = "github:amaanq/tree-sitter-smali"; rev = "fdfa6a1febc43c7467aa7e937b87b607956f2346"; hash = "sha256-S0U6Xuntz16DrpYwSqMQu8Cu7UuD/JufHUxIHv826yw="; @@ -2354,7 +2339,7 @@ }; snakemake = { - version = "0-unstable-2025-09-18"; + version = "2.0.0-unstable-2025-09-18"; url = "github:osthomas/tree-sitter-snakemake"; rev = "68010430c3e51c0e84c1ce21c6551df0e2469f51"; hash = "sha256-jcMNh+pHjYEvTdShp3o6UlgXRM2AuZMp4KE0uXfNMqY="; @@ -2376,9 +2361,8 @@ }; sourcepawn = { - version = "0-unstable-2025-06-13"; + version = "0.7.8"; url = "github:nilshelmig/tree-sitter-sourcepawn"; - rev = "5a8fdd446b516c81e218245c12129c6ad4bccfa2"; hash = "sha256-TfLCG2Ro3QnGStyCNqHwO54HQMR2fEOV6FjBv+0LjJ0="; meta = { license = lib.licenses.mit; @@ -2487,7 +2471,7 @@ }; sway = { - version = "0-unstable-2025-09-02"; + version = "1.0.0-unstable-2025-09-02"; url = "github:FuelLabs/tree-sitter-sway"; rev = "9b7845ce06ecb38b040c3940970b4fd0adc331d1"; hash = "sha256-+BRw4OFQb7FljdKCj5mruK0L9wsZ+1UDTykVLS9wjoY="; @@ -2512,10 +2496,9 @@ }; t32 = { - version = "0-unstable-2025-12-19"; + version = "7.2.2"; url = "github:xasc/tree-sitter-t32"; - rev = "5b5e4336731bda5ea2e6b78b6a2d9e7a89032b75"; - hash = "sha256-dAbjM+wlKtJ3cY3zdRgsdsjJ0ZYDZxTL0mcunqqNbvw="; + hash = "sha256-BUao6oveuWWPn2jDUWAjzoi9YMsDEA5B+hKJHvCUtD0="; meta = { maintainers = with lib.maintainers; [ aciceri @@ -2537,7 +2520,7 @@ }; tact = { - version = "0-unstable-2025-05-01"; + version = "1.6.0-unstable-2025-05-01"; url = "github:tact-lang/tree-sitter-tact"; rev = "a6267c2091ed432c248780cec9f8d42c8766d9ad"; hash = "sha256-2AUN/VYor3K0hkneLYa6+LjE+V8EJogFqBTgdfvOiKM="; @@ -2585,9 +2568,8 @@ }; teal = { - version = "0-unstable-2025-05-14"; + version = "0.1.0"; url = "github:euclidianAce/tree-sitter-teal"; - rev = "05d276e737055e6f77a21335b7573c9d3c091e2f"; hash = "sha256-JDqWr895Ob1Jn3Kf44xbkMJqyna0AiMBU5xJpA6ZP7w="; meta = { license = lib.licenses.mit; @@ -2630,7 +2612,7 @@ }; thrift = { - version = "0-unstable-2024-04-20"; + version = "0.5.0-unstable-2024-04-20"; url = "github:tree-sitter-grammars/tree-sitter-thrift"; rev = "68fd0d80943a828d9e6f49c58a74be1e9ca142cf"; hash = "sha256-owZbs8ttjKrqTA8fQ/NmBGyIUUItSUvvW4hRv0NPV8Y="; @@ -2849,7 +2831,7 @@ }; vhdl = { - version = "0-unstable-2025-12-18"; + version = "1.3.1-unstable-2025-12-18"; url = "github:jpt13653903/tree-sitter-vhdl"; rev = "7ae08deb5d1641aa57111342218ca1e1b3a5d539"; hash = "sha256-IJ6Gqq+3YJlL4n4cjtCLUCZKpLVJQa81nQrLsJBCccs="; @@ -2999,10 +2981,9 @@ }; }; - xit = { - version = "0-unstable-2024-03-16"; - url = "github:synaptiko/tree-sitter-xit"; - rev = "a4fad351bfa5efdcb379b40c36671413fbe9caac"; + xit = rec { + version = "0.2"; + url = "github:synaptiko/tree-sitter-xit?ref=${version}"; hash = "sha256-wTr7YyGnz/dWfA5oecRqxeR8Unoob6isGnQg4/iu+MI="; meta = { license = lib.licenses.mit; @@ -3071,7 +3052,7 @@ }; yuck = { - version = "0-unstable-2024-05-05"; + version = "0.0.2-unstable-2024-05-05"; url = "github:Philipp-M/tree-sitter-yuck"; rev = "e877f6ade4b77d5ef8787075141053631ba12318"; hash = "sha256-l8c1/7q8S78jGyl+VAVVgs8wq58PrrjycyJfWXsCgAI="; diff --git a/pkgs/development/web/nodejs/v25.nix b/pkgs/development/web/nodejs/v25.nix index 28609675644c..39f2283e8d6a 100644 --- a/pkgs/development/web/nodejs/v25.nix +++ b/pkgs/development/web/nodejs/v25.nix @@ -23,8 +23,8 @@ let [ ]; in buildNodejs { - version = "25.6.1"; - sha256 = "cf756781c8b4dc5ee030f87ddf9d51b8d5bf219ad56cbd9855c4a3bdc832c78e"; + version = "25.7.0"; + sha256 = "8f13df7e8f79c3e8f227ad713c754592293c98f70e9e29e8fcee974e62a000e1"; patches = ( if (stdenv.hostPlatform.emulatorAvailable buildPackages) then diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix index 1c60213097a1..d64fb8c6845c 100644 --- a/pkgs/os-specific/linux/nvidia-x11/default.nix +++ b/pkgs/os-specific/linux/nvidia-x11/default.nix @@ -101,11 +101,11 @@ rec { # Vulkan developer beta driver # See here for more information: https://developer.nvidia.com/vulkan-driver vulkan_beta = generic rec { - version = "580.94.17"; + version = "580.94.18"; persistencedVersion = "580.95.05"; settingsVersion = "580.95.05"; - sha256_64bit = "sha256-JqB7/Wo6EWt9PXbZFC4BoJ5i7u58tfUjZRoKnirWnEo="; - openSha256 = "sha256-OWiuXsNQRIx5lm9pYhqPH/SCPGvtd8/X9jtRZV6CYfQ="; + sha256_64bit = "sha256-FcbmHcwyrUt+1k31UgmX2WZNLLJ4BB5L3pbYUMrwtYo="; + openSha256 = "sha256-1Zt8DY2P43L+k2u90rfGCK1dFLnlnaASqoe+qyVNw7k="; settingsSha256 = "sha256-F2wmUEaRrpR1Vz0TQSwVK4Fv13f3J9NJLtBe4UP2f14="; persistencedSha256 = "sha256-QCwxXQfG/Pa7jSTBB0xD3lsIofcerAWWAHKvWjWGQtg="; url = "https://developer.nvidia.com/downloads/vulkan-beta-${lib.concatStrings (lib.splitVersion version)}-linux"; diff --git a/pkgs/os-specific/linux/zfs/2_3.nix b/pkgs/os-specific/linux/zfs/2_3.nix index 95ffd61de20b..8c26a68b877e 100644 --- a/pkgs/os-specific/linux/zfs/2_3.nix +++ b/pkgs/os-specific/linux/zfs/2_3.nix @@ -13,18 +13,10 @@ callPackage ./generic.nix args { kernelModuleAttribute = "zfs_2_3"; kernelMinSupportedMajorMinor = "4.18"; - kernelMaxSupportedMajorMinor = "6.17"; + kernelMaxSupportedMajorMinor = "6.19"; # this package should point to the latest release. - version = "2.3.5"; - - extraPatches = [ - (fetchpatch { - name = "fix_llvm-21_-wuninitialized-const-pointer_warning.patch"; - url = "https://github.com/openzfs/zfs/commit/9acedbaceec362d08a33ebfe7c4c7efcee81d094.patch"; - hash = "sha256-bjMRuT8gsMuwCnrS5PfG9vYthRvcFaWCCfQbCTVZdpw="; - }) - ]; + version = "2.3.6"; tests = { inherit (nixosTests.zfs) series_2_3; @@ -38,5 +30,5 @@ callPackage ./generic.nix args { amarshall ]; - hash = "sha256-zTDdoQWbguKeWjQH5+FOTDhxfs3e7UPFnUX8ZugHQy4="; + hash = "sha256-5p9UbOQ0WY+XeAO+btDyJ04nRnOQuEuwszduEV7cbso="; } diff --git a/pkgs/os-specific/linux/zfs/2_4.nix b/pkgs/os-specific/linux/zfs/2_4.nix index 9874986076d7..089954fba0a0 100644 --- a/pkgs/os-specific/linux/zfs/2_4.nix +++ b/pkgs/os-specific/linux/zfs/2_4.nix @@ -13,10 +13,10 @@ callPackage ./generic.nix args { kernelModuleAttribute = "zfs_2_4"; kernelMinSupportedMajorMinor = "4.18"; - kernelMaxSupportedMajorMinor = "6.18"; + kernelMaxSupportedMajorMinor = "6.19"; # this package should point to the latest release. - version = "2.4.0"; + version = "2.4.1"; tests = { inherit (nixosTests.zfs) series_2_4; @@ -30,5 +30,5 @@ callPackage ./generic.nix args { amarshall ]; - hash = "sha256-v78Tn1Im9h8Sjd4XACYesPOD+hlUR3Cmg8XjcJXOuwM="; + hash = "sha256-gapM2PNVOjhwGw6TAZF6QDxLza7oqOf1tpj7q0EN9Vg="; } diff --git a/pkgs/servers/home-assistant/custom-components/luxer_one/package.nix b/pkgs/servers/home-assistant/custom-components/luxer_one/package.nix index c339419bda25..aca36ef8e109 100644 --- a/pkgs/servers/home-assistant/custom-components/luxer_one/package.nix +++ b/pkgs/servers/home-assistant/custom-components/luxer_one/package.nix @@ -7,13 +7,13 @@ buildHomeAssistantComponent rec { owner = "tjhorner"; domain = "luxer"; - version = "0.2.0"; + version = "0.3.0"; src = fetchFromGitHub { owner = "tjhorner"; repo = "home-assistant-luxer-one"; tag = "v${version}"; - hash = "sha256-D92PhI23iGbSqvc1Myi9+KHYXpeArivXwFS5bGLn8Tk="; + hash = "sha256-bzAdroFE25L0gy1FURYF5p8BaTjzHKtmpKWweDAQH0s="; }; meta = { diff --git a/pkgs/servers/home-assistant/custom-components/omnik_inverter/package.nix b/pkgs/servers/home-assistant/custom-components/omnik_inverter/package.nix index 91edb53b71ff..45152a97901e 100644 --- a/pkgs/servers/home-assistant/custom-components/omnik_inverter/package.nix +++ b/pkgs/servers/home-assistant/custom-components/omnik_inverter/package.nix @@ -8,13 +8,13 @@ buildHomeAssistantComponent rec { owner = "robbinjanssen"; domain = "omnik_inverter"; - version = "2.6.4"; + version = "3.0.0"; src = fetchFromGitHub { owner = "robbinjanssen"; repo = "home-assistant-omnik-inverter"; - tag = "v${version}"; - hash = "sha256-O1NxT7u27xLydPqEqH72laU0tlYVrMPo0TwWIVNJ+0Q="; + tag = version; + hash = "sha256-L9us48J8fpIK3QHeEe3VhIAYBXbYegWYDi7OjeUollU="; }; dependencies = [ @@ -24,7 +24,7 @@ buildHomeAssistantComponent rec { doCheck = false; # no tests meta = { - changelog = "https://github.com/robbinjanssen/home-assistant-omnik-inverter/releases/tag/v${version}"; + changelog = "https://github.com/robbinjanssen/home-assistant-omnik-inverter/releases/tag/${src.tag}"; description = "Omnik Inverter integration will scrape data from an Omnik inverter connected to your local network"; homepage = "https://github.com/robbinjanssen/home-assistant-omnik-inverter"; maintainers = with lib.maintainers; [ _9R ]; diff --git a/pkgs/servers/home-assistant/custom-components/yoto_ha/package.nix b/pkgs/servers/home-assistant/custom-components/yoto_ha/package.nix index ec468dd58840..b89872983ee6 100644 --- a/pkgs/servers/home-assistant/custom-components/yoto_ha/package.nix +++ b/pkgs/servers/home-assistant/custom-components/yoto_ha/package.nix @@ -8,13 +8,13 @@ buildHomeAssistantComponent rec { owner = "cdnninja"; domain = "yoto"; - version = "2.3.0"; + version = "3.0.4"; src = fetchFromGitHub { owner = "cdnninja"; repo = "yoto_ha"; tag = "v${version}"; - hash = "sha256-8DyL9TQiGT5BMEgZgs7nXGv04HN0slCWIA14OivnzvY="; + hash = "sha256-lVd5Yko9oPCcsSORYe3d8UbOOYEcqvxU37gm/NthptI="; }; dependencies = [ diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 3e1c4acc1f0c..4b735b0af592 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1005,6 +1005,7 @@ mapAliases { lazarus-qt = throw "'lazarus-qt' has been renamed to/replaced by 'lazarus-qt5'"; # Converted to throw 2025-10-27 ledger_agent = throw "'ledger_agent' has been renamed to/replaced by 'ledger-agent'"; # Converted to throw 2025-10-27 lesstif = throw "'lesstif' has been removed due to its being broken and unmaintained upstream. Consider using 'motif' instead."; # Added 2025-06-09 + lexical = throw "'lexical' has been removed because it was deprecated and archived upstream. Consider using 'beamPackages.expert' instead"; # Added 2026-02-24 lfs = throw "'lfs' has been renamed to/replaced by 'dysk'"; # Converted to throw 2025-10-27 libAppleWM = libapplewm; # Added 2026-02-04 libast = throw "'libast' has been removed due to lack of maintenance upstream."; # Added 2025-06-09 @@ -1395,6 +1396,7 @@ mapAliases { newlib-nanoCross = throw "'newlib-nanoCross' has been renamed to/replaced by 'newlib-nano'"; # Converted to throw 2025-10-27 newlibCross = throw "'newlibCross' has been renamed to/replaced by 'newlib'"; # Converted to throw 2025-10-27 newt-go = fosrl-newt; # Added 2025-06-24 + next-ls = throw "'next-ls' has been removed because it was deprecated and archived upstream. Consider using 'beamPackages.expert' instead"; # Added 2026-02-24 nextcloud31 = throw " Nextcloud v31 has been removed from `nixpkgs` as the support for is dropped by upstream in 2025-09. Please upgrade to at least Nextcloud v32 by declaring @@ -1707,6 +1709,7 @@ mapAliases { rofi-wayland-unwrapped = throw "'rofi-wayland-unwrapped' has been merged into 'rofi-unwrapped'"; # Added 2025-09-06 root5 = throw "root5 has been removed from nixpkgs because it's a legacy version"; # Added 2025-07-17 rote = throw "rote has been removed due to lack of upstream maintenance"; # Added 2025-09-10 + rpPPPoE = warnAlias "'rpPPPoE' has been renamed to 'rp-pppoe'" rp-pppoe; # Added 2026-02-12 rquickshare-legacy = throw "The legacy version depends on insecure package libsoup2, please use the main version"; # Added 2025-10-09 rr-unstable = throw "'rr-unstable' has been renamed to/replaced by 'rr'"; # Converted to throw 2025-10-27 rtx = throw "'rtx' has been renamed to/replaced by 'mise'"; # Converted to throw 2025-10-27 @@ -1720,6 +1723,7 @@ mapAliases { rucksack = throw "rucksack was removed due to numerous vulnerabilities in freeimage"; # Added 2025-10-23 runCommandNoCC = warnAlias "'runCommandNoCC' has been renamed to/replaced by 'runCommand'" runCommand; # Converted to warning 2025-10-28 runCommandNoCCLocal = warnAlias "'runCommandNoCCLocal' has been renamed to/replaced by 'runCommandLocal'" runCommandLocal; # Converted to warning 2025-10-28 + runescape = throw "'runescape' was removed due to a lack of maintenance, insecure dependencies, and incompatibility with Jagex accounts. Please consider using 'bolt-launcher' instead."; # Added 2026-02-24 rust-hypervisor-firmware = throw "rust-hypevisor-firmware was removed, as it is no longer needed by Cloud Hypervisor and was broken"; # Added 2026-02-19 rust-synapse-state-compress = throw "'rust-synapse-state-compress' has been renamed to/replaced by 'rust-synapse-compress-state'"; # Converted to throw 2025-10-27 rustc-wasm32 = throw "'rustc-wasm32' has been renamed to/replaced by 'rustc'"; # Converted to throw 2025-10-27 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 97cd9f6d1339..0d9569b21b91 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -17371,6 +17371,13 @@ self: super: with self; { shellingham = callPackage ../development/python-modules/shellingham { }; + sherpa-onnx = callPackage ../development/python-modules/sherpa-onnx { + sherpa-onnx = pkgs.sherpa-onnx.override { + python3Packages = self; + pythonSupport = true; + }; + }; + shiboken2 = toPythonModule ( callPackage ../development/python-modules/shiboken2 { inherit (pkgs) cmake llvmPackages qt5; } );