1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-09-11 15:08:33 +01:00
Commit graph

782 commits

Author SHA1 Message Date
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
Profpatsch 70ed0fd3de haskellPackages.spy: fix for new fsnotify version
Temporary fix, until it is merged upstream.
2016-08-26 16:21:30 +02:00
Franz Pletz 237320190e haskellPackages.git-annex: fix hash 2016-08-24 21:31:02 +02: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
Brian McKenna 04a022be6d idris: fix build not finding dynamic library 2016-08-21 12:57:57 +10: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
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
obadz daf44055cd haskellPackages.stunclient: fix build error due to changing exports in deps 2016-08-11 16:42:28 +01:00
Nikolay Amiantov cd7bd0b42f mueval: fix build 2016-08-11 17:12:31 +03: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
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