Commit Graph
2284 Commits
Author SHA1 Message Date
Peter Simons d8f99973df hackage-packages.nix: update Haskell package set
This update was generated by hackage2nix v20160406 using the following inputs:

  - Hackage: https://github.com/commercialhaskell/all-cabal-hashes/commit/2266fbc644819a4de2aeeea7ba811d41fa453ab1
  - LTS Haskell: https://github.com/fpco/lts-haskell/commit/7a74143acf6bc16cbcf2ba3b33045a9f3fb92641
  - Stackage Nightly: https://github.com/fpco/stackage-nightly/commit/5e435cbedbaecd86319dddbca1690c64fc2ccfb5
2016-04-07 07:53:04 +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 f5c95fc1b2 configuration-hackage2nix.yaml: disable broken builds 2016-04-04 15:20:52 +02:00
Peter Simons de613e08dc haskell-doctest: use version 0.11.0 when compiling with GHC 8.0.x
Fixes https://github.com/sol/doctest/issues/125.
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
Peter Simons 0c0aa0413a hackage-packages.nix: update Haskell package set
This update was generated by hackage2nix v20160308-5-g3e915af using the following inputs:

  - Hackage: https://github.com/commercialhaskell/all-cabal-hashes/commit/57b937334dd073fc3efa850aaa81bdafbf88ec51
  - LTS Haskell: https://github.com/fpco/lts-haskell/commit/7a74143acf6bc16cbcf2ba3b33045a9f3fb92641
  - Stackage Nightly: https://github.com/fpco/stackage-nightly/commit/658d91e0e001d2b5f47d5670a3f0d5299126aa0e
2016-04-04 15:20:26 +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
Peter Simons ce2c13675d configuration-hackage2nix.yaml: update list of broken packages 2016-03-26 11:20:07 +01:00
Peter Simons 0f5db56b0b hackage-packages.nix: update Haskell package set
This update was generated by hackage2nix v20160308-3-g8057d11-dirty using the following inputs:

  - Nixpkgs: https://github.com/NixOS/nixpkgs/commit/840709b4a328998017b85479a9fce233d486c180
  - Hackage: https://github.com/commercialhaskell/all-cabal-hashes/commit/ab666959f09636bea6aa2b57a3941cfd3c211471
  - LTS Haskell: https://github.com/fpco/lts-haskell/commit/6c45757bda6547fb7bb847982c4b50b41bc31c07
  - Stackage Nightly: https://github.com/fpco/stackage-nightly/commit/d8a2cae77932579034f28ce11e4bfed4db1aa65a
2016-03-26 11:20:07 +01:00
Peter Simons 7b5728c0d4 configuration-hackage2nix.yaml: update list of broken packages 2016-03-24 11:52:35 +01:00
Nikolay Amiantov e74a8d08cc haskellPackages.Agda: add myself as a maintainer 2016-03-24 11:52:35 +01:00
Peter Simons 408f4aa654 hackage-packages.nix: update Haskell package set
This update was generated by hackage2nix v20160308-3-g8057d11 using the following inputs:

  - Nixpkgs: https://github.com/NixOS/nixpkgs/commit/bba4f2bbe3ae2ad104444ca83f3cbef97834a175
  - Hackage: https://github.com/commercialhaskell/all-cabal-hashes/commit/ab666959f09636bea6aa2b57a3941cfd3c211471
  - LTS Haskell: https://github.com/fpco/lts-haskell/commit/6c45757bda6547fb7bb847982c4b50b41bc31c07
  - Stackage Nightly: https://github.com/fpco/stackage-nightly/commit/d8a2cae77932579034f28ce11e4bfed4db1aa65a
2016-03-24 11:52:19 +01:00
Peter Simons 9a0e630874 configuration-hackage2nix.yaml: update list of broken packages 2016-03-23 18:25:22 +01:00
Peter Simons 1e5d6e584d hackage-packages.nix: update Haskell package set
This update was generated by hackage2nix v20160308-3-g8057d11 using the following inputs:

  - Nixpkgs: https://github.com/NixOS/nixpkgs/commit/9da84a6af0c25e599de1ce80da223cb1176eb37e
  - Hackage: https://github.com/commercialhaskell/all-cabal-hashes/commit/1e26fd18769cf4f943d4d92f659668b32cbfc85c
  - LTS Haskell: https://github.com/fpco/lts-haskell/commit/6c45757bda6547fb7bb847982c4b50b41bc31c07
  - Stackage Nightly: https://github.com/fpco/stackage-nightly/commit/d8a2cae77932579034f28ce11e4bfed4db1aa65a
2016-03-23 18:25:14 +01:00
Peter Simons 9405b1f497 hackage-packages.nix: update Haskell package set
This update was generated by hackage2nix v20160308-3-g8057d11 using the following inputs:

  - Nixpkgs: https://github.com/NixOS/nixpkgs/commit/cc6b62965c9c59011709e84ad9f3d763ec5b4ffc
  - Hackage: https://github.com/commercialhaskell/all-cabal-hashes/commit/81034151438ea05e24228e220e2eb18363cfe2d6
  - LTS Haskell: https://github.com/fpco/lts-haskell/commit/6bcb171af74b3bcce09d9ba8da3c2ef819232dcc
  - Stackage Nightly: https://github.com/fpco/stackage-nightly/commit/26f7d11e374996252486b3e531e947a034132ca0
2016-03-21 13:18:57 +01:00
Peter Simons ca34db0409 configuration-hackage2nix.yaml: update list of broken packages 2016-03-21 13:18:56 +01:00
Peter Simons bd2bc77f8c haskell-transformers-compat: fix build with GHC 8.0.x 2016-03-21 13:17:54 +01: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 daa03b0229 configuration-hackage2nix.yaml: update list of broken Haskell builds
@gridaphobe, this affects your packages 'liquid-fixpoint', 'liquidhaskell', and
'target'.
2016-03-18 08:16:05 +01:00
Peter Simons 3689c34b31 hackage-packages.nix: update Haskell package set
This update was generated by hackage2nix v20160308-3-g8057d11 using the following inputs:

  - Nixpkgs: https://github.com/NixOS/nixpkgs/commit/3b6870536f4ba989ef2b3f6d919564d5a5d3faac
  - Hackage: https://github.com/commercialhaskell/all-cabal-hashes/commit/f6dcb81d2a28b1419ef4a4b6513276e52c75f6bb
  - LTS Haskell: https://github.com/fpco/lts-haskell/commit/6bcb171af74b3bcce09d9ba8da3c2ef819232dcc
  - Stackage Nightly: https://github.com/fpco/stackage-nightly/commit/fbf2e48e585f4323b603c9e72e8b925cfe0f5724
2016-03-18 08:16:05 +01:00
Peter Simons 067f64469f configuration-common.nix: drop obsolete override 2016-03-18 07:52:37 +01:00
Peter Simons 57af6102f8 configuration-hackage2nix.yaml: enable builds for jsaddle, Agda, and Leksah 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
Peter Simons fe5d98d4c2 hackage-packages.nix: update Haskell package set
This update was generated by hackage2nix v20160308-3-g8057d11 using the following inputs:

  - Nixpkgs: https://github.com/NixOS/nixpkgs/commit/8b2661d933c62f1c1deaed74a88949838e81cc23
  - Hackage: https://github.com/commercialhaskell/all-cabal-hashes/commit/c6f8f98e5780f93e5501be79cabdfaa9d5f95b52
  - LTS Haskell: https://github.com/fpco/lts-haskell/commit/6bcb171af74b3bcce09d9ba8da3c2ef819232dcc
  - Stackage Nightly: https://github.com/fpco/stackage-nightly/commit/fbf2e48e585f4323b603c9e72e8b925cfe0f5724
2016-03-18 07:52:31 +01:00
Peter Simons b8635a2f45 hackage-packages.nix: update Haskell package set
This update was generated by hackage2nix v20160308-2-g1fd2040 using the following inputs:

  - Nixpkgs: https://github.com/NixOS/nixpkgs/commit/5963f785c987986df471cbbefa32440304295bf7
  - Hackage: https://github.com/commercialhaskell/all-cabal-hashes/commit/918817d0604a9504b7fd24992e020c53f6f2e692
  - LTS Haskell: https://github.com/fpco/lts-haskell/commit/6bcb171af74b3bcce09d9ba8da3c2ef819232dcc
  - Stackage Nightly: https://github.com/fpco/stackage-nightly/commit/fbf2e48e585f4323b603c9e72e8b925cfe0f5724

Also update list of broken packages in configuration-hackage2nix.yaml.
2016-03-17 16:07:23 +01:00
Peter Simons 76dead2099 Merge pull request #13954 from grwlf/conduit-fix
haskell-modules: fix conduit runtime dependency
2016-03-16 14:47:26 +01:00
Sergey Mironov b14a6f1f98 haskell-modules: fix conduit runtime dependency 2016-03-16 10:38:12 +03:00
Peter Simons 9f3ca09f94 hackage-packages.nix: update Haskell package set
This update was generated by hackage2nix v20160308 using the following inputs:

  - Nixpkgs: https://github.com/NixOS/nixpkgs/commit/47c2c01ea75db3abb8b4a36a936d606065326cab
  - Hackage: https://github.com/commercialhaskell/all-cabal-hashes/commit/435f8156b7834ab1d687666be789b57abc8ac564
  - LTS Haskell: https://github.com/fpco/lts-haskell/commit/6bcb171af74b3bcce09d9ba8da3c2ef819232dcc
  - Stackage Nightly: https://github.com/fpco/stackage-nightly/commit/a161c91389f59139623ed71ea3bce1591f3c1b1d

Also, update the list of broken builds in configuration-hackage2nix.yaml.
2016-03-15 13:16:12 +01:00
Ryan Trinkle 440b301d0a Merge pull request #13931 from mightybyte/unix-compat-needs-libiconv
ghcjs: on Darwin, build unix-compat with libiconv
2016-03-15 01:11:02 -04:00
Doug Beardsley a0ecf9cee2 ghcjs: on Darwin, build unix-compat with libiconv 2016-03-15 12:07:59 +08: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
Peter Simons 22f31ea6a0 hackage-packages.nix: update Haskell package set
This update was generated by hackage2nix v20151217-13-g1932303 using the following inputs:

  - Nixpkgs: https://github.com/NixOS/nixpkgs/commit/048b08e2df950731939a3d7281d22215569f1b39
  - Hackage: https://github.com/commercialhaskell/all-cabal-hashes/commit/9380d724dd8842b56412be3cf99d2f170f5d5a2c
  - LTS Haskell: https://github.com/fpco/lts-haskell/commit/d2ad5fe9030deeacf1ed9c9de9045c65e597ca76
  - Stackage Nightly: https://github.com/fpco/stackage-nightly/commit/04ed93d83062a82ff9489964485538e6e2b37ac2
2016-03-08 10:50:13 +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 e9fc4e7db6 Merge remote-tracking branch 'origin/master' into hardened-stdenv 2016-03-07 22:08:27 +01:00
Peter Simons 48a9555bc0 Merge pull request #13695 from forked-upstream-packages-for-ghcjs/more-bootpkgs
ghcjs: Use bootpkgs to override build tools, not hardcoded compiler's…
2016-03-07 14:15:42 +01:00
John Ericson e4abe06b8a ghcjs: Use bootpkgs to override build tools, not hardcoded compiler's pgks 2016-03-06 12:39:12 -08:00
Mathieu Boespflug b1b85ddb81 buildStackPackage: Fix path to generic-stack-builder.nix.
Before:

```
error: getting status of
‘/home/user/nixpkgs/pkgs/development/development/haskell-modules/generic-stack-builder.nix’:
No such file or directory
```
2016-03-06 10:35:25 +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