1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-09-11 15:08:33 +01:00
Commit graph

640 commits

Author SHA1 Message Date
Shea Levy afa985d4e7 arithmoi: Fix for ghc 7.10 2015-04-11 14:40:39 -04:00
Shea Levy fe4d221a30 ffmpeg-light: libavutil is part of ffmpeg.
Refs NixOS/cabal2nix#159
2015-04-11 14:24:02 -04:00
Peter Simons 37f7e152d5 Merge pull request #7303 from teh/master
Update closure-compiler and fix purescript for ghc 7.8
2015-04-10 13:48:40 +02:00
Charles Strahan 7d11b9535d Merge pull request #7161 from cstrahan/taffybar-fix
haskell: fix taffybar on GHC 7.10
2015-04-09 16:33:35 -04:00
Charles Strahan b5f63776a0 haskell: simplify ghcjs-dom expression for GHCJS 2015-04-09 15:02:16 -04:00
Charles Strahan ed30c8ba40 haskell: use native alex and happy for GHCJS 2015-04-09 15:02:16 -04:00
Charles Strahan f415ce2953 haskell: bring back wl-pprint patch
partially reverts 5742215
2015-04-09 15:02:16 -04:00
John Wiegley 208400cb3e haskellngPackages.stm-conduit: 2.6.0 fails to build tests 2015-04-09 10:57:43 -05:00
Tom Hunger 0fb056f521 haskell-ng: Fix purescript build expression for GHC 7.8. 2015-04-09 14:21:17 +01:00
Utku Demir 57422158b2 Remove haskellngPackages.wl-pprint-* patches since updated upstream 2015-04-09 13:02:04 +00:00
Nikolay Amiantov 08bf6c93c5 haskellng.leksah: don't run tests 2015-04-09 03:27:16 +03:00
Nikolay Amiantov 7e3d178e7b haskell-ng.llvm-general: style fix 2015-04-09 03:05:57 +03:00
Nikolay Amiantov f0f7707a03 haskellng.llvm-general: fix build
Closes #7259
2015-04-09 03:02:43 +03:00
Nikolay Amiantov 3956bc8e64 haskell-ng: fix various packages for 7.10 2015-04-09 02:58:59 +03:00
Peter Simons 34a8b2ee48 hackage-packages.nix: re-generate from Hackage 2015-04-08T15:53:57+0200 2015-04-08 21:00:03 +02:00
Peter Simons 5dc667035f haskell-ceilometer-common: test suite was fixed upstream 2015-04-08 16:53:01 +02:00
Charles Strahan 9abd483f7e haskell: use HStringTemplate 0.8.3 on GHC 7.10.x
fixes taffybar
closes #7161
2015-04-07 10:50:15 -04:00
Charles Strahan fad17a9ace hakyll: fix on GHC 7.10 2015-04-07 10:32:31 -04:00
Nikolay Amiantov d33d53a3a3 haskellng.caramia: fix build 2015-04-07 13:14:33 +03:00
Peter Simons d751367d70 haskell-gloss: keep old version around for GHC 7.8.x 2015-04-06 21:24:34 +02:00
Peter Simons 16dd6caec0 haskell-safecopy: upstream has fixed the test suite 2015-04-06 21:24:34 +02:00
Peter Simons 696513be2c haskell-mysql: manually pass the correct "lib" derivation
Apparently, automatic propagation to "mysql" still doesn't work. Anyway,
it's nicer to link "lib" only anyway.
2015-04-06 21:24:34 +02:00
Peter Simons e3925a3478 hackage-packages.nix: re-generate from Hackage 2015-04-06T20:16:31+0200 2015-04-06 21:24:34 +02:00
Peter Simons 434f129c62 Agda: fix build by providing the required older versions of its dependencies
Resolves https://github.com/NixOS/nixpkgs/issues/7201.
2015-04-06 21:24:33 +02:00
Peter Simons d9b67dd5a5 haskell-idris: update override for lens 2015-04-06 21:24:33 +02:00
Peter Simons cb01f21063 hackage-packages.nix: re-generate from Hackage 2015-04-06T16:01:20+0200 2015-04-06 21:24:33 +02:00
Peter Simons 66c587013b Merge pull request #7168 from cstrahan/pandoc-fix
pandoc: fix on GHC 7.10
2015-04-06 15:56:25 +02:00
Cray Elliott 5c866dc5e9 yesod-bin patch : use stripLen instead of patchFlags 2015-04-05 01:06:28 -07:00
Cray Elliott 880e0950d8 Revert "add patchFlags to haskell-ng's generic-builder"
Oops! Didn't realize that the stripLen option can be passed to fetchpatch.
Seems a cleaner than my method

This reverts commit eb7362a36c.
2015-04-05 01:06:20 -07:00
Cray Elliott 2f180f6888 yesod-bin : pull in patch from PR to support GHC 7.10.1 2015-04-05 00:49:39 -07:00
Cray Elliott eb7362a36c add patchFlags to haskell-ng's generic-builder
I use this to get yesod-bin working with ghc 7.10.1
2015-04-05 00:48:12 -07:00
Cray Elliott fd85ddcd50 remove ghc 7.10 patches for yesod-auth, wai-extra, and persistent-template
these patches have all landed upstream
2015-04-05 00:47:49 -07:00
Charles Strahan d652fdedcb pandoc: fix on GHC 7.10 2015-04-04 15:31:44 -04:00
Cray Elliott 1ec78db3c6 GHC 7.10.1 no longer requires a patch to build foldl 2015-04-04 11:02:44 -07:00
Charles Strahan 3d60f6401f haskell: fix GHC version check for GHCJS
closes #7137
2015-04-03 18:54:18 -04:00
Peter Simons d205b324c3 cabal2nix: version bump 2015-04-03 11:22:25 +02:00
Calvin Beck 4632ea106b Fixed hashes for cabal2nix. 2015-04-02 22:32:41 -07:00
Thomas Tuegel 6429b1cc09 haskell-poppler: fix build 2015-04-02 18:07:55 -05:00
Peter Simons 548dfdb832 cabal-install: add old 1.18.x version for the benefit of ghc-mod users
Install "haskellngPackages.cabal-install_1_18_0_8" to run ghc-mod with
GHC 7.8.x. Resolves https://github.com/NixOS/nixpkgs/issues/7133.
2015-04-02 22:59:05 +02:00
Peter Simons b07f749f37 haskell-AttoJson: mark broken 2015-04-02 20:58:31 +02:00
Peter Simons 27842ccd75 haskell-ng: fix webkit and websnap 2015-04-02 20:58:31 +02:00
Peter Simons 82893282dd haskell-ng: fix Hydra evaluation errors 2015-04-02 20:58:31 +02:00
Peter Simons 847f25d03b hackage-packages.nix: enable a couple of builds that now succeed 2015-04-02 20:58:31 +02:00
Peter Simons 75b527c1e1 haskell-modules: disable broken builds on Hydra 2015-04-01 22:54:45 +02:00
Peter Simons 36a2361976 haskell-ng-lib: add combinators for enabling/disabling source hyper-linking 2015-04-01 22:54:45 +02:00
Peter Simons 945269a48f haskell-generic-builder: gratuitous cosmetic change to trigger a complete re-build
hydra.nixos.org serves broken binaries because of our favorite non-deterministic
package IDs in GHC bug. :-( Re-building everything from scratch seems like the
easiest way to recover.
2015-04-01 22:54:45 +02:00
Peter Simons 7eda2f9ebb haskell-generic-builder: allow use of 'env' attributes in nix-shell
We disabled this to prevent users from accidentally running nix-build on
an 'env' attribute, but in fact the ability to use those in combination
with "nix-shell -p" is quite useful, so the restriction is lifted.
2015-04-01 22:54:45 +02:00
Peter Simons 59a1969f88 haskell-generic-builder: enable parallel building of libraries with GHC version >= 7.10.1
We'll blame @Fuuzetsu if this change produces broken binaries left and right.
2015-04-01 22:54:45 +02:00
Peter Simons 943bc26762 haskell-generic-builder: when replacing an edited Cabal file, show the download URL rather than the store path 2015-04-01 22:54:45 +02:00
Peter Simons 1afa8d28ea hackage-packages.nix: re-generate from Hackage 2015-04-01T12:39:25+0200 2015-04-01 22:54:45 +02:00
Eric Seidel b8d75c66ee haskell-ng: need to use haddock-api-2.15 on ghc-7.8 2015-03-31 16:07:43 -07:00
Nikolay Amiantov f2f826e97a haskellng: fix some gtk- and webkit-related packages
Fixes https://github.com/NixOS/nixpkgs/issues/7108.
2015-03-31 22:04:43 +02:00
Peter Simons f35b08ac39 haskell-csound-expression-dynamic: disable Haddock phase to fix the build
https://github.com/anton-k/csound-expression-dynamic/issues/1
2015-03-31 22:04:43 +02:00
Peter Simons d0ac04fbaa hackage-packages.nix: re-generate from Hackage 2015-03-31T16:39:41+0200 2015-03-31 22:04:43 +02:00
Peter Simons 9ce8d10dae haskell-cartel supports GHC 7.10.1 now. 2015-03-31 14:21:09 +02:00
Peter Simons bb38374158 haskell-xmonad-contrib: fix build 2015-03-31 14:21:08 +02:00
Peter Simons 6644bca846 idris: fix build by providing appropriate versions of the build inputs
Resolves https://github.com/NixOS/nixpkgs/issues/7014.
2015-03-31 13:56:16 +02:00
Peter Simons aba61babe3 haskell-pandoc: disable test suite to fix the build
The errors look harmless. Reported upstream at https://github.com/jgm/pandoc/issues/2036.
2015-03-30 16:43:56 +02:00
Peter Simons 179f1b788f hackage-packages.nix: downgrade blaze-html and haddock-library to fix Pandoc build 2015-03-30 16:43:56 +02:00
Peter Simons e568408367 Nomyx has been fixed upstream. 2015-03-30 16:43:55 +02:00
Peter Simons 6306f9a761 hackage-packages.nix: re-generate with recent hackage2nix 2015-03-30 16:43:55 +02:00
Peter Simons d75bcc16f7 haskell-stringsearch no longer needs patching for GHC 7.10.x. 2015-03-30 16:43:55 +02:00
Peter Simons b9dd22f1cb haskell-haddock-library fails its test suite. 2015-03-30 16:43:55 +02:00
Peter Simons d619392bdc hackage-packages.nix: don't update default version of 'primitive' yet 2015-03-30 16:43:55 +02:00
Peter Simons e42e1ea6de hackage-packages.nix: re-generate from Hackage 2015-03-29T03:47:46+0200 2015-03-30 16:43:55 +02:00
Peter Simons 83db889148 haskell-base: don't try to build this package 2015-03-30 16:43:54 +02:00
Peter Simons 834f2dc27b haskell-integer-gmp: don't try to build this package 2015-03-30 16:43:54 +02:00
Peter Simons 67950f036e haskell-marquise fails its test suite. 2015-03-30 16:43:54 +02:00
Peter Simons 3061ce63aa haskell-llvm-base: deprecated package (that doesn't compile) 2015-03-30 16:43:54 +02:00
Peter Simons c460fa95fb haskell-mtl-compat: fix build with ghc 7.6.x. 2015-03-30 04:05:00 +02:00
Nikolay Amiantov 8943ffcd2b ghcWithPackages: restore old style (without 'with') 2015-03-29 13:15:39 +03:00
Peter Simons 028779fb40 ghcWithPackages: fix isGhcjs evaluation even some more
This is harder than I would have thought.
2015-03-29 11:02:31 +02:00
Peter Simons b1e854d660 ghcjs: fix evaluation error in with-packages-wrapper.nix some more 2015-03-29 03:34:04 +02:00
Peter Simons 2502b53743 ghcjs: fix emacs syntax highlighting 2015-03-29 03:34:04 +02:00
Peter Simons 8c16648f56 ghcjs: fix evaluation error in with-packages-wrapper.nix 2015-03-29 03:34:04 +02:00
Charles Strahan d590a0f4b6 ghcjs: support for Haskell-NG
closes #5828
closes #6786
2015-03-29 03:34:04 +02:00
utdemir c9258a76ba Fix some build failures on GHC 7.10.1 2015-03-27 22:53:11 +02:00
Peter Simons f0742a4bfb cryptol is now available from Hackage, 2015-03-27 19:45:54 +01:00
Eelco Dolstra 5c0eb64d43 Set more precise meta.position for Haskell packages 2015-03-27 16:17:48 +01:00
Peter Simons 5f0d93351d Bump cabal2nix to latest version. 2015-03-27 15:28:00 +01:00
Peter Simons fa8c514407 hackage-packages.nix: re-generate from Hackage 2015-03-26T14:11:09+0100 2015-03-27 15:28:00 +01:00
Peter Simons 1841a05b9d haskell-stm-queue-extras: real fix for the broken Cabal file 2015-03-26 11:29:06 +01:00
Peter Simons a8d249cbbb haskell-bytestring-arbitrary: use compiler-specific LLVM version 2015-03-26 11:29:06 +01:00
Peter Simons 753284c2d0 hackage-packages.nix: add compiler-specific LLVM support
This change will resolve 'llvm' and related symbols from the compiler-specific
'llvmPackages' set rather than the global 'pkgs'. This allows us to use
different versions of llvm depending on the copmiler we're building with.
2015-03-26 11:29:06 +01:00
Peter Simons 2e811ff754 hackage-packages: re-generate from Hackage 2015-03-25T19:49:53+0100 2015-03-26 11:29:05 +01:00
Peter Simons 39ec62fa96 haskell-configuration-common: don't import LLVM into the package set
Instead, we'll make sure that packages find it in self.llvmPackages.
2015-03-26 11:29:05 +01:00
Nikolay Amiantov 49f3c375b5 ghcWithPackages: add withLLVM 2015-03-26 11:29:05 +01:00
Peter Simons 1368206eb8 haskell-configuration-common: remember ticket URL 2015-03-26 11:29:05 +01:00
Peter Simons 73f35dcc0c haskell-CLI fails its test suite because of missing modules. 2015-03-26 11:29:05 +01:00
Peter Simons a6f3b54fd0 haskell-ng: disable failing builds on Hydra 2015-03-26 11:29:05 +01:00
Peter Simons bdd4304870 Merge pull request #6980 from Fuuzetsu/remove-ansi-patch
ansi-wl-pprint: don't patch anymore
2015-03-25 20:36:05 +01:00
Peter Simons 706b2274cb haskell-esqueleto fails its test suite. 2015-03-25 20:33:26 +01:00
Mateusz Kowalczyk 5faa4e5aef ansi-wl-pprint: don't patch anymore
The package version we have now already has this patch courtesy to @hvr
making a release with it.
2015-03-25 19:16:26 +00:00
Peter Simons 6792f76706 haskell-stm-queue-extras: manually remove the update to revision 1
That revision doesn't exist. What happened is that upstream uploaded a Cabal
file that says "x-revision: 1". Of course, the incorrect setting will come back
in as soon as we update hackage-packages.nix. Nonetheless, I'm opting for the
short-term solution here, hoping that upstream will remove the x-revision
header from Hackage soon'ish.

https://github.com/haskell/hackage-server/issues/337
2015-03-25 14:37:15 +01:00
Peter Simons 1fcac34d46 hackage-packages.nix: re-generate from Hackage 2015-03-24T20:22:17+0100 2015-03-25 14:37:15 +01:00
Peter Simons 9170b4bd65 haskell-lambdabot: upstream has fixed the build 2015-03-25 14:37:15 +01:00
Peter Simons 013b12a54c haskell-ng: expose Hackage's revision number in hackage-packages.nix and use it to generate stable download URLs for edited Cabal files
Fixes https://github.com/NixOS/nixpkgs/issues/6914.
2015-03-25 14:37:15 +01:00
Peter Simons e77ad8855a haskell-feldspar-signal exports no modules. 2015-03-25 14:37:14 +01:00
Peter Simons eaf95037cd haskell-Hipmunk: mark broken because it doesn't support recent versions of StateVar 2015-03-25 14:37:14 +01:00
Peter Simons a4ffd5800e haskell-directory: version 1.2.2.0 tries to access the network when running the test suite 2015-03-25 14:37:14 +01:00
Peter Simons c8c355941c haskell-ng: update bytestring to latest version 2015-03-25 14:37:14 +01:00
Peter Simons 0533fdb09d haskell-ng: update haskeline to latest version 2015-03-25 14:37:14 +01:00
Peter Simons adff1a2b35 haskell-HStringTemplate: update to latest version 2015-03-25 14:37:14 +01:00
Peter Simons 258bc13966 haskell-ng: update Cabal and deepseq to latest versions 2015-03-25 14:37:14 +01:00
Peter Simons 3f0097fc4b hackage-packages.nix: re-generate from Hackage 2015-03-24T13:42:07+0100 2015-03-25 14:37:14 +01:00
Peter Simons 85704cd9d3 cabal2nix: update to latest Git version 2015-03-24 13:58:08 +01:00
Aistis Raulinaitis 3c7a919431 ansi-wl-pprint hash correction 2015-03-22 15:00:07 -07:00
Peter Simons d242b5220a haskell-bytestring-arbitrary: fix build by passing an older LLVM version 2015-03-21 19:47:53 +01:00
Peter Simons fddc2fa8bc haskell-hydrogen-syntax does not compile. 2015-03-21 19:44:12 +01:00
Peter Simons 16b9fd71f9 haskell-ansi-wl-pprint: fix the build with ghc-7.10.x 2015-03-21 19:44:12 +01:00
Peter Simons 61b1ef496f haskell-bindings-GLFW has been fixed upstream. 2015-03-21 19:44:12 +01:00
Peter Simons 446f301078 hackage-packages: re-generate from Hackage 2015-03-20T11:29:46+0100 2015-03-21 19:44:12 +01:00
Peter Simons 5c268bca2e haskell-locators test suite is broken. 2015-03-21 19:44:12 +01:00
Peter Simons afb0874e06 hackage-packages.nix: re-generate from Hackage 2015-03-19T13:39:37+0100 2015-03-19 17:55:19 +01:00
Peter Simons 3f45fe100a haskell-bindings-GLFW is broken (and has been for quite a while). 2015-03-18 13:31:33 +01:00
Peter Simons 5cdd855938 haskell-lens: update to 4.8 2015-03-18 13:31:33 +01:00
Peter Simons 25f4f78c92 haskell-mysql: fix build 2015-03-18 12:13:43 +01:00
Peter Simons fe8d65c9a6 Add required overrrides for haskell-hosc and haskell-tidal-midi.
Fixes https://github.com/NixOS/nixpkgs/issues/6864.
2015-03-18 12:13:43 +01:00
Peter Simons 53fa11398c hackage-packages.nix: re-generate from Hackage 2015-03-17T11:52:35+0100 2015-03-18 12:13:43 +01:00
Peter Simons eb7b6e2137 haskell-exceptions: upstream has fixed the test suite 2015-03-17 11:40:51 +01:00
Peter Simons 42ab5ea077 hackage-packages: re-generate from Hackage 2015-03-16T12:54:30+0100 2015-03-16 12:54:30 +01:00
Peter Simons 62d8b22931 hackage-packages.nix: re-generate from Hackage 2015-03-15T11:02:07+0100 2015-03-16 12:52:13 +01:00
Peter Simons 3f41103aaf Merge pull request #6824 from cstrahan/hs-mesos
hs-mesos: fix build
2015-03-16 12:10:24 +01:00
Charles Strahan 7e94f79433 hs-mesos: fix build
mesos was propagating the wrong protobuf version, and the cabal file
referenced some impure paths.
2015-03-15 18:57:44 -04:00
Peter Simons 46f2aab0a5 haskell-boundingboxes: upstream has fixed the test suite 2015-03-15 11:00:12 +01:00
Peter Simons a996d94d6b haskell-al: upstream has fixed the build 2015-03-15 11:00:12 +01:00
Peter Simons 9370137501 hackage-packages.nix: re-generate from Hackage 2015-03-14T14:55:25+0100 2015-03-15 11:00:12 +01:00
Peter Simons 519e1cefee haskell-xcffib: upstream fix the build issue (but the test suite still fails) 2015-03-15 11:00:12 +01:00
Peter Simons 53b6620027 haskell-hindent: upstream has fixed the test suite 2015-03-15 11:00:12 +01:00
Peter Simons da1617cb2b haskell-exceptions: update test suite issue link 2015-03-15 11:00:11 +01:00
Peter Simons a33042af5b haskell-al: jailbreal to fix build with c2hs 0.24.1 2015-03-15 11:00:11 +01:00
Peter Simons 3b8a7f2f70 haskell-amazonka does not compile with ghc-7.8.x. 2015-03-15 11:00:11 +01:00
Peter Simons adb3e894b2 configuration-common.nix: update comments for GLFW packages 2015-03-15 11:00:11 +01:00
Peter Simons 09c9a98717 aeson-schema: track the issue URL 2015-03-15 11:00:11 +01:00
Peter Simons 1207bc606e hackage-packages.nix: re-generate from Hackage 2015-03-14T13:08:30+0100 2015-03-15 11:00:11 +01:00
Peter Simons d54c94c189 pkgs/development/haskell-modules/configuration-common.nix: cosmetic 2015-03-14 15:05:34 +01:00
Michael Alan Dorman 53663772f3 haskell: aeson-schema missing test suite
For some reason the .tar.gz on hackage is missing most of the files for
the test suite.  I've opened an issue on
it (https://github.com/timjb/aeson-schema/issues/9), but it's not yet
been acted on.  In the meantime, simply disabling the test suite seems
most sensible.

@peti, could you merge this?
2015-03-13 07:09:28 -04:00
Peter Simons fdd821f1ef configuration-ghc-7.8.x.nix: remove amazonka-related overrides
These overrides allow us to build amazonka packages, but we have no way to
actually use those build results within Nix, because the replaced GHC core
libraries collide with the real ones when we try to compose a ghc-with-packages
environment.

Closes https://github.com/NixOS/nixpkgs/issues/6584.
2015-03-13 10:01:29 +01:00
Peter Simons 14e5333e3c hackage-packages: re-generate from Hackage 2015-03-12T12:28:02+0100
Resolves https://github.com/peti/jailbreak-cabal/issues/5.
2015-03-13 10:01:29 +01:00
Peter Simons f5b2b73dee cabal2nix: update git snapshot to latest version 2015-03-10 13:14:54 +01:00
Peter Simons a05aa1a3b1 haskell-ng: update to latest hscolour 2015-03-09 16:37:43 +01:00
Peter Simons c776477350 haskell-generic-builder: update and jailbreak cabal files before patchPhase is run
The updated and jailbroken Cabal file must be in place before the
'patchPhase' hook is run, otherwise we cannot use that hook to patch the
Cabal file! Resolves https://github.com/NixOS/nixpkgs/issues/5922.

As an added bonus, this change makes the "jailbreakPhase" obsolete.
2015-03-09 15:55:25 +01:00
Peter Simons 3e9e1a2f4e haskell-generic-builder: set LOCALE_ARCHIVE only on Linux 2015-03-09 15:55:25 +01:00
Peter Simons 0a97e2153e haskell-generic-builder.nix: don't add lib64 directories to the search path
Packages that provide 32 and 64-bit libraries in the same store path are rare
and usually require manual overrides anyway. It seems pointless to try and
guess proper settings for them. The effect is that we'll end up with bogus
settings that take more effort to correct that it takes to configure proper
settings in the first place. Point in case: haskell-cuda and it's configuration
for "cudatools".

Fixes https://github.com/NixOS/nixpkgs/issues/6564.
2015-03-09 15:55:25 +01:00
Peter Simons c4ff9d10ba haskell-generic-builder: consistently use $TMPDIR to refer to the designated place for temporary files
Resolves https://github.com/NixOS/nixpkgs/issues/6525.
2015-03-09 15:55:24 +01:00
Peter Simons 46e5a39cdc haskell-users-postgresql-simple requires PostgreSQL running for its test suite. 2015-03-09 15:20:59 +01:00
Peter Simons f4958243d4 haskell-chaselev-deque has been fixed. 2015-03-09 15:20:59 +01:00
Peter Simons ba60dea515 haskell-snap: jailbreak to allows building with current versions of lens 2015-03-09 15:20:59 +01:00
Peter Simons f2fc204811 haskell-blip and haskell-xcffib don't compile. 2015-03-09 15:20:59 +01:00
Peter Simons dddf5158c3 haskell-snowglobe has been fixed. 2015-03-09 15:20:59 +01:00