Commit graph

4053 commits

Author SHA1 Message Date
Peter Simons f111664194 hackage-packages.nix: automatic Haskell package set update
This update was generated by hackage2nix v2.14.2-10-gb2ea1c2 from Hackage revision
5072503e70.
2019-04-25 17:29:34 +02:00
Peter Simons e2763c05e1 hackage2nix: update list of broken builds 2019-04-25 17:29:33 +02:00
Peter Simons 905ec757ef LTS Haskell 13.18 2019-04-25 17:29:33 +02:00
Matthew Bauer d69cc779b5 Revert "Revert "darwin 10.12 commits""
This reverts commit 8505e710e7.
2019-04-20 23:17:04 -04:00
Frederik Rietdijk bae32a9f5c Merge staging-next into staging 2019-04-16 18:54:15 +02:00
Peter Simons 4f11c82d6e hackage-packages.nix: automatic Haskell package set update
This update was generated by hackage2nix v2.14.2-9-ge08962a from Hackage revision
554b854eb0.
2019-04-15 19:29:18 +02:00
Peter Simons 221f65b041 hackage2nix: update list of broken packages
Closes https://github.com/NixOS/nixpkgs/pull/59333.
2019-04-15 19:29:17 +02:00
Peter Simons f9dd1b813e LTS Haskell 13.17 2019-04-15 19:28:57 +02:00
Peter Simons 3689d543e3 hackage-packages.nix: automatic Haskell package set update
This update was generated by hackage2nix v2.14.2-5-g11c68fd from Hackage revision
150f8868bf.
2019-04-13 12:53:54 +02:00
Peter Simons 84cb3df618 liquidhaskell-cabal has been fixed in the latest version. 2019-04-13 12:53:54 +02:00
Peter Simons 09dbd3c8dc liquidhaskell: update devel snapshot to the latest version 2019-04-13 12:53:54 +02:00
Michael Alan Dorman 8c7d15f6d9 taffybar: unbreak package by default
The gtk package situation seems to have been resolved, so it builds again.

Closes https://github.com/NixOS/nixpkgs/pull/59305.
2019-04-13 12:53:54 +02:00
Peter Simons 81c31f3682 hackage2nix: update list of broken packages to fix evaluation errors on Hydra 2019-04-13 12:53:54 +02:00
(cdep)illabout 757099e8f1 haskell-generic-builder: disable library-for-ghci by default
This commit disables the library-for-ghci flag passed to
`Setup configure` in the Haskell generic-builder.nix file.

This stops the HSfoo.o file from being built.  Building this
HSfoo.o file caused doctest to take an extremely long time
to load dependencies when running.

This is a follow-up from https://github.com/NixOS/nixpkgs/pull/58743.
2019-04-12 11:55:22 +02:00
Peter Simons 6b63bbb199 haskell-pandoc: update override for the latest release 2019-04-12 11:55:22 +02:00
Peter Simons a85d1c9e34 hackage-packages.nix: automatic Haskell package set update
This update was generated by hackage2nix v2.14.2-5-g11c68fd from Hackage revision
3d5bbe3d81.
2019-04-12 11:55:22 +02:00
Peter Simons ab622fa93b hackage2nix: update list of broken packages 2019-04-12 11:55:21 +02:00
Peter Simons be5594b412 LTS Haskell 13.16 2019-04-12 11:55:21 +02:00
Matthew Bauer 4aca600624
Merge pull request #59024 from matthewbauer/hackage-mirrors
haskell: add fpcomplete mirror, use hackage mirrors in more places
2019-04-10 01:45:04 -04:00
Pascal Wittmann 4e9ffcff7b
haskellPackages.yesod-markdown: jailbreak 2019-04-07 19:47:25 +02:00
Austin Seipp 12db6c18f9 cryptol: fix, rework cryptol 2.6.0 builds
- The previous build of Cryptol was broken on GHC 8.6.x, which is now the
  new default. That's been fixed with a few upstream patches that will come
  up whenever the next release happens.

  - There was also a build failure on base-compat, fixed by jailbreaking.

  - The previous setup had all-packages.nix creating a new derivation
  solely for the purpose of wrapping the Z3 binary. This has been removed:
  the wrapper is still added but during the Haskell build itself, so that
  all Haskell dependent packages can use the cryptol interpreters too.

  - In its place, we use justStaticExecutables, so people using nix-env
  and Cryptol users who *don't* need haskell dependencies can get much
  smaller closures. Obviously this still implies a second build, but
  this build is much more useful than one that merely adds a shell
  script to a package that's relatively expensive to compile...

Signed-off-by: Austin Seipp <aseipp@pobox.com>
2019-04-07 00:45:22 -05:00
Matthew Bauer eaa5e85b35 haskell: add more hackage mirrors, use mirrors in more places
Fixes #58971
2019-04-05 13:51:56 -04:00
(cdep)illabout a5b85222ff Add option to disable library-for-ghci in the generic haskell builder.
Closes https://github.com/NixOS/nixpkgs/pull/58743.
2019-04-02 11:46:48 +02:00
Peter Simons 1da98bb281 hackage-packages.nix: automatic Haskell package set update
This update was generated by hackage2nix v2.14.2-4-gd25a3c5 from Hackage revision
5fa644505e.
2019-04-02 09:53:31 +02:00
Domen Kožar b06201bf6f
cachix: use separate bin output to prove it's useful
Spares compilation time by not compiling the package twice.
2019-03-29 15:10:54 +07:00
Domen Kožar bd06834d5e
haskell: allow separate bin output, disable by default 2019-03-29 15:10:42 +07:00
Peter Simons 1e41576638 hackage-packages.nix: automatic Haskell package set update
This update was generated by hackage2nix v2.14.2-4-gd25a3c5 from Hackage revision
f007a3166a.
2019-03-28 10:27:46 +01:00
Peter Simons c406a7287d hackage2nix: update list of broken Haskell packages 2019-03-28 10:27:45 +01:00
Peter Simons 803e956919 liquidhaskell: switch ghc-8.6.x version to the 'develop' branch to fix the build 2019-03-26 17:20:35 +01:00
Peter Simons 999450f7d3 hackage-packages.nix: automatic Haskell package set update
This update was generated by hackage2nix v2.14.2-4-gd25a3c5 from Hackage revision
12f5245f28.
2019-03-26 17:20:34 +01:00
Peter Simons 3732f1fe7e LTS Haskell 13.14 2019-03-26 17:20:34 +01:00
Peter Simons 3e113f5f7a
Merge pull request #58199 from rnhmjoj/superbuffer
haskellPackages.superbuffer: fix build
2019-03-25 13:57:12 +01:00
rnhmjoj 32ec718b57
haskellPackages.superbuffer: fix build 2019-03-24 12:07:40 +01:00
Peter Simons 35a504415f git-annex: update sha256 hash for new version 7.20190322 2019-03-23 17:06:25 +01:00
Peter Simons b23f9e540f hackage-packages.nix: automatic Haskell package set update
This update was generated by hackage2nix v2.14.2-3-gea0f0ca from Hackage revision
4b477e240f.
2019-03-23 17:06:25 +01:00
Peter Simons ce5504bc74 hackage2nix: drop broken entry for hfsevents
The package has its meta.platforms set up correctly already in cabal2nix's
post-processing code.

Fixes https://github.com/NixOS/nixpkgs/issues/58028.
2019-03-22 11:14:32 +01:00
Peter Simons a61b989900
Merge pull request #57748 from nomeata/haskell-clock-patch
Import cross-compilation patch for clock
2019-03-20 23:18:52 +01:00
Troels Henriksen 27f7cf2cad futhark: only wrap the 'futhark' executable
Newer versions of Futhark only care about this executable, and the
others are thin wrappers that will go away in a future version.
2019-03-17 22:51:20 +01:00
Peter Simons 3447973b9b xmonad-extras: drop obsolete override 2019-03-17 09:43:14 +01:00
Peter Simons 7c04e3eb75 haskell-arbtt: add build products into $PATH for the check phase
Fixes https://github.com/NixOS/nixpkgs/pull/57585.
2019-03-17 09:43:14 +01:00
Peter Simons e98e4d21fa hackage-packages.nix: automatic Haskell package set update
This update was generated by hackage2nix v2.14.2-3-gea0f0ca from Hackage revision
83ddbaad89.
2019-03-17 09:21:20 +01:00
Michael Peyton Jones 387c513d12 generic Haskell builder: don't copy packages from GHC
In order to build the package databases that we will use when compiling
a Haskell package, we iterate over the relevant dependencies, and if
they contain a package db, we copy its contents over.

So far so good, except when one of those dependencies is GHC. This
doesn't happen ordinarily, but it will happen when we construct the
package database for compiling `Setup.hs`.  This is compiled for the
build architecture, so we get the build deps, including both the native
and the cross GHC (if there is one).

In this case, we end up copying the packages from the GHC's package
database. This is at best unnecessary, since we will get those packages
from the GHC when we compile with it.

At worst, however, this is semantically questionable. We can end up
having multiple copies of e.g. Cabal with the same version, but
(potentially) different contents. At the moment, GHC will expose one of
these at semi-random depending on which one it looks at "first".
However, there is a MR open [in
GHC](https://gitlab.haskell.org/ghc/ghc/merge_requests/545) which as a
side effect will instead expose both, leading to ambiguous module
warnings (which is not unreasonable, since it *is* ambiguous).

So what can we do about it? The simplest solution is just to not copy
the package databases from GHC. GHC is special in this regard, so I
think it's okay to treat it specially.

This PR should have no effect on anything now, but will prevent any
breakage when/if the GHC patch lands.

Closes https://github.com/NixOS/nixpkgs/pull/57706.
2019-03-17 09:21:20 +01:00
Peter Simons bdd4e11278 haskell-pandoc: update overrides for the new 2.7.1 version
(cherry picked from commit 96c7ea5f6d1b9d41afcdcac1b156813013a5d04d)
2019-03-16 20:31:23 +01:00
Peter Simons b514a6d351 hackage-packages.nix: automatic Haskell package set update
This update was generated by hackage2nix v2.14.2-3-gea0f0ca from Hackage revision
faa5a059ee.
2019-03-16 20:31:23 +01:00
Peter Simons 2df9351953 LTS Haskell 13.13
(cherry picked from commit fee2f975ecd5a478f5a4fc60b4d6aaa53696e19e)
2019-03-16 20:30:58 +01:00
Peter Simons 93e4a90502 ghc: switch our default compiler to version 8.6.4
Also, drop obsolete 8.6.x minor releases 8.6.1, 8.6.2, and 8.6.3.

(cherry picked from commit 7fde42b8ebddbd673342b98d9d7c892a0c521583)
2019-03-16 20:30:58 +01:00
Peter Simons 17c62c98d3
Merge pull request #57587 from erictapen/hakyll-pandoc-bump
haskellPackages.hakyll: bump pandoc dependency to 2.7
2019-03-16 13:47:33 +01:00
Joachim Breitner c1eeb8f3ab Import cross-compilation patch for clock
taken form https://github.com/input-output-hk/iohk-nix/blob/master/patches/clock-0.7.2.patch
2019-03-16 11:32:39 +01:00
Stefan Fehrenbach b0351c0eb9
Remove obsolete workaround that breaks chell 0.5 2019-03-15 12:07:41 +00:00
Pascal Wittmann 66504c0671
Merge pull request #57129 from NixOS/fix-haskellPackages-xattr
haskellPackages.xattr: fix build with attr-2.4.48 (see #53716)
2019-03-15 09:08:41 +01:00
Peter Simons 54258e459f haskell-pandoc-citeproc: update override for the new version 2019-03-13 18:11:03 +01:00
Peter Simons bbf5431865 haskell-texmath: drop obsolete override 2019-03-13 18:11:03 +01:00
Peter Simons 8a0d1650a3 hackage-packages.nix: automatic Haskell package set update
This update was generated by hackage2nix v2.14.2 from Hackage revision
9fb5246e3c.
2019-03-13 18:11:03 +01:00
Peter Simons c18759113e LTS Haskell 13.12 2019-03-13 18:11:03 +01:00
Justin Humm b82150c8c2
haskellPackages.hakyll: bump pandoc dependency to 2.7 2019-03-13 17:44:51 +01:00
Peter Simons 3dd4ea56d7 haskell-ci: bump to latest git version 2019-03-10 11:12:57 +01:00
Peter Simons 51435890dd haskell-pandoc: update overrides for the latest LTS release 2019-03-10 11:12:56 +01:00
Peter Simons fa376f7548 hackage-packages.nix: automatic Haskell package set update
This update was generated by hackage2nix v2.14.2 from Hackage revision
9939986acd.
2019-03-10 11:12:51 +01:00
Peter Simons 9b5ce24b2e LTS Haskell 13.11 2019-03-10 11:12:35 +01:00
Matthew Bauer ca6e93155b
Merge pull request #56661 from matthewbauer/stack-hook-fixup
stack-hook: deduplicate better
2019-03-09 18:08:47 -05:00
Pascal Wittmann 57afc591b3
haskellPackages.xattr: fix build with attr-2.4.48 (see ##53716) 2019-03-09 17:37:46 +01:00
Peter Simons 33ebe0c79d
Merge pull request #56162 from jacereda/fix-purescript-build
purescript: fix build compiling with ghc 8.4.4
2019-03-07 08:39:08 +01:00
Peter Simons aef1d63650 hackage-packages.nix: automatic Haskell package set update
This update was generated by hackage2nix v2.14.2 from Hackage revision
76af45f9cb.
2019-03-06 14:24:51 +01:00
Jorge Acereda dd2dff39fa purescript: fix build compiling with ghc 8.4.4
Closes #53597.
2019-03-06 08:36:52 +01:00
Peter Simons 78b94d335d
haskell-packages: re-write references to webkit to webkitgtk 2019-03-06 00:20:07 +01:00
Peter Simons 2d3455ec0e haskell-packages.nix: fix all references that refer to a known alias
Thanks to @jtojnar for implementing this improvement.
2019-03-05 21:22:46 +01:00
Peter Simons fbc21368b9 hackage-packages.nix: automatic Haskell package set update
This update was generated by hackage2nix v2.14.1-10-gd1d8208 from Hackage revision
f2e35741b5.
2019-03-05 21:22:46 +01:00
Jan Tojnar 2ac764de78
Revert "hackage-packages.nix: automatic Haskell package set update"
This reverts commit fe0f47110f.
2019-03-05 16:28:29 +01:00
Jan Tojnar fe0f47110f
hackage-packages.nix: automatic Haskell package set update
This update was generated by hackage2nix v2.14.1-7-g6b9bca8 from Hackage revision
98dbc22cb4.
2019-03-05 16:27:46 +01:00
Jan Tojnar 57c745f530
gnome2: remove aliases 2019-03-05 15:37:45 +01:00
Peter Simons 9e1ef78162 pandoc: add overrides to fix build of the new 2.7 version 2019-03-05 11:13:47 +01:00
Peter Simons 6e04ad9523 hackage-packages.nix: automatic Haskell package set update
This update was generated by hackage2nix v2.14.1-10-gd1d8208 from Hackage revision
43355d3d6c.
2019-03-05 11:13:47 +01:00
Peter Simons a70e883445 hackage-packages.nix: automatic Haskell package set update
This update was generated by hackage2nix v2.14.1-10-gd1d8208 from Hackage revision
137855b0b1.
2019-03-05 11:13:47 +01:00
Peter Simons d955c0a385 hackage-packages.nix: automatic Haskell package set update
This update was generated by hackage2nix v2.14.1-9-g74e5d36 from Hackage revision
dc5ba26095.
2019-03-05 10:22:33 +01:00
Peter Simons 33e87e4b69 LTS Haskell 13.10 2019-03-05 10:22:33 +01:00
Domen Kožar d45ba336b2
cachix: 0.1.3 -> 0.2.0 2019-03-05 10:59:51 +07:00
Ryan Mulligan cdc652ad45 haskell: fix removed aliases; fix OfBorg eval 2019-03-02 13:52:20 -08:00
Peter Simons 3d3e5cafa7 hackage-packages.nix: automatic Haskell package set update
This update was generated by hackage2nix v2.14.1-6-gd2bed2e from Hackage revision
e78602c2a3.
2019-03-02 19:30:40 +01:00
Matthew Bauer 71f189f26f stack-hook: deduplicate better
No need to check for duplicates as it is now handled by setup.sh
deduplication. Also should use targetOffset here instead of hostOffset
because we are using stack-hook natively.
2019-03-02 02:21:32 -05:00
Frederik Rietdijk 2fcb11a244 Merge staging-next into master 2019-03-01 09:06:20 +01:00
Artem Pyanykh f7003e5390 ghc-8.4.4: use sphinx 1.7.x to build the documentation
ghc-8.4.4 requires sphinx < 1.8, otherwise build fails on haddock with:

    Extension error: The 'ghc-flag' directive is already registered to domain std

Also fixed evaluation errors in configurations of ghc-8.2.x and ghc-8.4.x.

Closes https://github.com/NixOS/nixpkgs/pull/55703.
2019-02-27 21:08:49 +01:00
Peter Simons 8913ba2a8d hackage-packages.nix: automatic Haskell package set update
This update was generated by hackage2nix v2.14.1-6-gd2bed2e from Hackage revision
40db99045c.
2019-02-27 09:11:14 +01:00
Peter Simons 446757f8ae LTS Haskell 13.9 2019-02-27 09:11:13 +01:00
Peter Simons 1f2d0a3569 haskell-base-compat-batteries: fix build with ghc 8.2.2 and 8.4.4 2019-02-24 10:14:29 +01:00
Peter Simons 10e7cf92bc haskell-ci: enable command-line completion 2019-02-24 10:14:29 +01:00
Peter Simons bbd82be63e haskell-ci: add an override that uses the latest git version
The latest Hackage release is too old to be useful, unfortunately.
2019-02-24 10:14:29 +01:00
Peter Simons 3d596e90da hackage-packages.nix: automatic Haskell package set update
This update was generated by hackage2nix v2.14.1-6-gd2bed2e from Hackage revision
db6cb31415.
2019-02-24 10:14:29 +01:00
Vladimír Čunát 71f4ba29a3
Merge branch 'master' into staging-next
Hydra nixpkgs: ?compare=1506218
2019-02-22 17:51:01 +01:00
Domen Kožar 673f50f4d9
haskellPackages.servant-client-core: patch out runtime error 2019-02-22 17:03:52 +07:00
Peter Simons 4f208c5818 hackage-packages.nix: automatic Haskell package set update
This update was generated by hackage2nix v2.14.1-6-gd2bed2e from Hackage revision
f59e85c25b.
2019-02-22 10:34:55 +01:00
Nathan van Doorn a86ffa4988 haskell-modules/generic-builder.nix: add haddockFlags option 2019-02-22 10:32:15 +01:00
Peter Simons 6450d8c5ca haskell-hledger: drop obsolete (and already commented-out) overrides 2019-02-21 12:12:18 +01:00
Peter Simons 7a6bbb41ac haskell-hledger: don't install data files that don't belong to this package
Fixes https://github.com/NixOS/nixpkgs/issues/53936.
2019-02-21 12:12:18 +01:00
Peter Simons 1d6532d976
Merge pull request #56137 from jacereda/cereal-check-head
cereal: run test suite on ghc-head
2019-02-21 11:54:11 +01:00
Peter Simons 62eae63a49
Merge pull request #56139 from jacereda/psqueues-check-head
psqueues: run test suite on ghc-head
2019-02-21 11:53:25 +01:00
Peter Simons 48db7bf9d9
Merge pull request #56138 from jacereda/psqueues-check-86
psqueues: run test suite on ghc-8.6
2019-02-21 11:53:05 +01:00
Jorge Acereda 7e153d9e2d psqueues: run test suite on ghc-head 2019-02-21 10:08:04 +01:00
Jorge Acereda 5aa3f23a98 psqueues: run test suite on ghc-8.6 2019-02-21 10:06:42 +01:00
Jorge Acereda d5f45a6566 cereal: run test suite on ghc-head 2019-02-21 10:04:11 +01:00
Jorge Acereda c8e61efae3 cereal: run test suite on ghc-8.6 2019-02-21 10:02:43 +01:00