Update to latest Determinate Nix

nix-wasm-plugin-fib/tests/fib.nix

@@ -1 +1 @@
-builtins.wasm <plugins/nix_wasm_plugin_fib.wasm> "fib" 33
+builtins.wasm { path = <plugins/nix_wasm_plugin_fib.wasm>; function = "fib"; } 33

nix-wasm-plugin-grep/tests/grep.nix

@@ -1,4 +1,4 @@
 let
-  grep = builtins.wasm <plugins/nix_wasm_plugin_grep.wasm> "grep";
+  grep = builtins.wasm { path = <plugins/nix_wasm_plugin_grep.wasm>; function = "grep"; };
 in
   map builtins.baseNameOf (grep { path = ../..; pattern = "hello 123"; inherit builtins; })

nix-wasm-plugin-ini/tests/test1.nix

@@ -1 +1 @@
-builtins.wasm <plugins/nix_wasm_plugin_ini.wasm> "fromINI" (builtins.readFile ./test1.ini)
+builtins.wasm { path = <plugins/nix_wasm_plugin_ini.wasm>; function = "fromINI"; } (builtins.readFile ./test1.ini)

nix-wasm-plugin-mandelbrot/tests/test1.nix

@@ -1 +1 @@
-builtins.wasm <plugins/nix_wasm_plugin_mandelbrot.wasm> "mandelbrot" { width = 160; }
+builtins.wasm { path = <plugins/nix_wasm_plugin_mandelbrot.wasm>; function = "mandelbrot"; } { width = 160; }

nix-wasm-plugin-test/tests/call.nix

@@ -1,8 +1,7 @@
 let 
-  wasm = builtins.wasm <plugins/nix_wasm_plugin_test.wasm>;
-  strictMap = wasm "strictMap";
-  range = wasm "range";
-  sum = wasm "sum";
-  double = wasm "double";
+  strictMap = builtins.wasm { path = <plugins/nix_wasm_plugin_test.wasm>; function = "strictMap"; };
+  range = builtins.wasm { path = <plugins/nix_wasm_plugin_test.wasm>; function = "range"; };
+  sum = builtins.wasm { path = <plugins/nix_wasm_plugin_test.wasm>; function = "sum"; };
+  double = builtins.wasm { path = <plugins/nix_wasm_plugin_test.wasm>; function = "double"; };
 in
   sum (strictMap { list = range { start = 0; end = 100000; }; fun = double; })

nix-wasm-plugin-test/tests/lazy.nix

@@ -1,5 +1,4 @@
 let
-  wasm = builtins.wasm <plugins/nix_wasm_plugin_test.wasm>;
-  lazyMap = wasm "lazyMap";
+  lazyMap = builtins.wasm { path = <plugins/nix_wasm_plugin_test.wasm>; function = "lazyMap"; };
 in
   builtins.elemAt (lazyMap { fun = (x: x * 2); list = [1 2 3 (throw "foo")]; }) 2

nix-wasm-plugin-test/tests/pure.nix

@@ -1,5 +1,4 @@
 let
-  wasm = builtins.wasm <plugins/nix_wasm_plugin_test.wasm>;
-  counter = wasm "counter";
+  counter = builtins.wasm { path = <plugins/nix_wasm_plugin_test.wasm>; function = "counter"; };
 in
   [ (counter "x") (counter "y") (counter "z") ]

nix-wasm-plugin-yaml/tests/fromYAML.nix

@@ -1 +1 @@
-builtins.wasm <plugins/nix_wasm_plugin_yaml.wasm> "fromYAML" (builtins.readFile ./test1.yaml)
+builtins.wasm { path = <plugins/nix_wasm_plugin_yaml.wasm>; function = "fromYAML"; } (builtins.readFile ./test1.yaml)

nix-wasm-plugin-yaml/tests/toYAML.nix

@@ -1,3 +1,3 @@
-builtins.wasm <plugins/nix_wasm_plugin_yaml.wasm> "toYAML"
-  (builtins.wasm <plugins/nix_wasm_plugin_yaml.wasm> "fromYAML"
+builtins.wasm { path = <plugins/nix_wasm_plugin_yaml.wasm>; function = "toYAML"; }
+  (builtins.wasm { path = <plugins/nix_wasm_plugin_yaml.wasm>; function = "fromYAML"; }
     (builtins.readFile ./test1.yaml))

nix-wasm-plugin-yaml/tests/toYAML2.nix

@@ -1 +1 @@
-builtins.wasm <plugins/nix_wasm_plugin_yaml.wasm> "toYAML" [{foo = 123; bar = null; xyzzy = "bla"; a.b.c = "abc";}]
+builtins.wasm { path = <plugins/nix_wasm_plugin_yaml.wasm>; function = "toYAML"; } [{foo = 123; bar = null; xyzzy = "bla"; a.b.c = "abc";}]

wasi/flake.nix

@@ -8,7 +8,6 @@
       type = "github";
       owner = "DeterminateSystems";
       repo = "nix-src";
-      ref = "eelcodolstra/nix-282-allow-wasm-plugins-to-use-wasi";
     };
     fenix = {
       url = "https://flakehub.com/f/nix-community/fenix/0.1.*.tar.gz";
@@ -92,7 +91,7 @@
           }
           ''
             [[ $(nix eval --store dummy:// --offline --json --show-trace -I plugins=${self.packages.${system}.nix-wasi-plugins}/bin --impure --eval-cores 0 \
-              --expr 'builtins.wasi <plugins/nix-wasi-plugin-fib.wasm> 33') = 5702887 ]]
+              --expr 'builtins.wasm { path = <plugins/nix-wasi-plugin-fib.wasm>; } 33') = 5702887 ]]
             mkdir -p $out
           '';
       });