Skip to content

Commit a377a49

Browse files
committed
adapt nix flake inputs for rv-nix-tools and nixpkgs
1 parent d856808 commit a377a49

2 files changed

Lines changed: 83 additions & 21 deletions

File tree

flake.lock

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

flake.nix

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,27 @@
11
{
22
description = "K Framework";
33
inputs = {
4+
rv-nix-tools.url = "github:runtimeverification/rv-nix-tools/854d4f05ea78547d46e807b414faad64cea10ae4";
5+
nixpkgs.follows = "rv-nix-tools/nixpkgs";
6+
47
llvm-backend.url = "github:runtimeverification/llvm-backend/v0.1.132";
8+
llvm-backend.inputs.nixpkgs.follows = "nixpkgs";
9+
510
haskell-backend = {
611
url = "github:runtimeverification/haskell-backend/v0.1.126";
7-
inputs.rv-utils.follows = "llvm-backend/rv-utils";
8-
inputs.nixpkgs.follows = "llvm-backend/nixpkgs";
12+
inputs.rv-nix-tools.follows = "llvm-backend/rv-nix-tools";
13+
inputs.nixpkgs.follows = "nixpkgs";
914
};
1015

1116
poetry2nix = {
1217
url = "github:nix-community/poetry2nix/2024.9.219347";
13-
inputs.nixpkgs.follows = "llvm-backend/nixpkgs";
18+
inputs.nixpkgs.follows = "nixpkgs";
1419
};
1520

16-
nixpkgs.follows = "llvm-backend/nixpkgs";
17-
rv-utils.follows = "llvm-backend/rv-utils";
1821
flake-utils.follows = "llvm-backend/utils";
1922
};
2023

21-
outputs = { self, nixpkgs, flake-utils, rv-utils, haskell-backend
24+
outputs = { self, nixpkgs, flake-utils, rv-nix-tools, haskell-backend
2225
, llvm-backend, poetry2nix }:
2326
let
2427
allOverlays = [
@@ -180,7 +183,7 @@
180183
packages = rec {
181184
inherit (pkgs) k k-lock pyk pyk-python310 pyk-python311 maven;
182185

183-
check-submodules = rv-utils.lib.check-submodules pkgs {
186+
check-submodules = rv-nix-tools.lib.check-submodules pkgs {
184187
inherit llvm-backend haskell-backend;
185188
};
186189

0 commit comments

Comments
 (0)