Skip to content

Commit 521a6c8

Browse files
Baltolirv-auditor
andauthored
Simplify Nix code (#674)
* Simplify Nix usage * Remove separate pyk version bump * Set Version: 0.1.82 --------- Co-authored-by: devops <[email protected]>
1 parent 0eec76c commit 521a6c8

File tree

5 files changed

+8
-194
lines changed

5 files changed

+8
-194
lines changed

.github/workflows/update-version.yml

-1
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,6 @@ jobs:
4747
run: |
4848
K_VERSION=v"$(cat deps/k_release)"
4949
sed -i 's! k-framework.url = "github:runtimeverification/k/v[[:digit:]]\+\.[[:digit:]]\+\.[[:digit:]]\+"! k-framework.url = "github:runtimeverification/k/'"${K_VERSION}"'"!' flake.nix
50-
sed -i 's! pyk.url = "github:runtimeverification/k/v[[:digit:]]\+\.[[:digit:]]\+\.[[:digit:]]\+?dir=pyk"! pyk.url = "github:runtimeverification/k/'"${K_VERSION}"'?dir=pyk"!' flake.nix
5150
nix flake update
5251
git add flake.nix flake.lock && git commit -m 'flake.{nix,lock}: update Nix derivations' || true
5352
- name: 'Push updates'

flake.lock

+1-185
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

flake.nix

+5-6
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,11 @@
66
nixpkgs.follows = "k-framework/nixpkgs";
77
flake-utils.follows = "k-framework/flake-utils";
88
rv-utils.follows = "k-framework/rv-utils";
9-
pyk.url = "github:runtimeverification/k/v7.1.54?dir=pyk";
10-
poetry2nix.follows = "pyk/poetry2nix";
9+
poetry2nix.follows = "k-framework/poetry2nix";
1110
};
1211

1312
outputs =
14-
{ self, k-framework, nixpkgs, flake-utils, rv-utils, pyk, poetry2nix }:
13+
{ self, k-framework, nixpkgs, flake-utils, rv-utils, poetry2nix }:
1514
let
1615
overlay = (final: prev:
1716
let
@@ -28,7 +27,7 @@
2827
inherit src version;
2928

3029
buildInputs = with prev; [
31-
k-framework.packages.${system}.k
30+
k
3231
final.kwasm-pyk
3332
python310
3433
];
@@ -50,7 +49,7 @@
5049
--prefix PATH : ${
5150
prev.lib.makeBinPath [
5251
prev.which
53-
k-framework.packages.${prev.system}.k
52+
prev.k
5453
]
5554
} \
5655
--set KDIST_DIR $out
@@ -131,7 +130,7 @@
131130
inherit system;
132131
overlays = [
133132
poetry2nix.overlays.default
134-
pyk.overlay
133+
k-framework.overlay
135134
overlay
136135
];
137136
};

package/version

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
0.1.81
1+
0.1.82

pykwasm/pyproject.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ build-backend = "poetry.core.masonry.api"
44

55
[tool.poetry]
66
name = "pykwasm"
7-
version = "0.1.81"
7+
version = "0.1.82"
88
description = ""
99
authors = [
1010
"Runtime Verification, Inc. <[email protected]>",

0 commit comments

Comments
 (0)