Commit graph

1691 commits

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