Skip to content

Commit 0b0c637

Browse files
committed
chore(nix): Formatting
1 parent a6ef370 commit 0b0c637

1 file changed

Lines changed: 20 additions & 7 deletions

File tree

shell.nix

Lines changed: 20 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,21 @@
11
let
2-
self = import ./. {};
2+
self = import ./. { };
33
inherit (self) sources pkgs meta;
44

5-
beku = pkgs.callPackage (sources."beku.py" + "/beku.nix") {};
6-
cargoDependencySetOfCrate = crate: [ crate ] ++ pkgs.lib.concatMap cargoDependencySetOfCrate (crate.dependencies ++ crate.buildDependencies);
7-
cargoDependencySet = pkgs.lib.unique (pkgs.lib.flatten (pkgs.lib.mapAttrsToList (crateName: crate: cargoDependencySetOfCrate crate.build) self.cargo.workspaceMembers));
8-
in pkgs.mkShell rec {
5+
beku = pkgs.callPackage (sources."beku.py" + "/beku.nix") { };
6+
cargoDependencySetOfCrate =
7+
crate:
8+
[ crate ]
9+
++ pkgs.lib.concatMap cargoDependencySetOfCrate (crate.dependencies ++ crate.buildDependencies);
10+
cargoDependencySet = pkgs.lib.unique (
11+
pkgs.lib.flatten (
12+
pkgs.lib.mapAttrsToList (
13+
crateName: crate: cargoDependencySetOfCrate crate.build
14+
) self.cargo.workspaceMembers
15+
)
16+
);
17+
in
18+
pkgs.mkShell rec {
919
name = meta.operator.name;
1020

1121
packages = with pkgs; [
@@ -24,7 +34,9 @@ in pkgs.mkShell rec {
2434
buildInputs = pkgs.lib.unique (pkgs.lib.concatMap (crate: crate.buildInputs) cargoDependencySet);
2535

2636
# build time dependencies
27-
nativeBuildInputs = pkgs.lib.unique (pkgs.lib.concatMap (crate: crate.nativeBuildInputs) cargoDependencySet ++ (with pkgs; [
37+
nativeBuildInputs = pkgs.lib.unique (
38+
pkgs.lib.concatMap (crate: crate.nativeBuildInputs) cargoDependencySet
39+
++ (with pkgs; [
2840
beku
2941
docker
3042
gettext # for the proper envsubst
@@ -39,7 +51,8 @@ in pkgs.mkShell rec {
3951
which
4052
yq-go
4153
grpcurl # for interacting with the Vector API
42-
]));
54+
])
55+
);
4356

4457
LIBCLANG_PATH = "${pkgs.libclang.lib}/lib";
4558
BINDGEN_EXTRA_CLANG_ARGS = "-I${pkgs.glibc.dev}/include -I${pkgs.clang}/resource-root/include";

0 commit comments

Comments
 (0)