Merge remote-tracking branch 'origin/develop'

runtimeverification · Feb 15, 2024 · 1302173 · 1302173
2 parents 7bac0bd + c1325dc
commit 1302173
Show file tree

Hide file tree

Showing 3 changed files with 67 additions and 13 deletions.
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -8,11 +8,10 @@
       inputs.haskell-backend.follows = "haskell-backend";
       inputs.stacklock2nix.follows = "haskell-backend/stacklock2nix";
     };
-    nixpkgs.follows = "haskell-backend/nixpkgs";
+    nixpkgs.follows = "llvm-backend/nixpkgs";
     flake-utils.url = "github:numtide/flake-utils";
     llvm-backend = {
       url = "github:runtimeverification/llvm-backend";
-      inputs.nixpkgs.follows = "haskell-backend/nixpkgs";
       inputs.utils.follows = "flake-utils";
     };
     rv-utils.url = "github:runtimeverification/rv-nix-tools";

diff --git a/nix/k.nix b/nix/k.nix
@@ -1,6 +1,6 @@
 { src, maven, mvnHash, manualMvnArtifacts, clang, stdenv, lib, runCommand
 , makeWrapper, bison, flex, gcc, git, gmp, jdk, jre, jre_minimal, mpfr, ncurses
-, pkgconfig, python3, z3, haskell-backend, booster, prelude-kore, llvm-backend
+, pkg-config, python3, z3, haskell-backend, booster, prelude-kore, llvm-backend
 , debugger, version, llvm-kompile-libs, runtimeShell }:
 
 let
@@ -19,7 +19,7 @@ let
       }))
     mpfr
     ncurses
-    pkgconfig
+    pkg-config
     python3
     z3
     haskell-backend