From a2c86d93f4eab759ecbe72df2e07299b34dfb0c8 Mon Sep 17 00:00:00 2001
From: sternenseemann <sternenseemann@systemli.org>
Date: Mon, 24 Feb 2025 22:46:19 +0100
Subject: [PATCH] hadolint: build with language-docker >= 13

---
 .../haskell-modules/configuration-common.nix  | 13 +++++++----
 .../configuration-hackage2nix/main.yaml       |  1 -
 .../haskell-modules/hackage-packages.nix      | 23 -------------------
 3 files changed, 9 insertions(+), 28 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index b922dcd514ce..846cf1578333 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -2010,10 +2010,15 @@ self: super: {
   # 2025-02-11: Too strict bounds on bytestring
   streamly-bytestring = doJailbreak super.streamly-bytestring;
 
-  # Stackage LTS 19 still has 10.*
-  hadolint = super.hadolint.override {
-    language-docker = self.language-docker_11_0_0;
-  };
+  # 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);
 
   # Too strict lower bounds on (test) deps
   # https://github.com/phadej/puresat/issues/6
diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml
index cf8507e295fc..dd29340796ed 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml
@@ -82,7 +82,6 @@ extra-packages:
   - hspec-discover < 2.8                # 2022-04-07: Needed for tasty-hspec 1.1.6
   - hspec-megaparsec == 2.2.0           # 2023-11-18: Latest version compatible with ghc 9.0, needed for HLS
   - hspec-meta < 2.8                    # 2022-12-07: Needed for elmPackages.elm / hspec-discover
-  - language-docker == 11.0.0           # required by hadolint 2.12.0, 2022-11-16
   - language-javascript == 0.7.0.0      # required by purescript
   - lsp == 2.1.*                        # 2024-02-28: need for dhall-lsp-server
   - lsp-types == 2.1.*                  # 2024-02-28: need for dhall-lsp-server and koka
diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index d6d1fcc43987..76e47e0290ad 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -187751,29 +187751,6 @@ self: {
        mainProgram = "emd";
      }) {};
 
-  "language-docker_11_0_0" = callPackage
-    ({ mkDerivation, base, bytestring, containers, data-default
-     , data-default-class, hspec, hspec-megaparsec, HUnit, megaparsec
-     , prettyprinter, QuickCheck, split, text, time
-     }:
-     mkDerivation {
-       pname = "language-docker";
-       version = "11.0.0";
-       sha256 = "1j8aib6pq7ghmsi3l2p554l8gnapi0jd3qsi8vhdn2mgvw2n1948";
-       libraryHaskellDepends = [
-         base bytestring containers data-default data-default-class
-         megaparsec prettyprinter split text time
-       ];
-       testHaskellDepends = [
-         base bytestring containers data-default data-default-class hspec
-         hspec-megaparsec HUnit megaparsec prettyprinter QuickCheck split
-         text time
-       ];
-       description = "Dockerfile parser, pretty-printer and embedded DSL";
-       license = lib.licenses.gpl3Only;
-       hydraPlatforms = lib.platforms.none;
-     }) {};
-
   "language-docker" = callPackage
     ({ mkDerivation, base, bytestring, containers, data-default
      , data-default-class, hspec, hspec-discover, hspec-megaparsec