diff --git a/nixos/modules/services/databases/influxdb.nix b/nixos/modules/services/databases/influxdb.nix index 0161208d9af0..bb07dd16bb58 100644 --- a/nixos/modules/services/databases/influxdb.nix +++ b/nixos/modules/services/databases/influxdb.nix @@ -7,106 +7,7 @@ let cfg = config.services.influxdb; - configOptions = lib.recursiveUpdate { - meta = { - bind-address = ":8088"; - commit-timeout = "50ms"; - dir = "${cfg.dataDir}/meta"; - election-timeout = "1s"; - heartbeat-timeout = "1s"; - hostname = "localhost"; - leader-lease-timeout = "500ms"; - retention-autocreate = true; - }; - - data = { - dir = "${cfg.dataDir}/data"; - wal-dir = "${cfg.dataDir}/wal"; - max-wal-size = 104857600; - wal-enable-logging = true; - wal-flush-interval = "10m"; - wal-partition-flush-delay = "2s"; - }; - - cluster = { - shard-writer-timeout = "5s"; - write-timeout = "5s"; - }; - - retention = { - enabled = true; - check-interval = "30m"; - }; - - http = { - enabled = true; - auth-enabled = false; - bind-address = ":8086"; - https-enabled = false; - log-enabled = true; - pprof-enabled = false; - write-tracing = false; - }; - - monitor = { - store-enabled = false; - store-database = "_internal"; - store-interval = "10s"; - }; - - admin = { - enabled = true; - bind-address = ":8083"; - https-enabled = false; - }; - - graphite = [ - { - enabled = false; - } - ]; - - udp = [ - { - enabled = false; - } - ]; - - collectd = [ - { - enabled = false; - typesdb = "${pkgs.collectd-data}/share/collectd/types.db"; - database = "collectd_db"; - bind-address = ":25826"; - } - ]; - - opentsdb = [ - { - enabled = false; - } - ]; - - continuous_queries = { - enabled = true; - log-enabled = true; - recompute-previous-n = 2; - recompute-no-older-than = "10m"; - compute-runs-per-interval = 10; - compute-no-more-than = "2m"; - }; - - hinted-handoff = { - enabled = true; - dir = "${cfg.dataDir}/hh"; - max-size = 1073741824; - max-age = "168h"; - retry-rate-limit = 0; - retry-interval = "1s"; - }; - } cfg.extraConfig; - - configFile = (pkgs.formats.toml { }).generate "config.toml" configOptions; + settingsFormat = pkgs.formats.toml { }; in { @@ -116,11 +17,7 @@ in services.influxdb = { - enable = lib.mkOption { - default = false; - description = "Whether to enable the influxdb server"; - type = lib.types.bool; - }; + enable = lib.mkEnableOption "the influxdb server"; package = lib.mkPackageOption pkgs "influxdb" { }; @@ -142,10 +39,116 @@ in type = lib.types.path; }; - extraConfig = lib.mkOption { + settings = lib.mkOption { default = { }; description = "Extra configuration options for influxdb"; - type = lib.types.attrs; + type = lib.types.submodule { + freeformType = settingsFormat.type; + config = + let + mkAllOptionDefault = lib.mapAttrs (n: lib.mkOptionDefault); + in + { + meta = mkAllOptionDefault { + bind-address = ":8088"; + commit-timeout = "50ms"; + dir = "${cfg.dataDir}/meta"; + election-timeout = "1s"; + heartbeat-timeout = "1s"; + hostname = "localhost"; + leader-lease-timeout = "500ms"; + retention-autocreate = true; + }; + + data = mkAllOptionDefault { + dir = "${cfg.dataDir}/data"; + wal-dir = "${cfg.dataDir}/wal"; + max-wal-size = 104857600; + wal-enable-logging = true; + wal-flush-interval = "10m"; + wal-partition-flush-delay = "2s"; + }; + + cluster = mkAllOptionDefault { + shard-writer-timeout = "5s"; + write-timeout = "5s"; + }; + + retention = mkAllOptionDefault { + enabled = true; + check-interval = "30m"; + }; + + http = mkAllOptionDefault { + enabled = true; + auth-enabled = false; + bind-address = ":8086"; + https-enabled = false; + log-enabled = true; + pprof-enabled = false; + write-tracing = false; + }; + + monitor = mkAllOptionDefault { + store-enabled = false; + store-database = "_internal"; + store-interval = "10s"; + }; + + admin = mkAllOptionDefault { + enabled = true; + bind-address = ":8083"; + https-enabled = false; + }; + + # We can't make lists sensibly overrideable, so you have to override + # them whole + graphite = lib.mkOptionDefault [ + { + enabled = false; + } + ]; + + udp = lib.mkOptionDefault [ + { + enabled = false; + } + ]; + + collectd = lib.mkOptionDefault [ + { + enabled = false; + typesdb = "${pkgs.collectd-data}/share/collectd/types.db"; + database = "collectd_db"; + bind-address = ":25826"; + } + ]; + + opentsdb = lib.mkOptionDefault [ + { + enabled = false; + } + ]; + + continuous_queries = mkAllOptionDefault { + enabled = true; + log-enabled = true; + recompute-previous-n = 2; + recompute-no-older-than = "10m"; + compute-runs-per-interval = 10; + compute-no-more-than = "2m"; + }; + + hinted-handoff = mkAllOptionDefault { + enabled = true; + dir = "${cfg.dataDir}/hh"; + max-size = 1073741824; + max-age = "168h"; + retry-rate-limit = 0; + retry-interval = "1s"; + }; + }; + }; }; }; }; @@ -163,17 +166,16 @@ in wantedBy = [ "multi-user.target" ]; after = [ "network.target" ]; serviceConfig = { - ExecStart = ''${cfg.package}/bin/influxd -config "${configFile}"''; + ExecStart = ''${cfg.package}/bin/influxd -config "${settingsFormat.generate "config.toml" cfg.settings}"''; User = cfg.user; Group = cfg.group; Restart = "on-failure"; }; postStart = let - scheme = if configOptions.http.https-enabled then "-k https" else "http"; - bindAddr = (ba: if lib.hasPrefix ":" ba then "127.0.0.1${ba}" else "${ba}") ( - toString configOptions.http.bind-address - ); + scheme = if cfg.settings.http.https-enabled or false then "-k https" else "http"; + inherit (cfg.settings.http) bind-address; + bindAddr = if lib.hasPrefix ":" bind-address then "127.0.0.1${bind-address}" else bind-address; in lib.mkBefore '' until ${pkgs.curl.bin}/bin/curl -s -o /dev/null ${scheme}://${bindAddr}/ping; do @@ -182,7 +184,7 @@ in ''; }; - users.users = lib.optionalAttrs (cfg.user == "influxdb") { + users.users = lib.mkIf (cfg.user == "influxdb") { influxdb = { uid = config.ids.uids.influxdb; group = "influxdb"; @@ -190,9 +192,16 @@ in }; }; - users.groups = lib.optionalAttrs (cfg.group == "influxdb") { + users.groups = lib.mkIf (cfg.group == "influxdb") { influxdb.gid = config.ids.gids.influxdb; }; }; + imports = [ + # FIXME remove after 26.11 + (lib.mkRenamedOptionModule + [ "services" "influxdb" "extraConfig" ] + [ "services" "influxdb" "settings" ] + ) + ]; } diff --git a/pkgs/applications/emulators/libretro/cores/genesis-plus-gx.nix b/pkgs/applications/emulators/libretro/cores/genesis-plus-gx.nix index 0df791b64b80..be33f5b49855 100644 --- a/pkgs/applications/emulators/libretro/cores/genesis-plus-gx.nix +++ b/pkgs/applications/emulators/libretro/cores/genesis-plus-gx.nix @@ -5,13 +5,13 @@ }: mkLibretroCore { core = "genesis-plus-gx"; - version = "0-unstable-2026-01-16"; + version = "0-unstable-2026-01-23"; src = fetchFromGitHub { owner = "libretro"; repo = "Genesis-Plus-GX"; - rev = "3f0f44787b3c9f51eaad3abfbeb86f345d6d8fb1"; - hash = "sha256-ZrJIZqkJC39vreiNPeEm764vDW42uv6kZb0rFo4bAXw="; + rev = "c858c9c5eebef46ea1a69427091853f9f1edbd23"; + hash = "sha256-3Rzoy2G517Pc3mAQY+b2dvAMDxUoUmyR8FCyg4BR5bc="; }; meta = { diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index ff56208f2d27..25f406bda496 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -1247,11 +1247,11 @@ "vendorHash": "sha256-HWAUI0mowVP8FPw44xYaFOTh6jjkfXa7fuPk2zoSZJ8=" }, "spotinst_spotinst": { - "hash": "sha256-0KjAzRrPsjBh1SadyKT4KTLvF7+cl5Hq5mWbv6uHNaA=", + "hash": "sha256-aPOqAzK/FdDDTbl2WMKxA99a5w6ZM0xK/BLjzPnvuws=", "homepage": "https://registry.terraform.io/providers/spotinst/spotinst", "owner": "spotinst", "repo": "terraform-provider-spotinst", - "rev": "v1.232.1", + "rev": "v1.232.3", "spdx": "MPL-2.0", "vendorHash": "sha256-Cj7RVITkFxIjAZAqHFhnoTa4lTZFXG22ny801g0Y+NE=" }, diff --git a/pkgs/build-support/build-fhsenv-bubblewrap/buildFHSEnv.nix b/pkgs/build-support/build-fhsenv-bubblewrap/buildFHSEnv.nix index fb6fcc815c9b..de9afda8d1bb 100644 --- a/pkgs/build-support/build-fhsenv-bubblewrap/buildFHSEnv.nix +++ b/pkgs/build-support/build-fhsenv-bubblewrap/buildFHSEnv.nix @@ -46,14 +46,14 @@ let # "use of glibc_multi is only supported on x86_64-linux" isMultiBuild = multiArch && stdenv.system == "x86_64-linux"; - # What should lib be linked to: lib32 or lib64? + # What should $out/usr/lib be linked to: lib32 or lib64? defaultLib = - { - "i686-linux" = "lib32"; - "x86_64-linux" = "lib64"; - "aarch64-linux" = "lib64"; - } - .${stdenv.system} or (throw "Please expand list of system with defaultLib for '${stdenv.system}'"); + if stdenv.hostPlatform.is64bit then + "lib64" + else if stdenv.hostPlatform.is32bit then + "lib32" + else + throw "buildFHSEnvBubblewrap: defaultLib cannot handle system ${stdenv.hostPlatform.system} (expected 64bit or 32bit)"; # list of packages (usually programs) which match the host's architecture # (which includes stuff from multiPkgs) diff --git a/pkgs/by-name/cu/cue/package.nix b/pkgs/by-name/cu/cue/package.nix index 093773a0de66..a2862b4f2bce 100644 --- a/pkgs/by-name/cu/cue/package.nix +++ b/pkgs/by-name/cu/cue/package.nix @@ -10,13 +10,13 @@ buildGoModule (finalAttrs: { pname = "cue"; - version = "0.15.3"; + version = "0.15.4"; src = fetchFromGitHub { owner = "cue-lang"; repo = "cue"; tag = "v${finalAttrs.version}"; - hash = "sha256-xonTaZyJ3oyk4jcnyLIlOEP201jfM4cB7jNR6GxfK1E="; + hash = "sha256-5qu+CilTLYdTCfW15ifGIhr/fVH7NshrFxecwED1hkQ="; }; vendorHash = "sha256-ivFw62+pg503EEpRsdGSQrFNah87RTUrRXUSPZMFLG4="; diff --git a/pkgs/by-name/db/dbeaver-bin/package.nix b/pkgs/by-name/db/dbeaver-bin/package.nix index 4f31401403ce..ce77767dc46f 100644 --- a/pkgs/by-name/db/dbeaver-bin/package.nix +++ b/pkgs/by-name/db/dbeaver-bin/package.nix @@ -8,7 +8,7 @@ openjdk21, gnused, autoPatchelfHook, - autoSignDarwinBinariesHook, + darwin, wrapGAppsHook3, gtk3, glib, @@ -55,7 +55,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { ] ++ lib.optionals stdenvNoCC.hostPlatform.isDarwin [ undmg - autoSignDarwinBinariesHook + darwin.autoSignDarwinBinariesHook ]; dontConfigure = true; @@ -144,7 +144,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { ''; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; license = lib.licenses.asl20; - platforms = with lib.platforms; linux ++ darwin; + platforms = lib.platforms.linux ++ lib.platforms.darwin; maintainers = with lib.maintainers; [ gepbird mkg20001 diff --git a/pkgs/by-name/fa/factorio/package.nix b/pkgs/by-name/fa/factorio/package.nix index 3de81b7191f8..62511cc4c77b 100644 --- a/pkgs/by-name/fa/factorio/package.nix +++ b/pkgs/by-name/fa/factorio/package.nix @@ -16,7 +16,7 @@ libxkbcommon, makeDesktopItem, makeWrapper, - releaseType, + releaseType ? "alpha", stdenv, wayland, diff --git a/pkgs/by-name/li/linyaps/package.nix b/pkgs/by-name/li/linyaps/package.nix index df7d2c833006..b21f0f3a125c 100644 --- a/pkgs/by-name/li/linyaps/package.nix +++ b/pkgs/by-name/li/linyaps/package.nix @@ -38,13 +38,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "linyaps"; - version = "1.11.0"; + version = "1.11.1"; src = fetchFromGitHub { owner = "OpenAtom-Linyaps"; repo = finalAttrs.pname; tag = finalAttrs.version; - hash = "sha256-qPHDAwEQVnHLWGioEfgz11ZWhlEBJynap3a0hgfL050="; + hash = "sha256-iGdZc+i1l/+raI7Pjpj3LOtxvSJ37fUth3VsKaV54u0="; }; patches = [ diff --git a/pkgs/by-name/mi/miro/package.nix b/pkgs/by-name/mi/miro/package.nix index d8242fb5b98a..8e234870e376 100644 --- a/pkgs/by-name/mi/miro/package.nix +++ b/pkgs/by-name/mi/miro/package.nix @@ -13,16 +13,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "miro"; - version = "0.7.2"; + version = "0.7.3"; src = fetchFromGitHub { owner = "vincent-uden"; repo = "miro"; tag = "v${finalAttrs.version}"; - hash = "sha256-2RyBjWeb94bxiZ7hy//654YP1bc6bl13slNxRwrhtyk="; + hash = "sha256-HSI6sAXy+PtZdla2GMuWFwoClUIf3E4rc3NHh7Wz1BE="; }; - cargoHash = "sha256-wRlze8VZ9I4O/eycWvlNPUsa/ucBeZ8SWtD9eJ+Uxvs="; + cargoHash = "sha256-yYpHB7LwGxBy5r16vzXflqaygJmibEV4XteD0BV0HoA="; nativeBuildInputs = [ rustPlatform.bindgenHook diff --git a/pkgs/by-name/mp/mpv/scripts/uosc-danmaku.nix b/pkgs/by-name/mp/mpv/scripts/uosc-danmaku.nix new file mode 100644 index 000000000000..ea673c52b76f --- /dev/null +++ b/pkgs/by-name/mp/mpv/scripts/uosc-danmaku.nix @@ -0,0 +1,41 @@ +{ + lib, + stdenvNoCC, + fetchFromGitHub, + gitUpdater, +}: +stdenvNoCC.mkDerivation (finalAttrs: { + pname = "uosc-danmaku"; + version = "2.0.0"; + + src = fetchFromGitHub { + owner = "Tony15246"; + repo = "uosc_danmaku"; + tag = "v${finalAttrs.version}"; + hash = "sha256-r4HcrDh4iW8ErfClfX1gkEWp7lVKbLE88fpj3tjYBAI="; + }; + + dontConfigure = true; + dontBuild = true; + + installPhase = '' + runHook preInstall + + install -Dm644 main.lua $out/share/mpv/scripts/uosc_danmaku/main.lua + cp -r modules apis dicts $out/share/mpv/scripts/uosc_danmaku/ + + runHook postInstall + ''; + + passthru = { + updateScript = gitUpdater { }; + scriptName = "uosc_danmaku"; + }; + + meta = { + description = "Load DanDanPlay danmaku in MPV player"; + homepage = "https://github.com/Tony15246/uosc_danmaku"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ puiyq ]; + }; +}) diff --git a/pkgs/by-name/po/pomerium-cli/package.nix b/pkgs/by-name/po/pomerium-cli/package.nix index bf89b42e9c05..4c9fd773b419 100644 --- a/pkgs/by-name/po/pomerium-cli/package.nix +++ b/pkgs/by-name/po/pomerium-cli/package.nix @@ -14,16 +14,16 @@ let in buildGoModule rec { pname = "pomerium-cli"; - version = "0.31.0"; + version = "0.32.0"; src = fetchFromGitHub { owner = "pomerium"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-m/qiNpkNQdQLC2vBbN5aj3oWTWZeFdplcXQCa0PiOKk="; + sha256 = "sha256-dxN3pVDt6v/xEnBwvmOFf8gf6YZWv23a4K6mTRovv+k="; }; - vendorHash = "sha256-a1E9pLMJ7JynV+YLANuO3iJ0IzkdEy0KBRUhsfz3D+U="; + vendorHash = "sha256-pDoV7CzQFiAi6OAqqW8b6/Sl9PSQou9pU2c5nU7Rt0A="; subPackages = [ "cmd/pomerium-cli" diff --git a/pkgs/by-name/py/pyrefly/package.nix b/pkgs/by-name/py/pyrefly/package.nix index b0857f17b8d4..3c699febe550 100644 --- a/pkgs/by-name/py/pyrefly/package.nix +++ b/pkgs/by-name/py/pyrefly/package.nix @@ -10,17 +10,17 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "pyrefly"; - version = "0.49.0"; + version = "0.50.0"; src = fetchFromGitHub { owner = "facebook"; repo = "pyrefly"; tag = finalAttrs.version; - hash = "sha256-r0KNzXZA02J9fYUI0oEoH188OemVzambC+GKlQaq5oU="; + hash = "sha256-F8r+kJx2nBwekeU2d2xLo+pggAzVWy0V0CV8Z0ZfLs8="; }; buildAndTestSubdir = "pyrefly"; - cargoHash = "sha256-nL703jB01JI7LILJKl4FiaRHNyjxNluZpQmJCTTzVdY="; + cargoHash = "sha256-vkqxRIbNEKJWNIIAMtny1XF6TSzV7KCpZPl+OCDEiPo="; buildInputs = [ rust-jemalloc-sys ]; diff --git a/pkgs/by-name/ru/rumdl/package.nix b/pkgs/by-name/ru/rumdl/package.nix index 58abb555c215..1449a2fc2e5f 100644 --- a/pkgs/by-name/ru/rumdl/package.nix +++ b/pkgs/by-name/ru/rumdl/package.nix @@ -9,26 +9,21 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "rumdl"; - version = "0.1.1"; + version = "0.1.2"; src = fetchFromGitHub { owner = "rvben"; repo = "rumdl"; tag = "v${finalAttrs.version}"; - hash = "sha256-cJRJVo/YoSst5NJXAZPJFhXFM6Fmqy/UfuOK2OGLi2o="; + hash = "sha256-8K+jZL/yo7ur5WD+5+L+ZHhFkhYo83brgD6Gg1Xo6js="; }; - cargoHash = "sha256-Y1KqqDGEjp2+0BwdAgooBjPOQtGbNDwwuXFH97XvXb4="; + cargoHash = "sha256-dpHV5+DJLsjwvLkxtXOS7CYUNKXW57o0O541pO8vN5U="; cargoBuildFlags = [ "--bin=rumdl" ]; - # Non-specific tests often fail on Darwin (especially aarch64-darwin), - # on both Hydra and GitHub-hosted runners, even with __darwinAllowLocalNetworking enabled. - # proptest fails frequently - doCheck = false; - nativeCheckInputs = [ gitMinimal ]; @@ -36,13 +31,8 @@ rustPlatform.buildRustPackage (finalAttrs: { useNextest = true; cargoTestFlags = [ - "--profile ci" - ]; - - checkFlags = [ - # Skip Windows tests - "--skip comprehensive_windows_tests" - "--skip windows_vscode_tests" + # Prefer the "smoke" profile over "ci" to exclude flaky tests: https://github.com/rvben/rumdl/pull/341 + "--profile smoke" ]; doInstallCheck = true; diff --git a/pkgs/by-name/un/unrar-free/package.nix b/pkgs/by-name/un/unrar-free/package.nix index 550d83115bdf..3f445bfd2e02 100644 --- a/pkgs/by-name/un/unrar-free/package.nix +++ b/pkgs/by-name/un/unrar-free/package.nix @@ -5,17 +5,18 @@ autoreconfHook, libarchive, pkg-config, + versionCheckHook, }: stdenv.mkDerivation (finalAttrs: { pname = "unrar-free"; - version = "0.3.1-unstable-2024-09-19"; + version = "0.3.3"; src = fetchFromGitLab { owner = "bgermann"; repo = "unrar-free"; - rev = "a7f9a157276ae68987fb44fe5ccf4f4255eb0a5e"; - hash = "sha256-aCO1vklG5MneEiqS/IBvC09YrvWa+OndfvCblDFKA1E="; + tag = finalAttrs.version; + hash = "sha256-3eI8vWc6E+gj+LwBG6jG1l8h8EXXcAQ44W0ALzwOOFg="; }; nativeBuildInputs = [ @@ -27,6 +28,9 @@ stdenv.mkDerivation (finalAttrs: { setupHook = ./setup-hook.sh; + nativeInstallCheckInputs = [ versionCheckHook ]; + doInstallCheck = true; + meta = { description = "Free utility to extract files from RAR archives"; longDescription = '' @@ -41,7 +45,10 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://gitlab.com/bgermann/unrar-free"; license = lib.licenses.gpl2Plus; mainProgram = "unrar-free"; - maintainers = with lib.maintainers; [ thiagokokada ]; + maintainers = with lib.maintainers; [ + anthonyroussel + thiagokokada + ]; platforms = lib.platforms.unix; broken = stdenv.hostPlatform.isDarwin; }; diff --git a/pkgs/by-name/wr/wrangler/package.nix b/pkgs/by-name/wr/wrangler/package.nix index 745040d45a32..983d6c33ec1f 100644 --- a/pkgs/by-name/wr/wrangler/package.nix +++ b/pkgs/by-name/wr/wrangler/package.nix @@ -19,13 +19,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "wrangler"; - version = "4.60.0"; + version = "4.61.0"; src = fetchFromGitHub { owner = "cloudflare"; repo = "workers-sdk"; rev = "wrangler@${finalAttrs.version}"; - hash = "sha256-lRdQrUgEr7KS/05BXZW7h3JS91d3gM8w+RLlaLC98RU="; + hash = "sha256-mNJPb66q0+UvcBpNBhqdZN2X5BKCBTXrWSWUgkjYS80="; }; pnpmDeps = fetchPnpmDeps { @@ -37,7 +37,7 @@ stdenv.mkDerivation (finalAttrs: { ; pnpm = pnpm_9; fetcherVersion = 2; - hash = "sha256-r3J4xNZJlWmNtnpLfx/eKK3TDKcrjZmR7oxp6TDuwxg="; + hash = "sha256-cwvAlqyglMSrPW/YIdV01VkT6LMQenFrjCXZmrcg954="; }; # pnpm packageManager version in workers-sdk root package.json may not match nixpkgs postPatch = '' diff --git a/pkgs/development/python-modules/gattlib/default.nix b/pkgs/development/python-modules/gattlib/default.nix index 82aa2b4e3df8..e9bf36c3d599 100644 --- a/pkgs/development/python-modules/gattlib/default.nix +++ b/pkgs/development/python-modules/gattlib/default.nix @@ -7,7 +7,6 @@ # build pkg-config, - glibc, python, setuptools, bluez, @@ -46,7 +45,6 @@ buildPythonPackage rec { nativeBuildInputs = [ pkg-config - glibc ]; buildInputs = [ diff --git a/pkgs/development/python-modules/notobuilder/default.nix b/pkgs/development/python-modules/notobuilder/default.nix index c9fb6b26e16f..6f4198953ea1 100644 --- a/pkgs/development/python-modules/notobuilder/default.nix +++ b/pkgs/development/python-modules/notobuilder/default.nix @@ -21,14 +21,14 @@ buildPythonPackage { pname = "notobuilder"; - version = "0-unstable-2026-01-09"; + version = "0-unstable-2026-01-27"; pyproject = true; src = fetchFromGitHub { owner = "notofonts"; repo = "notobuilder"; - rev = "424667c0603ecae86424961ad7f8dee97e6b134c"; - hash = "sha256-FzxYm602w2h58g8D9rk8cJAYWgxMJNMngeWUWnpRfdA="; + rev = "5d66754065c6257278d5cb780f6b8dc80d2a686b"; + hash = "sha256-ba9+X1ybaHW8ZWfrIuZnnJXeFZhkcXO9RXrc37mVz4U="; }; postPatch = '' diff --git a/pkgs/development/python-modules/pysmarlaapi/default.nix b/pkgs/development/python-modules/pysmarlaapi/default.nix index a80fb0d190ec..f887d40e93ca 100644 --- a/pkgs/development/python-modules/pysmarlaapi/default.nix +++ b/pkgs/development/python-modules/pysmarlaapi/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "pysmarlaapi"; - version = "0.9.3"; + version = "0.10.0"; pyproject = true; src = fetchFromGitHub { owner = "Explicatis-GmbH"; repo = "pysmarlaapi"; tag = version; - hash = "sha256-VnWGBTbs6c5WU1mGcUNRsFjdWUN5yA6TOD9qmQASxIw="; + hash = "sha256-aHwmZIesBco6XyxKv321p+0p3Gibvi+X7xs+7RkwbVc="; }; build-system = [ flit-core ]; diff --git a/pkgs/development/python-modules/torch/bin/binary-hashes.nix b/pkgs/development/python-modules/torch/bin/binary-hashes.nix index 7257fb72c9c0..58f8030a5095 100644 --- a/pkgs/development/python-modules/torch/bin/binary-hashes.nix +++ b/pkgs/development/python-modules/torch/bin/binary-hashes.nix @@ -7,81 +7,81 @@ version: builtins.getAttr version { - "2.9.1" = { + "2.10.0" = { x86_64-linux-310 = { - name = "torch-2.9.1-cp310-cp310-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu128/torch-2.9.1%2Bcu128-cp310-cp310-manylinux_2_28_x86_64.whl"; - hash = "sha256-yNZwqgvm++zSsOe31RShBNve/MN4bKRGzww0FQQ+pAo="; + name = "torch-2.10.0-cp310-cp310-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu128/torch-2.10.0%2Bcu128-cp310-cp310-manylinux_2_28_x86_64.whl"; + hash = "sha256-NjaFB7VuqlGsvTyWrIiTu5qGmR/80Gmf6joadKK4vcs="; }; x86_64-linux-311 = { - name = "torch-2.9.1-cp311-cp311-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu128/torch-2.9.1%2Bcu128-cp311-cp311-manylinux_2_28_x86_64.whl"; - hash = "sha256-Kh2pQPB1diHQmMl1X3UE15GnKkCSDshaT9mLICU/yk4="; + name = "torch-2.10.0-cp311-cp311-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu128/torch-2.10.0%2Bcu128-cp311-cp311-manylinux_2_28_x86_64.whl"; + hash = "sha256-HQH/rr9kcVwPUHo5RjFJyxnllv9wK9S8+GJgHyiB2rw="; }; x86_64-linux-312 = { - name = "torch-2.9.1-cp312-cp312-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu128/torch-2.9.1%2Bcu128-cp312-cp312-manylinux_2_28_x86_64.whl"; - hash = "sha256-fLQBj0zmi2H9Pvh9wcTKUgcxx7WyAONgrUe2EteEQGM="; + name = "torch-2.10.0-cp312-cp312-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu128/torch-2.10.0%2Bcu128-cp312-cp312-manylinux_2_28_x86_64.whl"; + hash = "sha256-Yo6JvVEQztfevuKlfGmVlyW3+8ZOq4GjndcORsfii6U="; }; x86_64-linux-313 = { - name = "torch-2.9.1-cp313-cp313-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu128/torch-2.9.1%2Bcu128-cp313-cp313-manylinux_2_28_x86_64.whl"; - hash = "sha256-YzgaEJpWmygO0zGdqJ06/lz5q1yHmTY4KiEq/7XJBVI="; + name = "torch-2.10.0-cp313-cp313-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu128/torch-2.10.0%2Bcu128-cp313-cp313-manylinux_2_28_x86_64.whl"; + hash = "sha256-e0vSPtY96XRW/MgcJv6p8C7gLOERIRHE2sDYz+V0sj4="; }; x86_64-linux-314 = { - name = "torch-2.9.1-cp314-cp314-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu128/torch-2.9.1%2Bcu128-cp314-cp314-manylinux_2_28_x86_64.whl"; - hash = "sha256-d4jT0D2TnPAPk6wNpatSCEb2ZBHjOc+/UZqAbo+s9Rk="; + name = "torch-2.10.0-cp314-cp314-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu128/torch-2.10.0%2Bcu128-cp314-cp314-manylinux_2_28_x86_64.whl"; + hash = "sha256-N9cf7qBod2hVaGoVEgWN8/GfbwQKFR8FWqdGYBZ4dE8="; }; aarch64-darwin-310 = { - name = "torch-2.9.1-cp310-none-macosx_11_0_arm64.whl"; - url = "https://download.pytorch.org/whl/cpu/torch-2.9.1-cp310-none-macosx_11_0_arm64.whl"; - hash = "sha256-vx5oz7k1riBGN0/wKnqnPdpwNRtGNChG9VcFWzpUC/A="; + name = "torch-2.10.0-cp310-none-macosx_11_0_arm64.whl"; + url = "https://download.pytorch.org/whl/cpu/torch-2.10.0-cp310-none-macosx_11_0_arm64.whl"; + hash = "sha256-LRar/ObJJYTO6wDDsmZdV5hCTdntI16mm3LgRc1Trpc="; }; aarch64-darwin-311 = { - name = "torch-2.9.1-cp311-none-macosx_11_0_arm64.whl"; - url = "https://download.pytorch.org/whl/cpu/torch-2.9.1-cp311-none-macosx_11_0_arm64.whl"; - hash = "sha256-pSlSqMkKQiwUYn6pm5gmt1VyA7RrTQdy08pcdplpJCU="; + name = "torch-2.10.0-cp311-none-macosx_11_0_arm64.whl"; + url = "https://download.pytorch.org/whl/cpu/torch-2.10.0-cp311-none-macosx_11_0_arm64.whl"; + hash = "sha256-RYSrFnmVwEefaCHj3OrxmcgWbIEdOtu6XY7tu/pnZP0="; }; aarch64-darwin-312 = { - name = "torch-2.9.1-cp312-none-macosx_11_0_arm64.whl"; - url = "https://download.pytorch.org/whl/cpu/torch-2.9.1-cp312-none-macosx_11_0_arm64.whl"; - hash = "sha256-KHJC3R+DCEYJi17KhH+BeqXGAV6lerTBKHgJ7+p7d+s="; + name = "torch-2.10.0-cp312-none-macosx_11_0_arm64.whl"; + url = "https://download.pytorch.org/whl/cpu/torch-2.10.0-cp312-none-macosx_11_0_arm64.whl"; + hash = "sha256-RaHFBXYpRErrHEUsGCmPp/MPL3rq3U3EH500CYApRAc="; }; aarch64-darwin-313 = { - name = "torch-2.9.1-cp313-none-macosx_11_0_arm64.whl"; - url = "https://download.pytorch.org/whl/cpu/torch-2.9.1-cp313-none-macosx_11_0_arm64.whl"; - hash = "sha256-vO5krnqmWHbO6ubcrr51EJSFshNSjHSTlgIgiiBwbj8="; + name = "torch-2.10.0-cp313-none-macosx_11_0_arm64.whl"; + url = "https://download.pytorch.org/whl/cpu/torch-2.10.0-cp313-none-macosx_11_0_arm64.whl"; + hash = "sha256-hANR2lnO23vLxRmBiABQgTwZ72uJin/s9zo6/HGv8/4="; }; aarch64-darwin-314 = { - name = "torch-2.9.1-cp314-cp314-macosx_11_0_arm64.whl"; - url = "https://download.pytorch.org/whl/cpu/torch-2.9.1-cp314-cp314-macosx_11_0_arm64.whl"; - hash = "sha256-3vrb6wVc/PXe9Y9wk3FFrsvXpLwpUjje0dDoWuLPDh0="; + name = "torch-2.10.0-cp314-cp314-macosx_14_0_arm64.whl"; + url = "https://download.pytorch.org/whl/cpu/torch-2.10.0-cp314-cp314-macosx_14_0_arm64.whl"; + hash = "sha256-yIsRKf1OFPD4gpY8ZygxXKrjXS9HN00X7e7R7cdpdJc="; }; aarch64-linux-310 = { - name = "torch-2.9.1-cp310-cp310-manylinux_2_28_aarch64.whl"; - url = "https://download.pytorch.org/whl/cpu/torch-2.9.1%2Bcpu-cp310-cp310-manylinux_2_28_aarch64.whl"; - hash = "sha256-EIZsikjEqlrj9IU43IoFW5nFfZxq8r9d1xU3TZ1t3KM="; + name = "torch-2.10.0-cp310-cp310-manylinux_2_28_aarch64.whl"; + url = "https://download.pytorch.org/whl/cpu/torch-2.10.0%2Bcpu-cp310-cp310-manylinux_2_28_aarch64.whl"; + hash = "sha256-1j7mqAmC/XP+RLtw2X0pduAQMS/224HXv7kWewbdRbk="; }; aarch64-linux-311 = { - name = "torch-2.9.1-cp311-cp311-manylinux_2_28_aarch64.whl"; - url = "https://download.pytorch.org/whl/cpu/torch-2.9.1%2Bcpu-cp311-cp311-manylinux_2_28_aarch64.whl"; - hash = "sha256-DmEc+xZyTmIlK2fTEHO8XEkMuD6S7NwRknYlNeDkRIc="; + name = "torch-2.10.0-cp311-cp311-manylinux_2_28_aarch64.whl"; + url = "https://download.pytorch.org/whl/cpu/torch-2.10.0%2Bcpu-cp311-cp311-manylinux_2_28_aarch64.whl"; + hash = "sha256-HPy5sVWMblLf/Q1O/86DsTxa5dlzOBZMNyBIwh+c/Ms="; }; aarch64-linux-312 = { - name = "torch-2.9.1-cp312-cp312-manylinux_2_28_aarch64.whl"; - url = "https://download.pytorch.org/whl/cpu/torch-2.9.1%2Bcpu-cp312-cp312-manylinux_2_28_aarch64.whl"; - hash = "sha256-O/m0QqUaKUjkEhanbXqwDwaUz8qqUbb5vKtXt/iYQ+Y="; + name = "torch-2.10.0-cp312-cp312-manylinux_2_28_aarch64.whl"; + url = "https://download.pytorch.org/whl/cpu/torch-2.10.0%2Bcpu-cp312-cp312-manylinux_2_28_aarch64.whl"; + hash = "sha256-F5RRcWSH+MsJtWRZZn+h9cTAlGwedfvq53z8QKV2jYc="; }; aarch64-linux-313 = { - name = "torch-2.9.1-cp313-cp313-manylinux_2_28_aarch64.whl"; - url = "https://download.pytorch.org/whl/cpu/torch-2.9.1%2Bcpu-cp313-cp313-manylinux_2_28_aarch64.whl"; - hash = "sha256-PlMuVTs37oWSBamy0ceXf9aSL1O7sbm/3VvcANGmDtQ="; + name = "torch-2.10.0-cp313-cp313-manylinux_2_28_aarch64.whl"; + url = "https://download.pytorch.org/whl/cpu/torch-2.10.0%2Bcpu-cp313-cp313-manylinux_2_28_aarch64.whl"; + hash = "sha256-5RmUSSzbdu3OKdqI3jZyowIvnvD/2QNFQ2lI1Jkr4sc="; }; aarch64-linux-314 = { - name = "torch-2.9.1-cp314-cp314-manylinux_2_28_aarch64.whl"; - url = "https://download.pytorch.org/whl/cpu/torch-2.9.1%2Bcpu-cp314-cp314-manylinux_2_28_aarch64.whl"; - hash = "sha256-ZQEKtKrM5smh3fyTX5hsADyoY43tBDSP0ybD50NGI3w="; + name = "torch-2.10.0-cp314-cp314-manylinux_2_28_aarch64.whl"; + url = "https://download.pytorch.org/whl/cpu/torch-2.10.0%2Bcpu-cp314-cp314-manylinux_2_28_aarch64.whl"; + hash = "sha256-oo/bz6L7rP/sgTAPJN0b7SsMz9vtEHqCPP8SvB2wcPY="; }; }; } diff --git a/pkgs/development/python-modules/torch/bin/default.nix b/pkgs/development/python-modules/torch/bin/default.nix index 705186bfa128..3d2b37967128 100644 --- a/pkgs/development/python-modules/torch/bin/default.nix +++ b/pkgs/development/python-modules/torch/bin/default.nix @@ -16,6 +16,7 @@ cudaPackages, # dependencies + cuda-bindings, filelock, jinja2, networkx, @@ -34,7 +35,7 @@ let pyVerNoDot = builtins.replaceStrings [ "." ] [ "" ] python.pythonVersion; srcs = import ./binary-hashes.nix version; unsupported = throw "Unsupported system"; - version = "2.9.1"; + version = "2.10.0"; in buildPythonPackage { inherit version; @@ -96,6 +97,9 @@ buildPythonPackage { sympy typing-extensions ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ + cuda-bindings + ] ++ lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isx86_64) [ triton ]; postInstall = '' diff --git a/pkgs/development/python-modules/torch/bin/prefetch.sh b/pkgs/development/python-modules/torch/bin/prefetch.sh index 354d28362a90..e29955d6a0ff 100755 --- a/pkgs/development/python-modules/torch/bin/prefetch.sh +++ b/pkgs/development/python-modules/torch/bin/prefetch.sh @@ -11,41 +11,41 @@ linux_cpu_bucket="https://download.pytorch.org/whl/cpu" darwin_bucket="https://download.pytorch.org/whl/cpu" url_and_key_list=( - "x86_64-linux-310 $linux_cuda_bucket/torch-${version}%2B${linux_cuda_version}-cp310-cp310-manylinux_2_28_x86_64.whl torch-${version}-cp310-cp310-linux_x86_64.whl" - "x86_64-linux-311 $linux_cuda_bucket/torch-${version}%2B${linux_cuda_version}-cp311-cp311-manylinux_2_28_x86_64.whl torch-${version}-cp311-cp311-linux_x86_64.whl" - "x86_64-linux-312 $linux_cuda_bucket/torch-${version}%2B${linux_cuda_version}-cp312-cp312-manylinux_2_28_x86_64.whl torch-${version}-cp312-cp312-linux_x86_64.whl" - "x86_64-linux-313 $linux_cuda_bucket/torch-${version}%2B${linux_cuda_version}-cp313-cp313-manylinux_2_28_x86_64.whl torch-${version}-cp313-cp313-linux_x86_64.whl" - "x86_64-linux-314 $linux_cuda_bucket/torch-${version}%2B${linux_cuda_version}-cp314-cp314-manylinux_2_28_x86_64.whl torch-${version}-cp314-cp314-linux_x86_64.whl" - "aarch64-darwin-310 $darwin_bucket/torch-${version}-cp310-none-macosx_11_0_arm64.whl torch-${version}-cp310-none-macosx_11_0_arm64.whl" - "aarch64-darwin-311 $darwin_bucket/torch-${version}-cp311-none-macosx_11_0_arm64.whl torch-${version}-cp311-none-macosx_11_0_arm64.whl" - "aarch64-darwin-312 $darwin_bucket/torch-${version}-cp312-none-macosx_11_0_arm64.whl torch-${version}-cp312-none-macosx_11_0_arm64.whl" - "aarch64-darwin-313 $darwin_bucket/torch-${version}-cp313-none-macosx_11_0_arm64.whl torch-${version}-cp313-none-macosx_11_0_arm64.whl" - "aarch64-darwin-314 $darwin_bucket/torch-${version}-cp314-cp314-macosx_11_0_arm64.whl torch-${version}-cp314-cp314-macosx_11_0_arm64.whl" - "aarch64-linux-310 $linux_cpu_bucket/torch-${version}%2Bcpu-cp310-cp310-manylinux_2_28_aarch64.whl torch-${version}-cp310-cp310-manylinux_2_28_aarch64.whl" - "aarch64-linux-311 $linux_cpu_bucket/torch-${version}%2Bcpu-cp311-cp311-manylinux_2_28_aarch64.whl torch-${version}-cp311-cp311-manylinux_2_28_aarch64.whl" - "aarch64-linux-312 $linux_cpu_bucket/torch-${version}%2Bcpu-cp312-cp312-manylinux_2_28_aarch64.whl torch-${version}-cp312-cp312-manylinux_2_28_aarch64.whl" - "aarch64-linux-313 $linux_cpu_bucket/torch-${version}%2Bcpu-cp313-cp313-manylinux_2_28_aarch64.whl torch-${version}-cp313-cp313-manylinux_2_28_aarch64.whl" - "aarch64-linux-314 $linux_cpu_bucket/torch-${version}%2Bcpu-cp314-cp314-manylinux_2_28_aarch64.whl torch-${version}-cp314-cp314-manylinux_2_28_aarch64.whl" + "x86_64-linux-310 $linux_cuda_bucket/torch-${version}%2B${linux_cuda_version}-cp310-cp310-manylinux_2_28_x86_64.whl torch-${version}-cp310-cp310-linux_x86_64.whl" + "x86_64-linux-311 $linux_cuda_bucket/torch-${version}%2B${linux_cuda_version}-cp311-cp311-manylinux_2_28_x86_64.whl torch-${version}-cp311-cp311-linux_x86_64.whl" + "x86_64-linux-312 $linux_cuda_bucket/torch-${version}%2B${linux_cuda_version}-cp312-cp312-manylinux_2_28_x86_64.whl torch-${version}-cp312-cp312-linux_x86_64.whl" + "x86_64-linux-313 $linux_cuda_bucket/torch-${version}%2B${linux_cuda_version}-cp313-cp313-manylinux_2_28_x86_64.whl torch-${version}-cp313-cp313-linux_x86_64.whl" + "x86_64-linux-314 $linux_cuda_bucket/torch-${version}%2B${linux_cuda_version}-cp314-cp314-manylinux_2_28_x86_64.whl torch-${version}-cp314-cp314-linux_x86_64.whl" + "aarch64-darwin-310 $darwin_bucket/torch-${version}-cp310-none-macosx_11_0_arm64.whl torch-${version}-cp310-none-macosx_11_0_arm64.whl" + "aarch64-darwin-311 $darwin_bucket/torch-${version}-cp311-none-macosx_11_0_arm64.whl torch-${version}-cp311-none-macosx_11_0_arm64.whl" + "aarch64-darwin-312 $darwin_bucket/torch-${version}-cp312-none-macosx_11_0_arm64.whl torch-${version}-cp312-none-macosx_11_0_arm64.whl" + "aarch64-darwin-313 $darwin_bucket/torch-${version}-cp313-none-macosx_11_0_arm64.whl torch-${version}-cp313-none-macosx_11_0_arm64.whl" + "aarch64-darwin-314 $darwin_bucket/torch-${version}-cp314-cp314-macosx_14_0_arm64.whl torch-${version}-cp314-cp314-macosx_14_0_arm64.whl" + "aarch64-linux-310 $linux_cpu_bucket/torch-${version}%2Bcpu-cp310-cp310-manylinux_2_28_aarch64.whl torch-${version}-cp310-cp310-manylinux_2_28_aarch64.whl" + "aarch64-linux-311 $linux_cpu_bucket/torch-${version}%2Bcpu-cp311-cp311-manylinux_2_28_aarch64.whl torch-${version}-cp311-cp311-manylinux_2_28_aarch64.whl" + "aarch64-linux-312 $linux_cpu_bucket/torch-${version}%2Bcpu-cp312-cp312-manylinux_2_28_aarch64.whl torch-${version}-cp312-cp312-manylinux_2_28_aarch64.whl" + "aarch64-linux-313 $linux_cpu_bucket/torch-${version}%2Bcpu-cp313-cp313-manylinux_2_28_aarch64.whl torch-${version}-cp313-cp313-manylinux_2_28_aarch64.whl" + "aarch64-linux-314 $linux_cpu_bucket/torch-${version}%2Bcpu-cp314-cp314-manylinux_2_28_aarch64.whl torch-${version}-cp314-cp314-manylinux_2_28_aarch64.whl" ) hashfile="binary-hashes-$version.nix" echo " \"$version\" = {" >>$hashfile for url_and_key in "${url_and_key_list[@]}"; do - key=$(echo "$url_and_key" | cut -d' ' -f1) - url=$(echo "$url_and_key" | cut -d' ' -f2) - name=$(echo "$url_and_key" | cut -d' ' -f3) + key=$(echo "$url_and_key" | cut -d' ' -f1) + url=$(echo "$url_and_key" | cut -d' ' -f2) + name=$(echo "$url_and_key" | cut -d' ' -f3) - echo "prefetching ${url}..." - hash=$(nix --extra-experimental-features nix-command hash convert --hash-algo sha256 $(nix-prefetch-url "$url" --name "$name")) + echo "prefetching ${url}..." + hash=$(nix --extra-experimental-features nix-command hash convert --hash-algo sha256 $(nix-prefetch-url "$url" --name "$name")) - echo " $key = {" >>$hashfile - echo " name = \"$name\";" >>$hashfile - echo " url = \"$url\";" >>$hashfile - echo " hash = \"$hash\";" >>$hashfile - echo " };" >>$hashfile + echo " $key = {" >>$hashfile + echo " name = \"$name\";" >>$hashfile + echo " url = \"$url\";" >>$hashfile + echo " hash = \"$hash\";" >>$hashfile + echo " };" >>$hashfile - echo + echo done echo " };" >>$hashfile diff --git a/pkgs/development/python-modules/torchaudio/bin.nix b/pkgs/development/python-modules/torchaudio/bin.nix index 1a66c24e6172..2e9e5bd3f533 100644 --- a/pkgs/development/python-modules/torchaudio/bin.nix +++ b/pkgs/development/python-modules/torchaudio/bin.nix @@ -20,16 +20,17 @@ torch-bin, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "torchaudio"; - version = "2.9.1"; + version = "2.10.0"; format = "wheel"; src = let pyVerNoDot = lib.replaceStrings [ "." ] [ "" ] python.pythonVersion; unsupported = throw "Unsupported system"; - srcs = (import ./binary-hashes.nix version)."${stdenv.system}-${pyVerNoDot}" or unsupported; + srcs = + (import ./binary-hashes.nix finalAttrs.version)."${stdenv.system}-${pyVerNoDot}" or unsupported; in fetchurl srcs; @@ -72,7 +73,7 @@ buildPythonPackage rec { meta = { description = "PyTorch audio library"; homepage = "https://pytorch.org/"; - changelog = "https://github.com/pytorch/audio/releases/tag/v${version}"; + changelog = "https://github.com/pytorch/audio/releases/tag/v${finalAttrs.version}"; # Includes CUDA and Intel MKL, but redistributions of the binary are not limited. # https://docs.nvidia.com/cuda/eula/index.html # https://www.intel.com/content/www/us/en/developer/articles/license/onemkl-license-faq.html @@ -88,4 +89,4 @@ buildPythonPackage rec { junjihashimoto ]; }; -} +}) diff --git a/pkgs/development/python-modules/torchaudio/binary-hashes.nix b/pkgs/development/python-modules/torchaudio/binary-hashes.nix index bba21e33b8b7..fc17cc5d28bd 100644 --- a/pkgs/development/python-modules/torchaudio/binary-hashes.nix +++ b/pkgs/development/python-modules/torchaudio/binary-hashes.nix @@ -7,81 +7,81 @@ version: builtins.getAttr version { - "2.9.1" = { + "2.10.0" = { x86_64-linux-310 = { - name = "torchaudio-2.9.1-cp310-cp310-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu128/torchaudio-2.9.1%2Bcu128-cp310-cp310-manylinux_2_28_x86_64.whl"; - hash = "sha256-YrFkJK9jwOEr6m7+OIm+NYsCBHqWEZmCZz8H8StzmIg="; + name = "torchaudio-2.10.0-cp310-cp310-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu128/torchaudio-2.10.0%2Bcu128-cp310-cp310-manylinux_2_28_x86_64.whl"; + hash = "sha256-cGW9EKtplNMGZ1aOjGSYeUZ4zh7iPS8HVvsozm1iNII="; }; x86_64-linux-311 = { - name = "torchaudio-2.9.1-cp311-cp311-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu128/torchaudio-2.9.1%2Bcu128-cp311-cp311-manylinux_2_28_x86_64.whl"; - hash = "sha256-Qwwi7N3ZsYQRe/ZNQdX02NPwNTu2hPMYI2O/gYDj6KU="; + name = "torchaudio-2.10.0-cp311-cp311-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu128/torchaudio-2.10.0%2Bcu128-cp311-cp311-manylinux_2_28_x86_64.whl"; + hash = "sha256-xQ7R9L9nQ6gvjmIe7REI/9ZsWBLQCp9pXHSfnOX+zeQ="; }; x86_64-linux-312 = { - name = "torchaudio-2.9.1-cp312-cp312-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu128/torchaudio-2.9.1%2Bcu128-cp312-cp312-manylinux_2_28_x86_64.whl"; - hash = "sha256-VOsZ5jS4xWeIahtTtBhFBtlDw7pRORmOn+G5QbxWbzA="; + name = "torchaudio-2.10.0-cp312-cp312-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu128/torchaudio-2.10.0%2Bcu128-cp312-cp312-manylinux_2_28_x86_64.whl"; + hash = "sha256-0muRoXPO5tuav/aLSNZCNpUP/FYo0GRI7N16xWhB4Qo="; }; x86_64-linux-313 = { - name = "torchaudio-2.9.1-cp313-cp313-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu128/torchaudio-2.9.1%2Bcu128-cp313-cp313-manylinux_2_28_x86_64.whl"; - hash = "sha256-Uil7fft8QuMROFVyvJwBhuYC6hpfIMQpI3Zbrqma/4M="; + name = "torchaudio-2.10.0-cp313-cp313-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu128/torchaudio-2.10.0%2Bcu128-cp313-cp313-manylinux_2_28_x86_64.whl"; + hash = "sha256-18a6jlE7lM2dX0Pu1HgHN+8bUJQd8RKt+19AHBsha3o="; }; x86_64-linux-314 = { - name = "torchaudio-2.9.1-cp314-cp314-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu128/torchaudio-2.9.1%2Bcu128-cp314-cp314-manylinux_2_28_x86_64.whl"; - hash = "sha256-EsPj06r4VtZ5MopanUbYZryItMUpDyEo8war/5dfpR4="; + name = "torchaudio-2.10.0-cp314-cp314-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu128/torchaudio-2.10.0%2Bcu128-cp314-cp314-manylinux_2_28_x86_64.whl"; + hash = "sha256-kIUsvrHzUZuLXZHO15RYJ+kq1TBIaHOEp6PEAa61zO0="; }; aarch64-darwin-310 = { - name = "torchaudio-2.9.1-cp310-cp310-macosx_11_0_arm64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchaudio-2.9.1-cp310-cp310-macosx_11_0_arm64.whl"; - hash = "sha256-t8tRcrbOZ8q8zFYLgSPe+VA2zRWH4RTcaXont7gdsT0="; + name = "torchaudio-2.10.0-cp310-cp310-macosx_11_0_arm64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchaudio-2.10.0-cp310-cp310-macosx_11_0_arm64.whl"; + hash = "sha256-pbp+nADlp4aZSkaEU9ooWJkz6O+JyzMN15n+Y6hckrk="; }; aarch64-darwin-311 = { - name = "torchaudio-2.9.1-cp311-cp311-macosx_11_0_arm64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchaudio-2.9.1-cp311-cp311-macosx_11_0_arm64.whl"; - hash = "sha256-5qTHlrG129ggvoM4jCCdDxY+9ddKQ6BtUZNg/azTbtE="; + name = "torchaudio-2.10.0-cp311-cp311-macosx_11_0_arm64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchaudio-2.10.0-cp311-cp311-macosx_11_0_arm64.whl"; + hash = "sha256-KIE2ZMTIZVeSHwrg7w9iTgZRMrAsUlv/WZ52VuGe9yc="; }; aarch64-darwin-312 = { - name = "torchaudio-2.9.1-cp312-cp312-macosx_11_0_arm64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchaudio-2.9.1-cp312-cp312-macosx_11_0_arm64.whl"; - hash = "sha256-x3nAOA+7oS1j9WwJPdk74SItbMPK8UCtHYnEpgso7/E="; + name = "torchaudio-2.10.0-cp312-cp312-macosx_11_0_arm64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchaudio-2.10.0-cp312-cp312-macosx_11_0_arm64.whl"; + hash = "sha256-CF8bcjOeQyEAW5qs19BrHGTl86Lj/5/GrVmL+2/ezsQ="; }; aarch64-darwin-313 = { - name = "torchaudio-2.9.1-cp313-cp313-macosx_12_0_arm64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchaudio-2.9.1-cp313-cp313-macosx_12_0_arm64.whl"; - hash = "sha256-HFIen3D6sugl9rgxrDFKedw39RyNEc1UmMDzyIChIuE="; + name = "torchaudio-2.10.0-cp313-cp313-macosx_12_0_arm64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchaudio-2.10.0-cp313-cp313-macosx_12_0_arm64.whl"; + hash = "sha256-vSp2B4YHmOWEdH1zVrPxG0OtppWyZCFc5ae29o/g81U="; }; aarch64-darwin-314 = { - name = "torchaudio-2.9.1-cp314-cp314-macosx_11_0_arm64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchaudio-2.9.1-cp314-cp314-macosx_11_0_arm64.whl"; - hash = "sha256-MrZ6VRA+mxElNDErHRlsKmtn4hpXY7qzCPNb9HmFcYU="; + name = "torchaudio-2.10.0-cp314-cp314-macosx_11_0_arm64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchaudio-2.10.0-cp314-cp314-macosx_11_0_arm64.whl"; + hash = "sha256-6o8HhIRjaezV2yZs9+sUhLXstzSG0puROt3SZ9e/Vks="; }; aarch64-linux-310 = { - name = "torchaudio-2.9.1-cp310-cp310-manylinux2014_aarch64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchaudio-2.9.1-cp310-cp310-manylinux_2_28_aarch64.whl"; - hash = "sha256-asvWO+ZK9MstF1vwZo7mpgRgTO8XxlPoBYZvp5V3Q00="; + name = "torchaudio-2.10.0-cp310-cp310-manylinux2014_aarch64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchaudio-2.10.0-cp310-cp310-manylinux_2_28_aarch64.whl"; + hash = "sha256-8YL6GRdwG7wk+z4q63gBwVls9C0CPX1+NBBdLyfXKZg="; }; aarch64-linux-311 = { - name = "torchaudio-2.9.1-cp311-cp311-manylinux2014_aarch64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchaudio-2.9.1-cp311-cp311-manylinux_2_28_aarch64.whl"; - hash = "sha256-nTlW4rz4pn5+hGjXYCCa7Qpd48+91G5K37qAo7wtDXs="; + name = "torchaudio-2.10.0-cp311-cp311-manylinux2014_aarch64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchaudio-2.10.0-cp311-cp311-manylinux_2_28_aarch64.whl"; + hash = "sha256-01kA9GicsBZBlbMSY6dpmHyJU0Ehl6a0t1ghjS4tvIY="; }; aarch64-linux-312 = { - name = "torchaudio-2.9.1-cp312-cp312-manylinux2014_aarch64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchaudio-2.9.1-cp312-cp312-manylinux_2_28_aarch64.whl"; - hash = "sha256-9vqIK3UDhf2woqpSFaagS5fPlmizdhcDioFMdjCy3I0="; + name = "torchaudio-2.10.0-cp312-cp312-manylinux2014_aarch64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchaudio-2.10.0-cp312-cp312-manylinux_2_28_aarch64.whl"; + hash = "sha256-SlEfXVXuA0gFJnDlg0gAd05CbOFoXYe0gqyeIyQHS7c="; }; aarch64-linux-313 = { - name = "torchaudio-2.9.1-cp313-cp313-manylinux2014_aarch64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchaudio-2.9.1-cp313-cp313-manylinux_2_28_aarch64.whl"; - hash = "sha256-Cz/sxrz+Rvy5BeqCbvY+mgUqbZ0eLNcT9ZpTpQn8i1w="; + name = "torchaudio-2.10.0-cp313-cp313-manylinux2014_aarch64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchaudio-2.10.0-cp313-cp313-manylinux_2_28_aarch64.whl"; + hash = "sha256-3Y7Rtym0aU8Bd2rpXn20MrGoCNtDd/mVlv50wkzLor4="; }; aarch64-linux-314 = { - name = "torchaudio-2.9.1-cp314-cp314-manylinux2014_aarch64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchaudio-2.9.1-cp314-cp314-manylinux_2_28_aarch64.whl"; - hash = "sha256-CnA1PulFIGit4h1hgbXaCVn1HThpocgR7O8Xy01nGBw="; + name = "torchaudio-2.10.0-cp314-cp314-manylinux2014_aarch64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchaudio-2.10.0-cp314-cp314-manylinux_2_28_aarch64.whl"; + hash = "sha256-DxEeF2oX3R9uygFmLbr8G/o2ZBTd64bxCmUzD8rP8L8="; }; }; } diff --git a/pkgs/development/python-modules/torchaudio/prefetch.sh b/pkgs/development/python-modules/torchaudio/prefetch.sh index 4b289f99bb31..bd9fed5959d1 100755 --- a/pkgs/development/python-modules/torchaudio/prefetch.sh +++ b/pkgs/development/python-modules/torchaudio/prefetch.sh @@ -11,41 +11,41 @@ linux_cpu_bucket="https://download.pytorch.org/whl/cpu" darwin_bucket="https://download.pytorch.org/whl/cpu" url_and_key_list=( - "x86_64-linux-310 $linux_cuda_bucket/torchaudio-${version}%2B${linux_cuda_version}-cp310-cp310-manylinux_2_28_x86_64.whl torchaudio-${version}-cp310-cp310-linux_x86_64.whl" - "x86_64-linux-311 $linux_cuda_bucket/torchaudio-${version}%2B${linux_cuda_version}-cp311-cp311-manylinux_2_28_x86_64.whl torchaudio-${version}-cp311-cp311-linux_x86_64.whl" - "x86_64-linux-312 $linux_cuda_bucket/torchaudio-${version}%2B${linux_cuda_version}-cp312-cp312-manylinux_2_28_x86_64.whl torchaudio-${version}-cp312-cp312-linux_x86_64.whl" - "x86_64-linux-313 $linux_cuda_bucket/torchaudio-${version}%2B${linux_cuda_version}-cp313-cp313-manylinux_2_28_x86_64.whl torchaudio-${version}-cp313-cp313-linux_x86_64.whl" - "x86_64-linux-314 $linux_cuda_bucket/torchaudio-${version}%2B${linux_cuda_version}-cp314-cp314-manylinux_2_28_x86_64.whl torchaudio-${version}-cp314-cp314-linux_x86_64.whl" - "aarch64-darwin-310 $darwin_bucket/torchaudio-${version}-cp310-cp310-macosx_11_0_arm64.whl torchaudio-${version}-cp310-cp310-macosx_11_0_arm64.whl" - "aarch64-darwin-311 $darwin_bucket/torchaudio-${version}-cp311-cp311-macosx_11_0_arm64.whl torchaudio-${version}-cp311-cp311-macosx_11_0_arm64.whl" - "aarch64-darwin-312 $darwin_bucket/torchaudio-${version}-cp312-cp312-macosx_11_0_arm64.whl torchaudio-${version}-cp312-cp312-macosx_11_0_arm64.whl" - "aarch64-darwin-313 $darwin_bucket/torchaudio-${version}-cp313-cp313-macosx_12_0_arm64.whl torchaudio-${version}-cp313-cp313-macosx_12_0_arm64.whl" - "aarch64-darwin-314 $darwin_bucket/torchaudio-${version}-cp314-cp314-macosx_11_0_arm64.whl torchaudio-${version}-cp314-cp314-macosx_11_0_arm64.whl" - "aarch64-linux-310 $linux_cpu_bucket/torchaudio-${version}-cp310-cp310-manylinux_2_28_aarch64.whl torchaudio-${version}-cp310-cp310-manylinux2014_aarch64.whl" - "aarch64-linux-311 $linux_cpu_bucket/torchaudio-${version}-cp311-cp311-manylinux_2_28_aarch64.whl torchaudio-${version}-cp311-cp311-manylinux2014_aarch64.whl" - "aarch64-linux-312 $linux_cpu_bucket/torchaudio-${version}-cp312-cp312-manylinux_2_28_aarch64.whl torchaudio-${version}-cp312-cp312-manylinux2014_aarch64.whl" - "aarch64-linux-313 $linux_cpu_bucket/torchaudio-${version}-cp313-cp313-manylinux_2_28_aarch64.whl torchaudio-${version}-cp313-cp313-manylinux2014_aarch64.whl" - "aarch64-linux-314 $linux_cpu_bucket/torchaudio-${version}-cp314-cp314-manylinux_2_28_aarch64.whl torchaudio-${version}-cp314-cp314-manylinux2014_aarch64.whl" + "x86_64-linux-310 $linux_cuda_bucket/torchaudio-${version}%2B${linux_cuda_version}-cp310-cp310-manylinux_2_28_x86_64.whl torchaudio-${version}-cp310-cp310-linux_x86_64.whl" + "x86_64-linux-311 $linux_cuda_bucket/torchaudio-${version}%2B${linux_cuda_version}-cp311-cp311-manylinux_2_28_x86_64.whl torchaudio-${version}-cp311-cp311-linux_x86_64.whl" + "x86_64-linux-312 $linux_cuda_bucket/torchaudio-${version}%2B${linux_cuda_version}-cp312-cp312-manylinux_2_28_x86_64.whl torchaudio-${version}-cp312-cp312-linux_x86_64.whl" + "x86_64-linux-313 $linux_cuda_bucket/torchaudio-${version}%2B${linux_cuda_version}-cp313-cp313-manylinux_2_28_x86_64.whl torchaudio-${version}-cp313-cp313-linux_x86_64.whl" + "x86_64-linux-314 $linux_cuda_bucket/torchaudio-${version}%2B${linux_cuda_version}-cp314-cp314-manylinux_2_28_x86_64.whl torchaudio-${version}-cp314-cp314-linux_x86_64.whl" + "aarch64-darwin-310 $darwin_bucket/torchaudio-${version}-cp310-cp310-macosx_11_0_arm64.whl torchaudio-${version}-cp310-cp310-macosx_11_0_arm64.whl" + "aarch64-darwin-311 $darwin_bucket/torchaudio-${version}-cp311-cp311-macosx_11_0_arm64.whl torchaudio-${version}-cp311-cp311-macosx_11_0_arm64.whl" + "aarch64-darwin-312 $darwin_bucket/torchaudio-${version}-cp312-cp312-macosx_11_0_arm64.whl torchaudio-${version}-cp312-cp312-macosx_11_0_arm64.whl" + "aarch64-darwin-313 $darwin_bucket/torchaudio-${version}-cp313-cp313-macosx_12_0_arm64.whl torchaudio-${version}-cp313-cp313-macosx_12_0_arm64.whl" + "aarch64-darwin-314 $darwin_bucket/torchaudio-${version}-cp314-cp314-macosx_11_0_arm64.whl torchaudio-${version}-cp314-cp314-macosx_11_0_arm64.whl" + "aarch64-linux-310 $linux_cpu_bucket/torchaudio-${version}-cp310-cp310-manylinux_2_28_aarch64.whl torchaudio-${version}-cp310-cp310-manylinux2014_aarch64.whl" + "aarch64-linux-311 $linux_cpu_bucket/torchaudio-${version}-cp311-cp311-manylinux_2_28_aarch64.whl torchaudio-${version}-cp311-cp311-manylinux2014_aarch64.whl" + "aarch64-linux-312 $linux_cpu_bucket/torchaudio-${version}-cp312-cp312-manylinux_2_28_aarch64.whl torchaudio-${version}-cp312-cp312-manylinux2014_aarch64.whl" + "aarch64-linux-313 $linux_cpu_bucket/torchaudio-${version}-cp313-cp313-manylinux_2_28_aarch64.whl torchaudio-${version}-cp313-cp313-manylinux2014_aarch64.whl" + "aarch64-linux-314 $linux_cpu_bucket/torchaudio-${version}-cp314-cp314-manylinux_2_28_aarch64.whl torchaudio-${version}-cp314-cp314-manylinux2014_aarch64.whl" ) hashfile=binary-hashes-"$version".nix echo " \"$version\" = {" >>$hashfile for url_and_key in "${url_and_key_list[@]}"; do - key=$(echo "$url_and_key" | cut -d' ' -f1) - url=$(echo "$url_and_key" | cut -d' ' -f2) - name=$(echo "$url_and_key" | cut -d' ' -f3) + key=$(echo "$url_and_key" | cut -d' ' -f1) + url=$(echo "$url_and_key" | cut -d' ' -f2) + name=$(echo "$url_and_key" | cut -d' ' -f3) - echo "prefetching ${url}..." - hash=$(nix --extra-experimental-features nix-command hash convert --hash-algo sha256 $(nix-prefetch-url "$url" --name "$name")) + echo "prefetching ${url}..." + hash=$(nix --extra-experimental-features nix-command hash convert --hash-algo sha256 $(nix-prefetch-url "$url" --name "$name")) - echo " $key = {" >>$hashfile - echo " name = \"$name\";" >>$hashfile - echo " url = \"$url\";" >>$hashfile - echo " hash = \"$hash\";" >>$hashfile - echo " };" >>$hashfile + echo " $key = {" >>$hashfile + echo " name = \"$name\";" >>$hashfile + echo " url = \"$url\";" >>$hashfile + echo " hash = \"$hash\";" >>$hashfile + echo " };" >>$hashfile - echo + echo done echo " };" >>$hashfile diff --git a/pkgs/development/python-modules/torchvision/bin.nix b/pkgs/development/python-modules/torchvision/bin.nix index 955c9cf29bf1..d689cf36db58 100644 --- a/pkgs/development/python-modules/torchvision/bin.nix +++ b/pkgs/development/python-modules/torchvision/bin.nix @@ -23,7 +23,7 @@ let pyVerNoDot = builtins.replaceStrings [ "." ] [ "" ] python.pythonVersion; srcs = import ./binary-hashes.nix version; unsupported = throw "Unsupported system"; - version = "0.24.1"; + version = "0.25.0"; in buildPythonPackage { inherit version; diff --git a/pkgs/development/python-modules/torchvision/binary-hashes.nix b/pkgs/development/python-modules/torchvision/binary-hashes.nix index ed3f6f9a1a4a..cf209e7d61f7 100644 --- a/pkgs/development/python-modules/torchvision/binary-hashes.nix +++ b/pkgs/development/python-modules/torchvision/binary-hashes.nix @@ -7,81 +7,81 @@ version: builtins.getAttr version { - "0.24.1" = { + "0.25.0" = { x86_64-linux-310 = { - name = "torchvision-0.24.1-cp310-cp310-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu128/torchvision-0.24.1%2Bcu128-cp310-cp310-manylinux_2_28_x86_64.whl"; - hash = "sha256-h/bjLS2Y0nefn6WKqTz2rwSeP4doE0SiCI4vx9ndPgA="; + name = "torchvision-0.25.0-cp310-cp310-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu128/torchvision-0.25.0%2Bcu128-cp310-cp310-manylinux_2_28_x86_64.whl"; + hash = "sha256-QzUMoRPp8iTe25Cw28MYU/3k8yJ5TL5KdYn8yrV2jww="; }; x86_64-linux-311 = { - name = "torchvision-0.24.1-cp311-cp311-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu128/torchvision-0.24.1%2Bcu128-cp311-cp311-manylinux_2_28_x86_64.whl"; - hash = "sha256-G0T2fL2PNuKli/qjF201s331VgSt9ZKeiQBuUx+En6o="; + name = "torchvision-0.25.0-cp311-cp311-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu128/torchvision-0.25.0%2Bcu128-cp311-cp311-manylinux_2_28_x86_64.whl"; + hash = "sha256-6/K0lcdgl3lrmi6skpDvvK6W4P2eWuUsQO/xiGELtEA="; }; x86_64-linux-312 = { - name = "torchvision-0.24.1-cp312-cp312-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu128/torchvision-0.24.1%2Bcu128-cp312-cp312-manylinux_2_28_x86_64.whl"; - hash = "sha256-z4Tq4dLRKn0mGnSW7KAN2Se3F5IBGx6E1BYslQ6zIB0="; + name = "torchvision-0.25.0-cp312-cp312-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu128/torchvision-0.25.0%2Bcu128-cp312-cp312-manylinux_2_28_x86_64.whl"; + hash = "sha256-ElWgyiv5h6z58QO5bFxM/jQV/Eoe7xf6CK9SegSk9XM="; }; x86_64-linux-313 = { - name = "torchvision-0.24.1-cp313-cp313-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu128/torchvision-0.24.1%2Bcu128-cp313-cp313-manylinux_2_28_x86_64.whl"; - hash = "sha256-X3xeD6CNLL7pO24Eu+3Vm14RRiz/bO/QeUkhcmXfI3A="; + name = "torchvision-0.25.0-cp313-cp313-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu128/torchvision-0.25.0%2Bcu128-cp313-cp313-manylinux_2_28_x86_64.whl"; + hash = "sha256-qcDeiT3OnCkTyceuiKkWkQ+S0CuZ2hSWeIBtGOgHnyk="; }; x86_64-linux-314 = { - name = "torchvision-0.24.1-cp314-cp314-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu128/torchvision-0.24.1%2Bcu128-cp314-cp314-manylinux_2_28_x86_64.whl"; - hash = "sha256-O3LjI3fl6ROY3cRXnHd4SyaWUqV5X0sgpaHUyA6b090="; + name = "torchvision-0.25.0-cp314-cp314-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu128/torchvision-0.25.0%2Bcu128-cp314-cp314-manylinux_2_28_x86_64.whl"; + hash = "sha256-W3rT+2zwPvKi/WF8tLTkHvqbsBQ8Z/UGwqPmdlx7Eq0="; }; aarch64-darwin-310 = { - name = "torchvision-0.24.1-cp310-cp310-macosx_11_0_arm64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchvision-0.24.1-cp310-cp310-macosx_11_0_arm64.whl"; - hash = "sha256-62yB50mCzCWBhdmHAG7Xg1xuWJNSfuKBKUyFovP3JYo="; + name = "torchvision-0.25.0-cp310-cp310-macosx_11_0_arm64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchvision-0.25.0-cp310-cp310-macosx_11_0_arm64.whl"; + hash = "sha256-eBCEGRaiqHDL+1gfQIS1lHmQj7nbbt/feBOZMTkthnc="; }; aarch64-darwin-311 = { - name = "torchvision-0.24.1-cp311-cp311-macosx_11_0_arm64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchvision-0.24.1-cp311-cp311-macosx_11_0_arm64.whl"; - hash = "sha256-c0gffA2jjsGgQCHy2WcoLIfaSKL4MyvpYAkWcs/+gGs="; + name = "torchvision-0.25.0-cp311-cp311-macosx_11_0_arm64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchvision-0.25.0-cp311-cp311-macosx_11_0_arm64.whl"; + hash = "sha256-p2znuNT84pGiVyHuL5IceDrMbb1Pwy3HQe0qHVqN3i8="; }; aarch64-darwin-312 = { - name = "torchvision-0.24.1-cp312-cp312-macosx_11_0_arm64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchvision-0.24.1-cp312-cp312-macosx_11_0_arm64.whl"; - hash = "sha256-TwlWglurWTLdUzlN6OEQXtkYJQKzZ/8Eddvw5plVBhI="; + name = "torchvision-0.25.0-cp312-cp312-macosx_11_0_arm64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchvision-0.25.0-cp312-cp312-macosx_11_0_arm64.whl"; + hash = "sha256-ck8hKlig0NdYZJziiGAQVrX0agHeVFcC9CvMxbJcsMw="; }; aarch64-darwin-313 = { - name = "torchvision-0.24.1-cp313-cp313-macosx_12_0_arm64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchvision-0.24.1-cp313-cp313-macosx_12_0_arm64.whl"; - hash = "sha256-yFj5RO/qIXCsvaL4AWE7FRk75J6EGcmMIE6fXoxlqVU="; + name = "torchvision-0.25.0-cp313-cp313-macosx_12_0_arm64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchvision-0.25.0-cp313-cp313-macosx_12_0_arm64.whl"; + hash = "sha256-bERBGcavj6SLecWfFSn8FaRaK7+CPPhfhR5yA9hPcn8="; }; aarch64-darwin-314 = { - name = "torchvision-0.24.1-cp314-cp314-macosx_11_0_arm64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchvision-0.24.1-cp314-cp314-macosx_11_0_arm64.whl"; - hash = "sha256-mDmEiv9H2Y53JKvRowdhIduWBmwy3bMZtoXf4Hc2D0A="; + name = "torchvision-0.25.0-cp314-cp314-macosx_11_0_arm64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchvision-0.25.0-cp314-cp314-macosx_11_0_arm64.whl"; + hash = "sha256-pkrlQ/4KBXqTlUr5TCOWKXI9sZbtZQkOZ3XxNnJrIvg="; }; aarch64-linux-310 = { - name = "torchvision-0.24.1-cp310-cp310-linux_aarch64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchvision-0.24.1-cp310-cp310-manylinux_2_28_aarch64.whl"; - hash = "sha256-VnnMvWaaiLq5ghwyI00kBzXTZJkpGIfyYqSS8Nlti4I="; + name = "torchvision-0.25.0-cp310-cp310-linux_aarch64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchvision-0.25.0%2Bcpu-cp310-cp310-manylinux_2_28_aarch64.whl"; + hash = "sha256-c84E3qZJFP8REACDESBMNmEH1lHTsE+qDb7nfvtxM7c="; }; aarch64-linux-311 = { - name = "torchvision-0.24.1-cp311-cp311-linux_aarch64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchvision-0.24.1-cp311-cp311-manylinux_2_28_aarch64.whl"; - hash = "sha256-RScwj/tX9tLBfoLuCOJb+9CkHxN99tDqiAWyPvKvDms="; + name = "torchvision-0.25.0-cp311-cp311-linux_aarch64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchvision-0.25.0%2Bcpu-cp311-cp311-manylinux_2_28_aarch64.whl"; + hash = "sha256-Wb6Z0cRw70cLE0Roqmr6b5aAgaUDrLTuiD1wMy+CLjU="; }; aarch64-linux-312 = { - name = "torchvision-0.24.1-cp312-cp312-linux_aarch64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchvision-0.24.1-cp312-cp312-manylinux_2_28_aarch64.whl"; - hash = "sha256-KBV2SXWPuXSR3g20eNXW5zwjtQjlTeIK28NeazqnJEM="; + name = "torchvision-0.25.0-cp312-cp312-linux_aarch64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchvision-0.25.0%2Bcpu-cp312-cp312-manylinux_2_28_aarch64.whl"; + hash = "sha256-cnM06achz8GsKWzgv55p2UhoIb+lsedaj+tveAQdtIE="; }; aarch64-linux-313 = { - name = "torchvision-0.24.1-cp313-cp313-linux_aarch64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchvision-0.24.1-cp313-cp313-manylinux_2_28_aarch64.whl"; - hash = "sha256-Wd2+V3mUOvmaiX/NWJR1eufP/rHCWlGbec2TOBiKhmQ="; + name = "torchvision-0.25.0-cp313-cp313-linux_aarch64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchvision-0.25.0%2Bcpu-cp313-cp313-manylinux_2_28_aarch64.whl"; + hash = "sha256-/lTL1ZQs0LJqkPF0jw1EIcr2e+NcKBxsO4VzczoD1jA="; }; aarch64-linux-314 = { - name = "torchvision-0.24.1-cp314-cp314-linux_aarch64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchvision-0.24.1-cp314-cp314-manylinux_2_28_aarch64.whl"; - hash = "sha256-MqXOmewggf1aswTaCqlpG27AR9EqMpwNmRxp0KG+7kU="; + name = "torchvision-0.25.0-cp314-cp314-linux_aarch64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchvision-0.25.0%2Bcpu-cp314-cp314-manylinux_2_28_aarch64.whl"; + hash = "sha256-DC0NqbwBGg/eHRJa85ao++lNmb7PnTE3ZPJMp2V6NEg="; }; }; } diff --git a/pkgs/development/python-modules/torchvision/prefetch.sh b/pkgs/development/python-modules/torchvision/prefetch.sh index d3e2b8f0362f..f1f1612e42d1 100755 --- a/pkgs/development/python-modules/torchvision/prefetch.sh +++ b/pkgs/development/python-modules/torchvision/prefetch.sh @@ -7,44 +7,44 @@ version=$1 linux_cuda_version="cu128" linux_bucket="https://download.pytorch.org/whl/${linux_cuda_version}" -darwin_bucket="https://download.pytorch.org/whl/cpu" +cpu_bucket="https://download.pytorch.org/whl/cpu" url_and_key_list=( - "x86_64-linux-310 $linux_bucket/torchvision-${version}%2B${linux_cuda_version}-cp310-cp310-manylinux_2_28_x86_64.whl torchvision-${version}-cp310-cp310-linux_x86_64.whl" - "x86_64-linux-311 $linux_bucket/torchvision-${version}%2B${linux_cuda_version}-cp311-cp311-manylinux_2_28_x86_64.whl torchvision-${version}-cp311-cp311-linux_x86_64.whl" - "x86_64-linux-312 $linux_bucket/torchvision-${version}%2B${linux_cuda_version}-cp312-cp312-manylinux_2_28_x86_64.whl torchvision-${version}-cp312-cp312-linux_x86_64.whl" - "x86_64-linux-313 $linux_bucket/torchvision-${version}%2B${linux_cuda_version}-cp313-cp313-manylinux_2_28_x86_64.whl torchvision-${version}-cp313-cp313-linux_x86_64.whl" - "x86_64-linux-314 $linux_bucket/torchvision-${version}%2B${linux_cuda_version}-cp314-cp314-manylinux_2_28_x86_64.whl torchvision-${version}-cp314-cp314-linux_x86_64.whl" - "aarch64-darwin-310 $darwin_bucket/torchvision-${version}-cp310-cp310-macosx_11_0_arm64.whl torchvision-${version}-cp310-cp310-macosx_11_0_arm64.whl" - "aarch64-darwin-311 $darwin_bucket/torchvision-${version}-cp311-cp311-macosx_11_0_arm64.whl torchvision-${version}-cp311-cp311-macosx_11_0_arm64.whl" - "aarch64-darwin-312 $darwin_bucket/torchvision-${version}-cp312-cp312-macosx_11_0_arm64.whl torchvision-${version}-cp312-cp312-macosx_11_0_arm64.whl" - "aarch64-darwin-313 $darwin_bucket/torchvision-${version}-cp313-cp313-macosx_12_0_arm64.whl torchvision-${version}-cp313-cp313-macosx_12_0_arm64.whl" - "aarch64-darwin-314 $darwin_bucket/torchvision-${version}-cp314-cp314-macosx_11_0_arm64.whl torchvision-${version}-cp314-cp314-macosx_11_0_arm64.whl" - "aarch64-linux-310 $darwin_bucket/torchvision-${version}-cp310-cp310-manylinux_2_28_aarch64.whl torchvision-${version}-cp310-cp310-linux_aarch64.whl" - "aarch64-linux-311 $darwin_bucket/torchvision-${version}-cp311-cp311-manylinux_2_28_aarch64.whl torchvision-${version}-cp311-cp311-linux_aarch64.whl" - "aarch64-linux-312 $darwin_bucket/torchvision-${version}-cp312-cp312-manylinux_2_28_aarch64.whl torchvision-${version}-cp312-cp312-linux_aarch64.whl" - "aarch64-linux-313 $darwin_bucket/torchvision-${version}-cp313-cp313-manylinux_2_28_aarch64.whl torchvision-${version}-cp313-cp313-linux_aarch64.whl" - "aarch64-linux-314 $darwin_bucket/torchvision-${version}-cp314-cp314-manylinux_2_28_aarch64.whl torchvision-${version}-cp314-cp314-linux_aarch64.whl" + "x86_64-linux-310 $linux_bucket/torchvision-${version}%2B${linux_cuda_version}-cp310-cp310-manylinux_2_28_x86_64.whl torchvision-${version}-cp310-cp310-linux_x86_64.whl" + "x86_64-linux-311 $linux_bucket/torchvision-${version}%2B${linux_cuda_version}-cp311-cp311-manylinux_2_28_x86_64.whl torchvision-${version}-cp311-cp311-linux_x86_64.whl" + "x86_64-linux-312 $linux_bucket/torchvision-${version}%2B${linux_cuda_version}-cp312-cp312-manylinux_2_28_x86_64.whl torchvision-${version}-cp312-cp312-linux_x86_64.whl" + "x86_64-linux-313 $linux_bucket/torchvision-${version}%2B${linux_cuda_version}-cp313-cp313-manylinux_2_28_x86_64.whl torchvision-${version}-cp313-cp313-linux_x86_64.whl" + "x86_64-linux-314 $linux_bucket/torchvision-${version}%2B${linux_cuda_version}-cp314-cp314-manylinux_2_28_x86_64.whl torchvision-${version}-cp314-cp314-linux_x86_64.whl" + "aarch64-darwin-310 $cpu_bucket/torchvision-${version}-cp310-cp310-macosx_11_0_arm64.whl torchvision-${version}-cp310-cp310-macosx_11_0_arm64.whl" + "aarch64-darwin-311 $cpu_bucket/torchvision-${version}-cp311-cp311-macosx_11_0_arm64.whl torchvision-${version}-cp311-cp311-macosx_11_0_arm64.whl" + "aarch64-darwin-312 $cpu_bucket/torchvision-${version}-cp312-cp312-macosx_11_0_arm64.whl torchvision-${version}-cp312-cp312-macosx_11_0_arm64.whl" + "aarch64-darwin-313 $cpu_bucket/torchvision-${version}-cp313-cp313-macosx_12_0_arm64.whl torchvision-${version}-cp313-cp313-macosx_12_0_arm64.whl" + "aarch64-darwin-314 $cpu_bucket/torchvision-${version}-cp314-cp314-macosx_11_0_arm64.whl torchvision-${version}-cp314-cp314-macosx_11_0_arm64.whl" + "aarch64-linux-310 $cpu_bucket/torchvision-${version}%2Bcpu-cp310-cp310-manylinux_2_28_aarch64.whl torchvision-${version}-cp310-cp310-linux_aarch64.whl" + "aarch64-linux-311 $cpu_bucket/torchvision-${version}%2Bcpu-cp311-cp311-manylinux_2_28_aarch64.whl torchvision-${version}-cp311-cp311-linux_aarch64.whl" + "aarch64-linux-312 $cpu_bucket/torchvision-${version}%2Bcpu-cp312-cp312-manylinux_2_28_aarch64.whl torchvision-${version}-cp312-cp312-linux_aarch64.whl" + "aarch64-linux-313 $cpu_bucket/torchvision-${version}%2Bcpu-cp313-cp313-manylinux_2_28_aarch64.whl torchvision-${version}-cp313-cp313-linux_aarch64.whl" + "aarch64-linux-314 $cpu_bucket/torchvision-${version}%2Bcpu-cp314-cp314-manylinux_2_28_aarch64.whl torchvision-${version}-cp314-cp314-linux_aarch64.whl" ) hashfile="binary-hashes-$version.nix" echo " \"$version\" = {" >>$hashfile for url_and_key in "${url_and_key_list[@]}"; do - key=$(echo "$url_and_key" | cut -d' ' -f1) - url=$(echo "$url_and_key" | cut -d' ' -f2) - name=$(echo "$url_and_key" | cut -d' ' -f3) + key=$(echo "$url_and_key" | cut -d' ' -f1) + url=$(echo "$url_and_key" | cut -d' ' -f2) + name=$(echo "$url_and_key" | cut -d' ' -f3) - echo "prefetching ${url}..." - hash=$(nix --extra-experimental-features nix-command hash convert --hash-algo sha256 $(nix-prefetch-url "$url" --name "$name")) + echo "prefetching ${url}..." + hash=$(nix --extra-experimental-features nix-command hash convert --hash-algo sha256 $(nix-prefetch-url "$url" --name "$name")) - echo " $key = {" >>$hashfile - echo " name = \"$name\";" >>$hashfile - echo " url = \"$url\";" >>$hashfile - echo " hash = \"$hash\";" >>$hashfile - echo " };" >>$hashfile + echo " $key = {" >>$hashfile + echo " name = \"$name\";" >>$hashfile + echo " url = \"$url\";" >>$hashfile + echo " hash = \"$hash\";" >>$hashfile + echo " };" >>$hashfile - echo + echo done echo " };" >>$hashfile diff --git a/pkgs/development/python-modules/triton/bin.nix b/pkgs/development/python-modules/triton/bin.nix index ce7915b6308c..b78e4fd38707 100644 --- a/pkgs/development/python-modules/triton/bin.nix +++ b/pkgs/development/python-modules/triton/bin.nix @@ -6,21 +6,20 @@ fetchurl, python, autoPatchelfHook, - filelock, - lit, zlib, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "triton"; - version = "3.5.1"; + version = "3.6.0"; format = "wheel"; src = let pyVerNoDot = lib.replaceStrings [ "." ] [ "" ] python.pythonVersion; unsupported = throw "Unsupported system"; - srcs = (import ./binary-hashes.nix version)."${stdenv.system}-${pyVerNoDot}" or unsupported; + srcs = + (import ./binary-hashes.nix finalAttrs.version)."${stdenv.system}-${pyVerNoDot}" or unsupported; in fetchurl srcs; @@ -36,12 +35,6 @@ buildPythonPackage rec { autoPatchelfHook ]; - propagatedBuildInputs = [ - filelock - lit - zlib - ]; - dontStrip = true; # If this breaks, consider replacing with "${cuda_nvcc}/bin/ptxas" @@ -53,7 +46,7 @@ buildPythonPackage rec { meta = { description = "Language and compiler for custom Deep Learning operations"; homepage = "https://github.com/triton-lang/triton/"; - changelog = "https://github.com/triton-lang/triton/releases/tag/v${version}"; + changelog = "https://github.com/triton-lang/triton/releases/tag/v${finalAttrs.version}"; # Includes NVIDIA's ptxas, but redistributions of the binary are not limited. # https://docs.nvidia.com/cuda/eula/index.html # triton's license is MIT. @@ -68,4 +61,4 @@ buildPythonPackage rec { junjihashimoto ]; }; -} +}) diff --git a/pkgs/development/python-modules/triton/binary-hashes.nix b/pkgs/development/python-modules/triton/binary-hashes.nix index c2c2a907dd96..f70a6a3619ca 100644 --- a/pkgs/development/python-modules/triton/binary-hashes.nix +++ b/pkgs/development/python-modules/triton/binary-hashes.nix @@ -7,56 +7,56 @@ version: builtins.getAttr version { - "3.5.1" = { - aarch64-linux-310 = { - name = "triton-3.5.1-cp310-cp310-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl"; - url = "https://download.pytorch.org/whl/triton-3.5.1-cp310-cp310-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl"; - hash = "sha256-XMiYppML/CzkHCVU6HnTUoDNeLWIPYOfLuqU2nYQpjo="; - }; + "3.6.0" = { x86_64-linux-310 = { - name = "triton-3.5.1-cp310-cp310-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl"; - url = "https://download.pytorch.org/whl/triton-3.5.1-cp310-cp310-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl"; - hash = "sha256-cHolosLulgnG8H5aJIQOsVA5+LikI9NZRXlWdP5lPfc="; - }; - aarch64-linux-311 = { - name = "triton-3.5.1-cp311-cp311-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl"; - url = "https://download.pytorch.org/whl/triton-3.5.1-cp311-cp311-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl"; - hash = "sha256-YTFb3ZLjVUFsVXuET5UpeE/Ynyl7UhCa25ZXWxkKCFU="; + name = "triton-3.6.0-cp310-cp310-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl"; + url = "https://download.pytorch.org/whl/triton-3.6.0-cp310-cp310-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl"; + hash = "sha256-ctaz7qoTREyim6ZdVfxXtkETc6K45hn2OuWWLT2eokk="; }; x86_64-linux-311 = { - name = "triton-3.5.1-cp311-cp311-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl"; - url = "https://download.pytorch.org/whl/triton-3.5.1-cp311-cp311-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl"; - hash = "sha256-2rz9BHCOdgjqukx4te7HcpJz2WweyK30Hbf6OxLQXQQ="; - }; - aarch64-linux-312 = { - name = "triton-3.5.1-cp312-cp312-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl"; - url = "https://download.pytorch.org/whl/triton-3.5.1-cp312-cp312-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl"; - hash = "sha256-xSJNyhWMHg6yNePHCL0ZzvqWi61D0vu5Sx1fo5fr9cU="; + name = "triton-3.6.0-cp311-cp311-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl"; + url = "https://download.pytorch.org/whl/triton-3.6.0-cp311-cp311-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl"; + hash = "sha256-4CHofo8mbG+HvzebZpxDwoAKrGJHvfXVGMtVPjxAPAA="; }; x86_64-linux-312 = { - name = "triton-3.5.1-cp312-cp312-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl"; - url = "https://download.pytorch.org/whl/triton-3.5.1-cp312-cp312-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl"; - hash = "sha256-jOm87b0Ss5PRMJ+4meBoGGJMfndlxSMepXSYUAFcdNg="; - }; - aarch64-linux-313 = { - name = "triton-3.5.1-cp313-cp313-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl"; - url = "https://download.pytorch.org/whl/triton-3.5.1-cp313-cp313-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl"; - hash = "sha256-NOAuVAYZSnBxpwPJ/d3hM6WQNppnCtgam0oOmDIGF6k="; + name = "triton-3.6.0-cp312-cp312-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl"; + url = "https://download.pytorch.org/whl/triton-3.6.0-cp312-cp312-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl"; + hash = "sha256-b1ko5tRMNKl7vhZMzt3A7yAHEhyJ68+6VBXPRS3n7p8="; }; x86_64-linux-313 = { - name = "triton-3.5.1-cp313-cp313-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl"; - url = "https://download.pytorch.org/whl/triton-3.5.1-cp313-cp313-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl"; - hash = "sha256-5c+hPLJzzuEEP7+cthxEON6xbVezeywne5Re8YWJDGY="; - }; - aarch64-linux-314 = { - name = "triton-3.5.1-cp314-cp314-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl"; - url = "https://download.pytorch.org/whl/triton-3.5.1-cp314-cp314-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl"; - hash = "sha256-R2l6CpY32b0q70HXjXHiiitluDWgf4XezgyJ4ZbUgvU="; + name = "triton-3.6.0-cp313-cp313-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl"; + url = "https://download.pytorch.org/whl/triton-3.6.0-cp313-cp313-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl"; + hash = "sha256-AHUDn/J3ZUgAg7GhCZmb8nEQ81QvH5+tlfD5Blo22nk="; }; x86_64-linux-314 = { - name = "triton-3.5.1-cp314-cp314-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl"; - url = "https://download.pytorch.org/whl/triton-3.5.1-cp314-cp314-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl"; - hash = "sha256-RWYEuwz08mXKMTroiwJcvYCSxEnh7iIoi5v3o/Nsfyg="; + name = "triton-3.6.0-cp314-cp314-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl"; + url = "https://download.pytorch.org/whl/triton-3.6.0-cp314-cp314-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl"; + hash = "sha256-ttgAvaZm675+whRuP16yce6H+PrHJAEdx/Jd7pv7X38="; + }; + aarch64-linux-310 = { + name = "triton-3.6.0-cp310-cp310-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl"; + url = "https://download.pytorch.org/whl/triton-3.6.0-cp310-cp310-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl"; + hash = "sha256-otC3ubTymt4xz3vXwje1DScKJIfPlD0DSzB6mz9z2cc="; + }; + aarch64-linux-311 = { + name = "triton-3.6.0-cp311-cp311-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl"; + url = "https://download.pytorch.org/whl/triton-3.6.0-cp311-cp311-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl"; + hash = "sha256-KQaH9PMQznlKB9akP6lN6pvahmFb8EV4UzN4UDvtcVo="; + }; + aarch64-linux-312 = { + name = "triton-3.6.0-cp312-cp312-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl"; + url = "https://download.pytorch.org/whl/triton-3.6.0-cp312-cp312-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl"; + hash = "sha256-bkLQhIZNErh4Rzb+UaDNBfbMVndbJcgQLJ2AxCH04pg="; + }; + aarch64-linux-313 = { + name = "triton-3.6.0-cp313-cp313-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl"; + url = "https://download.pytorch.org/whl/triton-3.6.0-cp313-cp313-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl"; + hash = "sha256-WNV9Z5awAEB2MVQzUm/p1K9CBE1DCv3uHmzUKna9bQk="; + }; + aarch64-linux-314 = { + name = "triton-3.6.0-cp314-cp314-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl"; + url = "https://download.pytorch.org/whl/triton-3.6.0-cp314-cp314-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl"; + hash = "sha256-IO0vdw9yF7iplMupnnysN+e+c1o5kTRJkLgKtP6pZMQ="; }; }; } diff --git a/pkgs/development/python-modules/triton/default.nix b/pkgs/development/python-modules/triton/default.nix index 1906e1c6f75b..9b904f5b1728 100644 --- a/pkgs/development/python-modules/triton/default.nix +++ b/pkgs/development/python-modules/triton/default.nix @@ -258,6 +258,11 @@ buildPythonPackage rec { ps.triton ps.torch-no-triton ]; + + gpuCheckArgs.nativeBuildInputs = [ + # PermissionError: [Errno 13] Permission denied: '/homeless-shelter' + writableTmpDirAsHomeHook + ]; } '' # Adopted from Philippe Tillet https://triton-lang.org/main/getting-started/tutorials/01-vector-add.html diff --git a/pkgs/development/python-modules/triton/prefetch.sh b/pkgs/development/python-modules/triton/prefetch.sh new file mode 100755 index 000000000000..8ee367b783ac --- /dev/null +++ b/pkgs/development/python-modules/triton/prefetch.sh @@ -0,0 +1,44 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p nix-prefetch-scripts + +set -eou pipefail + +version=$1 + +bucket="https://download.pytorch.org/whl" + +url_and_key_list=( + "x86_64-linux-310 $bucket/triton-${version}-cp310-cp310-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl triton-${version}-cp310-cp310-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl" + "x86_64-linux-311 $bucket/triton-${version}-cp311-cp311-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl triton-${version}-cp311-cp311-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl" + "x86_64-linux-312 $bucket/triton-${version}-cp312-cp312-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl triton-${version}-cp312-cp312-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl" + "x86_64-linux-313 $bucket/triton-${version}-cp313-cp313-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl triton-${version}-cp313-cp313-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl" + "x86_64-linux-314 $bucket/triton-${version}-cp314-cp314-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl triton-${version}-cp314-cp314-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl" + "aarch64-linux-310 $bucket/triton-${version}-cp310-cp310-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl triton-${version}-cp310-cp310-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl" + "aarch64-linux-311 $bucket/triton-${version}-cp311-cp311-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl triton-${version}-cp311-cp311-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl" + "aarch64-linux-312 $bucket/triton-${version}-cp312-cp312-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl triton-${version}-cp312-cp312-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl" + "aarch64-linux-313 $bucket/triton-${version}-cp313-cp313-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl triton-${version}-cp313-cp313-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl" + "aarch64-linux-314 $bucket/triton-${version}-cp314-cp314-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl triton-${version}-cp314-cp314-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl" +) + +hashfile="binary-hashes-$version.nix" +echo " \"$version\" = {" >>$hashfile + +for url_and_key in "${url_and_key_list[@]}"; do + key=$(echo "$url_and_key" | cut -d' ' -f1) + url=$(echo "$url_and_key" | cut -d' ' -f2) + name=$(echo "$url_and_key" | cut -d' ' -f3) + + echo "prefetching ${url}..." + hash=$(nix --extra-experimental-features nix-command hash convert --hash-algo sha256 $(nix-prefetch-url "$url" --name "$name")) + + echo " $key = {" >>$hashfile + echo " name = \"$name\";" >>$hashfile + echo " url = \"$url\";" >>$hashfile + echo " hash = \"$hash\";" >>$hashfile + echo " };" >>$hashfile + + echo +done + +echo " };" >>$hashfile +echo "done." diff --git a/pkgs/servers/home-assistant/custom-components/versatile_thermostat/package.nix b/pkgs/servers/home-assistant/custom-components/versatile_thermostat/package.nix index 80cb2a78c9de..cd35ff8d896c 100644 --- a/pkgs/servers/home-assistant/custom-components/versatile_thermostat/package.nix +++ b/pkgs/servers/home-assistant/custom-components/versatile_thermostat/package.nix @@ -10,13 +10,13 @@ buildHomeAssistantComponent rec { owner = "jmcollin78"; domain = "versatile_thermostat"; - version = "8.6.1"; + version = "8.6.2"; src = fetchFromGitHub { inherit owner; repo = domain; tag = version; - hash = "sha256-yQMTuNinRVHIsaS8Q7aqGozN1sTbkLGvXFhEw47jUkA="; + hash = "sha256-jd6+detoxlx9yDHEBQeFema+HLdN1C4lw1/Tk314xas="; }; dependencies = [ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5ab11ab15070..2438f6ffd2ad 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10025,10 +10025,6 @@ with pkgs; extraIntegrations = extras; }; - dbeaver-bin = callPackage ../by-name/db/dbeaver-bin/package.nix { - inherit (darwin) autoSignDarwinBinariesHook; - }; - deadbeefPlugins = recurseIntoAttrs { headerbar-gtk3 = callPackage ../applications/audio/deadbeef/plugins/headerbar-gtk3.nix { }; lyricbar = callPackage ../applications/audio/deadbeef/plugins/lyricbar.nix { }; @@ -12103,8 +12099,6 @@ with pkgs; d2x-rebirth-full ; - factorio = callPackage ../by-name/fa/factorio/package.nix { releaseType = "alpha"; }; - factorio-experimental = factorio.override { releaseType = "alpha"; experimental = true;