diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2023-09-29 00:11:52 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-09-29 00:11:52 +0000 |
| commit | 23bb2be564fa9680bb4f237d0b6bcc0a6faa6e33 (patch) | |
| tree | 8b226e6e5f1b6f171b0238cba0c66330cb574dfa /doc/languages-frameworks/haskell.section.md | |
| parent | haskell.compiler.ghc96: 9.6.2 -> 9.6.3 (diff) | |
| parent | Merge pull request #256884 from clkamp/justbuild (diff) | |
| download | nixpkgs-23bb2be564fa9680bb4f237d0b6bcc0a6faa6e33.tar.gz | |
Merge master into haskell-updates
Diffstat (limited to 'doc/languages-frameworks/haskell.section.md')
| -rw-r--r-- | doc/languages-frameworks/haskell.section.md | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/languages-frameworks/haskell.section.md b/doc/languages-frameworks/haskell.section.md index 83155bd24619..6b9ce32d1736 100644 --- a/doc/languages-frameworks/haskell.section.md +++ b/doc/languages-frameworks/haskell.section.md @@ -221,7 +221,7 @@ Sadly we currently don’t have tooling for this. For this you might be interested in the alternative [haskell.nix] framework, which, be warned, is completely incompatible with packages from `haskellPackages`. -<!-- TODO(@maralorn) Link to package set generation docs in the contributers guide below. --> +<!-- TODO(@maralorn) Link to package set generation docs in the contributors guide below. --> ## `haskellPackages.mkDerivation` {#haskell-mkderivation} @@ -1192,7 +1192,7 @@ with GHC), it is recommended to use overlays for Nixpkgs to change them. Since the interrelated parts, i.e. the package set and GHC, are connected via the Nixpkgs fixpoint, we need to modify them both in a way that preserves their connection (or else we'd have to wire it up again manually). This is -achieved by changing GHC and the package set in seperate overlays to prevent +achieved by changing GHC and the package set in separate overlays to prevent the package set from pulling in GHC from `prev`. The result is two overlays like the ones shown below. Adjustable parts are |