Skip to content

Commit 652487f

Browse files
MartinNikovPetarKirov
authored andcommitted
refactor(packages): Move checks in different folder
1 parent 20bf0c7 commit 652487f

File tree

4 files changed

+64
-36
lines changed

4 files changed

+64
-36
lines changed

checks/default.nix

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{ ... }:
2+
{
3+
imports = [
4+
./packages-ci-matrix.nix
5+
];
6+
}

checks/packages-ci-matrix.nix

Lines changed: 57 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,57 @@
1+
{
2+
lib,
3+
inputs,
4+
...
5+
}:
6+
{
7+
perSystem =
8+
{
9+
inputs',
10+
self',
11+
pkgs,
12+
...
13+
}:
14+
let
15+
inherit (lib) optionalAttrs;
16+
inherit (pkgs) system;
17+
inherit (pkgs.hostPlatform) isLinux;
18+
in
19+
rec {
20+
checks =
21+
self'.packages
22+
// {
23+
inherit (self'.legacyPackages) rustToolchain;
24+
inherit (self'.legacyPackages.inputs.dlang-nix) dub;
25+
inherit (self'.legacyPackages.inputs.nixpkgs)
26+
cachix
27+
nix
28+
nix-eval-jobs
29+
nix-fast-build
30+
;
31+
inherit (self'.legacyPackages.inputs.ethereum-nix) foundry;
32+
}
33+
// optionalAttrs (system == "x86_64-linux" || system == "aarch64-darwin") {
34+
inherit (self'.legacyPackages.inputs.ethereum-nix) geth;
35+
}
36+
// optionalAttrs isLinux {
37+
inherit (inputs'.validator-ejector.packages) validator-ejector;
38+
}
39+
// optionalAttrs (system == "x86_64-linux") {
40+
inherit (pkgs) terraform;
41+
inherit (self'.legacyPackages.inputs.terranix) terranix;
42+
inherit (self'.legacyPackages.inputs.dlang-nix)
43+
dcd
44+
dscanner
45+
serve-d
46+
dmd
47+
ldc
48+
;
49+
inherit (self'.legacyPackages.inputs.ethereum-nix)
50+
mev-boost
51+
nethermind
52+
web3signer
53+
nimbus-eth2
54+
;
55+
};
56+
};
57+
}

flake.nix

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -222,6 +222,7 @@
222222
in
223223
flake-parts.lib.mkFlake { inherit inputs; } {
224224
imports = [
225+
./checks
225226
./modules
226227
./packages
227228
];

packages/default.nix

Lines changed: 0 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -72,41 +72,5 @@
7272
inherit (legacyPackages.inputs.nixpkgs) cachix nix nix-eval-jobs;
7373
};
7474
};
75-
checks =
76-
packages
77-
// {
78-
inherit (legacyPackages) rustToolchain;
79-
inherit (legacyPackages.inputs.dlang-nix) dub;
80-
inherit (legacyPackages.inputs.nixpkgs)
81-
cachix
82-
nix
83-
nix-eval-jobs
84-
nix-fast-build
85-
;
86-
inherit (legacyPackages.inputs.ethereum-nix) foundry;
87-
}
88-
// optionalAttrs (system == "x86_64-linux" || system == "aarch64-darwin") {
89-
inherit (legacyPackages.inputs.ethereum-nix) geth;
90-
}
91-
// optionalAttrs isLinux {
92-
inherit (inputs'.validator-ejector.packages) validator-ejector;
93-
}
94-
// optionalAttrs (system == "x86_64-linux") {
95-
inherit (pkgs) terraform;
96-
inherit (legacyPackages.inputs.terranix) terranix;
97-
inherit (legacyPackages.inputs.dlang-nix)
98-
dcd
99-
dscanner
100-
serve-d
101-
dmd
102-
ldc
103-
;
104-
inherit (legacyPackages.inputs.ethereum-nix)
105-
mev-boost
106-
nethermind
107-
web3signer
108-
nimbus-eth2
109-
;
110-
};
11175
};
11276
}

0 commit comments

Comments
 (0)