Commit graph

2406 commits

Author SHA1 Message Date
Alex Brandt 8b4fec00e0 add alunduil as collection-json maintainer 2017-08-22 18:31:08 -05:00
Peter Simons 7b16f5974e git-annex: update to version 6.20170818
Fixes CVE-2017-9800, CVE-2017-12836, CVE-2017-1000116, and CVE-2017-1000117.
2017-08-22 14:52:29 +02:00
Peter Simons 499b9ebc01 liquidhaskell: fix build of the required old aeson version
Closes https://github.com/NixOS/nixpkgs/issues/28372.
2017-08-22 14:52:29 +02:00
Peter Simons f445fe7574 hackage-packages.nix: automatic Haskell package set update
This update was generated by hackage2nix v2.4.1-5-g0ed67c9 from Hackage revision
a355eb34ee.
2017-08-22 14:52:25 +02:00
Peter Simons 4ad193dd27 hackage2nix: partially revert https://github.com/NixOS/nixpkgs/pull/28383 to fix evaluation
5342bffc15 refers to an unknown Nixpkgs maintainer.
2017-08-22 14:51:57 +02:00
Peter Simons 4c07f40597 hackage2nix: keep old base-orphans around for liquidhaskell 2017-08-22 14:51:57 +02:00
Domen Kožar 37c340728e
servant-auth: tests pass for a while now 2017-08-21 14:42:05 +02:00
Peter Simons 6fe751fb5c ghcWithHoogle: deal gracefully with packages that have no haddockDir attribute 2017-08-19 17:20:39 +02:00
Peter Simons 01b8c4c9e5 ghcWithHoogle: cosmetic for the sake of Emacs syntax highlighting 2017-08-19 17:19:47 +02:00
Peter Simons 1ddf621b4e hackage-packages.nix: automatic Haskell package set update
This update was generated by hackage2nix v2.4.1-4-g53777ef from Hackage revision
cf0ce68962.
2017-08-19 16:28:19 +02:00
Peter Simons 5468d5c662 Merge pull request #27991 from Profpatsch/hoogleLocal-fix
Fix the `ghcWithHoogle` function to cope with the presence of separate `doc` outputs.
2017-08-19 16:26:30 +02:00
Alex Brandt 5342bffc15 remove collection-json from dont-distribute-packages
I believe I've fixed the build issues for collection-json and would like
to see it make it into the next stable release of NixOS.  I'm also
adding myself as maintainer.

Let me know if there is anything I did incorrectly or missed.
2017-08-19 08:41:23 +02:00
Peter Simons b6a746daa1 Merge pull request #28097 from cocreature/sdistTarball-doc
haskell: remove any extraneous outputs from sdistTarball
2017-08-18 16:32:51 +02:00
Daiderd Jordan d491eebffd
haskell-packages: fix evaluation 2017-08-17 22:43:15 +02:00
Peter Simons 7b73fb3b8a hackage-packages.nix: automatic Haskell package set update
This update was generated by hackage2nix v2.4.1-4-g53777ef from Hackage revision
79410fccc7.
2017-08-17 21:32:29 +02:00
Peter Simons 6ff62030d9 LTS Haskell 9.1 2017-08-17 21:32:26 +02:00
Domen Kožar 105864a24d
purescript: fix building #28296 2017-08-16 15:44:28 +02:00
rnhmjoj da8712e4e9 haskellPackages.shell-conduit: fix failing test 2017-08-15 12:06:53 +02:00
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
Moritz Kiefer 291da85ed9 haskell: remove any extraneous outputs from sdistTarball 2017-08-10 08:48:59 +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
Profpatsch 4a8efae000 pkgs/haskell-modules/hoogle.nix: find haddocks by haddockDir
Previously a few clumsy shell globs were used to find haddock output, which
broke every time something in `generic-builder.nix` changed.
Use the new `haddockDir` identifier exported by haskell packages.
2017-08-06 22:02:50 +02:00
Profpatsch e9e25ec5fe pkgs/haskell-modules: expose haddockDir as passthru variable
WIP

If the `hoogle.nix` file wants to have any sane chance of finding haddock
outputs, the packages need to export the haddock folders as an identifier.

A few TODOs still stand, like passing self to the package instead of needing to
pass it to `haddockDir`. Maybe the exported identifier should be integrated into
the fixpoint somehow instead of using `passthru`?
2017-08-06 21:48:22 +02:00
Profpatsch 3f27a36912 pkgs/haskell-modules: two small vanity fixes 2017-08-06 21:46:49 +02:00
Profpatsch 4e6c41e7fa pkgs/haskell-modules: fix hoogleLocal docstring 2017-08-06 21:46:22 +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