Commit graph

712 commits

Author SHA1 Message Date
Robin Gloster
c92bca56f8 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-05-02 22:58:02 +00:00
Peter Simons
a2e1692730 haskell-split: disable test suite to avoid transient build failures
We have frequent build failures of "split" because the QuickCheck testsuite
cannot generate enough conclusive test cases, i.e. in

  https://hydra.nixos.org/build/34857780/nixlog/1/raw

Cc: @byorgey
2016-04-28 12:02:08 +02:00
Peter Simons
cf4a69e2ec haskell-tinc: move the tool into the haskellPackages hierarchy like all other Haskell packages 2016-04-24 20:13:27 +02:00
Robin Gloster
0087d16120 haskellPackages: clean up unnecessary overrides 2016-04-20 17:08:26 +00:00
Robin Gloster
9a8a9c43b4 haskellPackages.pango: turn off fortify hardening 2016-04-19 12:21:06 +00:00
Robin Gloster
33ef14fb62 haskellPackages: clean up unnecessary overrides 2016-04-19 12:15:23 +00:00
Robin Gloster
fd77c5c5a0 haskellPackages.gio: turn off fortify hardening 2016-04-19 10:56:55 +00:00
Robin Gloster
d020caa5b2 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-04-18 13:49:22 +00:00
Anthony Cowley
3f845da22a haskell-modules: darwin configuration-common
- Reconfigure OpenGL/CL related packages to propagate the necessary
  framework dependencies.

- Disable tests on all versions of c2hs so package sets such as LTS
  releases work.

Closes https://github.com/NixOS/nixpkgs/pull/14609.
2016-04-14 09:17:55 +02:00
Vladimír Čunát
39ebb01d6e Merge branch 'staging', containing closure-size #7701 2016-04-13 09:25:28 +02:00
obadz
7f2163fc97 haskellPackages.haste-compiler: fix so that it now builds and runs
Required adding:
haskellPackages.haste-Cabal, and
haskellPackages.haste-cabal-install
2016-04-11 15:24:56 +01:00
Vladimír Čunát
30f14243c3 Merge branch 'master' into closure-size
Comparison to master evaluations on Hydra:
  - 1255515 for nixos
  - 1255502 for nixpkgs
2016-04-10 11:17:52 +02:00
Robin Gloster
3e68106afd Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-04-07 21:52:26 +00:00
Peter Simons
c0a5872c2c configuration-common.nix: fix syntax error (and cosmetic) 2016-04-07 07:58:32 +02:00
Michael Alan Dorman
2daf67bf87 haskell-pipes-transduce: fix build 2016-04-07 07:53:57 +02:00
obadz
8c2e8ec13c haskellPackages.dnssd: override the dns_sd dependency to point to avahi built with the right flags.
Fixes #14502
2016-04-06 22:21:56 +01:00
Robin Gloster
58a73d3f4b haskellPackages.lvmrun: disable format hardening 2016-04-06 08:26:01 +00:00
Robin Gloster
057a899791 haskellPackages.glib: disable fortify hardening 2016-04-06 08:18:14 +00:00
Robin Gloster
bbbaccfa68 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-04-04 15:24:52 +00:00
Peter Simons
0d39f485f0 haskell-hruby: remove obsolete override
Closes https://github.com/NixOS/nixpkgs/pull/13920.
2016-04-04 15:20:52 +02:00
Peter Simons
574f63b956 haskell-hspec: fix infinite recursion in version 2.2.2 2016-04-04 15:20:37 +02:00
Vladimír Čunát
ab15a62c68 Merge branch 'master' into closure-size
Beware that stdenv doesn't build. It seems something more will be needed
than just resolution of merge conflicts.
2016-04-01 10:06:01 +02:00
Robin Gloster
a4e65c3639 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-03-30 09:01:20 +00:00
Nikolay Amiantov
cef2db7e76 haskellPackages.mueval: fix build 2016-03-29 02:23:06 +03:00
Robin Gloster
f60c9df0ba Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-03-28 15:16:29 +00:00
Nikolay Amiantov
b1179bdbcf haskellPackages.Agda: use older cpphs
Package requires cpphs < 0.20.0.
2016-03-18 23:32:26 +03:00
Peter Simons
067f64469f configuration-common.nix: drop obsolete override 2016-03-18 07:52:37 +01:00
Peter Simons
fb1f18b98c haskell-jsaddle: fix build by disabling the test suite 2016-03-18 07:52:36 +01:00
Peter Simons
73d1d84e54 haskell-Agda: add necessary overrides for older versions to fix the LTS builds 2016-03-18 07:52:36 +01:00
obadz
a0f0a7191f leksah: add the appropriate deps to enable running 2016-03-18 07:52:36 +01:00
Robin Gloster
3f45f0948d Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-03-15 01:44:24 +00:00
Christoph Hrdinka
b10288eaa5 haskell-hs-blake2: fix dependency on libb2
`hs-blake2` currently wrongly depends on `pkgs.b2` which is an application
for backblazes storage service. This patch overrides it to link against
its correct native library `pkgs.libb2`.
2016-03-12 18:57:42 +01:00
Vladimír Čunát
09af15654f Merge master into closure-size
The kde-5 stuff still didn't merge well.
I hand-fixed what I saw, but there may be more problems.
2016-03-08 09:58:19 +01:00
Franz Pletz
cb3d27df93 Merge remote-tracking branch 'origin/master' into hardened-stdenv 2016-03-05 18:55:30 +01:00
Franz Pletz
aff1f4ab94 Use general hardening flag toggle lists
The following parameters are now available:

  * hardeningDisable
    To disable specific hardening flags
  * hardeningEnable
    To enable specific hardening flags

Only the cc-wrapper supports this right now, but these may be reused by
other wrappers, builders or setup hooks.

cc-wrapper supports the following flags:

  * fortify
  * stackprotector
  * pie (disabled by default)
  * pic
  * strictoverflow
  * format
  * relro
  * bindnow
2016-03-05 18:55:26 +01:00
Franz Pletz
d4ece75fd6 haskellPackages.epanet-haskell: Turn format hardening off 2016-03-05 16:53:38 +01:00
Nikolay Amiantov
0865d19ccd haskellPackages.Agda: use older unordered-containers to fix build
Fixes #13594.
2016-03-05 17:58:48 +03:00
Robin Gloster
d47857c3d9 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-03-01 21:09:17 +00:00
Vladimír Čunát
0294fc5bbd haskellPackages: fix evaluation
It seems `self` was wanted instead of `pkgs` by the author of 3844206.
2016-02-29 10:54:25 +01:00
Robin Gloster
3b4765c9e5 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-02-28 16:32:57 +00:00
Michael Alan Dorman
3844206366 Make sure we use the older version of hjsonpointer 2016-02-28 11:34:59 +01:00
Peter Simons
4ee5a8865d mwc-random: drop obsolete overrides 2016-02-28 11:34:59 +01:00
Robin Gloster
3477e662e6 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-02-27 00:08:08 +00:00
zimbatm
4ecb1ce679 Merge pull request #11274 from robgssp/ldap
ldap-client: don't break on test failures
2016-02-26 23:13:27 +00:00
Robin Gloster
1eed9435d5 haskellPackages.glib: simplify 2016-02-21 11:40:16 +00:00
Robin Gloster
0102e69707 haskellPackages.c2hs: fix evaluation 2016-02-21 11:39:41 +00:00
Franz Pletz
41698c9efa Merge branch 'master' into hardened-stdenv 2016-02-15 20:05:29 +01:00
Vladimír Čunát
d039c87984 Merge branch 'master' into closure-size 2016-02-14 08:33:51 +01:00
Peter Simons
328d9967d3 haskell-pandoc: drop obsolete override 2016-02-12 21:14:03 +01:00
Peter Simons
e771dc4b06 haskell-hans: drop obsolete patch 2016-02-12 21:14:03 +01:00