Skip to content

Commit bf65659

Browse files
PetarKirovPetarKirov
committed
style(nix): Reformat *.nix files with nixfmt
1 parent f681910 commit bf65659

File tree

7 files changed

+159
-160
lines changed

7 files changed

+159
-160
lines changed

‎packages/all-packages.nix‎

Lines changed: 75 additions & 76 deletions
Original file line numberDiff line numberDiff line change
@@ -147,94 +147,93 @@
147147
};
148148
in
149149
{
150-
legacyPackages.metacraft-labs =
151-
rec {
152-
gaiad = callPackage ./gaiad { };
153-
cosmos-theta-testnet = callPackage ./cosmos-theta-testnet { inherit gaiad; };
154-
blst = callPackage ./blst { };
155-
156-
circom = callPackage ./circom/default.nix { craneLib = craneLib-fenix-stable; };
157-
circ = callPackage ./circ/default.nix { craneLib = craneLib-fenix-stable; };
158-
159-
emscripten = pkgs.emscripten.overrideAttrs (_old: {
160-
postInstall = ''
161-
pushd $TMPDIR
162-
echo 'int __main_argc_argv( int a, int b ) { return 42; }' >test.c
163-
for MEM in "-s ALLOW_MEMORY_GROWTH" ""; do
164-
for LTO in -flto ""; do
165-
# FIXME: change to the following, once binaryen is updated to
166-
# >= v119 in Nixpkgs:
167-
# for OPT in "-O2" "-O3" "-Oz" "-Os"; do
168-
for OPT in "-O2"; do
169-
$out/bin/emcc $MEM $LTO $OPT -s WASM=1 -s STANDALONE_WASM test.c
170-
done
150+
legacyPackages.metacraft-labs = rec {
151+
gaiad = callPackage ./gaiad { };
152+
cosmos-theta-testnet = callPackage ./cosmos-theta-testnet { inherit gaiad; };
153+
blst = callPackage ./blst { };
154+
155+
circom = callPackage ./circom/default.nix { craneLib = craneLib-fenix-stable; };
156+
circ = callPackage ./circ/default.nix { craneLib = craneLib-fenix-stable; };
157+
158+
emscripten = pkgs.emscripten.overrideAttrs (_old: {
159+
postInstall = ''
160+
pushd $TMPDIR
161+
echo 'int __main_argc_argv( int a, int b ) { return 42; }' >test.c
162+
for MEM in "-s ALLOW_MEMORY_GROWTH" ""; do
163+
for LTO in -flto ""; do
164+
# FIXME: change to the following, once binaryen is updated to
165+
# >= v119 in Nixpkgs:
166+
# for OPT in "-O2" "-O3" "-Oz" "-Os"; do
167+
for OPT in "-O2"; do
168+
$out/bin/emcc $MEM $LTO $OPT -s WASM=1 -s STANDALONE_WASM test.c
171169
done
172170
done
173-
'';
174-
});
171+
done
172+
'';
173+
});
175174

176-
go-opera = callPackage ./go-opera/default.nix { };
175+
go-opera = callPackage ./go-opera/default.nix { };
177176

178-
circom_runtime = callPackage ./circom_runtime/default.nix { };
177+
circom_runtime = callPackage ./circom_runtime/default.nix { };
179178

180-
# Polkadot
181-
inherit polkadot polkadot-fast;
179+
# Polkadot
180+
inherit polkadot polkadot-fast;
182181

183-
avalanche-cli = callPackage ./avalanche-cli/default.nix {
184-
inherit blst;
185-
};
182+
avalanche-cli = callPackage ./avalanche-cli/default.nix {
183+
inherit blst;
184+
};
186185

187-
inherit corepack-shims;
186+
inherit corepack-shims;
187+
188+
eradicate2 = callPackage ./eradicate2 { };
189+
}
190+
// lib.optionalAttrs hostPlatform.isLinux rec {
191+
kurtosis = callPackage ./kurtosis/default.nix { };
192+
193+
wasmd = callPackage ./wasmd/default.nix { };
194+
195+
# Solana
196+
# solana-validator = callPackage ./solana-validator {};
197+
198+
# inherit elrond-go elrond-proxy-go;
199+
200+
# EOS / Antelope
201+
leap = callPackage ./leap/default.nix { };
202+
eos-vm = callPackage ./eos-vm/default.nix { };
203+
cdt = callPackage ./cdt/default.nix { };
204+
205+
zkwasm = callPackage ./zkwasm/default.nix args-zkVM;
206+
jolt-guest-rust = callPackage ./jolt-guest-rust/default.nix args-zkVM-rust;
207+
jolt = callPackage ./jolt/default.nix (args-zkVM // { inherit jolt-guest-rust; });
208+
zkm-rust = callPackage ./zkm-rust/default.nix args-zkVM-rust;
209+
zkm = callPackage ./zkm/default.nix (args-zkVM // { inherit zkm-rust; });
210+
nexus = callPackage ./nexus/default.nix args-zkVM;
211+
sp1-rust = callPackage ./sp1-rust/default.nix args-zkVM-rust;
212+
sp1 = callPackage ./sp1/default.nix (args-zkVM // { inherit sp1-rust; });
213+
risc0-rust = callPackage ./risc0-rust/default.nix args-zkVM-rust;
214+
risc0 = callPackage ./risc0/default.nix (args-zkVM // { inherit risc0-rust; });
215+
}
216+
// lib.optionalAttrs hostPlatform.isx86 rec {
217+
inherit
218+
zqfield-bn254
219+
ffiasm
220+
ffiasm-src
221+
rapidsnark
222+
;
188223

189-
eradicate2 = callPackage ./eradicate2 { };
190-
}
191-
// lib.optionalAttrs hostPlatform.isLinux rec {
192-
kurtosis = callPackage ./kurtosis/default.nix { };
193-
194-
wasmd = callPackage ./wasmd/default.nix { };
195-
196-
# Solana
197-
# solana-validator = callPackage ./solana-validator {};
198-
199-
# inherit elrond-go elrond-proxy-go;
200-
201-
# EOS / Antelope
202-
leap = callPackage ./leap/default.nix { };
203-
eos-vm = callPackage ./eos-vm/default.nix { };
204-
cdt = callPackage ./cdt/default.nix { };
205-
206-
zkwasm = callPackage ./zkwasm/default.nix args-zkVM;
207-
jolt-guest-rust = callPackage ./jolt-guest-rust/default.nix args-zkVM-rust;
208-
jolt = callPackage ./jolt/default.nix (args-zkVM // { inherit jolt-guest-rust; });
209-
zkm-rust = callPackage ./zkm-rust/default.nix args-zkVM-rust;
210-
zkm = callPackage ./zkm/default.nix (args-zkVM // { inherit zkm-rust; });
211-
nexus = callPackage ./nexus/default.nix args-zkVM;
212-
sp1-rust = callPackage ./sp1-rust/default.nix args-zkVM-rust;
213-
sp1 = callPackage ./sp1/default.nix (args-zkVM // { inherit sp1-rust; });
214-
risc0-rust = callPackage ./risc0-rust/default.nix args-zkVM-rust;
215-
risc0 = callPackage ./risc0/default.nix (args-zkVM // { inherit risc0-rust; });
216-
}
217-
// lib.optionalAttrs hostPlatform.isx86 rec {
224+
inherit cardano graphql;
225+
}
226+
// lib.optionalAttrs (hostPlatform.isx86 && hostPlatform.isLinux) rec {
227+
pistache = callPackage ./pistache/default.nix { };
228+
inherit zqfield-bn254 rapidsnark-gpu;
229+
rapidsnark-server = callPackage ./rapidsnark-server/default.nix {
218230
inherit
219-
zqfield-bn254
220231
ffiasm
221-
ffiasm-src
232+
zqfield-bn254
222233
rapidsnark
234+
pistache
223235
;
224-
225-
inherit cardano graphql;
226-
}
227-
// lib.optionalAttrs (hostPlatform.isx86 && hostPlatform.isLinux) rec {
228-
pistache = callPackage ./pistache/default.nix { };
229-
inherit zqfield-bn254 rapidsnark-gpu;
230-
rapidsnark-server = callPackage ./rapidsnark-server/default.nix {
231-
inherit
232-
ffiasm
233-
zqfield-bn254
234-
rapidsnark
235-
pistache
236-
;
237-
};
238236
};
237+
};
239238
};
240239
}

‎packages/default.nix‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -54,13 +54,12 @@
5454
cardano-node = builtins.getFlake "github:input-output-hk/cardano-node/f0b4ac897dcbefba9fa0d247b204a24543cf55f6";
5555

5656
reexportedPackages = {
57-
ethereum_nix =
58-
{
59-
# geth = inputs'.ethereum_nix.packages.geth; # TODO: re-enable when flake show/check passes
60-
}
61-
// lib.optionalAttrs (pkgs.hostPlatform.isx86 && pkgs.hostPlatform.isLinux) {
62-
# nimbus = inputs'.ethereum_nix.packages.nimbus-eth2; # TODO: re-enable when flake show/check passes
63-
};
57+
ethereum_nix = {
58+
# geth = inputs'.ethereum_nix.packages.geth; # TODO: re-enable when flake show/check passes
59+
}
60+
// lib.optionalAttrs (pkgs.hostPlatform.isx86 && pkgs.hostPlatform.isLinux) {
61+
# nimbus = inputs'.ethereum_nix.packages.nimbus-eth2; # TODO: re-enable when flake show/check passes
62+
};
6463
# noir = {
6564
# nargo = inputs'.noir.packages.nargo;
6665
# noirc_abi_wasm = inputs'.noir.packages.noirc_abi_wasm;

‎packages/ffiasm/default.nix‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,8 @@ stdenv.mkDerivation rec {
3838
gtest
3939
gmp
4040
zqfield-bn254
41-
] ++ openmp;
41+
]
42+
++ openmp;
4243
checkPhase = ''
4344
function run_test {
4445
echo -e "┌─── \033[1mstart \033[34m$1\033[0m ────╌╌╌"

‎packages/rapidsnark-gpu/default.nix‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,8 @@ stdenv.mkDerivation rec {
3131
gmp
3232
libsodium
3333
cudaPackages.cudatoolkit
34-
] ++ ffiasm.passthru.openmp;
34+
]
35+
++ ffiasm.passthru.openmp;
3536

3637
buildPhase = ''
3738
mkdir -p $out/bin

‎packages/rapidsnark/default.nix‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,8 @@ stdenv.mkDerivation rec {
2828
nlohmann_json
2929
gmp
3030
libsodium
31-
] ++ ffiasm.passthru.openmp;
31+
]
32+
++ ffiasm.passthru.openmp;
3233

3334
buildPhase = ''
3435
mkdir -p $out/bin

‎shells/all.nix‎

Lines changed: 68 additions & 69 deletions
Original file line numberDiff line numberDiff line change
@@ -16,75 +16,74 @@ let
1616
};
1717
in
1818
mkShell {
19-
packages =
20-
[
21-
# For priting the direnv banner
22-
figlet
23-
24-
# For formatting Nix files
25-
alejandra
26-
27-
# Packages defined in this repo
28-
metacraft-labs.cosmos-theta-testnet
29-
metacraft-labs.circom
30-
31-
metacraft-labs.circ
32-
33-
metacraft-labs.go-opera
34-
35-
metacraft-labs.polkadot
36-
metacraft-labs.polkadot-fast
37-
38-
# noir
39-
# self'.legacyPackages.noir.nargo
40-
# self'.legacyPackages.noir.noirc_abi_wasm
41-
# self'.legacyPackages.noir.acvm_js
42-
43-
# ethereum.nix
44-
self'.legacyPackages.ethereum_nix.geth
45-
46-
# avalanche cli
47-
metacraft-labs.avalanche-cli
48-
49-
# Node.js related
50-
metacraft-labs.corepack-shims
51-
]
52-
++ lib.optionals (stdenv.hostPlatform.isx86) [
53-
metacraft-labs.rapidsnark
54-
55-
# Cardano
56-
metacraft-labs.cardano
57-
]
58-
++ lib.optionals (stdenv.hostPlatform.isx86 && stdenv.isLinux) [
59-
# Rapidsnark depends on Pistache, which supports only Linux, see
60-
# https://github.com/pistacheio/pistache/issues/6#issuecomment-242398225
61-
# for more information
62-
metacraft-labs.rapidsnark-server
63-
64-
# Ethereum
65-
self'.legacyPackages.ethereum_nix.nimbus
66-
67-
# Test nix2container
68-
example-container.copyToDockerDaemon
69-
]
70-
++ lib.optionals (!stdenv.isDarwin) [
71-
# Solana is still not compatible with macOS on M1
72-
# metacraft-labs.solana
73-
metacraft-labs.wasmd
74-
75-
# Disabled until elrond-go can build with Go >= 1.19
76-
# Elrond
77-
# metacraft-labs.elrond-go
78-
# metacraft-labs.elrond-proxy-go
79-
80-
# EOS
81-
metacraft-labs.leap
82-
metacraft-labs.eos-vm
83-
metacraft-labs.cdt
84-
85-
# emscripten
86-
metacraft-labs.emscripten
87-
];
19+
packages = [
20+
# For priting the direnv banner
21+
figlet
22+
23+
# For formatting Nix files
24+
alejandra
25+
26+
# Packages defined in this repo
27+
metacraft-labs.cosmos-theta-testnet
28+
metacraft-labs.circom
29+
30+
metacraft-labs.circ
31+
32+
metacraft-labs.go-opera
33+
34+
metacraft-labs.polkadot
35+
metacraft-labs.polkadot-fast
36+
37+
# noir
38+
# self'.legacyPackages.noir.nargo
39+
# self'.legacyPackages.noir.noirc_abi_wasm
40+
# self'.legacyPackages.noir.acvm_js
41+
42+
# ethereum.nix
43+
self'.legacyPackages.ethereum_nix.geth
44+
45+
# avalanche cli
46+
metacraft-labs.avalanche-cli
47+
48+
# Node.js related
49+
metacraft-labs.corepack-shims
50+
]
51+
++ lib.optionals (stdenv.hostPlatform.isx86) [
52+
metacraft-labs.rapidsnark
53+
54+
# Cardano
55+
metacraft-labs.cardano
56+
]
57+
++ lib.optionals (stdenv.hostPlatform.isx86 && stdenv.isLinux) [
58+
# Rapidsnark depends on Pistache, which supports only Linux, see
59+
# https://github.com/pistacheio/pistache/issues/6#issuecomment-242398225
60+
# for more information
61+
metacraft-labs.rapidsnark-server
62+
63+
# Ethereum
64+
self'.legacyPackages.ethereum_nix.nimbus
65+
66+
# Test nix2container
67+
example-container.copyToDockerDaemon
68+
]
69+
++ lib.optionals (!stdenv.isDarwin) [
70+
# Solana is still not compatible with macOS on M1
71+
# metacraft-labs.solana
72+
metacraft-labs.wasmd
73+
74+
# Disabled until elrond-go can build with Go >= 1.19
75+
# Elrond
76+
# metacraft-labs.elrond-go
77+
# metacraft-labs.elrond-proxy-go
78+
79+
# EOS
80+
metacraft-labs.leap
81+
metacraft-labs.eos-vm
82+
metacraft-labs.cdt
83+
84+
# emscripten
85+
metacraft-labs.emscripten
86+
];
8887

8988
shellHook = ''
9089
figlet -w$COLUMNS "nix-blockchain-development"

‎shells/ci.nix‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,8 @@ pkgs.mkShellNoCC {
66
figlet
77
];
88

9-
shellHook =
10-
''
11-
figlet -w$COLUMNS "nix-blockchain-development"
12-
''
13-
+ config.pre-commit.installationScript;
9+
shellHook = ''
10+
figlet -w$COLUMNS "nix-blockchain-development"
11+
''
12+
+ config.pre-commit.installationScript;
1413
}

0 commit comments

Comments
 (0)