diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix index db38ebd8b708..127f3225c297 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix @@ -130,4 +130,7 @@ self: super: { inline-c-cpp = (if isDarwin then appendConfigureFlags ["--ghc-option=-fcompact-unwind"] else x: x) super.inline-c-cpp; + + # 2022-05-31: weeder 2.3.0 requires GHC 9.2 + weeder = doDistribute self.weeder_2_3_1; } diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml index d295ad3d63df..15d16ff2307d 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml @@ -124,6 +124,7 @@ extra-packages: - ormolu == 0.2.* # 2022-02-21: For ghc 8.8 and 8.10 - ShellCheck == 0.7.2 # 2022-02-20: haskell-ci 0.14 needs this - weeder == 2.2.* # 2022-02-21: preserve for GHC 8.10.7 + - weeder == 2.3.* # 2022-05-31: preserve for GHC 9.0.2 - attoparsec == 0.13.* # 2022-02-23: Needed to compile elm for now - relude == 0.7.0.0 # 2022-02-25: Needed for ema 0.6 - SVGFonts < 1.8 # 2022-03-19: Needed for Chart-diagrams 1.9.3 diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index e77a614b27bf..61a3763d6b1b 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -295834,6 +295834,32 @@ self: { maintainers = with lib.maintainers; [ maralorn ]; }) {}; + "weeder_2_3_1" = callPackage + ({ mkDerivation, algebraic-graphs, base, bytestring, containers + , dhall, directory, filepath, generic-lens, ghc, lens, mtl + , optparse-applicative, regex-tdfa, text, transformers + }: + mkDerivation { + pname = "weeder"; + version = "2.3.1"; + sha256 = "16hgfhchmnp32wvcx9r464azycvdq1gsjmnjmnw995y9cp27ayy1"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + algebraic-graphs base bytestring containers dhall directory + filepath generic-lens ghc lens mtl optparse-applicative regex-tdfa + text transformers + ]; + executableHaskellDepends = [ + base bytestring containers directory filepath ghc + optparse-applicative transformers + ]; + description = "Detect dead code"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + maintainers = with lib.maintainers; [ maralorn ]; + }) {}; + "weeder" = callPackage ({ mkDerivation, algebraic-graphs, base, bytestring, containers , dhall, directory, filepath, generic-lens, ghc, lens, mtl