Commit Graph

6 Commits

Author SHA1 Message Date
sternenseemann
767fefc21c haskell.lib: move lib.nix into same directory as compose.nix 2022-01-22 21:38:03 +01:00
Jonathan Ringer
2e6fadac4e
Merge remote-tracking branch 'origin/staging-next' into staging
Conflicts:
	pkgs/development/python-modules/django-rq/default.nix
2021-12-02 16:07:50 -08:00
sternenseemann
6496069dda haskell.lib{,.compose}.doDistribute: default to lib.platforms.all
This reflects the default value set in generic-builder.nix, following
the reasoning that GHC can cross-compile and we assume that packages are
generally portable.
2021-12-02 11:27:12 +01:00
Profpatsch
5abb1856ce haskell-modules/lib: make postFixup more resilient
1. Putting the string on one line (instead of using a multiline
string) means it is not ended with \n, which means if somebody wants
to append more lines, they have to start it with \n or it will get
concatenated to the `postFixup` here, so add \n.

2. Previously, ignoring `drv.postFixup` would throw away any
`postFixup`s set in `drv`, which is not something we want.

The extra empty line is a cute trick to prevent concatenating the code
with any previous `postFixup` that doesn’t end in \n.
2021-11-27 15:47:58 +01:00
Ellie Hermaszewska
15ae25f36c
haskell: switch from haskell.lib to haskell.lib.compose 2021-11-07 20:18:45 +08:00
Ellie Hermaszewska
518f09f2d0
haskell.lib.compose: init
No changes in derivations for pkgs.haskellPackages
2021-11-07 19:40:00 +08:00