From c2c19cbcfddda2b66c9c885699e0b3fe42e0499a Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Thu, 18 Sep 2025 19:20:08 +0200 Subject: [PATCH] hadolint: drop released patch --- .../haskell-modules/configuration-common.nix | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index f1c61550e674..440d866cba06 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -2355,20 +2355,9 @@ with haskellLib; doJailbreak ]; - # Allow building with language-docker >= 13 (!); waiting for 2.13 release. - hadolint = doJailbreak ( - appendPatches [ - (pkgs.fetchpatch { - name = "hadolint-language-docker-12.patch"; - url = "https://github.com/hadolint/hadolint/commit/593ccde5af13c9b960b3ea815c47ce028a2e8adc.patch"; - sha256 = "07v5c1k8if72j04m017jpsf7gvc5kwyi1q3a532n0zhxqc7w1zjn"; - includes = [ - "**/DL3011.hs" - "**/DL3011Spec.hs" - ]; - }) - ] super.hadolint - ); + # 2025-09-18: ilist >=0.3.1 && <0.4, optparse-applicative >=0.19.0 && <0.20 + # https://github.com/hadolint/hadolint/issues/1127 + hadolint = doJailbreak super.hadolint; # Too strict lower bounds on (test) deps # https://github.com/phadej/puresat/issues/6