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

1699 commits

Author SHA1 Message Date
Vaibhav Sagar b513231dc6 servant: Sphinx is a build-time dependency 2018-12-18 21:58:30 +00:00
Peter Simons 76e284fc60 haskell-hoogle: override haskell-src-exts to the latest version (as required) 2018-12-14 19:44:19 +01:00
Peter Simons f0f3cb75de haskell-hlint: override haskell-src-exts to the latest version (as required) 2018-12-14 19:44:19 +01:00
Peter Simons d7dcb9c291 haskell-appar: update to latest version to fix test suite failures in iproute 2018-12-14 19:44:19 +01:00
Peter Simons ea45e771a1 haskell-cryptonite: disable test suite to avoid transient errors 2018-12-14 19:44:19 +01:00
Peter Simons 89ed58dbea git-annex: update sha256 for new 7.20181211 version 2018-12-14 19:44:15 +01:00
Guillaume Maudoux 9a104494ec haskellPackages.modular-arithmetic: disable tests 2018-12-13 16:46:22 +01:00
MarcFontaine 186ec58e1a haskellPackages.binary-parsers : disable tests 2018-12-08 22:30:54 +01:00
Peter Simons db6aeeae56 haskell-json-autotype: disable the test suite to fix the build 2018-12-05 21:38:14 +01:00
Peter Simons 059c61d001 haskell-esqueleto: mark the build as broken 2018-12-04 22:08:46 +01:00
Peter Simons 63f5ed9f96 xmobar: disable the failing test suite to fix the build 
The test suite tries to access the ALSA system and fails.
 2018-12-04 22:08:46 +01:00
Peter Simons 697a421fdc haskell-shelly: enable the test suite again 2018-12-04 22:08:46 +01:00
Peter Simons 72b7f7f65b hledger: update overrides for version 1.12 2018-12-04 22:08:46 +01:00
Peter Simons 1e54ee80f2 haskell-chell: pin build to patience-0.1.x 
Newer version are not supported yet.
 2018-11-27 16:39:30 +01:00
Peter Simons b13d8eadaa haskell-Cabal: update overrides for the new 2.4.1.x version 2018-11-27 16:39:30 +01:00
Peter Simons b89b093048 git-annex: update sha256 hash for new version 7.20181121 2018-11-25 09:43:41 +01:00
Peter Simons 31de7743f8 haskell-fltkhs: re-enable the build 
https://github.com/NixOS/nixpkgs/pull/50828 makes an effort to fix this
package.
 2018-11-21 16:06:23 +01:00
Profpatsch 7c75afaf1a haskellPackages.libnix: dontCheck 2018-11-20 19:03:09 +01:00
José Luis Lafuente 1fe45bff2e
gitHUD: renamed to githud 2018-11-19 16:57:58 +01:00
Eric Wolf 5966c5698f haskell-opencv: fix build and #47595 
The applied patch can be removed, when
cd613e200a
hits hackage and later nixpkgs.

Closes https://github.com/NixOS/nixpkgs/pull/50192.
Closes https://github.com/NixOS/nixpkgs/issues/47595.
 2018-11-13 14:00:06 +00:00
John Ericson ebd1dd54e5 Merge remote-tracking branch 'upstream/master' into haskell-bash-completion-2 2018-11-08 11:28:53 -05:00
Robert Hensing 2a1c0dde8f haskellPackages: Add shell completions + improve docs 
This adds the remaining parts of #42657 on top of #49477, renames the
function to a better name, and improves the docs
 2018-11-08 11:28:11 -05:00
Peter Simons dde2ea4f37 git-annex: update sha256 hash for new version 7.20181105 2018-11-06 10:42:51 +01:00
Peter Simons db203c84e3 haskell-hpack: update overrides for the new version 2018-11-05 14:06:28 +01:00
Peter Simons 4f45edbd9a haskell-cpython: revert "set to null" 
This reverts commit 6a0b1b13b6. Please don't null
out the entire package just because its build is broken at the moment. If you
want to prevent users from compiling cpython, then haskell.lib.markBroken (or,
even better: markBrokenVersion) are the way to do it.
 2018-11-05 10:06:26 +01:00
Frederik Rietdijk 6a0b1b13b6 haskellPackages.cpython: set to null 
because these are bindings for cpython 3.4 which we no longer distribute.
 2018-11-04 18:48:24 +01:00
Eric Wolf 79dace1b30 haskellPackages.sdl2: test-suite needs x server, so deactivate it 2018-11-03 00:11:11 +01:00
Peter Simons 82822c66e4
Merge pull request #48697 from ElvishJerricco/jailbreak-cabal-helper 
haskellPackages.cabal-helper: Jailbreak restrictive bounds.
 2018-11-02 20:42:42 +01:00
Peter Simons 1bc120fa5f git-annex: update sha256 hash for new version 7.20181031 2018-11-02 19:22:17 +01:00
Peter Simons cfbf9cbf39 haskell-yesod-core: drop obsolete override 2018-10-25 11:12:38 +02:00
Peter Simons 4ec2418dda stack: drop obsolete override after version update 2018-10-19 14:44:22 +02:00
Peter Simons 876ea22caf haskell-yesod-core: update version to fix the test suite 2018-10-19 14:44:22 +02:00
Peter Simons ba64a13d69 haskell-haddock-api: disable broken override 2018-10-19 14:44:22 +02:00
Jack Henahan ed2370d8c4 haskellPackages.hasktags: remove dontCheck 
https://github.com/MarcWeber/hasktags/issues/52 has been closed and a new version (0.71.1) has been released.
 2018-10-19 14:44:22 +02:00
Will Fancher 2ebc3034d3 haskellPackages.cabal-helper: Jailbreak restrictive bounds. [Fixes #45515] 2018-10-19 04:29:21 -04:00
Will Fancher a93c777c63 haskellPackages.cabal-macosx: Tests don't build with Cabal >= 2.2 2018-10-18 19:12:25 -04:00
Drew Hess 46f937dddd
haskellPackages.language-nix: disable tests on aarch64. 
The test suite fails on aarch64 with a linker error that looks
suspiciously like this outstanding GHC issue:

https://ghc.haskell.org/trac/ghc/ticket/15275

Note that this change also fixes the existing `isi686` check to
conform to the new cross-compiling arch check.
 2018-10-15 20:07:27 -04:00
Drew Hess 321626d5ee
haskellPackages.cryptonite: fix for aarch64. 
This is a cherry-pick from upstream (see
https://github.com/haskell-crypto/cryptonite/issues/234); there has
been no upstream release since the fix was committed.
 2018-10-15 17:11:32 -04:00
Drew Hess c8a59e8453
haskellPackages.cryptonite: re-enable tests. 
This has been fixed since cryptonite-0.7:

https://github.com/haskell-crypto/cryptonite/issues/28

cryptonite is also no longer listed in expected-test-failures in
Stackage.
 2018-10-15 16:31:59 -04:00
Peter Simons fe91334fbf haskell-yesod-core: disable broken test suite 2018-10-15 12:39:17 +02:00
Peter Simons 1e44702fc0 git-annex: update sha256 hash for the new 6.20181011 version 2018-10-15 12:39:17 +02:00
Peter Simons c6c29def60 cabal2nix: update overrides for latest yaml version 2018-10-15 12:39:17 +02:00
Silvan Mosberger 1d512468aa
Merge pull request #48015 from rnhmjoj/shell-conduit 
haskellPackages.shell-conduit: fix build
 2018-10-14 21:17:23 +02:00
Sarah Brofeldt ff8d252c2d
Merge pull request #48000 from erictapen/arbtt-jailbreak 
haskellPackages.arbtt: jailbreak
 2018-10-13 12:51:06 +02:00
Bas van Dijk 7b49b870cb
haskell: have a dedicated file for non Hackage packages 
We had a few "overrides" in configuration-common.nix that were really
extensions. They introduced packages that weren't in hackage-packages.nix.

The advantage of having a dedicated file for these packages is that we can still
place Nix-specific overrides to these packages in configuration-nix.nix. We
weren't able do this before because configuration-nix.nix extended only the
packages from hackage-packages.nix.
 2018-10-12 14:12:29 +02:00
Bas van Dijk 0c25079958
futhark: introduce the top-level futhark attribute 
The fact that futhark is a Haskell package is an implementation detail. To
install it users should just have to specify `futhark` instead of
`haskellPackages.futhark`.

Additionally futhark is overridden with `haskell.lib.justStaticExecutables` to
reduce closure size.
 2018-10-12 14:12:29 +02:00
Silvan Mosberger d26c303bef
futhark: init at 0.6.2 2018-10-12 14:11:30 +02:00
Domen Kožar 9e502600ba
stack2nix: fix build 2018-10-08 18:45:46 +01:00
rnhmjoj 096be6d941
haskellPackages.shell-conduit: fix build 2018-10-07 16:45:05 +02:00
Justin Humm a01cab05c6
haskellPackages.arbtt: unbreak with jailbreak 2018-10-07 14:13:37 +02:00
Tim Steinbach 22e39f642b
xmonad-extras: jailbreak 
Our XMonad identifies as 0.15, which is why we need to jailbreak it
into the extras build
 2018-10-03 07:48:49 -04:00
Peter Simons a4badb243c hledger: fix build of new version 1.11 2018-10-02 21:08:48 +02:00
Peter Simons d994f1cfd4 git-annex: update sha256 for new version 6.20180926 2018-09-28 11:16:42 +02:00
Bas van Dijk 0ab8fa2181
Merge pull request #47424 from Taneb/dontcheck-generic-lens 
haskellPackages.generic-lens: dontCheck
 2018-09-28 10:55:38 +02:00
Nathan van Doorn 550fe159f0 haskellPackages.generic-lens: apply patch to fix tests 2018-09-28 09:42:36 +01:00
Sarah Brofeldt 5c45ca0943 haskellPackages.term-rewriting: doJailbreak and dontCheck 2018-09-28 09:45:22 +02:00
Bas van Dijk 36e8d638d4 haskellPackages.haddock-api: fix build 
Also remove haddock-library == 1.4.4 since it's not needed anymore
 2018-09-24 01:57:09 +02:00
Bas van Dijk e1d51fa9e6 haskellPackages.yi-core: use overrideScope instead of override 2018-09-24 01:57:09 +02:00
Bas van Dijk 1d7b922238 haskellPackages.safe-money-*: use overrideScope instead of override 2018-09-24 01:57:09 +02:00
Bas van Dijk 38467261c3 haskellPackages.Frames: use overrideScope instead of override 2018-09-24 01:57:09 +02:00
Bas van Dijk 9b67908e67 haskellPackages.Euterpea: fix build by using PortMidi == 0.2 2018-09-23 22:50:04 +02:00
Bas van Dijk ff6122c993 haskellPackages.Frames: fix build by using vinyl-0.10.0 2018-09-23 21:54:25 +02:00
Bas van Dijk 73862bf812 haskellPackages.mandrill: fix build for ghc843 2018-09-21 19:08:25 +02:00
Peter Simons 6e4c666a67 git-annex: update sha256 hash for new version 6.20180913 2018-09-19 21:04:41 +02:00
Peter Simons 72e2ab2c72 cabal2nix: update yaml override to the latest version 2018-09-19 21:04:41 +02:00
Michael Alan Dorman c5467e8f73 cabal-install: use newer version of Cabal library 2018-09-19 21:04:41 +02:00
Chris Ostrouchov e1ed5b26c9
haskellPackages.pandoc-crossref: refactor disable tests for 0.3.2.1 
Author acknowleges test failing (change when no longer 0.3.2.1).
https://github.com/lierdakil/pandoc-crossref/issues/199
 2018-09-19 14:47:41 -04:00
Nathan van Doorn d6dc56180b
haskellPackages.JuicyPixels: re-enable Haddock 
This was made to avoid an issue which was fixed in `3.2.9.3`. The version currently in `nixpkgs 18.03` is `3.2.9.4`, which includes this fix.
 2018-09-18 15:29:58 +01:00
Peter Simons e0c081c6ac haskell-cabal2nix: update override for hpack 0.31.0 
* pkgs/development/haskell-modules/configuration-common.nix:
 2018-09-12 13:14:22 +02:00
Peter Simons 1c5d7ad52e cabal2nix: fix (and clean up)override for hpack dependency 2018-09-12 10:31:09 +02:00
Arian van Putten 02feb90d4e safe-money: Fix dependencies for safe-money-* 
They all depend on safe-money-0.7, but hackage2nix made them incorrectly
depend on safe-money-0.6

We should be able to remove this 'hack' as soon as the new Stackage LTS
comes out, as safe-money-0.7 will then be the default version.
 2018-09-10 13:41:57 +02:00
Eric Wolf 5d91e0f57d hunspell-hs: fix build 
Using pkgconfig like jtojnar suggested.

Disables tests as some necessary data files
aren't included on hackage.
 2018-08-26 20:44:39 +02:00
Peter Simons 08f48236d2 cabal2nix: update hpack override to the new version 2018-08-19 13:36:20 +02:00
Shea Levy 38396acd3b
haskellPackages.xmlhtml: Jailbreak for hspec 2.5 2018-08-17 09:25:35 -04:00
Shea Levy a07cc456bc
haskellPackages.hoopl: Disable broken testsuite. 
https://github.com/haskell/hoopl/issues/50
 2018-08-17 09:02:24 -04:00
Shea Levy 9c32d185d1
haskellPackages.hasktags: Disable broken testsuite. 
https://github.com/MarcWeber/hasktags/issues/52
 2018-08-16 15:35:05 -04:00
Shea Levy 816f4ef188
haskellPackages.cabal-plan: Remove broken patch. 2018-08-16 15:16:54 -04:00
Domen Kožar d2c55eb34a
haskellPackages.hpack: set to newest hpack to avoid conflicting hpack versions in closure 2018-08-14 11:42:10 +01:00
Domen Kožar 85f892b988
stack2nix: cleanup 2018-08-14 11:41:42 +01:00
Bas van Dijk a70fbb8d9e haskell: upgrade the tensorflow packages 
Also enable building on GHC-8.4.
 2018-08-13 20:07:43 +02:00
Izorkin fdec6b1b8d servant-sphinx-documentation: fix sha256sum 2018-08-12 23:13:23 +03:00
Peter Simons 8121eebb9a git-annex: update sha256 hash for the new version 2018-08-12 11:35:23 +02:00
Bas van Dijk 9481513360 cabal2nix: fix build by overriding hpack to 0.29.6 
Fixes: https://github.com/NixOS/cabal2nix/issues/369
 2018-08-11 10:44:27 +02:00
Silvan Mosberger 7f12361e62
yi: fix build 2018-08-09 22:28:25 +02:00
Jan Tojnar 93168d887c
bustle: fix build 2018-08-07 12:08:10 +02:00
Michael Alan Dorman 8df4d87aee xmonad, xmonad-contrib, xmonad-extras: remove superfluous config 
xmonad and xmonad-contrib no longer require patches, and
xmonad-contrib and xmonad-extras no longer need to be jailbroken.
 2018-08-07 09:25:35 +02: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
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
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
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
Peter Simons 26b313accf git-annex: update sha256 hash for the new version 2018-07-21 16:22:13 +02: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
Will Dietz a16b7dfb6a hpc-coveralls: patch to fix build (for Cabal 2.2) 2018-07-13 23:39:17 -05:00
Will Dietz ba602b0a5f haskell-{unix-time,prettyprinter}: dontCheck on musl 2018-07-12 11:04:25 -05:00
Peter Simons 4fe4ac341d haskell-stylish-cabal: build needs hspec < 2.5 to succeed 2018-07-11 11:10:45 +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 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 a711d4342f Update Haskell overrides for lts-12.x. 2018-07-10 20:10:26 +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
Peter Simons 1d587c2e66 hledger-ui: fix build with ghc 8.4.x 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 6e07a3a19a
Revert "haskell generic-builder: Use strictDeps always" 2018-07-04 13:18:21 +02:00
Domen Kožar 9ed54a38bd configuration-common.nix: fix build tools 2018-07-03 19:24:40 -04: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
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 be1461fc0a haskell-dhall-json: update override 2018-07-01 22:03:57 +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 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 fb9f0ebc9a haskell-vector-sized: update override for the latest version 2018-06-26 10:12:28 +02:00
Profpatsch 2f2e79be39 haskellPackages: disable profiling ghc-heap-view ghc-datasize 2018-06-25 22:06:50 +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
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 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
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
xeji 045686fe04
Merge pull request #41408 from puffnfresh/package/taffybar 
taffybar: work around repeated arguments bug
 2018-06-17 22:11:52 +02:00
Matthew Bauer e544e4f564 configuration-common.nix: fix incorrect override 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
Michael Alan Dorman 0287773a0a haskell-gi: remove patch already present in new version 2018-06-07 15:22:16 +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
Brian McKenna 9dcf7d0d4e taffybar: work around repeated arguments bug 
Fixes #40013
 2018-06-03 19:24:28 +10:00
Matthew Bauer ced1670092 haskell: disable language-nix on i686 linux 
see https://github.com/peti/language-nix/issues/4 for discusssion
 2018-05-31 12:34:15 -04:00
Sarah Brofeldt feaf65f1ee darcs: Allow newer graphviz 
Fixes #41306
 2018-05-31 12:34:13 +02:00
Peter Simons 4f696f391d haskell-fgl: avoid jailbreak to fix the build 
A jailbreak-cabal binary compiles against Cabal 2.2.x will break fgl's Cabal
file. Therefore, we just disable the test suite that causes these version
issues.
 2018-05-30 03:46:16 +02:00
Peter Simons 2495f07222 haskell-cryptohash-sha256: avoid jailbreak, which breaks the Cabal file 2018-05-30 03:46:16 +02:00
Peter Simons 85c5e8d651 haskell-parsec: drop obsolete jailbreak 2018-05-30 03:46:16 +02:00
Peter Simons 9ef8d70d23 haskell-graphviz: override dependency versions to fix the build 
Closes https://github.com/ivan-m/graphviz/issues/34.
 2018-05-30 03:46:16 +02:00
Orivej Desh e4df80a69b haskellPackages.hlibgit2: fix build after #28029 2018-05-29 23:57:23 +00:00
Profpatsch ac404fd9e7 haskellPackages: mark yarn2nix broken w/ message 2018-05-28 17:28: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
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
Peter Simons 77fbd14d85 haskell-gi: apply upstream patch to fix the doctest suite 2018-05-09 20:41:33 +02: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 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 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 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
Nikolay Amiantov bea11a34fb haskellPackages.encoding: fix build with Cabal 2.0 2018-04-26 17:01:14 +03: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 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
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
Peter Simons 6c577a37b6
Merge branch 'master' into hs-vulkan 2018-04-20 17:51:07 +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
Michael Alan Dorman cb7b52a1b1 hlint, hoogle: add override for extra package 2018-04-20 15:24:03 +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 fac2951d8b
Merge pull request #38496 from jerith666/amazonka-fix 
amazonka: fix build after hackage update
 2018-04-06 10:51:02 +02:00
Matt McHenry 8ea70531de amazonka: fix build after hackage update 
fixes #38306
 2018-04-05 22:05:43 -04:00
Peter Simons c111b4bf80 haskell-alex: fix broken test suite 2018-04-04 15:00:25 +02:00
Peter Simons 170ea4f6c8 haskell-hackage-security: update override after Stackage update 2018-04-04 15:00:24 +02:00
Peter Simons 6e3cb231e6 haskell-hledger: update post-install hooks for the new documentation scheme 2018-04-01 16:56:54 +02:00
Maxime Dénès a1e8bd39a5
haskellPackages.spdx: fix build 
We disable tests which depend on old tasty (< 0.12).
 2018-03-31 11:46:46 +02:00
Peter Simons 0f90640518 cabal-install: fix build of the latest version 2018-03-29 20:46:32 +02:00
Peter Simons c7c3f58fad haskell-resolv: disable test suite to fix the build 2018-03-29 20:46:32 +02:00
Michael Alan Dorman dddf0314bc haskell-hnix: jailbreak deriving-compat dependency 
Reported as https://github.com/jwiegley/hnix/issues/98
 2018-03-27 20:43:55 +02:00
Shea Levy 2456060458
haskellPackages.lenz-template: Fix against lenz 3 2018-03-26 16:13:46 -04:00
Shea Levy 2b3ba40c03
haskellPackages.lenz: Remove outdated patch. 2018-03-26 13:40:22 -04:00
Peter Simons 53ab595095
Merge pull request #37766 from rnhmjoj/shell-conduit 
haskellPackages.shell-conduit: fix build
 2018-03-25 20:04:43 +02:00
rnhmjoj be3449200d
haskellPackages.shell-conduit: fix build 2018-03-25 15:54:09 +02:00
Peter Simons d1ba7ed4df haskell-pure-zlib: enable test suite again 
https://github.com/NixOS/nixpkgs/issues/37499 has been fixed. Now we just need to
jailbreak the package to avoid https://github.com/GaloisInc/pure-zlib/issues/6.
 2018-03-22 21:14:24 +01:00
Matthew Pickering 4a3ad82bcd dontCheck pure-zlib 
Fixes #37499
 2018-03-21 17:16:20 +00:00
Peter Simons c9777cdf9d haskell-SHA: the new version has fixed the test suite failure 2018-03-20 16:23:12 +01:00
Peter Simons 53309758e3 haskell-matrix: the new version has fixed the test suite failure 2018-03-20 16:23:12 +01:00
Jan Tojnar 47bbd819c7
haskell-configuration-common: disable some tests depending on tasty-hunit-0.9 2018-03-20 13:34:38 +01:00
Peter Simons 148646e630 haskell-matrix: override to latest version for ghc-8.4.x 2018-03-17 21:16:49 +01:00
Peter Simons 408d441df0 git-annex: update sha256 hash for the new version 2018-03-17 08:21:22 +01:00
Peter Simons 929dac413b cabal2nix: update hpack version override 2018-03-17 08:21:22 +01:00
Peter Simons 7d043f036c haskell-configuration-common: cosmetic, no functional change 2018-03-17 08:21:22 +01:00
Peter Simons 50020a296a darcs: jailbreak fgl dependency constraints to fix the build 2018-03-16 17:33:31 +01:00
Graham Christensen 18bf53a74d
haskel packages: drop override on ltk to fix evaluation 2018-03-15 22:00:02 -04:00
Peter Simons 5a1a30becc structured-haskell-mode: update overrides for lts-11.x 2018-03-15 21:33:05 +01:00
Peter Simons 1e8e3d6291 haskell-changelogged: drop obsolete override 2018-03-15 21:33:05 +01:00
Peter Simons de7847e683 git-annex: add overrides to fix the build in an lts-11.x environment 2018-03-15 21:33:05 +01:00
Peter Simons 326e1157a3 cabal2nix: update hpack override to use the latest version 2018-03-15 21:33:04 +01:00
Peter Simons 6e507784d7 lambdabot-haskell-plugins: drop obsolete override 2018-03-15 21:33:04 +01:00
Peter Simons 3cf9c63c64 Drop obsolete Haskell overrides. 
The overrides for the following packages no longer help:

 - HaVSA
 - test-framework-quickcheck
 2018-03-15 21:33:04 +01:00
Peter Simons 8fdba8ca99 haskell-test-framework: disable test suite build 
This avoids a dependency on an old version of QuickCheck.
 2018-03-15 21:33:04 +01:00
Michael Alan Dorman 559832d663 isDarwin: make usage consistent 
This one was the only one of the form pkgs.stdenv._hostPlatform_.isDarwin.
 2018-03-15 21:33:04 +01:00
Michael Alan Dorman 2d3138fc9a tldr: remove unnecessary override 
`shell-conduit` is no longer necessary for the expression.
 2018-03-15 21:33:04 +01:00
Michael Alan Dorman 41409f6348 haskell-src-exts: remove unnecessary overrides 
The 1.20.2 release is now the default.
 2018-03-15 21:33:04 +01:00
Michael Alan Dorman 80b209cf20 http-conduit: remove unnecessary override 
The 2.3.0 version is now the default.
 2018-03-15 21:33:04 +01:00
Peter Simons a13ff71b21 haskell-configuration-common: update a couple of comments 2018-03-15 21:33:04 +01:00
Peter Simons 90696dcb6c cabal2nix: update hpack override 2018-03-15 21:33:04 +01:00
Peter Simons 1583cc6449 haskell-SHA: fix compiler crash while trying to build the test suite on i686 
Fixes https://github.com/NixOS/nixpkgs/issues/36949.
 2018-03-14 21:23:25 +01:00
Peter Simons 2f2ad74369 Fix cross-compilation builds of several Haskell packages some more. 2018-03-14 21:09:14 +01:00
Peter Simons 70467b9a12 Fix cross-compilation builds of several Haskell packages. 2018-03-14 20:50:43 +01:00
Peter Simons 7337a20f64 haskell-inline-c: disable test suite to avoid around quickcheck failure 2018-03-12 14:30:59 +01:00
Peter Simons d531e09696 haskell-changelogged: update override for new turtle version 2018-03-12 14:30:59 +01:00
Peter Simons 86058acb2f haskell-ChasingBottoms: drop obsolete override 2018-03-12 14:30:58 +01:00
Peter Simons 4e63fcec1b haskell-ChasingBottoms: add override that uses the latest version 2018-03-11 09:24:37 +01:00
Peter Simons 8d0b0095db haskell-jailbreak-cabal: clean up overrides 2018-03-11 09:24:37 +01:00
Peter Simons dba20cb1b1 haskell-ChasingBottoms: move jailbreak to common to allow building with QuickCheck 2.11 2018-03-11 09:24:36 +01:00
Peter Simons ee262b83ef cabal2nix: fix overrides for Cabal 2.2.x 2018-03-10 10:00:16 +01:00
Peter Simons 2a17cffbb2 haskell-src-exts: update overrides for version 1.20.2 2018-03-09 14:22:28 +01:00
Peter Simons f4b757bd3d haskell-changelogged: add override to fix the build 2018-03-06 21:10:39 +01:00
Vladimír Čunát 565bd805e6
Merge branch 'master' 2018-03-05 14:53:27 +01:00
Peter Simons 8b537488a5 git-annex: update sha256 hash for the new version 2018-03-01 21:56:35 +01:00
Alexander V. Nikolaev 0acec7e984 treewide: transition mesa to libGLU_combined 2018-02-24 17:06:49 +02:00
Michael Alan Dorman f7ab190096 language-c: remove now-unnecessary overrides 2018-02-23 17:58:18 +01:00
Kosyrev Serge e6b5fefed7
configuration-generic | c2hs: language-c 0.7.2 is compatible with GHC 8.4 2018-02-22 01:30:42 +03:00
Peter Simons a3c1a66ed7 liquidhaskell: drop obsolete override 2018-02-20 17:21:47 +01:00
Peter Simons e7a8ced07f liquidhaskell: version 0.8.2.3 fails during Haddock stage 2018-02-16 12:55:46 +01:00
Peter Simons b0bdf778bd liquidhaskell: drop obsolete patches 2018-02-16 10:40:04 +01:00
Peter Simons b6e553506f cabal2nix: build with hpack 0.27.0 2018-02-16 10:40:00 +01:00
Peter Simons afb83e0e03 multi-ghc-travis: update to current Git master 2018-02-13 10:57:40 +01:00
Shea Levy 32085eafa1 haskell-hpio: disable test suite to fix the build 2018-02-10 18:10:47 +01:00
Shea Levy d2b6665024 haskell-twee-lib: disable broken haddocks 2018-02-10 18:10:46 +01:00
Shea Levy 7ac6c77323 ghc: Make deterministic profiling patches opt-in. 
The patch changes some pieces of the exposed API, so we can't have our
default GHC changed in this way.
 2018-02-10 18:10:44 +01:00
Shea Levy 9dfbb52423 liquidhaskell: Patch for compat with our deterministic profiling GHC patch 2018-02-10 18:05:29 +01:00
Peter Simons 1d4529c7e2 cabal2nix: compile with hpack 0.25.0 2018-02-10 18:05:28 +01:00
Peter Simons 8ff7ac4859
Merge pull request #34646 from clacke/hledger-darwin 
hledger: build correctly on darwin
 2018-02-07 08:32:59 +01:00
Claes Wallin (韋嘉誠) cc2c594a9b hledger*: build correctly on darwin 
- mkdir -p $out/share/info rather than assuming $out/share is there
 - find .info and .man* files correctly on darwin -- don't try to
   match the specific system name, there is nothing to gain from that

nix calls darwin darwin, but ghc calls it osx in its directory names.

closes #34644
 2018-02-07 01:32:16 +08:00
Shea Levy 39f62c770b
haxl: Disable non-deterministic tests 2018-02-05 13:00:12 -05:00
Peter Simons af884f5607 cabal2nix: update build to hpack 0.24 2018-02-04 10:52:53 +01:00
Peter Simons 866a1ed2d5 cabal2nix: build with hpack 0.23 2018-01-31 16:03:59 +01:00
Peter Simons b7e6ac1515 hledger: install man pages and info files 
Make sure that hledger, hledger-ui, and hledger-web have their documentation
installed in locations where system tools can find them.

Fixes https://github.com/NixOS/nixpkgs/issues/34301.
 2018-01-26 19:42:04 +01:00
Peter Simons f8776eabdd cabal2nix: build with latest version of hpack 2018-01-26 13:01:12 +01:00
Peter Simons 03ef28473d haskell-tinc: drop broken non-Hackage package 2018-01-26 13:01:11 +01:00
Peter Simons c83b455c7d haskell-intero-nix-shim: drop broken non-Hackage package 2018-01-26 13:01:11 +01:00
Peter Simons 291c3681f6 cabal-plan: fix build by applying https://github.com/haskell-hvr/cabal-plan/pull/16 2018-01-26 13:01:10 +01:00
Peter Simons eb5d7d2b26 haskell-lambdabot: fix build 2018-01-23 16:09:29 +01:00
Peter Simons 4532826e99
Merge pull request #34037 from ElvishJerricco/fix-ghcjs-lts-10 
Fixed GHCJS
 2018-01-21 19:55:25 +01:00
Will Fancher fcc8cae88d Fixed GHCJS 2018-01-20 15:47:59 -05:00
Peter Simons 8297025d28 haskell-hlint: needs latest version of haskell-src-exts 2018-01-20 21:40:45 +01:00
Michael Alan Dorman 899714ae96 hoogle: fix http-conduit dependency for new version 
5.0.17 now requires http-conduit > 2.3.
 2018-01-19 12:53:11 +01:00
Peter Simons a1366f43a0 git-annex: update hash for new version 2018-01-19 12:53:11 +01:00
Jan Tojnar c278dd0b9d
bustle: re-enable hgettext support 
hgettext 0.1.31.0 builds again
 2018-01-18 22:13:57 +01:00
Peter Simons 29f0f38433 multi-ghc-travis: update to latest Git version and create a proper Haskell build 
The attribute haskellPackages.multi-ghc-travis refers to a proper Cabal build
that includes the package's library
 2018-01-18 17:01:33 +01:00
José Luis Lafuente 9b577c44bc
gitHUD: disable tests 
Tests require tasty-quickcheck ==0.8.*
 2018-01-17 17:18:16 +01:00
Shea Levy 43e7cf5eb7
haskellPackages.ChasingBottoms: Disable testsuite 2018-01-12 13:04:57 -05:00
Peter Simons e277be1943
Merge pull request #33360 from adnelson/unpin_lzma_versions 
haskellPackages.lzma: loosen version bounds for test dependencies
 2018-01-12 16:09:13 +01:00
Drew Hess 84e4caacc5
haskell-modules: swagger2 still needs dontHaddock on armv7l-linux. 2018-01-11 00:59:55 -08:00
Drew Hess c5e433df59
haskell-modules: more disabled tests for armv7l-linux. 
Specifically: servant-docs, servant-swagger, swagger2.
 2018-01-10 00:38:45 -08:00
Drew Hess c05378b730
haskell-modules: disable hashable tests on armv7l-linux. 2018-01-09 18:06:25 -08:00
Matthew Pickering 5542e3cc4d haskell package set configuration clean-up 
Closes https://github.com/NixOS/nixpkgs/pull/33588.
 2018-01-09 20:32:55 +01:00
Peter Simons 48a6d1a2ab
Merge pull request #33405 from dhess/ghc-armv7l 
Make GHC work on armv7l-linux
 2018-01-08 11:50:41 +01:00
Allen Nelson a4c8f60e86 reference issue in comment 2018-01-06 23:08:24 -06:00
Michael Alan Dorman 5d56434e56 hindent: needs new haskell-src-exts 2018-01-06 11:29:51 +01:00
Michael Alan Dorman b1a1062dad text-icu: Some sort of testing issue with ghc-8.2 2018-01-05 09:34:25 +01:00
Peter Simons 0a07a52506
Merge pull request #33425 from mpickering/stringbuilder 
Use self rather than super to make stringbuilder overridable
 2018-01-04 18:02:07 +01:00
Matthew Pickering d7944aba3e Use self rather than super to make stringbuilder overridable 2018-01-04 16:54:38 +00:00
Robin Gloster 231754d995
haskellPackages.restless-git: fix build 2018-01-04 15:13:57 +01:00
Drew Hess 05824e66a1
haskell-modules: disable happy tests on armv7l-linux. 2018-01-03 16:03:26 -08:00
Test 6ea37497cd loosen version bounds for lzma test dependencies 2018-01-02 17:43:40 -06:00
Frederik Rietdijk 4cc2a38854 Merge remote-tracking branch 'upstream/master' into HEAD 2018-01-01 18:15:13 +01:00
Peter Simons f448a79770 haskell-JuicyPixels: disable failing Haddock phase 2018-01-01 18:12:17 +01:00
Vladimír Čunát 1fcd92ce92
Merge branch 'master' into staging 
A few thousand rebuilds from master, again.
Hydra: ?compare=1422362
 2017-12-31 09:53:49 +01:00
Peter Simons ab3a12ed7e darcs: switch build to GHC 8.0.2 to fix it 
Also, jailbreak the constraint on unix-compat <5.
 2017-12-31 09:31:03 +01:00
Frederik Rietdijk 2d0bead714 Merge remote-tracking branch 'upstream/master' into HEAD 2017-12-30 17:04:54 +01:00
Shea Levy 961907de47
Add haskell-ide-engine 2017-12-29 14:41:15 -05:00
Vladimír Čunát f29000b002
Merge branch 'master' into staging 
Hydra: ?compare=1421760
 2017-12-29 10:13:33 +01:00
Robin Gloster ee1c85aee9 mariadb: lib -> connector-c 2017-12-29 02:18:35 +01:00
Peter Simons 39eb15b028 haskell-scalendar: break the infinite recursion to avoid evaluation errors 
Suggested in https://github.com/NixOS/nixpkgs/pull/33077#issuecomment-353993598.
 2017-12-27 18:33:45 +01:00