Commit Graph

2383 Commits

Author SHA1 Message Date
Jude Taylor
6883119ab0 add some overrides for ghc 7.10.3 to build ghcjs 2017-08-13 13:32:08 -07:00
Frederik Rietdijk
13bbaee21d Merge pull request #27881 from mimadrid/fix/http-https
Update homepage attributes: http -> https
2017-08-13 21:53:20 +02:00
Frederik Rietdijk
7ebcd39a0f Merge commit '4c49205' into HEAD 2017-08-13 18:34:59 +02:00
Peter Simons
a9e463bc9d hackage-packages.nix: automatic Haskell package set update
This update was generated by hackage2nix v2.4.1 from Hackage revision
3ff230318a.
2017-08-12 18:15:49 +02:00
Domen Kožar
486e1c3c16 Merge pull request #27998 from davidak/macOS
replace "Mac OS X" and "OS X" with "macOS"
2017-08-11 13:01:36 +02:00
Jude Taylor
7e3e790675 add override for html-entities 2017-08-08 14:29:33 -07:00
Jude Taylor
eeeead21c5 add override for digestive-functors-blaze 2017-08-08 11:56:31 -07:00
Peter Simons
550373b000 cabal-install: fix build after updating to version 2.x 2017-08-08 10:09:56 +02:00
Peter Simons
35dd36a027 hackage-packages.nix: automatic Haskell package set update
This update was generated by hackage2nix v2.4.1 from Hackage revision
d913f9a17b.
2017-08-08 10:09:46 +02:00
Peter Simons
142df08825 hackage2nix: update list of broken packages 2017-08-08 10:09:44 +02:00
davidak
3270aa896b replace "Mac OS X" and "OS X" with "macOS"
as it is the official name since 2016

https://en.wikipedia.org/wiki/Macintosh_operating_systems#Desktop

exception are parts refering to older versions of macOS like

"GUI support for Mac OS X 10.6 - 10.12. Note that Emacs 23 and later [...]"
2017-08-07 21:41:30 +02:00
Domen Kožar
4f80406fdd Merge pull request #27615 from NickHu/cuda
fix haskellPackages.cuda and some tools dependent on cudatoolkit
2017-08-07 16:13:49 +02:00
Peter Simons
f152749c99 hackage-packages.nix: automatic Haskell package set update
This update was generated by hackage2nix v2.4.1 from Hackage revision
cfa51cac76.
2017-08-07 08:58:48 +02:00
Domen Kožar
71bebd5254
{fs,h}notify: move to configuration-nix.nix 2017-08-06 10:42:37 +02:00
Domen Kožar
8e16cee256
double-conversion: remove patch superseeded by ghc patch
https://github.com/NixOS/nixpkgs/pull/27584
2017-08-06 10:42:37 +02:00
Robin Gloster
688f066da2
haskellPackages.servant: fix hash 2017-08-04 17:04:03 +02:00
John Ericson
74f5fe5068 haskell infra: Misc cleanups
- The haskell lib is very close to not relying on Nixpkgs. I think
   this is good---simpler to think about and matches Nixpkgs's lib.

 - The haskell lib is only imported once

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

Closes https://github.com/NixOS/nixpkgs/pull/27840.
2017-08-03 13:12:01 +02:00
Peter Simons
a2825a3c6f hackage-packages.nix: automatic Haskell package set update
This update was generated by hackage2nix v2.4-2-ge4f891e from Hackage revision
c54ab27c33.
2017-08-03 13:11:56 +02:00
mimadrid
09e0cc7cc7
Update homepage attributes: http -> https
Homepage link "http://.../" is a permanent redirect to "https://.../" and should be updated
https://repology.org/repository/nix_stable/problems
2017-08-03 11:56:15 +02:00
John Wiegley
0396ca6150
ghc-events_0_6_0 no longer exists 2017-08-01 09:34:50 -07:00
Peter Simons
92031d6e01 structured-haskell-mode: bump version to latest git head
Chris doesn't seem to make release any more.
2017-08-01 15:35:44 +02:00
Peter Simons
4fe328c6ca haskell-hindent: fix location of the "site-lisp" symlink 2017-08-01 15:25:19 +02:00
Peter Simons
ef6849ca63 structured-haskell-mode: fix location of the "site-lisp" symlink 2017-08-01 15:25:19 +02:00
Frederik Rietdijk
b2608b8910 Merge remote-tracking branch 'upstream/master' into HEAD 2017-07-29 13:08:11 +02:00
Peter Simons
47e3245691 haskell.lib: drop obsolete hasNoDataOutput and hasNoDocOutput functions 2017-07-29 12:39:26 +02:00
Frederik Rietdijk
55357de67a Merge remote-tracking branch 'upstream/master' into HEAD 2017-07-28 19:37:36 +02:00
Peter Simons
cb1742e76d haskell: fix builds broken by LTS-9 update 2017-07-28 18:14:02 +02:00
Peter Simons
f442bbcdec hackage-packages.nix: automatic Haskell package set update
This update was generated by hackage2nix v2.4-2-ge4f891e from Hackage revision
f72c20d338.
2017-07-28 18:13:57 +02:00
Peter Simons
30fbeed254 LTS Haskell 9.0
Minus the broken wai-middleware-prometheus-0.2.0 package.
2017-07-28 18:13:27 +02:00
Franz Pletz
b116fa5ff2
Merge branch 'master' into staging 2017-07-28 16:08:30 +02:00
Peter Simons
382db8a9ad cabal2nix: version 2.4 needs Cabal 2.x 2017-07-27 15:47:03 +02:00
Peter Simons
86b230efd9 hackage-packages.nix: automatic Haskell package set update
This update was generated by hackage2nix v2.4 from Hackage revision
3fd8431bf5.
2017-07-27 15:46:59 +02:00
Nikolay Amiantov
94adf8d17d haskellPackages.threadscope: fix build 2017-07-27 12:47:58 +03:00
Domen Kožar
073b30563d ghc-mod: fix build to cope with new split-output work 2017-07-27 09:12:41 +02:00
Peter Simons
2b0ce7aeab hackage-packages.nix: automatic Haskell package set update
This update was generated by hackage2nix v2.3.1-25-ge9e9669 from Hackage revision
8b34a74f81.
2017-07-27 09:12:36 +02:00
michael bishop
be63b1994d enable split-output builds for all haskellPackages 2017-07-27 09:12:06 +02:00
John Ericson
9be40841ea Merge remote-tracking branch 'upstream/master' into staging-base
Conflicts:
	pkgs/build-support/cc-wrapper/default.nix
	pkgs/build-support/gcc-wrapper-old/builder.sh
	pkgs/build-support/trivial-builders.nix
	pkgs/desktops/kde-4.14/kde-package/default.nix
	pkgs/development/compilers/openjdk-darwin/8.nix
	pkgs/development/compilers/openjdk-darwin/default.nix
	pkgs/development/compilers/openjdk/7.nix
	pkgs/development/compilers/openjdk/8.nix
	pkgs/development/compilers/oraclejdk/jdk-linux-base.nix
	pkgs/development/compilers/zulu/default.nix
	pkgs/development/haskell-modules/generic-builder.nix
	pkgs/misc/misc.nix
	pkgs/stdenv/generic/builder.sh
	pkgs/stdenv/generic/setup.sh
2017-07-26 13:46:04 -04:00
William Casarin
d680c2352c jailbreak-cabal: specifically use ghc802 override in ghc821 config
Otherwise this will infinite loop when:

  pkgs.haskellPackages = pkgs.haskell.packages.ghc821
2017-07-26 10:44:50 -07:00
John Ericson
ea7d13cf1a stdenv-setup and misc hooks: Work with bash-3.4 for MacOS nix-shell
This is a temporary measure until this impurity is removed from Nix.
2017-07-26 09:08:01 -04:00
John Ericson
f6f40e3fe5 stdenv-setup and misc pkgs: Revert to space-deliminated propagated-* files
We cannot switch to line-delimited yet, because certain Nix commands do
not read in the entire file, but just the first line.
2017-07-26 09:07:55 -04:00
Peter Simons
175c3526ae haskell: provide the name 'bin-package-db' (null) to fix evaluation errors 2017-07-26 10:20:31 +02:00
Peter Simons
28c01703f0 haskell: remove all code related to the "haste" compiler
These packages have been broken for a while and now they don't even evaluate
any more.
2017-07-26 10:20:30 +02:00
Peter Simons
a9111840fa haskell: provide the name 'ghcjs-prim' (null) to fix evaluation errors 2017-07-26 10:20:30 +02:00
Peter Simons
91a8ed37af hackage-packages.nix: automatic Haskell package set update
This update was generated by hackage2nix v2.3.1-23-g656c589 from Hackage revision
2b4eeaa78b.
2017-07-26 10:20:25 +02:00
Peter Simons
1178136336 hackage2nix: disable failing builds 2017-07-26 10:19:58 +02:00
Peter Simons
fd6f0a2127 hackage2nix: drop obsolete version of zlib 2017-07-26 10:19:57 +02:00
Peter Simons
8a3c080237 hackage2nix: drop old packages that were required for stack prior to version 1.5.x 2017-07-26 10:19:57 +02:00
Peter Simons
4664cf8079 hackage2nix: keep Cabal 1.24.x around for the time being 2017-07-26 10:19:57 +02:00
Peter Simons
efa3ba8950 haskell-diagrams-solve: disable failing test suite to fix the build 2017-07-26 10:18:10 +02:00
Peter Simons
27ca0cb3d4 haskell-generic-builder: fix syntax high-lightning in Emacs 2017-07-26 10:17:48 +02:00