Skip to content

Commit b95d648

Browse files
committed
Remove os-string flag workaround that should not be needed any more
1 parent ceab542 commit b95d648

File tree

1 file changed

+0
-9
lines changed

1 file changed

+0
-9
lines changed

modules/configuration-nix.nix

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -169,15 +169,6 @@ in addPackageKeys {
169169
packages.ghci.flags.ghci = true;
170170
packages.ghci.flags.internal-interpreter = true;
171171

172-
# These flags are set by hadrian. This would be fine if:
173-
# * Haskell.nix respected `pre-existing` packages in `plan.json` and used the hadrian built version.
174-
# * If `plan.json` included the flag settings used by `pre-existing` packages.
175-
# For now the work around is to set the flags that hadrian does (see hadrian/src/Settings/Packages.hs).
176-
packages.unix.flags = pkgs.lib.optionalAttrs (builtins.compareVersions config.compiler.version "9.9" > 0) { os-string = true; };
177-
packages.directory.flags = pkgs.lib.optionalAttrs (builtins.compareVersions config.compiler.version "9.9" > 0) { os-string = true; };
178-
packages.Win32.flags = pkgs.lib.optionalAttrs (builtins.compareVersions config.compiler.version "9.9" > 0) { os-string = true; };
179-
packages.hashable.flags = pkgs.lib.optionalAttrs (builtins.compareVersions config.compiler.version "9.9" > 0) { os-string = true; };
180-
181172
# See https://github.com/Bodigrim/bitvec/pull/61
182173
packages.bitvec.patches = [
183174
(fromUntil "1.1.3.0" "1.1.3.0.1" ../patches/bitvec-gmp-fix.patch)

0 commit comments

Comments
 (0)