haskellPackages.base-compat{,batteries}: 0.12.2 -> 0.12.3

Building base-compat-batteries-0.12.2 against OneTuple == 0.4.* as we do
for GHC < 9.0 could lead to confusing results for users of
Data.Tuple.Compat. Thankfully upstream has provided a solution they are
satisfied with and released it as 0.12.3 to which we preemptively
upgrade (but it should enter Stackage LTS 21 soon enough)

See https://github.com/haskell-compat/base-compat/pull/92.

This reverts commit 54ebdad42dd5861538de31319206fcef78ec9df5.

3 files changed, 14 insertions, 14 deletions

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index b0bdd476d7f..198e834af1e 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -159,6 +159,18 @@ self: super: {
   ### END HASKELL-LANGUAGE-SERVER SECTION ###
   ###########################################
 
+  base-compat = overrideCabal (drv: {
+    version = assert drv.version == "0.12.2"; "0.12.3";
+    sha256 = "13dcrwihqn57js1ylj9vbw2snx90kfwikanvs1bj77zm22grj9nv";
+    editedCabalFile = null; revision = null;
+  }) super.base-compat;
+
+  base-compat-batteries = overrideCabal (drv: {
+    inherit (self.base-compat) version;
+    sha256 = "1bsz3bi1mnp60p90n5av76knscgssqvphc9f2jy1nhyr6ap7jxi0";
+    editedCabalFile = null; revision = null;
+  }) super.base-compat-batteries;
+
   vector = overrideCabal (old: {
     # Too strict bounds on doctest which isn't used, but is part of the configuration
     jailbreak = true;
diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix
index 0a5e323fe3f..d4d18fd327c 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix
@@ -55,13 +55,7 @@ self: super: {
   system-cxx-std-lib = null;
 
   # Additionally depends on OneTuple for GHC < 9.0
-  # https://github.com/haskell-compat/base-compat/issues/91
-  base-compat-batteries = addBuildDepend self.OneTuple (overrideCabal (drv: {
-    postPatch = ''
-      ${drv.postPatch or ""}
-      sed -i 's/OneTuple >= 0.3 && < 0.4/OneTuple/' *.cabal
-    '';
-  }) super.base-compat-batteries);
+  base-compat-batteries = addBuildDepend self.OneTuple super.base-compat-batteries;
 
   # For GHC < 9.4, some packages need data-array-byte as an extra dependency
   primitive = addBuildDepends [ self.data-array-byte ] super.primitive;
diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
index f899f26562f..ad9b8e5a1d1 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
@@ -61,13 +61,7 @@ self: super: {
   cabal2spec = super.cabal2spec.override { Cabal = self.Cabal_3_2_1_0; };
 
   # Additionally depends on OneTuple for GHC < 9.0
-  # https://github.com/haskell-compat/base-compat/issues/91
-  base-compat-batteries = addBuildDepend self.OneTuple (overrideCabal (drv: {
-    postPatch = ''
-      ${drv.postPatch or ""}
-      sed -i 's/OneTuple >= 0.3 && < 0.4/OneTuple/' *.cabal
-    '';
-  }) super.base-compat-batteries);
+  base-compat-batteries = addBuildDepend self.OneTuple super.base-compat-batteries;
 
   # For GHC < 9.4, some packages need data-array-byte as an extra dependency
   primitive = addBuildDepends [ self.data-array-byte ] super.primitive;