Use fetchCargoVendor for wasm-bindgen-cli

pkgs/applications/misc/pagefind/default.nix

@@ -12,20 +12,14 @@
   npmHooks,
   python3,
   rustc,
-  wasm-bindgen-cli,
+  wasm-bindgen-cli_0_2_92,
   wasm-pack,
 }:
 
 # TODO: package python bindings
 
 let
 
-  wasm-bindgen-92 = wasm-bindgen-cli.override {
-    version = "0.2.92";
-    hash = "sha256-1VwY8vQy7soKEgbki4LD+v259751kKxSxmo/gqE6yV0=";
-    cargoHash = "sha256-aACJ+lYNEU8FFBs158G1/JG8sc6Rq080PeKCMnwdpH0=";
-  };
-
   # the lindera-unidic v0.32.2 crate uses [1] an outdated unidic-mecab fork [2] and builds it in pure rust
   # [1] https://github.com/lindera/lindera/blob/v0.32.2/lindera-unidic/build.rs#L5-L11
   # [2] https://github.com/lindera/unidic-mecab
@@ -121,7 +115,7 @@ rustPlatform.buildRustPackage rec {
       nodejs
       rustc
       rustc.llvmPackages.lld
-      wasm-bindgen-92
+      wasm-bindgen-cli_0_2_92
       wasm-pack
       httplz
     ]

pkgs/build-support/rust/fetchcrate.nix

@@ -21,6 +21,8 @@ assert pname == null || pname == crateName;
   {
     name = "${crateName}-${version}.tar.gz";
     url = "${registryDl}/${crateName}/${version}/download";
+
+    passthru = { inherit pname version; };
   }
   // lib.optionalAttrs unpack {
     extension = "tar.gz";

pkgs/by-name/wa/wasm-bindgen-cli/package.nix → pkgs/build-support/wasm-bindgen-cli/default.nix

@@ -9,16 +9,18 @@
   stdenv,
   curl,
   darwin,
-  version ? "0.2.100",
-  hash ? "sha256-3RJzK7mkYFrs7C/WkhW9Rr4LdP5ofb2FdYGz1P7Uxog=",
-  cargoHash ? "sha256-tD0OY2PounRqsRiFh8Js5nyknQ809ZcHMvCOLrvYHRE=",
+}:
+
+{
+  version ? src.version,
+  src,
+  cargoDeps,
 }:
 
 rustPlatform.buildRustPackage rec {
   pname = "wasm-bindgen-cli";
-  inherit version hash cargoHash;
 
-  src = fetchCrate { inherit pname version hash; };
+  inherit version src cargoDeps;
 
   nativeBuildInputs = [ pkg-config ];
 

pkgs/by-name/ll/lldap/package.nix

@@ -5,19 +5,13 @@
 , nixosTests
 , rustPlatform
 , rustc
-, wasm-bindgen-cli
+, wasm-bindgen-cli_0_2_95
 , wasm-pack
 , which
 }:
 
 let
 
-  wasm-bindgen-95 = wasm-bindgen-cli.override {
-    version = "0.2.95";
-    hash = "sha256-prMIreQeAcbJ8/g3+pMp1Wp9H5u+xLqxRxL+34hICss=";
-    cargoHash = "sha256-6iMebkD7FQvixlmghGGIvpdGwFNLfnUcFke/Rg8nPK4=";
-  };
-
   commonDerivationAttrs = rec {
     pname = "lldap";
     version = "0.6.1";
@@ -44,7 +38,7 @@ let
     pname = commonDerivationAttrs.pname + "-frontend";
 
     nativeBuildInputs = [
-      wasm-pack wasm-bindgen-95 binaryen which rustc rustc.llvmPackages.lld
+      wasm-pack wasm-bindgen-cli_0_2_95 binaryen which rustc rustc.llvmPackages.lld
     ];
 
     buildPhase = ''

pkgs/by-name/st/stalwart-mail/webadmin.nix

@@ -9,7 +9,7 @@
   nodejs,
   npmHooks,
   llvmPackages,
-  wasm-bindgen-cli,
+  wasm-bindgen-cli_0_2_93,
   binaryen,
   zip,
 }:
@@ -46,11 +46,8 @@ rustPlatform.buildRustPackage rec {
     tailwindcss
     trunk
     # needs to match with wasm-bindgen version in upstreams Cargo.lock
-    (wasm-bindgen-cli.override {
-      version = "0.2.93";
-      hash = "sha256-DDdu5mM3gneraM85pAepBXWn3TMofarVR4NbjMdz3r0=";
-      cargoHash = "sha256-birrg+XABBHHKJxfTKAMSlmTVYLmnmqMDfRnmG6g/YQ=";
-    })
+    wasm-bindgen-cli_0_2_93
+
     zip
   ];
 

pkgs/by-name/tp/tpsecore/package.nix

@@ -4,18 +4,12 @@
   rustPlatform,
   rustc,
   wasm-pack,
-  wasm-bindgen-cli,
+  wasm-bindgen-cli_0_2_95,
   binaryen,
 }:
 
 let
   version = "0.1.1";
-
-  wasm-bindgen-cli-95 = wasm-bindgen-cli.override {
-    version = "0.2.95";
-    hash = "sha256-prMIreQeAcbJ8/g3+pMp1Wp9H5u+xLqxRxL+34hICss=";
-    cargoHash = "sha256-6iMebkD7FQvixlmghGGIvpdGwFNLfnUcFke/Rg8nPK4=";
-  };
 in
 rustPlatform.buildRustPackage {
   pname = "tpsecore";
@@ -32,7 +26,7 @@ rustPlatform.buildRustPackage {
 
   nativeBuildInputs = [
     wasm-pack
-    wasm-bindgen-cli-95
+    wasm-bindgen-cli_0_2_95
     binaryen
     rustc.llvmPackages.lld
   ];

pkgs/by-name/wa/wasm-bindgen-cli_0_2_100/package.nix

@@ -0,0 +1,19 @@
+{
+  buildWasmBindgenCli,
+  fetchCrate,
+  rustPlatform,
+}:
+
+buildWasmBindgenCli rec {
+  src = fetchCrate {
+    pname = "wasm-bindgen-cli";
+    version = "0.2.100";
+    hash = "sha256-3RJzK7mkYFrs7C/WkhW9Rr4LdP5ofb2FdYGz1P7Uxog=";
+  };
+
+  cargoDeps = rustPlatform.fetchCargoVendor {
+    inherit src;
+    inherit (src) pname version;
+    hash = "sha256-qsO12332HSjWCVKtf1cUePWWb9IdYUmT+8OPj/XP2WE=";
+  };
+}

pkgs/by-name/wa/wasm-bindgen-cli_0_2_92/package.nix

@@ -0,0 +1,19 @@
+{
+  buildWasmBindgenCli,
+  fetchCrate,
+  rustPlatform,
+}:
+
+buildWasmBindgenCli rec {
+  src = fetchCrate {
+    pname = "wasm-bindgen-cli";
+    version = "0.2.92";
+    hash = "sha256-1VwY8vQy7soKEgbki4LD+v259751kKxSxmo/gqE6yV0=";
+  };
+
+  cargoDeps = rustPlatform.fetchCargoVendor {
+    inherit src;
+    inherit (src) pname version;
+    hash = "sha256-81vQkKubMWaX0M3KAwpYgMA1zUQuImFGvh5yTW+rIAs=";
+  };
+}

pkgs/by-name/wa/wasm-bindgen-cli_0_2_93/package.nix

@@ -0,0 +1,19 @@
+{
+  buildWasmBindgenCli,
+  fetchCrate,
+  rustPlatform,
+}:
+
+buildWasmBindgenCli rec {
+  src = fetchCrate {
+    pname = "wasm-bindgen-cli";
+    version = "0.2.93";
+    hash = "sha256-DDdu5mM3gneraM85pAepBXWn3TMofarVR4NbjMdz3r0=";
+  };
+
+  cargoDeps = rustPlatform.fetchCargoVendor {
+    inherit src;
+    inherit (src) pname version;
+    hash = "sha256-s8srI+lu+DgQ+5BbaEXC4Ja/BL+K22LIl5Gd1PwNZZk=";
+  };
+}

pkgs/by-name/wa/wasm-bindgen-cli_0_2_95/package.nix

@@ -0,0 +1,19 @@
+{
+  buildWasmBindgenCli,
+  fetchCrate,
+  rustPlatform,
+}:
+
+buildWasmBindgenCli rec {
+  src = fetchCrate {
+    pname = "wasm-bindgen-cli";
+    version = "0.2.95";
+    hash = "sha256-prMIreQeAcbJ8/g3+pMp1Wp9H5u+xLqxRxL+34hICss=";
+  };
+
+  cargoDeps = rustPlatform.fetchCargoVendor {
+    inherit src;
+    inherit (src) pname version;
+    hash = "sha256-+h87/onAdpG0Jmeuy0Wd2djLFOAyaE52cAfxDVVcgP8=";
+  };
+}

pkgs/servers/teleport/15/default.nix

@@ -1,4 +1,4 @@
-{ wasm-bindgen-cli, ... }@args:
+args:
 import ../generic.nix (
   args
   // {
@@ -14,12 +14,5 @@ import ../generic.nix (
         "sspi-0.10.1" = "sha256-fkclC/plTh2d8zcmqthYmr5yXqbPTeFxI1VuaPX5vxk=";
       };
     };
-
-    # wasm-bindgen-cli version must match the version of wasm-bindgen in Cargo.lock
-    wasm-bindgen-cli = wasm-bindgen-cli.override {
-      version = "0.2.92";
-      hash = "sha256-1VwY8vQy7soKEgbki4LD+v259751kKxSxmo/gqE6yV0=";
-      cargoHash = "sha256-aACJ+lYNEU8FFBs158G1/JG8sc6Rq080PeKCMnwdpH0=";
-    };
   }
 )

pkgs/servers/teleport/16/default.nix

@@ -1,4 +1,4 @@
-{ wasm-bindgen-cli, ... }@args:
+args:
 import ../generic.nix (
   args
   // {
@@ -13,12 +13,5 @@ import ../generic.nix (
         "ironrdp-async-0.1.0" = "sha256-DOwDHavDaEda+JK9M6kbvseoXe2LxJg3MLTY/Nu+PN0=";
       };
     };
-
-    # wasm-bindgen-cli version must match the version of wasm-bindgen in Cargo.lock
-    wasm-bindgen-cli = wasm-bindgen-cli.override {
-      version = "0.2.93";
-      hash = "sha256-DDdu5mM3gneraM85pAepBXWn3TMofarVR4NbjMdz3r0=";
-      cargoHash = "sha256-birrg+XABBHHKJxfTKAMSlmTVYLmnmqMDfRnmG6g/YQ=";
-    };
   }
 )

pkgs/servers/teleport/default.nix

@@ -1,11 +1,34 @@
-{ callPackages, lib, ... }@args:
+{
+  callPackages,
+  lib,
+  wasm-bindgen-cli_0_2_92,
+  wasm-bindgen-cli_0_2_93,
+  ...
+}@args:
 let
   f = args: rec {
-    teleport_15 = import ./15 args;
-    teleport_16 = import ./16 args;
+    # wasm-bindgen-cli version must match the version of wasm-bindgen in Cargo.lock
+    teleport_15 = import ./15 (
+      args
+      // {
+        wasm-bindgen-cli = wasm-bindgen-cli_0_2_92;
+      }
+    );
+    teleport_16 = import ./16 (
+      args
+      // {
+        wasm-bindgen-cli = wasm-bindgen-cli_0_2_93;
+      }
+    );
     teleport = teleport_16;
   };
   # Ensure the following callPackages invocation includes everything 'generic' needs.
   f' = lib.setFunctionArgs f (builtins.functionArgs (import ./generic.nix));
 in
-callPackages f' (builtins.removeAttrs args [ "callPackages" ])
+callPackages f' (
+  builtins.removeAttrs args [
+    "callPackages"
+    "wasm-bindgen-cli_0_2_92"
+    "wasm-bindgen-cli_0_2_93"
+  ]
+)

pkgs/top-level/aliases.nix

@@ -1478,6 +1478,7 @@ mapAliases {
   wakatime = wakatime-cli; # 2024-05-30
   wal_e = throw "wal_e was removed as it is unmaintained upstream and depends on the removed boto package; upstream recommends using wal-g or pgbackrest"; # Added 2024-09-22
   wapp = tclPackages.wapp; # Added 2024-10-02
+  wasm-bindgen-cli = wasm-bindgen-cli_0_2_100;
   wayfireApplications-unwrapped = throw ''
     'wayfireApplications-unwrapped.wayfire' has been renamed to/replaced by 'wayfire'
     'wayfireApplications-unwrapped.wayfirePlugins' has been renamed to/replaced by 'wayfirePlugins'

pkgs/top-level/all-packages.nix

@@ -5353,6 +5353,9 @@ with pkgs;
 
   webassemblyjs-cli = nodePackages."@webassemblyjs/cli-1.11.1";
   webassemblyjs-repl = nodePackages."@webassemblyjs/repl-1.11.1";
+
+  buildWasmBindgenCli = callPackage ../build-support/wasm-bindgen-cli { };
+
   wasm-strip = nodePackages."@webassemblyjs/wasm-strip";
   wasm-text-gen = nodePackages."@webassemblyjs/wasm-text-gen-1.11.1";
   wast-refmt = nodePackages."@webassemblyjs/wast-refmt-1.11.1";