From 0c2ff42913035c83d56b53aeafd24b39b31d4152 Mon Sep 17 00:00:00 2001
From: sternenseemann <sternenseemann@systemli.org>
Date: Thu, 4 Jan 2024 12:10:25 +0100
Subject: [PATCH] haskellPackages.cabal2nix-unstable: 2023-11-02 -> 2024-01-02

See https://github.com/NixOS/cabal2nix/pull/611 for discussion.

While we're changing things, let's also use the tzdata setupHook for
haskellPackages.tz.
---
 pkgs/development/haskell-modules/cabal2nix-unstable.nix | 6 +++---
 pkgs/development/haskell-modules/configuration-nix.nix  | 5 ++---
 pkgs/development/haskell-modules/hackage-packages.nix   | 1 -
 3 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/haskell-modules/cabal2nix-unstable.nix b/pkgs/development/haskell-modules/cabal2nix-unstable.nix
index d329664dddfa..32810d85c54d 100644
--- a/pkgs/development/haskell-modules/cabal2nix-unstable.nix
+++ b/pkgs/development/haskell-modules/cabal2nix-unstable.nix
@@ -8,10 +8,10 @@
 }:
 mkDerivation {
   pname = "cabal2nix";
-  version = "unstable-2023-11-02";
+  version = "unstable-2024-01-02";
   src = fetchzip {
-    url = "https://github.com/NixOS/cabal2nix/archive/2099a1f4594f621bb1a2879b793b860aefe4c027.tar.gz";
-    sha256 = "11j1lzjanhmdkqwnb7hni3wxiixl7fzxk6d633cn7ybr7b8wra9s";
+    url = "https://github.com/NixOS/cabal2nix/archive/3f23ae1dda9a5bbe5f560e3cfe521efc9675f668.tar.gz";
+    sha256 = "12vlqiga5lmr38cf92khrk5f2r68swh5plxmbarqlc4bvw93prb3";
   };
   postUnpack = "sourceRoot+=/cabal2nix; echo source root reset to $sourceRoot";
   isLibrary = true;
diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix
index dd996ada782c..7a5666fcfb0d 100644
--- a/pkgs/development/haskell-modules/configuration-nix.nix
+++ b/pkgs/development/haskell-modules/configuration-nix.nix
@@ -447,9 +447,8 @@ self: super: builtins.intersectAttrs super {
   mime-mail = appendConfigureFlag "--ghc-option=-DMIME_MAIL_SENDMAIL_PATH=\"sendmail\"" super.mime-mail;
 
   # Help the test suite find system timezone data.
-  tz = overrideCabal (drv: {
-    preConfigure = "export TZDIR=${pkgs.tzdata}/share/zoneinfo";
-  }) super.tz;
+  tz = addBuildDepends [ pkgs.tzdata ] super.tz;
+  tzdata = addBuildDepends [ pkgs.tzdata ] super.tzdata;
 
   # https://hydra.nixos.org/build/128665302/nixlog/3
   # Disable tests because they require a running dbus session
diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 251545c0e504..e0ab0eb89f8a 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -311214,7 +311214,6 @@ self: {
        benchmarkHaskellDepends = [
          base criterion lens thyme time timezone-olson timezone-series
        ];
-       preConfigure = "export TZDIR=${pkgs.tzdata}/share/zoneinfo";
        description = "Efficient time zone handling";
        license = lib.licenses.asl20;
        maintainers = [ lib.maintainers.maralorn ];