diff --git a/Makefile b/Makefile index 3cd5c01f..c138efb7 100644 --- a/Makefile +++ b/Makefile @@ -44,7 +44,6 @@ config: cp -r deploy/config-spec/* "deploy/helm/${OPERATOR_NAME}/configs";\ fi - # We generate a crds.yaml, so that the effect of code changes are visible. # The operator will take care of the CRD rollout itself. crds: diff --git a/shell.nix b/shell.nix index 7ef77f28..b6ee3afb 100644 --- a/shell.nix +++ b/shell.nix @@ -21,10 +21,10 @@ in pkgs.mkShell rec { ]; # derivation runtime dependencies - buildInputs = pkgs.lib.concatMap (crate: crate.buildInputs) cargoDependencySet; + buildInputs = pkgs.lib.unique (pkgs.lib.concatMap (crate: crate.buildInputs) cargoDependencySet); # build time dependencies - nativeBuildInputs = pkgs.lib.concatMap (crate: crate.nativeBuildInputs) cargoDependencySet ++ (with pkgs; [ + nativeBuildInputs = pkgs.lib.unique (pkgs.lib.concatMap (crate: crate.nativeBuildInputs) cargoDependencySet ++ (with pkgs; [ beku docker gettext # for the proper envsubst @@ -38,7 +38,7 @@ in pkgs.mkShell rec { # tilt already defined in default.nix which yq-go - ]); + ])); LIBCLANG_PATH = "${pkgs.libclang.lib}/lib"; BINDGEN_EXTRA_CLANG_ARGS = "-I${pkgs.glibc.dev}/include -I${pkgs.clang}/resource-root/include";