Skip to content

Commit ba4d074

Browse files
committed
revert(nix): Restore shell.nix
This file is templated from https://github.com/stackabletech/operator-templating/blob/main/template/shell.nix
1 parent 4844246 commit ba4d074

1 file changed

Lines changed: 20 additions & 34 deletions

File tree

shell.nix

Lines changed: 20 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,11 @@
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 =
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 {
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 {
199
name = meta.operator.name;
2010

2111
packages = with pkgs; [
@@ -34,25 +24,21 @@ pkgs.mkShell rec {
3424
buildInputs = pkgs.lib.unique (pkgs.lib.concatMap (crate: crate.buildInputs) cargoDependencySet);
3525

3626
# build time dependencies
37-
nativeBuildInputs = pkgs.lib.unique (
38-
pkgs.lib.concatMap (crate: crate.nativeBuildInputs) cargoDependencySet
39-
++ (with pkgs; [
40-
beku
41-
docker
42-
gettext # for the proper envsubst
43-
git
44-
jq
45-
kind
46-
kubectl
47-
kubernetes-helm
48-
kuttl
49-
nix # this is implied, but needed in the pure env
50-
# tilt already defined in default.nix
51-
which
52-
yq-go
53-
grpcurl # for interacting with the Vector API
54-
])
55-
);
27+
nativeBuildInputs = pkgs.lib.unique (pkgs.lib.concatMap (crate: crate.nativeBuildInputs) cargoDependencySet ++ (with pkgs; [
28+
beku
29+
docker
30+
gettext # for the proper envsubst
31+
git
32+
jq
33+
kind
34+
kubectl
35+
kubernetes-helm
36+
kuttl
37+
nix # this is implied, but needed in the pure env
38+
# tilt already defined in default.nix
39+
which
40+
yq-go
41+
]));
5642

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

0 commit comments

Comments
 (0)