3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

4739 commits

Author SHA1 Message Date
Peter Simons 111a1b868e haskell-ormolu: update override 2020-02-28 20:42:28 +01:00
Peter Simons 78a2350f2c haskell-construct: drop obsolete overrides 2020-02-28 20:42:27 +01:00
Peter Simons 73af2522be haskell-ChasingBottoms: jailbreak to fix build with ghc-8.10.x 2020-02-28 20:42:27 +01:00
Peter Simons 1299f72e8b haskell-spacecookie & matterhorn: clean up overrides 2020-02-28 20:42:27 +01:00
Peter Simons 9347a3e5be ghc-8.10.x: add overrides to fix regex-* packages 2020-02-28 20:42:26 +01:00
Peter Simons ba190861e8 haskell-relude: avoid test suite failure when building with ghc-8.8.x 2020-02-28 20:42:26 +01:00
Peter Simons 95f15e7b31 haskell-polyparse: the latest version works with ghc-8.8.x 2020-02-28 20:42:26 +01:00
Justin Humm 5fb67fc448 haskellPackages.hakyll-contrib-hyphenation: jailbreak
Latest upstream commit is from 2015 [0], so I guess it's the easiest to
jailbreak it (as it builds that way).

[0] https://bitbucket.org/rvlm/hakyll-contrib-hyphenation/src/master/
2020-02-28 20:42:25 +01:00
Domen Kožar 21ded2d667 servant-server: fix build 2020-02-28 20:42:25 +01:00
Domen Kožar 16b8ab5329 haskellPackages.crpytonite: fix build 2020-02-28 20:42:24 +01:00
Peter Simons 7e5690c088 hackage-packages.nix: automatic Haskell package set update
This update was generated by hackage2nix v2.15.0-19-g1b9b3ef from Hackage revision
f2eea06cf2.
2020-02-28 20:42:15 +01:00
Peter Simons 49640dda72 hackage2nix: let's try to compile everything to see what works 2020-02-28 20:31:26 +01:00
Peter Simons f95d327f4e haskell-primitive: avoid infinite recursion during evaluation 2020-02-28 20:31:26 +01:00
Peter Simons 93b4f52f2c haskellPackages: drop obsolete overrides that break evaluation 2020-02-28 20:31:26 +01:00
Silvan Mosberger ef30908eef haskellPackages.streamly-bytestring: Fix build 2020-02-28 20:31:25 +01:00
Silvan Mosberger b359080688 haskellPackages.construct: Fix build 2020-02-28 20:31:25 +01:00
Silvan Mosberger 87fc484219 haskellPackages.bitwise-enum: Fix build 2020-02-28 20:31:25 +01:00
Silvan Mosberger df0392dc3c haskellPackages.Chart-tests: Fix build 2020-02-28 20:31:24 +01:00
Simon Chatterjee fdb4ed35ed haskell-gtk2hs packges: fixes for building on Darwin
This includes two layered changes so the gtk2hs packages build on Darwin:

 - For `glib`, `gio`, `gtk`, `gtk3`, and `pango`: the fix for version 0.13.8.0
   from https://github.com/gtk2hs/gtk2hs/pull/293 . I expect at some point the
   referenced fix (or one like it) will be released and and brought into
   nixpkgs, at which point the override and patch files here can (in fact must)
   be removed.

 - For `gtk` and `gtk3`: also apply the required cabal flag cited in
   https://github.com/gtk2hs/gtk2hs/issues/249 to specify the Quartz rather than
   X11 backend (Quartz is the one that both nixpkgs and macOS support
   out-the-box). This override is likely to be wanted indefinitely.

Both modifications are required for a successful build of `gtk` or `gtk3` on
Darwin right now.
2020-02-28 20:31:24 +01:00
Domen Kožar 524535f185 configuration-ghc-8.8.x: fix eval 2020-02-28 20:31:24 +01:00
Simon Chatterjee 4f39597903 spago: fix Darwin build
This change gets round a weird permissions error on darwin
2020-02-28 20:31:23 +01:00
Simon Chatterjee 3d7b19344d haskell-cabal-fmt: override Cabal to version 3.0.x 2020-02-28 20:31:23 +01:00
Peter Simons ee52b6ac68 haskell-brick: update overrides to the latest version 2020-02-28 20:31:23 +01:00
Peter Simons 79e53ba252 hackage2nix: update list of broken packages 2020-02-28 20:31:22 +01:00
Peter Simons aba43b8c3e ghc-8.8.x: update override for lens to the latest version 2020-02-28 20:31:22 +01:00
(cdep)illabout c44ded75fe haskellPackages.mplayer-spot: add runtime dependency on mplayer 2020-02-28 20:31:22 +01:00
(cdep)illabout a0171c6439 haskellPackages.prettyprinter: make sure everything depends on this correctly 2020-02-28 20:31:22 +01:00
(cdep)illabout 025faad9a9 haskell.packages.ghc882.policeman: fix up ansi-terminal dep 2020-02-28 20:31:21 +01:00
(cdep)illabout b6f45d056a haskellPackages.cabal-plan: fix up ansi-terminal dep 2020-02-28 20:31:21 +01:00
(cdep)illabout b68c9dda98 spago: 0.13.1 -> 0.14.0 2020-02-28 20:31:21 +01:00
Christian Lütke-Stetzkamp 671db18e22 haskellPackages.hledger-flow: do not build static
Fixes #68840
2020-02-28 20:31:20 +01:00
Peter Simons ea1aae15ae hackage-packages.nix: automatic Haskell package set update
This update was generated by hackage2nix v2.15.0-19-g1b9b3ef from Hackage revision
2054fb03f4.
2020-02-28 20:31:20 +01:00
Christian Lütke-Stetzkamp 15d71ed75b hackage2nix: restrict gi-gdkx11 to versions below 4
... because gi-gdkx11-4.x requires gtk-4.x, which is still under
development and not yet available in Nixpkgs

Fixes #77588
2020-02-28 20:31:19 +01:00
Christian Lütke-Stetzkamp cf8e796dd1 hackage2nix: mark taffybar as unbroken
...it builds because gi-gdkx11 is no longer broken

Fixes #63500
2020-02-28 20:31:19 +01:00
Christian Lütke-Stetzkamp 494124603a hackage2nix: mark http-streams not broken
Fixes #79227
2020-02-28 20:31:19 +01:00
Peter Simons dbc7989d3f hackage2nix: update to ghc-8.8.2 for lts-15.x 2020-02-28 20:31:18 +01:00
Peter Simons 9bc4a358cf LTS Haskell 15.1 2020-02-28 20:31:13 +01:00
John Ericson 196682b175 Merge remote-tracking branch 'upstream/master' into work-on-multi-shellFor 2020-02-22 17:34:08 -05:00
John Ericson 1c07ee7925 haskell shellFor: Fix hoogle 2020-02-22 13:10:30 -05:00
Simon Chatterjee 019e86fde9
haskell generic-builder: fix Darwin regression for lmdb
Recent updates to the generic builder have caused haskellPackages.lmdb-simple to
fail to build on Darwin, since it cannot see the lmdb C dynamic library included
by its dependent haskellPackages.lmdb.

The C dynamic library has suffix `.so` not `.dylib`, so this fix allows for
that.

Closes #80190, but that issue may identify a preferable solution.
2020-02-17 09:41:31 +01:00
Silvan Mosberger cfc21ad059
Revert "haskell generic-builder: fix Darwin regression for lmdb"
This reverts commit 8c58c44aae.

This causes a mass rebuild and should go to staging instead before
master
2020-02-17 09:36:53 +01:00
Simon Chatterjee 8c58c44aae haskell generic-builder: fix Darwin regression for lmdb
Recent updates to the generic builder have caused haskellPackages.lmdb-simple to
fail to build on Darwin, since it cannot see the lmdb C dynamic library included
by its dependent haskellPackages.lmdb.

The C dynamic library has suffix `.so` not `.dylib`, so this fix allows for
that.

Closes #80190, but that issue may identify a preferable solution.
2020-02-15 17:40:54 +00:00
Peter Simons abd5926447 haskell-policeman: don't build this package with ghc-8.6.x 2020-02-07 20:55:41 +01:00
Peter Simons e7dce63d54 haskell-cabal2spec: override Cabal to version 3.0.x 2020-02-07 20:44:24 +01:00
Peter Simons 04e3f52eb0 git-annex: update sha256 hash for new version 7.20200204 2020-02-07 20:38:00 +01:00
Peter Simons 38784c7916 ghc-lib-parser: update overrides for the latest version 2020-02-07 20:38:00 +01:00
Nathan van Doorn c13abc9509 haskellPackages.perhaps: add link to pull request fixing dependencies 2020-02-07 20:37:59 +01:00
Peter Simons 92f21f7159 haskell-lens: use latest version when building with ghc-8.8.x 2020-02-07 20:37:59 +01:00
Peter Simons 44d258777c haskell-brick: update overrides to latest version 2020-02-07 20:37:59 +01:00
Peter Simons ddb6d70051 haskell-js-flot: disable test suite to break infinite evaluation cycle 2020-02-07 20:37:58 +01:00
Peter Simons 0358bc066f hackage-packages.nix: automatic Haskell package set update
This update was generated by hackage2nix v2.15.0-19-g1b9b3ef from Hackage revision
f57c80f238.
2020-02-07 20:37:52 +01:00
Peter Simons 86f1da3933 hackage2nix: update list of broken packages 2020-02-07 20:31:53 +01:00
Nathan van Doorn eaca900965 haskellPackages.perhaps: jailbreak
It has an overly tight dependency on doctest.

I've removed it from the list of broken builds in the yaml and I've made
a PR upstream too.
2020-02-07 20:31:53 +01:00
Peter Simons a87b506140 LTS Haskell 14.23 2020-02-07 20:31:52 +01:00
Bas van Dijk 1cbb793ec8 haskellPackages.servant: fix sha256
My build server which isn't using cache.nixos.org discovered an
outdated hash in servant:

```
trying https://github.com/haskell-servant/servant/archive/v0.16.2.tar.gz
  % Total    % Received % Xferd  Average Speed   Time    Time     Time  Current
                                 Dload  Upload   Total   Spent    Left  Speed
100   132    0   132    0     0    616      0 --:--:-- --:--:-- --:--:--   616
100  295k    0  295k    0     0   269k      0 --:--:--  0:00:01 --:--:--  384k
unpacking source archive /build/v0.16.2.tar.gz
hash mismatch in fixed-output derivation '/nix/store/i6qgxlqf599wl11rd44jasgmwb78wr6c-source':
  wanted: sha256:0kqglih3rv12nmkzxvalhfaaafk4b2irvv9x5xmc48i1ns71y23l
  got:    sha256:0xk3czk3jhqjxhy0g8r2248m8yxgvmqhgn955k92z0h7p02lfs89
```
2020-02-07 10:12:49 +01:00
Peter Simons f206eea2cf ghc-8.10.x: add a bunch of jailbreaks to fix builds 2020-01-31 22:13:06 +01:00
Peter Simons a7712a1a31 hackage-packages.nix: automatic Haskell package set update
This update was generated by hackage2nix v2.15.0-16-g2971916 from Hackage revision
d77d0f7de2.
2020-01-31 21:39:55 +01:00
Peter Simons 5e90d04ee7 haskell-bustle: simplify the override now that those changes are in cabal2nix
Might be of interest to @jtojnar.
2020-01-31 21:38:10 +01:00
Peter Simons 6d068993b5 haskell-relude-6.0.0.0 does not pass its doctest suite 2020-01-31 21:05:56 +01:00
Peter Simons 6516c12dbe haskell-policeman: add overrides to provide newer versions of dependencies 2020-01-31 21:05:56 +01:00
Silvan Mosberger 8d4509e34d haskell generic-builder: Fix package conf handling
Previously the package conf files were handled without paying attention
to the fact that it's pretty-printed output. One problem was discovered
with GHC 8.8.1 on Darwin, where the dynamic-library-dirs first field
seems to have increased in length, meaning while before it was

    dynamic-library-dirs: some-small-directory-name
                          some-more-directories

Now it is

    dynamic-library-dirs:
        some-larger-directory-name
        some-more-directories

Which breaks the code installed for https://github.com/NixOS/nixpkgs/pull/25537,
because that assumed the former format, resulting in the reoccurence of
the bug in https://github.com/NixOS/nixpkgs/issues/22810, see
https://github.com/Infinisil/all-hies/issues/43

This commit fixes this by "unprettyfying" the package conf files before
processing them.

Closes https://github.com/NixOS/nixpkgs/pull/78738.
2020-01-31 21:05:56 +01:00
Peter Simons 2b10aed0d7 ghc-8.8.x: update version overrides for microlens packages 2020-01-31 21:05:56 +01:00
Peter Simons 135cc0c58d haskell-cabal-plan: update overrides for new version of base-compat 2020-01-31 21:05:55 +01:00
Jan Tojnar 4141619331 haskellPackages.bustle: fix building on Hydra
Bustle is proclaiming OtherLicense even though the code is licensed under LGPL 2.1+. This causes cabal2nix to set hydraPlatforms = stdenv.lib.platforms.none in hackage-packages.nix for the package.

Lets let's unset the attribute and fix the license.
2020-01-31 21:05:55 +01:00
Jan Tojnar 3430ded6c8 haskellPackages.bustle: clean up with lib.pipe 2020-01-31 21:05:55 +01:00
Peter Simons 8e8b8a5b6c hackage-packages.nix: automatic Haskell package set update
This update was generated by hackage2nix v2.15.0-14-gb942b6a from Hackage revision
5556d14668.
2020-01-31 21:05:44 +01:00
Peter Simons 78d58f61c5 hackage2nix: update list of broken packages 2020-01-31 21:05:39 +01:00
Peter Simons 3b5f3d1cb1 LTS Haskell 14.22 2020-01-31 21:05:38 +01:00
Keito Kajitani 38149ff88d haskellPackages.dhall-json_1_6_1: prettyprinter_1_6_0 2020-01-31 21:47:07 +09:00
Luka Blaskovic 668b3e7de4 configuration-ghc-8.2.x: use default llvmPackages 2020-01-30 18:35:30 -05:00
Luka Blaskovic 4fa34c2283 llvm-general: remove 2020-01-30 18:35:29 -05:00
Peter Simons 26dbde5dbc haskell-pandoc: disable test suite when building with ghc-8.8.x
pandoc-2.9.1.1 fails 1 test.
2020-01-27 10:00:45 +01:00
Peter Simons ade7cc1fd3 haskell-hlint: update override for new ghc-lib-parser-ex dependency 2020-01-24 21:02:44 +01:00
Peter Simons 15aa9dd0a3 haskell-prettyprinter: disable the failing test suite of version 1.6.0 2020-01-24 21:02:43 +01:00
Peter Simons 05a54d417b ghc-8.8.x: update overrides 2020-01-24 21:02:42 +01:00
Robert Djubek bb3a93fdb5 matterhorn: init at 50200.6.0
Command line mattermost client
2020-01-24 21:02:42 +01:00
Robert Djubek 8e5d5bac2e glirc: 2.33.1 -> 2.34
Really this is a fix of the build because of the automatic version bump
2020-01-24 21:02:42 +01:00
Peter Simons d8440b802e hackage-packages.nix: automatic Haskell package set update
This update was generated by hackage2nix v2.15.0-14-gb942b6a from Hackage revision
ac7dcf389a.
2020-01-24 21:02:23 +01:00
Peter Simons 67e8740904 hackage2nix: update the list of broken packages 2020-01-24 21:02:15 +01:00
Peter Simons 2f4dea687c LTS Haskell 14.21 2020-01-24 21:02:15 +01:00
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