diff --git a/pkgs/development/compilers/ghc/9.0.1.nix b/pkgs/development/compilers/ghc/9.0.2.nix similarity index 98% rename from pkgs/development/compilers/ghc/9.0.1.nix rename to pkgs/development/compilers/ghc/9.0.2.nix index 3f13fe1b9e1b..7d58b550a990 100644 --- a/pkgs/development/compilers/ghc/9.0.1.nix +++ b/pkgs/development/compilers/ghc/9.0.2.nix @@ -2,7 +2,7 @@ # build-tools , bootPkgs -, autoconf, automake, coreutils, fetchurl, perl, python3, m4, sphinx +, autoconf, automake, coreutils, fetchurl, perl, python3, m4, sphinx, xattr , autoSignDarwinBinariesHook , bash @@ -165,12 +165,12 @@ assert buildTargetLlvmPackages.llvm == llvmPackages.llvm; assert stdenv.targetPlatform.isDarwin -> buildTargetLlvmPackages.clang == llvmPackages.clang; stdenv.mkDerivation (rec { - version = "9.0.1"; + version = "9.0.2"; pname = "${targetPrefix}ghc${variantSuffix}"; src = fetchurl { url = "https://downloads.haskell.org/ghc/${version}/ghc-${version}-src.tar.xz"; - sha256 = "1y9mi9bq76z04hmggavrn8jwi1gx92bm3zhx6z69ypq6wha068x5"; + sha256 = "140e42b96346322d1a39eb17602bcdc76e292028ad4a69286b230bab188a9197"; }; enableParallelBuilding = true; @@ -280,6 +280,10 @@ stdenv.mkDerivation (rec { autoSignDarwinBinariesHook ] ++ lib.optionals enableDocs [ sphinx + ] ++ lib.optionals stdenv.isDarwin [ + # TODO(@sternenseemann): backport addition of XATTR env var like + # https://gitlab.haskell.org/ghc/ghc/-/merge_requests/6447 + xattr ]; # For building runtime libs diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml index bca6360dca2c..51cb1fc37f9a 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml @@ -158,13 +158,13 @@ extra-packages: - ShellCheck == 0.7.1 # 2021-05-09: haskell-ci 0.12.1 pins this version - cabal-install-parsers == 0.4.2 # 2021-09-04: needed haskell-ci by until it upgrades to Cabal >= 3.6 - ghc-api-compat == 8.6 # 2021-09-07: preserve for GHC 8.8.4 - - ghc-lib == 9.0.1.* # 2021-11-05: Need one GHC 9.0.1 compatible version - - ghc-lib-parser == 9.0.1.* # 2021-11-05: Need one GHC 9.0.1 compatible version - - ghc-lib-parser-ex == 9.0.* # 2021-11-05: Need one GHC 9.0.1 compatible version + - ghc-lib == 9.0.* # 2021-11-05: Need one GHC 9.0.2 compatible version + - ghc-lib-parser == 9.0.* # 2021-11-05: Need one GHC 9.0.2 compatible version + - ghc-lib-parser-ex == 9.0.* # 2021-11-05: Need one GHC 9.0.2 compatible version - doctest == 0.18.* # 2021-11-19: closest to stackage version for GHC 9.* - brick == 0.64.* # 2021-12-03: matterhorn depends on brick < 0.65 - - path == 0.9.0 # 2021-12-03: path version building with stackage genvalidity and GHC 9.0.1 - - ormolu == 0.3.* # 2021-12-03: for HLS with GHC 9.0.1 + - path == 0.9.0 # 2021-12-03: path version building with stackage genvalidity and GHC 9.0.2 + - ormolu == 0.3.* # 2021-12-03: for HLS with GHC 9.0.2 package-maintainers: abbradar: diff --git a/pkgs/development/tools/haskell/haskell-language-server/withWrapper.nix b/pkgs/development/tools/haskell/haskell-language-server/withWrapper.nix index 9f67317d71f0..2b5f6c4da80e 100644 --- a/pkgs/development/tools/haskell/haskell-language-server/withWrapper.nix +++ b/pkgs/development/tools/haskell/haskell-language-server/withWrapper.nix @@ -1,4 +1,4 @@ -{ lib, supportedGhcVersions ? [ "884" "8107" "901" ], stdenv, haskellPackages +{ lib, supportedGhcVersions ? [ "884" "8107" "902" ], stdenv, haskellPackages , haskell }: # # The recommended way to override this package is diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 089450ef97d5..c4e13ec44a4e 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -101,7 +101,7 @@ in { buildTargetLlvmPackages = pkgsBuildTarget.llvmPackages_12; llvmPackages = pkgs.llvmPackages_12; }; - ghc901 = callPackage ../development/compilers/ghc/9.0.1.nix { + ghc902 = callPackage ../development/compilers/ghc/9.0.2.nix { bootPkgs = # aarch64 ghc8107Binary exceeds max output size on hydra # the oldest ghc with aarch64-darwin support is 8.10.5 @@ -110,7 +110,7 @@ in { else packages.ghc8107Binary; inherit (buildPackages.python3Packages) sphinx; - inherit (buildPackages.darwin) autoSignDarwinBinariesHook; + inherit (buildPackages.darwin) autoSignDarwinBinariesHook xattr; buildTargetLlvmPackages = pkgsBuildTarget.llvmPackages_9; llvmPackages = pkgs.llvmPackages_9; }; @@ -215,9 +215,9 @@ in { ghc = bh.compiler.ghc8107; compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.10.x.nix { }; }; - ghc901 = callPackage ../development/haskell-modules { - buildHaskellPackages = bh.packages.ghc901; - ghc = bh.compiler.ghc901; + ghc902 = callPackage ../development/haskell-modules { + buildHaskellPackages = bh.packages.ghc902; + ghc = bh.compiler.ghc902; compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-9.0.x.nix { }; }; ghc921 = callPackage ../development/haskell-modules { diff --git a/pkgs/top-level/release-haskell.nix b/pkgs/top-level/release-haskell.nix index a9e4ea32ccdc..a9044f6989ab 100644 --- a/pkgs/top-level/release-haskell.nix +++ b/pkgs/top-level/release-haskell.nix @@ -51,7 +51,7 @@ let released = with compilerNames; [ ghc884 ghc8107 - ghc901 + ghc902 ghc921 ]; @@ -313,7 +313,7 @@ let haskell-language-server = [ compilerNames.ghc884 compilerNames.ghc8107 - compilerNames.ghc901 + compilerNames.ghc902 ]; hoogle = released; hlint = released; @@ -325,7 +325,7 @@ let ghc-api-compat = [ compilerNames.ghc884 compilerNames.ghc8107 - compilerNames.ghc901 + compilerNames.ghc902 ]; }) { @@ -393,11 +393,11 @@ let jobs.pkgsMusl.haskell.compiler.ghc8107Binary jobs.pkgsMusl.haskell.compiler.ghc884 jobs.pkgsMusl.haskell.compiler.ghc8107 - jobs.pkgsMusl.haskell.compiler.ghc901 + jobs.pkgsMusl.haskell.compiler.ghc902 jobs.pkgsMusl.haskell.compiler.ghc921 jobs.pkgsMusl.haskell.compiler.ghcHEAD jobs.pkgsMusl.haskell.compiler.integer-simple.ghc8107 - jobs.pkgsMusl.haskell.compiler.integer-simple.ghc901 + jobs.pkgsMusl.haskell.compiler.integer-simple.ghc902 jobs.pkgsMusl.haskell.compiler.integer-simple.ghc921 jobs.pkgsMusl.haskell.compiler.native-bignum.ghcHEAD ];