Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update dependency: deps/k_release #414

Merged
merged 28 commits into from
Sep 9, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
cc0a1e2
deps/k_release: Set Version 7.1.124
Aug 28, 2024
b9f7618
Set Version: 0.3.42
Aug 28, 2024
fe0b073
kmir/{pyproject.toml,poetry.lock}: sync Poetry files
Aug 28, 2024
f143788
flake.{nix,lock}: update Nix derivations
Aug 28, 2024
e96b130
deps/k_release: Set Version 7.1.125
Aug 29, 2024
5025706
kmir/{pyproject.toml,poetry.lock}: sync Poetry files
Aug 30, 2024
07dbe50
flake.{nix,lock}: update Nix derivations
Aug 30, 2024
c5b2726
deps/k_release: Set Version 7.1.126
Sep 2, 2024
4e67a33
kmir/{pyproject.toml,poetry.lock}: sync Poetry files
Sep 2, 2024
da82ed4
flake.{nix,lock}: update Nix derivations
Sep 2, 2024
8fb9023
deps/k_release: Set Version 7.1.127
Sep 2, 2024
27069a2
kmir/{pyproject.toml,poetry.lock}: sync Poetry files
Sep 2, 2024
cec31d8
flake.{nix,lock}: update Nix derivations
Sep 2, 2024
4e9fdd4
deps/k_release: Set Version 7.1.129
Sep 3, 2024
011869e
deps/k_release: Set Version 7.1.131
Sep 3, 2024
e89443c
deps/k_release: Set Version 7.1.132
Sep 6, 2024
0657ce2
deps/k_release: Set Version 7.1.133
Sep 6, 2024
e70a674
deps/k_release: Set Version 7.1.134
Sep 6, 2024
1dd8020
deps/k_release: Set Version 7.1.135
Sep 6, 2024
f7b5922
deps/k_release: Set Version 7.1.136
Sep 6, 2024
ba3d60f
fix update-version script
goodlyrottenapple Sep 7, 2024
7024cb2
update flake
goodlyrottenapple Sep 7, 2024
7179311
kmir/{pyproject.toml,poetry.lock}: sync Poetry files
Sep 7, 2024
33d4d52
Merge remote-tracking branch 'origin/master' into _update-deps/runtim…
Sep 9, 2024
8a250b2
deps/k_release: Set Version 7.1.137
Sep 9, 2024
a21b644
Set Version: 0.3.43
Sep 9, 2024
711b613
kmir/{pyproject.toml,poetry.lock}: sync Poetry files
Sep 9, 2024
ab19589
flake.{nix,lock}: update Nix derivations
Sep 9, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .github/workflows/update-version.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@ jobs:
run: |
K_VERSION=$(cat deps/k_release)
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! pyk.url = "github:runtimeverification/k/[v0-9\.]*?dir=pyk"! pyk.url = "github:runtimeverification/k/v'"${K_VERSION}"'?dir=pyk"!' 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
Expand Down
2 changes: 1 addition & 1 deletion deps/k_release
Original file line number Diff line number Diff line change
@@ -1 +1 @@
7.1.123
7.1.137
206 changes: 9 additions & 197 deletions flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

23 changes: 14 additions & 9 deletions flake.nix
Original file line number Diff line number Diff line change
@@ -1,22 +1,27 @@
{
description = "mir-semantics - ";
inputs = {
k-framework.url = "github:runtimeverification/k/v7.1.123";
k-framework.url = "github:runtimeverification/k/v7.1.137";
nixpkgs.follows = "k-framework/nixpkgs";
flake-utils.follows = "k-framework/flake-utils";
rv-utils.follows = "k-framework/rv-utils";
pyk.url = "github:runtimeverification/k/v7.1.123?dir=pyk";
nixpkgs-pyk.follows = "pyk/nixpkgs";
poetry2nix.follows = "pyk/poetry2nix";
poetry2nix.follows = "k-framework/poetry2nix";
};
outputs = { self, nixpkgs, flake-utils, poetry2nix }:
outputs = { self, nixpkgs, flake-utils, k-framework, ... }@inputs:
let
allOverlays = [
poetry2nix.overlay
(final: prev: {
mir-semantics = prev.poetry2nix.mkPoetryApplication {
k-framework.overlays.pyk
(final: prev: let
poetry2nix =
inputs.poetry2nix.lib.mkPoetry2Nix { pkgs = prev; };
in {
mir-semantics = poetry2nix.mkPoetryApplication {
python = prev.python310;
projectDir = ./.;
projectDir = ./kmir;
overrides = poetry2nix.overrides.withDefaults
(finalPython: prevPython: {
kframework = prev.pyk-python310;
});
groups = [];
# We remove `dev` from `checkGroups`, so that poetry2nix does not try to resolve dev dependencies.
checkGroups = [];
Expand Down
Loading
Loading