From 263eeb91b3decf83c35aead80d68fdc4d0e6e869 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=81lex?= Date: Fri, 12 Jun 2026 12:53:32 +0000 Subject: [PATCH] chore(nix): remove unneeded circuit files (#2936) --- flake.lock | 7 ++++--- flake.nix | 15 +++++++-------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/flake.lock b/flake.lock index f9b49cbef..978db4f27 100644 --- a/flake.lock +++ b/flake.lock @@ -30,6 +30,7 @@ "original": { "owner": "logos-blockchain", "repo": "logos-blockchain-circuits", + "rev": "2846ee7a4cfa24458bb8063412ab2e753b344d2f", "type": "github" } }, @@ -51,11 +52,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1780749050, - "narHash": "sha256-3av0pIjlOWQ6rDbNOmpUSvbNnJkGORQKKjb4LtCZsIY=", + "lastModified": 1781074563, + "narHash": "sha256-md8WlXOlfnIeHeOScMTTHFyf2d6iaTwPl2apR5EQ3P4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a799d3e3886da994fa307f817a6bc705ae538eeb", + "rev": "9ae611a455b90cf061d8f332b977e387bda8e1ca", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index b4e28a8c9..a1a59fc0c 100644 --- a/flake.nix +++ b/flake.nix @@ -12,8 +12,13 @@ crane.url = "github:ipetkov/crane"; # Must stay in sync with the lbc-* tags in Cargo.toml. + # Pinned to the commit right after the v0.5.3 tag (127626881faa975aa8e9868422cf6bbb08fcb512): + # the tag itself predates the CI job that registers its Nix hashes in + # circuits-nix-hashes.json, so building directly off the tag fails with + # `attribute '"0.5.3"' missing`. This commit adds that entry without + # otherwise changing the source. logos-blockchain-circuits = { - url = "github:logos-blockchain/logos-blockchain-circuits?tag=v0.5.1"; + url = "github:logos-blockchain/logos-blockchain-circuits/2846ee7a4cfa24458bb8063412ab2e753b344d2f"; }; # Must stay in sync with the rust-rapidsnark rev in Cargo.toml. @@ -95,14 +100,8 @@ inherit logosBlockchainDependencies; postInstall = '' - mkdir -p $out/circuits $out/include - cp -r ${logos-blockchain-circuits.packages.${system}.default}/* $out/circuits/ + mkdir -p $out/include cp c-bindings/logos_blockchain.h $out/include/ - - # Files copied from the Nix store are read-only. - # Crane modifies files in $out after install, so they must be writable during the build. - # Nix makes the final output read-only again, so this is safe. - chmod -R u+w $out/circuits '' + pkgs.lib.optionalString pkgs.stdenv.isDarwin '' install_name_tool -id @rpath/liblogos_blockchain.dylib $out/lib/liblogos_blockchain.dylib '';