Merge branch 'develop' into adopt-pr-4504

runtimeverification · Jul 10, 2024 · fcb0fde · fcb0fde
2 parents b053fc3 + 2ab3abe
commit fcb0fde
Show file tree

Hide file tree

Showing 2 changed files with 42 additions and 102 deletions.
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -1,14 +1,16 @@
 {
   description = "K Framework";
   inputs = {
-    haskell-backend.url = "github:runtimeverification/haskell-backend/v0.1.29";
-    nixpkgs.follows = "llvm-backend/nixpkgs";
-    flake-utils.url = "github:numtide/flake-utils";
-    llvm-backend = {
-      url = "github:runtimeverification/llvm-backend/v0.1.52";
-      inputs.utils.follows = "flake-utils";
+    llvm-backend.url = "github:runtimeverification/llvm-backend/v0.1.52";
+    haskell-backend = {
+      url = "github:runtimeverification/haskell-backend/v0.1.29";
+      inputs.rv-utils.follows = "llvm-backend/rv-utils";
+      inputs.nixpkgs.follows = "llvm-backend/nixpkgs";
     };
-    rv-utils.url = "github:runtimeverification/rv-nix-tools";
+
+    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