From 3d6ffad387c8d7d337d3811fac1ee52e89270c32 Mon Sep 17 00:00:00 2001 From: Sam Balco Date: Wed, 4 Oct 2023 14:38:37 +0100 Subject: [PATCH 1/2] Allow arbitrary overrides of the form --override ... github:... --- src/kup/__main__.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/kup/__main__.py b/src/kup/__main__.py index 02e8a3f..6cf2223 100644 --- a/src/kup/__main__.py +++ b/src/kup/__main__.py @@ -458,7 +458,7 @@ def mk_override_args(package_alias: str, package: GithubPackage, overrides: List ) input_path = possible_input.follows possible_input = walk_package_metadata(inputs, input_path) - if possible_input is None: + if possible_input is None and not version_or_path.startswith('github:'): rich.print( f"❗ [red]'[green]{input}[/]' is not a valid input of the package '[green]{package_alias}[/]'.\n" f"[/]To see the valid inputs, run '[blue]kup list {package_alias} --inputs[/]'" @@ -473,6 +473,12 @@ def mk_override_args(package_alias: str, package: GithubPackage, overrides: List nix_overrides.append(git_path) nix_overrides.append('--update-input') nix_overrides.append('/'.join(input_path)) + elif version_or_path.startswith('github:'): + nix_overrides.append('--override-input') + nix_overrides.append(input) + nix_overrides.append(version_or_path) + nix_overrides.append('--update-input') + nix_overrides.append(input) else: rich.print( f"❗ [red]Internal error when accessing package metadata. Expected '[green]{input}[/]' to be a direct input.[/]" From 1781d13c9b1425e2060f73d7b8c1ac11ea973419 Mon Sep 17 00:00:00 2001 From: Sam Balco Date: Thu, 26 Oct 2023 10:41:14 +0100 Subject: [PATCH 2/2] bump version and add a changelog --- CHANGELOG | 11 +++++++++++ pyproject.toml | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) create mode 100644 CHANGELOG diff --git a/CHANGELOG b/CHANGELOG new file mode 100644 index 0000000..cf21e9b --- /dev/null +++ b/CHANGELOG @@ -0,0 +1,11 @@ +# 0.2.1 + +* Allow arbitrary overrides of the form `kup install ... --override ... github:...` + + +# 0.2.0 + +* Removed `kup update` as it was functionally equivalent to `kup install` +* Renamed `kup remove` to `kup uninstall` so as to make it clear its associated with the `kup install` operation and not the `kup add` +* Added `kup publish` which allows uploading a package to a cachix cache and pinning it to it's uri +* Added the ability to query the `k-framework-binary.cachix.org` cache to download pre-built binaries of a package if they exist in the pinned cache \ No newline at end of file diff --git a/pyproject.toml b/pyproject.toml index 0e7f34f..809c627 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -4,7 +4,7 @@ build-backend = "poetry.core.masonry.api" [tool.poetry] name = "kup" -version = "0.2.0" +version = "0.2.1" description = "kup is a tool for managing installations of the K framework along with the different available semantics" authors = [ "Runtime Verification, Inc. ",