Commit Graph

4609 Commits

Author SHA1 Message Date
Matthew Bauer
07db0b248c Merge remote-tracking branch 'obsidiansystems/work-on-multi-shellFor' 2020-01-17 18:00:27 -05:00
Peter Simons
4758981603 haskell-ormolu: fix override for ghc-lib-parser 2020-01-17 21:14:34 +01:00
Peter Simons
fc1cafab42 haskell-dhall: update overrides for the new release
I dropped the override for dhall-to-cabal, because the package
is marked as broken already.
2020-01-17 21:14:34 +01:00
Peter Simons
8a5c2f6569 haskell-tls-session-manager: fix build with ghc-8.8.x 2020-01-17 21:14:34 +01:00
Peter Simons
8576e8b2c3 hackage-packages.nix: automatic Haskell package set update
This update was generated by hackage2nix v2.15.0-14-gb942b6a from Hackage revision
d1d0ee2298.
2020-01-17 21:14:33 +01:00
Peter Simons
40420dc313 haskell-doctemplates: provide the latest version when building pandoc 2.9.x 2020-01-17 21:14:33 +01:00
Peter Simons
672880966f haskell-ghc-lib-parser: update to latest version for hlint 2020-01-17 21:14:33 +01:00
Peter Simons
f3769d7015 hackage-packages.nix: automatic Haskell package set update
This update was generated by hackage2nix v2.15.0-14-gb942b6a from Hackage revision
b2812edaae.
2020-01-17 21:14:32 +01:00
Peter Simons
42273f0e67 hackage2nix: update list of broken packages 2020-01-17 21:14:32 +01:00
Peter Simons
cedb9c1c1c hackage2nix: honor LTS for lambdabot, but not for cabal2spec 2020-01-17 21:13:19 +01:00
Jacquin Mininger
7d67db3919 shellFor: Refactor for consistency and cross
This makes it work like work-on-multi from Reflex Platform. In
particular, rather than making `.env` from `shellFor`, we make `.env`
the primitive, and `shellFor` works by combining together the arguments
of all the packages to `generic-builder` and taking the `.env` of the
resulting mashup-package.

There are 2 benefits of this:

1. The dependency logic is deduplicated. generic builder just concatted
   lists, whereas all the envs until now would sieve apart haskell and
   system build inputs. Now, they both decide haskell vs system the same
   way: according to the argument list and without reflection.
   Consistency is good, especially because it mean that if the build
   works, the shell is more likely to work.

2. Cross is handled better. For native builds, because the
   `ghcWithPackages` calls would shadow, we through both the regular
   component (lib, exe, test, bench) haskell deps and Setup.hs haskell
   deps in the same `ghcWithPackages` call. But for cross builds we use
   `buildPackages.ghcWithPackages` to get the setup deps. This ensures
   everything works correctly.
2020-01-17 10:46:29 -05:00
John Ericson
ba9066abca Merge together merge bases of 19.09 and master 2020-01-15 18:54:36 -05:00
Peter Simons
29e871b2d0 haskell-krank: jailbreak to fix the build 2020-01-10 21:02:44 +01:00
Peter Simons
0685be711e git-annex: update sha256 hash for version 7.20191230 2020-01-10 20:56:20 +01:00
Peter Simons
4ef37f4210 haskell-hoogle: drop obsolete jailbreak
The latest version of hoogle accepts haskell-src-exts-1.23.x.
2020-01-10 20:56:20 +01:00
Peter Simons
7b8cdfabcd haskell-pandoc: update ghc-8.8.x override for the latest version 2020-01-10 20:56:20 +01:00
Peter Simons
1886028a3c haskell-tls: update ghc-8.8.x override for the latest version 2020-01-10 20:56:20 +01:00
Peter Simons
2c1f974db5 hackage2nix.yaml: update the comment that documents 'default-package-overrides' 2020-01-10 20:56:20 +01:00
(cdep)illabout
d11d55fd62 haskell: add comment to default-package-overrides in configuration-hackage2nix.yaml. 2020-01-10 20:56:20 +01:00
Merlin Göttlinger
900a378245 haskell: add quickjump option to the haskell mkDerivation
When visiting local documentation via hoogle, currently for most packages the
quickjump index is missing so you only get a sad error when pressing "s" to
search in the current documentation.

The quickjump option is only supported by the haddock utility that's shipped
with ghc 8.6.x or later.

Closes https://github.com/NixOS/nixpkgs/pull/75942.
2020-01-10 20:56:20 +01:00
Peter Simons
d8cf98b9c8 haskell-src-exts: update overrides for the new 1.23.0 version 2020-01-10 20:56:20 +01:00
Brian Hicks
dfa9d013e7 postgresql-typed: disable test suite
the test suite requires a running PostgreSQL instance to complete
successfully, so we'll just skip that.
2020-01-10 20:56:20 +01:00
Peter Simons
2514bddbf7 ghc-8.10.x: exceptions is now a core library that comes with the compiler 2020-01-10 20:56:19 +01:00
Peter Simons
2447c661d9 hackage-packages.nix: automatic Haskell package set update
This update was generated by hackage2nix v2.15.0-14-gb942b6a from Hackage revision
e75b27b8d5.
2020-01-10 20:56:08 +01:00
Marek Fajkus
efa816ab60 haskellPackages.hakyll-sass: unmark broken 2020-01-10 20:56:07 +01:00
Aditya Manthramurthy
cf2df51313 haskellPackages.webby: mark unbroken
Builds fine now.
2020-01-10 20:56:07 +01:00
Peter Simons
dbe97c772e hackage2nix: update list of broken builds 2020-01-10 20:56:07 +01:00
Peter Simons
323fe92057 LTS Haskell 14.20 2020-01-10 20:56:07 +01:00
Peter Simons
4a2aad0d39
Revert "haskell/with-packages-wrapper.nix: install "doc" outputs" 2020-01-10 15:20:08 +01:00
Alexander Foremny
9e808578c4 haskellPackages.ormolu: mark unbroken
Builds fine with 6b5bb4261c6dacbe65d348376c416c75ddafaebd
2020-01-10 14:54:33 +01:00
Alexander Foremny
47ddee700f haskellPackages.ormolu: fix overrides so it builds 2020-01-10 14:54:33 +01:00
Matthew Bauer
ddcaa0cd2f
Merge pull request #76842 from matthewbauer/add-doc-to-ghc-wrapper
haskell/with-packages-wrapper.nix: install "doc" outputs
2020-01-07 00:23:15 -05:00
Matthew Bauer
93aabab760 haskell/with-packages-wrapper.nix: remove /bin symlink if it exists
The wrapper need a writable directory to work, so remove the symlink
to a read-only one if it occurs.
2020-01-06 18:25:50 -05:00
Peter Simons
f2a218df59 git-annex: temporarily drop support for bup some more 2020-01-05 15:31:16 +01:00
Peter Simons
f172a19e79 git-annex: temporarily drop support for bup
The build is currently broken [1] and therefore blocks git-annex.

[1] https://github.com/NixOS/nixpkgs/issues/76979
2020-01-05 15:13:29 +01:00
Matthew Bauer
e915608618 haskell/with-packages-wrapper.nix: install "doc" outputs
We were previously just installing the "out" output which broke when
we recently changed to generating multiple outputs.

Fixes #76837
2020-01-02 16:12:46 -05:00
Frederik Rietdijk
555037a667 Merge master into staging-next 2019-12-31 16:35:53 +01:00
John Ericson
cfd013813e
Merge pull request #74090 from obsidiansystems/ghcjs-cross-without-cc
stdenv, haskell: bonafied GHCJS cross compilation without stdenv.cc
2019-12-30 16:40:43 -08:00
Robin Gloster
f9f46dc327
treewide: NIX_*_FLAGS -> string 2019-12-31 00:15:46 +01:00
Merijn Broeren
133103d709
treewide: replace make/build/configure/patchFlags with nix lists 2019-12-30 12:58:11 +01:00
Alexandre Esteves
af2eaec41a haskellPackages.multi-ghc-travis: add missing space (PR #76648) 2019-12-29 19:27:25 +01:00
Peter Simons
525b8cd3f6 ghc: add 8.10.1-alpha2 2019-12-27 20:58:23 +01:00
Peter Simons
fdd64fbc37 haskell-servant-{ekg,blaze}: jailbreak to fix the build 2019-12-27 20:37:13 +01:00
Peter Simons
4d403a3a51 haskell-ghcide: drop broken overrides
We made an effort to support ghcide in Nixpkgs, but the complexity of the
problem is a bit too high, IMHO. We need to keep older versions of several
packages around in order to satisfy the build requirements, and some of those
older packages don't even build themselves (like hie-bios). We had ghcide
working at some point, but then it was broken again right away after a couple
of days. I fear that we'll run into that issue again and again with a setup of
that complexity.

Instead, I'd propose that we work with upstream to fix their build, i.e. let's
make sure that the proper ghcide build works with recent versions of its build
inputs.

Closes https://github.com/NixOS/nixpkgs/pull/75449.
Closes https://github.com/NixOS/nixpkgs/pull/76103.
2019-12-27 20:37:13 +01:00
Peter Simons
4979823e46 git-annex: update sha256 hash for version 7.20191218 2019-12-27 20:37:13 +01:00
Peter Simons
dbcb34900a haskell-lsp-test: update override to the latest version 2019-12-27 20:37:13 +01:00
Peter Simons
6010ce05b7 pandoc: update override for the ghc-8.8.x to the latest version 2019-12-27 20:37:13 +01:00
Dmitry Kalinkin
c744527e3e gitAndTools.git-annex: fix darwin build
Closes: #76342
Fixes: #73435
2019-12-27 20:37:13 +01:00
(cdep)illabout
b7a5df05c3 spago: 0.12.1.0 -> 0.13.0 2019-12-27 20:37:13 +01:00
(cdep)illabout
54fad88234 haskellPackages.dhall_1_27_0: fix build 2019-12-27 20:37:13 +01:00