Better fix for os-string

Author: hamishmack

modules/configuration-nix.nix

@@ -168,6 +168,14 @@ in {
   packages.ghci.flags.ghci = true;
   packages.ghci.flags.internal-interpreter = true;
 
+  # These flags are set by hadrian.  This would be fine if:
+  # * Haskell.nix respected `pre-existing` packages in `plan.json` and used the hadrian built version.
+  # * If `plan.json` included the flag settings used by `pre-existing` packages.
+  # For now the work around is to set the flags that hadrian does (see hadrian/src/Settings/Packages.hs).
+  packages.unix.flags      = pkgs.lib.optionalAttrs (builtins.compareVersions config.compiler.version "9.9" > 0) { os-string = true; };
+  packages.directory.flags = pkgs.lib.optionalAttrs (builtins.compareVersions config.compiler.version "9.9" > 0) { os-string = true; };
+  packages.win32.flags     = pkgs.lib.optionalAttrs (builtins.compareVersions config.compiler.version "9.9" > 0) { os-string = true; };
+
   # See https://github.com/Bodigrim/bitvec/pull/61
   packages.bitvec.patches = [
     (fromUntil "1.1.3.0" "1.1.3.0.1" ../patches/bitvec-gmp-fix.patch)

test/cabal.project.local

@@ -6,7 +6,6 @@ if impl(ghc>=9.8)
   allow-newer: *:base, *:template-haskell, *:bytestring, *:text, *:ghc-prim, *:deepseq, *:Cabal
 if impl(ghc > 9.9)
   allow-newer: *:containers
-  constraints: os-string >=2.0.2
 
 repository head.hackage.ghc.haskell.org
   url: https://ghc.gitlab.haskell.org/head.hackage/