volth
6d2857a311
[bot] treewide: remove unused 'inherit' in let blocks
2018-07-20 19:38:19 +00:00
Frederik Rietdijk
1a6af9f88e
Merge pull request #43857 from volth/unused
...
[bot] treewide: remove unreferenced code
2018-07-20 21:06:32 +02:00
volth
87f5930c3f
[bot]: remove unreferenced code
2018-07-20 18:48:37 +00:00
Peter Simons
65d209811a
Merge pull request #43509 from dtzWill/fix/hpc-coveralls-patch
...
hpc-coveralls: patch to fix build (for Cabal 2.2)
2018-07-20 09:13:04 +02:00
Silvan Mosberger
59159f9d8e
haskellPackages.hnix: Fix build ( #43824 )
2018-07-19 19:18:44 +01:00
Peter Simons
b667721ce2
Merge pull request #43730 from srhb/dontcheck-spatial-rotation
...
haskellPackages.spatial-rotations: dontCheck for cyclic dependency
2018-07-19 14:00:55 +02:00
Sarah Brofeldt
b53b5950fc
haskellPackages.spatial-rotations: dontCheck for cyclic dependency
2018-07-19 10:37:12 +02:00
Matthew Bauer
76999cc40e
treewide: remove aliases in nixpkgs
...
This makes the command ‘nix-env -qa -f. --arg config '{skipAliases =
true;}'’ work in Nixpkgs.
Misc...
- qtikz: use libsForQt5.callPackage
This ensures we get the right poppler.
- rewrites:
docbook5_xsl -> docbook_xsl_ns
docbook_xml_xslt -> docbook_xsl
diffpdf: fixup
2018-07-18 23:25:20 -04:00
Peter Simons
0ac5637ee9
Add a couple of overrides to fix builds in the ghc-8.6.x package set.
2018-07-18 10:27:39 +02:00
Peter Simons
194a2f0535
hackage-packages.nix: automatic Haskell package set update
...
This update was generated by hackage2nix v2.10.1 from Hackage revision
12c327a1fb
.
2018-07-18 10:27:40 +02:00
Peter Simons
9aff5fcd56
LTS Haskell 12.1
2018-07-18 10:27:39 +02:00
Domen Kožar
6fd5287c36
haskell: don't error if isLibrary = true and no libraries exist
...
If empty directory isn't deleted, referer depenedencies will
fail with:
cp: missing destination file operand after '/tmp/nix-build-cabal-helper-0.8.0.2.drv-0/setup-package.conf.d/'
This is currently only the case for cabal-install, as cabal2nix
doesn't handle well buildable=False flags due to long-standing bugs
in Cabal itself.
2018-07-18 10:25:40 +02:00
Will Dietz
da5383006d
haskell-modules: only include glibc locales when using glibc
...
Fixes #43665 .
Hopefully. :)
2018-07-17 08:44:17 -05:00
Peter Simons
b412cac1d7
Merge pull request #43508 from nh2/haskell-dontStrip
...
haskell: Pass `dontStrip` to cabal. Fixes #43506
2018-07-17 08:57:32 +02:00
Peter Simons
9a32dafd05
Merge pull request #43444 from Infinisil/idris-cleanup
...
idris: Recurse into attrs, fix build and remove unneeded overrides
2018-07-16 20:38:53 +02:00
Peter Simons
c661f96968
Consistently pass versioned llvmPackages_x attributes to GHC.
...
Otherwise, these configurations are going to break when Nixpkgs updates
to llvm 6.x.
2018-07-16 10:56:36 +02:00
Peter Simons
55af91d4aa
haskell-xmobar: the new release handles recent haskell-dbus version
2018-07-16 10:11:14 +02:00
Peter Simons
14dc80bc3e
hackage-packages.nix: automatic Haskell package set update
...
This update was generated by hackage2nix v2.10.0-5-gc7420eb from Hackage revision
61ddd81557
.
2018-07-16 09:57:49 +02:00
Will Fancher
2781b1fcbc
Fix ghcjs-dom-jsffi with GHCJS 8.4
2018-07-15 23:47:47 -04:00
Will Fancher
68ea661bb4
Fix various packages under GHCJS
2018-07-15 23:47:46 -04:00
Will Fancher
8488982ee3
Fixed some core packages in GHCJS 8.4
2018-07-15 22:41:27 -04:00
Will Dietz
a16b7dfb6a
hpc-coveralls: patch to fix build (for Cabal 2.2)
2018-07-13 23:39:17 -05:00
Niklas Hambüchen
e15496203e
haskell: Pass dontStrip
to cabal. Fixes #43506
2018-07-14 03:41:39 +02:00
Silvan Mosberger
d767c0c253
idris: Remove unneeded overrides
...
- The gmp issue has long been fixed and closed
- The preBuild thing was never used afaik, it works no problem without
it, especially since checks don't run (To get checks to work we'd have
to compile the libraries into idris, which are currently nicely
separated)
- The dependencies overrides aren't needed anymore
2018-07-13 00:59:30 +02:00
Will Dietz
ba602b0a5f
haskell-{unix-time,prettyprinter}: dontCheck on musl
2018-07-12 11:04:25 -05:00
Peter Simons
e65bdb9199
xmonad-extras: jailbreak to build to cope with out patched version of xmonad
...
Fixes https://github.com/NixOS/nixpkgs/issues/43374 .
2018-07-12 10:54:58 +02:00
Peter Simons
e1e707ce7f
hackage-packages.nix: automatic Haskell package set update
...
This update was generated by hackage2nix 2.9.3-8-gb330eb5 from Hackage revision
5926b55f65
.
2018-07-11 11:41:09 +02:00
Peter Simons
6fa41ca51f
hackage2nix: disable failing Hydra builds
2018-07-11 11:41:08 +02:00
Peter Simons
4fe4ac341d
haskell-stylish-cabal: build needs hspec < 2.5 to succeed
2018-07-11 11:10:45 +02:00
Peter Simons
ef967e2a40
hackage2nix: cosmetic (avoid use of tabs)
2018-07-10 21:49:18 +02:00
Peter Simons
0b0696f4ac
haskell-stack: jailbreak to fix the build
2018-07-10 20:10:27 +02:00
Domen Kožar
d3a7439722
haskell-servant-swagger: disable tests until next release
2018-07-10 20:10:27 +02:00
Domen Kožar
7c35b1a006
haskell-amazonka: no need for overrides
2018-07-10 20:10:27 +02:00
Domen Kožar
b039854de1
haskell-lzma: dontCheck
2018-07-10 20:10:27 +02:00
Peter Simons
b49693a0fa
haskell-taffybar: drop duplicate override for strictDeps
2018-07-10 20:10:27 +02:00
Peter Simons
e36fcd28a2
cabal2nix: help the regression test suite locate the cabal2nix binary
2018-07-10 20:10:27 +02:00
Peter Simons
1397830470
structured-haskell-mode: fix build with LTS 12.x
2018-07-10 20:10:27 +02:00
Peter Simons
dcd037c14a
git-annex: fix the build in LTS 12.x
...
git-annex depends on 'esqueleto', which is not actively maintained. As a
result, 'esqueleto' fails to compile with recent versions of 'persistent',
which in turns requires us to link with old versions of 'conduit' and so on and
so forth. It's a disaster. I wasted several hours of my life trying to make
that build work, but eventually I gave up and dropped support for S3 and for
the Web app from git-annex to get rid of the most problematic dependencies.
That reduced version of git-annex is still difficult enough to compile, but at
least it's possible.
2018-07-10 20:10:27 +02:00
Peter Simons
1cc53afdd2
haskell-xmonad-contrib: apply patches to fix the build
2018-07-10 20:10:27 +02:00
Peter Simons
0c45d331c7
haskell-xmobar: build with older versions of its dependencies
2018-07-10 20:10:27 +02:00
Peter Simons
279287a91c
haskell-haddock-library: jailbreak and disable test suite to fix the build
2018-07-10 20:10:26 +02:00
Peter Simons
1cc37b2947
haskell-tree-diff: jailbreak to fix the build
2018-07-10 20:10:26 +02:00
Peter Simons
f73baa30f3
haskell-odpic-raw: can't compile this package on Hydra because of unfree dependencies
2018-07-10 20:10:26 +02:00
Peter Simons
62239af3ee
haskell-manifolds: break infinite recursion in test suite dependencies
2018-07-10 20:10:26 +02:00
Peter Simons
1096d95c84
haskell-hledger: drop obsolete overrides for ghc-8.2.x
2018-07-10 20:10:26 +02:00
Peter Simons
a711d4342f
Update Haskell overrides for lts-12.x.
2018-07-10 20:10:26 +02:00
Peter Simons
444404fc4a
hackage-packages.nix: automatic Haskell package set update
...
This update was generated by hackage2nix 2.9.3-3-ge82312f from Hackage revision
386d91ec32
.
2018-07-10 20:10:26 +02:00
Peter Simons
6ad292424a
hackage2nix: update list of broken Hydra builds
2018-07-10 20:10:18 +02:00
Peter Simons
32bd0c4f50
hackage2nix: xmobar-0.26 needs old versions of dbus and hinotify to compile
2018-07-10 20:10:18 +02:00
Peter Simons
69cd09f8fb
Switch default Haskell package set to LTS-12.x and GHC 8.4.3.
...
We are at LTS Haskell 12.0.
2018-07-10 20:10:18 +02:00
Robert Hensing
873465eede
Merge pull request #42923 from Gabriel439/gabriel/readDirectory
...
Add `pkgs.haskell.lib.packagesFromDirectory` utility
2018-07-10 11:30:11 +02:00
John Ericson
740cfffcb2
haskell infra: Fix built-time overrides
...
These should all come from `buildHaskellPackages`
2018-07-09 18:09:17 -04:00
John Ericson
f27f491784
Haskell infra: Do callPackage splicing
2018-07-09 16:39:37 -04:00
John Ericson
0299641c91
haskell generic-builder: Make test and benchmark tool depends nativeBuildInputs
...
This was reverted in 6e07a3a19a
with the
other commits in the PR, as the number of overrides added in that PR was deemed
excessive. But this commit adds no overrides, and is valuable on its
own, so I am adding it back.
(cherry picked from commit 359e0ce4bb
)
2018-07-09 12:30:18 -04:00
Gabriel Gonzalez
05ca67107a
Fix type signature
2018-07-07 15:23:03 -07:00
Robert Hensing
637fcd4c5b
pkgs.haskell.lib.packagesFromDirectory: forward compatibility
...
Add `...` for less painful downgrades in the future
2018-07-06 13:03:56 +02:00
Peter Simons
a2338472fb
Drop obsolete ghc-8.4.x overrides for arrows, flexible-defaults, and lambdabot-core.
2018-07-04 19:14:18 +02:00
Peter Simons
1d587c2e66
hledger-ui: fix build with ghc 8.4.x
2018-07-04 19:14:18 +02:00
Peter Simons
81a85ae486
haskell-criterion: update override for ghc 8.4.x
2018-07-04 19:14:18 +02:00
Peter Simons
07db547c19
haskell-dhall: update override for the new version that's used by ghc 8.4.x
2018-07-04 19:14:18 +02:00
Peter Simons
259215a6b3
ghc-8.6.x: create an initial package set configuration
2018-07-04 19:14:18 +02:00
Peter Simons
e938b12cde
haskell-base-compat: update overrides for the new version
2018-07-04 19:14:18 +02:00
Peter Simons
0a635d3b78
haskell-hspec: update override for ghc 8.4.x
2018-07-04 19:14:18 +02:00
Peter Simons
ed111be99a
hackage-packages.nix: automatic Haskell package set update
...
This update was generated by hackage2nix v2.9.2-32-gdaeaea6 from Hackage revision
f8e066acb6
.
2018-07-04 19:14:19 +02:00
Peter Simons
70d7586278
hackage2nix: ignore Stackage constraints for lambdabot and use latest versions
2018-07-04 19:14:01 +02:00
Peter Simons
a282166e0d
hackage2nix: avoid the update to base-compat-batteries-0.10.4
...
We cannot compile that new version because most builds don't work with
contravariant 1.5.x.
2018-07-04 19:13:14 +02:00
Peter Simons
2664df06c5
hackage2nix: disable failing Hydra builds
2018-07-04 19:13:14 +02:00
Peter Simons
bf9ad8da07
LTS Haskell 11.16
2018-07-04 19:13:14 +02:00
Gabriel Gonzalez
2c55c157bd
Rename readDirectory
to packagesFromDirectory
...
... as suggested by @roberth
2018-07-04 08:22:20 -07:00
Peter Simons
6e07a3a19a
Revert "haskell generic-builder: Use strictDeps always"
2018-07-04 13:18:21 +02:00
Gabriel Gonzalez
8dae83157b
Change readDirectory
to accept an attribute set
...
... as suggested by @roberth
2018-07-03 17:44:19 -07:00
Matthew Bauer
157b59736b
configuration-ghc-8.4.x.nix: Update hspec versions
...
These have changed on master.
2018-07-03 19:25:26 -04:00
Domen Kožar
9ed54a38bd
configuration-common.nix: fix build tools
2018-07-03 19:24:40 -04:00
Gabriel Gonzalez
e57fd11bb4
Add pkgs.haskell.lib.readDirectory
utility
...
This adds a `readDirectory` utility that can be used to "slurp" a directory
full of `cabal2nix`-generated files and transform them into a Haskell package
override set. The main use of this is so that users don't have to write:
```
{ overrides = self: super: {
foo = self.callPackage ./path/to/foo.nix { };
bar = self.callPackage ./path/to/bar.nix { };
...
};
}
```
Instead, they can write:
```
{ overrides = pkgs.haskell.lib.readDirectory ./path/to;
}
```
This is a an alternative to `packageSourceOverrides` which primarily addresses
the following use cases:
* The desired package is not yet available in `all-cabal-hashes` (perhaps the
user is pinned to an older revision of `nixpkgs`)
* The default `cabal2nix` invocation used by `packageSourceOverrides`
does not use the desired `cabal2nix` flags
* The user wants to avoid the use of import-from-derivation
2018-07-03 09:25:15 -07:00
Matthew Bauer
1a668f79b2
yesod-persistent: add hspec-discover for 1.4.3
2018-07-02 16:37:20 -04:00
Matthew Bauer
4590a3702a
haskell-modules: Add more overrides
2018-07-02 15:55:00 -04:00
Matthew Bauer
2cb563374f
haskell-modules: Add more test tool depends
2018-07-02 15:55:53 -04:00
Matthew Bauer
fb94cd9b51
haskell-modules: Add pandoc for heist
2018-07-02 15:55:48 -04:00
Matthew Bauer
c4431d301a
haskell-modules: Add test tool depend for modern-uri
2018-07-02 15:55:43 -04:00
Matthew Bauer
10f10638d8
haskell-modules: Add many more overrides for hspec-discover
...
This is needed for picking up hspec-discover in strictDeps generic-builder.nix.
2018-07-02 15:55:20 -04:00
Matthew Bauer
42bd49d72b
haskell-modules: Fix mockery in macos
...
Weird errors otherwise - seems to need this to know it can skip the
bad test.
2018-07-02 15:55:01 -04:00
John Ericson
3457ce0142
with-location: Link upstreamming attempt
2018-07-02 15:52:47 -04:00
John Ericson
c4d43761c1
haskell with-location: Link upstreaming attempt
2018-07-02 15:52:47 -04:00
Matthew Bauer
fea9a71ff4
haskell: add more test tool depend for hspec-discover
...
Needed for new ‘strictDeps = true;’ handling.
Including-
- slim
- string-conversions
- skeletal-test
- catamorphism
- unliftio
- logging-facade
- distributive
- doctest
- http-types
- interpolate
- mockery
- mime-mail
- http2
2018-07-02 15:52:47 -04:00
Matthew Bauer
160894db35
text-conversions: add hspec-discover
2018-07-02 15:52:22 -04:00
Matthew Bauer
9ef816e776
with-location: add hspec-discover
2018-07-02 15:52:22 -04:00
John Ericson
d2f6f527f4
alex: which
needs to be a tool dep so it's a nativeBuildInput
...
Also pull it from `buildPackages`, as that is where nativeBuildInputs
come from.
2018-07-02 15:52:22 -04:00
John Ericson
242ca11b03
base-compat: Add missing build tool dependency
2018-07-02 15:52:22 -04:00
John Ericson
43e3ea0322
hspec{,-core,-discovery}: Add build-tool-depends to testsuite
...
`fetchpatch`ing a PR I just opened. This ought to get Cabal to make the
`PATH` include the newly-built exe, but unfortunately it doesn't.
2018-07-02 15:52:21 -04:00
John Ericson
ceaf285c0c
haskell generic-builder: Use strictDeps always
...
This helps avoid the `ARG_MAX` issues we've been having, and is
generally a good idea to ensure cross comparability anyways.
2018-07-02 15:51:14 -04:00
John Ericson
359e0ce4bb
haskell generic-builder: Make test and benchmark tool depends nativeBuildInputs
...
I suppose I forgot these when I did this before.
2018-07-02 15:51:14 -04:00
John Ericson
1e6aeeddce
haskell lib: Make helpers to add benchmark and test tool depends
...
These seems to be common omissions due to a) non-new-build being overly
flexible, and b) code gen most often used for test boilerplate.
2018-07-02 15:51:14 -04:00
Domen Kožar
a260b3d681
dhall-nix: fix build
2018-07-02 19:45:02 +01:00
Sarah Brofeldt
24ef1450bd
dhall-json_1_2_1: Bump dhall dep
2018-07-02 10:57:00 +01:00
Peter Simons
0b36a94ed4
hledger: fix ghc-8.2.x build of the new 1.10 version
2018-07-02 11:29:10 +02:00
Peter Simons
065c936863
hackage-packages.nix: automatic Haskell package set update
...
This update was generated by hackage2nix v2.9.2-30-g7c77e7e from Hackage revision
153e846959
.
2018-07-02 11:29:10 +02:00
Peter Simons
be1461fc0a
haskell-dhall-json: update override
2018-07-01 22:03:57 +02:00
Peter Simons
37c20564b0
haskell-hspec: update overrides for ghc 8.4.x
2018-07-01 22:03:57 +02:00
Peter Simons
4f28eac924
haskell-hoopl: provide an un-versioned attribute for ghc 8.4.x
...
This used to be a core library in previous versions of GHC, but now it no
longer is.
2018-07-01 22:03:57 +02:00
Peter Simons
1ee0f4378b
hackage-packages.nix: automatic Haskell package set update
...
This update was generated by hackage2nix v2.9.2-30-g7c77e7e from Hackage revision
e8fa4931bc
.
2018-07-01 22:03:58 +02:00