JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
173,272 Commits 2 Branches 0 Tags 13 GiB
dc884633a4
Commit Graph

3967 Commits

Author SHA1 Message Date
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