diff --git a/.github/workflows/update-version.yml b/.github/workflows/update-version.yml index 33413b0d4..ea6172aaf 100644 --- a/.github/workflows/update-version.yml +++ b/.github/workflows/update-version.yml @@ -4,6 +4,7 @@ on: branches: - '_update-deps/runtimeverification/k' - '_update-deps/runtimeverification/stable-mir-json' + - '_update-deps/runtimeverification/rv-nix-tools' workflow_dispatch: concurrency: group: ${{ github.workflow }}-${{ github.ref }} @@ -45,7 +46,9 @@ jobs: - name: 'Update Nix flake inputs' run: | K_VERSION=$(cat deps/k_release) + RV_NIX_TOOLS_VERSION=$(cat deps/rv-nix-tools) sed -i 's! k-framework.url = "github:runtimeverification/k/[v0-9\.]*"! k-framework.url = "github:runtimeverification/k/v'"${K_VERSION}"'"!' flake.nix + sed -i 's! rv-nix-tools.url = "github:runtimeverification/rv-nix-tools/[a-z0-9\.]*"! rv-nix-tools.url = "github:runtimeverification/rv-nix-tools/'"${RV_NIX_TOOLS_VERSION}"'"!' flake.nix nix --extra-experimental-features 'nix-command flakes' --show-trace flake update git add flake.nix flake.lock git commit -m 'flake.{nix,lock}: update Nix derivations' || true diff --git a/deps/rv-nix-tools b/deps/rv-nix-tools new file mode 100644 index 000000000..c8863974d --- /dev/null +++ b/deps/rv-nix-tools @@ -0,0 +1 @@ +854d4f05ea78547d46e807b414faad64cea10ae4 \ No newline at end of file diff --git a/flake.lock b/flake.lock index dda02a0e3..57ab0621f 100644 --- a/flake.lock +++ b/flake.lock @@ -127,8 +127,6 @@ "haskell-backend": "haskell-backend", "llvm-backend": "llvm-backend", "nixpkgs": [ - "k-framework", - "llvm-backend", "nixpkgs" ], "poetry2nix": "poetry2nix", @@ -222,6 +220,22 @@ "type": "github" } }, + "nixpkgs_2": { + "locked": { + "lastModified": 1716457947, + "narHash": "sha256-Y+exebcqeprnhEpoPJrEUZmNeO60qeOxkVHhqG/OEwQ=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "69493a13eaea0dc4682fd07e8a084f17813dbeeb", + "type": "github" + }, + "original": { + "owner": "nixos", + "repo": "nixpkgs", + "rev": "69493a13eaea0dc4682fd07e8a084f17813dbeeb", + "type": "github" + } + }, "poetry2nix": { "inputs": { "flake-utils": "flake-utils_2", @@ -291,17 +305,33 @@ ], "k-framework": "k-framework", "nixpkgs": [ - "k-framework", + "rv-nix-tools", "nixpkgs" ], "poetry2nix": [ "k-framework", "poetry2nix" ], - "rv-utils": [ - "k-framework", - "rv-utils" - ] + "rv-nix-tools": "rv-nix-tools" + } + }, + "rv-nix-tools": { + "inputs": { + "nixpkgs": "nixpkgs_2" + }, + "locked": { + "lastModified": 1726497185, + "narHash": "sha256-iN+5eLmDm/rLuIZezS5ZqiW1BtBpwrrM9CPPP7Z5Tog=", + "owner": "runtimeverification", + "repo": "rv-nix-tools", + "rev": "854d4f05ea78547d46e807b414faad64cea10ae4", + "type": "github" + }, + "original": { + "owner": "runtimeverification", + "repo": "rv-nix-tools", + "rev": "854d4f05ea78547d46e807b414faad64cea10ae4", + "type": "github" } }, "rv-utils": { diff --git a/flake.nix b/flake.nix index 6110d91f8..82adf9b74 100644 --- a/flake.nix +++ b/flake.nix @@ -1,11 +1,16 @@ { description = "kmir - "; inputs = { + rv-nix-tools.url = "github:runtimeverification/rv-nix-tools/854d4f05ea78547d46e807b414faad64cea10ae4"; + nixpkgs.follows = "rv-nix-tools/nixpkgs"; + k-framework.url = "github:runtimeverification/k/v7.1.258"; - nixpkgs.follows = "k-framework/nixpkgs"; + k-framework.inputs.nixpkgs.follows = "nixpkgs"; + flake-utils.follows = "k-framework/flake-utils"; - rv-utils.follows = "k-framework/rv-utils"; + poetry2nix.follows = "k-framework/poetry2nix"; + poetry2nix.inputs.nixpkgs.follows = "nixpkgs"; }; outputs = { self, nixpkgs, flake-utils, k-framework, ... }@inputs: let diff --git a/kmir/pyproject.toml b/kmir/pyproject.toml index 64ef13e2f..8607a092e 100644 --- a/kmir/pyproject.toml +++ b/kmir/pyproject.toml @@ -4,7 +4,7 @@ build-backend = "hatchling.build" [project] name = "kmir" -version = "0.3.179" +version = "0.3.180" description = "" requires-python = "~=3.10" dependencies = [ diff --git a/kmir/src/kmir/__init__.py b/kmir/src/kmir/__init__.py index 7dd367bec..6ca6cbb26 100644 --- a/kmir/src/kmir/__init__.py +++ b/kmir/src/kmir/__init__.py @@ -1,3 +1,3 @@ from typing import Final -VERSION: Final = '0.3.179' +VERSION: Final = '0.3.180' diff --git a/kmir/uv.lock b/kmir/uv.lock index 8b87aee5e..df65e22cc 100644 --- a/kmir/uv.lock +++ b/kmir/uv.lock @@ -491,7 +491,7 @@ wheels = [ [[package]] name = "kmir" -version = "0.3.179" +version = "0.3.180" source = { editable = "." } dependencies = [ { name = "kframework" }, diff --git a/package/version b/package/version index b281dd780..1c460a466 100644 --- a/package/version +++ b/package/version @@ -1 +1 @@ -0.3.179 +0.3.180