Commit graph

4005 commits

Author SHA1 Message Date
Peter Simons da9c111088 ghc-8.6.x: fix llvmPackages version; this compiler needs LLVM 6.x 2019-04-30 11:43:44 +00:00
Peter Simons 894e102c84 ghc: add alpha-1 pre-release for version 8.8.1
The patches for https://phabricator.haskell.org/D5123 and
https://github.com/haskell/haddock/issues/900 no longer
apply and have been dropped.
2019-04-30 11:43:44 +00:00
Peter Simons 0dffbcd178 haskell-pandoc-citeproc: update override for the latest version 2019-04-25 17:29:40 +02:00
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
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