Commit graph

3553 commits

Author SHA1 Message Date
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
Jack Kelly
b2be524e30 haskellPackages.blank-canvas: Move fixes to configuration-common.nix 2018-07-24 10:32:00 +10:00
Bas van Dijk
f30bfcd623 doctest-discover: move override out of configuration-nix.nix
and move it to configuration-common.nix where it belongs.
configuration-nix.nix is only for fixing build failures
due to Nix.
2018-07-24 01:42:43 +02:00
Bas van Dijk
3d4ea59f20
Merge pull request #43959 from endgame/dontCheck-doctest-discover
haskellPackages.doctest-discover: Disable tests
2018-07-24 01:24:19 +02:00
Domen Kožar
cbb50b8188
haskellPackages.servant-streaming-server: dontCheck 2018-07-23 13:19:09 +01:00
Peter Simons
4ea202d328 hackage-packages.nix: avoid broken reference to libudev 2018-07-22 21:08:42 +02:00
Peter Simons
810c3e31b3
Merge pull request #43970 from LumiGuide/tensorflow-haskell-improvements
haskell: fix build of all tensorflow packages
2018-07-22 20:25:20 +02:00
Bas van Dijk
0ac253da1c hackage-packages.nix: automatic Haskell package set update
This update was generated by hackage2nix v2.10.1-8-gd90c8cc from Hackage revision
f98093ee9f.
2018-07-22 17:45:01 +02:00
Jan Tojnar
f94f861942
haskellPackages.bustle: fix build 2018-07-22 16:43:57 +02:00
Jan Tojnar
5b5a1b3445
haskellPackages.hgettext: jailbreak
https://github.com/haskell-hvr/hgettext/issues/14
2018-07-22 16:43:34 +02:00
Bas van Dijk
e60f4eef8d haskell: fix build of all tensorflow packages
* Since this commit changes configuration-hackage2nix.yaml it
  requires a hackage-packages.nix upgrade.

* Moved the tensorflow overrides out of configuration-ghc-8.2.x.nix
  and into the dedicated file configuration-tensorflow-ghc-8.2.x.nix
  for better readability.

* Add overrides for all the packages in the tensorflow-haskell
  repository.
2018-07-22 16:37:51 +02:00
Jack Kelly
2dd664140b haskellPackages.doctest-discover: Disable tests
The source package is missing a required file. See:

- https://github.com/karun012/doctest-discover/issues/22
- https://github.com/karun012/doctest-discover/issues/23
2018-07-22 17:08:43 +10:00
volth
cc55a3ebcb treewide: fix build with disallowed aliases (#43872)
fixes build with disallowed aliases
2018-07-21 22:03:24 -04:00
Peter Simons
8aaaf98045 hackage-packages.nix: automatic Haskell package set update
This update was generated by hackage2nix v2.10.1-7-ga1690c5 from Hackage revision
412c0df404.
2018-07-21 16:51:55 +02:00
Peter Simons
26b313accf git-annex: update sha256 hash for the new version 2018-07-21 16:22:13 +02:00
Bas van Dijk
ab4bff2b77 haskell: fix build of tensorflow on GHC-8.2 2018-07-21 16:22:13 +02:00
Bas van Dijk
7b510c47e1 haskell: add extra dependencies of tensorflow-proto 2018-07-21 16:22:13 +02:00
Peter Simons
aa9b50ccf3 hackage-packages.nix: automatic Haskell package set update
This update was generated by hackage2nix v2.10.1-5-gfad2fe7 from Hackage revision
43ea4ff82a.
2018-07-21 16:22:13 +02:00
Peter Simons
02f7053629 hackage2nix: disable reflex-dom-fragment-shader-canvas
The package depends on broken webkit and doesn't evaluate.
2018-07-21 16:22:13 +02:00
volth
6d2857a311 [bot] treewide: remove unused 'inherit' in let blocks 2018-07-20 19:38:19 +00:00
Frederik Rietdijk
1a6af9f88e
Merge pull request #43857 from volth/unused
[bot] treewide: remove unreferenced code
2018-07-20 21:06:32 +02:00
volth
87f5930c3f [bot]: remove unreferenced code 2018-07-20 18:48:37 +00:00
Peter Simons
65d209811a
Merge pull request #43509 from dtzWill/fix/hpc-coveralls-patch
hpc-coveralls: patch to fix build (for Cabal 2.2)
2018-07-20 09:13:04 +02:00
Silvan Mosberger
59159f9d8e haskellPackages.hnix: Fix build (#43824) 2018-07-19 19:18:44 +01:00
Peter Simons
b667721ce2
Merge pull request #43730 from srhb/dontcheck-spatial-rotation
haskellPackages.spatial-rotations: dontCheck for cyclic dependency
2018-07-19 14:00:55 +02:00
Sarah Brofeldt
b53b5950fc haskellPackages.spatial-rotations: dontCheck for cyclic dependency 2018-07-19 10:37:12 +02:00
Matthew Bauer
76999cc40e treewide: remove aliases in nixpkgs
This makes the command ‘nix-env -qa -f. --arg config '{skipAliases =
true;}'’ work in Nixpkgs.

Misc...

- qtikz: use libsForQt5.callPackage

  This ensures we get the right poppler.

- rewrites:

  docbook5_xsl -> docbook_xsl_ns
  docbook_xml_xslt -> docbook_xsl

diffpdf: fixup
2018-07-18 23:25:20 -04:00
Peter Simons
0ac5637ee9 Add a couple of overrides to fix builds in the ghc-8.6.x package set. 2018-07-18 10:27:39 +02:00
Peter Simons
194a2f0535 hackage-packages.nix: automatic Haskell package set update
This update was generated by hackage2nix v2.10.1 from Hackage revision
12c327a1fb.
2018-07-18 10:27:40 +02:00
Peter Simons
9aff5fcd56 LTS Haskell 12.1 2018-07-18 10:27:39 +02:00
Domen Kožar
6fd5287c36 haskell: don't error if isLibrary = true and no libraries exist
If empty directory isn't deleted, referer depenedencies will
fail with:

cp: missing destination file operand after '/tmp/nix-build-cabal-helper-0.8.0.2.drv-0/setup-package.conf.d/'

This is currently only the case for cabal-install, as cabal2nix
doesn't handle well buildable=False flags due to long-standing bugs
in Cabal itself.
2018-07-18 10:25:40 +02:00
Will Dietz
da5383006d haskell-modules: only include glibc locales when using glibc
Fixes #43665.
Hopefully. :)
2018-07-17 08:44:17 -05:00
Peter Simons
b412cac1d7
Merge pull request #43508 from nh2/haskell-dontStrip
haskell: Pass `dontStrip` to cabal. Fixes #43506
2018-07-17 08:57:32 +02:00
Peter Simons
9a32dafd05
Merge pull request #43444 from Infinisil/idris-cleanup
idris: Recurse into attrs, fix build and remove unneeded overrides
2018-07-16 20:38:53 +02:00
Peter Simons
c661f96968 Consistently pass versioned llvmPackages_x attributes to GHC.
Otherwise, these configurations are going to break when Nixpkgs updates
to llvm 6.x.
2018-07-16 10:56:36 +02:00
Peter Simons
55af91d4aa haskell-xmobar: the new release handles recent haskell-dbus version 2018-07-16 10:11:14 +02:00
Peter Simons
14dc80bc3e hackage-packages.nix: automatic Haskell package set update
This update was generated by hackage2nix v2.10.0-5-gc7420eb from Hackage revision
61ddd81557.
2018-07-16 09:57:49 +02:00
Will Fancher
2781b1fcbc Fix ghcjs-dom-jsffi with GHCJS 8.4 2018-07-15 23:47:47 -04:00
Will Fancher
68ea661bb4 Fix various packages under GHCJS 2018-07-15 23:47:46 -04:00
Will Fancher
8488982ee3 Fixed some core packages in GHCJS 8.4 2018-07-15 22:41:27 -04:00
Will Dietz
a16b7dfb6a hpc-coveralls: patch to fix build (for Cabal 2.2) 2018-07-13 23:39:17 -05:00
Niklas Hambüchen
e15496203e haskell: Pass dontStrip to cabal. Fixes #43506 2018-07-14 03:41:39 +02:00
Silvan Mosberger
d767c0c253
idris: Remove unneeded overrides
- The gmp issue has long been fixed and closed
- The preBuild thing was never used afaik, it works no problem without
it, especially since checks don't run (To get checks to work we'd have
to compile the libraries into idris, which are currently nicely
separated)
- The dependencies overrides aren't needed anymore
2018-07-13 00:59:30 +02:00
Will Dietz
ba602b0a5f haskell-{unix-time,prettyprinter}: dontCheck on musl 2018-07-12 11:04:25 -05:00
Peter Simons
e65bdb9199 xmonad-extras: jailbreak to build to cope with out patched version of xmonad
Fixes https://github.com/NixOS/nixpkgs/issues/43374.
2018-07-12 10:54:58 +02:00
Peter Simons
e1e707ce7f hackage-packages.nix: automatic Haskell package set update
This update was generated by hackage2nix 2.9.3-8-gb330eb5 from Hackage revision
5926b55f65.
2018-07-11 11:41:09 +02:00
Peter Simons
6fa41ca51f hackage2nix: disable failing Hydra builds 2018-07-11 11:41:08 +02:00
Peter Simons
4fe4ac341d haskell-stylish-cabal: build needs hspec < 2.5 to succeed 2018-07-11 11:10:45 +02:00
Peter Simons
ef967e2a40 hackage2nix: cosmetic (avoid use of tabs) 2018-07-10 21:49:18 +02:00
Peter Simons
0b0696f4ac haskell-stack: jailbreak to fix the build 2018-07-10 20:10:27 +02:00
Domen Kožar
d3a7439722 haskell-servant-swagger: disable tests until next release 2018-07-10 20:10:27 +02:00
Domen Kožar
7c35b1a006 haskell-amazonka: no need for overrides 2018-07-10 20:10:27 +02:00
Domen Kožar
b039854de1 haskell-lzma: dontCheck 2018-07-10 20:10:27 +02:00
Peter Simons
b49693a0fa haskell-taffybar: drop duplicate override for strictDeps 2018-07-10 20:10:27 +02:00
Peter Simons
e36fcd28a2 cabal2nix: help the regression test suite locate the cabal2nix binary 2018-07-10 20:10:27 +02:00
Peter Simons
1397830470 structured-haskell-mode: fix build with LTS 12.x 2018-07-10 20:10:27 +02:00
Peter Simons
dcd037c14a git-annex: fix the build in LTS 12.x
git-annex depends on 'esqueleto', which is not actively maintained. As a
result, 'esqueleto' fails to compile with recent versions of 'persistent',
which in turns requires us to link with old versions of 'conduit' and so on and
so forth. It's a disaster. I wasted several hours of my life trying to make
that build work, but eventually I gave up and dropped support for S3 and for
the Web app from git-annex to get rid of the most problematic dependencies.
That reduced version of git-annex is still difficult enough to compile, but at
least it's possible.
2018-07-10 20:10:27 +02:00
Peter Simons
1cc53afdd2 haskell-xmonad-contrib: apply patches to fix the build 2018-07-10 20:10:27 +02:00
Peter Simons
0c45d331c7 haskell-xmobar: build with older versions of its dependencies 2018-07-10 20:10:27 +02:00