Commit Graph

1836 Commits

Author SHA1 Message Date
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 277efdd50e)
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