From aadfe3ef2b1e4b65e35befda51874befd9491263 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Mon, 8 Jul 2024 11:38:42 +0200 Subject: [PATCH] haskell.compiler.ghc966: init at 9.6.6 https://www.haskell.org/ghc//blog/20240701-ghc-9.6.6-released.html --- pkgs/development/compilers/ghc/9.6.6.nix | 4 ++++ .../compilers/ghc/common-hadrian.nix | 2 +- pkgs/top-level/haskell-packages.nix | 23 +++++++++++++++++++ 3 files changed, 28 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/compilers/ghc/9.6.6.nix diff --git a/pkgs/development/compilers/ghc/9.6.6.nix b/pkgs/development/compilers/ghc/9.6.6.nix new file mode 100644 index 000000000000..60854685f1e1 --- /dev/null +++ b/pkgs/development/compilers/ghc/9.6.6.nix @@ -0,0 +1,4 @@ +import ./common-hadrian.nix { + version = "9.6.6"; + sha256 = "008f7a04d89ad10baae6486c96645d7d726aaac7e1476199f6dd86c6bd9977ad"; +} diff --git a/pkgs/development/compilers/ghc/common-hadrian.nix b/pkgs/development/compilers/ghc/common-hadrian.nix index b5fef30332f7..5a9be57e613c 100644 --- a/pkgs/development/compilers/ghc/common-hadrian.nix +++ b/pkgs/development/compilers/ghc/common-hadrian.nix @@ -171,7 +171,7 @@ then ./docs-sphinx-7-ghc98.patch else ./docs-sphinx-7.patch ) ] - ++ lib.optionals (lib.versionAtLeast version "9.6" && lib.versionOlder version "9.8") [ + ++ lib.optionals (lib.versionAtLeast version "9.6" && lib.versionOlder version "9.6.6") [ (fetchpatch { name = "fix-fully_static.patch"; url = "https://gitlab.haskell.org/ghc/ghc/-/commit/1bb24432ff77e11a0340a7d8586e151e15bba2a1.diff"; diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index ad8a4b947964..24a8e979b020 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -316,6 +316,24 @@ in { buildTargetLlvmPackages = pkgsBuildTarget.llvmPackages_15; llvmPackages = pkgs.llvmPackages_15; }; + ghc966 = callPackage ../development/compilers/ghc/9.6.6.nix { + bootPkgs = + # For GHC 9.2 no armv7l bindists are available. + if stdenv.hostPlatform.isAarch32 then + packages.ghc928 + else if stdenv.hostPlatform.isPower64 && stdenv.hostPlatform.isLittleEndian then + packages.ghc928 + else + packages.ghc924Binary; + inherit (buildPackages.python3Packages) sphinx; + # Need to use apple's patched xattr until + # https://github.com/xattr/xattr/issues/44 and + # https://github.com/xattr/xattr/issues/55 are solved. + inherit (buildPackages.darwin) xattr autoSignDarwinBinariesHook; + # Support range >= 11 && < 16 + buildTargetLlvmPackages = pkgsBuildTarget.llvmPackages_15; + llvmPackages = pkgs.llvmPackages_15; + }; ghc96 = compiler.ghc965; ghc981 = callPackage ../development/compilers/ghc/9.8.1.nix { bootPkgs = @@ -547,6 +565,11 @@ in { ghc = bh.compiler.ghc965; compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-9.6.x.nix { }; }; + ghc966 = callPackage ../development/haskell-modules { + buildHaskellPackages = bh.packages.ghc966; + ghc = bh.compiler.ghc966; + compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-9.6.x.nix { }; + }; ghc96 = packages.ghc965; ghc981 = callPackage ../development/haskell-modules { buildHaskellPackages = bh.packages.ghc981;