fix(flake.nix): Update packages, following flake.lock update

- Remove cryptography36 from all shell

- Update leap's clang11 to clang14

- Rename rust-stable wasm32-wasi target to wasm32-wasip1, following
upstream rename

- Add rust-bin-2024-08-01 for old rust-bin toolchains, which are needed
for zkWasm to compile

Co-authored-by: Martin Nikov <[email protected]>

Author: Syndamia

flake.lock

@@ -33,6 +33,11 @@
       url = "github:oxalica/rust-overlay";
       inputs.nixpkgs.follows = "nixpkgs";
     };
+
+    rust-overlay-2024-08-01 = {
+      url = "github:oxalica/rust-overlay?ref=snapshot/2024-08-01";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
   };
 
   outputs =

flake.nix

@@ -22,6 +22,7 @@
         cardano-node
         cardano-cli
         pkgs-with-rust-overlay
+        rust-bin-2024-08-01
         ;
       python3Packages = pkgs.python3Packages;
 
@@ -178,6 +179,7 @@
         inherit craneLib-nightly;
         inherit fetchGitHubFile;
         inherit installSourceAndCargo;
+        inherit rust-bin-2024-08-01;
       };
 
       args-zkVM-rust = {

packages/all-packages.nix

@@ -26,7 +26,7 @@
       rust-stable = pkgs-with-rust-overlay.rust-bin.stable.latest.default.override {
         extensions = [ "rust-src" ];
         targets = [
-          "wasm32-wasi"
+          "wasm32-wasip1"
           "wasm32-unknown-unknown"
         ];
       };
@@ -92,6 +92,8 @@
           pkgs-with-rust-overlay
           ;
 
+        rust-bin-2024-08-01 = inputs.rust-overlay-2024-08-01.lib.mkRustBin { } pkgs;
+
         rustPlatformStable = pkgs.makeRustPlatform {
           rustc = rust-stable;
           cargo = rust-stable;

packages/default.nix

@@ -1,12 +1,12 @@
 {
-  clang11Stdenv,
+  clang14Stdenv,
   nodejs,
   fetchFromGitHub,
   pkgs,
   lib,
   xz,
 }:
-clang11Stdenv.mkDerivation rec {
+clang14Stdenv.mkDerivation rec {
   pname = "leap";
   version = "4.0.0";
 
@@ -25,13 +25,13 @@ clang11Stdenv.mkDerivation rec {
   nativeBuildInputs = with pkgs; [
     pkg-config
     cmake
-    clang_11
+    clang_14
     git
     python3
   ];
 
   buildInputs = with pkgs; [
-    llvm_11
+    llvm_14
     curl.dev
     gmp.dev
     openssl.dev

packages/leap/default.nix

@@ -1,5 +1,5 @@
 {
-  rust-bin,
+  rust-bin-2024-08-01,
   craneLib-nightly,
   fetchFromGitHub,
   fetchGitHubFile,
@@ -29,7 +29,7 @@ let
   };
 
   craneLib = craneLib-nightly.overrideToolchain (
-    rust-bin.fromRustupToolchainFile (fetchGitHubFile {
+    rust-bin-2024-08-01.fromRustupToolchainFile (fetchGitHubFile {
       inherit (commonArgs.src) owner repo rev;
       file = "rust-toolchain";
       hash = "sha256-gHLj2AMKnStjvZcowfe9ZdTnwOBUPCRADmv81H7dAak=";

packages/zkwasm/default.nix

@@ -75,7 +75,7 @@ mkShell {
 
       # Disabled until elrond-go can build with Go >= 1.19
       # Elrond
-      metacraft-labs.cryptography36
+      # metacraft-labs.cryptography36
       # metacraft-labs.erdpy
       # metacraft-labs.elrond-go
       # metacraft-labs.elrond-proxy-go