alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity
156243 commits 217 branches 121 tags 4.5 GiB
Commit graph

3625 commits

Author SHA1 Message Date
Moritz Angermann e4a61c8b6e [haskell/generic-builder] windows always has an active library 
This commit is not really correct. The `hasActiveLibrary` check is wrong.
We can have an active library even if we do not ask for a static lirbary or
dynamic one; we can still have just a set of objet files and archives.
 2018-08-07 09:25:35 +02:00
Peter Simons 10b923930c hackage-packages.nix: automatic Haskell package set update 
This update was generated by hackage2nix v2.10.2 from Hackage revision
e35bfea89e.
 2018-08-07 09:25:35 +02:00
Domen Kožar 750e4888f8 hackage2nix: update list of failing Hydra builds 
Ping @jb55 for broken "skeletons".
Ping @khumba for broken "hoppy-*".
 2018-08-07 09:25:33 +02:00
Peter Simons 5bd2ca749d LTS Haskell 12.5 2018-08-07 09:25:33 +02:00
Travis Whitaker a3e7fc876a haskellPackages.llvm-hs: Use LLVM 6 with llvm-hs, don't run tests on Darwin. 2018-08-05 07:46:10 -07:00
Drew Hess 4abb8be7ab
haskell-modules: add callCabal2nixWithOptions. 
Fixes #44377.
 2018-08-03 12:55:29 -07:00
Bas van Dijk 3328ea7749 haskellPackages.sexpr: fix build 2018-08-03 02:00:47 +02:00
Matt McHenry afaaac2432 haskell-language-ecmascript: jailbreak to fix the build 2018-08-02 07:23:31 -04:00
Peter Simons 5c4b203032 hledger-lib: patch code to work around a regression in version 0.10 
https://github.com/simonmichael/hledger/issues/852
 2018-07-30 19:46:25 +02:00
Tim Steinbach e7d57853b0 hnix: Fix build 2018-07-27 14:16:41 -07:00
Domen Kožar 059c2312be
haskell: move yaml overrides to configuration-nix 2018-07-25 15:17:56 +01:00
Domen Kožar db557aab7b
haskell: remove/add some servant overrides 2018-07-25 09:02:40 +01:00
Peter Simons 006e298107 hackage-packages.nix: automatic Haskell package set update 
This update was generated by hackage2nix v2.10.1-16-gf144800 from Hackage revision
8dc53de6a2.
 2018-07-24 17:15:56 +02:00
Peter Simons 17784ef3d6 LTS Haskell 12.2 2018-07-24 17:15:26 +02:00
Jack Kelly b2be524e30 haskellPackages.blank-canvas: Move fixes to configuration-common.nix 2018-07-24 10:32:00 +10:00
Bas van Dijk f30bfcd623 doctest-discover: move override out of configuration-nix.nix 
and move it to configuration-common.nix where it belongs.
configuration-nix.nix is only for fixing build failures
due to Nix.
 2018-07-24 01:42:43 +02:00
Bas van Dijk 3d4ea59f20
Merge pull request #43959 from endgame/dontCheck-doctest-discover 
haskellPackages.doctest-discover: Disable tests
 2018-07-24 01:24:19 +02:00
Domen Kožar cbb50b8188
haskellPackages.servant-streaming-server: dontCheck 2018-07-23 13:19:09 +01:00
Peter Simons 4ea202d328 hackage-packages.nix: avoid broken reference to libudev 2018-07-22 21:08:42 +02:00
Peter Simons 810c3e31b3
Merge pull request #43970 from LumiGuide/tensorflow-haskell-improvements 
haskell: fix build of all tensorflow packages
 2018-07-22 20:25:20 +02:00
Bas van Dijk 0ac253da1c hackage-packages.nix: automatic Haskell package set update 
This update was generated by hackage2nix v2.10.1-8-gd90c8cc from Hackage revision
f98093ee9f.
 2018-07-22 17:45:01 +02:00
Jan Tojnar f94f861942
haskellPackages.bustle: fix build 2018-07-22 16:43:57 +02:00
Jan Tojnar 5b5a1b3445
haskellPackages.hgettext: jailbreak 
https://github.com/haskell-hvr/hgettext/issues/14
 2018-07-22 16:43:34 +02:00
Bas van Dijk e60f4eef8d haskell: fix build of all tensorflow packages 
* Since this commit changes configuration-hackage2nix.yaml it
  requires a hackage-packages.nix upgrade.

* Moved the tensorflow overrides out of configuration-ghc-8.2.x.nix
  and into the dedicated file configuration-tensorflow-ghc-8.2.x.nix
  for better readability.

* Add overrides for all the packages in the tensorflow-haskell
  repository.
 2018-07-22 16:37:51 +02:00
Jack Kelly 2dd664140b haskellPackages.doctest-discover: Disable tests 
The source package is missing a required file. See:

- https://github.com/karun012/doctest-discover/issues/22
- https://github.com/karun012/doctest-discover/issues/23
 2018-07-22 17:08:43 +10:00
volth cc55a3ebcb treewide: fix build with disallowed aliases (#43872) 
fixes build with disallowed aliases
 2018-07-21 22:03:24 -04:00
Peter Simons 8aaaf98045 hackage-packages.nix: automatic Haskell package set update 
This update was generated by hackage2nix v2.10.1-7-ga1690c5 from Hackage revision
412c0df404.
 2018-07-21 16:51:55 +02:00
Peter Simons 26b313accf git-annex: update sha256 hash for the new version 2018-07-21 16:22:13 +02:00
Bas van Dijk ab4bff2b77 haskell: fix build of tensorflow on GHC-8.2 2018-07-21 16:22:13 +02:00
Bas van Dijk 7b510c47e1 haskell: add extra dependencies of tensorflow-proto 2018-07-21 16:22:13 +02:00
Peter Simons aa9b50ccf3 hackage-packages.nix: automatic Haskell package set update 
This update was generated by hackage2nix v2.10.1-5-gfad2fe7 from Hackage revision
43ea4ff82a.
 2018-07-21 16:22:13 +02:00
Peter Simons 02f7053629 hackage2nix: disable reflex-dom-fragment-shader-canvas 
The package depends on broken webkit and doesn't evaluate.
 2018-07-21 16:22:13 +02:00
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
Peter Simons 48300a5b6d LTS Haskell 11.15 2018-07-01 22:03:28 +02:00
Domen Kožar 5974bb7c9c
haskell: Move version dependent overrides from to configuration-common 2018-06-30 15:49:36 +01:00
Jan Tojnar 30c154d99b
haskellPackages.llvm-hs_6_3_0: fix build 2018-06-29 11:31:16 +02:00
Jan Tojnar bf4d1f2c15
bustle: fix build 2018-06-29 02:19:19 +02:00
Pi3r 75ce141a35 haskell-filecache: disable test suite on Darwin 
See https://github.com/bartavelle/filecache/issues/4 for details.
Closes https://github.com/NixOS/nixpkgs/pull/42629.

Update configuration-common.nix
 2018-06-27 14:27:00 +02:00
Peter Simons 8d0d41da09 git-annex: update to version 6.20180626 
This update fixes CVE-2018-10857 and CVE-2018-10859.
 2018-06-27 10:44:10 +02:00
Peter Simons f380b66911 hackage-packages.nix: automatic Haskell package set update 
This update was generated by hackage2nix v2.9.2-23-g7ccbd66 from Hackage revision
dc8aa30e8c.
 2018-06-27 10:43:11 +02:00
Matthew Bauer e01db49bfa ghcjs-ng: Move to $out/lib/ghcjs-8.4 
This is standard for ghc compilers & much more convenient. This seems
to fix the issues we have been having in ghcjs pkgs.

Fixes #42032
Fixes #42617
 2018-06-26 17:43:58 -04:00
Peter Simons fb9f0ebc9a haskell-vector-sized: update override for the latest version 2018-06-26 10:12:28 +02:00
Peter Simons 48e1d7837a haskell-doctest: update override for ghc-8.4.x to latest version 2018-06-26 10:12:28 +02:00
Peter Simons db319effa0 hackage-packages.nix: automatic Haskell package set update 
This update was generated by hackage2nix v2.9.2-23-g7ccbd66 from Hackage revision
31a9e4f9ae.
 2018-06-26 10:12:29 +02:00
Profpatsch 2f2e79be39 haskellPackages: disable profiling ghc-heap-view ghc-datasize 2018-06-25 22:06:50 +02:00
Peter Simons 5c80983e75 haskell-generic-builder: bake the package name and version into --docdir 
If we use a --docdir that's not specific to the package, then different builds
will install their license files into the same location, which leads to file
collisions if those are ever joined into the same environment.

Fixes https://github.com/NixOS/nixpkgs/issues/35024.
 2018-06-22 17:50:11 +02:00
Peter Simons 1486fee1d3 haskell-Cabal: drop obsolete override to fix Setup dependencies 
This is now handled by cabal2nix:

 - 7ccbd668d1.
 - https://github.com/NixOS/nixpkgs/pull/41939
 2018-06-22 17:50:11 +02:00
Peter Simons e0d34cfeca haskell-streaming-commons: disable randomly failing test suite 2018-06-22 17:50:11 +02:00
Peter Simons d94d27c2dd hackage-packages.nix: automatic Haskell package set update 
This update was generated by hackage2nix v2.9.2-23-g7ccbd66 from Hackage revision
c9934e673b.
 2018-06-22 17:50:11 +02:00
Peter Simons 503e5c3f27 hackage2nix: boolector has an unfree license 2018-06-22 17:50:10 +02:00
Peter Simons 2bd8148b95 LTS Haskell 11.14 2018-06-22 17:50:10 +02:00
Peter Simons f13f2434d0
Revert "Fix null deps in ghcWithHoogle" 2018-06-22 14:21:44 +02:00
Peter Simons 7489a760d2
Merge pull request #42349 from ElvishJerricco/fix-hoogle-null-deps 
Fix null deps in ghcWithHoogle
 2018-06-22 12:21:01 +02:00
Peter Simons 5cb4cdfd39
Merge pull request #42268 from philandstuff/fix-dhall-json-1.2.0-deps 
dhall-json_1_2_0: fix dependencies
 2018-06-22 12:20:05 +02:00
Will Fancher dc7a91392e Fix null deps in ghcWithHoogle 2018-06-21 17:53:37 -04:00
Matthew Bauer fd7a6ea0af haskell: make generic builder follow compiler’s shared config 
enableShared in generic-builder.nix should default to what the GHC
compiler was compiled with. Add a passthru to all of the GHC compilers
to hold the value of enableShared. If enableShared is not set in the
GHC we just use false as the default value for enableSharedLibraries.

Note: I may have missed some compilers. Only GHC & GHCJS are covered
by this commit but this shouldn’t break evaluation of anything else.
 2018-06-20 18:40:53 -04:00
Philip Potter 5a2e2db7b2 dhall-json_1_2_0: fix dependencies 
dhall-json 1.2.0 requires dhall's version to be at least 1.14.0 and less
than 1.15.0.  The package wasn't building for me because `dhall` is at
version 1.11.1; pinning to `dhall_1_14_0` fixed it.
 2018-06-19 20:33:32 +01:00
John Ericson 37eca93aab haskell generic-builder: Only pass --extra-* for host deps 2018-06-19 10:57:48 -04:00
Pascal Wittmann d21653f465 haskell generic-buider: nativeGhc should be a depsBuildBuild 
It targets the build platform.
 2018-06-19 10:57:37 -04:00
Matthew Justin Bauer 5b09fe1098
Merge pull request #42191 from obsidiansystems/fix-ghcjs-with-packages 
haskell: fix with-packages-wrapper in ghcjs
 2018-06-18 23:31:03 -04:00
John Ericson b6dfa316b7
Merge pull request #41939 from obsidiansystems/haskell-always-setup-separately 
haskell generic-builder: Always use separate pkg db for custom setup
 2018-06-18 22:25:17 -04:00
Matthew Bauer 34f57ac837 haskell: fix with-packages-wrapper in ghcjs 
Fixes #42032
Fixes #42070
 2018-06-18 20:17:06 -04:00
Kirill Elagin 6d5751bfa5 haskell: Add setup depends for Cabal 2018-06-18 16:22:21 -04:00
mulderr a6e737c65e odpic-raw: disable tests (#42135) 
Test suite expects a running Oracle database server.
 2018-06-18 21:50:57 +02:00
John Ericson f8ec07e836 haskell generic-builder: Always use separate pkg db for custom setup 
This decreases complexity and ensures setup dependencies are properly
specified with `setup-depends` as they should be. Testing will say if
this is a reasonable change.
 2018-06-18 14:07:37 -04:00
xeji 045686fe04
Merge pull request #41408 from puffnfresh/package/taffybar 
taffybar: work around repeated arguments bug
 2018-06-17 22:11:52 +02:00
Peter Simons 713f57af40
Merge pull request #41994 from jtojnar/llvm-hs-6 
haskellPackages.llvm-hs_6_2_0: fix build
 2018-06-17 21:04:33 +02:00
Peter Simons 78f91c8aa1 hledger: jailbreak to fix builds with ghc-8.4.x 2018-06-16 15:57:44 +02:00
Peter Simons e6e64d5e45 haskell-pandoc-types: update override for ghc 8.4.x 2018-06-16 15:57:44 +02:00
Peter Simons 46f6f08672 hackage-packages.nix: automatic Haskell package set update 
This update was generated by hackage2nix v2.9.2-22-g06cc00a from Hackage revision
de822d09cc.
 2018-06-16 15:57:38 +02:00
Peter Simons 5cf044ce46 hackage2nix: always use latest version of json-autotype 2018-06-16 15:57:18 +02:00
Peter Simons a9a78f3457 LTS Haskell 11.13 2018-06-16 15:57:18 +02:00
Jan Tojnar 0bc250c48b
haskellPackages.llvm-hs_6_2_0: fix build 2018-06-14 12:32:59 +02:00
Matthew Justin Bauer b2a76b6464
Merge pull request #41932 from obsidiansystems/fix-setup-depends 
haskell generic-builder: Use separate setup db in more cases
 2018-06-13 11:40:49 -04:00
John Ericson 529a0f74ed haskell generic-builder: Use separate setup db in more cases 
Use for cross and GHCJS whether or not there are setup depends.
 2018-06-13 11:34:25 -04:00
John Ericson 089297ad29
Merge pull request #41896 from obsidiansystems/fix-setup-depends 
haskell generic-builder: Fix setup depends
 2018-06-13 11:28:54 -04:00
John Ericson eeeaab8d5e haskell generic-builder: Fix setup depends 
I was referring to the wrong package db in a few places. Thanks
@ElvishJerricco for catching.
 2018-06-12 14:07:33 -04:00
Matthew Bauer 340bc74a2b ghcjs: remove old-time 
This attribute is no longer available
 2018-06-11 10:29:12 -04:00
Matthew Bauer e544e4f564 configuration-common.nix: fix incorrect override 2018-06-10 15:07:02 -04:00
Matthew Bauer 5a216cd7ed ghcjs: disable some checks 2018-06-10 15:07:02 -04:00
Profpatsch 91fe664867 haskellPackages.hnix: dont jailbreak 
The jailbreak itself produces a broken cabal file, and with the current
haskellPackages hnix builds just fine.
 2018-06-08 23:27:31 +02:00
Peter Simons 6bde64f6db
Merge pull request #41593 from erictapen/haskellPackages-http-link-header-disable-tests 
haskellPackages.http-link-header: disable tests
 2018-06-08 09:27:58 +02:00
John Ericson f379be939c haskell infra: Use self.ghc rather than closing over initial value 2018-06-07 14:27:44 -04:00
Michael Alan Dorman ba17cbfd1f taffybar: turn on strictDeps 2018-06-07 15:22:16 +02:00
Michael Alan Dorman b7a0c60e8b dbus-hslogger, status-notifier-item: specify dbus version 2018-06-07 15:22:16 +02:00
Michael Alan Dorman 2558c41192 gi-dbusmenugtk3: add dependency on gtk3 2018-06-07 15:22:16 +02:00
Michael Alan Dorman 0287773a0a haskell-gi: remove patch already present in new version 2018-06-07 15:22:16 +02:00
Peter Simons 89a8e0bfad hackage-packages.nix: automatic Haskell package set update 
This update was generated by hackage2nix v2.9.2-21-g9312993 from Hackage revision
338f06c74f.
 2018-06-07 15:22:16 +02:00
Peter Simons a89d900566 hackage2nix: update list of broken packages 2018-06-07 15:21:57 +02:00
Peter Simons 7aa6d2c808 LTS Haskell 11.12 2018-06-07 15:21:57 +02:00
Justin Humm 33ffa1f888
haskellPackages.http-link-header: disable tests 
The test

  Network.HTTP.Link, writeLinkHeader → parseLinkHeader, roundtrips successfully

seems to flap, as I cannot reproduce the failure locally, but it occured on
Hydra [0]. Also upstream is aware of the problem [1].

[0] https://hydra.nixos.org/build/75041105
[1] https://github.com/myfreeweb/http-link-header/issues/7
 2018-06-06 18:42:17 +02:00
Peter Simons b2d07e093f git-annex: update sha256 hash for new version 2018-06-05 09:34:11 +02:00
Peter Simons eca586e0e8 hackage-packages.nix: automatic Haskell package set update 
This update was generated by hackage2nix v2.9.2-21-g9312993 from Hackage revision
fd2c3d3b57.
 2018-06-05 09:34:11 +02:00
Peter Simons da11a27109
Merge pull request #41334 from jhenahan/patch-3 
configuration-ghc-8.4.x: bump to dhall_1_14_0
 2018-06-03 12:03:42 +02:00
Brian McKenna 9dcf7d0d4e taffybar: work around repeated arguments bug 
Fixes #40013
 2018-06-03 19:24:28 +10:00
Sarah Brofeldt 19fa9b2e30 haskell.packages.ghcjs.terminfo: Bump version (#41337) 2018-06-01 19:19:09 +02:00
John Ericson ecabdfd12f
Merge pull request #41330 from obsidiansystems/haskellSrc2nix-overriding 
haskell infra: Allow overriding `haskellSrc2nix`
 2018-05-31 16:42:16 -04:00
Jack Henahan 286f9ca704
configuration-ghc-8.4.x: bump to dhall_1_14_0 
The `dhall_1_13_0` attribute doesn't exist, anymore.
 2018-05-31 16:37:05 -04:00
John Ericson 58ce59dd96 haskell infra: Allow overriding haskellSrc2nix 2018-05-31 16:29:02 -04:00
Matthew Bauer e4e8967269 haskell: fixup merge of c425a1fc50 
This was accidentally included even though setupHaskellDepends is
already listed above.
 2018-05-31 14:06:56 -04:00
Austin Seipp a22faf1060 haskellPackages.ghc84x.criterion: bump to criterion 1.4.1.0 
We need base-compat-0.10 for 8.4, but the older version wanted 0.9.
(Criterion 1.4.1.0 now uses base-compat-batteries-0.10, in fact)

Signed-off-by: Austin Seipp <aseipp@pobox.com>
 2018-05-31 13:04:58 -05:00