1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-12-25 03:17:13 +00:00
Commit graph

1254 commits

Author SHA1 Message Date
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
Peter Simons adabca4b13
Revert "haskellPackages.{SC,sc}alendar: nullify to fix ofborg eval" 2017-12-26 22:24:30 +01:00
Piotr Bogdan 416d9bd7f8 haskellPackages.{SC,sc}alendar: nullify to fix ofborg eval 2017-12-26 16:52:36 +00:00
Michael Alan Dorman 48c4901a7a taggy: remove patch
The newly released 0.2.1 includes it.
2017-12-26 11:36:28 +01:00
Shea Levy e32bc0b5c0
haskellPackages.lenz: Fix against latest hs-functors 2017-12-22 13:54:01 -05:00
Shea Levy 5e8a0786b0
Disable tests on haskellPackages.protobuf 2017-12-22 12:48:07 -05:00
Shea Levy 302202ccde
haskellPackages.monad-memo: Fix testsuite 2017-12-22 09:11:41 -05:00
Michael Alan Dorman 8e6d5639c3 pointfree, taffybar: jailbreak 2017-12-20 20:59:33 +01:00
Peter Simons 15b9537f37 haskell-wai-secure-cookies: drop obsolete overrides 2017-12-20 20:59:18 +01:00
Peter Simons e4bb2a784d liquidhaskell: drop obsolete override 2017-12-20 20:59:18 +01:00
Pierre Radermecker 3e22c56161 Haskell-language-puppet: don't build haddock 2017-12-20 15:16:57 +01:00
Peter Simons 3ae4e2dcc9 haskell-graphviz: jailbreak to fix build with recent versions of QuickCheck 2017-12-20 09:17:46 +01:00
Peter Simons dba09a202b stack: jailbreak to fix broken build in LTS-10.x 2017-12-20 09:17:46 +01:00
Peter Simons 4ab8999891 haskell-store: disable test suite to fix build with recent versions of smallcheck 2017-12-20 09:17:46 +01:00
Peter Simons 6922808372 haskell-path: disable test suite to fix build with recent versions of doctest 2017-12-20 09:17:46 +01:00
Peter Simons a33d746223 haskell-genvalidity-property: jailbreak to fix build with recent versions of doctest 2017-12-20 09:17:46 +01:00
Peter Simons 5119549255 haskell-config-ini: disable test suite which fails with GHC 8.2.2 2017-12-20 09:17:46 +01:00
Peter Simons 04bd949738 haskell-nix-derivation: jailbreak to fix build with QuickCheck 2.10+ 2017-12-20 09:17:46 +01:00
Peter Simons 48c0621cdf haskell-int-cast: jailbreak to fix build with QuickCheck 2.10+ 2017-12-20 09:17:46 +01:00
Peter Simons 68be4071ed haskell-text-short: jailbreak to fix build with recent tasty-quickcheck 2017-12-20 09:17:46 +01:00
Peter Simons 2a097c9c02 haskell-blaze-html: jailbreak to fix build with QuickCheck 2.10+ 2017-12-20 09:17:46 +01:00
Peter Simons 91a864f3d7 haskell-attoparsec: disable test suite to fix build with QuickCheck 2.10+ 2017-12-20 09:17:46 +01:00
Peter Simons 914d1aa19b haskell-blaze-markup: jailbreak to fix build with QuickCheck 2.10+ 2017-12-20 09:17:46 +01:00
Peter Simons cde067b3ac haskell-cryptohash-*: jailbreak to fix build with recent tasty-quickcheck 2017-12-20 09:17:46 +01:00
Peter Simons 6372613259 cabal-install: drop obsolete overrides 2017-12-20 09:17:46 +01:00
Peter Simons a5d5d03a97 haskell-cryptohash-sha256: jailbreak to fix build with recent tasty-quickcheck 2017-12-20 09:17:46 +01:00
Peter Simons 2a742f6aef haskell-edit-distance: jailbreak to fix build with QuickCheck 2.10+ 2017-12-20 09:17:46 +01:00
Peter Simons 45e819dd49 haskell-configuration-common: drop obsolete overrides 2017-12-20 09:17:46 +01:00
Peter Simons e2c6ccf71f haskell-scalendar: mark package as broken 2017-12-20 09:17:46 +01:00
Peter Simons 3e524aa06f haskell-configuration-common: drop obsolete overrides 2017-12-20 09:17:46 +01:00
Peter Simons 46351ad4b7 haskell-pandoc: drop obsolete constraints 2017-12-20 09:17:45 +01:00
Michael Alan Dorman 053c466073 vector-builder: Break recursion 2017-12-20 09:17:45 +01:00
Michael Alan Dorman 4fa4348dea Remove various package overrides 2017-12-20 09:17:45 +01:00
Michael Alan Dorman 461f311e35 haskell-src-exts: 1.19.1 is now the default version 2017-12-20 09:17:45 +01:00
Michael Alan Dorman 22ef441cfa optparse-applicative: 0.14 is now the default version
Remove references to when it was non-default.
2017-12-20 09:17:45 +01:00
Peter Simons 523fae925c haskell-pandoc-citeproc: update override 2017-12-19 13:58:52 +01:00
Peter Simons 2737faba47
Merge pull request #32746 from jtojnar/bustle
haskellPackages.bustle: build icons and metadata
2017-12-17 08:42:05 +01:00
Jan Tojnar 07c375d9fc
haskellPackages.bustle: build icons and metadata 2017-12-16 22:42:30 +01:00
Peter Simons 874dbb14c1 git-annex: update hash for version 6.20171214 2017-12-15 16:32:56 +01:00
Peter Simons a215e145e4 haskell-configuration-common: cosmetic 2017-12-15 13:11:15 +01:00
Peter Simons 647cda9dfe haskell-hoogle: fix build of latest version 2017-12-15 13:11:15 +01:00
Peter Simons 432d58593e haskell-pandoc: fix override for latest version 2017-12-15 13:11:15 +01:00
Peter Simons 04c4002190 haskell-hpack: fix override for latest version 2017-12-15 13:11:15 +01:00
Peter Simons 265d68e8ca haskell-pandoc-2.x: update overrides 2017-12-11 18:46:41 +01:00
Peter Simons ee3d43f978 stack: update default version to 1.6.1
Allow building with either ghc 8.0.x or 8.2.x.
2017-12-11 18:46:41 +01:00
Peter Simons b0ca52b24c haskell-hpack: new versions need latest HUnit to compile their test suite 2017-12-11 18:46:41 +01:00
Nick Hu a3d7d3e7cf pandoc2: fix Haskell dependencies 2017-12-07 21:25:29 +00:00
Peter Simons fb1660439b
Merge pull request #32324 from rvl/tmp-postgres
haskellPackages.tmp-postgres: Add pginit dependency
2017-12-06 08:30:20 +01:00
Rodney Lorrimar e1c4beb818 haskellPackages.tmp-postgres: Add pginit dependency 2017-12-06 04:31:05 +00:00
Peter Simons c722252251 idris: update overrides for new 1.1.1 default version 2017-12-05 21:01:50 +01:00
Peter Simons 8737c9668b haskell-Cabal: update overrides for new 2.0.1.1 release 2017-12-05 21:01:50 +01:00
Peter Simons 8d8061ec20
Revert "Revive multiple outputs for Haskell packages." 2017-12-05 09:36:08 +01:00
Peter Simons 7993e8790f
Merge pull request #32112 from nc6/hask-split-out
Revive multiple outputs for Haskell packages.
2017-12-04 12:36:45 +01:00
Jonathan Curran 75b79fb5db Use override instead of overrideScope 2017-11-29 15:47:44 -07:00
Jonathan Curran 7775a1a60e purescript: fix build by overriding optparse-applicative dependency 2017-11-29 14:52:29 -07:00
Peter Simons cf1e09013e git-annex: update hash for new version 6.20171124 2017-11-29 10:47:07 +01:00
Nicholas Clarke d90165c7db Revert "Revert "Merge pull request #27209 from nc6/nc/haskell-multiple-out""
This reverts commit 89f5d52cf4.
2017-11-27 16:05:22 +00:00
Peter Simons 1743953cc5 haskell-Cabal: bump 2.x branch to version 2.0.1.0 2017-11-24 18:34:32 +01:00
Peter Simons d5dceefa71 haskell-LambdaHack: update override for sdl2-ttf version 2017-11-20 14:49:27 +01:00
Peter Simons cecfc96e0b haskell-json-autotype: drop obsolete jailbreak override 2017-11-20 14:49:27 +01:00
Peter Simons 6d72341533 haskell-stack: remove jailbreak for hpack
Current versions of hpack actually break the build, so we must now stick to the
version stack wants. It still overstates it's dependency restrictions, though. :-(
2017-11-20 14:49:27 +01:00
Peter Simons c6d9b5d96a haskell-c2hs: use development version from github to work around _Float128 bug
Works around https://github.com/haskell/c2hs/issues/192.
Closes https://github.com/NixOS/nixpkgs/issues/31411.
Closes https://github.com/NixOS/nixpkgs/pull/31498.
2017-11-11 17:38:42 +01:00
Peter Simons 56a4c3750e git-annex: fix sha256 hash after upstream update 2017-11-11 17:38:26 +01:00
Robin Gloster 1c431f4664
stack2nix: fix build
closes #30899
2017-11-02 09:09:54 +01:00
Peter Simons 4c263586f6 git-annex: fix hash after version update 2017-10-31 19:09:19 +01:00
Peter Simons d2f9dc4a3b haskell-ltk: fix build by providing haskell-gi-overloading-0.0
Closes https://github.com/NixOS/nixpkgs/pull/30462.
2017-10-23 20:16:45 +02:00
Michael Alan Dorman d559edc277 git-annex: update sha 2017-10-23 15:57:34 +02:00
Peter Simons 895b4ef59b liquidhaskell: use latest aeson 2017-10-23 15:57:34 +02:00
Peter Simons 25eb5eecb7 haskell-fluid-idl-scotty: disable broken build 2017-10-23 15:57:34 +02:00
Frank Doepper 2d7705f8d4 haskellPackages.amqp-utils: fix dependencies 2017-10-21 18:10:29 +02:00
Peter Simons 09a13160dd liquidhaskell: new release copes with recent versions of its dependencies 2017-10-17 20:35:30 +02:00
Peter Simons f9b72047f8 haskell-fluid-idl-http-client: disable broken build 2017-10-17 20:35:30 +02:00
Mateusz Kowalczyk 0ef6e215ff Agda: package builds fine these days
Tested with 8.0.2 and 8.2.1.
2017-10-13 15:35:27 +01:00
Domen Kožar a1dfb1916a
haskellPackages.double-conversion: remove upstreamed patch
81d53e299f
2017-10-09 15:07:54 +02:00
Peter Simons 929eadebb0 git-annex: update to version 6.20171003 2017-10-06 12:41:50 +02:00
Peter Simons 2784bd7168 haskell-json-autotype: jailbreak to fix build within LTS 9.x
https://github.com/mgajda/json-autotype/issues/15
2017-10-01 21:16:44 +02:00
Peter Simons b92f59029a haskell-hspec-core: enable test suite again 2017-10-01 15:45:52 +02:00
Peter Simons bc265e041a haskell-hspec-core: disable test suite until transient failures are fixed
https://github.com/hspec/hspec/issues/330
2017-09-30 10:23:21 +02:00
Peter Simons 49fafc77b4 haskell-stack: jailbreak build to support hpack 0.19 2017-09-30 10:23:21 +02:00
Peter Simons 3fc0c769b0 git-annex: update to version 6.20170925 2017-09-30 10:23:21 +02:00
Mikael Brockman 0b8b72081b Merge branch 'master' into dapphub-hevm 2017-09-28 13:27:19 +03:00
Peter Simons 92576b77e9 haskell: provide a meta package "unbuildable" to fix evaluation of Win32 2017-09-25 10:43:42 +02:00
Peter Simons 2a1c656c54 cabal2nix: update to version 2.6
- Add support for the 01-index tarball of cabal-install 2.x.
 - Add shell completions for fish and zsh.
2017-09-24 20:52:05 +02:00
Mikael Brockman 74edd2c5db
hsevm: project was renamed to hevm
This also upgrades the hsevm package from v0.6.4 to v0.8.5.

The project `dapp` which depends on hsevm was also updated to use the
new name, so I have also upgraded that package from version v0.5.3 to
v0.5.7.

I also added a `dontCheck` to a Hackage dependency because its test
suite depends on Git and runs a bunch of Git repository manipulations.
2017-09-22 08:06:05 +03:00
Peter Simons a68eea3cb0 Merge pull request #29089 from LnL7/vaultenv-0.5.0
vaultenv: init at 0.5.0
2017-09-21 21:13:53 +02:00
Patrick Callahan 8119e48c2d haskellPackages.tldr: fix build and add to top-level packages 2017-09-15 09:51:37 -07:00
Patrick Callahan 12aa8b2f2b shell-conduit: disable tests on Darwin to fix build 2017-09-15 09:51:36 -07:00
Peter Simons 4944610903 haskell-cryptol: override happy to older version to fix the build 2017-09-14 15:25:46 +02:00
Peter Simons a037526789 Merge pull request #29177 from LumiGuide/fix-attoparsec-data
haskell: fix build of attoparsec-data
2017-09-10 20:48:29 +02:00
Falco Peijnenburg 5d57aaebd5 haskellPackages.wai-secure-cookies: Fixed build 2017-09-10 20:47:01 +02:00
Peter Simons dc9c2c7bac Merge pull request #29188 from LumiGuide/fix-hw-xml
haskell: fix build of hw-xml
2017-09-10 20:42:41 +02:00
Peter Simons d96ad6b635 Merge pull request #29186 from LumiGuide/fix-hol
haskellPackages.hol: Fixed build
2017-09-10 20:42:02 +02:00
Peter Simons 2b7fac2eff Merge pull request #29183 from LumiGuide/fix-grakn
haskell: fix grakn-0.2.0
2017-09-10 20:41:08 +02:00
Bas van Dijk 09bdd6260f haskell: fix build of LambdaHack 2017-09-10 12:24:24 +02:00
Bas van Dijk a759faf60b haskell: fix build of hw-xml 2017-09-10 11:56:48 +02:00
Falco Peijnenburg 78ddef2cae haskellPackages.hol: Fixed build 2017-09-10 11:45:24 +02:00
Bas van Dijk 40b1516d39 haskell: fix grakn-0.2.0 2017-09-10 11:17:24 +02:00
Bas van Dijk c910bbb134 haskell: fix build of attoparsec-data
Fixes: https://hydra.nixos.org/build/60421889
2017-09-10 10:36:40 +02:00
Peter Simons 9b611844f1 Agda: disable broken build 2017-09-10 09:41:49 +02:00
Peter Simons e960eb0bf5 haskell-text-zipper: disable test suite to fix the build 2017-09-09 17:08:17 +02:00
Daiderd Jordan c3f6b53bb6
vaultenv: init at 0.5.0 2017-09-09 12:43:04 +02:00
Peter Simons 0898cd2521 haskell-Agda: use old Happy version to fix the build 2017-09-07 17:42:25 +02:00
Peter Simons 89f5d52cf4 Revert "Merge pull request #27209 from nc6/nc/haskell-multiple-out"
This reverts commit dfb0f25484, reversing
changes made to 7f8ff02437. These changes broke
the ghcWithPackages wrapper:

    nix-shell -p "haskellPackages.ghcWithPackages (ps: [ps.mtl])" --run "ghc-pkg list mtl"
    /nix/store/szz84j5k1dy3jdashis6ws28d8l8zxxb-ghc-8.0.2-with-packages/lib/ghc-8.0.2/package.conf.d
        (no packages)
2017-09-06 10:19:18 +02:00
Peter Simons e1a67915f8 haskell-happy: use 1.19.7 version (despite lts-9) to fix test suite failure 2017-09-06 10:17:46 +02:00
Nicholas Clarke 77cfb96fb1 Fix hastache build error.
`hastache` has no binary output but for `mkReadme`, so disable the
separate bin output and keep removing the `mkReadme`.
2017-09-04 12:35:57 +01:00
Nicholas Clarke 676362494d Enable multiple outputs for Haskell packages. 2017-09-04 12:35:57 +01:00
Michael Alan Dorman 2bbab078fb haskell-taggy: include upstream patch to fix build 2017-09-03 16:29:56 +02:00
Peter Simons 813d907b1d haskell-filelock: disable test suite to fix build 2017-09-03 16:29:45 +02:00
Peter Simons b9edab7a17 haskell-sbv: fix build 2017-09-03 16:29:37 +02:00
Peter Simons 1fb8734fdd Merge pull request #28492 from ttuegel/idris-packages
Update Idris
2017-08-23 14:03:39 +02:00
Thomas Tuegel b438d394ce
idrisPackages.idris: 1.0 -> 1.1.1 2017-08-23 06:45:32 -05:00
Peter Simons 7b16f5974e git-annex: update to version 6.20170818
Fixes CVE-2017-9800, CVE-2017-12836, CVE-2017-1000116, and CVE-2017-1000117.
2017-08-22 14:52:29 +02:00
Peter Simons 499b9ebc01 liquidhaskell: fix build of the required old aeson version
Closes https://github.com/NixOS/nixpkgs/issues/28372.
2017-08-22 14:52:29 +02:00
Domen Kožar 37c340728e
servant-auth: tests pass for a while now 2017-08-21 14:42:05 +02:00
Peter Simons 5468d5c662 Merge pull request #27991 from Profpatsch/hoogleLocal-fix
Fix the `ghcWithHoogle` function to cope with the presence of separate `doc` outputs.
2017-08-19 16:26:30 +02:00
Domen Kožar 105864a24d
purescript: fix building #28296 2017-08-16 15:44:28 +02:00
rnhmjoj da8712e4e9 haskellPackages.shell-conduit: fix failing test 2017-08-15 12:06:53 +02:00
Jude Taylor 7e3e790675 add override for html-entities 2017-08-08 14:29:33 -07:00
Jude Taylor eeeead21c5 add override for digestive-functors-blaze 2017-08-08 11:56:31 -07:00
Peter Simons 550373b000 cabal-install: fix build after updating to version 2.x 2017-08-08 10:09:56 +02:00
Profpatsch 4e6c41e7fa pkgs/haskell-modules: fix hoogleLocal docstring 2017-08-06 21:46:22 +02:00
Domen Kožar 71bebd5254
{fs,h}notify: move to configuration-nix.nix 2017-08-06 10:42:37 +02:00
Domen Kožar 8e16cee256
double-conversion: remove patch superseeded by ghc patch
https://github.com/NixOS/nixpkgs/pull/27584
2017-08-06 10:42:37 +02:00
Robin Gloster 688f066da2
haskellPackages.servant: fix hash 2017-08-04 17:04:03 +02:00
John Ericson 74f5fe5068 haskell infra: Misc cleanups
- The haskell lib is very close to not relying on Nixpkgs. I think
   this is good---simpler to think about and matches Nixpkgs's lib.

 - The haskell lib is only imported once

 - stdenv is exposed more shallowly so it can be overriden more easily.
   I'll eventually use this on Darwin to avoid the Sierra shared
   library problems (unless changes are to be made system-wide).

Closes https://github.com/NixOS/nixpkgs/pull/27840.
2017-08-03 13:12:01 +02:00
John Wiegley 0396ca6150
ghc-events_0_6_0 no longer exists 2017-08-01 09:34:50 -07:00
Peter Simons 92031d6e01 structured-haskell-mode: bump version to latest git head
Chris doesn't seem to make release any more.
2017-08-01 15:35:44 +02:00
Peter Simons 4fe328c6ca haskell-hindent: fix location of the "site-lisp" symlink 2017-08-01 15:25:19 +02:00
Peter Simons ef6849ca63 structured-haskell-mode: fix location of the "site-lisp" symlink 2017-08-01 15:25:19 +02:00
Peter Simons cb1742e76d haskell: fix builds broken by LTS-9 update 2017-07-28 18:14:02 +02:00
Nikolay Amiantov 94adf8d17d haskellPackages.threadscope: fix build 2017-07-27 12:47:58 +03:00
Domen Kožar 073b30563d ghc-mod: fix build to cope with new split-output work 2017-07-27 09:12:41 +02:00
michael bishop be63b1994d enable split-output builds for all haskellPackages 2017-07-27 09:12:06 +02:00
Peter Simons 175c3526ae haskell: provide the name 'bin-package-db' (null) to fix evaluation errors 2017-07-26 10:20:31 +02:00
Peter Simons 28c01703f0 haskell: remove all code related to the "haste" compiler
These packages have been broken for a while and now they don't even evaluate
any more.
2017-07-26 10:20:30 +02:00
Peter Simons a9111840fa haskell: provide the name 'ghcjs-prim' (null) to fix evaluation errors 2017-07-26 10:20:30 +02:00
Peter Simons 8a3c080237 hackage2nix: drop old packages that were required for stack prior to version 1.5.x 2017-07-26 10:19:57 +02:00
Peter Simons efa3ba8950 haskell-diagrams-solve: disable failing test suite to fix the build 2017-07-26 10:18:10 +02:00
Peter Simons 3cc46829c7 haskell-symengine: the build is broken because the system library this code binds to does not exist
This error isn't easily detectable, however, because the Cabal files declares
the dependency on "symengine" for the test program rather than for the library
itself.

https://github.com/symengine/symengine.hs/pull/14
2017-07-19 18:55:38 +02:00
Peter Simons 476fc5f26e haskell-cautious-file: jailbreak to fix the build 2017-07-18 16:51:09 +02:00
Peter Simons 47feb45313 haskell-hsyslog: update version override
And move it from configuration-nix to configuration-common.
2017-07-17 22:04:25 +02:00
Sarah Brofeldt 05c2d80025 haskellPackages.inline-java: Add jdk build dependency 2017-07-10 03:08:26 +02:00
Peter Simons 7e31862657 haskell-tinc: use default versions of cabal-install and cabal2nix 2017-07-04 15:50:27 +02:00
Peter Simons c43a2d392f git-annex: the overrideScope must be applied first to avoid bug https://github.com/NixOS/nixpkgs/issues/26852 2017-06-25 21:24:22 +02:00
Peter Simons 9721c54592 git-annex: replacing optparse-applicative needs a deep override
| Warning: This package indirectly depends on multiple versions of the same
 | package. This is highly likely to cause a compile failure.
 | package wai-app-static-3.1.6.1 requires optparse-applicative-0.13.2.0
 | package tasty-rerun-1.1.6 requires optparse-applicative-0.13.2.0
 | package tasty-0.11.2.1 requires optparse-applicative-0.13.2.0
 | package git-annex-6.20170520 requires optparse-applicative-0.14.0.0
2017-06-25 12:21:55 +02:00
Peter Simons bc20886345 git-annex: enable shell completions for zsh and fish
The latest optparse-applicative version can do that.
2017-06-23 12:49:36 +02:00