Peter Simons
5b73d202ab
haskell-jailbreak-cabal: build with Cabal 2.2.x in ghc-8.2.x package set
2018-05-30 03:46:16 +02:00
Peter Simons
852e9dc448
haskell-brick: update override for ghc 8.4.x
2018-05-30 03:46:16 +02:00
Peter Simons
9ef8d70d23
haskell-graphviz: override dependency versions to fix the build
...
Closes https://github.com/ivan-m/graphviz/issues/34 .
2018-05-30 03:46:16 +02:00
Peter Simons
60d8e82558
hackage-packages.nix: automatic Haskell package set update
...
This update was generated by hackage2nix v2.9.2-17-g580e4ea from Hackage revision
ae1b1485e2
.
2018-05-30 03:46:16 +02:00
Peter Simons
28ca28296f
LTS Haskell 11.11
2018-05-30 03:45:54 +02:00
Orivej Desh
e4df80a69b
haskellPackages.hlibgit2: fix build after #28029
2018-05-29 23:57:23 +00:00
Ryan Mulligan
e8c5d867a1
use https for default Hackage homepage
2018-05-28 12:48:16 -07:00
Profpatsch
ac404fd9e7
haskellPackages: mark yarn2nix broken w/ message
2018-05-28 17:28:53 +02:00
Jan Malakhovski
ad35019501
Merge branch 'master' into staging
...
Fixed conflicts:
- lib/systems/for-meta.nix: in favor of staging
- pkgs/os-specific/darwin/xcode/default.nix: in favor of master
2018-05-26 00:20:17 +00:00
John Ericson
2e70a75b12
haskell generic-builder: Limit usage of --extra-framework-dirs for compat
2018-05-25 14:52:58 -04:00
John Ericson
ce0180dfd5
Merge pull request #40996 from obsidiansystems/cross-ghc
...
ghc, haskell-infra: #40929 take 2
2018-05-25 11:09:07 -04:00
John Ericson
d7144e708b
Merge remote-tracking branch 'upstream/master' into staging
2018-05-23 16:00:04 -04:00
Peter Simons
9c2b4e53fa
hackage-packages.nix: automatic Haskell package set update
...
This update was generated by hackage2nix v2.9.2-13-gd8bc043 from Hackage revision
9866f7be16
.
2018-05-23 18:21:13 +02:00
Peter Simons
f9524a48f3
LTS Haskell 11.10
2018-05-23 18:21:13 +02:00
Peter Simons
ba47d40db9
hackage-packages.nix: automatic Haskell package set update
...
This update was generated by hackage2nix v2.9.2-13-gd8bc043 from Hackage revision
4e1741ad6f
.
2018-05-23 18:21:13 +02:00
Peter Simons
e7abee1939
hackage2nix: disable failing builds on Hydra
2018-05-23 18:21:12 +02:00
Moritz Angermann
63e5b3ce71
used stdenv.targetPlatform.isDarwin and not stdenv.isDarwin.
2018-05-23 10:27:42 -04:00
Moritz Angermann
87afa66a63
haskell infra: Adds buildFlags logic
2018-05-23 10:27:42 -04:00
Moritz Angermann
affeb0cb80
haskell generic builder: Do the links
dance only if shared is enabled.
2018-05-23 10:27:41 -04:00
Moritz Angermann
a4d5dbd45d
haskell generic builder: Disable static libs on Windows because no -staticlib
...
The reason why this does not work is not that we can't built static
objects, we can, but we can't use `-staticlib` on GHC on windows.
`-staticlib` rolls all dependencies into a combined archive. While this
would work on windows if we used gnu ar and MRI script, GHC can't rely
on GNU ar, and as such has a quick archive concatenation module for GNU
and BSD archives only.
2018-05-23 10:27:41 -04:00
Moritz Angermann
38fbdcc726
haskell generic builder: Use setup package database for setup-depends
...
Adapted from b69f420121
by @Ericson2314
2018-05-23 10:27:41 -04:00
John Ericson
e1b9419dec
haskell generic builder: setupHaskellDepends
should be `nativeBuildInputs
...
This is because they are just for Setup.hs, so they are just used at build time
and completely isolated from the normal components' dependencies.
This was previous implemented in 8a8f0408cd
, but
reverted in e69c7f5641
because it broken
setup-depends non-cross in haskell shell environments (custom Setup.hs in cross
shell environments has never worked). This version adds a special native
exception to avoid that breakage.
2018-05-23 10:27:39 -04:00
John Ericson
513cd3de0e
haskell-generic-builder: Add extra framework dirs
...
Just like with the other `--extra-*` flags, cc/ld-wrapper already handles
this, but we need to make Cabal aware so that the haskell builds have
the correct metadata.
2018-05-23 10:26:57 -04:00
John Ericson
3394c96655
haskell generic-builder: Tiny changes that preserve hases
...
These bring us closer to staging at no cost
2018-05-23 10:23:06 -04:00
John Ericson
446cb32ea1
haskell generic-builder: Remove merge conflict
...
I forgot this in 17316643fd
2018-05-23 10:11:03 -04:00
John Ericson
18742471af
Merge remote-tracking branch 'upstream/master' into staging
...
Use newer vagrant from master
2018-05-23 09:40:37 -04:00
Peter Simons
8f96324584
haskell-lambdabot-core: apply patch from @int-e to fix GHC 8.4.x build
2018-05-23 12:24:31 +02:00
Peter Simons
5db3a9df5e
Revert "ghc, haskell infra: #40642 direct to master"
2018-05-23 09:36:16 +02:00
Peter Simons
0e35858252
Merge pull request #40929 from obsidiansystems/cross-ghc-for-master
...
ghc, haskell infra: #40642 direct to master
2018-05-22 20:37:45 +02:00
Tuomas Tynkkynen
f9feacfc7c
Merge remote-tracking branch 'upstream/master' into staging
2018-05-22 17:48:29 +03:00
Peter Simons
07a045922d
Merge pull request #40710 from ElvishJerricco/overrideCabal-getHaskellBuildInputs
...
Make getHaskellBuildInputs / shellFor work with overrideCabal (Fixes #40266 )
2018-05-22 10:37:26 +02:00
Peter Simons
e9d991a938
hackage-packages.nix: automatic Haskell package set update
...
This update was generated by hackage2nix v2.9.2-13-gd8bc043 from Hackage revision
a5d0811a16
.
2018-05-22 10:32:09 +02:00
Peter Simons
3e2a3b4f12
hackage2nix: keep haddock-library 1.5.x around
2018-05-22 10:31:39 +02:00
John Ericson
db4d77779c
Merge remote-tracking branch 'upstream/master' into staging
2018-05-21 20:21:48 -04:00
John Ericson
d6ecbbe921
Merge branch 'staging' into feature/clean-ghc
2018-05-21 17:43:30 -04:00
Moritz Angermann
f914fdd960
used stdenv.targetPlatform.isDarwin and not stdenv.isDarwin.
2018-05-21 15:11:11 -04:00
Moritz Angermann
82a847a04b
haskell infra: Adds buildFlags logic
2018-05-21 15:11:11 -04:00
Moritz Angermann
5e589a4049
haskell generic builder: Do the links
dance only if shared is enabled.
2018-05-21 15:11:11 -04:00
Moritz Angermann
4ea33def46
haskell generic builder: Disable static libs on Windows because no -staticlib
...
The reason why this does not work is not that we can't built static
objects, we can, but we can't use `-staticlib` on GHC on windows.
`-staticlib` rolls all dependencies into a combined archive. While this
would work on windows if we used gnu ar and MRI script, GHC can't rely
on GNU ar, and as such has a quick archive concatenation module for GNU
and BSD archives only.
2018-05-21 15:11:11 -04:00
Moritz Angermann
15759df660
haskell generic builder: Use setup package database for setup-depends
...
Adapted from b69f420121
by @Ericson2314
2018-05-21 15:11:10 -04:00
John Ericson
900862ea3b
haskell generic builder: setupHaskellDepends
should be `nativeBuildInputs
...
This is because they are just for Setup.hs, so they are just used at build time
and completely isolated from the normal components' dependencies.
This was previous implemented in 8a8f0408cd
, but
reverted in e69c7f5641
because it broken
setup-depends non-cross in haskell shell environments (custom Setup.hs in cross
shell environments has never worked). This version adds a special native
exception to avoid that breakage.
2018-05-21 15:09:51 -04:00
Will Fancher
1f348e41a4
Dont test enclosed exceptions
2018-05-20 13:24:28 -04:00
Vladimír Čunát
392e6de7d0
Merge branch 'master' into staging
2018-05-20 13:20:53 +02:00
Peter Simons
49fc5f0044
git-annex: update sha256 hash for the new version
2018-05-19 22:24:31 +02:00
Peter Simons
c2dd77c440
haskell-vector-sized: update override for the latest version
2018-05-19 22:24:30 +02:00
Peter Simons
b558e43753
haskell-hspec: use version 2.5.1 for ghc-8.4.x
2018-05-19 22:24:30 +02:00
Peter Simons
d83d20c11b
haskell-pandoc: update override for ghc-8.4.x
2018-05-19 22:24:30 +02:00
Peter Simons
02834ba458
hackage-packages.nix: automatic Haskell package set update
...
This update was generated by hackage2nix v2.9.2-13-gd8bc043 from Hackage revision
a6208828bf
.
2018-05-19 22:24:21 +02:00
Peter Simons
9cd1702502
LTS Haskell 11.9
2018-05-19 22:24:18 +02:00
John Ericson
2241dedbe6
Merge pull request #40442 from obsidiansystems/cabal-frameworks
...
haskell-generic-builder: Add extra framework dirs
2018-05-18 18:08:20 -04:00
John Ericson
c6f742b770
haskell-generic-builder: Add extra framework dirs
...
Just like with the other `--extra-*` flags, cc/ld-wrapper already handles
this, but we need to make Cabal aware so that the haskell builds have
the correct metadata.
2018-05-18 17:49:41 -04:00
John Ericson
5ccb99e372
Merge remote-tracking branch 'upstream/master' into staging
2018-05-18 17:48:37 -04:00
John Wiegley
d33322d449
haskellPackages.developPackage: Add a defaulted provideDrv argument
...
The purpose of this argument is to allow you to get at the derivation (rather
than it's env) even when in the evaluation context of a nix-shell invocation.
2018-05-18 13:04:18 -07:00
Tuomas Tynkkynen
003473613a
Merge remote-tracking branch 'upstream/master' into staging
...
Conflicts:
pkgs/top-level/all-packages.nix
2018-05-18 03:54:38 +03:00
Will Fancher
5523ec8f3c
Make getHaskellBuildInputs / shellFor work with overrideCabal
2018-05-17 20:35:53 -04:00
Peter Simons
b5cef2ea66
Merge pull request #40392 from ElvishJerricco/ghcjs-8.2
...
Ghcjs 8.2 & 8.4
2018-05-17 17:55:59 +02:00
John Ericson
f2017c40ae
Merge remote-tracking branch 'upstream/master' into staging
2018-05-14 22:53:10 -04:00
Profpatsch
669f9453dc
haskellPackages.hnix: jailbreak & fix tests
...
Some of the new tests need the `nix` executable on `PATH`.
One also needs `hpack`, but we really don’t want to embiggen (heh) the closure
because of that.
2018-05-15 04:03:28 +02:00
Will Fancher
64df9b6b89
GHCJS 8.4
2018-05-12 17:48:30 -04:00
John Ericson
42f6e7c4e4
Merge remote-tracking branch 'upstream/master' into staging
2018-05-10 12:04:17 -04:00
Peter Simons
07dc607a8d
Merge pull request #40250 from LumiGuide/fix-base-compat-batteries
...
haskell: fix build of base-compat-batteries
2018-05-10 15:09:36 +02:00
Frederik Rietdijk
64c8c6dcb3
Merge master into staging
2018-05-10 09:30:56 +02:00
Matthew Justin Bauer
1682353805
generic-stack-builder: also support nix-build
...
We need to add the STACK_IN_NIX_EXTRA_ARGS hook in configurePhase also to ensure we get the right args when calling ```nix-build``` (as opposed to nix-shell).
2018-05-09 18:12:13 -05:00
Bas van Dijk
53d6997e5d
haskell: fix build of base-compat-batteries
2018-05-09 22:59:54 +02:00
Matthew Bauer
527abe59cf
generic-stack-builder: attempt to add propagation
...
Fixes #40039
This adds a shellHook to handle propagated dependencies like that seen
in #40039 where gpgme needed libgpg-error.
2018-05-09 15:46:48 -05:00
Peter Simons
a9577da115
haskell-brick: update override for ghc-8.4.x to the latest version
2018-05-09 20:41:33 +02:00
Peter Simons
77fbd14d85
haskell-gi: apply upstream patch to fix the doctest suite
2018-05-09 20:41:33 +02:00
Peter Simons
5c26dd3195
hackage-packages.nix: automatic Haskell package set update
...
This update was generated by hackage2nix v2.9.2-13-gd8bc043 from Hackage revision
6ab957cb81
.
2018-05-09 20:41:28 +02:00
Frederik Rietdijk
a18b493e02
Merge master into staging
2018-05-09 10:48:01 +02:00
Jack Kelly
33bc4a7b3b
haskellPackages.blank-canvas_0_6_2: dontCheck
...
Same reason as 2d01bb7f6a
, but for the
specific-version package.
2018-05-09 12:05:26 +10:00
Peter Simons
c5338e5acb
haskell-gi: remember the URL to the PR that explains why the override is necessary
2018-05-08 17:47:12 +02:00
Peter Simons
26e961c1fb
hackage-packages.nix: automatic Haskell package set update
...
This update was generated by hackage2nix v2.9.2-11-ga2d666d from Hackage revision
7b40a148a0
.
2018-05-08 17:46:45 +02:00
Peter Simons
277ca33bee
LTS Haskell 11.8
2018-05-08 17:46:24 +02:00
Matthew Bauer
6748534d83
Merge remote-tracking branch 'upstream/master' into staging
2018-05-08 09:36:00 -05:00
Peter Simons
d3784373ad
haskell-dbus-hslogger & status-notifier-item: use latest dbus despite lts-11.x
2018-05-07 14:29:15 +02:00
Peter Simons
8b11e30b84
github-backup: jailbreak to fix the build
2018-05-07 14:29:15 +02:00
Peter Simons
394d0f2ed9
haskell-gi-gdkx11: drop obsolete override
...
Closes https://github.com/NixOS/nixpkgs/issues/37724 .
2018-05-07 14:29:15 +02:00
Peter Simons
253ea95d28
hackage-packages.nix: automatic Haskell package set update
...
This update was generated by hackage2nix v2.9.2-11-ga2d666d from Hackage revision
f60ac8c0ef
.
2018-05-07 14:29:15 +02:00
Peter Simons
127de7480e
haskell-attoparsec-varword: fix infinite recursion in test dependencies
2018-05-06 19:31:04 +02:00
Michael Alan Dorman
4764a6e2e9
haskell-gi, gi-gdkx11: fix builds
...
The `haskell-gi` build fails its doctests because of a missing
library; I'm not 100% convinced that setting it to `dontCheck` is the
right thing to do, but I don't have a better idea at the moment.
The `gi-gdkx11` build fails because, surprise, Gdk-X11 isn't found; by
looking around in my store, I found that that that library seems to
live in gtk3 these days; this override is just a stop-gap, though,
I've also submitted the change to cabal2nix that I believe will fix
the automatic generation of the package in the future.
2018-05-06 19:31:04 +02:00
Peter Simons
fe95c5c64f
hackage-packages.nix: automatic Haskell package set update
...
This update was generated by hackage2nix v2.9.2-9-g07ca643 from Hackage revision
d2c0010bab
.
2018-05-06 19:31:04 +02:00
Peter Simons
11096b2cfe
hackage2nix: disable failing Hydra builds
...
@gebner: hledger-diff no longer compiles
2018-05-06 19:31:03 +02:00
Peter Simons
f2b581394c
Merge pull request #39903 from endgame/hold-blank-canvas
...
haskellPackages.blank-canvas: 0.6.3 -> 0.6.2
2018-05-04 13:26:41 +02:00
John Ericson
cf06e42d1c
Merge remote-tracking branch 'upstream/master' into staging
2018-05-03 16:35:36 -04:00
Peter Simons
6ff00acd67
haskell-wl-pprint-text: drop obsolete override for ghc-8.4.x
2018-05-03 14:50:45 +02:00
Peter Simons
988ad012f6
haskell-hashtables: drop obsolete override for ghc-8.4.x
2018-05-03 14:50:44 +02:00
Peter Simons
cdca787899
haskell-dhall: jailbreak version 1.13.0 to fix the build with ansi-terminal 0.8.x
...
Ping: @Gabriel439
2018-05-03 14:50:44 +02:00
Peter Simons
4519076421
haskell-dhall: update override for ghc-8.4.x to use the latest version
2018-05-03 14:50:44 +02:00
Peter Simons
1d79794c79
haskell-gtk2hs-buildtools: drop obsolete override for ghc-8.4.x
2018-05-03 14:50:44 +02:00
Peter Simons
0fe2007963
haskell-simple-reflect: drop obsolete override for ghc-8.4.x
2018-05-03 14:50:44 +02:00
Peter Simons
756e386e41
haskell-gi-base: drop obsolete override for ghc-8.4.x
2018-05-03 14:50:43 +02:00
Peter Simons
ce6402dc79
haskell-gi: drop obsolete override for ghc-8.4.x
2018-05-03 14:50:43 +02:00
Peter Simons
92256a9453
haskell-tar: drop obsolete override for ghc-8.4.x
2018-05-03 14:50:43 +02:00
Peter Simons
b33d1d6481
hackage-packages.nix: automatic Haskell package set update
...
This update was generated by hackage2nix v2.9.2-9-g07ca643 from Hackage revision
bb0c3bef04
.
2018-05-03 14:50:30 +02:00
Jack Kelly
4680fe67db
haskellPackages.blank-canvas: 0.6.3 -> 0.6.2
...
blank-canvas-0.6.3 depends on base-compat-batteries-0.10, which
depends on base-compat-0.10. This conflicts with the rest of the LTS
set, which uses base-compat-0.9. No base-compat-batteries-0.9 exists.
blank-canvas-0.6.2 only depends on base-compat >= 0.8 && < 0.10.
2018-05-03 12:12:48 +10:00
Matthew Justin Bauer
eeb016e8f0
Merge branch 'staging' into fix-ncurses-darwin-extensions
2018-05-02 15:40:38 -05:00
Peter Simons
59490ae472
haskell-brick: update override for ghc 8.4.x
2018-05-01 09:30:23 +02:00
Peter Simons
e9c955fb84
hackage-packages.nix: automatic Haskell package set update
...
This update was generated by hackage2nix v2.9.2-9-g07ca643 from Hackage revision
4fb888414b
.
2018-05-01 09:29:45 +02:00
Peter Simons
79897e15ab
LTS Haskell 11.7
2018-05-01 09:29:43 +02:00
Peter Simons
9f144e8578
haskell-hspec-smallcheck: use latest version for ghc-8.4.x to fix the build
2018-04-28 15:38:00 +02:00
Peter Simons
8564e93d2d
haskell-c2hs: drop hacky override and try the current version again
2018-04-28 15:38:00 +02:00
Peter Simons
f0549be090
haskell-stack: update overrides for the new 1.7.1 version
2018-04-28 15:37:59 +02:00
Peter Simons
c60c6a2443
git-annex: update sha256 hash for new 6.2018042 version
2018-04-28 15:37:59 +02:00
Peter Simons
99dc2d6f0f
haskell-hpack: use latest version for ghc-8.4.x to fix the build
2018-04-28 15:37:59 +02:00
Peter Simons
e39a75cd35
haskell-pandoc: update override for ghc-8.4.x
2018-04-28 15:37:59 +02:00
Peter Simons
f8d0c9e3c3
hackage-packages.nix: automatic Haskell package set update
...
This update was generated by hackage2nix v2.9.2-9-g07ca643 from Hackage revision
bb8ed19628
.
2018-04-28 15:37:55 +02:00
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