From 87762c126aed3124989a4dfd98b24d0581b4534d Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Fri, 28 Feb 2020 15:18:21 -0800 Subject: [PATCH] shellcheck: fix build --- .../haskell-modules/configuration-common.nix | 11 +++++++++++ .../haskell-modules/configuration-hackage2nix.yaml | 1 - pkgs/development/haskell-modules/hackage-packages.nix | 1 - 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index d0af64c59860..b39b454b1d53 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -48,6 +48,17 @@ self: super: { # Needs older QuickCheck version attoparsec-varword = dontCheck super.attoparsec-varword; + ShellCheck = overrideCabal super.ShellCheck (drv: { + patches = [ + # cabal 3.0 support + ( pkgs.fetchpatch { + url = "https://github.com/koalaman/shellcheck/commit/2c026f1ec7c205c731ff2a0ccd85365f37245.patch"; + sha256 = "0z6yf350ngr6rwfkvdy670c476fgzj8a0n4ppdm1xr8r1lij7sfz"; + excludes = [ "Dockerfile" ]; + }) + ]; + }); + # Tests are failing # https://github.com/bos/statistics/issues/123 statistics = dontCheck super.statistics; diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index 2b95625ad5e1..06acf07ad79e 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -9248,7 +9248,6 @@ broken-packages: - Shellac-editline - Shellac-haskeline - Shellac-readline - - ShellCheck - shellish - shellmate - shellmate-extras diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 639e73e84a36..7425f9e784d7 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -17899,7 +17899,6 @@ self: { description = "Shell script analysis tool"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "Shellac" = callPackage