Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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: 1 addition & 0 deletions .github/workflows/test-pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -209,6 +209,7 @@ jobs:
uses: cachix/cachix-action@v14
with:
name: k-framework
authToken: '${{ secrets.CACHIX_PUBLIC_TOKEN }}'
skipPush: true
- name: 'Build K Framework and push build time dependencies to cachix'
env:
Expand Down
7 changes: 7 additions & 0 deletions .github/workflows/update-deps.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ on:
branches:
- '_update-deps/runtimeverification/llvm-backend'
- '_update-deps/runtimeverification/haskell-backend'
- '_update-deps/runtimeverification/rv-nix-tools'
workflow_dispatch:
# Stop in progress workflows on the same branch and same workflow to use latest committed code
concurrency:
Expand Down Expand Up @@ -64,6 +65,12 @@ jobs:
changed=true
fi

RV_NIX_TOOLS_VERSION=$(cat deps/rv-nix-tools)
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
if git add flake.nix && git commit -m "flake.nix, rv-nix-tools: update to revision ${RV_NIX_TOOLS_VERSIONs}"; then
changed=true
fi

nix flake update
if git add flake.lock && git commit -m 'flake.lock: update'; then
changed=true
Expand Down
1 change: 1 addition & 0 deletions deps/rv-nix-tools
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
854d4f05ea78547d46e807b414faad64cea10ae4
93 changes: 76 additions & 17 deletions flake.lock

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

17 changes: 10 additions & 7 deletions flake.nix
Original file line number Diff line number Diff line change
@@ -1,24 +1,27 @@
{
description = "K Framework";
inputs = {
rv-nix-tools.url = "github:runtimeverification/rv-nix-tools/854d4f05ea78547d46e807b414faad64cea10ae4";
nixpkgs.follows = "rv-nix-tools/nixpkgs";

llvm-backend.url = "github:runtimeverification/llvm-backend/v0.1.132";
llvm-backend.inputs.nixpkgs.follows = "nixpkgs";

haskell-backend = {
url = "github:runtimeverification/haskell-backend/v0.1.126";
inputs.rv-utils.follows = "llvm-backend/rv-utils";
inputs.nixpkgs.follows = "llvm-backend/nixpkgs";
inputs.rv-nix-tools.follows = "llvm-backend/rv-nix-tools";
inputs.nixpkgs.follows = "nixpkgs";
};

poetry2nix = {
url = "github:nix-community/poetry2nix/2024.9.219347";
inputs.nixpkgs.follows = "llvm-backend/nixpkgs";
inputs.nixpkgs.follows = "nixpkgs";
};

nixpkgs.follows = "llvm-backend/nixpkgs";
rv-utils.follows = "llvm-backend/rv-utils";
flake-utils.follows = "llvm-backend/utils";
};

outputs = { self, nixpkgs, flake-utils, rv-utils, haskell-backend
outputs = { self, nixpkgs, flake-utils, rv-nix-tools, haskell-backend
, llvm-backend, poetry2nix }:
let
allOverlays = [
Expand Down Expand Up @@ -180,7 +183,7 @@
packages = rec {
inherit (pkgs) k k-lock pyk pyk-python310 pyk-python311 maven;

check-submodules = rv-utils.lib.check-submodules pkgs {
check-submodules = rv-nix-tools.lib.check-submodules pkgs {
inherit llvm-backend haskell-backend;
};

Expand Down
Loading