Commit graph

3611 commits

Author SHA1 Message Date
Peter Simons
2fc9fee6b2 hackage2nix: disable broken Hydra builds 2018-09-24 21:18:51 +02:00
Bas van Dijk
36e8d638d4 haskellPackages.haddock-api: fix build
Also remove haddock-library == 1.4.4 since it's not needed anymore
2018-09-24 01:57:09 +02:00
Bas van Dijk
e1d51fa9e6 haskellPackages.yi-core: use overrideScope instead of override 2018-09-24 01:57:09 +02:00
Bas van Dijk
1d7b922238 haskellPackages.safe-money-*: use overrideScope instead of override 2018-09-24 01:57:09 +02:00
Bas van Dijk
38467261c3 haskellPackages.Frames: use overrideScope instead of override 2018-09-24 01:57:09 +02:00
Bas van Dijk
9b67908e67 haskellPackages.Euterpea: fix build by using PortMidi == 0.2 2018-09-23 22:50:04 +02:00
Bas van Dijk
73cf1c26d8 haskellPackages.Frames-beam: disable tests because it requires a running PostgreSQL server 2018-09-23 21:57:17 +02:00
Bas van Dijk
ff6122c993 haskellPackages.Frames: fix build by using vinyl-0.10.0 2018-09-23 21:54:25 +02:00
Peter Simons
7a036a5cbe hackage-packages.nix: automatic Haskell package set update
This update was generated by hackage2nix v2.11.1 from Hackage revision
c75652c02b.
2018-09-22 13:26:33 +02:00
Bas van Dijk
73862bf812 haskellPackages.mandrill: fix build for ghc843 2018-09-21 19:08:25 +02:00
John Ericson
8a41a11d66
Merge pull request #47096 from obsidiansystems/fix-x509-system
haskellPackages.x509-system: Override based on the host, not target platform
2018-09-20 21:55:24 -04:00
John Ericson
45c637d8a0 haskellPackages.x509-system: Override based on the host, not target platform
There were many reverts back and forth, but it ultimately appears that I
am the source of this mistake. I clarified the comment so as not to
confuse myself or anyone else.
2018-09-20 21:48:06 -04:00
Nathan van Doorn
c8598daad4 haskellPackages.sbv: fix location of z3 executable
A lot of the functionality of the z3 library depends on it being able to
find the z3 executable on $PATH. Hard-coding it here means it will never
be unable to find it and z3 doesn't need to pollute $PATH.
2018-09-20 11:45:16 +01:00
Peter Simons
6e4c666a67 git-annex: update sha256 hash for new version 6.20180913 2018-09-19 21:04:41 +02:00
Peter Simons
c18a0becf2 hackage-packages.nix: automatic Haskell package set update
This update was generated by hackage2nix v2.11.1 from Hackage revision
439b9af37f.
2018-09-19 21:04:41 +02:00
Peter Simons
72e2ab2c72 cabal2nix: update yaml override to the latest version 2018-09-19 21:04:41 +02:00
Michael Alan Dorman
c5467e8f73 cabal-install: use newer version of Cabal library 2018-09-19 21:04:41 +02:00
Peter Simons
4b129a73db hackage-packages.nix: automatic Haskell package set update
This update was generated by hackage2nix v2.11.1 from Hackage revision
d5215acecc.
2018-09-19 21:04:41 +02:00
Peter Simons
234a24cbeb LTS Haskell 12.10 2018-09-19 21:04:40 +02:00
Peter Simons
3c95fb13ee
Merge pull request #46893 from costrouc/costrouc/pandoc-crossref-refactor
haskellPackages.pandoc-crossref: refactor disable tests for 0.3.2.1
2018-09-19 20:50:50 +02:00
Chris Ostrouchov
e1ed5b26c9
haskellPackages.pandoc-crossref: refactor disable tests for 0.3.2.1
Author acknowleges test failing (change when no longer 0.3.2.1).
https://github.com/lierdakil/pandoc-crossref/issues/199
2018-09-19 14:47:41 -04:00
John Ericson
f4be0b45dd
Merge pull request #46872 from obsidiansystems/cross-haskell-ar-flag
haskell infra: Also pass `--with-ar` in cross builds
2018-09-18 19:14:13 -04:00
John Ericson
750933a17c haskell infra: Also pass --with-ar in cross builds 2018-09-18 18:49:58 -04:00
Nathan van Doorn
d6dc56180b
haskellPackages.JuicyPixels: re-enable Haddock
This was made to avoid an issue which was fixed in `3.2.9.3`. The version currently in `nixpkgs 18.03` is `3.2.9.4`, which includes this fix.
2018-09-18 15:29:58 +01:00
Bas van Dijk
0a30853461
Merge pull request #46512 from michaelpj/imp/haskell-benchmarks
haskell lib: add --enable-benchmarks in doBenchmark
2018-09-18 14:57:03 +02:00
John Ericson
9f768ff43c
Merge pull request #46795 from obsidiansystems/late-bind-buildHaskellPackages
haskell infra: "late bind" `buildHaskellPackages`
2018-09-17 16:20:56 -04:00
John Ericson
8da28de0e8 haskell infra: "late bind" buildHaskellPackages
This way it can be overridden.
2018-09-17 16:01:26 -04:00
Silvan Mosberger
7e5917a031
haskellPackages: Fix ListLike for 8.02 and 8.22 2018-09-17 03:54:03 +02:00
Peter Simons
e0c081c6ac haskell-cabal2nix: update override for hpack 0.31.0
* pkgs/development/haskell-modules/configuration-common.nix:
2018-09-12 13:14:22 +02:00
Peter Simons
9d47aaa3b6 hackage-packages.nix: automatic Haskell package set update
This update was generated by hackage2nix v2.11-9-gb3613cb from Hackage revision
e44c7d34b0.
2018-09-12 10:33:23 +02:00
Peter Simons
53d34305f6 haskell-stm: update overrides that use version 2.4.5.0 to version 2.4.5.1 2018-09-12 10:31:10 +02:00
Peter Simons
838b4fe552 haskell-Cabal: keep a copy of the 2.2.x version around in the package set 2018-09-12 10:31:09 +02:00
(cdep)illabout
da86e4255b haskellPackages.termonad: Add dontCheck and remove from dont-distribute-packages.
The doctests for termonad fail to build only with nix.  When building
without nix, the doctests run correctly:

https://github.com/cdepillabout/termonad/issues/15

This PR disables the tests for termonad, as well as removing it from
dont-distribute-packages.
2018-09-12 10:31:09 +02:00
Peter Simons
1c5d7ad52e cabal2nix: fix (and clean up)override for hpack dependency 2018-09-12 10:31:09 +02:00
Peter Simons
11930854a2 haskell-yaml: drop obsolete override 2018-09-12 10:31:08 +02:00
Peter Simons
1b1cb6305c hackage-packages.nix: automatic Haskell package set update
This update was generated by hackage2nix v2.11-9-gb3613cb from Hackage revision
3869e8d541.
2018-09-12 10:31:03 +02:00
Peter Simons
3c1af12544 LTS Haskell 12.9 2018-09-12 10:30:20 +02:00
Alexander Biehl
88ce4f5e8a More conservative SCC tagging for Haskell libraries
`all-functions` corresponds to `-fprof-auto` which places an SCC on every binding. It is well known that SCCs hinder GHC from doing its optimization magic and really slows down profiled code to a point where the profiling reports are completely skewed towards things that were completely optimized away in production settings. Concretely this shows up with things like lenses which do not carry runtime overhead when properly simplified.

`exported-functions` corresponds to GHCs `-fprof-auto-exported` which doesn't put SCCs on `INLINE`d code and in turn doesn't influence simplification of this basic but important stuff.
2018-09-12 10:30:20 +02:00
Alex Biehl
f8a158c346 Haskell builder: Use $abi/$libname as --libsubdir 2018-09-12 10:30:20 +02:00
Michael Peyton Jones
175c4f040f
haskell generic builder: enable benchmarks if doBenchmark is true 2018-09-11 16:24:26 +01:00
Bas van Dijk
d05a8bb410
Merge pull request #44424 from dhess/callCaball2nixWithOption
haskell-modules: add callCabal2nixWithOptions.
2018-09-11 09:00:03 +02:00
Arian van Putten
02feb90d4e safe-money: Fix dependencies for safe-money-*
They all depend on safe-money-0.7, but hackage2nix made them incorrectly
depend on safe-money-0.6

We should be able to remove this 'hack' as soon as the new Stackage LTS
comes out, as safe-money-0.7 will then be the default version.
2018-09-10 13:41:57 +02:00
Bas van Dijk
1fc5a6d2b6 haskell: build the tensorflow packages on hydra since they now build successfully 2018-09-06 09:15:56 +02:00
Bas van Dijk
a5f08c17e5 haskellPackages.tensorflow-mnist: fix missing dependency on tensorflow-mnist-input-data 2018-09-06 09:15:56 +02:00
Bas van Dijk
641025d410 haskellPackages.tensorflow-mnist-input-data: link data files instead of copying
This prevents duplication in the nix store.
2018-09-06 09:15:56 +02:00
Bas van Dijk
6bd8799448 haskellPackages.tensorflow-mnist-input-data: use an attribute set to specify the data files
This is more understandable and safer than using a nested list.
2018-09-06 09:15:50 +02:00
Matthieu Coudron
11e2009821 haskellPackages.tensorflow-mnist-input-data: fetch
Prefetch data so that the package doesn't try to connect to the internet.
2018-09-06 00:11:02 +09:00
Peter Simons
b35b8baddd
Merge pull request #45348 from shlevy/shellFor-all-build-inputs
haskellPackages.shellFor: fix after recent getHaskellBuildInputs fix.
2018-09-02 16:11:43 +02:00
John Ericson
0828e2d8c3 treewide: Remove usage of remaining redundant platform compatability stuff
Want to get this out of here for 18.09, so it can be deprecated
thereafter.
2018-08-30 17:20:32 -04:00
Bas van Dijk
97a4d29545 haskell: disable library profiling for static executables
Haskell packages overridden with justStaticExecutables
(like cabal-install, stack, pandoc, darcs, etc.) don't provide
libraries in the end result so it's futile to build them with library
profiling enabled because it will just take extra time.
2018-08-27 14:31:34 +02:00
Michael Alan Dorman
60cc518b22 xmonad: update nix patch
Regenerated against the current release.
2018-08-27 14:31:34 +02:00
Peter Simons
cd35b1cc9c hackage-packages.nix: automatic Haskell package set update
This update was generated by hackage2nix v2.11-7-gdb540bc from Hackage revision
d01233b4fa.
2018-08-27 14:31:34 +02:00
(cdep)illabout
78e2045f6d gi-vte: Remove from dont-distribute-packages 2018-08-27 14:31:33 +02:00
Peter Simons
e0d250e5cf LTS Haskell 12.7 2018-08-27 14:31:33 +02:00
Domen Kožar
82f11ba01b haskell generic builder: expose enableParallelBuilding 2018-08-26 23:20:41 +01:00
Eric Wolf
5d91e0f57d hunspell-hs: fix build
Using pkgconfig like jtojnar suggested.

Disables tests as some necessary data files
aren't included on hackage.
2018-08-26 20:44:39 +02:00
Bas van Dijk
170b8a85d2
Merge pull request #45053 from carlosdagos/skip-check-mattermost-api
haskellPackages.mattermost-api: skip check
2018-08-21 03:04:53 +02:00
Carlos D
0909282b1b haskellPackages.mattermost-api: skip check 2018-08-21 10:16:59 +10:00
John Ericson
60fc04c34b haskell lib: Add appendConfigureFlags
For consistency and completeness; other helpers have these "plural"
variants too.
2018-08-20 17:50:23 -04:00
Shea Levy
b00b2363b3
haskellPackages.shellFor: fix after recent getHaskellBuildInputs fix.
Fixes #45318
2018-08-19 15:17:35 -04:00
Peter Simons
08f48236d2 cabal2nix: update hpack override to the new version 2018-08-19 13:36:20 +02:00
Peter Simons
782e96e7d4 hackage-packages.nix: automatic Haskell package set update
This update was generated by hackage2nix v2.11 from Hackage revision
d5c89ad106.
2018-08-19 13:36:14 +02:00
Peter Simons
87ae21cd12 LTS Haskell 12.6 2018-08-19 13:34:59 +02:00
Peter Simons
8546be38e5 hackage-packages: avoid broken reference to gnome2.gnome-keyring
Fixes https://github.com/NixOS/nixpkgs/issues/44996.
2018-08-19 09:38:40 +02:00
Shea Levy
2d32f7daa8
haskellPackages.hadoop-rpc: Apply stack overflow patch on 8.4 as well. 2018-08-17 09:36:53 -04:00
Shea Levy
38396acd3b
haskellPackages.xmlhtml: Jailbreak for hspec 2.5 2018-08-17 09:25:35 -04:00
Shea Levy
a07cc456bc
haskellPackages.hoopl: Disable broken testsuite.
https://github.com/haskell/hoopl/issues/50
2018-08-17 09:02:24 -04:00
Shea Levy
9c32d185d1
haskellPackages.hasktags: Disable broken testsuite.
https://github.com/MarcWeber/hasktags/issues/52
2018-08-16 15:35:05 -04:00
Shea Levy
816f4ef188
haskellPackages.cabal-plan: Remove broken patch. 2018-08-16 15:16:54 -04:00
Eric Wolf
fe6ebf85b7 ghc-8.0.2: Fix #44987 (#45014)
nix-env -f '<nixpkgs>' -qaP -A haskell.packages.ghc802

will run again, but the packages depending on ghc-compact will still not
build, as they have a constrain on base >= 4.10 and ghc 8.0.2 has base
4.9.1.0
2018-08-15 14:53:20 +01:00
Shea Levy
7372d3bf31
haskell.lib.getHaskellBuildInputs: Actually get the haskell build inputs.
5523ec8f3c accidentally dropped the attribute lookup.
2018-08-14 17:05:36 -04:00
Domen Kožar
d2c55eb34a
haskellPackages.hpack: set to newest hpack to avoid conflicting hpack versions in closure 2018-08-14 11:42:10 +01:00
Domen Kožar
85f892b988
stack2nix: cleanup 2018-08-14 11:41:42 +01:00
Bas van Dijk
a70fbb8d9e haskell: upgrade the tensorflow packages
Also enable building on GHC-8.4.
2018-08-13 20:07:43 +02:00
Silvan Mosberger
a57c8579a8
Merge pull request #44568 from uskudnik/add-shellhook-support-to-buildstackproject
Add support for user-extensible shellHook to haskell.lib.buildStackProject
2018-08-13 19:39:43 +02:00
Izorkin
fdec6b1b8d servant-sphinx-documentation: fix sha256sum 2018-08-12 23:13:23 +03:00
Peter Simons
8121eebb9a git-annex: update sha256 hash for the new version 2018-08-12 11:35:23 +02:00
Peter Simons
3fe0751494 hackage-packages.nix: automatic Haskell package set update
This update was generated by hackage2nix v2.10.2-2-g5e5293d from Hackage revision
42f8c34fa4.
2018-08-12 11:35:24 +02:00
Bas van Dijk
9481513360 cabal2nix: fix build by overriding hpack to 0.29.6
Fixes: https://github.com/NixOS/cabal2nix/issues/369
2018-08-11 10:44:27 +02:00
Bas van Dijk
e9b7e73120
Merge pull request #44356 from ElvishJerricco/callcabal2nix-passthru-deriver
callCabal2nix: Passthru deriver
2018-08-11 10:34:06 +02:00
Will Fancher
08b766921d callCabal2nix: Passthru deriver 2018-08-10 11:38:09 -04:00
Silvan Mosberger
7f12361e62
yi: fix build 2018-08-09 22:28:25 +02:00
Urban Skudnik
01a8fa1a72 Add support for user-extensible shellHook to buildStackProject
buildStackProject is overridding shell hook and doesn't append
user-specified shellHook to it, resulting in user's shellHook
never executing.
2018-08-07 14:28:18 +02:00
Jan Tojnar
93168d887c
bustle: fix build 2018-08-07 12:08:10 +02:00
Michael Alan Dorman
8df4d87aee xmonad, xmonad-contrib, xmonad-extras: remove superfluous config
xmonad and xmonad-contrib no longer require patches, and
xmonad-contrib and xmonad-extras no longer need to be jailbroken.
2018-08-07 09:25:35 +02:00
Moritz Angermann
e1d180725b Update generic-builder.nix
Drop `hasActiveLibrary` altogether. The condition is wrong, `isLibrary` is the correct one. We can have non-static, non-shared libraries as well.
2018-08-07 09:25:35 +02:00
Moritz Angermann
e4a61c8b6e [haskell/generic-builder] windows always has an active library
This commit is not really correct. The `hasActiveLibrary` check is wrong.
We can have an active library even if we do not ask for a static lirbary or
dynamic one; we can still have just a set of objet files and archives.
2018-08-07 09:25:35 +02:00
Peter Simons
10b923930c hackage-packages.nix: automatic Haskell package set update
This update was generated by hackage2nix v2.10.2 from Hackage revision
e35bfea89e.
2018-08-07 09:25:35 +02:00
Domen Kožar
750e4888f8 hackage2nix: update list of failing Hydra builds
Ping @jb55 for broken "skeletons".
Ping @khumba for broken "hoppy-*".
2018-08-07 09:25:33 +02:00
Peter Simons
5bd2ca749d LTS Haskell 12.5 2018-08-07 09:25:33 +02:00
Travis Whitaker
a3e7fc876a haskellPackages.llvm-hs: Use LLVM 6 with llvm-hs, don't run tests on Darwin. 2018-08-05 07:46:10 -07:00
Drew Hess
4abb8be7ab
haskell-modules: add callCabal2nixWithOptions.
Fixes #44377.
2018-08-03 12:55:29 -07:00
Bas van Dijk
3328ea7749 haskellPackages.sexpr: fix build 2018-08-03 02:00:47 +02:00
Matt McHenry
afaaac2432 haskell-language-ecmascript: jailbreak to fix the build 2018-08-02 07:23:31 -04:00
Peter Simons
5c4b203032 hledger-lib: patch code to work around a regression in version 0.10
https://github.com/simonmichael/hledger/issues/852
2018-07-30 19:46:25 +02:00
Tim Steinbach
e7d57853b0 hnix: Fix build 2018-07-27 14:16:41 -07:00
Domen Kožar
059c2312be
haskell: move yaml overrides to configuration-nix 2018-07-25 15:17:56 +01:00
Domen Kožar
db557aab7b
haskell: remove/add some servant overrides 2018-07-25 09:02:40 +01:00
Peter Simons
006e298107 hackage-packages.nix: automatic Haskell package set update
This update was generated by hackage2nix v2.10.1-16-gf144800 from Hackage revision
8dc53de6a2.
2018-07-24 17:15:56 +02:00
Peter Simons
17784ef3d6 LTS Haskell 12.2 2018-07-24 17:15:26 +02:00