From 73296faa01a0bff12ce8198bc3f13914ee6e8d80 Mon Sep 17 00:00:00 2001 From: winston Date: Thu, 25 Jun 2026 22:01:25 +0200 Subject: [PATCH 1/6] wasmtime: 45.0.2 -> 46.0.1 --- pkgs/by-name/wa/wasmtime/package.nix | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/wa/wasmtime/package.nix b/pkgs/by-name/wa/wasmtime/package.nix index 034984f5d6de..a81839519fe9 100644 --- a/pkgs/by-name/wa/wasmtime/package.nix +++ b/pkgs/by-name/wa/wasmtime/package.nix @@ -10,7 +10,7 @@ nix-update-script, enableShared ? !stdenv.hostPlatform.isStatic, enableStatic ? stdenv.hostPlatform.isStatic, - majorVersion ? "45", + majorVersion ? "46", }: let sources = { @@ -19,11 +19,10 @@ let hash = "sha256-rrSI2dSOA8/1CL7JhW0eQ7LaeS5EqTVnyn2HTI+/x20="; cargoHash = "sha256-S67/fv7179uDy4PpwycyXSWAknIC/7ZzvzWPOd6MD+8="; }; - "45" = { - - version = "45.0.2"; - hash = "sha256-LEQitwz+UDSX4mrjEecmoO/ZPgRnYTZ3DsD1pu8Jybs="; - cargoHash = "sha256-uTgEW2w0RSMetd2W1ucGiVMEEvz2A7CQ79SEsE8/+BM="; + "46" = { + version = "46.0.1"; + hash = "sha256-rPIO+wQSu5KWT/v3Wbjs29p5Aoqpnpb+TwSTT5CRb6U="; + cargoHash = "sha256-cJD5iq342giBP+YdTem0/nOsMhI7DKRL4iiai5xayv8="; }; }; source = sources.${majorVersion}; From 8fb3a336256d4e791aa857f3fb4314cda26d3429 Mon Sep 17 00:00:00 2001 From: winston Date: Thu, 25 Jun 2026 22:03:49 +0200 Subject: [PATCH 2/6] wasmtime: use lts & main `variant`s instead of `majorVersion` arg The previous `majorVersion` arg broke nix-update-script when the major version changed. --- pkgs/by-name/wa/wasmtime/package.nix | 8 ++++---- pkgs/by-name/wa/wasmtime_36/package.nix | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/wa/wasmtime/package.nix b/pkgs/by-name/wa/wasmtime/package.nix index a81839519fe9..e33892c355a1 100644 --- a/pkgs/by-name/wa/wasmtime/package.nix +++ b/pkgs/by-name/wa/wasmtime/package.nix @@ -10,22 +10,22 @@ nix-update-script, enableShared ? !stdenv.hostPlatform.isStatic, enableStatic ? stdenv.hostPlatform.isStatic, - majorVersion ? "46", + variant ? "main", }: let sources = { - "36" = { + lts-36 = { version = "36.0.11"; hash = "sha256-rrSI2dSOA8/1CL7JhW0eQ7LaeS5EqTVnyn2HTI+/x20="; cargoHash = "sha256-S67/fv7179uDy4PpwycyXSWAknIC/7ZzvzWPOd6MD+8="; }; - "46" = { + main = { version = "46.0.1"; hash = "sha256-rPIO+wQSu5KWT/v3Wbjs29p5Aoqpnpb+TwSTT5CRb6U="; cargoHash = "sha256-cJD5iq342giBP+YdTem0/nOsMhI7DKRL4iiai5xayv8="; }; }; - source = sources.${majorVersion}; + source = sources.${variant}; in rustPlatform.buildRustPackage (finalAttrs: { pname = "wasmtime"; diff --git a/pkgs/by-name/wa/wasmtime_36/package.nix b/pkgs/by-name/wa/wasmtime_36/package.nix index 282b821a7642..31bd67c40308 100644 --- a/pkgs/by-name/wa/wasmtime_36/package.nix +++ b/pkgs/by-name/wa/wasmtime_36/package.nix @@ -4,7 +4,7 @@ }: # NOTE: LTS Version EOL August 20 2027 -(wasmtime.override { majorVersion = "36"; }).overrideAttrs (old: { +(wasmtime.override { variant = "lts-36"; }).overrideAttrs (old: { __structuredAttrs = true; passthru = old.passthru // { From 3b63a22964ecaac3cebce1d291a7ac3db6f6f662 Mon Sep 17 00:00:00 2001 From: winston Date: Thu, 25 Jun 2026 22:07:32 +0200 Subject: [PATCH 3/6] wasmtime{,_36}: use structuredAttrs for both variants --- pkgs/by-name/wa/wasmtime/package.nix | 2 ++ pkgs/by-name/wa/wasmtime_36/package.nix | 2 -- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/wa/wasmtime/package.nix b/pkgs/by-name/wa/wasmtime/package.nix index e33892c355a1..c47781d2b50a 100644 --- a/pkgs/by-name/wa/wasmtime/package.nix +++ b/pkgs/by-name/wa/wasmtime/package.nix @@ -56,6 +56,8 @@ rustPlatform.buildRustPackage (finalAttrs: { "lib" ]; + __structuredAttrs = true; + nativeBuildInputs = [ cmake installShellFiles diff --git a/pkgs/by-name/wa/wasmtime_36/package.nix b/pkgs/by-name/wa/wasmtime_36/package.nix index 31bd67c40308..91077251e357 100644 --- a/pkgs/by-name/wa/wasmtime_36/package.nix +++ b/pkgs/by-name/wa/wasmtime_36/package.nix @@ -5,8 +5,6 @@ # NOTE: LTS Version EOL August 20 2027 (wasmtime.override { variant = "lts-36"; }).overrideAttrs (old: { - __structuredAttrs = true; - passthru = old.passthru // { updateScript = nix-update-script { extraArgs = [ From 3b1886d2c913ce4e4c2a969514dc84ab14a68216 Mon Sep 17 00:00:00 2001 From: winston Date: Thu, 25 Jun 2026 22:09:31 +0200 Subject: [PATCH 4/6] wasmtime, python3Packages.wasmtime: use compound license ref: #468378 --- pkgs/by-name/wa/wasmtime/package.nix | 5 +---- pkgs/development/python-modules/wasmtime/default.nix | 5 +---- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/pkgs/by-name/wa/wasmtime/package.nix b/pkgs/by-name/wa/wasmtime/package.nix index c47781d2b50a..3c197d64f8f4 100644 --- a/pkgs/by-name/wa/wasmtime/package.nix +++ b/pkgs/by-name/wa/wasmtime/package.nix @@ -123,10 +123,7 @@ rustPlatform.buildRustPackage (finalAttrs: { meta = { description = "Standalone JIT-style runtime for WebAssembly, using Cranelift"; homepage = "https://wasmtime.dev/"; - license = [ - lib.licenses.asl20 - lib.licenses.llvm-exception - ]; + license = lib.licenses.WITH lib.licenses.asl20 lib.licenses.llvm-exception; mainProgram = "wasmtime"; maintainers = with lib.maintainers; [ ereslibre diff --git a/pkgs/development/python-modules/wasmtime/default.nix b/pkgs/development/python-modules/wasmtime/default.nix index dd3a0227db1e..101243002bf9 100644 --- a/pkgs/development/python-modules/wasmtime/default.nix +++ b/pkgs/development/python-modules/wasmtime/default.nix @@ -84,10 +84,7 @@ buildPythonPackage (finalAttrs: { description = "Python WebAssembly runtime powered by Wasmtime"; homepage = "https://github.com/bytecodealliance/wasmtime-py"; changelog = "https://github.com/bytecodealliance/wasmtime-py/releases/tag/${finalAttrs.src.tag}"; - license = [ - lib.licenses.asl20 - lib.licenses.llvm-exception - ]; + license = lib.licenses.WITH lib.licenses.asl20 lib.licenses.llvm-exception; maintainers = with lib.maintainers; [ fab ]; }; }) From 75dd5d573a2d17871448a879ecfbdc5cf43c9b49 Mon Sep 17 00:00:00 2001 From: winston Date: Thu, 25 Jun 2026 22:11:11 +0200 Subject: [PATCH 5/6] python3Packages.wasmtime: add wasmtime maintainers --- pkgs/development/python-modules/wasmtime/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/wasmtime/default.nix b/pkgs/development/python-modules/wasmtime/default.nix index 101243002bf9..b94fd417f7ba 100644 --- a/pkgs/development/python-modules/wasmtime/default.nix +++ b/pkgs/development/python-modules/wasmtime/default.nix @@ -85,6 +85,6 @@ buildPythonPackage (finalAttrs: { homepage = "https://github.com/bytecodealliance/wasmtime-py"; changelog = "https://github.com/bytecodealliance/wasmtime-py/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.WITH lib.licenses.asl20 lib.licenses.llvm-exception; - maintainers = with lib.maintainers; [ fab ]; + maintainers = [ lib.maintainers.fab ] ++ pkgs.wasmtime.meta.maintainers; }; }) From 6b035af055bbbb0604daa442b8dccb868962ae13 Mon Sep 17 00:00:00 2001 From: winston Date: Mon, 29 Jun 2026 17:44:51 +0200 Subject: [PATCH 6/6] python3Packages.wasmtime: 45.0.0 -> 46.0.1 --- pkgs/development/python-modules/wasmtime/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/wasmtime/default.nix b/pkgs/development/python-modules/wasmtime/default.nix index b94fd417f7ba..3eea7f3f5268 100644 --- a/pkgs/development/python-modules/wasmtime/default.nix +++ b/pkgs/development/python-modules/wasmtime/default.nix @@ -18,14 +18,14 @@ let in buildPythonPackage (finalAttrs: { pname = "wasmtime"; - version = "45.0.0"; + version = "46.0.1"; pyproject = true; src = fetchFromGitHub { owner = "bytecodealliance"; repo = "wasmtime-py"; tag = finalAttrs.version; - hash = "sha256-XlAWPJB34uE+hbEMGZ46Ll6kXP+/lZ2amTKdjslGrP4="; + hash = "sha256-PWMrmr9PPi98lQe5+KaY4bPLOYyJ5qYugMJwVwwnuwA="; }; postPatch = ''