Commit Graph

1754 Commits

Author SHA1 Message Date
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
Peter Simons
aebfb40425 Revert "Don't use incompatible haddock-api."
This reverts commit 8fdcf556a1. I accidentally committed to the
wrong branch.
2016-05-27 19:18:31 +02:00
Michael Alan Dorman
8fdcf556a1 Don't use incompatible haddock-api. 2016-05-27 19:01:06 +02:00
Peter Simons
a2519c8da4 hackage-packages.nix: update Haskell package set
This update was generated by hackage2nix v20160406-13-gf11ffc0 using the following inputs:

  - Hackage: 42718c5830
  - LTS Haskell: 4910435899
  - Stackage Nightly: f92320d2fa
2016-05-25 12:27:56 +02:00
Nikolay Amiantov
be5b596deb ghc801.linear: fix src checksum 2016-05-25 05:38:51 +03:00
Oliver Charles
b3acd8ca39 ghc801.MonadCatchIO-transformers: jailbreak 2016-05-23 16:55:41 +01:00
Joachim Fasting
6a2244e8f4
Revert "Merge pull request #15595 from laMudri/agda-stdlib"
This reverts commit ce4f6c215f, reversing
changes made to 7817d0901d.

See 68e1419cb8 (r64175487)
2016-05-23 09:07:02 +02:00
Joachim Fasting
ce4f6c215f Merge pull request #15595 from laMudri/agda-stdlib
Agda: 2.4.2.3 -> 2.5.1
2016-05-23 08:23:55 +02:00
laMudri
68e1419cb8 Agda: prebuild all of the new builtin modules 2016-05-21 17:27:19 +01:00
Peter Simons
7b75e82785 hackage-packages.nix: update Haskell package set
This update was generated by hackage2nix v20160406-11-g659087e using the following inputs:

  - Hackage: a7fe14b44c
  - LTS Haskell: e1becfd6f8
  - Stackage Nightly: fac5530021
2016-05-20 14:47:06 +02:00
Franz Pletz
f8d481754c
Merge remote-tracking branch 'origin/master' into hardened-stdenv 2016-05-18 17:10:02 +02:00
Peter Simons
8e462995ba Bring my stdenv.lib.maintainers user name in line with my github nick. 2016-05-16 22:49:55 +02:00
Dave Laing
0540a83789 llvm-general: Adds Darwin compatibilty 2016-05-13 09:41:15 +10:00
Ryan Trinkle
e3417b0f71 Merge pull request #15375 from ryantrinkle/ghc8-ghcjs-prim
ghc8 | config: ghcjs-prim: init at 0.1.0.0
2016-05-10 20:39:04 -04:00
Ryan Trinkle
2bae6b6737 ghc8 | config: ghcjs-prim: init at 0.1.0.0 2016-05-10 20:01:09 -04:00
Michael Alan Dorman
d2387e3c4a haskellPackages.hjsonschema: remove hjsonpointer override 2016-05-10 12:28:36 +02:00
Michael Alan Dorman
deba002b3c haskellPackages.hindent: remove testing override 2016-05-10 12:28:36 +02:00
Michael Alan Dorman
d8c24dae8f haskellPackages.pipes-transduce: Remove foldl override 2016-05-10 12:28:36 +02:00
Peter Simons
d19e8ea429 configuration-ghc-7.10.x.nix: enable builds for cabal-install 1.24.x 2016-05-10 12:28:36 +02:00
Peter Simons
c23fd4fbc9 configuration-ghc-7.10.x.nix: remove obsolete override for linear 2016-05-10 12:28:36 +02:00
Peter Simons
2f9a2e6808 configuration-ghc-7.10.x.nix: switch jailbreak-cabal to Cabal 1.24.x 2016-05-10 12:28:35 +02:00