Commit graph

3056 commits

Author SHA1 Message Date
Kosyrev Serge
86b554a589
ghc841: github needs a jailbreak 2018-03-12 03:03:31 +03:00
Kosyrev Serge
c5160c62e3
ghc841: hackage-security fixed upstream 2018-03-12 03:03:31 +03:00
Kosyrev Serge
663934aec8
ghc841: fixed deriving-compat now on hackage 2018-03-12 03:03:31 +03:00
Kosyrev Serge
d799cc8b23
ghc841: haddock-library needs dontCheck and dontHaddock 2018-03-12 03:03:31 +03:00
Kosyrev Serge
1a451a36cb
ghc841: SMP-compatible regex-tdfa now on hackage 2018-03-12 03:03:31 +03:00
Kosyrev Serge
98f5efd872
ghc841: haskell-src-exts fix released 2018-03-12 03:03:31 +03:00
Kosyrev Serge
b2cfe1ce64
ghc841: cabal-install fixed upstream 2018-03-12 03:03:30 +03:00
Kosyrev Serge
662bc073b2
ghc841: cabal2nix fixed upstream 2018-03-12 03:03:30 +03:00
Kosyrev Serge
8f72b8a5c0
ghc841: bv fixed upstream 2018-03-12 03:03:30 +03:00
Kosyrev Serge
d7365851fb
ghc841: dhall fix 2018-03-12 03:03:30 +03:00
Kosyrev Serge
9c58744f3e
ghc841: dontCheck resolv 2018-03-12 03:03:30 +03:00
Kosyrev Serge
b69eb4af28
ghc841: jailbreak protolude 2018-03-12 03:03:30 +03:00
Kosyrev Serge
b77b9d56f3
ghc841: deriving-compat released [1/2] 2018-03-12 03:03:06 +03:00
Kosyrev Serge
06a1979263
ghc841: gc outdated overrides 2018-03-12 02:46:45 +03:00
Kosyrev Serge
bb9704ca82
ghc841: intern changes to PKGDB, except manual: esqueleto haskell-src 2018-03-12 01:35:48 +03:00
Peter Simons
379eb75014 haskell-setlocale: jailbreak to fix ghc 8.4.1 build 2018-03-11 09:24:37 +01:00
Peter Simons
73982726b0 haskell-boxes: apply patch to fix build with GHC 8.4.1 2018-03-11 09:24:37 +01:00
Peter Simons
4e63fcec1b haskell-ChasingBottoms: add override that uses the latest version 2018-03-11 09:24:37 +01:00
Peter Simons
797c272b66 haskell-hslua-module-text: drop obsolete override 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
3c104572a0 haskell-stylish-cabal: fix build with ghc 8.2.x and 8.4.x 2018-03-11 09:24:37 +01:00
Peter Simons
77e974b394 haskell-hackage-security: jailbreak to fix build with ghc 8.4.x 2018-03-11 09:24:36 +01:00
Peter Simons
b4707d9e65 haskell-src: mark broken for GHC 8.4.1 2018-03-11 09:24:36 +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
0ff88fb2ab haskell-GenericPretty: apply upstream patch to fix the build with ghc 8.4.x 2018-03-11 09:24:36 +01:00
Peter Simons
70aa779445 haskell-doctemplate: apply upstream patch to fix the build with ghc 8.4.x 2018-03-11 09:24:36 +01:00
Peter Simons
86bfcc89b8 haskell-HTTP: use the latest version when compiling with GHC 8.4.x 2018-03-11 09:24:36 +01:00
Peter Simons
f62deb0f92 hackage-packages.nix: automatic Haskell package set update
This update was generated by hackage2nix v2.9-5-g32974fc from Hackage revision
3efaeb24c3.
2018-03-11 09:24:31 +01:00
Peter Simons
8b369a15d2 hackage2nix: update list of broken Hydra builds 2018-03-11 09:24:30 +01:00
Peter Simons
668383c088 haskell-hackage-db: add override to fix build with GHC 8.4.1
Cc: @deepfire
2018-03-10 10:00:17 +01:00
Peter Simons
842a5c40f7 haskell: mark esqueleto and doctemplates as broken
Cc: @deepfire
2018-03-10 10:00:17 +01:00
Peter Simons
7011f3b66d haskell-tree-diff: add override to fix build with GHC 8.4.1
Cc: @deepfire
2018-03-10 10:00:17 +01:00
Peter Simons
7e040c8775 haskell-hslua-module-text: add override to fix build with GHC 8.4.1
Cc: @deepfire
2018-03-10 10:00:16 +01:00
Peter Simons
99fba9e335 haskell-HTTP and haddock-library: add overrides for ghc 8.4.1
Cc: @deepfire
2018-03-10 10:00:16 +01:00
Peter Simons
3724b07e2e haskell-blaze-builder: update overrides for ghc 8.4.1
The pull request we use does not suffice any longer because it does not update
the version constraint on base in the Cabal file.

Cc: @deepfire
2018-03-10 10:00:16 +01:00
Peter Simons
b01a5ec506 haskell-regex-tdfa: update overrides for ghc 8.4.1
The pull request we use does not suffice any longer because it does not update
the version constraint on base in the Cabal file.

Generally speaking, it might be a good idea to use
https://github.com/ChrisKuklewicz/regex-tdfa/pull/16 instead of the old one,
because it looks much cleaner. (It might have the same problem w/r to base,
though).

Pinging our resident GHC 8.4.1 guru @deepfire.
2018-03-10 10:00:16 +01:00
Peter Simons
ee262b83ef cabal2nix: fix overrides for Cabal 2.2.x 2018-03-10 10:00:16 +01:00
Peter Simons
c5cf8dd57a haskell-hackage-db: fix build with GHC 8.2.2 2018-03-10 10:00:16 +01:00
Peter Simons
469a15d386 distribution-nixpkgs: fix build with GHC 8.2.2 2018-03-10 10:00:15 +01:00
Peter Simons
deab46fdba Cabal-2.2.0.0: fix build with GHC 8.2.2 2018-03-10 10:00:15 +01:00
Peter Simons
8aa0e7b950 hackage-packages.nix: automatic Haskell package set update
This update was generated by hackage2nix v2.9-3-gae0d2f7 from Hackage revision
42026bde62.
2018-03-10 10:00:06 +01:00
Peter Simons
3134f6bf97 hackage2nix: disable failing Hydra builds 2018-03-10 10:00:02 +01:00
Peter Simons
52383dbb6b hackage2nix: always use latest version of jailbreak-cabal 2018-03-10 10:00:02 +01:00
Kosyrev Serge
a4fedaa481
ghc841 | turtle: GHC 8.4 needs a fresh Turtle 2018-03-10 06:51:58 +03:00
Kosyrev Serge
1aada58c2b
ghc841 | either: pin to v5 2018-03-10 06:37:35 +03:00
Peter Simons
90b394936b
Merge pull request #36652 from roberth/cabal2nix-extra-options
haskell.lib.haskellSrc2nix: add extraCabal2nixOptions
2018-03-09 15:06:14 +01:00
Robert Hensing
a90294afe4 haskell.lib.haskellSrc2nix: add extraCabal2nixOptions 2018-03-09 14:52:34 +01:00
Peter Simons
96b5bbd457 haskell-free: update overrides for version 5.0.1 2018-03-09 14:22:28 +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
bcd11f6a05 hackage-packages.nix: automatic Haskell package set update
This update was generated by hackage2nix v2.8.2-10-g32cfe74 from Hackage revision
ed3336e836.
2018-03-09 14:22:18 +01:00
Reuben D'Netto
b66892931e haskellPackages.cuda: Fixed broken dependency 2018-03-09 18:33:28 +11:00
Peter Simons
df6e6d91a8
Merge pull request #36393 from ElvishJerricco/haskell-shell-for
Haskell: Added haskellPackages.shellFor
2018-03-07 12:45:06 +01:00
Will Fancher
9adb4d25e6 Haskell: Added haskellPackages.shellFor 2018-03-06 16:34:05 -05:00
Peter Simons
f4b757bd3d haskell-changelogged: add override to fix the build 2018-03-06 21:10:39 +01:00
Peter Simons
ebfecf3e76 hackage-packages.nix: automatic Haskell package set update
This update was generated by hackage2nix v2.8.2-10-g32cfe74 from Hackage revision
d14774a67e.
2018-03-06 21:10:34 +01:00
Peter Simons
6568cbc1bb hackage-packages.nix: automatic Haskell package set update
This update was generated by hackage2nix v2.8.2-8-g0aa23ac from Hackage revision
4caf6826b1.
2018-03-05 16:45:01 +01:00
Peter Simons
ff45358a3c LTS Haskell 10.8 2018-03-05 16:44:23 +01:00
Peter Simons
1b0c67259e haskell: cosmetic changes to the generic builder 2018-03-05 16:44:23 +01:00
Vladimír Čunát
565bd805e6
Merge branch 'master' 2018-03-05 14:53:27 +01:00
Shea Levy
62a1abe204
haskellPackages.callCabal2nix: Depend on the expression.
This ensures that as long as the package derivation is alive, its nix
expressions do not need to be regenerated.

Fixes #36190.
2018-03-02 09:37:02 -05:00
Peter Simons
8b537488a5 git-annex: update sha256 hash for the new version 2018-03-01 21:56:35 +01:00
Peter Simons
5d4db65494 hackage-packages.nix: automatic Haskell package set update
This update was generated by hackage2nix v2.8.2-6-g7dfce29 from Hackage revision
292d228e71.
2018-03-01 21:56:28 +01:00
Dominic Steinitz
d1ac8d1e1a Merge branch 'master' of https://github.com/NixOS/nixpkgs 2018-03-01 09:14:18 +00:00
Dominic Steinitz
183c3603fa No longer needed and causes confusion 2018-03-01 09:11:45 +00:00
Shea Levy
7f623cfa45
callCabal2nix: Fix filtering for non-cleanSourceable sources.
What was here before wasn't correct anyway, and now it works in
restricted mode.

Fixes #35207
2018-02-28 14:22:19 -05:00
Kosyrev Serge
f9c952f39c
ghc84: remove unused overrides & minor proof updates 2018-02-28 02:17:44 +03:00
Kosyrev Serge
fe5183105a
ghc84 | cabal2nix: ghc84 needs its own very fixed hpack 2018-02-27 15:11:13 +03:00
Peter Simons
8c0a1c87d1
Merge pull request #35661 from deepfire/ghc-8.4
ghc841 | hpack:  SMP fix unmerged
2018-02-26 20:15:06 +01:00
Peter Simons
6f144177f1 hackage-packages.nix: automatic Haskell package set update
This update was generated by hackage2nix v2.8.2-6-g7dfce29 from Hackage revision
70475ad0ea.
2018-02-26 14:26:42 +01:00
Peter Simons
cf4b8c6b7a LTS Haskell 10.7 2018-02-26 14:26:29 +01:00
Kosyrev Serge
f5858af1bc
ghc841 | hpack: SMP fix unmerged 2018-02-26 01:36:00 +03:00
Nikolay Amiantov
f6925dbdd8 opencv3: enable contrib by default 2018-02-25 22:24:10 +03:00
Jan Tojnar
a31d98f312
tree-wide: autorename gnome packages to use dashes 2018-02-25 17:41:16 +01:00
Kosyrev Serge
18fa78c539
ghc841 | tar: upstream fix not on Hackage yet 2018-02-25 07:38:19 +03:00
Kosyrev Serge
673785d18a
ghc841 | text-lens: new failure with bumped GHC 2018-02-25 06:58:32 +03:00
Kosyrev Serge
00b24f7a69
ghc841 | x509/x509-store: SMP fix PR unmerged 2018-02-25 04:11:33 +03:00
Kosyrev Serge
65169aac88
ghc841 | uri-bytestring: TH boundaries fix author made no PR yet 2018-02-25 04:11:32 +03:00
Kosyrev Serge
2201ba1a5b
ghc841 | tls: SMP fix unmerged 2018-02-25 04:11:32 +03:00
Kosyrev Serge
746b36c863
ghc841 | http-api-data: SMP fix not on hackage yet 2018-02-25 04:11:32 +03:00
Alexander V. Nikolaev
0acec7e984 treewide: transition mesa to libGLU_combined 2018-02-24 17:06:49 +02:00
Alexander V. Nikolaev
8f2a22935c treewide: transition from mesa_noglu to libGL 2018-02-24 17:03:46 +02:00
Kosyrev Serge
a5078286e6
ghc84: deriving-compat and hnix 2018-02-24 04:51:36 +03:00
Peter Simons
2e45e280cb haskell-doctest: the 0.14.1 test suite fails on NixOS 2018-02-23 18:08:09 +01:00
Peter Simons
fa6272678d haskell-stringbuilder: drop obsolete override for GHC 8.4.x 2018-02-23 17:58:18 +01:00
Peter Simons
81a9442fd0 haskell-language-c: drop unused version 0.7.0 2018-02-23 17:58:18 +01:00
Peter Simons
b5454a1380 haskell-doctest: update ghc 8.4.x version to 0.14.1 2018-02-23 17:58:18 +01:00
Michael Alan Dorman
f7ab190096 language-c: remove now-unnecessary overrides 2018-02-23 17:58:18 +01:00
Peter Simons
d035fc1e76 haskell-parsec: fix build with GHC 7.10.x 2018-02-23 17:58:17 +01:00
Peter Simons
d87fcc7d43 haskell-reflect: fix build with GHC 7.10.x 2018-02-23 17:58:17 +01:00
Peter Simons
a6b30cb43d hackage-packages.nix: automatic Haskell package set update
This update was generated by hackage2nix v2.8.2-6-g7dfce29 from Hackage revision
d165ed5500.
2018-02-23 17:57:58 +01:00
Peter Simons
d544c454bd LTS Haskell 10.6 2018-02-23 17:57:57 +01:00
Kosyrev Serge
24777b86d8
configuration-ghc84: import manually-defined overrides and update 2018-02-22 01:31:33 +03: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
3cc9445e56 haskell-test-framework-quickcheck2: jailbreak to support ghc-8.4.x 2018-02-20 17:23:05 +01:00
Peter Simons
020471ee6c haskell-optparse-applicative: fix build with ghc-8.4.x 2018-02-20 17:23:04 +01:00
Peter Simons
af173130c6 haskell-here: jailbreak for ghc-8.4.x 2018-02-20 17:23:04 +01:00
Peter Simons
d6f37ff0a5 haskell-doctest: use the latest version when compiling with GHC 8.4.x
This change also requires us to use the latest QuickCheck version in the GHC
8.4.x package set.

Furthermore, the latest version of doctest has a broken test suite that needs
to be disabled for the build to succeed.
2018-02-20 17:21:48 +01:00
Peter Simons
a3c1a66ed7 liquidhaskell: drop obsolete override 2018-02-20 17:21:47 +01:00
Peter Simons
8cfaa55d67 hackage-packages.nix: automatic Haskell package set update
This update was generated by hackage2nix v2.8.2-5-gbde1863 from Hackage revision
98679850f4.
2018-02-20 17:21:41 +01:00
Peter Simons
0d7740870d hackage2nix: disable broken Hydra builds 2018-02-20 17:21:21 +01:00
Kosyrev Serge
060f2f99db
ghc 8.4: update configuration 2018-02-19 23:31:50 +03:00
Peter Simons
25ee2516c2 haskell-generic-builder: simplify outputs attribute logic
The arguments cannot contain outputs, so the if-then-else here is pointless.
2018-02-16 16:54:16 +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
194d61bfca haskell-JuicyPixels: drop obsolete override for ghc-8.4.x 2018-02-16 10:39:59 +01:00
Peter Simons
02e8ee8a80 haskell-th-lift: drop obsolete override for ghc-8.4.x 2018-02-16 10:39:59 +01:00
Peter Simons
1f53e710ec haskell-tasty: update override for latest version used by ghc-8.4.x 2018-02-16 10:39:59 +01:00
Peter Simons
b787aacade hackage-packages.nix: automatic Haskell package set update
This update was generated by hackage2nix v2.8.2-1-g66cb4b6 from Hackage revision
71e6c26026.
2018-02-16 10:39:54 +01:00
Tuomas Tynkkynen
1a06373c0a Merge remote-tracking branch 'upstream/master' into staging
Conflicts:
	pkgs/development/libraries/libclc/default.nix
	pkgs/top-level/all-packages.nix
2018-02-13 16:42:55 +02:00
Peter Simons
afb83e0e03 multi-ghc-travis: update to current Git master 2018-02-13 10:57:40 +01:00
Peter Simons
4b39930ee6 Update hspec family packages to 2.4.8 when building with GHC 8.4.x. 2018-02-13 10:18:19 +01:00
Peter Simons
be676705e3 hackage-packages.nix: automatic Haskell package set update
This update was generated by hackage2nix v2.8-24-g7642d25 from Hackage revision
dc11df52c5.
2018-02-13 10:18:14 +01:00
Peter Simons
47adc4eb8e LTS Haskell 10.5 2018-02-13 10:17:56 +01:00
Will Fancher
627444cfc2 Use static cabal2nix in callCabal2nix 2018-02-11 18:33:20 -05:00
Daiderd Jordan
69779a5f7e
Merge pull request #33374 from dtzWill/update/llvm-5-default
Update LLVM default 4 -> 5
2018-02-11 18:29:26 +01:00
Shea Levy
32085eafa1 haskell-hpio: disable test suite to fix the build 2018-02-10 18:10:47 +01:00
Shea Levy
b0270dfcec haskell-securemem: fix build with GHC 8.4 2018-02-10 18:10:47 +01:00
Shea Levy
74bde7e20a haskell-deepseq-generics: fix build on ghc 8.4 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
15344506cc haskell-funcmp: Fix build on GHC 8.4 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
36a095e27e haskell-contravariant: fix build on GHC 7.10.x 2018-02-10 18:05:28 +01:00
Peter Simons
1d4529c7e2 cabal2nix: compile with hpack 0.25.0 2018-02-10 18:05:28 +01:00
Peter Simons
c8bc6163c0 hackage-packages.nix: automatic Haskell package set update
This update was generated by hackage2nix v2.8-24-g7642d25 from Hackage revision
ddb881454b.
2018-02-10 18:05:23 +01:00
Peter Simons
52628a27e7 hackage2nix: disable broken builds 2018-02-10 18:05:21 +01:00
Peter Simons
13dda44b8b haskell-with-packages-wrapper: don't bother with extraOutputsToInstall
symlinkJoin doesn't recognize this parameter, so this functionality has been
broken ever since 4b77d425aa.
2018-02-09 20:26:35 +01:00
Peter Simons
2c13435734 haskell-generic-builder: revert "set LD_LIBRARY_PATH in shellHook"
This reverts commit e73e5c884f. Please don't
set $LD_LIBRARY_PATH! Instead, pass appropriate --extra-include-dir and
--extra-lib-dir arguments to "cabal configure" to ensure that Cabal knows
about system dependencies.
2018-02-09 19:56:20 +01:00
Peter Simons
bd3379c443 haskell-generic-builder: include build-tool dependencies in shell environments
For a Haskell package "foo" the environment foo.env now contains the build tool
dependencies required for compiling the package in $PATH.

Fixes https://github.com/NixOS/cabal2nix/issues/331.
2018-02-09 19:56:20 +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
Daiderd Jordan
db7e0aeb42
llvm-packages: cleanup 2018-02-06 23:38:46 +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
Peter Simons
a9268dd694
Merge pull request #34404 from deepfire/x-ghc-8.4-overrides
GHC 8.4 package overrides
2018-02-06 10:01:15 +01:00
Kosyrev Serge
ae1e9fbf87
ghc841 configuration: overrides 2018-02-06 05:33:07 +03: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
77e074829b hackage-packages.nix: automatic Haskell package set update
This update was generated by hackage2nix v2.8-24-g7642d25 from Hackage revision
2499b1e31f.
2018-02-04 10:52:48 +01:00
Peter Simons
3ac304963c hackage2nix: use latest version of weeder by default 2018-02-04 10:52:18 +01:00
Shea Levy
943592f698
Add setFunctionArgs lib function.
Among other things, this will allow *2nix tools to output plain data
while still being composable with the traditional
callPackage/.override interfaces.
2018-01-31 14:02:19 -05:00
Peter Simons
6f93e0f749 fix GHC 8.4.x builds of hspec and test-framework 2018-01-31 16:03:59 +01:00
Peter Simons
866a1ed2d5 cabal2nix: build with hpack 0.23 2018-01-31 16:03:59 +01:00
Peter Simons
94b6357dc5 hackage-packages.nix: automatic Haskell package set update
This update was generated by hackage2nix v2.8-20-g7c22fdf from Hackage revision
d0f20cf258.
2018-01-31 16:03:54 +01:00
Peter Simons
b063a02320 LTS Haskell 10.4 2018-01-31 16:03:50 +01:00
pjan vandaele
bdffbc775e
Adds modifier option to developPackage 2018-01-30 12:29:59 +09: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
b83990dd76 haskell-hie-packages: disable broken Hydra builds 2018-01-26 13:01:12 +01:00
Peter Simons
71c76eadff hackage2nix: disable broken Hydra builds 2018-01-26 13:01:12 +01:00
Peter Simons
f8776eabdd cabal2nix: build with latest version of hpack 2018-01-26 13:01:12 +01:00
Peter Simons
4ec557eea9 hackage-packages.nix: automatic Haskell package set update
This update was generated by hackage2nix v2.8-16-gec0f902 from Hackage revision
6b78792753.
2018-01-26 13:01:12 +01:00