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
Robin Gloster
63c7b4f9a7
Merge remote-tracking branch 'upstream/master' into hardened-stdenv
2016-07-31 20:51:34 +00: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
Peter Simons
66ca9b9146
git-annex: update hash for new version
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
Benno Fünfstück
2e48d838d0
haskell/Glob: fix build
2016-07-23 01:27:40 +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
Robin Gloster
1f04b4a566
Merge remote-tracking branch 'upstream/master' into hardened-stdenv
2016-07-21 00:56:43 +00: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
Robin Gloster
203846b9de
Merge remote-tracking branch 'upstream/master' into hardened-stdenv
2016-07-19 10:37:02 +00: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
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
a7e33a1a1e
cabal2nix: update to version 20160613-10-g57dddc7
2016-07-01 12:01:03 +02:00
Peter Simons
06d3636596
git-annex: update sha256 hash
2016-06-20 17:01:36 +02:00
Bas van Dijk
d0c7056b92
inline-c-cpp: fix build on darwin
2016-06-16 01:03:22 +02:00
Peter Simons
00bebe798c
haskell-http2: remove obsolete override
2016-06-12 08:37:06 +02:00
Peter Simons
71f0092143
haskell-lhc: drop obsolete override
2016-06-12 08:37:05 +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
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
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
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
d27881c014
haskell-pandoc: fix build
2016-06-03 16:12:41 +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
Robin Gloster
2382084e3b
haskellPackages.gtk{,3}: disable fortify hardening
2016-05-31 12:22:17 +00:00
Franz Pletz
f8d481754c
Merge remote-tracking branch 'origin/master' into hardened-stdenv
2016-05-18 17:10:02 +02:00
Dave Laing
0540a83789
llvm-general: Adds Darwin compatibilty
2016-05-13 09:41:15 +10: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
f5a7f03bbe
haskell-darcs: migrate overrides into cabal2nix generator
2016-05-05 12:51:47 +02:00
Peter Simons
17022a70f2
haskell-stack: migrate overrides into cabal2nix generator
2016-05-05 12:51:46 +02:00
Peter Simons
e5536b799a
haskell-split: re-enable test suite
...
split version 0.2.3.1 ought to fix the issue we've had:
a2e1692730 (commitcomment-17331531)
2016-05-05 12:51:13 +02:00
Peter Simons
ddb8c06c2d
haskell-yi: mark as broken
2016-05-03 10:22:22 +02:00
Peter Simons
ec49307518
haskell-hakyll: fix test suite by providing "rev" in test environment
2016-05-03 10:22:22 +02:00
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