Commit Graph
2284 Commits
Author SHA1 Message Date
Peter Simons e9c20be62d haskell-HTF: disable test suite for older versions, too 2015-09-19 08:20:51 +02:00
Peter Simons 28e9327282 haskell-hslua needs no more overrides. 2015-09-19 08:20:51 +02:00
Peter Simons 1b86d24d41 haskell-libconfig builds without overrides. 2015-09-19 08:20:51 +02:00
Peter Simons 9e4b5dce24 haskell-hmatrix builds without overrides now. 2015-09-19 08:20:50 +02:00
Peter Simons a1ff4eb2ad haskell-hspec: add overrides for older versions to break infinitie recursions 2015-09-19 08:20:50 +02:00
Peter Simons 786ebf4e12 haskell-freenect: override is required only for old versions 2015-09-19 08:20:50 +02:00
Peter Simons 2aaa587b71 hackage-packages.nix: switch our default package set to Stackage Nightly
This update was generated by hackage2nix v20150903-82-g351b6f8 using the following inputs:

  - Hackage: https://github.com/commercialhaskell/all-cabal-hashes/commit/af161fdf178e996c83d9c06059cb81cc4480b035
  - LTS Haskell: https://github.com/fpco/lts-haskell/commit/da73308b6359aa6083591ec7a2069090977d3be7
  - Stackage Nightly: https://github.com/fpco/stackage-nightly/commit/1994a4f865fe7e1cbe2c5b94a2214a5d91507f2c
2015-09-19 08:20:40 +02:00
Peter Simons 91b07846a6 haskell-bytestring-builder: trigger re-build to recover from broken package on Hydra 2015-09-15 21:31:49 +02:00
Peter Simons 7802f5c793 haskell.lib: add doDistribute function as a dual to dontDistribute 2015-09-15 16:23:46 +02:00
Peter Simons 974f2122b1 jailbreak-cabal: clean up overrides
These changes ensure that jailbreak-cabal works correctly without further
configuration even with older compilers. The exception to that rule being,
naturally, versions of GHC that can't compile Cabal 1.20.x; these *do* need
another override.
2015-09-15 16:23:46 +02:00
Peter Simons 6a0e150aa9 configuration-ghc-7.10.x.nix: remove obsolete overrides 2015-09-15 16:23:46 +02:00
Vladimír Čunát eb09b1fd85 hackage-packages: revert the xlib renaming changes
The file is generated anyway.

@peti: is there an easy way to make the generator use different
attribute names? (But this case isn't important at all.)
2015-09-15 13:07:41 +02:00
Vladimír Čunát 88c9f8b574 xlibs: replace occurrences by xorg
This seems to have been confusing people, using both xlibs and xorg, etc.
- Avoided renaming local (and different) xlibs binding in gcc*.
- Fixed cases where both xorg and xlibs were used.
Hopefully everything still works as before.
2015-09-15 12:54:34 +02:00
Vladimír Čunát 21e3ff658a x11: replace its usage by xlibsWrapper directly
Scilab note: the parameters already had pointed to nonexistent dirs
before this set of refactoring. But that config wasn't even used by
default.
2015-09-15 12:08:24 +02:00
Peter Simons 6be6397aa1 ghcjs: import gtk2hs-buildtools from the regular Haskell package set
The tool is required for ghcjs builds, but ghcjs cannot compile it itself,
obviously, because it's written in C.
2015-09-14 16:43:31 +02:00
Peter Simons 346d777d31 hackage-packages.nix: update to https://github.com/commercialhaskell/all-cabal-hashes/commit/7fb00804dc897428592368e6eb2a6949cf2c1040 with hackage2nix v20150903-37-ge57a1f9 2015-09-14 12:27:34 +02:00
Peter Simons ea72d27a21 configuration-hackage2nix.yaml: enable builds for maintained packages goatee and goatee-gtk 2015-09-12 22:28:12 +02:00
Peter Simons 3378b8430e hackage-packages.nix: update to https://github.com/commercialhaskell/all-cabal-hashes/commit/489f207e9520206869637635897cec92ba31522f with hackage2nix v20150903-35-gfaf50c2 2015-09-12 22:20:53 +02:00
Mark Laws b6636db0a1 ginsu: add missing deps 2015-09-12 07:57:22 -07:00
Bryan Gardiner 7d74847471 goatee, goatee-gtk: add myself as maintainer 2015-09-11 20:37:53 -07:00
Peter Simons 9395a4c645 hackage-packages.nix: update to https://github.com/commercialhaskell/all-cabal-hashes/commit/99bc43a909c6c49aaf6181d74dafb22f98e25fef with hackage2nix v20150903-33-g4e6aefa 2015-09-11 10:30:28 +02:00
Peter Simons 6b682a9e37 haskell-language-nix: pull this library in from Hackage 2015-09-11 10:28:30 +02:00
Peter Simons f6fd6defa5 haskell-nix-paths: pull the library in from Hackage now that it's been published 2015-09-11 10:28:30 +02:00
Peter Simons eb5657e5a2 hackage-packages.nix: update to https://github.com/commercialhaskell/all-cabal-hashes/commit/c5e3b296781de2f29c1bdb7eb99756e89194fc92 with hackage2nix v20150903-29-gdd74ac4 2015-09-11 10:28:30 +02:00
Peter Simons a3540d9bb7 haskell-generic-builder: drop "haskell-" prefix from interactive environment's names 2015-09-10 19:51:47 +02:00
Eelco Dolstra af3ec14b24 Merge pull request #9769 from bjornfor/cudatoolkit-include-fixup
cudatoolkit: don't move $out/include to $out/usr_include
2015-09-10 13:06:32 +02:00
Peter Simons 873bd03458 hackage-packages.nix: update to https://github.com/commercialhaskell/all-cabal-hashes/commit/9f8783f6a68deed51b54c1650a51da55e3015cc3 with hackage2nix v20150903-29-gdd74ac4 2015-09-10 10:40:58 +02:00
William Casarin 3cfe7b138d hackage: add jb55 maintainer to skeletons project 2015-09-10 10:39:28 +02:00
Bjørn Forsman 22321f2e58 cudatoolkit: don't move $out/include to $out/usr_include
This effectively reverts 86c283824f
("If cuda headers are presented to nix [...]") and all the following
workarounds that was added due to that commit.

As far as I can tell[1] this hack isn't needed anymore. And moving
includes to $out/usr_include causes pain for cudatoolkit users, so
better get rid of it.

In patches that did more than the $out/usr_include workaround, I only
changed the line back to $out/include instead of re-generating the
patches and fully removing the changed line.

[1]: I build tested blender and caffe, and temporarily added
recurseIntoAttrs to rPackages and haskellPackages so that nox-review
could get proper coverage. However, many of the packages do not build
even before this patch. I also built CUDA samples with cudatoolkit7
that ran fine.
2015-09-10 10:35:40 +02:00
Allen Nelson d2457ea991 add shellHook argument so that users can pass in their own 2015-09-09 12:58:28 -05:00
Peter Simons 1e5e17eeac haskell-nix-paths: initial version 1 2015-09-09 11:31:14 +02:00
Peter Simons c0b25fe164 configuration-ghcjs.nix: remove obsolete overrides for dependent-map
Fixes https://github.com/NixOS/nixpkgs/issues/9734.
2015-09-09 10:22:29 +02:00
Peter Simons 11e4521d27 configuration-hackage2nix.yaml: track the configuration used by hackage2nix 2015-09-08 14:40:18 +02:00
Peter Simons b8bd12a580 haskell-singletons has been declared fixed by upstream.
The test suite still fails, but apparently that's okay.
2015-09-08 14:40:18 +02:00
Peter Simons 397972a6ef haskell-yesod-static has been fixed upstream. 2015-09-08 14:40:17 +02:00
Peter Simons eb860e488a Haskell ListLike and yesod-static have their test suites broken by HUnit 1.3.x. 2015-09-08 14:40:17 +02:00
Peter Simons 29114ce8a1 hackage-packages.nix: update to https://github.com/commercialhaskell/all-cabal-hashes/commit/2d8b43f689b692d82fa3c30c16c4767e1a69cb48 with hackage2nix v20150903-21-g5daa38a 2015-09-08 14:40:11 +02:00
Peter Simons 1ca79bff84 haskell-DSA: test suite run-time has been reduced upstream 2015-09-04 11:51:01 +02:00
Peter Simons 636e7fa166 hackage-packages.nix: update to https://github.com/commercialhaskell/all-cabal-hashes/commit/63f14dd1f7fb8377c25e484a8b36c00546a25048 with hackage2nix v20180903-1-g7c29be6 2015-09-04 11:51:00 +02:00
Peter Simons 65a415a1b2 cabal2nix: update to version 20180903 2015-09-03 17:53:24 +02:00
Peter Simons 407b4f7641 haskell-sophia: disable failing test suite 2015-09-03 15:22:22 +02:00
Peter Simons acb05dfc15 haskell-base32-bytestring: disable failing test suite 2015-09-03 15:22:22 +02:00
Peter Simons 6c885b38ee hackage-packages.nix: update to https://github.com/commercialhaskell/all-cabal-hashes/commit/d7dddc66daaf3a0e4aac6026dea879fcbfaed3cc with hackage2nix v20150824-72-g87526c2 2015-09-03 15:22:16 +02:00
Peter Simons 7182ef35f4 hackage-packages.nix: update to https://github.com/commercialhaskell/all-cabal-hashes/commit/23452bdddd485c6e43b92c8886a4347d839783e4 with hackage2nix v20150824-68-ga8b9f17 2015-09-02 17:46:39 +02:00
Peter Simons ada81b80fd cabal2nix: update to version 20150824-66-gd281a60
This patch fixes https://github.com/NixOS/nixpkgs/issues/9599.
2015-09-02 17:46:39 +02:00
Peter Simons dc5bf39bfe haskell-generic-builder: improve meta.platforms vs. meta.hydraPlatforms logic
hydraPlatforms now defaults to the value of meta.platforms rather than
defaulting to ghc.meta.hydraPlatforms. This solution is, in fact, still
sub-optimal. See https://github.com/NixOS/nixpkgs/issues/9608 for further
details.
2015-09-02 16:51:35 +02:00
Peter Simons 07542d12ea hoogle: use $NIX_BUILD_CORES to determine the proper level of parallelism for database creation 2015-09-02 16:28:01 +02:00
Peter Simons 90c163bde0 hackage-packages.nix: update to https://github.com/commercialhaskell/all-cabal-hashes/commit/23452bdddd485c6e43b92c8886a4347d839783e4 with hackage2nix v20150824-65-g80afb21 2015-09-02 12:44:02 +02:00
Peter Simons c456073e03 Disable test suites of Haskell packages RSA and kademlia.
Those test suites run for 2+ hours and thus fail with a timeout error.
2015-09-02 12:29:00 +02:00
Peter Simons 2b71e4643e haskell-bloomfilter: patch to fix build on 32 bit platforms 2015-09-01 18:02:50 +02:00