Workarounds for haskell.nix bugs re pre-installed packages

Co-authored-by: Hamish Mackenzie <[email protected]> Co-authored-by: Alexander Esgen <[email protected]>
IntersectMBO · Jun 19, 2024 · 6eb84a8 · 6eb84a8
1 parent f58ddee
commit 6eb84a8
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 26 deletions.
diff --git a/cabal.project b/cabal.project
@@ -36,3 +36,10 @@ import: ./asserts.cabal
 if(os(windows))
   constraints:
     bitvec -simd
+
+-- Workaround for a haskell.nix bug around pre-installed libraries. Might be
+-- fixed by https://github.com/input-output-hk/haskell.nix/pull/2218.
+extra-packages: Cabal
+if os(windows)
+  constraints: time ^>=1.14
+  allow-newer: *:time
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -12,9 +12,7 @@
     nixpkgs.follows = "haskellNix/nixpkgs-unstable";
     flake-utils.url = "github:numtide/flake-utils";
     haskellNix = {
-      # temporarily use the static-nix-tools branch until it's merged to work
-      # aroundt he Cabal build issues.
-      url = "github:input-output-hk/haskell.nix/static-nix-tools";
+      url = "github:input-output-hk/haskell.nix";
       inputs.hackage.follows = "hackageNix";
     };
     hackageNix = {