Implement suggestion for bazel / rules_haskell

From #116 (review)
nh2 · Jul 13, 2023 · 514540c · 514540c
1 parent 64576d5
commit 514540c
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/nixpkgs b/nixpkgs
diff --git a/nixpkgs.nix b/nixpkgs.nix
@@ -25,5 +25,5 @@ if builtins.getEnv "STATIC_HASKELL_NIX_CI_NIXPKGS_UNSTABLE_BUILD" == "1"
     if builtins.pathExists ./nixpkgs/pkgs
       then import ./nixpkgs {}
       # Pinned nixpkgs version; should be kept up-to-date with our submodule.
-      # This is nixos-21.11 as of 2021-12-15.
-      else import (fetchTarball https://github.com/NixOS/nixpkgs/archive/573095944e7c1d58d30fc679c81af63668b54056.tar.gz) {}
+      # This is nixos-23.05 as of 2023-06-08, with minimal patches currently having open nixpkgs PR (see commits for PR links).
+      else import (fetchTarball https://github.com/nh2/nixpkgs/archive/9e49f8f1f37bc906cda1adb33064c325d760819a.tar.gz) {}
diff --git a/survey/default.nix b/survey/default.nix
@@ -1572,7 +1572,10 @@ let
         else ghcPackage.override { enableDwarf = false; }
     )
     (ghcPackage:
-      ghcPackage.override { enableRelocatedStaticLibs = useArchiveFilesForTemplateHaskell; }
+      ghcPackage.override {
+        enableRelocatedStaticLibs = useArchiveFilesForTemplateHaskell;
+        enableShared = !useArchiveFilesForTemplateHaskell;
+       }
     )
   ];