Skip to content

Commit ce1f737

Browse files
committed
Implement suggestion for bazel / rules_haskell
From #116 (review)
1 parent 63232fc commit ce1f737

File tree

3 files changed

+7
-4
lines changed

3 files changed

+7
-4
lines changed

nixpkgs

nixpkgs.nix

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,5 +25,5 @@ if builtins.getEnv "STATIC_HASKELL_NIX_CI_NIXPKGS_UNSTABLE_BUILD" == "1"
2525
if builtins.pathExists ./nixpkgs/pkgs
2626
then import ./nixpkgs {}
2727
# Pinned nixpkgs version; should be kept up-to-date with our submodule.
28-
# This is nixos-21.11 as of 2021-12-15.
29-
else import (fetchTarball https://github.com/NixOS/nixpkgs/archive/573095944e7c1d58d30fc679c81af63668b54056.tar.gz) {}
28+
# This is nixos-23.05 as of 2023-06-08, with minimal patches currently having open nixpkgs PR (see commits for PR links).
29+
else import (fetchTarball https://github.com/nh2/nixpkgs/archive/9e49f8f1f37bc906cda1adb33064c325d760819a.tar.gz) {}

survey/default.nix

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1572,7 +1572,10 @@ let
15721572
else ghcPackage.override { enableDwarf = false; }
15731573
)
15741574
(ghcPackage:
1575-
ghcPackage.override { enableRelocatedStaticLibs = useArchiveFilesForTemplateHaskell; }
1575+
ghcPackage.override {
1576+
enableRelocatedStaticLibs = useArchiveFilesForTemplateHaskell;
1577+
enableShared = !useArchiveFilesForTemplateHaskell;
1578+
}
15761579
)
15771580
];
15781581

0 commit comments

Comments
 (0)