Commit Graph

3279 Commits

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