diff --git a/.github/workflows/nix_build_linux.yml b/.github/workflows/nix_build_linux.yml index cfcc77e4..6a1d99c1 100644 --- a/.github/workflows/nix_build_linux.yml +++ b/.github/workflows/nix_build_linux.yml @@ -9,7 +9,6 @@ on: jobs: handle-syncwith: - if: github.event_name == 'pull_request' name: Call Reusable SyncWith Handler uses: NilFoundation/ci-cd/.github/workflows/reusable-handle-syncwith.yml@v1 with: diff --git a/flake.lock b/flake.lock index fdefbae1..fb62f2d8 100644 --- a/flake.lock +++ b/flake.lock @@ -18,55 +18,22 @@ "type": "github" } }, - "flake-utils_2": { - "inputs": { - "systems": "systems_2" - }, - "locked": { - "lastModified": 1710146030, - "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_3": { - "inputs": { - "systems": "systems_3" - }, - "locked": { - "lastModified": 1710146030, - "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, "nil-crypto3": { "inputs": { + "flake-utils": [ + "flake-utils" + ], "nix-3rdparty": "nix-3rdparty", "nixpkgs": [ "nixpkgs" ] }, "locked": { - "lastModified": 1720625736, - "narHash": "sha256-hN9H6kpGAUn0JJQDCgZi8PjR2lOvMxC9M/Nm3D7ngs0=", + "lastModified": 1721720987, + "narHash": "sha256-+ah13O1r8cUZOJpv5AKFbl5WmsGc2bBkiji8gKZY8cU=", "ref": "refs/heads/master", - "rev": "3033b706940d20433651963d4ee8b751805d388f", - "revCount": 9151, + "rev": "87edbf57f8ff14ed31ab67180dd504a229e2be87", + "revCount": 9161, "submodules": false, "type": "git", "url": "https://github.com/NilFoundation/crypto3" @@ -79,20 +46,23 @@ }, "nil-zkllvm-blueprint": { "inputs": { - "flake-utils": "flake-utils_3", + "flake-utils": [ + "flake-utils" + ], "nil-crypto3": [ "nil-crypto3" ], + "nix-3rdparty": "nix-3rdparty_2", "nixpkgs": [ "nixpkgs" ] }, "locked": { - "lastModified": 1720537031, - "narHash": "sha256-ucn4h+p17acwRv7GjpwtPj99mUk3WHqA7Ag4zvTvJ8U=", + "lastModified": 1721734595, + "narHash": "sha256-P/L6jsOGT0L8dCfuMi7wvnqUknakbwYCI+ra8u0eCxc=", "ref": "refs/heads/master", - "rev": "30377e6d7d1b71a3c777c326d2140945398f651f", - "revCount": 1249, + "rev": "cfd44a0a29365f59dc00ce06ac041110cdd06c95", + "revCount": 1253, "submodules": true, "type": "git", "url": "https://github.com/NilFoundation/zkllvm-blueprint" @@ -105,7 +75,10 @@ }, "nix-3rdparty": { "inputs": { - "flake-utils": "flake-utils_2", + "flake-utils": [ + "nil-crypto3", + "flake-utils" + ], "nixpkgs": [ "nil-crypto3", "nixpkgs" @@ -128,9 +101,11 @@ "nix-3rdparty_2": { "inputs": { "flake-utils": [ + "nil-zkllvm-blueprint", "flake-utils" ], "nixpkgs": [ + "nil-zkllvm-blueprint", "nixpkgs" ] }, @@ -148,13 +123,36 @@ "type": "github" } }, + "nix-3rdparty_3": { + "inputs": { + "flake-utils": [ + "flake-utils" + ], + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1721822436, + "narHash": "sha256-AQidmv80fA72FFHgyjCq9Psc04w9aaHedJpoVgnLb6M=", + "owner": "NilFoundation", + "repo": "nix-3rdparty", + "rev": "d14a2a3c4b9498b297400b225fc09570bfe0a9a1", + "type": "github" + }, + "original": { + "owner": "NilFoundation", + "repo": "nix-3rdparty", + "type": "github" + } + }, "nixpkgs": { "locked": { - "lastModified": 1720679975, - "narHash": "sha256-8yHvqa7P7y4kFiNW9BPgeQdZ6FVFXD3Sp/oUVRyzYpA=", + "lastModified": 1721899448, + "narHash": "sha256-9/hH1MfJyDKFgxD0HxQEzZN+SqiX3taKAoigFkr87Ls=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "1f86d2ae2cb15b411e11ff1e4638beb079b7190d", + "rev": "aefcf1642cc10d7427019670f8f32b561f7fb070", "type": "github" }, "original": { @@ -168,7 +166,7 @@ "flake-utils": "flake-utils", "nil-crypto3": "nil-crypto3", "nil-zkllvm-blueprint": "nil-zkllvm-blueprint", - "nix-3rdparty": "nix-3rdparty_2", + "nix-3rdparty": "nix-3rdparty_3", "nixpkgs": "nixpkgs" } }, @@ -186,36 +184,6 @@ "repo": "default", "type": "github" } - }, - "systems_2": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, - "systems_3": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } } }, "root": "root", diff --git a/flake.nix b/flake.nix index 5b7aeeee..cf3695be 100644 --- a/flake.nix +++ b/flake.nix @@ -17,6 +17,7 @@ submodules = false; inputs = { nixpkgs.follows = "nixpkgs"; + flake-utils.follows = "flake-utils"; }; }; nil-zkllvm-blueprint = { @@ -24,6 +25,7 @@ type = "git"; submodules = true; inputs = { + flake-utils.follows = "flake-utils"; nixpkgs.follows = "nixpkgs"; nil-crypto3.follows = "nil-crypto3"; }; @@ -43,7 +45,7 @@ inherit system; overlays = [ nix-3rdparty.overlays.${system}.default ]; }; - crypto3 = nil-crypto3.packages.${system}.default; + crypto3 = nil-crypto3.packages.${system}.crypto3; blueprint = nil-zkllvm-blueprint.packages.${system}.default; in { diff --git a/libs/assigner b/libs/assigner index 94c85b94..3e5aebc3 160000 --- a/libs/assigner +++ b/libs/assigner @@ -1 +1 @@ -Subproject commit 94c85b94aae37886508343ca1f15e6feb45ebed1 +Subproject commit 3e5aebc34c8278f88e30a52fd3b99a61d225df8e diff --git a/libs/transpiler b/libs/transpiler index 92332ff9..2fa0898a 160000 --- a/libs/transpiler +++ b/libs/transpiler @@ -1 +1 @@ -Subproject commit 92332ff93e2d818191c7abb6149ad1f0fcbf404e +Subproject commit 2fa0898af4b59adff290d5ea59ce033aa948c08c