From e689b329c3ac130304132ccb9a4be120593f4254 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Tue, 28 Apr 2020 11:09:30 +1000 Subject: [PATCH] haskellPackages.hadolint: mark unbroken, remove override --- .../haskell-modules/configuration-hackage2nix.yaml | 1 - pkgs/development/haskell-modules/configuration-nix.nix | 5 ----- 2 files changed, 6 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index 1f090fd7b45..ee234efb376 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -5338,7 +5338,6 @@ broken-packages: - haddock-leksah - haddock-test - haddocset - - hadolint - hadoop-formats - hadoop-rpc - hadoop-tools diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index 817037e1e43..78e44a5ec87 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -628,11 +628,6 @@ self: super: builtins.intersectAttrs super { http-download = dontCheck super.http-download; pantry = dontCheck super.pantry; - # Hadolint wants to build a statically linked binary by default. - hadolint = overrideCabal super.hadolint (drv: { - preConfigure = "sed -i -e /ld-options:/d hadolint.cabal"; - }); - # gtk2hs-buildtools is listed in setupHaskellDepends, but we # need it during the build itself, too. cairo = addBuildTool super.cairo self.buildHaskellPackages.gtk2hs-buildtools;