Commit Graph

4573 Commits

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

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

Closes https://github.com/NixOS/nixpkgs/pull/75449.
Closes https://github.com/NixOS/nixpkgs/pull/76103.
2019-12-27 20:37:13 +01:00
Peter Simons
4979823e46 git-annex: update sha256 hash for version 7.20191218 2019-12-27 20:37:13 +01:00
Peter Simons
dbcb34900a haskell-lsp-test: update override to the latest version 2019-12-27 20:37:13 +01:00
Peter Simons
6010ce05b7 pandoc: update override for the ghc-8.8.x to the latest version 2019-12-27 20:37:13 +01:00
Dmitry Kalinkin
c744527e3e gitAndTools.git-annex: fix darwin build
Closes: #76342
Fixes: #73435
2019-12-27 20:37:13 +01:00
(cdep)illabout
b7a5df05c3 spago: 0.12.1.0 -> 0.13.0 2019-12-27 20:37:13 +01:00
(cdep)illabout
54fad88234 haskellPackages.dhall_1_27_0: fix build 2019-12-27 20:37:13 +01:00
Merlin Göttlinger
693b68be7f haskell-lsp: Added 0.18.* to extra-packages for ghcide 2019-12-27 20:37:13 +01:00
(cdep)illabout
db1adfe3c8 haskellPackages.dhall_1_28_0: fix overrides so it builds
This PR fixes dhall_1_28_0, dhall-bash_1_0_25, and dhall-json_1_6_0 so
they build.

They all require a newer version of prettyprinter than we get from the
LTS package set.

This is from https://github.com/NixOS/nixpkgs/pull/75931 by @ijaketak.

Co-authored-by: Keito Kajitani <ijaketak@gmail.com>
2019-12-27 20:37:13 +01:00
Matt McHenry
9f053666ae haskellPackages.snap-server: patch for network >= 3.0 2019-12-27 20:37:13 +01:00
Robert Djubek
0787a562c4 glirc: init at 2.33.1
haskellPackages.glirc is a "Console IRC Client." I've added a doJailbreak
to fix the build (thanks @infinisil) and added it to top-level/all-packages.nix
so people can find and install it as they would normally.

Would be nice to make this build in a way that allows the OTR extension to be
enabled. One thing at a time....
2019-12-27 20:37:13 +01:00
Peter Simons
42e51bd42e hackage-packages.nix: automatic Haskell package set update
This update was generated by hackage2nix v2.15.0-11-g2fb6f7e from Hackage revision
16e46fea2e.
2019-12-27 20:37:03 +01:00
(cdep)illabout
753a0d3f72 haskellPackages.dhall_1_27_0: generate this package
This adds dhall-1.27.0 to extra-packages in
configuration-hackage2nix.yaml.

dhall-1.27.0 is used by spago, so this package needs to be available.
2019-12-27 20:37:01 +01:00
Peter Simons
992de916ce hackage2nix: disable broken builds 2019-12-27 20:35:33 +01:00
Aditya Manthramurthy
aaf838d095 haskellPackages.postgresql-simple-url: mark unbroken
Builds fine now.
2019-12-27 20:35:33 +01:00
(cdep)illabout
c1be286ca2 haskellPackages.stack2cabal: mark unbroken 2019-12-27 20:35:33 +01:00
Peter Simons
b77ed68156 LTS Haskell 14.18 2019-12-27 20:35:33 +01:00
Peter Simons
3e2e061529 structured-haskell-mode: update github repo location 2019-12-27 18:42:56 +01:00
Peter Simons
c2ba83e98a haskell-descriptive: use the proper release version instead of the one from git
The released version has all the fixes we needed.
2019-12-27 18:37:42 +01:00
John Ericson
9cbbe2b00f Merge branch 'ghcjs-cross-without-cc-common' into ghcjs-cross-without-cc 2019-12-25 14:36:13 -05:00
John Ericson
d8dd301412 haskell generic-builder: Hack so CPP without a CC works 2019-12-25 14:34:40 -05:00
John Ericson
49daa0aa64 Merge branch 'ghcjs-cross-without-cc-common' into ghcjs-cross-without-cc 2019-12-25 13:17:00 -05:00
John Ericson
6a23c9ddbe haskell generic-builder: Fix --with-ghc flag for GHCJS as cross
Otherwise it passes `--with-ghc=ghc`, and we do the wrong thing.
2019-12-25 13:14:48 -05:00
John Ericson
a8bd27b454 Merge branch 'ghcjs-cross-without-cc-common' into ghcjs-cross-without-cc 2019-12-25 01:31:35 -05:00
John Ericson
ad93663a48 ghcWithHoogle: Fix for cross
Use `buildPackages.stdenv.mkDerivation` because we are making a shell
script to start hoogle on the build platform.
2019-12-24 18:17:41 -05:00
Niklas Hambüchen
4bf23ce6f9 haskellPackages.GLUT: Fix freeglut.pc -> glut.pc.
This was broken by PR #70235 with commit

    f5ae5cac - freeglut: 3.0.0 -> 3.2.1

The in the newer freeglut version, the pkg-config file is called
`glut.pc`, no longer `freeglut.pc`.

Found in:

    https://github.com/NixOS/nixpkgs/pull/70235#issuecomment-567536852
2019-12-20 02:52:54 +01:00
Peter Simons
9c01e123d6 haskell-src-meta: update ghc-8.8.x build to the latest version
This allows us to build the package without the need for
patching. The test suite still doesn't compile unfortunately.

Closes https://github.com/NixOS/nixpkgs/pull/75594.
2019-12-13 20:48:35 +01:00
Peter Simons
69e794d1d8 haskell-pandoc: update the ghc-8.8.x build to version 2.9 2019-12-13 20:48:35 +01:00
Manuel Bärenz
bd11e12fcc haskell-clay: unbreak the build; it succeeds fine 2019-12-13 20:48:14 +01:00
Peter Simons
2d94437a32 haskell-doctemplates: update override for ghc-8.8.x 2019-12-13 20:48:13 +01:00
Peter Simons
c02f1b47cd hackage-packages.nix: automatic Haskell package set update
This update was generated by hackage2nix v2.15.0-9-g650d530 from Hackage revision
df9ca29882.
2019-12-13 20:48:13 +01:00
Peter Simons
d5814bc0e6 haskell-ghcide: use latest haskell-lsp versions
ghcide needs version 0.18.x of the haskell-lsp package to build.

Closes https://github.com/NixOS/nixpkgs/pull/75610.
2019-12-13 20:48:13 +01:00
sternenseemann
1fef36e671 haskell-spacecookie: use correct version of systemd to fix the build 2019-12-13 20:46:29 +01:00
sternenseemann
e449a21f19 haskell-systemd: use correct version of network to fix the build 2019-12-13 20:46:29 +01:00
Peter Simons
82d49ffa82 hackage2nix: disable broken builds 2019-12-13 20:46:29 +01:00
Peter Simons
c01e7b9703 LTS Haskell 14.17 2019-12-13 20:45:44 +01:00
Peter Simons
53dca0d451 haskell-hlint: update override for ghc-lib-parser to the latest version 2019-12-06 20:55:12 +01:00
Peter Simons
88179304b4 haskell-brick: use the latest version when building with ghc-8.8.x 2019-12-06 20:55:12 +01:00
Peter Simons
fc8ccfa780 haskell-dhall: update overrides for the latest version 2019-12-06 20:55:12 +01:00
Peter Simons
cd9816e0f7 haskell-pandoc: update ghc-8.8.x override for the latest version 2019-12-06 20:55:12 +01:00
Peter Simons
66285b7ab7 haskell-vty: use latest version when building with ghc-8.8.x 2019-12-06 20:55:12 +01:00
Peter Simons
09186816b1 haskell-regex-tdfa: update override for ghc-8.8.x 2019-12-06 20:55:12 +01:00
Peter Simons
fa1a064694 haskell-monad-par: enable test suite again 2019-12-06 20:55:12 +01:00