diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index fbd7d15251463..102c5f4b74ba4 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -127,34 +127,7 @@ with haskellLib; # to bogus references to some dependencies. overrideCabal ( old: - { - # Ignore unix bound intended to prevent an unix bug on 32bit systems. - # We apply a patch for this issue to the GHC core packages directly. - # See unix-fix-ctimeval-size-32-bit.patch in ../compilers/ghc/common-*.nix - patches = - old.patches or [ ] - ++ - lib.optionals - ( - scope.unix == null - && lib.elem self.ghc.version [ - "9.6.1" - "9.6.2" - "9.6.3" - "9.6.4" - "9.6.5" - "9.6.6" - "9.8.1" - "9.8.2" - "9.8.3" - "9.10.1" - ] - ) - [ - ./patches/cabal-install-3.16-lift-unix-bound.patch - ]; - } - // lib.optionalAttrs (pkgs.stdenv.hostPlatform.isDarwin && pkgs.stdenv.hostPlatform.isAarch64) { + lib.optionalAttrs (pkgs.stdenv.hostPlatform.isDarwin && pkgs.stdenv.hostPlatform.isAarch64) { postInstall = '' ${old.postInstall or ""} remove-references-to -t ${scope.HTTP} "$out/bin/.cabal-wrapped" @@ -529,19 +502,14 @@ with haskellLib; # Fixes compilation for basement on i686 # https://github.com/haskell-foundation/foundation/pull/573 - # Don't apply patch for GHC == 9.2.* on 64bit where it breaks compilation: - # https://github.com/haskell-foundation/foundation/pull/573#issuecomment-1669468867 - basement = appendPatches (lib.optionals - (pkgs.stdenv.hostPlatform.is32bit || lib.versions.majorMinor self.ghc.version != "9.2") - [ - (fetchpatch { - name = "basement-i686-ghc-9.4.patch"; - url = "https://github.com/haskell-foundation/foundation/pull/573/commits/38be2c93acb6f459d24ed6c626981c35ccf44095.patch"; - sha256 = "17kz8glfim29vyhj8idw8bdh3id5sl9zaq18zzih3schfvyjppj7"; - stripLen = 1; - }) - ] - ) super.basement; + basement = appendPatches [ + (fetchpatch { + name = "basement-i686-ghc-9.4.patch"; + url = "https://github.com/haskell-foundation/foundation/pull/573/commits/38be2c93acb6f459d24ed6c626981c35ccf44095.patch"; + sha256 = "17kz8glfim29vyhj8idw8bdh3id5sl9zaq18zzih3schfvyjppj7"; + stripLen = 1; + }) + ] super.basement; # Fixes compilation of memory with GHC >= 9.4 on 32bit platforms # https://github.com/vincenthz/hs-memory/pull/99 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 338f661232ebc..e7f0342aa470f 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix @@ -1,18 +1,6 @@ -{ - config, - pkgs, - haskellLib, -}: - -with haskellLib; - -let - inherit (pkgs.stdenv.hostPlatform) isDarwin; - inherit (pkgs) lib; -in +{ }: self: super: { - # Disable GHC 9.0.x core libraries. array = null; base = null; @@ -42,152 +30,10 @@ self: super: { rts = null; stm = null; template-haskell = null; - # GHC only builds terminfo if it is a native compiler - terminfo = - if pkgs.stdenv.hostPlatform == pkgs.stdenv.buildPlatform then - null - else - doDistribute self.terminfo_0_4_1_7; + terminfo = null; text = null; time = null; transformers = null; unix = null; - # GHC only bundles the xhtml library if haddock is enabled, check if this is - # still the case when updating: https://gitlab.haskell.org/ghc/ghc/-/blob/0198841877f6f04269d6050892b98b5c3807ce4c/ghc.mk#L463 - xhtml = if self.ghc.hasHaddock or true then null else doDistribute self.xhtml_3000_4_0_0; - - # Need the Cabal-syntax-3.6.0.0 fake package for Cabal < 3.8 to allow callPackage and the constraint solver to work - Cabal-syntax = self.Cabal-syntax_3_6_0_0; - # These core package only exist for GHC >= 9.4. The best we can do is feign - # their existence to callPackages, but their is no shim for lower GHC versions. - system-cxx-std-lib = null; - - # Becomes a core package in GHC >= 9.8 - semaphore-compat = doDistribute self.semaphore-compat_1_0_0; - - # Becomes a core package in GHC >= 9.10 - os-string = doDistribute self.os-string_1_0_0; - - # Becomes a core package in GHC >= 9.10, no release compatible with GHC < 9.10 is available - ghc-internal = null; - # Become core packages in GHC >= 9.10, but aren't uploaded to Hackage - ghc-toolchain = null; - ghc-platform = null; - - # Only required for ghc >= 9.2 - nothunks = super.nothunks.override { - wherefrom-compat = null; - }; - - # Needs base-orphans for GHC < 9.8 / base < 4.19 - some = addBuildDepend self.base-orphans super.some; - - # Jailbreaks & Version Updates - - # tar > 0.6 requires os-string which can't be built with bytestring < 0.11 - tar = doDistribute (doJailbreak self.tar_0_6_0_0); - # text-metrics >= 0.3.3 requires GHC2021 - text-metrics = doDistribute self.text-metrics_0_3_2; - - # For GHC < 9.4, some packages need data-array-byte as an extra dependency - primitive = addBuildDepends [ self.data-array-byte ] super.primitive; - # hashable >= 1.5 only supports GHC >= 9.6 / base >= 4.18 - hashable = self.hashable_1_4_7_0; - hashable_1_4_7_0 = - # extra deps for GHC < 9.4 - addBuildDepends - [ - self.data-array-byte - self.base-orphans - ] - # For GHC < 9.2, os-string is not required - (super.hashable_1_4_7_0.override { os-string = null; }); - - # Too strict lower bounds on base - primitive-addr = doJailbreak super.primitive-addr; - - hashable-time = doJailbreak super.hashable-time; - tuple = addBuildDepend self.base-orphans super.tuple; - vector-th-unbox = doJailbreak super.vector-th-unbox; - - ormolu = self.ormolu_0_5_2_0.override { - Cabal-syntax = self.Cabal-syntax_3_8_1_0; - }; - - stylish-haskell = doJailbreak super.stylish-haskell_0_14_4_0; - - doctest = dontCheck super.doctest; - - haskell-language-server = - lib.throwIf config.allowAliases - "haskell-language-server has dropped support for ghc 9.0 in version 2.4.0.0, please use a newer ghc version or an older nixpkgs version" - (markBroken super.haskell-language-server); - - # test suite depends on vcr since hpack >= 0.38.1 which requires GHC2021 - hpack = dontCheck super.hpack; - - # Needs to use ghc-lib due to incompatible GHC - ghc-tags = doDistribute self.ghc-tags_1_5; - - # ghc-lib >= 9.6 and friends no longer build with GHC 9.0 - ghc-lib-parser = doDistribute self.ghc-lib-parser_9_2_8_20230729; - ghc-lib-parser-ex = doDistribute self.ghc-lib-parser-ex_9_2_1_1; - ghc-lib = doDistribute self.ghc-lib_9_2_8_20230729; - - # Test suite sometimes segfaults with GHC 9.0.1 and 9.0.2 - # due to a GHC bug that has been fixed for GHC >= 9.2.2 - # https://github.com/ekmett/reflection/issues/51 krank:ignore-line - # https://gitlab.haskell.org/ghc/ghc/-/issues/21141 krank:ignore-line - reflection = dontCheck super.reflection; - - ghc-api-compat = unmarkBroken super.ghc-api-compat; - - # 2021-09-18: cabal2nix does not detect the need for ghc-api-compat. - hiedb = overrideCabal (old: { - libraryHaskellDepends = old.libraryHaskellDepends ++ [ self.ghc-api-compat ]; - }) super.hiedb; - - # https://github.com/lspitzner/butcher/issues/7 - butcher = doJailbreak super.butcher; - - # Tests require nothunks < 0.3 (conflicting with Stackage) for GHC < 9.8 - aeson = dontCheck super.aeson; - - # 2022-05-31: weeder 2.4.* requires GHC 9.2 - weeder = doDistribute self.weeder_2_3_1; - # Unnecessarily strict upper bound on lens - weeder_2_3_1 = doJailbreak ( - super.weeder_2_3_1.override { - # weeder < 2.6 only supports algebraic-graphs < 0.7 - # We no longer have matching test deps for algebraic-graphs 0.6.1 in the set - algebraic-graphs = dontCheck self.algebraic-graphs_0_6_1; - } - ); - - # Later versions only support GHC >= 9.2 - ghc-exactprint = self.ghc-exactprint_0_6_4; - - retrie = dontCheck self.retrie_1_1_0_0; - - # Needs OneTuple for ghc < 9.2 - binary-orphans = addBuildDepends [ self.OneTuple ] super.binary-orphans; - - hspec-megaparsec = super.hspec-megaparsec_2_2_0; - - # No instance for (Show B.Builder) arising from a use of ‘print’ - http-types = dontCheck super.http-types; - - # Packages which need compat library for GHC < 9.6 - inherit (lib.mapAttrs (_: addBuildDepends [ self.foldable1-classes-compat ]) super) - indexed-traversable - these - ; - base-compat-batteries = addBuildDepends [ - self.foldable1-classes-compat - self.OneTuple - ] super.base-compat-batteries; - OneTuple = addBuildDepends [ - self.foldable1-classes-compat - self.base-orphans - ] super.OneTuple; + xhtml = null; } diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml index a84c439722b1b..8442c27959beb 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml @@ -46,7 +46,6 @@ default-package-overrides: # keep-sorted start skip_lines=1 case=no numeric=yes extra-packages: - - algebraic-graphs < 0.7 # 2023-08-14: Needed for building weeder < 2.6.0 - ansi-wl-pprint >= 0.6 && < 0.7 # 2025-07-07: used by gren <= 0.5.4 - attoparsec == 0.13.* # 2022-02-23: Needed to compile elm for now - Cabal == 3.10.* @@ -54,8 +53,6 @@ extra-packages: - Cabal == 3.14.* - Cabal == 3.16.* # version required for cabal-install and other packages - cabal-add == 0.1 # 2025-09-09: Only needed for hls 2.11 can be removed once we are past it. - - Cabal-syntax == 3.6.* # Dummy package that ensures packages depending on Cabal-syntax can work for Cabal < 3.8 - - Cabal-syntax == 3.8.* # version required for ormolu and fourmolu on ghc 9.0 - Cabal-syntax == 3.10.* - Cabal-syntax == 3.12.* - Cabal-syntax == 3.14.* @@ -64,23 +61,17 @@ extra-packages: - fourmolu == 0.14.0.0 # 2023-11-13: for ghc-lib-parser 9.6 compat - fourmolu == 0.15.0.0 # 2025-09-21: for ghc-lib-parser 9.8 compat - fuzzyset == 0.2.4 # 2023-12-20: Needed for building postgrest > 10 - - ghc-exactprint == 0.6.* # 2022-12-12: needed for GHC < 9.2 - - ghc-exactprint == 1.5.* # 2023-03-30: needed for GHC == 9.2 - ghc-exactprint == 1.6.* # 2023-03-30: needed for GHC == 9.4 - ghc-exactprint == 1.7.* # 2025-03-09: needed for GHC == 9.6 - ghc-exactprint == 1.8.* # 2024-05-20: needed for GHC == 9.8 - ghc-exactprint == 1.9.* # 2024-08-27: needed for GHC == 9.10 - ghc-exactprint == 1.12.* # 2025-10-15: needed for GHC == 9.12 - - ghc-lib == 9.2.* # 2022-02-17: preserve for GHC 9.0 - - ghc-lib == 9.6.* # 2022-02-17: preserve for GHC 9.2, 9.4 + - ghc-lib == 9.6.* # 2022-02-17: preserve for GHC 9.4 - ghc-lib == 9.10.* # 2024-12-30: preserve for GHC 9.10/ghc-tags 1.9 - - ghc-lib-parser == 9.2.* # 2022-02-17: preserve for GHC 9.0 - - ghc-lib-parser == 9.6.* # 2024-05-19: preserve for GHC 9.2, 9.4 + - ghc-lib-parser == 9.6.* # 2024-05-19: preserve for GHC 9.4 - ghc-lib-parser == 9.8.* # 2024-12-26: preserve for GHC 9.6, 9.8 - - ghc-lib-parser-ex == 9.2.* # 2022-07-13: preserve for GHC 9.0 - - ghc-lib-parser-ex == 9.6.* # 2024-05-19: preserve for GHC 9.2, 9.4 + - ghc-lib-parser-ex == 9.6.* # 2024-05-19: preserve for GHC 9.4 - ghc-lib-parser-ex == 9.8.* # 2024-12-26: preserve for GHC 9.6, 9.8 - - ghc-tags == 1.5.* # 2023-02-18: preserve for ghc-lib == 9.2.* - ghc-tags == 1.7.* # 2023-02-18: preserve for ghc-lib == 9.6.* - ghc-tags == 1.8.* # 2023-02-18: preserve for ghc-lib == 9.8.* - ghc-typelits-natnormalise < 0.8 # 2025-09-15: Stackage is stuck at 0.7.10 @@ -95,31 +86,21 @@ extra-packages: - hlint == 3.6.* # 2025-04-14: needed for hls with ghc-lib-parser 9.6 - hlint == 3.8.* # 2025-09-21: needed for hls with ghc-lib-parser 9.8 - hpack == 0.38.1 # 2025-09-18: to match exact version upstream stack-3.7.1 uses - - hspec-megaparsec == 2.2.0 # 2023-11-18: Latest version compatible with ghc 9.0 - language-javascript == 0.7.0.0 # required by purescript - network-run == 0.4.0 # 2024-10-20: for GHC 9.10/network == 3.1.* - - ormolu == 0.5.2.0 # 2023-08-08: preserve for ghc 9.0 - ormolu == 0.7.2.0 # 2023-11-13: for ghc-lib-parser 9.6 compat - ormolu == 0.7.4.0 # 2023-09-21: for ghc-lib-parser 9.8 compat - - os-string == 1.* # 2025-07-30: dummy package we need for pre os-string GHCs - path == 0.9.5 # 2025-09-21: Pin for hls on ghc 9.4 - postgresql-binary < 0.14 # 2025-01-19: Needed for building postgrest - - primitive-unlifted == 0.1.3.1 # 2024-03-16: preserve for ghc 9.2 - - retrie < 1.2.0.0 # 2022-12-30: preserve for ghc < 9.2 - shake-cabal < 0.2.2.3 # 2023-07-01: last version to support Cabal 3.6.* - ShellCheck == 0.9.0 # 2024-03-21: pinned by haskell-ci - simple-get-opt < 0.5 # 2025-05-01: for crux-0.7.2 - - stylish-haskell == 0.14.4.0 # 2022-09-19: preserve for ghc 9.0 - stylish-haskell == 0.14.5.0 # 2025-04-14: needed for hls with ghc-lib 9.6 - stylish-haskell == 0.14.6.0 # 2025-09-21: needed for hls with ghc-lib 9.8 - stylish-haskell == 0.15.0.1 # 2025-04-14: needed for hls with ghc-lib 9.10 - - tar == 0.6.0.0 # 2025-02-08: last version to not require os-string (which can't be built with GHC < 9.2) - tar == 0.6.3.0 # 2025-08-17: last version to not require file-io and directory-ospath-streaming (for GHC < 9.6) - text-builder < 1 # 2025-08-27: Needed for building postgrest - text-builder-dev < 0.4 # 2025-08-27: Needed for building postgrest - - text-metrics < 0.3.3 # 2025-02-08: >= 0.3.3 uses GHC2021 - - weeder == 2.3.* # 2022-05-31: preserve for GHC 9.0.2 - - weeder == 2.4.* # 2023-02-02: preserve for GHC 9.2.* # keep-sorted end # keep-sorted start skip_lines=1 case=no diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 01f0a787925a5..e1ff47ab49fa0 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -6080,68 +6080,6 @@ self: { } ) { }; - Cabal-syntax_3_6_0_0 = callPackage ( - { mkDerivation, Cabal }: - mkDerivation { - pname = "Cabal-syntax"; - version = "3.6.0.0"; - sha256 = "0lcj4g55sj5iv727g7k57pscgyj0fx3smwapm1gmd5qkc3yfa9fa"; - libraryHaskellDepends = [ Cabal ]; - doHaddock = false; - description = "A library for working with .cabal files"; - license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - } - ) { }; - - Cabal-syntax_3_8_1_0 = callPackage ( - { - mkDerivation, - array, - base, - binary, - bytestring, - containers, - deepseq, - directory, - filepath, - mtl, - parsec, - pretty, - text, - time, - transformers, - unix, - }: - mkDerivation { - pname = "Cabal-syntax"; - version = "3.8.1.0"; - sha256 = "03yfk3b2sjmqpxmvx3mj185nifiaqapvc8hmbx4825z0kyqxvs07"; - revision = "3"; - editedCabalFile = "14zm8h7sfawysr9g37in8by8aj1p87fywj83hmshp8n6lrxr6bgd"; - libraryHaskellDepends = [ - array - base - binary - bytestring - containers - deepseq - directory - filepath - mtl - parsec - pretty - text - time - transformers - unix - ]; - description = "A library for working with .cabal files"; - license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - } - ) { }; - Cabal-syntax_3_10_3_0 = callPackage ( { mkDerivation, @@ -59099,47 +59037,6 @@ self: { } ) { }; - algebraic-graphs_0_6_1 = callPackage ( - { - mkDerivation, - array, - base, - containers, - deepseq, - extra, - inspection-testing, - QuickCheck, - transformers, - }: - mkDerivation { - pname = "algebraic-graphs"; - version = "0.6.1"; - sha256 = "168aqkm7mfd4is95qwpyf9k0k95qf5rfnkhq5ydbr74jj4jrhr1d"; - revision = "1"; - editedCabalFile = "1lnzgy3z51jyl1ail3wdd817np84gzi2bplccwzbm72glwbakc5h"; - libraryHaskellDepends = [ - array - base - containers - deepseq - transformers - ]; - testHaskellDepends = [ - array - base - containers - deepseq - extra - inspection-testing - QuickCheck - transformers - ]; - description = "A library for algebraic graph construction and transformation"; - license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - } - ) { }; - algebraic-graphs = callPackage ( { mkDerivation, @@ -258155,139 +258052,6 @@ self: { } ) { }; - ghc-exactprint_0_6_4 = callPackage ( - { - mkDerivation, - base, - bytestring, - containers, - Diff, - directory, - filemanip, - filepath, - free, - ghc, - ghc-boot, - ghc-paths, - HUnit, - mtl, - silently, - syb, - }: - mkDerivation { - pname = "ghc-exactprint"; - version = "0.6.4"; - sha256 = "0a6baza962d4pz2m02hxmh8234i47zkizmwhsy68namr05dmlgpw"; - revision = "1"; - editedCabalFile = "0qil5rlsvxhwrbciixha8mdaw8wfci797n4wcyxn41mr4a4783f5"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base - bytestring - containers - directory - filepath - free - ghc - ghc-boot - ghc-paths - mtl - syb - ]; - testHaskellDepends = [ - base - bytestring - containers - Diff - directory - filemanip - filepath - ghc - ghc-boot - ghc-paths - HUnit - mtl - silently - syb - ]; - description = "ExactPrint for GHC"; - license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - } - ) { }; - - ghc-exactprint_1_5_0 = callPackage ( - { - mkDerivation, - base, - bytestring, - containers, - data-default, - Diff, - directory, - fail, - filemanip, - filepath, - free, - ghc, - ghc-boot, - ghc-paths, - HUnit, - mtl, - ordered-containers, - silently, - syb, - }: - mkDerivation { - pname = "ghc-exactprint"; - version = "1.5.0"; - sha256 = "07m4cg47knrrvpyimnbc0nq9176vkzwwa64b2iqfj6azn6q2hagp"; - revision = "1"; - editedCabalFile = "1v6my8bnhjhw7k3v2q9iwjpz9lj5g6ilvlzdq6svcabxahmzbr2c"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base - bytestring - containers - data-default - directory - fail - filepath - free - ghc - ghc-boot - ghc-paths - mtl - ordered-containers - syb - ]; - testHaskellDepends = [ - base - bytestring - containers - data-default - Diff - directory - fail - filemanip - filepath - ghc - ghc-boot - ghc-paths - HUnit - mtl - ordered-containers - silently - syb - ]; - description = "ExactPrint for GHC"; - license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - } - ) { }; - ghc-exactprint_1_6_1_3 = callPackage ( { mkDerivation, @@ -259137,67 +258901,6 @@ self: { } ) { }; - ghc-lib_9_2_8_20230729 = callPackage ( - { - mkDerivation, - alex, - array, - base, - binary, - bytestring, - containers, - deepseq, - directory, - exceptions, - filepath, - ghc-lib-parser, - ghc-prim, - happy, - hpc, - parsec, - pretty, - process, - rts, - time, - transformers, - unix, - }: - mkDerivation { - pname = "ghc-lib"; - version = "9.2.8.20230729"; - sha256 = "0jxfbzz7w28jcfpd6x5480ml7zp7pza20mr2zqdvzjdidnxqvlml"; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - array - base - binary - bytestring - containers - deepseq - directory - exceptions - filepath - ghc-lib-parser - ghc-prim - hpc - parsec - pretty - process - rts - time - transformers - unix - ]; - libraryToolDepends = [ - alex - happy - ]; - description = "The GHC API, decoupled from GHC versions"; - license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - } - ) { }; - ghc-lib_9_6_7_20250325 = callPackage ( { mkDerivation, @@ -259392,61 +259095,6 @@ self: { } ) { }; - ghc-lib-parser_9_2_8_20230729 = callPackage ( - { - mkDerivation, - alex, - array, - base, - binary, - bytestring, - containers, - deepseq, - directory, - exceptions, - filepath, - ghc-prim, - happy, - parsec, - pretty, - process, - time, - transformers, - unix, - }: - mkDerivation { - pname = "ghc-lib-parser"; - version = "9.2.8.20230729"; - sha256 = "0lk6s6ka0yhqph6wlijlyzgj47r5j7cw6mnn02vgvqdvlmrkwkkl"; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - array - base - binary - bytestring - containers - deepseq - directory - exceptions - filepath - ghc-prim - parsec - pretty - process - time - transformers - unix - ]; - libraryToolDepends = [ - alex - happy - ]; - description = "The GHC API, decoupled from GHC versions"; - license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - } - ) { }; - ghc-lib-parser_9_6_7_20250325 = callPackage ( { mkDerivation, @@ -259619,47 +259267,6 @@ self: { } ) { }; - ghc-lib-parser-ex_9_2_1_1 = callPackage ( - { - mkDerivation, - base, - bytestring, - containers, - directory, - extra, - filepath, - ghc-lib-parser, - tasty, - tasty-hunit, - uniplate, - }: - mkDerivation { - pname = "ghc-lib-parser-ex"; - version = "9.2.1.1"; - sha256 = "01004zsi4d3vd9k1d2ik284z6wnkny48yp5d2y6fi9hgba11d53q"; - libraryHaskellDepends = [ - base - bytestring - containers - ghc-lib-parser - uniplate - ]; - testHaskellDepends = [ - base - directory - extra - filepath - ghc-lib-parser - tasty - tasty-hunit - uniplate - ]; - description = "Algorithms on GHC parse trees"; - license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - } - ) { }; - ghc-lib-parser-ex_9_6_0_2 = callPackage ( { mkDerivation, @@ -260805,63 +260412,6 @@ self: { } ) { }; - ghc-tags_1_5 = callPackage ( - { - mkDerivation, - aeson, - async, - attoparsec, - base, - bytestring, - containers, - deepseq, - directory, - filepath, - ghc-lib, - ghc-paths, - optparse-applicative, - process, - stm, - temporary, - text, - time, - vector, - yaml, - }: - mkDerivation { - pname = "ghc-tags"; - version = "1.5"; - sha256 = "0hscl49qq3lx2a5g6g7g1wa4rl52piizqsykicy1kvi4di7qnyqk"; - isLibrary = false; - isExecutable = true; - executableHaskellDepends = [ - aeson - async - attoparsec - base - bytestring - containers - deepseq - directory - filepath - ghc-lib - ghc-paths - optparse-applicative - process - stm - temporary - text - time - vector - yaml - ]; - description = "Utility for generating ctags and etags with GHC API"; - license = lib.licenses.mpl20; - hydraPlatforms = lib.platforms.none; - mainProgram = "ghc-tags"; - } - ) { }; - ghc-tags_1_7 = callPackage ( { mkDerivation, @@ -355548,37 +355098,6 @@ self: { } ) { }; - hspec-megaparsec_2_2_0 = callPackage ( - { - mkDerivation, - base, - containers, - hspec, - hspec-expectations, - megaparsec, - }: - mkDerivation { - pname = "hspec-megaparsec"; - version = "2.2.0"; - sha256 = "0hyf06gzzqd6sqd76crwxycwgx804sd39z7i0c2vmv1qgsxv82gn"; - libraryHaskellDepends = [ - base - containers - hspec-expectations - megaparsec - ]; - testHaskellDepends = [ - base - hspec - hspec-expectations - megaparsec - ]; - description = "Utility functions for testing Megaparsec parsers with Hspec"; - license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - } - ) { }; - hspec-megaparsec = callPackage ( { mkDerivation, @@ -497455,94 +496974,6 @@ self: { } ) { }; - ormolu_0_5_2_0 = callPackage ( - { - mkDerivation, - ansi-terminal, - array, - base, - binary, - bytestring, - Cabal-syntax, - containers, - Diff, - directory, - dlist, - file-embed, - filepath, - ghc-lib-parser, - gitrev, - hspec, - hspec-discover, - hspec-megaparsec, - megaparsec, - MemoTrie, - mtl, - optparse-applicative, - path, - path-io, - QuickCheck, - syb, - temporary, - text, - }: - mkDerivation { - pname = "ormolu"; - version = "0.5.2.0"; - sha256 = "1ai2wza4drirvf9pb7qsf03kii5jiayqs49c19ir93jd0ak9pi96"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - ansi-terminal - array - base - binary - bytestring - Cabal-syntax - containers - Diff - directory - dlist - file-embed - filepath - ghc-lib-parser - megaparsec - MemoTrie - mtl - syb - text - ]; - executableHaskellDepends = [ - base - containers - filepath - ghc-lib-parser - gitrev - optparse-applicative - text - ]; - testHaskellDepends = [ - base - containers - directory - filepath - ghc-lib-parser - hspec - hspec-megaparsec - path - path-io - QuickCheck - temporary - text - ]; - testToolDepends = [ hspec-discover ]; - description = "A formatter for Haskell source code"; - license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - mainProgram = "ormolu"; - } - ) { }; - ormolu_0_7_2_0 = callPackage ( { mkDerivation, @@ -498144,20 +497575,6 @@ self: { } ) { }; - os-string_1_0_0 = callPackage ( - { mkDerivation, filepath }: - mkDerivation { - pname = "os-string"; - version = "1.0.0"; - sha256 = "0znnp88cgbj3r858r2w6mlf2sjg3lxfajyih4bdshs0vgy1dyhr6"; - libraryHaskellDepends = [ filepath ]; - doHaddock = false; - description = "Library for manipulating Operating system strings"; - license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - } - ) { }; - os-string_2_0_8 = callPackage ( { mkDerivation, @@ -540194,38 +539611,6 @@ self: { } ) { }; - primitive-unlifted_0_1_3_1 = callPackage ( - { - mkDerivation, - base, - bytestring, - primitive, - stm, - text-short, - }: - mkDerivation { - pname = "primitive-unlifted"; - version = "0.1.3.1"; - sha256 = "1gilzgclpvz200sybw86nmdm7084nrklscq48cs36qqlgcd0wcwb"; - revision = "1"; - editedCabalFile = "0y3zdwbs1fdzspj1k95jyjrhm7za38gb6ada031bp02ifxbvsvsf"; - libraryHaskellDepends = [ - base - bytestring - primitive - text-short - ]; - testHaskellDepends = [ - base - primitive - stm - ]; - description = "Primitive GHC types with unlifted types inside"; - license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - } - ) { }; - primitive-unlifted = callPackage ( { mkDerivation, @@ -574614,97 +573999,6 @@ self: { } ) { }; - retrie_1_1_0_0 = callPackage ( - { - mkDerivation, - ansi-terminal, - async, - base, - bytestring, - containers, - data-default, - deepseq, - directory, - filepath, - ghc, - ghc-exactprint, - ghc-paths, - haskell-src-exts, - HUnit, - list-t, - mtl, - optparse-applicative, - process, - random-shuffle, - syb, - tasty, - tasty-hunit, - temporary, - text, - transformers, - unordered-containers, - }: - mkDerivation { - pname = "retrie"; - version = "1.1.0.0"; - sha256 = "148d1pl52mac4mz4pl9qmmynjjbzygg4x6vlsyblb268drcjn3f8"; - revision = "1"; - editedCabalFile = "1v2x7n71vvhpybmzqlxg5bqg7ac5zqx1q4ji342xgmy2dfjq29d3"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - ansi-terminal - async - base - bytestring - containers - data-default - directory - filepath - ghc - ghc-exactprint - list-t - mtl - optparse-applicative - process - random-shuffle - syb - text - transformers - unordered-containers - ]; - executableHaskellDepends = [ - base - haskell-src-exts - ]; - testHaskellDepends = [ - base - containers - data-default - deepseq - directory - filepath - ghc - ghc-paths - haskell-src-exts - HUnit - mtl - optparse-applicative - process - syb - tasty - tasty-hunit - temporary - text - unordered-containers - ]; - description = "A powerful, easy-to-use codemodding tool for Haskell"; - license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; - } - ) { }; - retrie = callPackage ( { mkDerivation, @@ -645737,113 +645031,6 @@ self: { } ) { }; - stylish-haskell_0_14_4_0 = callPackage ( - { - mkDerivation, - aeson, - base, - bytestring, - Cabal, - containers, - directory, - file-embed, - filepath, - ghc, - ghc-boot, - ghc-boot-th, - ghc-lib-parser-ex, - HsYAML, - HsYAML-aeson, - HUnit, - mtl, - optparse-applicative, - random, - regex-tdfa, - strict, - syb, - test-framework, - test-framework-hunit, - text, - }: - mkDerivation { - pname = "stylish-haskell"; - version = "0.14.4.0"; - sha256 = "0y0vfz5vkvw0wzcsw2ym3nix0v3pwjw2vas0qv3lrhdvn3ba9gb7"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson - base - bytestring - Cabal - containers - directory - file-embed - filepath - ghc - ghc-boot - ghc-boot-th - ghc-lib-parser-ex - HsYAML - HsYAML-aeson - mtl - regex-tdfa - syb - text - ]; - executableHaskellDepends = [ - aeson - base - bytestring - Cabal - containers - directory - file-embed - filepath - ghc - ghc-boot - ghc-boot-th - ghc-lib-parser-ex - HsYAML - HsYAML-aeson - mtl - optparse-applicative - regex-tdfa - strict - syb - text - ]; - testHaskellDepends = [ - aeson - base - bytestring - Cabal - containers - directory - file-embed - filepath - ghc - ghc-boot - ghc-boot-th - ghc-lib-parser-ex - HsYAML - HsYAML-aeson - HUnit - mtl - random - regex-tdfa - syb - test-framework - test-framework-hunit - text - ]; - description = "Haskell code prettifier"; - license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - mainProgram = "stylish-haskell"; - } - ) { }; - stylish-haskell_0_14_5_0 = callPackage ( { mkDerivation, @@ -658741,72 +657928,6 @@ self: { } ) { }; - tar_0_6_0_0 = callPackage ( - { - mkDerivation, - array, - base, - bytestring, - containers, - deepseq, - directory, - file-embed, - filepath, - QuickCheck, - tasty, - tasty-bench, - tasty-quickcheck, - temporary, - time, - }: - mkDerivation { - pname = "tar"; - version = "0.6.0.0"; - sha256 = "11hr2p0lrdkklvn7yf85cqhyzq4ax2lxsfg0rljakkrpnn7s0n44"; - libraryHaskellDepends = [ - array - base - bytestring - containers - deepseq - directory - filepath - time - ]; - testHaskellDepends = [ - array - base - bytestring - containers - deepseq - directory - file-embed - filepath - QuickCheck - tasty - tasty-quickcheck - temporary - time - ]; - benchmarkHaskellDepends = [ - array - base - bytestring - containers - deepseq - directory - filepath - tasty-bench - temporary - time - ]; - doHaddock = false; - description = "Reading, writing and manipulating \".tar\" archive files."; - license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - } - ) { }; - tar_0_6_3_0 = callPackage ( { mkDerivation, @@ -670070,50 +669191,6 @@ self: { } ) { }; - text-metrics_0_3_2 = callPackage ( - { - mkDerivation, - base, - containers, - criterion, - deepseq, - hspec, - QuickCheck, - text, - vector, - weigh, - }: - mkDerivation { - pname = "text-metrics"; - version = "0.3.2"; - sha256 = "0vl3vnm7xhy2zwcx1m293gp64q5sxfa3vmzdaqnqmjgby6l31mxx"; - revision = "4"; - editedCabalFile = "1blvnlylfs5s91q4n48la7pcl2sz5gajmjdx9jagcml5nmsnirqq"; - libraryHaskellDepends = [ - base - containers - text - vector - ]; - testHaskellDepends = [ - base - hspec - QuickCheck - text - ]; - benchmarkHaskellDepends = [ - base - criterion - deepseq - text - weigh - ]; - description = "Calculate various string metrics efficiently"; - license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - } - ) { }; - text-metrics = callPackage ( { mkDerivation, @@ -723637,126 +722714,6 @@ self: { } ) { }; - 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; - mainProgram = "weeder"; - maintainers = [ lib.maintainers.maralorn ]; - } - ) { }; - - weeder_2_4_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.4.1"; - sha256 = "1z17w8q0s1pgqrxx7f1zijy1j4fwl8x2f5r9y11i0vcsqlx12pi9"; - 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; - mainProgram = "weeder"; - maintainers = [ lib.maintainers.maralorn ]; - } - ) { }; - weeder = callPackage ( { mkDerivation, diff --git a/pkgs/development/haskell-modules/patches/cabal-install-3.16-lift-unix-bound.patch b/pkgs/development/haskell-modules/patches/cabal-install-3.16-lift-unix-bound.patch deleted file mode 100644 index b4d7c553baffd..0000000000000 --- a/pkgs/development/haskell-modules/patches/cabal-install-3.16-lift-unix-bound.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/cabal-install.cabal -+++ b/cabal-install.cabal -@@ -275,7 +275,7 @@ - , directory >=1.3.1.0 - else - build-depends: -- , unix >= 2.5 && < 2.8 || >= 2.8.6.0 && < 2.9 -+ , unix >= 2.5 && < 2.9 - - if flag(lukko) - build-depends: diff --git a/pkgs/development/haskell-modules/patches/encoding-Cabal-2.0.patch b/pkgs/development/haskell-modules/patches/encoding-Cabal-2.0.patch deleted file mode 100644 index 510e450945b89..0000000000000 --- a/pkgs/development/haskell-modules/patches/encoding-Cabal-2.0.patch +++ /dev/null @@ -1,67 +0,0 @@ -From 67bb87ceff53f0178c988dd4e15eeb2daee92b84 Mon Sep 17 00:00:00 2001 -From: Gregor Kleen -Date: Tue, 20 Feb 2018 17:46:24 +0100 -Subject: [PATCH] Relax upper version bounds on dependencies - ---- - Setup.hs | 20 ++++++++++++++++---- - encoding.cabal | 4 ++-- - stack.yaml | 4 ++-- - 3 files changed, 20 insertions(+), 8 deletions(-) - -diff --git a/Setup.hs b/Setup.hs -index de719e6..fe5b84c 100644 ---- a/Setup.hs -+++ b/Setup.hs -@@ -1,13 +1,25 @@ -+{-# LANGUAGE CPP #-} -+ - module Main where - - import Distribution.Simple - import Data.Encoding.Preprocessor.Mapping - import Data.Encoding.Preprocessor.XMLMappingBuilder - -+#if MIN_VERSION_Cabal(2,0,0) -+main = defaultMainWithHooks (simpleUserHooks -+ {hookedPreProcessors = ( ("mapping" , \_ _ _ -> mappingPreprocessor) -+ : ("mapping2", \_ _ _ -> mappingPreprocessor) -+ : ("xml" , \_ _ _ -> xmlPreprocessor) -+ : (hookedPreProcessors simpleUserHooks) -+ ) -+ }) -+#else - main = defaultMainWithHooks (simpleUserHooks -- {hookedPreProcessors = (("mapping",\_ _ -> mappingPreprocessor) -- :("mapping2",\_ _ -> mappingPreprocessor) -- :("xml",\_ _ -> xmlPreprocessor) -- :(hookedPreProcessors simpleUserHooks) -+ {hookedPreProcessors = ( ("mapping" , \_ _ -> mappingPreprocessor) -+ : ("mapping2", \_ _ -> mappingPreprocessor) -+ : ("xml" , \_ _ -> xmlPreprocessor) -+ : (hookedPreProcessors simpleUserHooks) - ) - }) -+#endif -diff --git a/encoding.cabal b/encoding.cabal -index ec20617..f221715 100644 ---- a/encoding.cabal -+++ b/encoding.cabal -@@ -36,7 +36,7 @@ Source-Repository this - - Custom-Setup - Setup-Depends: base >=3 && <5, -- Cabal >=1.24 && <1.25, -+ Cabal >=1.24 && <2.1, - containers, - filepath, - ghc-prim, -@@ -51,7 +51,7 @@ Library - extensible-exceptions >=0.1 && <0.2, - ghc-prim >=0.3 && <0.6, - mtl >=2.0 && <2.3, -- regex-compat >=0.71 && <0.95 -+ regex-compat >=0.71 && <0.96 - - Extensions: CPP -