chore: remove circom compat from nix (#1388)

This commit is contained in:
Arnaud 2026-02-03 10:51:30 +04:00 committed by GitHub
parent 0a6c2a5796
commit 3203dfba41
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 6 additions and 41 deletions

27
flake.lock generated
View File

@ -1,32 +1,12 @@
{
"nodes": {
"circom-compat": {
"inputs": {
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1736521871,
"narHash": "sha256-d34XNLg9NGPEOARHW+BIOAWalkHdEUAwsv3mpLZQxds=",
"owner": "logos-storage",
"repo": "circom-compat-ffi",
"rev": "8cd4ed44fdafe59d4ec1184420639cae4c4dbab9",
"type": "github"
},
"original": {
"owner": "logos-storage",
"repo": "circom-compat-ffi",
"type": "github"
}
},
"nixpkgs": {
"locked": {
"lastModified": 1736200483,
"narHash": "sha256-JO+lFN2HsCwSLMUWXHeOad6QUxOuwe9UOAF/iSl1J4I=",
"lastModified": 1751274312,
"narHash": "sha256-/bVBlRpECLVzjV19t5KMdMFWSwKLtb5RyXdjz3LJT+g=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "3f0a8ac25fb674611b98089ca3a5dd6480175751",
"rev": "50ab793786d9de88ee30ec4e4c24fb4236fc2674",
"type": "github"
},
"original": {
@ -38,7 +18,6 @@
},
"root": {
"inputs": {
"circom-compat": "circom-compat",
"nixpkgs": "nixpkgs"
}
}

View File

@ -3,13 +3,9 @@
inputs = {
nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.11";
circom-compat = {
url = "github:logos-storage/circom-compat-ffi";
inputs.nixpkgs.follows = "nixpkgs";
};
};
outputs = { self, nixpkgs, circom-compat}:
outputs = { self, nixpkgs }:
let
stableSystems = [
"x86_64-linux" "aarch64-linux"
@ -19,9 +15,8 @@
pkgsFor = forAllSystems (system: import nixpkgs { inherit system; });
in rec {
packages = forAllSystems (system: let
circomCompatPkg = circom-compat.packages.${system}.default;
buildTarget = pkgsFor.${system}.callPackage ./nix/default.nix rec {
inherit stableSystems circomCompatPkg;
inherit stableSystems;
src = self;
};
build = targets: buildTarget.override { inherit targets; };
@ -33,7 +28,6 @@
nixosModules.logos-storage-nim = { config, lib, pkgs, ... }: import ./nix/service.nix {
inherit config lib pkgs self;
circomCompatPkg = circom-compat.packages.${pkgs.system}.default;
};
devShells = forAllSystems (system: let
@ -43,7 +37,6 @@
inputsFrom = [
packages.${system}.logos-storage-nim
packages.${system}.libstorage
circom-compat.packages.${system}.default
];
# Not using buildInputs to override fakeGit and fakeCargo.
nativeBuildInputs = with pkgs; [ git cargo nodejs_18 ];

View File

@ -507,4 +507,4 @@ A Go wrapper is available [here](https://github.com/logos-storage/logos-storage-
## Rust Wrapper
A Rust wrapper is available [here](https://github.com/nipsysdev/codex-rust-bindings).
A Rust wrapper is available [here](https://github.com/nipsysdev/storage-rust-bindings).

View File

@ -12,9 +12,6 @@
],
# Perform 2-stage bootstrap instead of 3-stage to save time.
quickAndDirty ? true,
circomCompatPkg ? (
builtins.getFlake "github:logos-storage/circom-compat-ffi"
).packages.${builtins.currentSystem}.default
}:
assert pkgs.lib.assertMsg ((src.submodules or true) == true)
@ -47,14 +44,10 @@ in stdenv.mkDerivation rec {
nativeBuildInputs = let
# Fix for Nim compiler calling 'git rev-parse' and 'lsb_release'.
fakeGit = writeScriptBin "git" "echo ${version}";
# Fix for the nim-circom-compat-ffi package that is built with cargo.
fakeCargo = writeScriptBin "cargo" "echo ${version}";
in with pkgs; [
cmake
which
circomCompatPkg
fakeGit
fakeCargo
] ++ lib.optionals stdenv.isLinux [
lsb-release
] ++ lib.optionals stdenv.isDarwin [