Merge pull request #312934 from NixOS/haskell-updates (a44d2a41) · Commits · nix / nixpkgs

pkgs/data/misc/hackage/pin.json

+4 −4

Original line number	Diff line number	Diff line
		{
		"commit": "88d42dc0129b0e3f4f702149a58667c66add9262",
		"url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/88d42dc0129b0e3f4f702149a58667c66add9262.tar.gz",
		"sha256": "0imff76qbg1hsvsdds6dc2wfip0prdsa0bixd5b575jr6yjlkirh",
		"msg": "Update from Hackage at 2024-05-15T11:29:34Z"
		"commit": "a71af8d538cda614baa0bcb3e44600061f815d57",
		"url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/a71af8d538cda614baa0bcb3e44600061f815d57.tar.gz",
		"sha256": "0hsqzdfb89rqmplipz39x7m80czcvrmk42y05ifnqjhxn6q4v91l",
		"msg": "Update from Hackage at 2024-05-20T16:06:03Z"
		}

pkgs/development/compilers/ghc/common-make-native-bignum.nix

+21 −53

Original line number	Diff line number	Diff line
		@@ -187,17 +187,7 @@ stdenv.mkDerivation (rec {

		outputs = [ "out" "doc" ];

		# FIXME(@sternenseemann): This can be simplified a lot (causing a rebuild)
		patches = (if lib.versions.majorMinor version == "9.0" then [
		# Fix docs build with sphinx >= 6.0
		# https://gitlab.haskell.org/ghc/ghc/-/issues/22766
		(fetchpatch {
		name = "ghc-docs-sphinx-6.0.patch";
		url = "https://gitlab.haskell.org/ghc/ghc/-/commit/10e94a556b4f90769b7fd718b9790d58ae566600.patch";
		sha256 = "0kmhfamr16w8gch0lgln2912r8aryjky1hfcda3jkcwa5cdzgjdv";
		})
		# Fix docs build with Sphinx >= 7 https://gitlab.haskell.org/ghc/ghc/-/issues/24129
		./docs-sphinx-7.patch
		patches = lib.optionals (lib.versionOlder version "9.4") [
		# fix hyperlinked haddock sources: https://github.com/haskell/haddock/pull/1482
		(fetchpatch {
		url = "https://patch-diff.githubusercontent.com/raw/haskell/haddock/pull/1482.patch";
		@@ -205,16 +195,9 @@ stdenv.mkDerivation (rec {
		extraPrefix = "utils/haddock/";
		stripLen = 1;
		})
		]

		# Add flag that fixes C++ exception handling; opt-in. Merged in 9.4 and 9.2.2.
		# https://gitlab.haskell.org/ghc/ghc/-/merge_requests/7423
		(fetchpatch {
		name = "ghc-9.0.2-fcompact-unwind.patch";
		# Note that the test suite is not packaged.
		url = "https://gitlab.haskell.org/ghc/ghc/-/commit/c6132c782d974a7701e7f6447bdcd2bf6db4299a.patch?merge_request_iid=7423";
		sha256 = "sha256-b4feGZIaKDj/UKjWTNY6/jH4s2iate0wAgMxG3rAbZI=";
		})
		] else if lib.versions.majorMinor version == "9.2" then [
		++ lib.optionals (lib.versionOlder version "9.4.6") [
		# Fix docs build with sphinx >= 6.0
		# https://gitlab.haskell.org/ghc/ghc/-/issues/22766
		(fetchpatch {
		@@ -222,24 +205,25 @@ stdenv.mkDerivation (rec {
		url = "https://gitlab.haskell.org/ghc/ghc/-/commit/10e94a556b4f90769b7fd718b9790d58ae566600.patch";
		sha256 = "0kmhfamr16w8gch0lgln2912r8aryjky1hfcda3jkcwa5cdzgjdv";
		})
		]

		++ [
		# Fix docs build with Sphinx >= 7 https://gitlab.haskell.org/ghc/ghc/-/issues/24129
		./docs-sphinx-7.patch
		# fix hyperlinked haddock sources: https://github.com/haskell/haddock/pull/1482
		(fetchpatch {
		url = "https://patch-diff.githubusercontent.com/raw/haskell/haddock/pull/1482.patch";
		sha256 = "sha256-8w8QUCsODaTvknCDGgTfFNZa8ZmvIKaKS+2ZJZ9foYk=";
		extraPrefix = "utils/haddock/";
		stripLen = 1;
		})
		# Don't generate code that doesn't compile when --enable-relocatable is passed to Setup.hs
		# Can be removed if the Cabal library included with ghc backports the linked fix
		]

		++ lib.optionals (lib.versionOlder version "9.2.2") [
		# Add flag that fixes C++ exception handling; opt-in. Merged in 9.4 and 9.2.2.
		# https://gitlab.haskell.org/ghc/ghc/-/merge_requests/7423
		(fetchpatch {
		url = "https://github.com/haskell/cabal/commit/6c796218c92f93c95e94d5ec2d077f6956f68e98.patch";
		stripLen = 1;
		extraPrefix = "libraries/Cabal/";
		sha256 = "sha256-yRQ6YmMiwBwiYseC5BsrEtDgFbWvst+maGgDtdD0vAY=";
		name = "ghc-9.0.2-fcompact-unwind.patch";
		# Note that the test suite is not packaged.
		url = "https://gitlab.haskell.org/ghc/ghc/-/commit/c6132c782d974a7701e7f6447bdcd2bf6db4299a.patch?merge_request_iid=7423";
		sha256 = "sha256-b4feGZIaKDj/UKjWTNY6/jH4s2iate0wAgMxG3rAbZI=";
		})
		] else if lib.versions.majorMinor version == "9.4" then [
		]

		++ lib.optionals (lib.versionAtLeast version "9.2") [
		# Don't generate code that doesn't compile when --enable-relocatable is passed to Setup.hs
		# Can be removed if the Cabal library included with ghc backports the linked fix
		(fetchpatch {
		@@ -249,25 +233,13 @@ stdenv.mkDerivation (rec {
		sha256 = "sha256-yRQ6YmMiwBwiYseC5BsrEtDgFbWvst+maGgDtdD0vAY=";
		})
		]
		++ lib.optionals (version == "9.4.5") [
		# Fix docs build with sphinx >= 6.0
		# https://gitlab.haskell.org/ghc/ghc/-/issues/22766
		(fetchpatch {
		name = "ghc-docs-sphinx-6.0.patch";
		url = "https://gitlab.haskell.org/ghc/ghc/-/commit/10e94a556b4f90769b7fd718b9790d58ae566600.patch";
		sha256 = "0kmhfamr16w8gch0lgln2912r8aryjky1hfcda3jkcwa5cdzgjdv";
		})
		]
		++ [

		# Fix docs build with Sphinx >= 7 https://gitlab.haskell.org/ghc/ghc/-/issues/24129
		./docs-sphinx-7.patch
		]
		++ lib.optionals (version == "9.4.6") [
		# Work around a type not being defined when including Rts.h in bytestring's cbits
		# due to missing feature macros. See https://gitlab.haskell.org/ghc/ghc/-/issues/23810.
		./9.4.6-bytestring-posix-source.patch
		] else [ ])
		]

		++ lib.optionals (stdenv.targetPlatform.isDarwin && stdenv.targetPlatform.isAarch64) [
		# Prevent the paths module from emitting symbols that we don't use
		# when building with separate outputs.
		@@ -313,12 +285,8 @@ stdenv.mkDerivation (rec {
		# LLVM backend on Darwin needs clang: https://downloads.haskell.org/~ghc/latest/docs/html/users_guide/codegens.html#llvm-code-generator-fllvm
		export CLANG="${buildTargetLlvmPackages.clang}/bin/${buildTargetLlvmPackages.clang.targetPrefix}clang"
		''
		+ lib.optionalString (version == "9.0.2" \|\| lib.versionAtLeast version "9.4") ''

		'' + ''
		+ ''
		echo -n "${buildMK}" > mk/build.mk
		'' + lib.optionalString (lib.versionAtLeast version "9.4") ''

		''
		+ lib.optionalString (lib.versionOlder version "9.2" \|\| lib.versionAtLeast version "9.4") ''
		sed -i -e 's\|-isysroot /Developer/SDKs/MacOSX10.5.sdk\|\|' configure

pkgs/development/haskell-modules/cabal2nix-unstable.nix

+3 −3

Original line number	Diff line number	Diff line
		@@ -8,10 +8,10 @@
		}:
		mkDerivation {
		pname = "cabal2nix";
		version = "unstable-2024-04-21";
		version = "unstable-2024-05-20";
		src = fetchzip {
		url = "https://github.com/NixOS/cabal2nix/archive/f8e6bf749a158a5ed866c57deee907b5f16c38e5.tar.gz";
		sha256 = "0c73mvza65iy46fv8c8cadsy7klk4jzmimm1mfdavvm8i2cr5476";
		url = "https://github.com/NixOS/cabal2nix/archive/79b73778680e2ae27302dce430beee302299f496.tar.gz";
		sha256 = "0xjrnf9x1f4jl4bsxc6kv5q7rsbn3vs0ddidj9qf6mzzzqxq14p3";
		};
		postUnpack = "sourceRoot+=/cabal2nix; echo source root reset to $sourceRoot";
		isLibrary = true;

pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix

+1 −1

Original line number	Diff line number	Diff line
		@@ -95,7 +95,7 @@ self: super: {
		ghc-lib-parser-ex = addBuildDepend self.ghc-lib-parser super.ghc-lib-parser-ex;

		# This became a core library in ghc 8.10., so we don’t have an "exception" attribute anymore.
		exceptions = self.exceptions_0_10_7;
		exceptions = self.exceptions_0_10_8;

		# vector 0.12.2 indroduced doctest checks that don’t work on older compilers
		vector = dontCheck super.vector;

pkgs/development/haskell-modules/configuration-ghc-9.8.x.nix

+2 −2

Original line number	Diff line number	Diff line
		@@ -59,8 +59,8 @@ self: super: {
		megaparsec = doDistribute self.megaparsec_9_6_1;
		# TODO: remove when aeson updates or launches a revision
		# see https://github.com/haskell/aeson/issues/1089 and https://github.com/haskell/aeson/pulls/1088
		aeson = doJailbreak (doDistribute self.aeson_2_2_1_0);
		attoparsec-aeson = doDistribute self.attoparsec-aeson_2_2_0_1;
		aeson = doJailbreak (doDistribute self.aeson_2_2_2_0);
		attoparsec-aeson = doDistribute self.attoparsec-aeson_2_2_2_0;
		xmonad = doDistribute self.xmonad_0_18_0;
		apply-refact = self.apply-refact_0_14_0_0;
		ormolu = self.ormolu_0_7_4_0;