Skip to content

Commit f46abec

Browse files
committed
Update the docs
1 parent a6992ad commit f46abec

File tree

14 files changed

+443
-178
lines changed

14 files changed

+443
-178
lines changed

.gitignore

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
# The output of "mkdocs build"
2+
/site/
3+
4+
# Nix build results
5+
result*
6+
/nt
17

28
# Created by https://www.gitignore.io/api/haskell,emacs,vim
39

changelog.md

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
This file contains a summary of changes to Haskell.nix and `nix-tools`
2+
that will impact users.
3+
4+
## June 6, 2019
5+
* Substantial additions to the [documentation](https://input-output-hk.github.io/haskell.nix/).
6+
17
## May 29, 2019
28
* Added `shellFor` function to package set.
39

@@ -8,7 +14,7 @@
814
## May 22, 2019
915
* Add the `cleanSourceHaskell` utility function to the Haskell.nix
1016
top-level.
11-
17+
1218
## May 21, 2019
1319
* Add the `callCabalProjectToNix` function, which uses "import from
1420
derivation" (IFD) so that nix-tools doesn't need to be run
@@ -23,7 +29,13 @@
2329
* Add the `callStackToNix` function, which uses "import from
2430
derivation" (IFD) so that `stack-to-nix` doesn't need to be run
2531
manually.
26-
32+
2733
## Mar 15, 2019
28-
* overlays was renamed to extras (#79)
29-
See docs/migration.md
34+
* `overlays` was renamed to `extras` in
35+
[#79](https://github.com/input-output-hk/haskell.nix/pull/79)
36+
to prevent confusion between the notion of Nix overlays.
37+
38+
Therefore `plan-pkgs` and `stack-pkgs` as generated by `plan-to-nix` and `stack-to-nix` will
39+
expose `extras` instead of `overlay`. Similarly `mkStackPkgSet`, `mkPkgSet` and `mkCabalProjectPkgSet`
40+
take a `pkg-def-extras` instead of `pkg-def-overlay` argument. If you are using `iohk-nix`, the
41+
`iohk-overlay` was parameter was renamed to `iohk-extras`.

docs/architecture.md

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -43,22 +43,26 @@ nix-tools is a Haskell package that provides the following tools:
4343

4444
as well as a few other tools used to generate `hackage.nix` and `stackage.nix`.
4545

46-
## [haskell.nix](https://github.com/input-output-hk/haskell.nix)
46+
## [haskell.nix][]
4747

48-
haskell.nix is the runtime system for this Haskell infrastructure. It
49-
contains the component builder, as well as the system package and
48+
[Haskell.nix][] is the runtime system for this Haskell infrastructure.
49+
It contains the component builder, as well as the system package and
5050
license mapping. Without haskell.nix the expressions generated by
5151
either of the `nix-tools` tools make little sense on their own.
5252

53-
## [hackage.nix](https://github.com/input-output-hk/hackage.nix)
53+
## [hackage.nix][]
5454

55-
hackage.nix provides all cabal expressions from hackage as nix
55+
[hackage.nix][] provides all cabal expressions from hackage as nix
5656
expressions. It is periodically updated to keep in sync with the set
5757
of packages available on hackage.
5858

59-
## [stackage.nix](https://github.com/input-output-hk/stackage.nix)
59+
## [stackage.nix][]
6060

61-
stackage.nix is similar to hackage.nix but provides all stackage
61+
[stackage.nix][] is similar to hackage.nix but provides all stackage
6262
snapshots (lts, and nightly) as nix expressions. It naturally depends
6363
on hackage.nix to resolve package names, versions and revisions to the
6464
repsective packages from hackage.nix.
65+
66+
[haskell.nix]: https://github.com/input-output-hk/haskell.nix
67+
[hackage.nix]: https://github.com/input-output-hk/hackage.nix
68+
[stackage.nix]: https://github.com/input-output-hk/stackage.nix

docs/changelog.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../changelog.md

docs/index.md

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,11 @@
11
# haskell.nix
22

33
haskell.nix is an alternative Haskell infrastructure for nixpkgs. See
4-
[Nixpkgs current Users' Guide to Haskell Infrastructure](https://nixos.org/nixpkgs/manual/#users-guide-to-the-haskell-infrastructure) for comparison.
4+
[Nixpkgs current Users' Guide to Haskell Infrastructure][nixpkgs] for
5+
comparison.
6+
7+
[nixpkgs]: https://nixos.org/nixpkgs/manual/#users-guide-to-the-haskell-infrastructure
8+
[issues]: https://github.com/input-output-hk/haskell.nix/issues
59

610
## Motivation
711

docs/migrations.md

Lines changed: 0 additions & 13 deletions
This file was deleted.

docs/user-guide-cabal.md

Lines changed: 0 additions & 64 deletions
This file was deleted.

0 commit comments

Comments
 (0)