Commit graph

3511 commits

Author SHA1 Message Date
Peter Simons ab5dcdddd1
Merge pull request #39456 from endgame/base-compat-batteries-deps
haskellPackages.base-compat-batteries: fix bad dependency
2018-04-27 12:41:18 +02:00
Jack Kelly c8b9ac9be6 haskellPackages.base-compat-batteries: fix bad dependency 2018-04-27 20:05:38 +10:00
John Wiegley a22b3e91b6 configuration-ghc-8.4.x.nix: Remove reference to non-existent bv_0_5 2018-04-26 17:20:51 -07:00
Jan Malakhovski 9345fc51d1 haskell-generic-builder: be explicit about doCheck, cleanup 2018-04-26 20:22:44 +00:00
Nikolay Amiantov bea11a34fb haskellPackages.encoding: fix build with Cabal 2.0 2018-04-26 17:01:14 +03:00
John Ericson b9acfb4ecf treewide: isArm -> isAarch32
Following legacy packing conventions, `isArm` was defined just for
32-bit ARM instruction set. This is confusing to non packagers though,
because Aarch64 is an ARM instruction set.

The official ARM overview for ARMv8[1] is surprisingly not confusing,
given the overall state of affairs for ARM naming conventions, and
offers us a solution. It divides the nomenclature into three levels:

```
ISA:             ARMv8   {-A, -R, -M}
                 /    \
Mode:     Aarch32     Aarch64
             |         /   \
Encoding:   A64      A32   T32
```

At the top is the overall v8 instruction set archicture. Second are the
two modes, defined by bitwidth but differing in other semantics too, and
buttom are the encodings, (hopefully?) isomorphic if they encode the
same mode.

The 32 bit encodings are mostly backwards compatible with previous
non-Thumb and Thumb encodings, and if so we can pun the mode names to
instead mean "sets of compatable or isomorphic encodings", and then
voilà we have nice names for 32-bit and 64-bit arm instruction sets
which do not use the word ARM so as to not confused either laymen or
experienced ARM packages.

[1]: https://developer.arm.com/products/architecture/a-profile

(cherry picked from commit ba52ae5048)
2018-04-25 15:50:41 -04:00
John Ericson ba52ae5048 treewide: isArm -> isAarch32
Following legacy packing conventions, `isArm` was defined just for
32-bit ARM instruction set. This is confusing to non packagers though,
because Aarch64 is an ARM instruction set.

The official ARM overview for ARMv8[1] is surprisingly not confusing,
given the overall state of affairs for ARM naming conventions, and
offers us a solution. It divides the nomenclature into three levels:

```
ISA:             ARMv8   {-A, -R, -M}
                 /    \
Mode:     Aarch32     Aarch64
             |         /   \
Encoding:   A64      A32   T32
```

At the top is the overall v8 instruction set archicture. Second are the
two modes, defined by bitwidth but differing in other semantics too, and
buttom are the encodings, (hopefully?) isomorphic if they encode the
same mode.

The 32 bit encodings are mostly backwards compatible with previous
non-Thumb and Thumb encodings, and if so we can pun the mode names to
instead mean "sets of compatable or isomorphic encodings", and then
voilà we have nice names for 32-bit and 64-bit arm instruction sets
which do not use the word ARM so as to not confused either laymen or
experienced ARM packages.

[1]: https://developer.arm.com/products/architecture/a-profile
2018-04-25 15:28:55 -04:00
Peter Simons 1d0a71879d haskell-brick: update override for ghc 8.4.x 2018-04-25 11:43:57 +02:00
Peter Simons 33e046271a haskell-vector-sized: update override 2018-04-25 11:43:56 +02:00
Peter Simons 7724ead286 haskell-{hlint,hoogle}: drop obsolete overrides 2018-04-25 11:43:56 +02:00
Peter Simons a49dca6821 haskell-monad-logger: drop obsolete override 2018-04-25 11:43:56 +02:00
Peter Simons 46cce6ef99 hackage-packages.nix: automatic Haskell package set update
This update was generated by hackage2nix v2.9.2-6-g7882850 from Hackage revision
5dcdcbfee8.
2018-04-25 11:43:49 +02:00
Peter Simons c60a874ef5 LTS Haskell 11.6 2018-04-25 11:28:16 +02:00
Peter Simons f22ce37e1f
Merge pull request #39265 from expipiplus1/vector-sized-1
Haskell Packages: Use correct version of indexed-list-literals for vector-sized-1.0.0.0
2018-04-21 08:18:25 +02:00
Peter Simons d1107d5dce
Merge pull request #39248 from PierreR/patch-1
Enable language-puppet again
2018-04-21 08:11:46 +02:00
Joe Hermaszewski 5778c4150a Haskell Packages: Use correct version of indexed-list-literals for vector-sized-1.0.0.0 2018-04-21 09:47:52 +08:00
Pi3r a36538f33c
Update configuration-hackage2nix.yaml 2018-04-20 22:41:48 +02:00
Peter Simons 2a488c9758
Merge pull request #39269 from chessai/fix-ghc84x-deriving-compat-unneeded
deriving compat was unneeded and prohibitive
2018-04-20 20:10:51 +02:00
chessai 6c6d3e8749 haskell.packages.ghc842: removed broken 8.4.x deriving-compat override 2018-04-20 14:09:43 -04:00
Peter Simons 6c577a37b6
Merge branch 'master' into hs-vulkan 2018-04-20 17:51:07 +02:00
Pi3r 844ba7e34a
Enable language-puppet again
The latest version of `language-puppet` now works with the latest `lts-11`:
https://www.stackage.org/lts-11.5/package/language-puppet-1.3.17
2018-04-20 15:49:41 +02:00
Peter Simons 7c1b8ac85f haskell-monad-logger: use latest version to avoid bug in current LTS version 2018-04-20 15:24:03 +02:00
Peter Simons 2c4e291083 haskell-brick: jailbreak for the benefit of GHC 8.4.2 2018-04-20 15:24:03 +02:00
Michael Alan Dorman cb7b52a1b1 hlint, hoogle: add override for extra package 2018-04-20 15:24:03 +02:00
Peter Simons 86e65430f6 hackage-packages.nix: automatic Haskell package set update
This update was generated by hackage2nix v2.9.2-6-g7882850 from Hackage revision
452dc1872a.
2018-04-20 15:24:02 +02:00
Peter Simons 657f3e099c hackage2nix: disable failing Hydra builds 2018-04-20 15:24:01 +02:00
Peter Simons 18053a4593 LTS Haskell 11.5 2018-04-20 15:24:01 +02:00
Joe Hermaszewski 7abfefaaf4 haskellPackages.vulkan: Fix dependency for vulkan 2018-04-19 17:23:20 +08:00
Michael Alan Dorman 9358f60f94 taffybar: fix build
Closes https://github.com/NixOS/nixpkgs/issues/38531.
2018-04-12 09:06:33 +02:00
Jan Tojnar 9ae378cc42
haskellPackages.lzma: fix outdated patch 2018-04-11 22:12:14 +02:00
Peter Simons 726ee1dbb8 git-annex: update sha256 hash for the new version 2018-04-11 11:25:30 +02:00
Peter Simons 531e1eb1e6 hackage-packages.nix: automatic Haskell package set update
This update was generated by hackage2nix v2.9.2-6-g7882850 from Hackage revision
b35023f435.
2018-04-11 11:25:30 +02:00
Peter Simons d10a7f0b26 LTS Haskell 11.4 2018-04-11 11:25:29 +02:00
Jack Kelly c2ce7070b1 Whitespace lint 2018-04-09 07:27:03 +10:00
Jack Kelly 2d01bb7f6a haskellPackages.blank-canvas: disable tests
The tests require a browser and possibly some manual
intervention. See https://github.com/ku-fpg/blank-canvas/issues/73
2018-04-09 07:26:50 +10:00
Peter Simons 2498bcb1c4 hackage-packages.nix: automatic Haskell package set update
This update was generated by hackage2nix v2.9.2-5-g17e0b6c from Hackage revision
fac6246666.
2018-04-08 08:57:13 +02:00
Michael Alan Dorman c83682bb68 gtk-traymanager: fix build 2018-04-08 08:56:57 +02:00
Peter Simons fac2951d8b
Merge pull request #38496 from jerith666/amazonka-fix
amazonka: fix build after hackage update
2018-04-06 10:51:02 +02:00
Matt McHenry 8ea70531de amazonka: fix build after hackage update
fixes #38306
2018-04-05 22:05:43 -04:00
Peter Simons c111b4bf80 haskell-alex: fix broken test suite 2018-04-04 15:00:25 +02:00
Peter Simons 821592f5ba haskell-data-inttrie: drop obsolete override 2018-04-04 15:00:24 +02:00
Peter Simons 170ea4f6c8 haskell-hackage-security: update override after Stackage update 2018-04-04 15:00:24 +02:00
Peter Simons 54d20d9a7c hackage-packages.nix: automatic Haskell package set update
This update was generated by hackage2nix v2.9.2-5-g17e0b6c from Hackage revision
e8d163b127.
2018-04-04 15:00:24 +02:00
Peter Simons f11302e665 hackage-packages.nix: automatic Haskell package set update
This update was generated by hackage2nix v2.9.2-3-g5b271ab from Hackage revision
2a6f701156.
2018-04-04 15:00:23 +02:00
Peter Simons 8a10401452 hackage-packages.nix: automatic Haskell package set update
This update was generated by hackage2nix v2.9.2-5-g611edf4 from Hackage revision
fb685155eb.
2018-04-04 14:59:54 +02:00
Peter Simons 5e39db2297 hackage-packages.nix: automatic Haskell package set update
This update was generated by hackage2nix v2.9.2-3-g5b271ab from Hackage revision
54d2fd4d50.
2018-04-04 14:59:53 +02:00
Peter Simons fc85a86e62 LTS Haskell 11.3 2018-04-04 14:59:53 +02:00
Peter Simons 97e891aee0
Merge pull request #38314 from ElvishJerricco/fix-ghcjs-7.10
Fix GHCJS 7.10
2018-04-03 18:15:44 +02:00
Will Fancher 5da837ad9c GHCJS: Fix GHCJS with haddock-library-1.4.3 2018-04-02 00:23:32 -04:00
Will Fancher 774253e56b Fix GHCJS 7.10 2018-04-01 23:25:37 -04:00
Matt McHenry 5dd5faddc0 elm: disable dependencies' tests to fix build
these haskell packages need their tests disabled after recent hackage
package version bumps.

partial fix for #38023
2018-04-02 01:05:03 +02:00
Peter Simons 6e3cb231e6 haskell-hledger: update post-install hooks for the new documentation scheme 2018-04-01 16:56:54 +02:00
Peter Simons d265fc7274 haskell-brick: update override for ghc 8.4.x 2018-04-01 16:56:54 +02:00
Peter Simons 932a07340c haskell-data-inttrie: use latest version for ghc 8.4.x 2018-04-01 16:56:54 +02:00
Peter Simons 7035e0345a hackage-packages.nix: automatic Haskell package set update
This update was generated by hackage2nix v2.9.2-3-g5b271ab from Hackage revision
1d76c4d88c.
2018-04-01 16:56:54 +02:00
Peter Simons 70ddb32cab Revert "Haskell: free-4.12.4 for ghc-7.10.x"
This reverts commit e419e98a24. It turns out the
older version is no longer required after all.
2018-04-01 11:45:44 +02:00
Will Fancher e419e98a24 Haskell: free-4.12.4 for ghc-7.10.x 2018-04-01 03:52:32 -04:00
Maxime Dénès a1e8bd39a5
haskellPackages.spdx: fix build
We disable tests which depend on old tasty (< 0.12).
2018-03-31 11:46:46 +02:00
Peter Simons 0f90640518 cabal-install: fix build of the latest version 2018-03-29 20:46:32 +02:00
Peter Simons c7c3f58fad haskell-resolv: disable test suite to fix the build 2018-03-29 20:46:32 +02:00
Peter Simons 9391f0912f haskell-flexible-defaults: apply patch to fix build with ghc 8.4.1 2018-03-29 20:46:32 +02:00
Peter Simons dc211abbb7 haskell-Cabal: update overrides for the new 2.2.0.1 release 2018-03-29 20:46:31 +02:00
Peter Simons a7203c54e8 haskell-arrows: apply patch to fix build with ghc 8.4.1 2018-03-29 20:46:31 +02:00
Peter Simons 508e583105 configuration-ghc-8.4.x.nix: update the list of core libraries 2018-03-29 20:46:31 +02:00
Peter Simons c9f7afa05b haskell-data-inttrie: update override for ghc 8.4.1 2018-03-29 20:46:31 +02:00
Peter Simons 5b54db1759 hackage-packages.nix: automatic Haskell package set update
This update was generated by hackage2nix v2.9.2-3-g5b271ab from Hackage revision
de5e4b8445.
2018-03-29 20:46:26 +02:00
Peter Simons f1a187f448 hackage2nix: update list of broken builds 2018-03-29 20:46:24 +02:00
Peter Simons c91a8b78b4
Merge pull request #38057 from bgamari/enableExecutableProfiling
haskell.lib: Add {en,dis}ableExecutableProfiling transformer
2018-03-29 20:41:37 +02:00
Ben Gamari d79fd43c9d haskell.lib: Add {en,dis}ableExecutableProfiling transformer
We already have {en,dis}ableLibraryProfiling and the builder already
accepts the executable profiling attribute; let's make it easy to use.
2018-03-29 13:33:48 -04:00
Will Fancher 0879138cb7 GHC: Don't use --profiling-detail on GHC < 8.0.2 2018-03-29 00:28:05 -04:00
Michael Alan Dorman dddf0314bc haskell-hnix: jailbreak deriving-compat dependency
Reported as https://github.com/jwiegley/hnix/issues/98
2018-03-27 20:43:55 +02:00
Peter Simons 234c42b8e6 haskell-json: drop obsolete override for GHC 8.4.1 2018-03-27 20:43:46 +02:00
Peter Simons 5dd264af42 haskell-getopt-generics: drop obsolete override for GHC 8.4.1 2018-03-27 20:43:46 +02:00
Peter Simons fc58ab2ff2 LTS Haskell 11.2
This update was generated by hackage2nix v2.9.2-2-gebc40be from Hackage revision
0200fecf27.
2018-03-27 20:43:36 +02:00
Matthew Bauer 970f2b5063 Revert "justStaticExecutables: enable -dead_strip on mac to shrink closure"
This reverts commit 24d313e203.

Fixes #37750
2018-03-26 20:57:32 -05:00
Shea Levy 2456060458
haskellPackages.lenz-template: Fix against lenz 3 2018-03-26 16:13:46 -04:00
Peter Simons 519fa22241
Merge pull request #37880 from mpickering/i-37856
Use up-to-date versions of singletons and th-desguar for GHC 8.4.1
2018-03-26 20:46:19 +02:00
Shea Levy 2b3ba40c03
haskellPackages.lenz: Remove outdated patch. 2018-03-26 13:40:22 -04:00
Matthew Pickering 5e7ab18437 Use up-to-date versions of singletons and th-desguar for GHC 8.4.1
Fixes #37856
2018-03-26 17:20:04 +00:00
Peter Simons 695897f799
Merge pull request #37754 from ElvishJerricco/call-hackage-keep-deriver
callHackage: Keep deriver, like callCabal2nix
2018-03-26 12:07:50 +02:00
Peter Simons 83f5012c58
Merge pull request #37825 from ElvishJerricco/fix-overriding-all-cabal-hashes
haskellPackages: Fix overriding all-cabal-hashes
2018-03-26 12:06:16 +02:00
Peter Simons caf83c6477
Merge pull request #37826 from ElvishJerricco/fix-node-executables-ghcjs
GHCJS: Fix autogenerated node executables
2018-03-26 12:05:42 +02:00
Will Fancher 41500cf2d7 Request older haddock library for haddock-api in GHC 8.0 2018-03-25 21:49:19 -04:00
Will Fancher 0a8359f18c GHCJS: Fix autogenerated node executables 2018-03-25 20:43:23 -04:00
Will Fancher 25856e37e3 haskellPackages: Fix overriding all-cabal-hashes 2018-03-25 20:39:38 -04:00
Peter Simons 7ac95d5a8a haskell-hledger-lib: drop obsolete override for ghc-8.4.x 2018-03-25 20:21:45 +02:00
Peter Simons dfa1640429 haskell-brick: fix override for ghc-8.4.x 2018-03-25 20:21:45 +02:00
Peter Simons 8446b031c4 hackage-packages.nix: automatic Haskell package set update
This update was generated by hackage2nix v2.9.2 from Hackage revision
6272b092cf.
2018-03-25 20:21:45 +02:00
Peter Simons 784dd64e8a hackage2nix: disable broken builds
The following maintained builds fail (since quite some time):

 - network-arbitrary and network-uri-json (@alunduil)
 - pipes-csv (@jb55)
2018-03-25 20:21:45 +02:00
Peter Simons 53ab595095
Merge pull request #37766 from rnhmjoj/shell-conduit
haskellPackages.shell-conduit: fix build
2018-03-25 20:04:43 +02:00
Peter Simons 18d3088ba8 haskell-either: drop obsolete override for ghc-8.4.x
Closes https://github.com/NixOS/nixpkgs/issues/37773.
2018-03-25 19:31:46 +02:00
rnhmjoj be3449200d
haskellPackages.shell-conduit: fix build 2018-03-25 15:54:09 +02:00
Will Fancher 155dfe385e callHackage: Keep deriver, like callCabal2nix 2018-03-25 03:12:28 -04:00
Shea Levy ead2ba8809
Remove HIE package set until automation can be put in place. 2018-03-23 10:06:58 -04:00
Peter Simons e718df678d haskell-xmonad-contrib: patch to fix build with ghc 8.4.x 2018-03-22 21:14:25 +01:00
Peter Simons eb5470913f haskell-timezone-olson: drop obsolete override for GHC 8.4.1 2018-03-22 21:14:25 +01:00
Peter Simons 1e8663ab9b haskell-json: use latest versions when building with GHC 8.4.1 2018-03-22 21:14:25 +01:00
Peter Simons 71beddad8c Use latest versions of HaTeX and pandoc when building with GHC 8.4.1. 2018-03-22 21:14:24 +01:00
Peter Simons d1ba7ed4df haskell-pure-zlib: enable test suite again
https://github.com/NixOS/nixpkgs/issues/37499 has been fixed. Now we just need to
jailbreak the package to avoid https://github.com/GaloisInc/pure-zlib/issues/6.
2018-03-22 21:14:24 +01:00
Peter Simons 3cdb5aa2f0 hackage-packages.nix: automatic Haskell package set update
This update was generated by hackage2nix v2.9.2 from Hackage revision
2b503b0b7c.
2018-03-22 21:14:20 +01:00
Peter Simons 435e38878c hackage2nix: update list of failing Hydra builds 2018-03-22 21:14:19 +01:00
Jude Taylor d6a0652d6d
Merge pull request #37509 from pikajude/darwin-hs-dynamic
Haskell: fix static libs on darwin
2018-03-21 14:36:08 -07:00
Peter Simons 3c6dcdb74e
Merge pull request #37588 from mpickering/pure-zlib
dontCheck pure-zlib
2018-03-21 18:19:56 +01:00
Matthew Pickering 4a3ad82bcd dontCheck pure-zlib
Fixes #37499
2018-03-21 17:16:20 +00:00
Will Dietz 2a30ab3865
Merge pull request #37486 from dtzWill/fix/ghc-glibcLocales
haskell: only use glibcLocales when using glibc
2018-03-20 22:55:44 -05:00
Jude Taylor 0458c7b885 fix static libs on darwin 2018-03-20 15:26:00 -07:00
Will Dietz 8727284a4b haskell: only use glibcLocales when using glibc
Fixes eval w/musl.

Possible alternative would be using glibcLocales
when it is non-null, to avoid duplicating the logic.
2018-03-20 14:38:40 -05:00
Moritz Angermann 918edbe485 haskell-generic-builder: Add enableHsc2hsViaAsm for Windows cross compilation 2018-03-20 15:27:02 -04:00
John Ericson 0c52fe9702
Merge pull request #37460 from obsidiansystems/host-meta-platforms-fixes
treewide: `meta.platforms` fixes now that it tracks the host platform
2018-03-20 13:08:54 -04:00
John Ericson 65e24f22e6 haskell-generic-builder: Default to window + unix platforms,
Since GHC is a cross compiler, it's perfectly possible to make haskell
binaries on platforms without GHCs. `windows ++ unix` seems good enough
for now.

Also don't default `hydraPlatforms` to `platforms`. The former must be a
list of systems (strings), but the latter is a list of systems or
patterns.
2018-03-20 13:02:53 -04:00
Peter Simons 97d56e94fa haskell-getopt-generics: override to latest version for ghc-8.4.x 2018-03-20 16:23:12 +01:00
Peter Simons ad1cd53ec8 haskell-src: drop obsolete override for ghc 8.4.x 2018-03-20 16:23:12 +01:00
Peter Simons 92935aeac8 haskell-conduit: drop obsolete override for ghc 8.4.x 2018-03-20 16:23:12 +01:00
Peter Simons e4a5fea87f haskell-blaze-builder: drop obsolete override for ghc 8.4.x 2018-03-20 16:23:12 +01:00
Peter Simons c9777cdf9d haskell-SHA: the new version has fixed the test suite failure 2018-03-20 16:23:12 +01:00
Peter Simons a413639a26 haskell-th-printf: drop obsolete override for ghc 8.4.x 2018-03-20 16:23:12 +01:00
Peter Simons 53309758e3 haskell-matrix: the new version has fixed the test suite failure 2018-03-20 16:23:12 +01:00
Peter Simons 61d4538812 LTS Haskell 11.1
This update was generated by hackage2nix v2.9.1-1-g63041e4 from Hackage revision
6aec0b311c.
2018-03-20 16:23:12 +01:00
Jan Tojnar 47bbd819c7
haskell-configuration-common: disable some tests depending on tasty-hunit-0.9 2018-03-20 13:34:38 +01:00
Graham Christensen 81da63f003
Merge pull request #37132 from srhb/haddock-wrapped
haskellPackages.ghcWithPackages: Wrap haddock with GHC lib dir
2018-03-19 10:27:36 -04:00
Peter Simons 54c1ca5fe9 haskell-xmonad: patch to fix the build with ghc-8.4.x 2018-03-17 21:16:49 +01:00
Peter Simons 13b154aee4 haskell-data-inttrie: patch to fix the build with ghc-8.4.x 2018-03-17 21:16:49 +01:00
Peter Simons b8ab77c1f0 haskell-th-printf: jailbreak to fix the build with ghc-8.4.x 2018-03-17 21:16:49 +01:00
Peter Simons c044a82caf haskell-json: patch to fix the build with ghc-8.4.x 2018-03-17 21:16:49 +01:00
Peter Simons 148646e630 haskell-matrix: override to latest version for ghc-8.4.x 2018-03-17 21:16:49 +01:00
Peter Simons 93d241e3dd haskell-timezone-olson: override to latest version for ghc-8.4.x 2018-03-17 21:16:49 +01:00
Peter Simons 7d5a69c265 haskell-GenericPretty: drop obsolete override for ghc-8.4.x 2018-03-17 21:16:49 +01:00
Peter Simons 8848a95575 haskell-boxes: drop obsolete override for ghc-8.4.x 2018-03-17 21:16:49 +01:00
Peter Simons cedf31b04a haskell-brick: override to latest version to fix build with ghc-8.4.x 2018-03-17 21:16:49 +01:00
Peter Simons 84bd9be9ce haskell-cabal2spec: fix build with ghc-8.2.x 2018-03-17 21:16:49 +01:00
Peter Simons 69c7aabbf8 hackage-packages.nix: automatic Haskell package set update
This update was generated by hackage2nix v2.9.1-1-g63041e4 from Hackage revision
f91c8f61e9.
2018-03-17 21:16:49 +01:00
Peter Simons 03cae069fe haskell-pandoc: use current git version when building with ghc-8.4.x 2018-03-17 21:16:48 +01:00
Peter Simons bb6b99287b cabal2nix: drop obsolete overrides for ghc-8.4.x 2018-03-17 21:16:48 +01:00
Peter Simons 3c978a82ca haskell-doctemplates: drop obsolete override for ghc-8.4.x 2018-03-17 21:16:48 +01:00
Peter Simons b59905bfe4 haskell-conduit: use latest version when compiling with ghc-8.4.x 2018-03-17 21:16:48 +01:00
Peter Simons e772848b44 haskell-tasty: drop obsolete override for ghc-8.4.x 2018-03-17 21:16:48 +01:00
Peter Simons 6a71804bea hackage-packages.nix: automatic Haskell package set update
This update was generated by hackage2nix v2.9.1 from Hackage revision
04b554ad3b.
2018-03-17 21:16:48 +01:00
Peter Simons 38bd7183c5 brick: undo update to revision 1, which breaks the build with GHC 8.2.2
Hopefully, upstream fixes this quickly.
2018-03-17 11:42:36 +01:00
Peter Simons 6fbf6efcf3 haskell-esqueleto: drop the markBroken for ghc 8.4.1
Although accurate, the override causes evaluation errors that serve little
purpose but poison our dashboard at [1].

[1] https://hydra.nixos.org/jobset/nixpkgs/haskell-updates
2018-03-17 08:21:24 +01:00
Peter Simons fe0be794fb haskell-pandoc-types: update override for ghc 8.4.x 2018-03-17 08:21:23 +01:00
Peter Simons f3f5d68ca3 haskell-generic-builder: cosmetic 2018-03-17 08:21:23 +01:00
Peter Simons 1978fa444d haskell-generic-builder: disable shared executable linking by default
This change raises the question of whether we should disable building of shared
libraries altogether (since we don't link them). Unfortunately, we can't,
because GHC expects shared libraries to be around when building and running
test suites, and no amount of passing --disable-shared flags at configure time
changes the fact. I *guess* that's related to the DYNAMIC_GHC_PROGRAMS = YES
flag we set when building GHC itself, but I haven't investigated it further
yet.

Closes https://github.com/NixOS/nixpkgs/issues/29011.
2018-03-17 08:21:23 +01:00
Peter Simons db5be10a4a haskell-generic-builder: fix confusion about --enable-static vs. --enable-library-vanilla 2018-03-17 08:21:23 +01:00
Peter Simons d7beae33dc haskell-generic-builder: always compile with --enable-library-for-ghci 2018-03-17 08:21:23 +01:00
Peter Simons a62b24be6d haskell-generic-builder: drop obsolete splitObjs function argument 2018-03-17 08:21:23 +01:00
Peter Simons 7f5fba75e2 haskell-generic-builder: compile profiling library variants by default
Unless specified otherwise, the default package set compiles library variants
for profiling with profiling-detail "all-functions". Executables, however, are
not built with profiling enabled.

This change increases the closure size for many Haskell programs, but the
practical advantage of having stack traces and performance measurements easily
available during development seems to outweigh that cost.

Closes https://github.com/NixOS/nixpkgs/issues/22340.
2018-03-17 08:21:22 +01:00
Peter Simons 408d441df0 git-annex: update sha256 hash for the new version 2018-03-17 08:21:22 +01:00
Peter Simons 929dac413b cabal2nix: update hpack version override 2018-03-17 08:21:22 +01:00
Peter Simons 7d043f036c haskell-configuration-common: cosmetic, no functional change 2018-03-17 08:21:22 +01:00
Peter Simons 9df1d15a28 hackage-packages.nix: automatic Haskell package set update
This update was generated by hackage2nix v2.9-10-gc1333d1 from Hackage revision
bad3dc0ed6.
2018-03-17 08:21:17 +01:00
Peter Simons c81d3e72e8 hackage2nix: disable failing Hydra builds 2018-03-17 08:21:16 +01:00
Peter Simons b6ca84c94e hackage2nix: extend the set of packages I maintain 2018-03-17 08:21:15 +01:00
Peter Simons 50020a296a darcs: jailbreak fgl dependency constraints to fix the build 2018-03-16 17:33:31 +01:00
Graham Christensen 18bf53a74d
haskel packages: drop override on ltk to fix evaluation 2018-03-15 22:00:02 -04:00
Peter Simons dc7557a2f0 haskell-constraints: drop obsolete override for ghc-8.4.x 2018-03-15 21:33:05 +01:00
Peter Simons 81316008f7 haskell-semigroupoids: drop obsolete override for ghc-8.4.x 2018-03-15 21:33:05 +01:00
Peter Simons 5a1a30becc structured-haskell-mode: update overrides for lts-11.x 2018-03-15 21:33:05 +01:00
Peter Simons 9254b06b22 haskell-src: update override for ghc-8.4.x 2018-03-15 21:33:05 +01:00
Peter Simons 5c9b3a6b18 haskell-free: drop obsolete override for ghc-8.4.x 2018-03-15 21:33:05 +01:00
Peter Simons 43d9df52c3 haskell-lens: drop obsolete override for ghc-8.4.x 2018-03-15 21:33:05 +01:00
Peter Simons a11eaf1f04 haskell-regex-tdfa: drop obsolete override for ghc-8.4.x 2018-03-15 21:33:05 +01:00
Peter Simons 1e8e3d6291 haskell-changelogged: drop obsolete override 2018-03-15 21:33:05 +01:00
Peter Simons de7847e683 git-annex: add overrides to fix the build in an lts-11.x environment 2018-03-15 21:33:05 +01:00
Peter Simons 080c54cd1c haskell-turtle: drop obsolete override for ghc-8.4.x 2018-03-15 21:33:05 +01:00
Peter Simons 8d0df69f4f haskell-vty: drop obsolete override for ghc-8.4.x 2018-03-15 21:33:05 +01:00
Peter Simons 79c2be32ad haskell-doctest: update overrides for ghc-8.4.x 2018-03-15 21:33:04 +01:00
Peter Simons 2932385b3c haskell-pandoc-types: update to latest version to fix the build with GHC 8.4.x 2018-03-15 21:33:04 +01:00
Peter Simons 326e1157a3 cabal2nix: update hpack override to use the latest version 2018-03-15 21:33:04 +01:00
Peter Simons 45caa0cf64 haskell-unordered-containers: drop obsolete override for GHC 8.4.x 2018-03-15 21:33:04 +01:00
Peter Simons f0730a1bf5 haskell-funcmp: drop obsolete override for ghc-8.4.x 2018-03-15 21:33:04 +01:00
Peter Simons 6e507784d7 lambdabot-haskell-plugins: drop obsolete override 2018-03-15 21:33:04 +01:00
Peter Simons 77c16dd7db haskell-hspec: update overrides for ghc-8.4.1 build 2018-03-15 21:33:04 +01:00
Peter Simons 3cf9c63c64 Drop obsolete Haskell overrides.
The overrides for the following packages no longer help:

 - HaVSA
 - test-framework-quickcheck
2018-03-15 21:33:04 +01:00
Peter Simons 8fdba8ca99 haskell-test-framework: disable test suite build
This avoids a dependency on an old version of QuickCheck.
2018-03-15 21:33:04 +01:00
Michael Alan Dorman 559832d663 isDarwin: make usage consistent
This one was the only one of the form pkgs.stdenv._hostPlatform_.isDarwin.
2018-03-15 21:33:04 +01:00
Michael Alan Dorman 2d3138fc9a tldr: remove unnecessary override
`shell-conduit` is no longer necessary for the expression.
2018-03-15 21:33:04 +01:00
Michael Alan Dorman 41409f6348 haskell-src-exts: remove unnecessary overrides
The 1.20.2 release is now the default.
2018-03-15 21:33:04 +01:00
Michael Alan Dorman 80b209cf20 http-conduit: remove unnecessary override
The 2.3.0 version is now the default.
2018-03-15 21:33:04 +01:00
Peter Simons a13ff71b21 haskell-configuration-common: update a couple of comments 2018-03-15 21:33:04 +01:00
Peter Simons 90696dcb6c cabal2nix: update hpack override 2018-03-15 21:33:04 +01:00
Peter Simons b79f68ae7a hackage-packages.nix: automatic Haskell package set update
This update was generated by hackage2nix v2.9-6-g7017487 from Hackage revision
97c9f84bf5.
2018-03-15 21:33:04 +01:00
Peter Simons e4d49bcabc hackage2nix: keep old package versions around so that we can build git-annex 2018-03-15 21:33:02 +01:00
Peter Simons da9f52a6e9 LTS Haskell 11.0 2018-03-15 21:33:02 +01:00
Sarah Brofeldt 2956cc8760 haskellPackages.ghcWithPackages: Wrap haddock with GHC lib dir 2018-03-15 20:16:54 +01:00
Peter Simons 1583cc6449 haskell-SHA: fix compiler crash while trying to build the test suite on i686
Fixes https://github.com/NixOS/nixpkgs/issues/36949.
2018-03-14 21:23:25 +01:00
Peter Simons 2f2ad74369 Fix cross-compilation builds of several Haskell packages some more. 2018-03-14 21:09:14 +01:00
Peter Simons 70467b9a12 Fix cross-compilation builds of several Haskell packages. 2018-03-14 20:50:43 +01:00
Peter Simons 79c97645b4 haskell-Cabal: version 2.2.x now accepts older versions of text 2018-03-13 21:41:54 +01:00
Peter Simons a3a6918137 hackage-packages.nix: automatic Haskell package set update
This update was generated by hackage2nix v2.9-5-g32974fc from Hackage revision
3e784a7dcf.
2018-03-13 21:41:54 +01:00
volth 34f12184cd treewide: s/saneBackends/sane-backends/g 2018-03-13 00:47:10 +00:00
Peter Simons bd46cb180d haskell-vty: use latest version when compiling with GHC 8.4.x 2018-03-12 14:31:00 +01:00
Peter Simons aed9401abc hledger-lib: add override fix build with ghc 8.4.x 2018-03-12 14:31:00 +01:00
Peter Simons 6c837058a4 haskell-megaparsec: fix build with GHC 7.10.x 2018-03-12 14:31:00 +01:00
Peter Simons 729a26d875 haskell-parser-combinators: fix build with GHC 7.10.x 2018-03-12 14:31:00 +01:00
Peter Simons d9ed7a2642 haskell-cmdargs: fix build with GHC 7.10.x 2018-03-12 14:30:59 +01:00
Peter Simons c575724782 haskell-tar: fix build with ghc-7.10.x 2018-03-12 14:30:59 +01:00
Peter Simons 7337a20f64 haskell-inline-c: disable test suite to avoid around quickcheck failure 2018-03-12 14:30:59 +01:00
Peter Simons 74e40b0671 haskell-HTTP: drop obsolete override for GHC 8.4.x 2018-03-12 14:30:59 +01:00
Peter Simons d531e09696 haskell-changelogged: update override for new turtle version 2018-03-12 14:30:59 +01:00
Kosyrev Serge c373b26f9c ghc841: boxes fix released 2018-03-12 14:30:58 +01:00
Kosyrev Serge 1278dba2bc ghc841: bv fix released 2018-03-12 14:30:58 +01:00
Peter Simons 86058acb2f haskell-ChasingBottoms: drop obsolete override 2018-03-12 14:30:58 +01:00
Peter Simons 83de07c6b4 LTS Haskell 10.9
This includes an automatic update of hackage-packages.nix, generated by
hackage2nix v2.9-5-g32974fc from Hackage revision
ed783e7c6e.
2018-03-12 14:30:10 +01:00
Peter Simons a9e1ae3d29
Merge pull request #36781 from deepfire/ghc-8.4
ghc841:  semi-automated updates
2018-03-12 09:28:33 +01:00
Ken Micklas f34e136a04 callCabal2nix: Use host platform rather than build platform for evaluation of Cabal files 2018-03-11 22:02:32 -04:00
Kosyrev Serge 86b554a589
ghc841: github needs a jailbreak 2018-03-12 03:03:31 +03:00
Kosyrev Serge c5160c62e3
ghc841: hackage-security fixed upstream 2018-03-12 03:03:31 +03:00
Kosyrev Serge 663934aec8
ghc841: fixed deriving-compat now on hackage 2018-03-12 03:03:31 +03:00
Kosyrev Serge d799cc8b23
ghc841: haddock-library needs dontCheck and dontHaddock 2018-03-12 03:03:31 +03:00
Kosyrev Serge 1a451a36cb
ghc841: SMP-compatible regex-tdfa now on hackage 2018-03-12 03:03:31 +03:00
Kosyrev Serge 98f5efd872
ghc841: haskell-src-exts fix released 2018-03-12 03:03:31 +03:00
Kosyrev Serge b2cfe1ce64
ghc841: cabal-install fixed upstream 2018-03-12 03:03:30 +03:00
Kosyrev Serge 662bc073b2
ghc841: cabal2nix fixed upstream 2018-03-12 03:03:30 +03:00
Kosyrev Serge 8f72b8a5c0
ghc841: bv fixed upstream 2018-03-12 03:03:30 +03:00
Kosyrev Serge d7365851fb
ghc841: dhall fix 2018-03-12 03:03:30 +03:00
Kosyrev Serge 9c58744f3e
ghc841: dontCheck resolv 2018-03-12 03:03:30 +03:00
Kosyrev Serge b69eb4af28
ghc841: jailbreak protolude 2018-03-12 03:03:30 +03:00
Kosyrev Serge b77b9d56f3
ghc841: deriving-compat released [1/2] 2018-03-12 03:03:06 +03:00
Kosyrev Serge 06a1979263
ghc841: gc outdated overrides 2018-03-12 02:46:45 +03:00
Kosyrev Serge bb9704ca82
ghc841: intern changes to PKGDB, except manual: esqueleto haskell-src 2018-03-12 01:35:48 +03:00
Peter Simons 379eb75014 haskell-setlocale: jailbreak to fix ghc 8.4.1 build 2018-03-11 09:24:37 +01:00
Peter Simons 73982726b0 haskell-boxes: apply patch to fix build with GHC 8.4.1 2018-03-11 09:24:37 +01:00
Peter Simons 4e63fcec1b haskell-ChasingBottoms: add override that uses the latest version 2018-03-11 09:24:37 +01:00
Peter Simons 797c272b66 haskell-hslua-module-text: drop obsolete override 2018-03-11 09:24:37 +01:00
Peter Simons 8d0b0095db haskell-jailbreak-cabal: clean up overrides 2018-03-11 09:24:37 +01:00
Peter Simons 3c104572a0 haskell-stylish-cabal: fix build with ghc 8.2.x and 8.4.x 2018-03-11 09:24:37 +01:00
Peter Simons 77e974b394 haskell-hackage-security: jailbreak to fix build with ghc 8.4.x 2018-03-11 09:24:36 +01:00
Peter Simons b4707d9e65 haskell-src: mark broken for GHC 8.4.1 2018-03-11 09:24:36 +01:00
Peter Simons dba20cb1b1 haskell-ChasingBottoms: move jailbreak to common to allow building with QuickCheck 2.11 2018-03-11 09:24:36 +01:00
Peter Simons 0ff88fb2ab haskell-GenericPretty: apply upstream patch to fix the build with ghc 8.4.x 2018-03-11 09:24:36 +01:00
Peter Simons 70aa779445 haskell-doctemplate: apply upstream patch to fix the build with ghc 8.4.x 2018-03-11 09:24:36 +01:00
Peter Simons 86bfcc89b8 haskell-HTTP: use the latest version when compiling with GHC 8.4.x 2018-03-11 09:24:36 +01:00
Peter Simons f62deb0f92 hackage-packages.nix: automatic Haskell package set update
This update was generated by hackage2nix v2.9-5-g32974fc from Hackage revision
3efaeb24c3.
2018-03-11 09:24:31 +01:00
Peter Simons 8b369a15d2 hackage2nix: update list of broken Hydra builds 2018-03-11 09:24:30 +01:00
Peter Simons 668383c088 haskell-hackage-db: add override to fix build with GHC 8.4.1
Cc: @deepfire
2018-03-10 10:00:17 +01:00
Peter Simons 842a5c40f7 haskell: mark esqueleto and doctemplates as broken
Cc: @deepfire
2018-03-10 10:00:17 +01:00
Peter Simons 7011f3b66d haskell-tree-diff: add override to fix build with GHC 8.4.1
Cc: @deepfire
2018-03-10 10:00:17 +01:00
Peter Simons 7e040c8775 haskell-hslua-module-text: add override to fix build with GHC 8.4.1
Cc: @deepfire
2018-03-10 10:00:16 +01:00
Peter Simons 99fba9e335 haskell-HTTP and haddock-library: add overrides for ghc 8.4.1
Cc: @deepfire
2018-03-10 10:00:16 +01:00
Peter Simons 3724b07e2e haskell-blaze-builder: update overrides for ghc 8.4.1
The pull request we use does not suffice any longer because it does not update
the version constraint on base in the Cabal file.

Cc: @deepfire
2018-03-10 10:00:16 +01:00
Peter Simons b01a5ec506 haskell-regex-tdfa: update overrides for ghc 8.4.1
The pull request we use does not suffice any longer because it does not update
the version constraint on base in the Cabal file.

Generally speaking, it might be a good idea to use
https://github.com/ChrisKuklewicz/regex-tdfa/pull/16 instead of the old one,
because it looks much cleaner. (It might have the same problem w/r to base,
though).

Pinging our resident GHC 8.4.1 guru @deepfire.
2018-03-10 10:00:16 +01:00
Peter Simons ee262b83ef cabal2nix: fix overrides for Cabal 2.2.x 2018-03-10 10:00:16 +01:00
Peter Simons c5cf8dd57a haskell-hackage-db: fix build with GHC 8.2.2 2018-03-10 10:00:16 +01:00
Peter Simons 469a15d386 distribution-nixpkgs: fix build with GHC 8.2.2 2018-03-10 10:00:15 +01:00
Peter Simons deab46fdba Cabal-2.2.0.0: fix build with GHC 8.2.2 2018-03-10 10:00:15 +01:00
Peter Simons 8aa0e7b950 hackage-packages.nix: automatic Haskell package set update
This update was generated by hackage2nix v2.9-3-gae0d2f7 from Hackage revision
42026bde62.
2018-03-10 10:00:06 +01:00
Peter Simons 3134f6bf97 hackage2nix: disable failing Hydra builds 2018-03-10 10:00:02 +01:00
Peter Simons 52383dbb6b hackage2nix: always use latest version of jailbreak-cabal 2018-03-10 10:00:02 +01:00
Kosyrev Serge a4fedaa481
ghc841 | turtle: GHC 8.4 needs a fresh Turtle 2018-03-10 06:51:58 +03:00
Kosyrev Serge 1aada58c2b
ghc841 | either: pin to v5 2018-03-10 06:37:35 +03:00
Peter Simons 90b394936b
Merge pull request #36652 from roberth/cabal2nix-extra-options
haskell.lib.haskellSrc2nix: add extraCabal2nixOptions
2018-03-09 15:06:14 +01:00
Robert Hensing a90294afe4 haskell.lib.haskellSrc2nix: add extraCabal2nixOptions 2018-03-09 14:52:34 +01:00
Peter Simons 96b5bbd457 haskell-free: update overrides for version 5.0.1 2018-03-09 14:22:28 +01:00
Peter Simons 2a17cffbb2 haskell-src-exts: update overrides for version 1.20.2 2018-03-09 14:22:28 +01:00
Peter Simons bcd11f6a05 hackage-packages.nix: automatic Haskell package set update
This update was generated by hackage2nix v2.8.2-10-g32cfe74 from Hackage revision
ed3336e836.
2018-03-09 14:22:18 +01:00
Reuben D'Netto b66892931e haskellPackages.cuda: Fixed broken dependency 2018-03-09 18:33:28 +11:00
Peter Simons df6e6d91a8
Merge pull request #36393 from ElvishJerricco/haskell-shell-for
Haskell: Added haskellPackages.shellFor
2018-03-07 12:45:06 +01:00
Will Fancher 9adb4d25e6 Haskell: Added haskellPackages.shellFor 2018-03-06 16:34:05 -05:00
Peter Simons f4b757bd3d haskell-changelogged: add override to fix the build 2018-03-06 21:10:39 +01:00
Peter Simons ebfecf3e76 hackage-packages.nix: automatic Haskell package set update
This update was generated by hackage2nix v2.8.2-10-g32cfe74 from Hackage revision
d14774a67e.
2018-03-06 21:10:34 +01:00
Peter Simons 6568cbc1bb hackage-packages.nix: automatic Haskell package set update
This update was generated by hackage2nix v2.8.2-8-g0aa23ac from Hackage revision
4caf6826b1.
2018-03-05 16:45:01 +01:00
Peter Simons ff45358a3c LTS Haskell 10.8 2018-03-05 16:44:23 +01:00
Peter Simons 1b0c67259e haskell: cosmetic changes to the generic builder 2018-03-05 16:44:23 +01:00
Vladimír Čunát 565bd805e6
Merge branch 'master' 2018-03-05 14:53:27 +01:00
Shea Levy 62a1abe204
haskellPackages.callCabal2nix: Depend on the expression.
This ensures that as long as the package derivation is alive, its nix
expressions do not need to be regenerated.

Fixes #36190.
2018-03-02 09:37:02 -05:00
Peter Simons 8b537488a5 git-annex: update sha256 hash for the new version 2018-03-01 21:56:35 +01:00
Peter Simons 5d4db65494 hackage-packages.nix: automatic Haskell package set update
This update was generated by hackage2nix v2.8.2-6-g7dfce29 from Hackage revision
292d228e71.
2018-03-01 21:56:28 +01:00
Dominic Steinitz d1ac8d1e1a Merge branch 'master' of https://github.com/NixOS/nixpkgs 2018-03-01 09:14:18 +00:00
Dominic Steinitz 183c3603fa No longer needed and causes confusion 2018-03-01 09:11:45 +00:00
Shea Levy 7f623cfa45
callCabal2nix: Fix filtering for non-cleanSourceable sources.
What was here before wasn't correct anyway, and now it works in
restricted mode.

Fixes #35207
2018-02-28 14:22:19 -05:00
Kosyrev Serge f9c952f39c
ghc84: remove unused overrides & minor proof updates 2018-02-28 02:17:44 +03:00
Kosyrev Serge fe5183105a
ghc84 | cabal2nix: ghc84 needs its own very fixed hpack 2018-02-27 15:11:13 +03:00
Peter Simons 8c0a1c87d1
Merge pull request #35661 from deepfire/ghc-8.4
ghc841 | hpack:  SMP fix unmerged
2018-02-26 20:15:06 +01:00
Peter Simons 6f144177f1 hackage-packages.nix: automatic Haskell package set update
This update was generated by hackage2nix v2.8.2-6-g7dfce29 from Hackage revision
70475ad0ea.
2018-02-26 14:26:42 +01:00
Peter Simons cf4b8c6b7a LTS Haskell 10.7 2018-02-26 14:26:29 +01:00
Kosyrev Serge f5858af1bc
ghc841 | hpack: SMP fix unmerged 2018-02-26 01:36:00 +03:00
Nikolay Amiantov f6925dbdd8 opencv3: enable contrib by default 2018-02-25 22:24:10 +03:00
Jan Tojnar a31d98f312
tree-wide: autorename gnome packages to use dashes 2018-02-25 17:41:16 +01:00
Kosyrev Serge 18fa78c539
ghc841 | tar: upstream fix not on Hackage yet 2018-02-25 07:38:19 +03:00
Kosyrev Serge 673785d18a
ghc841 | text-lens: new failure with bumped GHC 2018-02-25 06:58:32 +03:00
Kosyrev Serge 00b24f7a69
ghc841 | x509/x509-store: SMP fix PR unmerged 2018-02-25 04:11:33 +03:00
Kosyrev Serge 65169aac88
ghc841 | uri-bytestring: TH boundaries fix author made no PR yet 2018-02-25 04:11:32 +03:00
Kosyrev Serge 2201ba1a5b
ghc841 | tls: SMP fix unmerged 2018-02-25 04:11:32 +03:00
Kosyrev Serge 746b36c863
ghc841 | http-api-data: SMP fix not on hackage yet 2018-02-25 04:11:32 +03:00
Alexander V. Nikolaev 0acec7e984 treewide: transition mesa to libGLU_combined 2018-02-24 17:06:49 +02:00
Alexander V. Nikolaev 8f2a22935c treewide: transition from mesa_noglu to libGL 2018-02-24 17:03:46 +02:00
Kosyrev Serge a5078286e6
ghc84: deriving-compat and hnix 2018-02-24 04:51:36 +03:00
Peter Simons 2e45e280cb haskell-doctest: the 0.14.1 test suite fails on NixOS 2018-02-23 18:08:09 +01:00
Peter Simons fa6272678d haskell-stringbuilder: drop obsolete override for GHC 8.4.x 2018-02-23 17:58:18 +01:00
Peter Simons 81a9442fd0 haskell-language-c: drop unused version 0.7.0 2018-02-23 17:58:18 +01:00
Peter Simons b5454a1380 haskell-doctest: update ghc 8.4.x version to 0.14.1 2018-02-23 17:58:18 +01:00
Michael Alan Dorman f7ab190096 language-c: remove now-unnecessary overrides 2018-02-23 17:58:18 +01:00
Peter Simons d035fc1e76 haskell-parsec: fix build with GHC 7.10.x 2018-02-23 17:58:17 +01:00
Peter Simons d87fcc7d43 haskell-reflect: fix build with GHC 7.10.x 2018-02-23 17:58:17 +01:00
Peter Simons a6b30cb43d hackage-packages.nix: automatic Haskell package set update
This update was generated by hackage2nix v2.8.2-6-g7dfce29 from Hackage revision
d165ed5500.
2018-02-23 17:57:58 +01:00
Peter Simons d544c454bd LTS Haskell 10.6 2018-02-23 17:57:57 +01:00
Kosyrev Serge 24777b86d8
configuration-ghc84: import manually-defined overrides and update 2018-02-22 01:31:33 +03:00
Kosyrev Serge e6b5fefed7
configuration-generic | c2hs: language-c 0.7.2 is compatible with GHC 8.4 2018-02-22 01:30:42 +03:00
Peter Simons 3cc9445e56 haskell-test-framework-quickcheck2: jailbreak to support ghc-8.4.x 2018-02-20 17:23:05 +01:00
Peter Simons 020471ee6c haskell-optparse-applicative: fix build with ghc-8.4.x 2018-02-20 17:23:04 +01:00
Peter Simons af173130c6 haskell-here: jailbreak for ghc-8.4.x 2018-02-20 17:23:04 +01:00
Peter Simons d6f37ff0a5 haskell-doctest: use the latest version when compiling with GHC 8.4.x
This change also requires us to use the latest QuickCheck version in the GHC
8.4.x package set.

Furthermore, the latest version of doctest has a broken test suite that needs
to be disabled for the build to succeed.
2018-02-20 17:21:48 +01:00
Peter Simons a3c1a66ed7 liquidhaskell: drop obsolete override 2018-02-20 17:21:47 +01:00
Peter Simons 8cfaa55d67 hackage-packages.nix: automatic Haskell package set update
This update was generated by hackage2nix v2.8.2-5-gbde1863 from Hackage revision
98679850f4.
2018-02-20 17:21:41 +01:00
Peter Simons 0d7740870d hackage2nix: disable broken Hydra builds 2018-02-20 17:21:21 +01:00
Kosyrev Serge 060f2f99db
ghc 8.4: update configuration 2018-02-19 23:31:50 +03:00
Peter Simons 25ee2516c2 haskell-generic-builder: simplify outputs attribute logic
The arguments cannot contain outputs, so the if-then-else here is pointless.
2018-02-16 16:54:16 +01:00
Peter Simons e7a8ced07f liquidhaskell: version 0.8.2.3 fails during Haddock stage 2018-02-16 12:55:46 +01:00
Peter Simons b0bdf778bd liquidhaskell: drop obsolete patches 2018-02-16 10:40:04 +01:00
Peter Simons b6e553506f cabal2nix: build with hpack 0.27.0 2018-02-16 10:40:00 +01:00
Peter Simons 194d61bfca haskell-JuicyPixels: drop obsolete override for ghc-8.4.x 2018-02-16 10:39:59 +01:00
Peter Simons 02e8ee8a80 haskell-th-lift: drop obsolete override for ghc-8.4.x 2018-02-16 10:39:59 +01:00
Peter Simons 1f53e710ec haskell-tasty: update override for latest version used by ghc-8.4.x 2018-02-16 10:39:59 +01:00
Peter Simons b787aacade hackage-packages.nix: automatic Haskell package set update
This update was generated by hackage2nix v2.8.2-1-g66cb4b6 from Hackage revision
71e6c26026.
2018-02-16 10:39:54 +01:00
Tuomas Tynkkynen 1a06373c0a Merge remote-tracking branch 'upstream/master' into staging
Conflicts:
	pkgs/development/libraries/libclc/default.nix
	pkgs/top-level/all-packages.nix
2018-02-13 16:42:55 +02:00
Peter Simons afb83e0e03 multi-ghc-travis: update to current Git master 2018-02-13 10:57:40 +01:00
Peter Simons 4b39930ee6 Update hspec family packages to 2.4.8 when building with GHC 8.4.x. 2018-02-13 10:18:19 +01:00
Peter Simons be676705e3 hackage-packages.nix: automatic Haskell package set update
This update was generated by hackage2nix v2.8-24-g7642d25 from Hackage revision
dc11df52c5.
2018-02-13 10:18:14 +01:00
Peter Simons 47adc4eb8e LTS Haskell 10.5 2018-02-13 10:17:56 +01:00
Will Fancher 627444cfc2 Use static cabal2nix in callCabal2nix 2018-02-11 18:33:20 -05:00
Daiderd Jordan 69779a5f7e
Merge pull request #33374 from dtzWill/update/llvm-5-default
Update LLVM default 4 -> 5
2018-02-11 18:29:26 +01:00
Shea Levy 32085eafa1 haskell-hpio: disable test suite to fix the build 2018-02-10 18:10:47 +01:00
Shea Levy b0270dfcec haskell-securemem: fix build with GHC 8.4 2018-02-10 18:10:47 +01:00
Shea Levy 74bde7e20a haskell-deepseq-generics: fix build on ghc 8.4 2018-02-10 18:10:47 +01:00
Shea Levy d2b6665024 haskell-twee-lib: disable broken haddocks 2018-02-10 18:10:46 +01:00
Shea Levy 15344506cc haskell-funcmp: Fix build on GHC 8.4 2018-02-10 18:10:46 +01:00
Shea Levy 7ac6c77323 ghc: Make deterministic profiling patches opt-in.
The patch changes some pieces of the exposed API, so we can't have our
default GHC changed in this way.
2018-02-10 18:10:44 +01:00
Shea Levy 9dfbb52423 liquidhaskell: Patch for compat with our deterministic profiling GHC patch 2018-02-10 18:05:29 +01:00
Peter Simons 36a095e27e haskell-contravariant: fix build on GHC 7.10.x 2018-02-10 18:05:28 +01:00
Peter Simons 1d4529c7e2 cabal2nix: compile with hpack 0.25.0 2018-02-10 18:05:28 +01:00
Peter Simons c8bc6163c0 hackage-packages.nix: automatic Haskell package set update
This update was generated by hackage2nix v2.8-24-g7642d25 from Hackage revision
ddb881454b.
2018-02-10 18:05:23 +01:00
Peter Simons 52628a27e7 hackage2nix: disable broken builds 2018-02-10 18:05:21 +01:00
Peter Simons 13dda44b8b haskell-with-packages-wrapper: don't bother with extraOutputsToInstall
symlinkJoin doesn't recognize this parameter, so this functionality has been
broken ever since 4b77d425aa.
2018-02-09 20:26:35 +01:00
Peter Simons 2c13435734 haskell-generic-builder: revert "set LD_LIBRARY_PATH in shellHook"
This reverts commit e73e5c884f. Please don't
set $LD_LIBRARY_PATH! Instead, pass appropriate --extra-include-dir and
--extra-lib-dir arguments to "cabal configure" to ensure that Cabal knows
about system dependencies.
2018-02-09 19:56:20 +01:00
Peter Simons bd3379c443 haskell-generic-builder: include build-tool dependencies in shell environments
For a Haskell package "foo" the environment foo.env now contains the build tool
dependencies required for compiling the package in $PATH.

Fixes https://github.com/NixOS/cabal2nix/issues/331.
2018-02-09 19:56:20 +01:00
Peter Simons 8ff7ac4859
Merge pull request #34646 from clacke/hledger-darwin
hledger: build correctly on darwin
2018-02-07 08:32:59 +01:00
Daiderd Jordan db7e0aeb42
llvm-packages: cleanup 2018-02-06 23:38:46 +01:00
Claes Wallin (韋嘉誠) cc2c594a9b hledger*: build correctly on darwin
- mkdir -p $out/share/info rather than assuming $out/share is there
 - find .info and .man* files correctly on darwin -- don't try to
   match the specific system name, there is nothing to gain from that

nix calls darwin darwin, but ghc calls it osx in its directory names.

closes #34644
2018-02-07 01:32:16 +08:00
Peter Simons a9268dd694
Merge pull request #34404 from deepfire/x-ghc-8.4-overrides
GHC 8.4 package overrides
2018-02-06 10:01:15 +01:00
Kosyrev Serge ae1e9fbf87
ghc841 configuration: overrides 2018-02-06 05:33:07 +03:00
Shea Levy 39f62c770b
haxl: Disable non-deterministic tests 2018-02-05 13:00:12 -05:00
Peter Simons af884f5607 cabal2nix: update build to hpack 0.24 2018-02-04 10:52:53 +01:00
Peter Simons 77e074829b hackage-packages.nix: automatic Haskell package set update
This update was generated by hackage2nix v2.8-24-g7642d25 from Hackage revision
2499b1e31f.
2018-02-04 10:52:48 +01:00
Peter Simons 3ac304963c hackage2nix: use latest version of weeder by default 2018-02-04 10:52:18 +01:00
Shea Levy 943592f698
Add setFunctionArgs lib function.
Among other things, this will allow *2nix tools to output plain data
while still being composable with the traditional
callPackage/.override interfaces.
2018-01-31 14:02:19 -05:00
Peter Simons 6f93e0f749 fix GHC 8.4.x builds of hspec and test-framework 2018-01-31 16:03:59 +01:00
Peter Simons 866a1ed2d5 cabal2nix: build with hpack 0.23 2018-01-31 16:03:59 +01:00
Peter Simons 94b6357dc5 hackage-packages.nix: automatic Haskell package set update
This update was generated by hackage2nix v2.8-20-g7c22fdf from Hackage revision
d0f20cf258.
2018-01-31 16:03:54 +01:00
Peter Simons b063a02320 LTS Haskell 10.4 2018-01-31 16:03:50 +01:00
pjan vandaele bdffbc775e
Adds modifier option to developPackage 2018-01-30 12:29:59 +09:00
Peter Simons b7e6ac1515 hledger: install man pages and info files
Make sure that hledger, hledger-ui, and hledger-web have their documentation
installed in locations where system tools can find them.

Fixes https://github.com/NixOS/nixpkgs/issues/34301.
2018-01-26 19:42:04 +01:00
Peter Simons b83990dd76 haskell-hie-packages: disable broken Hydra builds 2018-01-26 13:01:12 +01:00
Peter Simons 71c76eadff hackage2nix: disable broken Hydra builds 2018-01-26 13:01:12 +01:00
Peter Simons f8776eabdd cabal2nix: build with latest version of hpack 2018-01-26 13:01:12 +01:00
Peter Simons 4ec557eea9 hackage-packages.nix: automatic Haskell package set update
This update was generated by hackage2nix v2.8-16-gec0f902 from Hackage revision
6b78792753.
2018-01-26 13:01:12 +01:00
Peter Simons 03ef28473d haskell-tinc: drop broken non-Hackage package 2018-01-26 13:01:11 +01:00
Peter Simons c83b455c7d haskell-intero-nix-shim: drop broken non-Hackage package 2018-01-26 13:01:11 +01:00
Peter Simons 05723c4d97 hackage-packages.nix: automatic Haskell package set update
This update was generated by hackage2nix v2.8-15-g0d15053 from Hackage revision
0d7f6b72e9.
2018-01-26 13:01:11 +01:00
Peter Simons edf1d07173 hackage2nix: disable broken Hydra builds 2018-01-26 13:01:11 +01:00
Peter Simons 83b35508c6 hackage-packages.nix: automatic Haskell package set update
This update was generated by hackage2nix v2.8-11-g68a143c from Hackage revision
ddb65ce29d.
2018-01-26 13:01:11 +01:00
Peter Simons f9700df56a lambdabot-core: add myself as a maintainer 2018-01-26 13:01:10 +01:00
Peter Simons 291c3681f6 cabal-plan: fix build by applying https://github.com/haskell-hvr/cabal-plan/pull/16 2018-01-26 13:01:10 +01:00
Peter Simons da7833e7e6 cabal2spec: add myself as a maintainer 2018-01-26 13:01:10 +01:00
Peter Simons eb5d7d2b26 haskell-lambdabot: fix build 2018-01-23 16:09:29 +01:00
John Ericson ec0c4802ae
Merge pull request #26799 from obsidiansystems/cross-haskell
haskell infra: Fix cross compilation to work with new system
2018-01-22 15:31:19 -05:00
Peter Simons 699d715f24 haskell-nix-paths: fix bogus dependencies 2018-01-22 08:47:00 +01:00
Ben Gamari bf687907d7 haskell lib: Make Cabal compiler names explicit
Cabal2nix expects a --compiler flag that contains a Cabal Compiler description.
We used to use the compiler's derivation name for this, but this breaks when
cross-compiling due to the target suffix. Instead we add an explicit
haskellCompilerName attribute to Haskell compiler derivations.
2018-01-21 23:31:05 -05:00
John Ericson 81553124cf haskell infra: nativeGhc != ghc.bootPkgs.ghc
There's no reason to wait for non-binary native to *build* cross ghc,
but we want a nix-built GHC for Setup.hs or things won't work.
2018-01-21 23:31:04 -05:00
John Ericson 54ead73271 generic-builder: Make GHC a proper dependency
Rather than just sticking it on the PATH
2018-01-21 23:27:38 -05:00
Peter Simons 4532826e99
Merge pull request #34037 from ElvishJerricco/fix-ghcjs-lts-10
Fixed GHCJS
2018-01-21 19:55:25 +01:00
Will Fancher fcc8cae88d Fixed GHCJS 2018-01-20 15:47:59 -05:00
Peter Simons 8297025d28 haskell-hlint: needs latest version of haskell-src-exts 2018-01-20 21:40:45 +01:00
Peter Simons dcf3699b0b hackage-packages.nix: automatic Haskell package set update
This update was generated by hackage2nix v2.8-7-gfbcdc2a from Hackage revision
70d584c0a5.
2018-01-20 21:40:40 +01:00
Peter Simons 9688c0eab7 haskell-hlint: use latest version by default 2018-01-20 21:40:39 +01:00
Peter Simons a8d9a94574 haskell.lib.markBroken: explicitly disable Hydra builds
Recent changes [1] allow Hydra to build packages that are marked broken. To
avoid plenty of evaluation errors on Hydra, explicitly disable Hydra builds of
broken packages.

[1] https://github.com/NixOS/nixpkgs/issues/7541#issuecomment-357541243
2018-01-20 21:40:38 +01:00
Peter Simons 8bf8581b9a hackage2nix: disable broken Hydra builds
- Ping @abbradar for broken lambdabot.
- Ping @alunduil for broken collection-json and siren-json.
2018-01-20 21:40:08 +01:00
Kosyrev Serge 8d027c1113
ghc841: GHC 8.4.1: nix-shell -p haskell.compiler.ghc841 2018-01-19 16:06:02 +03:00
Michael Alan Dorman 899714ae96 hoogle: fix http-conduit dependency for new version
5.0.17 now requires http-conduit > 2.3.
2018-01-19 12:53:11 +01:00
Peter Simons a1366f43a0 git-annex: update hash for new version 2018-01-19 12:53:11 +01:00
Peter Simons 3b54c5f483 hackage-packages.nix: automatic Haskell package set update
This update was generated by hackage2nix v2.8-3-g1ab3260 from Hackage revision
6aedac1525.
2018-01-19 12:53:11 +01:00
Will Fancher 9047a7dd33 Move packageSourceOverrides to haskellLib 2018-01-18 16:42:56 -05:00
Jan Tojnar c278dd0b9d
bustle: re-enable hgettext support
hgettext 0.1.31.0 builds again
2018-01-18 22:13:57 +01:00
Shea Levy f12f2ed44c
haskell-ide-engine: Fix build in sandbox 2018-01-18 12:02:29 -05:00
Peter Simons 29f0f38433 multi-ghc-travis: update to latest Git version and create a proper Haskell build
The attribute haskellPackages.multi-ghc-travis refers to a proper Cabal build
that includes the package's library
2018-01-18 17:01:33 +01:00
José Luis Lafuente 9b577c44bc
gitHUD: disable tests
Tests require tasty-quickcheck ==0.8.*
2018-01-17 17:18:16 +01:00
Jude Taylor cf6c05fda7 add haddock version for GHC 8.0 2018-01-13 01:17:23 -08:00
Shea Levy 43e7cf5eb7
haskellPackages.ChasingBottoms: Disable testsuite 2018-01-12 13:04:57 -05:00
Peter Simons e30ecaa916
Merge pull request #33636 from hamishmack/haskell-internal-libs-darwin2
haskell: Fix depending on libs with internal libs on darwin.
2018-01-12 16:09:56 +01:00
Peter Simons e277be1943
Merge pull request #33360 from adnelson/unpin_lzma_versions
haskellPackages.lzma: loosen version bounds for test dependencies
2018-01-12 16:09:13 +01:00
Robert Hensing f40ecb29aa Add documentation for haskell-modules/lib.nix 2018-01-12 10:48:03 +01:00
Peter Simons aecc868ac1
Merge pull request #33733 from dhess/arm-cross-fixes
ghc, haskell-modules: ARM cross build fixes.
2018-01-11 16:56:20 +01:00
Drew Hess e4f3fe051e ghc, haskell-modules: ARM cross build fixes.
As requested in #33405.
2018-01-11 10:45:44 -05:00
Shea Levy 4e78aeb441
callCabal2nix: Fix calling with a path in the store. 2018-01-11 10:17:56 -05:00
Shea Levy fb069b77ee
Merge branch 'callCabal2nix-cleanSourceWith' 2018-01-11 09:21:50 -05:00
Drew Hess 84e4caacc5
haskell-modules: swagger2 still needs dontHaddock on armv7l-linux. 2018-01-11 00:59:55 -08:00
Shea Levy fb2b6ac373
callCabal2nix: Use cleanSourceWith for composable filtering 2018-01-10 12:46:45 -05:00
Shea Levy 3a763b9196
haskellLib: Add shellAware function 2018-01-10 12:08:36 -05:00
Drew Hess c5e433df59
haskell-modules: more disabled tests for armv7l-linux.
Specifically: servant-docs, servant-swagger, swagger2.
2018-01-10 00:38:45 -08:00
Drew Hess c05378b730
haskell-modules: disable hashable tests on armv7l-linux. 2018-01-09 18:06:25 -08:00
Peter Simons 2280127e85 hackage-packages.nix: automatic Haskell package set update
This update was generated by hackage2nix v2.7.2 from Hackage revision
c0e307307b.
2018-01-09 20:33:02 +01:00