Gabriel Ebner
66041a4475
configuration-hackage2nix.yaml: re-enable ghc-mod
2016-07-23 11:41:55 +02:00
Benno Fünfstück
2e48d838d0
haskell/Glob: fix build
2016-07-23 01:27:40 +02:00
Peter Simons
f162a1349a
haskell-bifunctors: fix build with GHC 7.6.x
2016-07-21 17:57:28 +02:00
Peter Simons
60d7f39ec0
configuration-hackage2nix.yaml: update list of broken builds
...
These packages are broken in "haskellPackages" and have been for quite a while:
- disable goatee, goatee-gtk, and qtah-* (ping @khumba)
- disable persistent-mongoDB (ping @psibi)
2016-07-21 16:40:03 +02:00
Peter Simons
3d5556b2cc
haskell-ghcjs-prim: mark broken
2016-07-21 16:40:02 +02:00
Peter Simons
1545d241b6
haskell-semigroups: fix build with old compilers
2016-07-21 16:40:02 +02:00
Peter Simons
6f26617737
haskell-bifunctors: fix build with old compilers
2016-07-21 16:40:02 +02:00
Peter Simons
2720ee84ad
hackage-packages.nix: update Haskell package set
...
This update was generated by hackage2nix v2.0-12-gb304101 using the following inputs:
- Hackage: https://github.com/commercialhaskell/all-cabal-hashes/commit/b135e7a1de5a60d17e13be3bd20d046816f72772
- LTS Haskell: https://github.com/fpco/lts-haskell/commit/a5a99cf17698741e56c8efdf50989692c2e363e0
- Stackage Nightly: https://github.com/fpco/stackage-nightly/commit/bf146896f35132bf340fe59b27feb0f796c867b2
2016-07-21 16:39:56 +02:00
Christian Gram Kalhauge
1a08805358
Make the implementation clean
2016-07-21 14:56:45 +02:00
Peter Simons
641fc0e683
haskell: remove all but the latest LTS package sets (version 6.7)
...
This is the first step towards dropping Stackage support. We keep LTS 6.x
around because I don't want to downgrade our default compiler to GHC 7.x,
but once LTS 7.x comes out we'll switch our main package set to that and
drop Nightly.
More details are at:
http://permalink.gmane.org/gmane.linux.distributions.nixos/20505
Closes https://github.com/NixOS/nixpkgs/issues/14897 .
Also relevant:
- https://github.com/NixOS/nixpkgs/issues/16130
- https://github.com/commercialhaskell/stack/issues/2259
2016-07-21 14:41:44 +02:00
Christian Gram Kalhauge
9bca29d4ef
Change if to optionalString
2016-07-21 14:23:56 +02:00
Peter Simons
beab1adb6e
configuration-hackage2nix.yaml: update list of broken builds
2016-07-21 13:52:48 +02:00
Christian Gram Kalhauge
de5a2ee034
Reduce computation time for non-darwin users
2016-07-21 11:39:52 +02:00
Robin Gloster
1f04b4a566
Merge remote-tracking branch 'upstream/master' into hardened-stdenv
2016-07-21 00:56:43 +00:00
Christian Gram Kalhauge
ab46f69802
Merge remote-tracking branch 'origin/master' into haskell_darwin_dyld
2016-07-20 14:28:28 +02:00
Christian Gram Kalhauge
475c8bfb7d
Fix DLYD problem with haskell libraries on Darwin
...
This commit fixes a problem that occurs with externally linked haskell
libraries on Darwin. It does this by adding the libraries to the
--extra-lib-dirs flag and the DYLD_LIBRARY_PATH environment variable.
2016-07-20 14:21:53 +02:00
Peter Simons
ddfc4ba977
haskell-Glob: fix LTS build
2016-07-20 12:50:06 +02:00
Peter Simons
c2656d6809
Merge pull request #15423 from dalaing/llvm-general-darwin
...
llvm-general: Adds Darwin compatibilty
2016-07-19 22:44:28 +02:00
Peter Simons
c0b5213aad
haskell-hfsevents: remove obsolete override
...
cabal2nix generates correct build instructions now.
Fixes https://github.com/NixOS/nixpkgs/pull/17046 .
2016-07-19 14:20:53 +02:00
Peter Simons
450fa8d9a0
hackage-packages.nix: update Haskell package set
...
This update was generated by hackage2nix v2.0-11-gcec8f95 using the following inputs:
- Hackage: https://github.com/commercialhaskell/all-cabal-hashes/commit/19ec8f3a6d22036c2f0940213648fd16d5c444fa
- LTS Haskell: https://github.com/fpco/lts-haskell/commit/a5a99cf17698741e56c8efdf50989692c2e363e0
- Stackage Nightly: https://github.com/fpco/stackage-nightly/commit/bf146896f35132bf340fe59b27feb0f796c867b2
2016-07-19 14:20:40 +02:00
Robin Gloster
203846b9de
Merge remote-tracking branch 'upstream/master' into hardened-stdenv
2016-07-19 10:37:02 +00:00
Peter Simons
3bfe30a042
haskell: update our Hackage database to the latest version
2016-07-16 13:34:06 +02:00
Peter Simons
1b0e82d6ff
Merge pull request #16974 from khumba/hoppy+qtah-maintainer
...
hoppy, qtah: add myself as maintainer
2016-07-15 20:27:22 +02:00
Robin Gloster
5185bc1773
Merge remote-tracking branch 'upstream/master' into hardened-stdenv
2016-07-15 14:41:01 +00:00
Peter Simons
9fc0347c93
Merge pull request #16262 from basvandijk/fix-inline-c-cpp-darwin
...
inline-c-cpp: fix build on darwin
2016-07-15 16:21:46 +02:00
Bryan Gardiner
5e685121e4
hoppy, qtah: add myself as maintainer
2016-07-14 23:07:53 -07:00
Peter Simons
6af0f57f91
haskell-binary: update to latest version
2016-07-14 22:13:48 +02:00
Peter Simons
d477991c48
hackage-packages.nix: update Haskell package set
...
This update was generated by hackage2nix v2.0-4-gb156b94 using the following inputs:
- Hackage: https://github.com/commercialhaskell/all-cabal-hashes/commit/5bb0a1b20f0c9cc20c5e0c9c33deac5e855bb316
- LTS Haskell: https://github.com/fpco/lts-haskell/commit/a5a99cf17698741e56c8efdf50989692c2e363e0
- Stackage Nightly: https://github.com/fpco/stackage-nightly/commit/3664752ea8eaaca08dcc932bfcfaf3a3e20eddc4
2016-07-14 22:13:09 +02:00
Peter Simons
8436458865
hackage-packages.nix: update Haskell package set
...
This update was generated by hackage2nix v2.0-2-g0bc3d6d using the following inputs:
- Hackage: https://github.com/commercialhaskell/all-cabal-hashes/commit/d6d83232276db2efedab449dabc84736457319de
- LTS Haskell: https://github.com/fpco/lts-haskell/commit/52eeaf4edc30c81a4fbeddc7b7b01530052a1835
- Stackage Nightly: https://github.com/fpco/stackage-nightly/commit/64dfa6aa2ef929d199ce31da6776e66289de76e1
2016-07-07 17:18:35 +02:00
Peter Simons
6a6b8fa36f
cabal2nix: update to version 2.0 from Hackage
...
I've realized that publishing updates to Hackage is far easier than
publishing updates in Nixpkgs, and since all Hackage updates show up in
Nix automatically I've decided to go back to publishing cabal2nix on
Hackage again.
Unfortunately, this means that I'll have to change the version numbering
scheme to comply with the expectations of the Haskell PVP (which is used
by Stackage), so the new version 2.0 looks like a downgrade to Nix,
which used to have version 20160406. :-(
If in doubt, run "nix-env -u --always" to force the update. I am sorry
about the inconvenience.
2016-07-05 23:45:41 +02:00
Peter Simons
a828d79a8a
hackage-packages.nix: update Haskell package set
...
This update was generated by hackage2nix v2.0-2-g0bc3d6d using the following inputs:
- Hackage: https://github.com/commercialhaskell/all-cabal-hashes/commit/fcabbcc70b8550e9f23094cd3f0d96d9bbafe925
- LTS Haskell: https://github.com/fpco/lts-haskell/commit/52eeaf4edc30c81a4fbeddc7b7b01530052a1835
- Stackage Nightly: https://github.com/fpco/stackage-nightly/commit/ff50bc1a46558a6e060888b0f655c453d277eeed
2016-07-05 23:45:41 +02:00
Peter Simons
cbcb23dcf6
hackage-packages.nix: update Haskell package set
...
This update was generated by hackage2nix v20160613-12-g1145e86 using the following inputs:
- Hackage: https://github.com/commercialhaskell/all-cabal-hashes/commit/8b1e5923b5f2d5a438f8936ecfc8ef4d39782004
- LTS Haskell: https://github.com/fpco/lts-haskell/commit/1c63caa7b8636d6096141d19ed5fb9becd89ce8d
- Stackage Nightly: https://github.com/fpco/stackage-nightly/commit/39da79acedd8aaa9d22fb962825f7ebc27a25585
2016-07-02 20:59:02 +02:00
Peter Simons
14a42dba66
haskell-semigroups: add missing overrides for old version of the package
2016-07-01 12:01:04 +02:00
Peter Simons
ec2e568b35
configuration-hackage2nix.yaml: disable failing builds
2016-07-01 12:01:04 +02:00
Peter Simons
a7e33a1a1e
cabal2nix: update to version 20160613-10-g57dddc7
2016-07-01 12:01:03 +02:00
Peter Simons
77f6750ef0
hackage-packages.nix: update Haskell package set
...
This update was generated by hackage2nix v20160613-12-g1145e86 using the following inputs:
- Hackage: https://github.com/commercialhaskell/all-cabal-hashes/commit/53b696d106af368394e115af7436b8006438aa91
- LTS Haskell: https://github.com/fpco/lts-haskell/commit/1c63caa7b8636d6096141d19ed5fb9becd89ce8d
- Stackage Nightly: https://github.com/fpco/stackage-nightly/commit/affdd756e95c75255334ae0bbbca16a6b9117885
2016-07-01 12:00:58 +02:00
Peter Simons
e2c1926758
hackage-packages.nix: update Haskell package set
...
This update was generated by hackage2nix v20160613-11-g57dddc7 using the following inputs:
- Hackage: https://github.com/commercialhaskell/all-cabal-hashes/commit/6d525b650213a9a4a2ebba7ccc1d76ff6b0793a1
- LTS Haskell: https://github.com/fpco/lts-haskell/commit/1c63caa7b8636d6096141d19ed5fb9becd89ce8d
- Stackage Nightly: https://github.com/fpco/stackage-nightly/commit/b1d16f45deb15ff4de8a781557ad75f855eaa636
2016-06-29 11:54:27 +02:00
Peter Simons
99c6c9d42f
Merge pull request #16370 from rasendubi/haskell-hoogle
...
haskell-hoogle: adapt to GHC docs split
2016-06-20 23:52:47 +02:00
Alexey Shmalko
87aa864ff9
haskell-hoogle: adapt to GHC docs split
...
The docs were split at #16167 and broke google support. @peti fixed
build, however hoogle still didn't see packages shipped with GHC. This
patch fixes location of the libraries shipped with GHC.
2016-06-20 22:52:20 +03:00
Peter Simons
06d3636596
git-annex: update sha256 hash
2016-06-20 17:01:36 +02:00
Peter Simons
1178ccf085
hackage-packages.nix: update Haskell package set
...
This update was generated by hackage2nix v20160613-7-g3089457 using the following inputs:
- Hackage: https://github.com/commercialhaskell/all-cabal-hashes/commit/08c95c9ddf84ea3dd40e3cfd73210aaddc675e34
- LTS Haskell: https://github.com/fpco/lts-haskell/commit/2a2cddb4431c7e6766c0fef56c72540787e804a8
- Stackage Nightly: https://github.com/fpco/stackage-nightly/commit/5f88469291856faed11c15ab9de4aaf4224cff15
2016-06-20 17:01:36 +02:00
Peter Simons
06489a1850
haskell-hoogle: remedy some fallout from https://github.com/NixOS/nixpkgs/pull/16167
...
ghcWithHoogle builds with this patch applied, but it's probably still broken in
the sense that links might point nowhere or that the generated databases and/or
documentation might be incomplete.
2016-06-20 14:50:52 +02:00
Bjørn Forsman
bd01fad0ed
Captialize meta.description of all packages
...
In line with the Nixpkgs manual.
A mechanical change, done with this command:
find pkgs -name "*.nix" | \
while read f; do \
sed -e 's/description\s*=\s*"\([a-z]\)/description = "\u\1/' -i "$f"; \
done
I manually skipped some:
* Descriptions starting with an abbreviation, a user name or package name
* Frequently generated expressions (haskell-packages.nix)
2016-06-20 13:55:52 +02:00
Bas van Dijk
d0c7056b92
inline-c-cpp: fix build on darwin
2016-06-16 01:03:22 +02:00
YPares
3868cad832
haskell: generic-stack-builder sets an env var
...
generic-stack-builder was not setting STACK_PLATFORM_VARIANT="nix".
This is required by stack when handling its haskell packages database
snapshot. Stack must keep separated packages built with its own GHC
and those built with GHC from Nixpkgs.
2016-06-15 17:08:41 +02:00
Peter Simons
8d86c8274f
callHackage: generate expressions for the appropriate target system and compiler
2016-06-13 23:09:56 +02:00
Peter Simons
ee933f5d73
hackage-packages.nix: update Haskell package set
...
This update was generated by hackage2nix v20160613 using the following inputs:
- Hackage: https://github.com/commercialhaskell/all-cabal-hashes/commit/b9e58743e7306da155ed866b797f543556d3c479
- LTS Haskell: https://github.com/fpco/lts-haskell/commit/2a2cddb4431c7e6766c0fef56c72540787e804a8
- Stackage Nightly: https://github.com/fpco/stackage-nightly/commit/4b8c8abac5f38c31d90cf256565821716aa89a50
2016-06-13 23:09:44 +02:00
Peter Simons
52edff8689
Merge pull request #15989 from mboes/stack-builder-tweaks
...
haskell.lib.buildStackProject: allow passing in a custom GHC version.
2016-06-13 12:15:11 +02:00
Michael Alan Dorman
b40e1efe00
haskell generic-builder: don't propagate setupHaskellDepends
...
Without this patch, attempts to install at least some of the packages
that start to use setupHaskellDepends (mostly gtk-related packages)
results in collisions:
building path(s) ‘/nix/store/63k5smns43f5r2ad8wcc242x0gwd70m3-ghc-8.0.1’
collision between `/nix/store/k18i1nm5hgnb82y9w2g9hmlwhk3szjld-ghc-8.0.1/lib/ghc-8.0.1/Cabal-1.24.0.0/Distribution/Compat/Binary.dyn_hi' and `/nix/store/0rwhbwsg9kmywgbrib2bs29p2hmi80za-Cabal-1.24.0.0/lib/ghc-8.0.1/Cabal-1.24.0.0/Distribution/Compat/Binary.dyn_hi'
builder for ‘/nix/store/vrjkfpm8sb96m9i5k74h8vn0rwddgy4v-ghc-8.0.1.drv’ failed with exit code 25
This would appear to me to be a consequence of setupHaskellDepends
entries being added to propagateBuildInputs. It is sufficient in the
cases I'm familiar with (taffyBar), and I think correct, to simply add
it to the otherBuildInputs.
2016-06-13 09:51:35 +02:00
Mathieu Boespflug
70bc97b731
haskell.lib.buildStackProject: fix treatment of LD_LIBRARY_PATH.
...
Don't make LD_LIBRARY_PATH pick up cwd when original string is empty,
due to colon terminated search path.
2016-06-13 00:55:34 +02:00