From 2a999490532ab41257605fa888893098be291d8b Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Thu, 7 Aug 2025 14:21:04 +0200 Subject: [PATCH 1/3] haskellPackages.dotenv: allow data-default-class-0.2.0.0 --- pkgs/development/haskell-modules/configuration-common.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 16f9dfef9e68..2dcb7713f6bb 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -821,6 +821,10 @@ with haskellLib; # https://github.com/lierdakil/pandoc-crossref/issues/478 pandoc-crossref = doJailbreak super.pandoc-crossref; + # Too strict upper bound on data-default-class (< 0.2) + # https://github.com/stackbuilders/dotenv-hs/issues/203 + dotenv = doJailbreak super.dotenv; + # 2022-01-29: Tests require package to be in ghc-db. aeson-schemas = dontCheck super.aeson-schemas; From 0947d6fc317136347c6b6c0b53a57e58f1320c92 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Thu, 7 Aug 2025 14:21:32 +0200 Subject: [PATCH 2/3] haskellPackages.dotenv: re-enable test suite --- .../development/haskell-modules/configuration-common.nix | 1 - pkgs/development/haskell-modules/configuration-nix.nix | 9 +++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 2dcb7713f6bb..0d8f4f080934 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -871,7 +871,6 @@ with haskellLib; DigitalOcean = dontCheck super.DigitalOcean; directory-layout = dontCheck super.directory-layout; dom-selector = dontCheck super.dom-selector; # http://hydra.cryp.to/build/497670/log/raw - dotenv = dontCheck super.dotenv; # Tests fail because of missing test file on version 0.8.0.2 fixed on version 0.8.0.4 dotfs = dontCheck super.dotfs; # http://hydra.cryp.to/build/498599/log/raw DRBG = dontCheck super.DRBG; # http://hydra.cryp.to/build/498245/nixlog/1/raw ed25519 = dontCheck super.ed25519; diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index 3db97acdecd8..064a471c49e9 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -756,6 +756,15 @@ builtins.intersectAttrs super { # Break infinite recursion cycle with criterion and network-uri. js-flot = dontCheck super.js-flot; + # Test suite unsets PATH, but wants to be able to run `whoami` + # https://github.com/stackbuilders/dotenv-hs/commit/6125dc2d260c5042f5416c1431882d1c2c91d3c8#issuecomment-3163926427 + dotenv = overrideCabal (drv: { + postPatch = drv.postPatch or "" + '' + substituteInPlace spec/fixtures/.dotenv spec/Configuration/DotenvSpec.hs \ + --replace-fail "whoami" "$(type -p whoami)" + ''; + }) super.dotenv; + # Break infinite recursion cycle between QuickCheck and splitmix. splitmix = dontCheck super.splitmix; splitmix_0_1_1 = dontCheck super.splitmix_0_1_1; From cf670157430334144cd9f029b4730dc5f2a54214 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Wed, 6 Aug 2025 16:02:07 +0200 Subject: [PATCH 3/3] top-level/release-haskell.nix: re-enable vaultenv --- pkgs/development/haskell-modules/configuration-common.nix | 3 --- pkgs/top-level/release-haskell.nix | 2 +- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 0d8f4f080934..0c05a1dcbc8f 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -2816,9 +2816,6 @@ with haskellLib; libraryToolDepends = (drv.libraryToolDepends or [ ]) ++ [ pkgs.buildPackages.git ]; }) super.kmonad; - # 2024-03-17: broken - vaultenv = dontDistribute super.vaultenv; - # 2024-01-24: support optparse-applicative 0.18 niv = appendPatches [ (fetchpatch { diff --git a/pkgs/top-level/release-haskell.nix b/pkgs/top-level/release-haskell.nix index 2238dc9d05ba..fe37492dd6b8 100644 --- a/pkgs/top-level/release-haskell.nix +++ b/pkgs/top-level/release-haskell.nix @@ -378,7 +378,7 @@ let uusi uqm uuagc - # vaultenv: broken by connection on 2024-03-16 + vaultenv xmobar xmonadctl xmonad-with-packages