haskell.compiler.ghc{947,964,965,966,981,982,983}: drop (#440659)

authored by

Wolfgang Walther and committed by
GitHub
6cd29a47 413fda74

+1 -246
-15
pkgs/development/compilers/ghc/9.4.6-bytestring-posix-source.patch
··· 1 - Make sure that the appropriate feature flags are set when 2 - Rts.h is included, so that clockid_t is defined. 3 - 4 - diff --git a/cbits/is-valid-utf8.c b/cbits/is-valid-utf8.c 5 - index 01b3b41..c69596a 100644 6 - --- a/libraries/bytestring/cbits/is-valid-utf8.c 7 - +++ b/libraries/bytestring/cbits/is-valid-utf8.c 8 - @@ -29,6 +29,7 @@ SUCH DAMAGE. 9 - */ 10 - #pragma GCC push_options 11 - #pragma GCC optimize("-O2") 12 - +#include "rts/PosixSource.h" 13 - #include <stdbool.h> 14 - #include <stddef.h> 15 - #include <stdint.h>
-6
pkgs/development/compilers/ghc/9.4.7.nix
··· 1 - # DO NOT port this expression to hadrian. It is not possible to build a GHC 2 - # cross compiler with 9.4.* and hadrian. 3 - import ./common-make-native-bignum.nix { 4 - version = "9.4.7"; 5 - sha256 = "06775a52b4d13ac09edc6dabc299fd11e59d8886bbcae450af367baee2684c8f"; 6 - }
-4
pkgs/development/compilers/ghc/9.6.4.nix
··· 1 - import ./common-hadrian.nix { 2 - version = "9.6.4"; 3 - sha256 = "10bf25b8b07174fdd9868b5c0c56c17c0ef1edcb6247b4b864be933651bfd4c0"; 4 - }
-4
pkgs/development/compilers/ghc/9.6.5.nix
··· 1 - import ./common-hadrian.nix { 2 - version = "9.6.5"; 3 - sha256 = "87b389924f98c1a26c205122757338c8dab33ad1fcf670faa22622742432b93c"; 4 - }
-4
pkgs/development/compilers/ghc/9.6.6.nix
··· 1 - import ./common-hadrian.nix { 2 - version = "9.6.6"; 3 - sha256 = "008f7a04d89ad10baae6486c96645d7d726aaac7e1476199f6dd86c6bd9977ad"; 4 - }
-4
pkgs/development/compilers/ghc/9.8.1.nix
··· 1 - import ./common-hadrian.nix { 2 - version = "9.8.1"; 3 - sha256 = "b2f8ed6b7f733797a92436f4ff6e088a520913149c9a9be90465b40ad1f20751"; 4 - }
-4
pkgs/development/compilers/ghc/9.8.2.nix
··· 1 - import ./common-hadrian.nix { 2 - version = "9.8.2"; 3 - sha256 = "4vt6fddGEjfSLoNlqD7dnhp30uFdBF85RTloRah3gck="; 4 - }
-4
pkgs/development/compilers/ghc/9.8.3.nix
··· 1 - import ./common-hadrian.nix { 2 - version = "9.8.3"; 3 - sha256 = "99e40d729ec8831a633b75fd85d65dd10e31a0133dec9d198d686a273679ab70"; 4 - }
-11
pkgs/development/compilers/ghc/common-hadrian.nix
··· 274 274 ../../tools/haskell/hadrian/disable-hyperlinked-source-extra-args.patch 275 275 ) 276 276 ] 277 - # Incorrect bounds on Cabal in hadrian 278 - # https://gitlab.haskell.org/ghc/ghc/-/issues/24100 279 - ++ 280 - lib.optionals 281 - (lib.elem version [ 282 - "9.8.1" 283 - "9.8.2" 284 - ]) 285 - [ 286 - ../../tools/haskell/hadrian/hadrian-9.8.1-allow-Cabal-3.10.patch 287 - ] 288 277 ++ lib.optionals (lib.versionAtLeast version "9.8" && lib.versionOlder version "9.12") [ 289 278 (fetchpatch { 290 279 name = "enable-ignore-build-platform-mismatch.patch";
-6
pkgs/development/compilers/ghc/common-make-native-bignum.nix
··· 410 410 }) 411 411 ] 412 412 413 - ++ lib.optionals (version == "9.4.6") [ 414 - # Work around a type not being defined when including Rts.h in bytestring's cbits 415 - # due to missing feature macros. See https://gitlab.haskell.org/ghc/ghc/-/issues/23810. 416 - ./9.4.6-bytestring-posix-source.patch 417 - ] 418 - 419 413 ++ lib.optionals (stdenv.targetPlatform.isDarwin && stdenv.targetPlatform.isAarch64) [ 420 414 # Prevent the paths module from emitting symbols that we don't use 421 415 # when building with separate outputs.
-13
pkgs/development/tools/haskell/hadrian/hadrian-9.8.1-allow-Cabal-3.10.patch
··· 1 - diff --git a/hadrian.cabal b/hadrian.cabal 2 - index 70fded11aa..3893537f05 100644 3 - --- a/hadrian/hadrian.cabal 4 - +++ b/hadrian/hadrian.cabal 5 - @@ -150,7 +150,7 @@ executable hadrian 6 - , TypeOperators 7 - other-extensions: MultiParamTypeClasses 8 - , TypeFamilies 9 - - build-depends: Cabal >= 3.2 && < 3.9 10 - + build-depends: Cabal >= 3.2 && < 3.11 11 - , base >= 4.11 && < 5 12 - , bytestring >= 0.10 && < 0.13 13 - , containers >= 0.5 && < 0.7
-162
pkgs/top-level/haskell-packages.nix
··· 158 158 llvmPackages = pkgs.llvmPackages_12; 159 159 }; 160 160 ghc92 = compiler.ghc928; 161 - ghc947 = callPackage ../development/compilers/ghc/9.4.7.nix { 162 - bootPkgs = 163 - # Building with 9.2 is broken due to 164 - # https://gitlab.haskell.org/ghc/ghc/-/issues/21914 165 - 166 - # No suitable bindists for powerpc64le 167 - if stdenv.buildPlatform.isPower64 && stdenv.buildPlatform.isLittleEndian then 168 - bb.packages.ghc902 169 - else 170 - bb.packages.ghc902Binary; 171 - inherit (buildPackages.python3Packages) sphinx; 172 - # Need to use apple's patched xattr until 173 - # https://github.com/xattr/xattr/issues/44 and 174 - # https://github.com/xattr/xattr/issues/55 are solved. 175 - inherit (buildPackages.darwin) xattr autoSignDarwinBinariesHook; 176 - # Support range >= 10 && < 14 177 - buildTargetLlvmPackages = pkgsBuildTarget.llvmPackages_12; 178 - llvmPackages = pkgs.llvmPackages_12; 179 - }; 180 161 ghc948 = callPackage ../development/compilers/ghc/9.4.8.nix { 181 162 bootPkgs = 182 163 # Building with 9.2 is broken due to ··· 215 196 buildTargetLlvmPackages = pkgsBuildTarget.llvmPackages_15; 216 197 llvmPackages = pkgs.llvmPackages_15; 217 198 }; 218 - ghc964 = callPackage ../development/compilers/ghc/9.6.4.nix { 219 - bootPkgs = 220 - # For GHC 9.2 no armv7l bindists are available. 221 - if stdenv.buildPlatform.isAarch32 then 222 - bb.packages.ghc928 223 - else if stdenv.buildPlatform.isPower64 && stdenv.buildPlatform.isLittleEndian then 224 - bb.packages.ghc928 225 - else 226 - bb.packages.ghc924Binary; 227 - inherit (buildPackages.python3Packages) sphinx; 228 - # Need to use apple's patched xattr until 229 - # https://github.com/xattr/xattr/issues/44 and 230 - # https://github.com/xattr/xattr/issues/55 are solved. 231 - inherit (buildPackages.darwin) xattr autoSignDarwinBinariesHook; 232 - # Support range >= 11 && < 16 233 - buildTargetLlvmPackages = pkgsBuildTarget.llvmPackages_15; 234 - llvmPackages = pkgs.llvmPackages_15; 235 - }; 236 - ghc965 = callPackage ../development/compilers/ghc/9.6.5.nix { 237 - bootPkgs = 238 - # For GHC 9.2 no armv7l bindists are available. 239 - if stdenv.buildPlatform.isAarch32 then 240 - bb.packages.ghc928 241 - else if stdenv.buildPlatform.isPower64 && stdenv.buildPlatform.isLittleEndian then 242 - bb.packages.ghc928 243 - else 244 - bb.packages.ghc924Binary; 245 - inherit (buildPackages.python3Packages) sphinx; 246 - # Need to use apple's patched xattr until 247 - # https://github.com/xattr/xattr/issues/44 and 248 - # https://github.com/xattr/xattr/issues/55 are solved. 249 - inherit (buildPackages.darwin) xattr autoSignDarwinBinariesHook; 250 - # Support range >= 11 && < 16 251 - buildTargetLlvmPackages = pkgsBuildTarget.llvmPackages_15; 252 - llvmPackages = pkgs.llvmPackages_15; 253 - }; 254 - ghc966 = callPackage ../development/compilers/ghc/9.6.6.nix { 255 - bootPkgs = 256 - # For GHC 9.2 no armv7l bindists are available. 257 - if stdenv.buildPlatform.isAarch32 then 258 - bb.packages.ghc928 259 - else if stdenv.buildPlatform.isPower64 && stdenv.buildPlatform.isLittleEndian then 260 - bb.packages.ghc928 261 - else 262 - bb.packages.ghc924Binary; 263 - inherit (buildPackages.python3Packages) sphinx; 264 - # Need to use apple's patched xattr until 265 - # https://github.com/xattr/xattr/issues/44 and 266 - # https://github.com/xattr/xattr/issues/55 are solved. 267 - inherit (buildPackages.darwin) xattr autoSignDarwinBinariesHook; 268 - # Support range >= 11 && < 16 269 - buildTargetLlvmPackages = pkgsBuildTarget.llvmPackages_15; 270 - llvmPackages = pkgs.llvmPackages_15; 271 - }; 272 199 ghc967 = callPackage ../development/compilers/ghc/9.6.7.nix { 273 200 bootPkgs = 274 201 # For GHC 9.2 no armv7l bindists are available. ··· 288 215 llvmPackages = pkgs.llvmPackages_15; 289 216 }; 290 217 ghc96 = compiler.ghc967; 291 - ghc981 = callPackage ../development/compilers/ghc/9.8.1.nix { 292 - bootPkgs = 293 - # For GHC 9.6 no armv7l bindists are available. 294 - if stdenv.buildPlatform.isAarch32 then 295 - bb.packages.ghc963 296 - else if stdenv.buildPlatform.isPower64 && stdenv.buildPlatform.isLittleEndian then 297 - bb.packages.ghc963 298 - else 299 - bb.packages.ghc963Binary; 300 - inherit (buildPackages.python3Packages) sphinx; 301 - # Need to use apple's patched xattr until 302 - # https://github.com/xattr/xattr/issues/44 and 303 - # https://github.com/xattr/xattr/issues/55 are solved. 304 - inherit (buildPackages.darwin) xattr autoSignDarwinBinariesHook; 305 - # Support range >= 11 && < 16 306 - buildTargetLlvmPackages = pkgsBuildTarget.llvmPackages_15; 307 - llvmPackages = pkgs.llvmPackages_15; 308 - }; 309 - ghc982 = callPackage ../development/compilers/ghc/9.8.2.nix { 310 - bootPkgs = 311 - # For GHC 9.6 no armv7l bindists are available. 312 - if stdenv.buildPlatform.isAarch32 then 313 - bb.packages.ghc963 314 - else if stdenv.buildPlatform.isPower64 && stdenv.buildPlatform.isLittleEndian then 315 - bb.packages.ghc963 316 - else 317 - bb.packages.ghc963Binary; 318 - inherit (buildPackages.python3Packages) sphinx; 319 - # Need to use apple's patched xattr until 320 - # https://github.com/xattr/xattr/issues/44 and 321 - # https://github.com/xattr/xattr/issues/55 are solved. 322 - inherit (buildPackages.darwin) xattr autoSignDarwinBinariesHook; 323 - # Support range >= 11 && < 16 324 - buildTargetLlvmPackages = pkgsBuildTarget.llvmPackages_15; 325 - llvmPackages = pkgs.llvmPackages_15; 326 - }; 327 - ghc983 = callPackage ../development/compilers/ghc/9.8.3.nix { 328 - bootPkgs = 329 - # For GHC 9.6 no armv7l bindists are available. 330 - if stdenv.buildPlatform.isAarch32 then 331 - bb.packages.ghc963 332 - else if stdenv.buildPlatform.isPower64 && stdenv.buildPlatform.isLittleEndian then 333 - bb.packages.ghc963 334 - else 335 - bb.packages.ghc963Binary; 336 - inherit (buildPackages.python3Packages) sphinx; 337 - # Need to use apple's patched xattr until 338 - # https://github.com/xattr/xattr/issues/44 and 339 - # https://github.com/xattr/xattr/issues/55 are solved. 340 - inherit (buildPackages.darwin) xattr autoSignDarwinBinariesHook; 341 - # Support range >= 11 && < 16 342 - buildTargetLlvmPackages = pkgsBuildTarget.llvmPackages_15; 343 - llvmPackages = pkgs.llvmPackages_15; 344 - }; 345 218 ghc984 = callPackage ../development/compilers/ghc/9.8.4.nix { 346 219 bootPkgs = 347 220 if stdenv.buildPlatform.isAarch64 && stdenv.buildPlatform.isMusl then ··· 561 434 compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-9.2.x.nix { }; 562 435 }; 563 436 ghc92 = packages.ghc928; 564 - ghc947 = callPackage ../development/haskell-modules { 565 - buildHaskellPackages = bh.packages.ghc947; 566 - ghc = bh.compiler.ghc947; 567 - compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-9.4.x.nix { }; 568 - }; 569 437 ghc948 = callPackage ../development/haskell-modules { 570 438 buildHaskellPackages = bh.packages.ghc948; 571 439 ghc = bh.compiler.ghc948; ··· 577 445 ghc = bh.compiler.ghc963; 578 446 compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-9.6.x.nix { }; 579 447 }; 580 - ghc964 = callPackage ../development/haskell-modules { 581 - buildHaskellPackages = bh.packages.ghc964; 582 - ghc = bh.compiler.ghc964; 583 - compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-9.6.x.nix { }; 584 - }; 585 - ghc965 = callPackage ../development/haskell-modules { 586 - buildHaskellPackages = bh.packages.ghc965; 587 - ghc = bh.compiler.ghc965; 588 - compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-9.6.x.nix { }; 589 - }; 590 - ghc966 = callPackage ../development/haskell-modules { 591 - buildHaskellPackages = bh.packages.ghc966; 592 - ghc = bh.compiler.ghc966; 593 - compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-9.6.x.nix { }; 594 - }; 595 448 ghc967 = callPackage ../development/haskell-modules { 596 449 buildHaskellPackages = bh.packages.ghc967; 597 450 ghc = bh.compiler.ghc967; 598 451 compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-9.6.x.nix { }; 599 452 }; 600 453 ghc96 = packages.ghc967; 601 - ghc981 = callPackage ../development/haskell-modules { 602 - buildHaskellPackages = bh.packages.ghc981; 603 - ghc = bh.compiler.ghc981; 604 - compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-9.8.x.nix { }; 605 - }; 606 - ghc982 = callPackage ../development/haskell-modules { 607 - buildHaskellPackages = bh.packages.ghc982; 608 - ghc = bh.compiler.ghc982; 609 - compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-9.8.x.nix { }; 610 - }; 611 - ghc983 = callPackage ../development/haskell-modules { 612 - buildHaskellPackages = bh.packages.ghc983; 613 - ghc = bh.compiler.ghc983; 614 - compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-9.8.x.nix { }; 615 - }; 616 454 ghc984 = callPackage ../development/haskell-modules { 617 455 buildHaskellPackages = bh.packages.ghc984; 618 456 ghc = bh.compiler.ghc984;
+1 -9
pkgs/top-level/release-haskell.nix
··· 66 66 ghc8107 67 67 ghc902 68 68 ghc928 69 - ghc947 70 69 ghc948 71 70 ghc963 72 - ghc964 73 - ghc965 74 - ghc966 75 71 ghc967 76 - ghc981 77 - ghc982 78 - ghc983 79 72 ghc984 80 73 ghc9101 81 74 ghc9102 ··· 590 583 compilerNames.ghc8107 591 584 compilerNames.ghc902 592 585 compilerNames.ghc928 593 - compilerNames.ghc947 594 586 compilerNames.ghc948 595 587 ] released; 596 588 Cabal_3_10_3_0 = lib.subtractLists [ ··· 650 642 semaphore-compat = [ 651 643 # Compiler < 9.8 don't have the semaphore-compat core package, but 652 644 # requires unix >= 2.8.1.0 which implies GHC >= 9.6 for us. 653 - compilerNames.ghc966 645 + compilerNames.ghc967 654 646 ]; 655 647 weeder = lib.subtractLists [ 656 648 compilerNames.ghc9101