Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
9e26bef
Merge master into haskell-updates
github-actions[bot] Aug 20, 2022
b4ee555
haskellPackages: stackage LTS 19.18 -> LTS 19.19
cdepillabout Aug 20, 2022
4740685
all-cabal-hashes: 2022-08-09T06:14:32Z -> 2022-08-20T06:29:36Z
cdepillabout Aug 20, 2022
3937af9
haskellPackages: regenerate package set based on current config
cdepillabout Aug 20, 2022
73c57d4
haskell.packages.ghc924.base-compat*: adapt to 0.12.1 -> 0.12.2
sternenseemann Aug 20, 2022
ff6962c
haskell.packages.ghc924.hashable: adapt to 1.4.0.2 -> 1.4.1.0
sternenseemann Aug 20, 2022
4ad395f
cabal-install: adapt to changes for 3.8.1.0
sternenseemann Aug 20, 2022
f6479ba
Merge master into haskell-updates
github-actions[bot] Aug 21, 2022
edfbc76
haskellPackages.Cabal_3_6_3_0: generate for cabal-install-parsers etc
cdepillabout Aug 21, 2022
5ff39ca
haskell.packages.ghc924.lens: bump to lens-5.2
cdepillabout Aug 21, 2022
d08667a
haskellPackages.ema: appears to now require ghc-9.2
cdepillabout Aug 21, 2022
b6b997d
haskellPackages.servant-cassava: remove unneeded doJailbreak
cdepillabout Aug 21, 2022
a7d4c91
Merge master into haskell-updates
github-actions[bot] Aug 22, 2022
f89dd3d
haskellPackages.cabalSdist: Work around cabal#8413
roberth Aug 21, 2022
547e235
haskellPackages.ema: disable tests since they require ghc-9.2
cdepillabout Aug 22, 2022
970a97f
haskell.compiler: ghc941 -> ghc942
sternenseemann Aug 22, 2022
f06a4d7
haskell.compiler: clean up unused patches
sternenseemann Aug 22, 2022
c8c04e3
Merge master into haskell-updates
github-actions[bot] Aug 23, 2022
6a5570d
haskellPackages.glirc: jailbreak
expipiplus1 Aug 23, 2022
20a37d9
Merge master into haskell-updates
github-actions[bot] Aug 24, 2022
517fa0d
Merge master into haskell-updates
github-actions[bot] Aug 25, 2022
da501f8
haskellPackages.streaming-commons: Fix sandboxed build on Darwin
centromere Aug 25, 2022
0e4a58c
Merge pull request #188247 from centromere/fix-streaming-commons
expipiplus1 Aug 25, 2022
3aa744d
Merge master into haskell-updates
github-actions[bot] Aug 26, 2022
de5a47b
Merge master into haskell-updates
github-actions[bot] Aug 27, 2022
83ef7d4
haskellPackages: move misplaced overrides out of HLS section
sternenseemann Aug 27, 2022
42e16cc
haskellPackages.Cabal_3_8_1_0: allow building directly
sternenseemann Aug 27, 2022
f6b35ce
haskellPackages.cabal-install-solver: allow building directly
sternenseemann Aug 27, 2022
dc29b17
Merge master into haskell-updates
github-actions[bot] Aug 28, 2022
c8ea46d
Merge master into haskell-updates
github-actions[bot] Aug 29, 2022
7cfa85b
haskellPackages: mark builds failing on hydra as broken
expipiplus1 Aug 29, 2022
9656853
haskell: Add link to current haskell update PR search
expipiplus1 Aug 29, 2022
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions pkgs/data/misc/hackage/pin.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"commit": "eb862a59277fd86ad3138e9f25e793f0fe0364ba",
"url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/eb862a59277fd86ad3138e9f25e793f0fe0364ba.tar.gz",
"sha256": "10agwlxzp76lnp4d6zncvjgv78hr3rss3j3i3bfpsn3i7af1qcw8",
"msg": "Update from Hackage at 2022-08-09T06:14:32Z"
"commit": "3c1ad4d78a1d5fc29c5e169f5ba9f82bc580d2f0",
"url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/3c1ad4d78a1d5fc29c5e169f5ba9f82bc580d2f0.tar.gz",
"sha256": "0cd24ibv0i2zq0vvawafm0hqjgv70flmna84g320h5jy3lc0qrv4",
"msg": "Update from Hackage at 2022-08-20T06:29:36Z"
}
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Preliminary GHC 9.4.1 expression using the make build system.
# Preliminary GHC 9.4.2 expression using the make build system.
# TODO(@sternenseemann): port to hadrian, so we are prepared for 9.6
# where make support will be dropped.
{ lib, stdenv, pkgsBuildTarget, pkgsHostTarget, targetPackages
Expand Down Expand Up @@ -177,29 +177,19 @@ assert buildTargetLlvmPackages.llvm == llvmPackages.llvm;
assert stdenv.targetPlatform.isDarwin -> buildTargetLlvmPackages.clang == llvmPackages.clang;

stdenv.mkDerivation (rec {
version = "9.4.1";
version = "9.4.2";
pname = "${targetPrefix}ghc${variantSuffix}";

src = fetchurl {
url = "https://downloads.haskell.org/ghc/${version}/ghc-${version}-src.tar.xz";
sha256 = "sha256-y/7UZAvfAl4zulVDPa+M32mPTgSZrnqADd5EqC5zluM=";
sha256 = "7227ef3b5e15a0d70b8f1a43aec32867e2a9b2d857cc0ed556aeed172d4db3a5";
};

enableParallelBuilding = true;

outputs = [ "out" "doc" ];


patches = [
# add missing profiling targets in make build system
(fetchpatch {
name = "ghc-9.4.1-fix-bootstrapping-with-profiling-1.patch";
url = "https://gitlab.haskell.org/ghc/ghc/-/commit/47b4fea08bd0ef1476b8d134c7baf06157fe5fa5.diff";
sha256 = "sha256-oYQWg9cK0RNL9I+kap8KER+iiKim73zG6URQs8BeAXU=";
})
./ghc-9.4.1-fix-bootstrapping-with-profiling-2.patch
];

postPatch = "patchShebangs .";

# GHC needs the locale configured during the Haddock phase.
Expand Down

This file was deleted.

This file was deleted.

296 changes: 0 additions & 296 deletions pkgs/development/compilers/ghc/issue-18549.patch

This file was deleted.

2 changes: 2 additions & 0 deletions pkgs/development/haskell-modules/HACKING.md
Original file line number Diff line number Diff line change
Expand Up @@ -249,6 +249,8 @@ opening the next one. When you want to merge the currently open
$ ./maintainers/scripts/haskell/merge-and-open-pr.sh PR_NUM_OF_CURRENT_HASKELL_UPDATES_PR
```

Find the PR number easily [here](https://github.com/nixos/nixpkgs/pulls?q=is%3Apr+is%3Aopen+head%3Ahaskell-updates)

This does the following things:

1. Fetches `origin`, makes sure you currently have the `haskell-updates`
Expand Down
Loading