Commit Graph

2174 Commits

Author SHA1 Message Date
Peter Simons
baea6a8d82 Merge pull request #20619 from Profpatsch/ghcWithHoogle-empty-packagelist
haskell/hoogle.nix: make an empty packages list possible
2016-11-25 19:21:23 +01:00
Profpatsch
b8a69aaba9 haskell/hoogle.nix: make an empty packages list possible
Building hoogle environments with an empty list of packages threw a built-time
error. This was particularly confusing when giving e.g. `(hps: [hps.Cabal])`
which, since `Cabal` is set to `null` (because it’s a distribution package),
would have lead to the same error as an empty list.

It was not useful to throw an error at all, because sometimes one only wants to
build an environment for the distribution packages; also the default value for
packages wasn’t even a valid value, so it is removed.
2016-11-24 12:31:58 +01:00
Peter Simons
88fa370992 Merge pull request #20652 from Profpatsch/hdbc-odbc-haddock
haskellPackages: fix HDBC-odbc haddockPhase
2016-11-23 20:35:14 +01:00
Peter Simons
91225b8ba2 hackage-packages.nix: automatic Haskell package set update
This update was generated by hackage2nix v2.0.3-4-g1dfbad0 from Hackage revision
58a16d64a7.
2016-11-23 17:29:45 +01:00
Peter Simons
a02be6517a LTS Haskell 7.10 2016-11-23 17:29:27 +01:00
Profpatsch
54f8379321 haskellPackages: fix HDBC-odbc haddockPhase 2016-11-23 16:21:59 +01:00
Rodney Lorrimar
de2f9d6719 haskellPackages.ghcjs-dom: Add overrides (#20474) 2016-11-21 20:51:59 +01:00
Michael Alan Dorman
9cca22873a git-annex: fixup sha256 for new version 2016-11-21 09:55:59 +01:00
Peter Simons
f4cf7638fd hackage-packages.nix: automatic Haskell package set update
This update was generated by hackage2nix v2.0.3-4-g1dfbad0 from Hackage revision
b21c267fad.
2016-11-21 09:55:53 +01:00
Pascal Wittmann
515974a66b haskellPackages.ReadArgs: jailbreak to fix build
fixes #20515
2016-11-20 21:41:55 +01:00
obadz
c1b919ff5c haskellPackages.ghc-core: 0.5.6 -> 2012-12-15 2016-11-20 16:25:54 +00:00
Nikolay Amiantov
5bfaa2d3ad lambdabot: fix to use new haskell-src-exts 2016-11-20 19:09:03 +03:00
Shea Levy
f198e4f52a socket-0.7.0.0: Pass new version of QuickCheck 2016-11-19 19:28:46 -05:00
Vladimír Čunát
2aea31b52e
Merge branch 'staging' 2016-11-19 21:55:26 +01:00
Profpatsch
786c13c884 Merge pull request #20534 from Profpatsch/ghcjs-sort-configuration
Ghcjs sort configuration
2016-11-19 14:28:43 +01:00
Shea Levy
64ec4dd87b Add haskell packages set for cross ghc 2016-11-18 10:44:53 -05:00
Profpatsch
06e0bac814 haskell/ghcjs: sort ghcjs packages alphabetically 2016-11-18 16:38:04 +01:00
Profpatsch
a7043808dd haskell/ghcjs: patch Safe out of fast-logger 2016-11-18 16:24:37 +01:00
Profpatsch
247d7c88d2 haskell.packages.ghcjs: fix entropy (#20446) 2016-11-18 16:17:14 +01:00
Peter Simons
80daa953c4 hackage-packages.nix: automatic Haskell package set update
This update was generated by hackage2nix v2.0.3-3-g5c816fd from Hackage revision
75f785093e.
2016-11-18 09:51:24 +01:00
Peter Simons
4306a53756 Declare "ghcjs-base" as a compiler-provided core package.
This change fixes several GHCJS-related packages in our Hackage database.

Cc: @Profpatsch
2016-11-18 09:51:14 +01:00
Peter Simons
29662304df configuration-hackage2nix.yaml: disable broken builds
Ping @abbradar because of broken lambdabot.
2016-11-18 09:51:06 +01:00
Peter Simons
0816860785 Merge pull request #20463 from Profpatsch/with-packages-drv-naming
ghc.withPackages: amend the derviation name
2016-11-17 17:09:28 +01:00
Profpatsch
499e4e6393 ghc.withPackages: amend the derviation name
Provide a clear difference between the compiler itself and link farms containing
additional packages.
2016-11-17 16:48:53 +01:00
Shea Levy
3995655d2c Revert "Merge pull request #17145 from kalhauge/haskell_darwin_dyld"
This fix doesn't actually fix the cabal bug (see #16357), but it does
cause other bugs (see #20476)

Fixes #20476

This reverts commit b89fa5fd5c, reversing
changes made to e4b146b041.
2016-11-17 07:25:42 -05:00
Peter Simons
fcb6a18f37 haskell-http-api-data: fix reference in configuration-common.nix 2016-11-16 11:16:10 +01:00
Peter Simons
1e43c159e2 hackage-packages.nix: automatic Haskell package set update
This update was generated by hackage2nix v2.0.3-3-g5c816fd from Hackage revision
4196e3bc37.
2016-11-16 11:16:02 +01:00
Peter Simons
734bd22f1b LTS Haskell 7.9 2016-11-16 11:15:13 +01:00
Michael Alan Dorman
7daf0b8b6e git-annex: update sha256 for new version 2016-11-14 10:04:15 +01:00
Peter Simons
92df69fb22 hackage-packages.nix: automatic Haskell package set update
This update was generated by hackage2nix v2.0.3-3-g5c816fd from Hackage revision
5e084e904a.
2016-11-14 10:04:05 +01:00
Peter Simons
cb07aea0bd haskell-STMonadTrans: disable failing test suite to fix the build
Closes https://github.com/NixOS/nixpkgs/issues/20309.
2016-11-10 18:15:35 +01:00
Peter Simons
6a53da63b3 haskell-http-client: update reference in configuration-common.nix 2016-11-10 18:15:35 +01:00
Peter Simons
b15dec170a hackage-packages.nix: automatic Haskell package set update
This update was generated by hackage2nix v2.0.3-3-g5c816fd from Hackage revision
ea775f0608.
2016-11-10 18:15:35 +01:00
Peter Simons
cef68b475e haskell-diff-parse: jailbreak to fix test suite build 2016-11-09 08:47:27 +01:00
Peter Simons
d268cef94a haskell-distributed-process-tests: don't run tests on Hydra 2016-11-07 08:36:20 +01:00
Peter Simons
488e460f27 configuration-common.nix: update reference to http-client_0_5_3_4 2016-11-07 08:36:00 +01:00
Peter Simons
d9c3f3fbaf haskell-Cabal: update from 1.24.0.0 to 1.24.1.0 2016-11-07 08:36:00 +01:00
Peter Simons
5dd3c22717 hackage-packages.nix: automatic Haskell package set update
This update was generated by hackage2nix v2.0.3-3-g5c816fd from Hackage revision
17853c139c.
2016-11-07 08:36:00 +01:00
Peter Simons
cefc24bf69 hackage-packages.nix: automatic Haskell package set update
This update was generated by hackage2nix v2.0.3-3-g5c816fd from Hackage revision
d2b9c38a11.
2016-11-07 08:36:00 +01:00
Peter Simons
b69ef90fe7 Update to LTS Haskell 7.8. 2016-11-07 08:35:59 +01:00
Profpatsch
77f6453fe8 haskellPackages: libsystemd-journal unjailbreak
upper bound got fixed
2016-11-05 20:55:23 +01:00
Nikolay Amiantov
dd8f60fbd9 haskellPackages.dbus: fix for new DBUS_SESSION_BUS_ADDRESS format 2016-11-05 14:45:40 +03:00
Peter Simons
6a76ee237d haskell-hoogle doesn't work with haskell-src-exts-1.19.x. 2016-11-04 21:29:58 +01:00
Peter Simons
7b26af844f hackage-packages.nix: automatic Haskell package set update
This update was generated by hackage2nix v2.0.3-3-g5c816fd from Hackage revision
780f9e49c9.
2016-11-04 21:29:50 +01:00
Peter Simons
43f2c86eee configuration-hackage2nix.yaml: add older version of haskell-src-exts for hoogle 2016-11-04 21:29:49 +01:00
Peter Simons
b137b8d1aa hackage-packages.nix: automatic Haskell package set update
This update was generated by hackage2nix v2.0.3-3-g5c816fd from Hackage revision
ed04e9f186.
2016-11-03 17:42:22 +01:00
Peter Simons
4ba3605260 configuration-hackage2nix.yaml: enable hledger-* test builds
Closes https://github.com/NixOS/nixpkgs/issues/20076.
2016-11-03 17:37:21 +01:00
Peter Simons
6fe22c643b haskell-servant: fix build of latest version
Closes https://github.com/NixOS/nixpkgs/pull/20068.
2016-11-03 17:37:20 +01:00
Peter Simons
b84f2a5165 Cosmetic. 2016-11-03 17:37:20 +01:00
Peter Simons
dbeb3f357c haskell-hspec-discover: enable the Haddock documentation again 2016-11-03 17:37:20 +01:00
Peter Simons
0018599a26 haskell-hoogle: use latest version by default 2016-11-03 17:37:19 +01:00
Peter Simons
38dc05fd06 Update hoogle and structured-haskell-mode to latest version of haskell-src-exts. 2016-11-03 17:37:19 +01:00
Peter Simons
c6cd4ee35d configuration-hackage2nix.yaml: update list of broken builds 2016-11-03 17:34:23 +01:00
Peter Simons
306953581d haskell-swagger: disable Haddock phase
Citing from http://hydra.cryp.to/build/2035868/nixlog/1/raw:

  haddock: internal error: spliceURL UnhelpfulSpan
2016-11-03 17:34:22 +01:00
Peter Simons
ed9f1c575b git-annex: update version 2016-11-03 17:34:21 +01:00
Peter Simons
a170fb2340 LTS Haskell 7.7 2016-11-03 17:34:21 +01:00
Peter Simons
a0cad9ad75 LTS Haskell 7.6 2016-11-03 17:32:27 +01:00
Profpatsch
5c197b2e38 haskellPackages: mark sindre broken 2016-11-02 16:22:29 +01:00
Profpatsch
83317f7d04 haskellPackages: fix libsystemd-journal 2016-11-02 01:11:10 +01:00
Peter Simons
fac1168816 callHackage: make 'all-cabal-hashes' repository overridable
This commit changes callHackage to use a deterministic version of the Hackage
checkout from https://github.com/commercialhaskell/all-cabal-hashes by default.
This means that packages uploaded to Hackage after today will be available to
callHackage only after "pkgs/data/misc/hackage/default.nix" has been updated.

People who want the previous behavior where we always had the latest version of
Hackage available -- at the cost of frequent downloads from Github --, can add
the following override to their "~/.nixpkgs/config.nix" file:

  {
    packageOverrides = super: {
      all-cabal-hashes = builtins.fetchTarball "https://github.com/commercialhaskell/all-cabal-hashes/archive/hackage.tar.gz";
    };
  }
2016-11-01 18:35:19 +01:00
Joachim Fasting
31f8367c67
haskellPackages.dataenc: jailbreak
Relaxes overly strict bounds on base (3 > && < 4.8).  The dataenc
package is unmaintained so there is no corresponding upstream issue.
2016-11-01 13:30:50 +01:00
Rickard Nilsson
6bbdad7d11 haskell-xxhash: Use doJailbreak instead of sed 2016-11-01 11:34:14 +01:00
Rickard Nilsson
58707589d2 haskell-xxhash: fix build with GHC 8.x 2016-11-01 11:01:51 +01:00
Shea Levy
4df3bb7e08 store-0.3: Build with the right version of store-core 2016-10-30 11:29:07 -04:00
Peter Simons
0cf03e02ae git-annex: update to latest version
(cherry picked from commit b6df43a2df3c1b998a3c4ce5fb1e54a1691e3f41)
2016-10-28 16:52:51 +02:00
Peter Simons
4cfc164256 haskell-titlecase: drop obsolete overrides
(cherry picked from commit 118efe87b99cf475e6bcf2a559f4e23f4ab3f94f)
2016-10-28 16:52:51 +02:00
Peter Simons
2a19aea54a haskell-stack: fix evaluation
(cherry picked from commit 9c31962c075933b6dae6ef5374f01768fe7a892b)
2016-10-28 16:52:51 +02:00
Peter Simons
e0ef9e9714 hackage-packages.nix: automatic Haskell package set update
This update was generated by hackage2nix v2.0.3 from Hackage revision
bb6bb10d46.
2016-10-28 16:52:50 +02:00
Peter Simons
00659b83a3 LTS Haskell 7.5
(cherry picked from commit a6445ace6f978d865eaeb1683709eb28d9d1f5c7)
2016-10-28 16:51:52 +02:00
Joachim Fasting
620b364a87
haskellPackages.wai-app-file-cgi: fix build
Fixes https://github.com/NixOS/nixpkgs/issues/19611
Fixes https://github.com/NixOS/nixpkgs/issues/19612
2016-10-28 16:32:27 +02:00
John Wiegley
c60b3e4bfc
haskellPackages.hakyll: Fix the Darwin build (broken tests) 2016-10-27 15:10:39 -07:00
Pierre Radermecker
95b95ffc85 hackage2nix: add hruby x86_64-linux to hydra 2016-10-25 22:51:06 +02:00
Peter Simons
e5db8068fa hackage-packages.nix: automatic Haskell package set update
This update was generated by hackage2nix v2.0.2-12-g87e23de from Hackage revision
19c7074b55.
2016-10-20 13:40:10 +02:00
Peter Simons
f3e994e8be haskell-titlecase: fix build with GHC 8.0.x 2016-10-20 13:40:10 +02:00
Peter Simons
6a35164874 haskell: drop obsolete jailbreaking overrides 2016-10-20 13:40:10 +02:00
Peter Simons
ad81560afc structured-haskell-mode: update to latestt Git revision
This update makes our local patches obsolete.
2016-10-20 13:40:10 +02:00
Michael Alan Dorman
a70e11adbf haskellPackages: jailbreak terminal-progress-bar 2016-10-18 18:02:40 +02:00
Peter Simons
56ea4f8098 haskell-stack: fix build 2016-10-18 18:02:40 +02:00
Peter Simons
3af8c6e306 git-annex: enable test suite again 2016-10-18 18:02:40 +02:00
Peter Simons
3ce999416a hackage-packages.nix: automatic Haskell package set update
This update was generated by hackage2nix v2.0.2-12-g87e23de from Hackage revision
19c7074b55.
2016-10-18 18:02:33 +02:00
Peter Simons
db6b964290 Update to LTS Haskell 7.4 2016-10-18 18:01:35 +02:00
Aristid Breitkreuz
64b2205bf4 ihaskell: partial fix, mark as broken 2016-10-16 12:27:46 +02:00
Bas van Dijk
79f6e39b93 cereal: fix build on ghcjs 2016-10-14 00:35:01 +02:00
Peter Simons
ea1a8cf5f0 git-annex: bump to latest version 2016-10-12 17:50:20 +02:00
Peter Simons
5925d14525 haddock-library: fix build with GHC 7.10.x
Required by GHCJS.
2016-10-12 16:52:41 +02:00
Peter Simons
7c1d952a56 hackage-packages.nix: automatic Haskell package set update
This update was generated by hackage2nix v2.0.2-12-g87e23de from Hackage revision
d009766695.
2016-10-12 16:52:41 +02:00
Peter Simons
8939e2a26b haskell-nvvm: disable build on Hydra since it depends on unfree cudatoolkit 2016-10-12 16:52:40 +02:00
Peter Simons
c69f058ee2 configuration-hackage2nix.yaml: add old version of haddock-library
This is required by haddock-api 2.16.x.
2016-10-12 16:51:47 +02:00
Peter Simons
71e4613e78 LTS Haskell 7.3 2016-10-12 16:51:47 +02:00
Peter Simons
7e0dc5ab69 Merge pull request #19394 from aherrmann/pr_diagrams_pgf
haskell-diagrams-pgf: fix build
2016-10-09 17:18:41 +02:00
Andreas Herrmann
7c741722e2 diagrams-pgf: Fix dependencies 2016-10-09 17:07:17 +02:00
Andreas Herrmann
50aff7e07b texrunner: Fix build
Tests fail due to nonexistent tex executables.
2016-10-09 15:39:05 +02:00
Peter Simons
b59b89d9e3 Revert "Extend Haskell generic builder to use new --ipid flag."
This reverts commit ec8b816154. The change told
the Cabal build system to use the hash-part of $out as the internal identifier
for the library it's building (rather than generating such an ID itself). While
a good idea in theory, this choice had an unfortunate side-effect: When Cabal
links libraries X, Y, and Z into an executable, then the generated binary
contains their respective IDs. Now, Nix finds those strings and treats them as
an indication that there is a *run-time dependency* on the corresponding store
paths. This means that the generated executable will always depend on the store
paths of all the Haskell libraries that went into it, even when linked
statically.
2016-10-08 10:45:48 +02:00
Theodore Witkamp
d4566400c9 haskellPackage.wai-cors: Disable cabal check
External program is used in tests.
2016-10-05 17:04:35 -07:00
Peter Simons
82d32feda9 haskell: jailbreak some packages to fix builds in LTS 7.x 2016-10-05 21:07:29 +02:00
Peter Simons
e9d7f0d945 haskell-attoparsec: fix build with GHC 7.10.x
Closes https://github.com/NixOS/nixpkgs/issues/19270.
2016-10-05 21:07:29 +02:00
Peter Simons
75df6107da haskell-configuration-ghc-7.10.x: drop obsolete overrides 2016-10-05 21:07:29 +02:00
Peter Simons
2a2a3c796a callHackage: ensure we're always using the latest available Hackage database 2016-10-05 19:05:50 +02:00
Peter Simons
ec8b816154 Extend Haskell generic builder to use new --ipid flag. 2016-10-05 09:46:53 +02:00
Peter Simons
4e576faa1c hackage-packages.nix: automatic Haskell package set update
This update was generated by hackage2nix v2.0.2-11-g4585b46 from Hackage revision
ad51461d4d.
2016-10-05 09:46:53 +02:00
Peter Simons
79f92f00f9 haskell-vector: jailbreak to fix test suite build 2016-10-02 23:44:00 +02:00
Peter Simons
e3cc3de334 hackage-packages.nix: automatic Haskell package set update
This update was generated by hackage2nix v2.0.2-10-g950a7f4 from Hackage revision
1aa9f5de46.
2016-10-02 23:43:54 +02:00
Peter Simons
0dc9600107 configuration-hackage2nix.yaml: update to LTS 7.2
Also update list of broken builds.
2016-10-02 23:43:29 +02:00
Peter Simons
8b5c1190d6 haskell-store: disable spuriously failing test suite 2016-10-01 19:37:13 +02:00
Peter Simons
26a7e0784f haskell-stack: fix build of the new version 2016-09-30 22:11:40 +02:00
Peter Simons
8911857fd4 hackage-packages.nix: automatic Haskell package set update
This update was generated by hackage2nix v2.0.2-9-gc0b597f from Hackage revision
9ca479bb22.
2016-09-30 15:08:20 +02:00
Peter Simons
d09227fb33 configuration-hackage2nix.yaml: drop versions restrictions on stack and cabal2nix 2016-09-30 15:08:10 +02:00
Peter Simons
1fe5deb62b Merge pull request #19042 from Profpatsch/ghcjs-package-fixes
packages.ghcjs: fix a few packages
2016-09-28 16:15:37 +02:00
Peter Simons
6c59acc8ae hackage-packages.nix: automatic Haskell package set update
This update was generated by hackage2nix v2.0.2-8-g5f3e95b from Hackage revision
2bcfb7bba6.
2016-09-28 16:02:07 +02:00
Profpatsch
308cd1abad packages.ghcjs: fix a few packages
dependencies for http2 & semigroups
jailbreak for protolude
no docs for wai
2016-09-28 15:51:53 +02:00
Peter Simons
74434e4ab1 git-annex: update to latest version 2016-09-27 14:09:15 +02:00
Peter Simons
8df6e25305 hackage-packages.nix: automatic Haskell package set update
This update was generated by hackage2nix v2.0.2-5-gabba389 from Hackage revision
c330477077.
2016-09-27 14:09:09 +02:00
Peter Simons
9b72cacc48 configuration-hackage2nix: update to LTS Haskell 7.1 2016-09-27 14:08:21 +02:00
Peter Simons
31d2e2c3a5 hackage-packages.nix: automatic Haskell package set update
This update was generated by hackage2nix v2.0.2-5-gabba389 from Hackage revision
f3f5c19aa1.
2016-09-26 08:45:22 +02:00
Peter Simons
d126fbb89c hindent: don't try to byte compile elisp files
We don't have an up-to-date version of haskell-mode in Nix, which is a
dependency of that build.
2016-09-26 08:43:23 +02:00
Peter Simons
6ea55715b6 structured-haskell-mode: apply patches to fix the build 2016-09-26 08:43:23 +02:00
Peter Simons
0d38ff9d37 structured-haskell-mode: cosmetic 2016-09-26 08:43:23 +02:00
Peter Simons
24b64aab0f structured-haskell-mode: use output from "git describe" to identify the version 2016-09-26 08:43:23 +02:00
Peter Simons
8967a3f798 structured-haskell-mode: bump to latest git version
Hopefully, this will achieve support for Emacs 25.x.
2016-09-26 01:20:31 +02:00
Rodney Lorrimar
f318d62b5f haskellPackages.hasql-transaction: disable failing test suite
The tests want to connect to a postgresql server at localhost:5432.
2016-09-24 21:05:03 +01:00
Peter Simons
62606be9b0 haskell-hindent: disable failing test suite 2016-09-20 12:04:47 +02:00
Peter Simons
c999c9f636 haskell-mongoDB: disable failing test suite 2016-09-20 12:04:47 +02:00
Michael Alan Dorman
c3974031dd For the moment, we need a specific reference to 5.0.4
This will need to change if we stop arbitrarily tying "hoogle" to be
5.0.1.
2016-09-20 12:04:47 +02:00
Michael Alan Dorman
f16f2017ac Make hoogle-local compatible wih hoogle >= 5.0.4 2016-09-20 12:04:46 +02:00
Peter Simons
57f5d1b7a8 hackage-packages.nix: automatic Haskell package set update
This update was generated by hackage2nix v2.0.2-5-gabba389 from Hackage revision
3f3f95963d.
2016-09-20 12:04:42 +02:00
Peter Simons
ee0f2722b3 configuration-hackage2nix.yaml: disable broken builds to avoid evaluation errors 2016-09-20 12:04:41 +02:00
Moritz Ulrich
01e44ac1f9 emacs: 24.5 -> 25.1
This commit removes all references to emacs24 with the exception of
emacs24-macports. The two folders in `pkgs/applications/editors` named
`emacs-24` and `emacs-24` are consolidated to a new `emacs` folder.

Various parts in nixpkgs also referenced `emacs24Packages` (pinned to
`emacs24`) explicitly where `emacsPackages` (non-pinned) is more
appropriate. These references get fixed by this commit too.
2016-09-18 13:38:21 +02:00
Peter Simons
2b1fea120c idris: disable failing test suite 2016-09-18 12:14:49 +02:00
Peter Simons
806d96b6a3 git-annex: test suite fails, reported upstream 2016-09-18 12:14:49 +02:00
Peter Simons
59e0dff09f hoogle: remove obsolete override 2016-09-18 12:14:49 +02:00
Peter Simons
b7aad29806 hackage-packages.nix: automatic Haskell package set update
This update was generated by hackage2nix v2.0.2-3-g78b650c from Hackage revision
74dd7d3698.
2016-09-18 12:14:49 +02:00
Profpatsch
bfc710b0f5 haskellPackages/pontarius-xmpp: dontCheck 2016-09-17 20:36:44 +02:00
Peter Simons
1a51047c3c hackage-packages.nix: automatic Haskell package set update
This update was generated by hackage2nix v2.0.2 from Hackage revision
b76b355f94.
2016-09-17 17:57:04 +02:00
Peter Simons
ef4eb283a9 haskell-MemoTrie: disable failing Haddock stage 2016-09-17 17:57:02 +02:00
Peter Simons
9921e7ce96 xmonad: disable failing test suite 2016-09-17 17:57:01 +02:00
Peter Simons
70150639a8 haskell-spy: drop obsolete override 2016-09-17 17:57:01 +02:00
Peter Simons
2140aca679 haskell-hasktags: drop obsolete override 2016-09-17 17:57:01 +02:00
Peter Simons
99b5c0cb9b haskell: disable plenty of broken LTS-7.x test suites 2016-09-17 17:57:01 +02:00
Peter Simons
3e2b24a988 configuration-hackage2nix.yaml: add version constraints from LTS 7.0 2016-09-17 17:55:43 +02:00
Pierre Radermecker
a6fbd4e798 configuration-hackage2nix.yaml: language-puppet
enable for x86_64-linux only
2016-09-16 22:01:14 +02:00
Peter Simons
fabd60a397 hackage-packages.nix: update Haskell package set
This update was generated by hackage2nix v2.0.1-10-gca03454 using the following inputs:

  - Hackage: 0aa5f8d505
  - LTS Haskell: b5ee848475
2016-09-15 09:12:08 +02:00
Peter Simons
9123a0452d haskell: drop obsolete LTS package set
The default 'haskellPackages' set now corresponds to the latest
available version of LTS 7.x.
2016-09-15 09:12:04 +02:00
Peter Simons
6607b99168 haskell: port existing hardening overrides to use the new combinator 2016-09-15 09:12:03 +02:00
Peter Simons
97fd905823 haskell: add support for 'hardeningDisable' to the generic builder
We also have a new helper function 'disableHardening' to use in
overrides. Fixes https://github.com/NixOS/nixpkgs/issues/14820.
2016-09-15 09:12:03 +02:00
Peter Simons
aa1d424421 hackage-packages.nix: update Haskell package set
This update was generated by hackage2nix v2.0.1-9-g9d0fb31 using the following inputs:

  - Hackage: d68983aeb2
  - LTS Haskell: 36c0f4fa5e
  - Stackage Nightly: 8b258a761d
2016-09-15 09:12:02 +02:00
Peter Simons
af1d6e503e configuration-hackage2nix.yaml: make sure some old (but required) packages remain available
The switch to LTS 7.x has made many older versions obsolete and so they
are no longer included in our package set by default:

 - aeson-pretty 0.7.x
 - hoogle 4.x
 - persistent 2.2
 - persistent-sqlite 2.2
 - persistent-template 2.1
2016-09-15 09:11:04 +02:00
Nikolay Amiantov
c542e6d239 haskell: replace gnome mentions with gnome2 as a workaround to fix eval 2016-09-13 13:29:49 +03:00
Nikolay Amiantov
4748709926 Merge commit 'refs/pull/18498/head' of git://github.com/NixOS/nixpkgs 2016-09-13 12:51:34 +03:00
Peter Simons
4adbcc60fc configuration-hackage2nix.yaml: fix evaluation errors 2016-09-13 09:11:57 +02:00
Peter Simons
6780ac9d03 haskell-timezone-series: clean up overrides 2016-09-13 09:11:57 +02:00
Peter Simons
2f2243433f hackage-packages.nix: update Haskell package set
This update was generated by hackage2nix v2.0.1-8-g914b77b using the following inputs:

  - Hackage: 3a577eda9a
  - LTS Haskell: 36c0f4fa5e
  - Stackage Nightly: 8b258a761d
2016-09-13 09:11:57 +02:00
Kirill Boltaev
bccd75094f treewide: explicitly specify gtk and related package versions 2016-09-12 18:26:06 +03:00
Peter Simons
79ab2f3b32 haskell-timezone-series: block version 1.6 update
The new version's build is completely broken: https://github.com/ygale/timezone-series/issues/2.
2016-09-12 11:28:58 +02:00
Peter Simons
4da51ec637 structured-haskell-mode: link Haskell libraries statically into this executable
It's my understanding that Emacs runs the "structured-haskell-mode" binary
virtually every time you press a key in an Haskell buffer, and since
dynamically linked Haskell binaries take *much* longer to start up, switching
this particular package to statically linked libraries ought to result in a
performance boost.
2016-09-12 11:28:58 +02:00
Peter Simons
fef56e8b25 hackage-packages.nix: update Haskell package set
This update was generated by hackage2nix v2.0.1-8-g914b77b using the following inputs:

  - Hackage: aa7348b0fd
  - LTS Haskell: 56135ef31a
  - Stackage Nightly: 8b7d8b236d
2016-09-11 22:04:48 +02:00
Peter Simons
d01416ba50 Merge pull request #17997 from teozkr/fix/buildstackproject-stackroot
buildStackProject: Fix missing STACK_ROOT causing build errors
2016-09-10 22:23:02 +02:00
Peter Simons
b89fa5fd5c Merge pull request #17145 from kalhauge/haskell_darwin_dyld
haskell-ghc: fix darwin issue
2016-09-10 22:11:56 +02:00
Chris Martin
e4b146b041 haskell-hasktags: don't install the "test" binary
Closes https://github.com/NixOS/nixpkgs/pull/18403.
2016-09-10 22:09:11 +02:00
Peter Simons
51932e3d69 idris: clean up overrides
Closes https://github.com/NixOS/nixpkgs/pull/18309.
2016-09-10 22:01:15 +02:00
Peter Simons
04e4c495bb haskell-configuration-common: cosmetic 2016-09-10 21:00:22 +02:00
Peter Simons
7619f88eb8 haskell-gtk2hs-buildtools: this override does not belong into common 2016-09-10 21:00:22 +02:00
Peter Simons
d8af0db284 haskell-yi: remove obsolete "broken" marker
Fixes https://github.com/NixOS/nixpkgs/issues/18188.
2016-09-10 21:00:22 +02:00
Peter Simons
675421174a Cosmetic, no functional change. 2016-09-09 13:55:40 +02:00
Peter Simons
740eb969eb haskell-lens: fix build on older compilers 2016-09-09 13:55:40 +02:00
Peter Simons
ea9a948fab haskell-servant-router: don't run the test suite
It times out after 2 hours: http://hydra.nixos.org/build/40065332.

(cherry picked from commit 277efdd50eeec48a510672eaea5d7d664aac0b7c)
2016-09-09 13:55:40 +02:00
Peter Simons
83da50a505 git-annex: update version to 6.20160907 2016-09-09 13:55:39 +02:00
Peter Simons
f649d4eefa git-annex: fix GHC 8.x build 2016-09-09 13:55:39 +02:00
Peter Simons
26cc9b4d01 haste-compiler: mark as broken
Configuring haste-compiler-0.5.5.0...
  Setup: At least the following dependencies are missing:
  HTTP -any,
  bzlib -any,
  either -any,
  ghc-simple -any,
  system-fileio -any,
  tar -any
2016-09-09 13:55:39 +02:00
Peter Simons
743982d0f9 haste-cabal-install: mark as broken
The build depends on the broken haste-Cabal package.
2016-09-09 13:55:38 +02:00
Peter Simons
68f43cf9a9 configuration-hackage2nix.yaml: disable broken builds 2016-09-09 13:55:38 +02:00
Peter Simons
a37164f7a3 hackage-packages.nix: update Haskell package set
This update was generated by hackage2nix v2.0.1-7-g2231107 using the following inputs:

  - Hackage: 3d791385a6
  - LTS Haskell: 56135ef31a
  - Stackage Nightly: a8a4229c98
2016-09-09 13:55:33 +02:00
Daiderd Jordan
cc38535845
haskellPackages: cleanup ghc710x 2016-09-07 19:17:33 +02:00
Daiderd Jordan
985a260a12
haskellPackages.texmath: fix ghc710x build inputs 2016-09-07 19:15:47 +02:00
obadz
973fd1aae1 haskellPackages.haste-Cabal: mark as broken 2016-09-07 01:35:23 +01:00
Rickard Nilsson
28ceb0f31a haskellPackages.lens: Fix dependencies for ghc7.10.x 2016-09-06 10:26:18 +02:00
Peter Simons
8774294e30 hackage-packages.nix: update Haskell package set
This update was generated by hackage2nix v2.0.1-3-g27b56fd using the following inputs:

  - Hackage: 535780cef6
  - LTS Haskell: d7ece2dc93
  - Stackage Nightly: 15c64f722e
2016-09-05 20:17:41 +02:00
Profpatsch
f9f680013c haskell: fix ghcWithHoogle to version 4
Version 5 does not yet work with the ghcWithHoogle infrastructure. This
fixes Hoogle to version 4 as a temporary measure.
2016-09-03 18:18:53 +02:00
Tuomas Tynkkynen
8c4aeb1780 Merge staging into master
Brings in:
    - changed output order for multiple outputs:
      https://github.com/NixOS/nixpkgs/pull/14766
    - audit disabled by default
      https://github.com/NixOS/nixpkgs/pull/17916

 Conflicts:
	pkgs/development/libraries/openldap/default.nix
2016-09-01 13:27:27 +03:00
Peter Simons
2d091873ab configuration-hackage2nix.yaml: update list of broken builds 2016-08-31 12:01:03 +02:00
Peter Simons
a96160728e haskell-mueval: remove obsolete patch 2016-08-31 12:01:03 +02:00
Peter Simons
fbff1305fb hackage-packages.nix: update Haskell package set
This update was generated by hackage2nix v2.0.1 using the following inputs:

  - Hackage: 0752bfd4f0
  - LTS Haskell: e602b68df3
  - Stackage Nightly: f7407f2e81
2016-08-31 12:00:58 +02:00
Tuomas Tynkkynen
d3dc3d4130 Merge remote-tracking branch 'dezgeg/shuffle-outputs' into staging
https://github.com/NixOS/nixpkgs/pull/14766
2016-08-30 12:43:37 +03:00
Tuomas Tynkkynen
01f857409f haskellPackages.hcwiid: Fix output references to bluez 2016-08-30 03:02:33 +03:00
Peter Simons
67c57a9ce5 Merge pull request #18016 from Profpatsch/spy-patch
haskellPackages.spy: fix for new fsnotify version
2016-08-29 16:55:06 +02:00
Peter Simons
486c204859 Merge pull request #18087 from YPares/stack-getlib
Haskell stack nix shell: using lib.getLib/Dev now
2016-08-29 16:54:36 +02:00
YPares
9ddcd5d456 Haskell stack nix shell: using lib.getLib/Dev now 2016-08-29 16:15:09 +02:00
obadz
57ddc155fc Merge branch 'master' into staging
Conflicts:
	pkgs/games/scummvm/default.nix
2016-08-28 12:20:59 +01:00
Shea Levy
f168030af1 haskellPackages.unbound: 0.5.0 -> 0.5.1 2016-08-27 19:35:47 -04:00
obadz
3de6e5be50 Merge branch 'master' into staging
Conflicts:
      pkgs/applications/misc/navit/default.nix
      pkgs/applications/networking/mailreaders/alpine/default.nix
      pkgs/applications/networking/mailreaders/realpine/default.nix
      pkgs/development/compilers/ghc/head.nix
      pkgs/development/libraries/openssl/default.nix
      pkgs/games/liquidwar/default.nix
      pkgs/games/spring/springlobby.nix
      pkgs/os-specific/linux/kernel/perf.nix
      pkgs/servers/sip/freeswitch/default.nix
      pkgs/tools/archivers/cromfs/default.nix
      pkgs/tools/graphics/plotutils/default.nix
2016-08-27 23:54:54 +01:00
Profpatsch
70ed0fd3de haskellPackages.spy: fix for new fsnotify version
Temporary fix, until it is merged upstream.
2016-08-26 16:21:30 +02:00
Teo Klestrup Röijezon
f35d23b16d buildStackProject: Fix missing STACK_ROOT causing build errors 2016-08-25 22:16:06 +02:00
Franz Pletz
237320190e haskellPackages.git-annex: fix hash 2016-08-24 21:31:02 +02:00
Peter Simons
e9f62d890c hackage-packages.nix: fix syntax error 2016-08-24 16:01:06 +02:00
Peter Simons
4b343f84f7 hackage-packages.nix: update Haskell package set
This update was generated by hackage2nix v2.0-23-ga0c4861 using the following inputs:

  - Hackage: cfc500652f
  - LTS Haskell: 8678a3c7f3
  - Stackage Nightly: a0f3555d1f
2016-08-24 15:57:57 +02:00
Peter Simons
72133e05f4 configuration-hackage2nix.yaml: enable builds of language-puppet
Fixes https://github.com/NixOS/nixpkgs/issues/14929.
2016-08-24 15:46:39 +02:00
Peter Simons
0bdea44537 hackage-packages.nix: update Haskell package set
This update was generated by hackage2nix v2.0-22-ga83e456 using the following inputs:

  - Hackage: 729f27336e
  - LTS Haskell: a23e74ee23
  - Stackage Nightly: 4a0b9e146a
2016-08-24 15:46:32 +02:00
obadz
0e8d2725dc Merge branch 'master' into staging 2016-08-23 18:50:06 +01:00
Tuomas Tynkkynen
4452ef42ac treewide: Make explicit that 'dev' output of cairo is used 2016-08-23 03:52:04 +03:00
obadz
24a9183f90 Merge branch 'hardened-stdenv' into staging
Closes #12895

Amazing work by @globin & @fpletz getting hardened compiler flags by
enabled default on the whole package set
2016-08-22 01:19:35 +01:00
Arseniy Seroka
6522715429 Merge pull request #17880 from puffnfresh/issue/haskell-idris
idris: fix build not finding dynamic library
2016-08-21 12:30:19 +03:00
Daiderd Jordan
359ab67aee Merge pull request #17851 from jezen/master
haskellPackages.yesod-auth-oauth2: fix build inputs for ghc7.10.x
2016-08-21 11:11:17 +02:00
Rickard Nilsson
17c86df793 haskellPackages.aeson: Fix version in configuration-ghc-7.10.x 2016-08-21 09:50:52 +02:00
Rickard Nilsson
f47ec8c744 haskellPackages.Glob: Fix version in configuration-ghc-7.10.x 2016-08-21 09:50:35 +02:00
Brian McKenna
04a022be6d idris: fix build not finding dynamic library 2016-08-21 12:57:57 +10:00
Jezen Thomas
6154fecdbd
Declare dependencies for yesod-auth-oauth2 2016-08-19 19:51:33 +02:00
Peter Simons
d717d0dfb1 haskell-hans: revert commit 983ab7be1e
https://github.com/NixOS/nixpkgs/pull/17555 added an override that pins the
version of haskellPackages.hans to a specific Git revision. This means that any
version updates in the Haskell packages set will have no effect and that our
users will be stuck at that (arbitrary) version until the override is removed
again. Furthermore, it's bad practice to distribute a package dubbed as version
X when it's really version Y! The proper way to fix this issue IMHO is to
convince upstream to released a fixed version to Hackage.
2016-08-19 10:58:14 +02:00
Peter Simons
881131b968 configuration-hackage2nix.yaml: structured-haskell-mode works again 2016-08-19 10:23:43 +02:00
Peter Simons
224804d0f6 hackage-packages.nix: update Haskell package set
This update was generated by hackage2nix v2.0-22-ga83e456 using the following inputs:

  - Hackage: 352d6a176e
  - LTS Haskell: a23e74ee23
  - Stackage Nightly: 4a0b9e146a
2016-08-19 10:23:36 +02:00
Joachim Fasting
b8578f8096
haskellPackages_ghc710.libmpd: test-suite issue has been fixed upstream
Undoes b2f22c8a29
2016-08-18 14:38:03 +02:00
Joachim Fasting
8d51c50570
haskellPackages.libmpd: upper-bound on time has been fixed upstream
This basically reverts d13378ffd1 (git
revert resulted in conflicts, which I'm too lazy to resolve).
2016-08-18 14:35:45 +02:00
Robin Gloster
33e1c78ae3 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-08-16 07:54:01 +00:00
obadz
6eb2ca2247 haskellPackages.Lazy-Pbkdf2.i686-linux: don't run tests that keep aborting 2016-08-15 13:05:55 +01:00
Robin Gloster
b7787d932e Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-08-12 09:46:53 +00:00
Daiderd Jordan
59e1397f01
haskellPackages.hoauth2: fix test dependencies for ghc7.10.x 2016-08-11 23:02:49 +02:00
obadz
daf44055cd haskellPackages.stunclient: fix build error due to changing exports in deps 2016-08-11 16:42:28 +01:00
Nikolay Amiantov
17f87c98b6 haskell: maintain lambdabot 2016-08-11 17:12:31 +03:00
Nikolay Amiantov
c59c310d80 haskell: distribute hint and lambdabot 2016-08-11 17:12:31 +03:00
Nikolay Amiantov
cd7bd0b42f mueval: fix build 2016-08-11 17:12:31 +03:00
Daiderd Jordan
5f5b0c4348 haskellPackages.mono-traversable: fix build inputs for ghc7.10.x (#17636) 2016-08-10 17:05:45 +01:00
Daiderd Jordan
b8a3174aa3 haskellPackages.vector-algorithms: added extra build dependencies for ghc 7.10 (#17586) 2016-08-08 00:03:07 +01:00
Daiderd Jordan
d764e55a1c Merge pull request #17564 from LnL7/darwin-haskell-fsnotify
haskellPackages.fsnotify: add darwin build dependency
2016-08-06 17:56:18 +02:00
Daiderd Jordan
7aaf75608f
haskellPackages.fsnotify: add darwin build dependency 2016-08-06 17:29:25 +02:00
Benno Fünfstück
22281009b7 haskell/GLUT: fix "unkown GLUT entry glutInit"
This fixes #17547
2016-08-06 17:21:12 +02:00
Aycan iRiCAN
983ab7be1e haskellPackages.hans: fixed major version bugs (#17555) 2016-08-06 14:29:01 +03:00
obadz
fbea275286 haskellPackages.ghc-mod: remove override as 5.6.0.0 is ghc8 compatible
cc @peti
2016-08-04 17:40:17 +01:00
Peter Simons
2627b09b82 haskell-applicative-quoters: fix build with GHC 8.x 2016-08-04 17:38:44 +02:00
Peter Simons
8f52a0f926 hackage-packages.nix: update Haskell package set
This update was generated by hackage2nix v2.0-22-ga83e456 using the following inputs:

  - Hackage: 07ee4666b6
  - LTS Haskell: dfe21a3b8d
  - Stackage Nightly: 7c2bfd83db
2016-08-04 15:20:31 +02:00
Robin Gloster
63c7b4f9a7 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-07-31 20:51:34 +00:00
Peter Simons
aa69c4a5df hackage-packages.nix: update Haskell package set
This update was generated by hackage2nix v2.0-18-g8001337 using the following inputs:

  - Hackage: 0be8ef7fab
  - LTS Haskell: d085132b77
  - Stackage Nightly: 84fc6fbee7
2016-07-30 13:34:53 +02:00
Profpatsch
4741e9e051 haskellPackages.Glob: remove superfluous override
The override is already in the 7.10.x file, and we’d like to explicitely
override for every version that needs it.
2016-07-30 12:45:23 +02:00
Profpatsch
95528bfdcb haskellPackages.cereal: fix for pre-GHC 8.0 2016-07-30 12:44:57 +02:00
Peter Simons
48829c7828 Merge pull request #17312 from ryantrinkle/ghcjs-separate-stage1-list
ghcjs: move list of stage 1 packages into ghcjs derivation
2016-07-27 21:15:12 +02:00
Ryan Trinkle
5a622db103 ghcjs: move list of stage 1 packages into ghcjs derivation
This makes it easier to ensure that the list of stage 1 packages accurately matches the given version of ghcjs, and makes it possible for this list to be overridden
2016-07-27 14:28:31 -04:00
Peter Simons
68de205c5b hackage-packages.nix: update Haskell package set
This update was generated by hackage2nix v2.0-18-g8001337 using the following inputs:

  - Hackage: 690eda62e2
  - LTS Haskell: d085132b77
  - Stackage Nightly: 494d6bf80b
2016-07-27 20:04:41 +02:00
Ryan Trinkle
676a7b698f ghcjs: fix build
We need to hold back some packages, now that ghc 8 is out
2016-07-27 12:27:13 -04:00
Ryan Trinkle
0905aea14e Merge pull request #17276 from ryantrinkle/ghcjs-8.0-support
ghcjs: refactor stage2 handling
2016-07-27 12:26:45 -04:00
Ryan Trinkle
c564997ba0 ghcjs: refactor stage2 handling
Previously, the stage2 information was stored in haskell-modules, and imported directly from there.  However, the correct stage2 information is determined by the version of ghcjs-boot repository.  This commit makes the stage2 information part of the ghcjs derivation, which improves organization and makes it possible to override stage2 when overriding ghcjs.
2016-07-26 16:58:56 -04:00
Peter Simons
66ca9b9146 git-annex: update hash for new version 2016-07-26 10:37:55 +02:00
Peter Simons
24bb4333cd hackage-packages.nix: update Haskell package set
This update was generated by hackage2nix v2.0-18-g8001337 using the following inputs:

  - Hackage: de00016925
  - LTS Haskell: d085132b77
  - Stackage Nightly: bf146896f3
2016-07-26 10:37:55 +02:00
Robin Gloster
f222d98746 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-07-25 12:47:13 +00:00
Gabriel Ebner
66041a4475 configuration-hackage2nix.yaml: re-enable ghc-mod 2016-07-23 11:41:55 +02:00
Benno Fünfstück
2e48d838d0 haskell/Glob: fix build 2016-07-23 01:27:40 +02:00
Peter Simons
f162a1349a haskell-bifunctors: fix build with GHC 7.6.x 2016-07-21 17:57:28 +02:00
Peter Simons
60d7f39ec0 configuration-hackage2nix.yaml: update list of broken builds
These packages are broken in "haskellPackages" and have been for quite a while:

 - disable goatee, goatee-gtk, and qtah-* (ping @khumba)
 - disable persistent-mongoDB (ping @psibi)
2016-07-21 16:40:03 +02:00
Peter Simons
3d5556b2cc haskell-ghcjs-prim: mark broken 2016-07-21 16:40:02 +02:00
Peter Simons
1545d241b6 haskell-semigroups: fix build with old compilers 2016-07-21 16:40:02 +02:00
Peter Simons
6f26617737 haskell-bifunctors: fix build with old compilers 2016-07-21 16:40:02 +02:00
Peter Simons
2720ee84ad hackage-packages.nix: update Haskell package set
This update was generated by hackage2nix v2.0-12-gb304101 using the following inputs:

  - Hackage: b135e7a1de
  - LTS Haskell: a5a99cf176
  - Stackage Nightly: bf146896f3
2016-07-21 16:39:56 +02:00
Christian Gram Kalhauge
1a08805358 Make the implementation clean 2016-07-21 14:56:45 +02:00
Peter Simons
641fc0e683 haskell: remove all but the latest LTS package sets (version 6.7)
This is the first step towards dropping Stackage support. We keep LTS 6.x
around because I don't want to downgrade our default compiler to GHC 7.x,
but once LTS 7.x comes out we'll switch our main package set to that and
drop Nightly.

More details are at:

  http://permalink.gmane.org/gmane.linux.distributions.nixos/20505

Closes https://github.com/NixOS/nixpkgs/issues/14897.

Also relevant:

 - https://github.com/NixOS/nixpkgs/issues/16130
 - https://github.com/commercialhaskell/stack/issues/2259
2016-07-21 14:41:44 +02:00
Christian Gram Kalhauge
9bca29d4ef Change if to optionalString 2016-07-21 14:23:56 +02:00
Peter Simons
beab1adb6e configuration-hackage2nix.yaml: update list of broken builds 2016-07-21 13:52:48 +02:00
Christian Gram Kalhauge
de5a2ee034 Reduce computation time for non-darwin users 2016-07-21 11:39:52 +02:00
Robin Gloster
1f04b4a566 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-07-21 00:56:43 +00:00
Christian Gram Kalhauge
ab46f69802 Merge remote-tracking branch 'origin/master' into haskell_darwin_dyld 2016-07-20 14:28:28 +02:00
Christian Gram Kalhauge
475c8bfb7d Fix DLYD problem with haskell libraries on Darwin
This commit fixes a problem that occurs with externally linked haskell
libraries on Darwin. It does this by adding the libraries to the
--extra-lib-dirs flag and the DYLD_LIBRARY_PATH environment variable.
2016-07-20 14:21:53 +02:00
Peter Simons
ddfc4ba977 haskell-Glob: fix LTS build 2016-07-20 12:50:06 +02:00
Peter Simons
c2656d6809 Merge pull request #15423 from dalaing/llvm-general-darwin
llvm-general: Adds Darwin compatibilty
2016-07-19 22:44:28 +02:00
Peter Simons
c0b5213aad haskell-hfsevents: remove obsolete override
cabal2nix generates correct build instructions now.
Fixes https://github.com/NixOS/nixpkgs/pull/17046.
2016-07-19 14:20:53 +02:00
Peter Simons
450fa8d9a0 hackage-packages.nix: update Haskell package set
This update was generated by hackage2nix v2.0-11-gcec8f95 using the following inputs:

  - Hackage: 19ec8f3a6d
  - LTS Haskell: a5a99cf176
  - Stackage Nightly: bf146896f3
2016-07-19 14:20:40 +02:00
Robin Gloster
203846b9de Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-07-19 10:37:02 +00:00
Peter Simons
3bfe30a042 haskell: update our Hackage database to the latest version 2016-07-16 13:34:06 +02:00
Peter Simons
1b0e82d6ff Merge pull request #16974 from khumba/hoppy+qtah-maintainer
hoppy, qtah: add myself as maintainer
2016-07-15 20:27:22 +02:00
Robin Gloster
5185bc1773 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-07-15 14:41:01 +00:00
Peter Simons
9fc0347c93 Merge pull request #16262 from basvandijk/fix-inline-c-cpp-darwin
inline-c-cpp: fix build on darwin
2016-07-15 16:21:46 +02:00
Bryan Gardiner
5e685121e4
hoppy, qtah: add myself as maintainer 2016-07-14 23:07:53 -07:00
Peter Simons
6af0f57f91 haskell-binary: update to latest version 2016-07-14 22:13:48 +02:00
Peter Simons
d477991c48 hackage-packages.nix: update Haskell package set
This update was generated by hackage2nix v2.0-4-gb156b94 using the following inputs:

  - Hackage: 5bb0a1b20f
  - LTS Haskell: a5a99cf176
  - Stackage Nightly: 3664752ea8
2016-07-14 22:13:09 +02:00
Peter Simons
8436458865 hackage-packages.nix: update Haskell package set
This update was generated by hackage2nix v2.0-2-g0bc3d6d using the following inputs:

  - Hackage: d6d8323227
  - LTS Haskell: 52eeaf4edc
  - Stackage Nightly: 64dfa6aa2e
2016-07-07 17:18:35 +02:00
Peter Simons
6a6b8fa36f cabal2nix: update to version 2.0 from Hackage
I've realized that publishing updates to Hackage is far easier than
publishing updates in Nixpkgs, and since all Hackage updates show up in
Nix automatically I've decided to go back to publishing cabal2nix on
Hackage again.

Unfortunately, this means that I'll have to change the version numbering
scheme to comply with the expectations of the Haskell PVP (which is used
by Stackage), so the new version 2.0 looks like a downgrade to Nix,
which used to have version 20160406. :-(

If in doubt, run "nix-env -u --always" to force the update. I am sorry
about the inconvenience.
2016-07-05 23:45:41 +02:00
Peter Simons
a828d79a8a hackage-packages.nix: update Haskell package set
This update was generated by hackage2nix v2.0-2-g0bc3d6d using the following inputs:

  - Hackage: fcabbcc70b
  - LTS Haskell: 52eeaf4edc
  - Stackage Nightly: ff50bc1a46
2016-07-05 23:45:41 +02:00
Peter Simons
cbcb23dcf6 hackage-packages.nix: update Haskell package set
This update was generated by hackage2nix v20160613-12-g1145e86 using the following inputs:

  - Hackage: 8b1e5923b5
  - LTS Haskell: 1c63caa7b8
  - Stackage Nightly: 39da79aced
2016-07-02 20:59:02 +02:00
Peter Simons
14a42dba66 haskell-semigroups: add missing overrides for old version of the package 2016-07-01 12:01:04 +02:00
Peter Simons
ec2e568b35 configuration-hackage2nix.yaml: disable failing builds 2016-07-01 12:01:04 +02:00
Peter Simons
a7e33a1a1e cabal2nix: update to version 20160613-10-g57dddc7 2016-07-01 12:01:03 +02:00
Peter Simons
77f6750ef0 hackage-packages.nix: update Haskell package set
This update was generated by hackage2nix v20160613-12-g1145e86 using the following inputs:

  - Hackage: 53b696d106
  - LTS Haskell: 1c63caa7b8
  - Stackage Nightly: affdd756e9
2016-07-01 12:00:58 +02:00
Peter Simons
e2c1926758 hackage-packages.nix: update Haskell package set
This update was generated by hackage2nix v20160613-11-g57dddc7 using the following inputs:

  - Hackage: 6d525b6502
  - LTS Haskell: 1c63caa7b8
  - Stackage Nightly: b1d16f45de
2016-06-29 11:54:27 +02:00
Peter Simons
99c6c9d42f Merge pull request #16370 from rasendubi/haskell-hoogle
haskell-hoogle: adapt to GHC docs split
2016-06-20 23:52:47 +02:00
Alexey Shmalko
87aa864ff9
haskell-hoogle: adapt to GHC docs split
The docs were split at #16167 and broke google support. @peti fixed
build, however hoogle still didn't see packages shipped with GHC. This
patch fixes location of the libraries shipped with GHC.
2016-06-20 22:52:20 +03:00
Peter Simons
06d3636596 git-annex: update sha256 hash 2016-06-20 17:01:36 +02:00
Peter Simons
1178ccf085 hackage-packages.nix: update Haskell package set
This update was generated by hackage2nix v20160613-7-g3089457 using the following inputs:

  - Hackage: 08c95c9ddf
  - LTS Haskell: 2a2cddb443
  - Stackage Nightly: 5f88469291
2016-06-20 17:01:36 +02:00
Peter Simons
06489a1850 haskell-hoogle: remedy some fallout from https://github.com/NixOS/nixpkgs/pull/16167
ghcWithHoogle builds with this patch applied, but it's probably still broken in
the sense that links might point nowhere or that the generated databases and/or
documentation might be incomplete.
2016-06-20 14:50:52 +02:00
Bjørn Forsman
bd01fad0ed Captialize meta.description of all packages
In line with the Nixpkgs manual.

A mechanical change, done with this command:

  find pkgs -name "*.nix" | \
      while read f; do \
          sed -e 's/description\s*=\s*"\([a-z]\)/description = "\u\1/' -i "$f"; \
      done

I manually skipped some:

* Descriptions starting with an abbreviation, a user name or package name
* Frequently generated expressions (haskell-packages.nix)
2016-06-20 13:55:52 +02:00
Bas van Dijk
d0c7056b92 inline-c-cpp: fix build on darwin 2016-06-16 01:03:22 +02:00
YPares
3868cad832 haskell: generic-stack-builder sets an env var
generic-stack-builder was not setting STACK_PLATFORM_VARIANT="nix".
This is required by stack when handling its haskell packages database
snapshot. Stack must keep separated packages built with its own GHC
and those built with GHC from Nixpkgs.
2016-06-15 17:08:41 +02:00
Peter Simons
8d86c8274f callHackage: generate expressions for the appropriate target system and compiler 2016-06-13 23:09:56 +02:00
Peter Simons
ee933f5d73 hackage-packages.nix: update Haskell package set
This update was generated by hackage2nix v20160613 using the following inputs:

  - Hackage: b9e58743e7
  - LTS Haskell: 2a2cddb443
  - Stackage Nightly: 4b8c8abac5
2016-06-13 23:09:44 +02:00
Peter Simons
52edff8689 Merge pull request #15989 from mboes/stack-builder-tweaks
haskell.lib.buildStackProject: allow passing in a custom GHC version.
2016-06-13 12:15:11 +02:00
Michael Alan Dorman
b40e1efe00 haskell generic-builder: don't propagate setupHaskellDepends
Without this patch, attempts to install at least some of the packages
that start to use setupHaskellDepends (mostly gtk-related packages)
results in collisions:

    building path(s) ‘/nix/store/63k5smns43f5r2ad8wcc242x0gwd70m3-ghc-8.0.1’
    collision between `/nix/store/k18i1nm5hgnb82y9w2g9hmlwhk3szjld-ghc-8.0.1/lib/ghc-8.0.1/Cabal-1.24.0.0/Distribution/Compat/Binary.dyn_hi' and `/nix/store/0rwhbwsg9kmywgbrib2bs29p2hmi80za-Cabal-1.24.0.0/lib/ghc-8.0.1/Cabal-1.24.0.0/Distribution/Compat/Binary.dyn_hi'
    builder for ‘/nix/store/vrjkfpm8sb96m9i5k74h8vn0rwddgy4v-ghc-8.0.1.drv’ failed with exit code 25

This would appear to me to be a consequence of setupHaskellDepends
entries being added to propagateBuildInputs.  It is sufficient in the
cases I'm familiar with (taffyBar), and I think correct, to simply add
it to the otherBuildInputs.
2016-06-13 09:51:35 +02:00
Mathieu Boespflug
70bc97b731 haskell.lib.buildStackProject: fix treatment of LD_LIBRARY_PATH.
Don't make LD_LIBRARY_PATH pick up cwd when original string is empty,
due to colon terminated search path.
2016-06-13 00:55:34 +02:00
Mathieu Boespflug
292a8892a0 haskell.lib.buildStackProject: allow passing in a custom GHC version.
Previously, the user could only compile using the default version of
GHC in Nixpkgs. Now this can be changed by setting the `ghc` attribute
appropriately.
2016-06-13 00:55:33 +02:00
Peter Simons
2862d272a6 haskell: add support for all of Hackage
The function "callHackage <name> <version>" generates build instructions for
the requested library version on-the-fly. All of Hackage is available. Note:
this code is brand-new, experimental, and it might change in the future. Don't
base production code on this feature yet.

Example usage:

  $ nix-shell -p 'haskellPackages.callHackage "cpphs" "1.19.3" {}' --run "cpphs --version"
  cpphs 1.19.3

  $ nix-shell -p 'haskellPackages.ghcWithPackages (self: [(self.callHackage "hsdns" "1.6.1" {})])' --run "ghc-pkg list hsdns"
  /nix/store/p6r81k2vb2pzy4wcvri6z9m492i0hg63-ghc-8.0.1/lib/ghc-8.0.1/package.conf.d
      hsdns-1.6.1
2016-06-12 08:37:06 +02:00
Peter Simons
52aad6c77d haskell.lib.withHoogle: remove obsolete function 2016-06-12 08:37:06 +02:00
Peter Simons
00bebe798c haskell-http2: remove obsolete override 2016-06-12 08:37:06 +02:00
Peter Simons
cc09d421f2 haskell-hslogger: fix LTS build 2016-06-12 08:37:05 +02:00
Peter Simons
71f0092143 haskell-lhc: drop obsolete override 2016-06-12 08:37:05 +02:00
Peter Simons
8ffcd238c3 haskell-generic-builder: add support for setupHaskellDepends 2016-06-12 08:37:01 +02:00
Peter Simons
bef4cf54d5 hackage-packages.nix: update Haskell package set
This update was generated by hackage2nix v20160611 using the following inputs:

  - Hackage: 8f99b2654a
  - LTS Haskell: 1a80e0660e
  - Stackage Nightly: 504ee2b3bb
2016-06-12 08:36:53 +02:00
Peter Simons
0f7a0a0377 haskell-stack: apply small patch from Git to fix "stack repl" for GHC 8.x 2016-06-10 14:41:01 +02:00
Robin Gloster
8031cba2ab Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-06-10 09:27:04 +00:00
Peter Simons
7914242b37 haskell-timezone-series: fix build with GHC 8.0.1
- Fix the incorrect sha256 hash of the patch.
 - Apply the patch only when compiling with GHC 8.0.x.
2016-06-09 21:51:09 +02:00
Peter Simons
cf042ae750 hackage-packages.nix: update Haskell package set
This update was generated by hackage2nix v20160406-38-g2269395 using the following inputs:

  - Hackage: 65d1dbe8dd
  - LTS Haskell: 1a80e0660e
  - Stackage Nightly: 5863aeaee3
2016-06-09 21:51:00 +02:00
Peter Simons
dc6f1cf4b3 Merge pull request #16080 from mstarzyk/timezone-series
haskellPackages.timezone-series: Add support for time-1.6 - applied p…
2016-06-09 12:09:12 +02:00
obadz
fcb0023e80 haskellPackages.intero: fix tests (thanks @rvl) 2016-06-09 08:53:47 +01:00
Maciek Starzyk
0158d124bd haskellPackages.timezone-series: Download patch instead of checking it into nixpkgs 2016-06-09 00:03:41 +02:00
Maciek Starzyk
10c87e69b4 haskellPackages.timezone-series: Add support for time-1.6 - applied patch https://github.com/ygale/timezone-series/pull/1 2016-06-08 23:35:44 +02:00
obadz
d13378ffd1 haskellPackages.libmpd: remove upper bound on time 2016-06-08 19:14:27 +01:00
Peter Simons
71fc5083be git-annex: work around Joey Hess' latest brain fart
Now we're releasing incomplete Hackage tarballs on purpose:

  http://git-annex.branchable.com/bugs/bash_completion_file_is_missing_in_the_6.20160527_tarball_on_hackage/

You know, I'll fix this shit one last time, but on the next occasion
upstream breaks the build for no apparent reason, I'm going to abandon
this project and leave it to someone else to package, because these kind
of wacko engineering decisions cast a bad light on the soundness of
git-annex as a whole, IMHO.
2016-06-07 21:59:52 +02:00
Peter Simons
637f901f3e hackage-packages.nix: update Haskell package set
This update was generated by hackage2nix v20160406-35-g2a2d30b using the following inputs:

  - Hackage: 7a03eee484
  - LTS Haskell: 1a80e0660e
  - Stackage Nightly: 7e90e5529b
2016-06-07 21:59:04 +02:00
Peter Simons
3e4cd62903 Merge pull request #16053 from obadz/ghc-mod-ghc8
haskellPackages.ghc-mod: add support for GHC8
2016-06-07 21:50:35 +02:00
obadz
99717f7a56 haskellPackages.intero: don't run tests 2016-06-07 20:36:35 +01:00
obadz
679a51b116 haskellPackages.ghc-mod: add overrides to support ghc8 2016-06-07 20:33:48 +01:00
Peter Simons
0cc1b3744e haskell-semigroups: fix build with older compilers 2016-06-06 09:33:31 +02:00
Peter Simons
a01fab64e2 haskell-binary: update overrides for latest version 2016-06-06 09:33:31 +02:00
Peter Simons
c7639f4e56 haskell-esqueleto: remove broken overrides
These overrides didn't work, because they created a mixture of different
versions of 'persistent' in the build tree. Furthermore, we cannot pin
specific versions like that in configuration-common.nix because this
breaks builds in other package sets, i.e. the LTS variants.
2016-06-06 09:33:30 +02:00
Peter Simons
513d648f40 configuration-common.nix: drop obsolete overrides 2016-06-06 09:33:30 +02:00
Peter Simons
ac3ccce0c1 hackage-packages.nix: update Haskell package set
This update was generated by hackage2nix v20160406-31-gd9dda87 using the following inputs:

  - Hackage: 4c643345f3
  - LTS Haskell: 1a80e0660e
  - Stackage Nightly: 3ba38d9d9e
2016-06-06 09:33:25 +02:00
Peter Simons
d27881c014 haskell-pandoc: fix build 2016-06-03 16:12:41 +02:00
Peter Simons
d2bb38e59b configuration-ghc-8.0.x.nix: throw out commented-out code 2016-06-03 16:12:41 +02:00
Peter Simons
3fd03fb644 haskell-pandoc: add myself as a maintainer 2016-06-03 16:12:41 +02:00
Peter Simons
fba8635991 hackage-packages.nix: update Haskell package set
This update was generated by hackage2nix v20160406-30-g704cd27 using the following inputs:

  - Hackage: 5f6653ffd9
  - LTS Haskell: 042ef2187b
  - Stackage Nightly: a2b989788f
2016-06-03 16:12:41 +02:00
Peter Simons
05cdb0f621 hackage-packages.nix: update Haskell package set
This update was generated by hackage2nix v20160406-28-g35f7635 using the following inputs:

  - Hackage: 21e9bc8a5e
  - LTS Haskell: 042ef2187b
  - Stackage Nightly: 2f54d84973
2016-06-02 09:30:38 +02:00
Peter Simons
edfee2098f configuration-hackage2nix.yaml: update list of broken builds 2016-06-02 09:30:38 +02:00
Peter Simons
3fb2006846 haskell-bytes: fix LTS build 2016-06-02 09:30:38 +02:00
Michael Alan Dorman
d631679b83 cabal: fix expressions 2016-06-02 09:30:38 +02:00
Michael Alan Dorman
76db3f6e63 esqueleto: fix dependencies 2016-06-02 09:30:38 +02:00
Nikolay Amiantov
d82b15d57b haskell.cabal-install: remove override 2016-06-02 01:11:01 +03:00
Nikolay Amiantov
adfe65edf2 haskell.cabal-install: use new Cabal 2016-06-02 00:59:08 +03:00
Michael Alan Dorman
5ca5a4f773 gtk2hs-buildtools: hand-code some dependencies
A change in the way the gtk2hs libraries make use of gtk2hs-buildtools
caused them to move the dependency into a stanza where cabal2nix doesn't
pick it up---so we need to do these by hand for the moment.
2016-05-31 22:09:57 +02:00
Michael Alan Dorman
b0f64b04fc pandoc: jailbreak 2016-05-31 22:09:57 +02:00
Michael Alan Dorman
20cf5c9750 hackage2nix: Compile with older deepseq-generics 2016-05-31 22:09:57 +02:00
Michael Alan Dorman
5c803214ee distribution-nixpkgs: Compile with older deepseq-generics 2016-05-31 22:09:57 +02:00
Michael Alan Dorman
607e123d11 ghc-mod: Depend on cabal-helper 0.6.3.1 2016-05-31 22:09:57 +02:00
Michael Alan Dorman
be6c46c3b3 gtk2hs-buildtools: ensure appropriate Cabal version 2016-05-31 22:09:56 +02:00
Michael Alan Dorman
ffe733a52d cereal: Add dependency for 7.10.x compatibility 2016-05-31 22:09:56 +02:00
Michael Alan Dorman
f226dbff00 lens-family-th: restrict version to 7.10.X compatible 2016-05-31 22:09:56 +02:00
Peter Simons
8277beff46 Fix LTS Haskell version of intervals. 2016-05-31 22:09:56 +02:00
Peter Simons
2d1e907c61 Fix LTS Haskell version of aeson. 2016-05-31 22:09:56 +02:00
Peter Simons
7e7c4ff779 Fix LTS Haskell builds of case-insensitive and semigroups. 2016-05-31 22:09:56 +02:00
Peter Simons
0331c3ee8d configuration-hackage2nix.yaml: update list of broken packages 2016-05-31 22:09:56 +02:00
Peter Simons
4825b607f8 configuration-ghc-7.10.x.nix: add missing core library names from GHC 8.x to fix evaluation 2016-05-31 22:09:55 +02:00
Peter Simons
98c03caeac generate-hackage-package-set.nix: drop experimental code from master branch 2016-05-31 22:09:55 +02:00
Peter Simons
fc0c63d369 configuration-ghc-8.0.x.nix: update list of core packages 2016-05-31 22:09:55 +02:00
Peter Simons
4ab2a32888 configuration-ghc-8.0.x.nix: drop obsolete overrides
We're following Stackage Nightly with GHC 8.x now, so problems should be
reported there rather than fixed locally in Nixpkgs.
2016-05-31 22:09:55 +02:00
Peter Simons
2d201d41ca configuration-ghc-7.10.x.nix: update to cabal-install 1.24.x by default 2016-05-31 22:09:55 +02:00
Peter Simons
900aa31644 configuration-hackage2nix.yaml: update list of broken packages 2016-05-31 22:09:55 +02:00
Peter Simons
e343ec0822 Switch default Haskell compiler to GHC 8.0.1. 2016-05-31 22:09:54 +02:00
Peter Simons
4cea709ce0 hackage-packages.nix: update Haskell package set
This update was generated by hackage2nix v20160406-27-gc573068 using the following inputs:

  - Hackage: b000a1eee6
  - LTS Haskell: 042ef2187b
  - Stackage Nightly: c7757d46b6
2016-05-31 22:09:43 +02:00
Robin Gloster
2382084e3b haskellPackages.gtk{,3}: disable fortify hardening 2016-05-31 12:22:17 +00:00
Robin Gloster
2d382f3d98 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-05-30 19:39:34 +00:00