wasmtime: 45.0.2 -> 46.0.1, python3Packages.wasmtime: 45.0.0 -> 46.0.1 (#535388)

pkgs/by-name/wa/wasmtime/package.nix

@@ -10,23 +10,22 @@
   nix-update-script,
   enableShared ? !stdenv.hostPlatform.isStatic,
   enableStatic ? stdenv.hostPlatform.isStatic,
-  majorVersion ? "45",
+  variant ? "main",
 }:
 let
   sources = {
-    "36" = {
+    lts-36 = {
       version = "36.0.11";
       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=";
+    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";
@@ -57,6 +56,8 @@ rustPlatform.buildRustPackage (finalAttrs: {
     "lib"
   ];
 
+  __structuredAttrs = true;
+
   nativeBuildInputs = [
     cmake
     installShellFiles
@@ -122,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

pkgs/by-name/wa/wasmtime_36/package.nix

@@ -4,9 +4,7 @@
 }:
 
 # NOTE: LTS Version EOL August 20 2027
-(wasmtime.override { majorVersion = "36"; }).overrideAttrs (old: {
-  __structuredAttrs = true;
-
+(wasmtime.override { variant = "lts-36"; }).overrideAttrs (old: {
   passthru = old.passthru // {
     updateScript = nix-update-script {
       extraArgs = [

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 = ''
@@ -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
-    ];
-    maintainers = with lib.maintainers; [ fab ];
+    license = lib.licenses.WITH lib.licenses.asl20 lib.licenses.llvm-exception;
+    maintainers = [ lib.maintainers.fab ] ++ pkgs.wasmtime.meta.maintainers;
   };
 })