haskell.packages.ghc9{2,4}.primitive-addr: lift bounds over downgrading

The lower base bound is actually not justified and we can just continue
using the default version of primitive addr like we do for GHC < 9.0.

This commit partially reverts 908f4e078955b61031328022d01405e557ccbc04.

4 files changed, 4 insertions, 19 deletions

diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix
index f0a7ab4e535cd..bbeea9da65076 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix
@@ -76,7 +76,8 @@ self: super: {
   hashable = addBuildDepends [ self.data-array-byte ] super.hashable;
   primitive = addBuildDepends [ self.data-array-byte ] super.primitive;
   primitive-unlifted = super.primitive-unlifted_0_1_3_1;
-  primitive-addr = super.primitive-addr_0_1_0_2;
+  # Too strict lower bound on base
+  primitive-addr = doJailbreak super.primitive-addr;
 
   # Jailbreaks & Version Updates
   hashable-time = doJailbreak super.hashable-time;
diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix
index 342f3d41cf7cd..de5f883e5f4be 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix
@@ -138,5 +138,6 @@ in {
     self.OneTuple
   ] super.base-compat-batteries;
 
-  primitive-addr = self.primitive-addr_0_1_0_2;
+  # Too strict lower bound on base
+  primitive-addr = doJailbreak super.primitive-addr;
 }
diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml
index 0fb11e5d839bd..1f992210feb34 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml
@@ -89,7 +89,6 @@ extra-packages:
   - fourmolu == 0.14.0.0                # 2023-11-13: for ghc-lib-parser 9.6 compat
   - ormolu == 0.5.2.0                   # 2023-08-08: for hls on ghc 9.0 and 9.2
   - ormolu == 0.7.2.0                   # 2023-11-13: for ghc-lib-parser 9.6 compat
-  - primitive-addr < 0.1.0.3            # 2024-03-20: for hls on ghc < 9.4.7
   - primitive-unlifted == 0.1.3.1       # 2024-03-16: Needed for hls on ghc 9.2
   - path == 0.9.0                       # 2021-12-03: path version building with stackage genvalidity and GHC 9.0.2
   - resolv < 0.2                        # required to build cabal-install-3.10.1.0 with Stackage LTS 21
diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index a9ee8c83b2176..13bc47047c6ee 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -241451,20 +241451,6 @@ self: {
        hydraPlatforms = lib.platforms.none;
      }) {};
 
-  "primitive-addr_0_1_0_2" = callPackage
-    ({ mkDerivation, base, primitive }:
-     mkDerivation {
-       pname = "primitive-addr";
-       version = "0.1.0.2";
-       sha256 = "06r1p56wm8rbjxnlaqbmc3rbsj1rsv5scwnh80lsn0xw56jc70a2";
-       revision = "2";
-       editedCabalFile = "1s18b6xm6906ldj8wd2b2j885xbgvf5mzabd4mpl1ic7a9205qgn";
-       libraryHaskellDepends = [ base primitive ];
-       description = "Addresses to unmanaged memory";
-       license = lib.licenses.bsd3;
-       hydraPlatforms = lib.platforms.none;
-     }) {};
-
   "primitive-addr" = callPackage
     ({ mkDerivation, base, primitive }:
      mkDerivation {
@@ -308840,8 +308826,6 @@ self: {
        ];
        description = "Tools for writing better type errors";
        license = lib.licenses.bsd3;
-       hydraPlatforms = lib.platforms.none;
-       broken = true;
      }) {};
 
   "type-errors-pretty" = callPackage