Skip to content
This repository has been archived by the owner on Jan 9, 2025. It is now read-only.

Commit

Permalink
adjust flake and shell nix
Browse files Browse the repository at this point in the history
  • Loading branch information
tedim52 committed Oct 16, 2024
1 parent c0bcae3 commit 35db686
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 20 deletions.
3 changes: 0 additions & 3 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -110,9 +110,6 @@
packages.go-tidy-all = pkgs.callPackage ./scripts/go-tidy-all.nix {
inherit pkgs;
};
packages.get-docker-tag = pkgs.callPackage ./scripts/get-docker-tag.nix {
inherit pkgs;
};
packages.generate-kardinal-version = pkgs.callPackage ./scripts/generate_kardinal_version.nix {
inherit pkgs;
};
Expand Down
15 changes: 1 addition & 14 deletions scripts/generate_kardinal_version.nix
Original file line number Diff line number Diff line change
Expand Up @@ -18,20 +18,7 @@ pkgs.writeShellApplication {
commit_sha="$(git rev-parse --short=6 HEAD)"
suffix="$(git diff --quiet || echo '-dirty')"
echo "$commit_sha$suffix"
new_version=""
if [ -z "$new_version" ]; then
if ! cd "$root_dirpath"; then
echo "Error: Couldn't cd to the root of this repo, '$root_dirpath', which is required to get the Git tag" >&2
show_helptext_and_exit
fi
if ! new_version="$(./scripts/get-docker-tag.sh)"; then
echo "Error: No new version provided and couldn't generate one" >&2
show_helptext_and_exit
fi
fi
new_version="$commit_sha$suffix"
kardinal_version_go_file_abs_path="$root_dirpath/$KARDINAL_VERSION_PACKAGE_DIR/$KARDINAL_VERSION_GO_FILE"
Expand Down
3 changes: 0 additions & 3 deletions shell.nix
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,7 @@
'';

go-tidy-all = import ./scripts/go-tidy-all.nix {inherit pkgs;};
get-docker-tag = import ./scripts/get-docker-tag.nix {inherit pkgs;};
generate-kardinal-version = import ./scripts/generate_kardinal_version.nix {inherit pkgs;};

manager_shell = pkgs.callPackage ./kardinal-manager/shell.nix {inherit pkgs;};
cli_shell = pkgs.callPackage ./kardinal-cli/shell.nix {inherit pkgs;};
cli_kontrol_api_shell = pkgs.callPackage ./libs/cli-kontrol-api/shell.nix {inherit pkgs;};
Expand All @@ -27,7 +25,6 @@
buildInputs = [
kardinal
go-tidy-all
get-docker-tag
generate-kardinal-version
kubectl
kustomize
Expand Down

0 comments on commit 35db686

Please sign in to comment.