Skip to content

Commit e9f97f1

Browse files
chore: Generated commit to update templated files since the last template run up to stackabletech/operator-templating@0fd2a1f (#734)
Reference-to: stackabletech/operator-templating@0fd2a1f (Rollout CRD versioning related changes and Nix fix)
1 parent c3f18f7 commit e9f97f1

File tree

2 files changed

+3
-4
lines changed

2 files changed

+3
-4
lines changed

Makefile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@ config:
4444
cp -r deploy/config-spec/* "deploy/helm/${OPERATOR_NAME}/configs";\
4545
fi
4646

47-
4847
# We generate a crds.yaml, so that the effect of code changes are visible.
4948
# The operator will take care of the CRD rollout itself.
5049
crds:

shell.nix

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,10 @@ in pkgs.mkShell rec {
2121
];
2222

2323
# derivation runtime dependencies
24-
buildInputs = pkgs.lib.concatMap (crate: crate.buildInputs) cargoDependencySet;
24+
buildInputs = pkgs.lib.unique (pkgs.lib.concatMap (crate: crate.buildInputs) cargoDependencySet);
2525

2626
# build time dependencies
27-
nativeBuildInputs = pkgs.lib.concatMap (crate: crate.nativeBuildInputs) cargoDependencySet ++ (with pkgs; [
27+
nativeBuildInputs = pkgs.lib.unique (pkgs.lib.concatMap (crate: crate.nativeBuildInputs) cargoDependencySet ++ (with pkgs; [
2828
beku
2929
docker
3030
gettext # for the proper envsubst
@@ -38,7 +38,7 @@ in pkgs.mkShell rec {
3838
# tilt already defined in default.nix
3939
which
4040
yq-go
41-
]);
41+
]));
4242

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

0 commit comments

Comments
 (0)