Commit Graph

2927 Commits

Author SHA1 Message Date
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
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
05723c4d97 hackage-packages.nix: automatic Haskell package set update
This update was generated by hackage2nix v2.8-15-g0d15053 from Hackage revision
0d7f6b72e9.
2018-01-26 13:01:11 +01:00
Peter Simons
edf1d07173 hackage2nix: disable broken Hydra builds 2018-01-26 13:01:11 +01:00
Peter Simons
83b35508c6 hackage-packages.nix: automatic Haskell package set update
This update was generated by hackage2nix v2.8-11-g68a143c from Hackage revision
ddb65ce29d.
2018-01-26 13:01:11 +01:00
Peter Simons
f9700df56a lambdabot-core: add myself as a maintainer 2018-01-26 13:01:10 +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
da7833e7e6 cabal2spec: add myself as a maintainer 2018-01-26 13:01:10 +01:00
Peter Simons
eb5d7d2b26 haskell-lambdabot: fix build 2018-01-23 16:09:29 +01:00
John Ericson
ec0c4802ae
Merge pull request #26799 from obsidiansystems/cross-haskell
haskell infra: Fix cross compilation to work with new system
2018-01-22 15:31:19 -05:00
Peter Simons
699d715f24 haskell-nix-paths: fix bogus dependencies 2018-01-22 08:47:00 +01:00
Ben Gamari
bf687907d7 haskell lib: Make Cabal compiler names explicit
Cabal2nix expects a --compiler flag that contains a Cabal Compiler description.
We used to use the compiler's derivation name for this, but this breaks when
cross-compiling due to the target suffix. Instead we add an explicit
haskellCompilerName attribute to Haskell compiler derivations.
2018-01-21 23:31:05 -05:00
John Ericson
81553124cf haskell infra: nativeGhc != ghc.bootPkgs.ghc
There's no reason to wait for non-binary native to *build* cross ghc,
but we want a nix-built GHC for Setup.hs or things won't work.
2018-01-21 23:31:04 -05:00
John Ericson
54ead73271 generic-builder: Make GHC a proper dependency
Rather than just sticking it on the PATH
2018-01-21 23:27:38 -05: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
Peter Simons
dcf3699b0b hackage-packages.nix: automatic Haskell package set update
This update was generated by hackage2nix v2.8-7-gfbcdc2a from Hackage revision
70d584c0a5.
2018-01-20 21:40:40 +01:00
Peter Simons
9688c0eab7 haskell-hlint: use latest version by default 2018-01-20 21:40:39 +01:00
Peter Simons
a8d9a94574 haskell.lib.markBroken: explicitly disable Hydra builds
Recent changes [1] allow Hydra to build packages that are marked broken. To
avoid plenty of evaluation errors on Hydra, explicitly disable Hydra builds of
broken packages.

[1] https://github.com/NixOS/nixpkgs/issues/7541#issuecomment-357541243
2018-01-20 21:40:38 +01:00
Peter Simons
8bf8581b9a hackage2nix: disable broken Hydra builds
- Ping @abbradar for broken lambdabot.
- Ping @alunduil for broken collection-json and siren-json.
2018-01-20 21:40:08 +01:00
Kosyrev Serge
8d027c1113
ghc841: GHC 8.4.1: nix-shell -p haskell.compiler.ghc841 2018-01-19 16:06:02 +03: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
Peter Simons
3b54c5f483 hackage-packages.nix: automatic Haskell package set update
This update was generated by hackage2nix v2.8-3-g1ab3260 from Hackage revision
6aedac1525.
2018-01-19 12:53:11 +01:00
Will Fancher
9047a7dd33 Move packageSourceOverrides to haskellLib 2018-01-18 16:42:56 -05:00
Jan Tojnar
c278dd0b9d
bustle: re-enable hgettext support
hgettext 0.1.31.0 builds again
2018-01-18 22:13:57 +01:00
Shea Levy
f12f2ed44c
haskell-ide-engine: Fix build in sandbox 2018-01-18 12:02:29 -05: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