Skip to content

Commit f159396

Browse files
authored
Update nix flake inputs structure and add rv-nix-tools to dependency update workflow (#217)
* adapt nix flake inputs for `rv-nix-tools` and `nixpkgs` * adapt `update-version.yml` workflow for `rv-nix-tools`
1 parent 1fda07d commit f159396

4 files changed

Lines changed: 47 additions & 10 deletions

File tree

.github/workflows/update-version.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ on:
33
push:
44
branches:
55
- '_update-deps/runtimeverification/k'
6+
- '_update-deps/runtimeverification/rv-nix-tools'
67
workflow_dispatch:
78
concurrency:
89
group: ${{ github.workflow }}-${{ github.ref }}
@@ -42,7 +43,9 @@ jobs:
4243
- name: 'Update Nix flake inputs'
4344
run: |
4445
K_VERSION=v"$(cat deps/k_release)"
46+
RV_NIX_TOOLS_VERSION=$(cat deps/rv-nix-tools)
4547
sed -i 's! k-framework.url = "github:runtimeverification/k/v[[:digit:]]\+\.[[:digit:]]\+\.[[:digit:]]\+"! k-framework.url = "github:runtimeverification/k/'"${K_VERSION}"'"!' flake.nix
48+
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
4649
nix flake update
4750
git add flake.nix flake.lock && git commit -m 'flake.{nix,lock}: update Nix derivations' || true
4851

deps/rv-nix-tools

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
854d4f05ea78547d46e807b414faad64cea10ae4

flake.lock

Lines changed: 37 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

flake.nix

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,14 @@
22
description = "Blockchain K plugin";
33

44
inputs = {
5+
rv-nix-tools.url = "github:runtimeverification/rv-nix-tools/854d4f05ea78547d46e807b414faad64cea10ae4";
6+
nixpkgs.follows = "rv-nix-tools/nixpkgs";
7+
58
k-framework.url = "github:runtimeverification/k/v7.1.257";
6-
nixpkgs.follows = "k-framework/nixpkgs";
9+
k-framework.inputs.nixpkgs.follows = "nixpkgs";
710
flake-utils.follows = "k-framework/flake-utils";
8-
rv-utils.follows = "k-framework/rv-utils";
911
poetry2nix.follows = "k-framework/poetry2nix";
12+
poetry2nix.inputs.nixpkgs.follows = "nixpkgs";
1013

1114
cpp-httplib = {
1215
url =
@@ -39,7 +42,7 @@
3942
flake = false;
4043
};
4144
};
42-
outputs = { self, nixpkgs, k-framework, poetry2nix, flake-utils, rv-utils
45+
outputs = { self, nixpkgs, k-framework, poetry2nix, flake-utils, rv-nix-tools
4346
, cpp-httplib, cryptopp, libff, ate-pairing, xbyak
4447
, ckzg4844, blst, ... }@inputs:
4548
let

0 commit comments

Comments
 (0)