Commit graph

157 commits

Author SHA1 Message Date
Domen Kožar 7a71069309 ghcide: unbreak 2019-10-18 22:49:18 +02:00
Domen Kožar e5ae4a8dc6 ormolu: add from haskell package set 2019-10-13 14:27:17 +02:00
Peter Simons 6d95c7b595 haskell-gtk: clean up our existing overrides 2019-10-07 20:51:00 +02:00
Peter Simons 63faef32e6 haskell-pango: patch to fix the build 2019-10-07 20:51:00 +02:00
Konstantinos Sideris c4a42a726d haskellPackages.proteaaudio: link with the AudioToolbox framework on Darwin
The build is currently failing on Darwin due to missing headers. see #70151
2019-10-05 22:48:22 +03:00
mujx 0b1fb4f2d2 haskellPackages.OpenAL: link with the OpenAL framework on Darwin (#70150)
* haskellPackages.OpenAL: link with the OpenAL framework on Darwin

The missing framework caused a build failure on Darwin. Fixes #68306.
2019-10-05 21:44:09 +02:00
Domen Kožar ab5863afad
cachix: workaround https://github.com/NixOS/nix/issues/2990 2019-10-03 10:52:24 +02:00
Domen Kožar 660db64a26
cachix: fix build on darwin 2019-10-03 10:08:42 +02:00
Domen Kožar cb4332e3eb
Merge pull request #69886 from NixOS/haskell-updates
Haskell updates
2019-10-02 15:51:55 +02:00
Peter Simons f29e3b72df cachix: it's no longer necessary to add boost manually 2019-09-30 15:56:13 +02:00
Domen Kožar 821676200d
cachix: comment why boost is needed 2019-09-30 13:59:16 +02:00
Domen Kožar 3a59830c44
cachix&niv: use separate bin output 2019-09-29 09:52:11 +02:00
Domen Kožar e04dae50cf
fix dhall_1_26_0 reference 2019-09-28 21:33:14 +02:00
Dmitry Kalinkin c455adcc42
Merge branch 'master' into staging-next
Fixes eval on darwin after #69072

Resolved conflict in pkgs/tools/security/thc-hydra/default.nix
Basically had to revert a1c0e10564 which
adapts #69210 to master that doesn't yet have
329a88efa7

Tested using maintainers/scripts/eval-release.sh before and after to see
that the fix works
2019-09-25 19:21:46 -04:00
Olli Helenius 21977c055d haskellPackages.hadolint: fix build by disabling static linking 2019-09-25 15:28:40 +02:00
Vladimír Čunát 22a216849b
Re-Revert "Merge branch 'staging-next'"
This reverts commit f8a8fc6c7c.
2019-09-22 09:38:09 +02:00
Vladimír Čunát f8a8fc6c7c
Revert "Merge branch 'staging-next'"
This reverts commit 41af38f372, reversing
changes made to f0fec244ca.

Let's delay this.  We have some serious regressions.
2019-09-21 20:05:09 +02:00
Frederik Rietdijk 0b12d44c06 Merge master into staging-next 2019-09-19 16:59:42 +02:00
Luc Tielen b55447925d Update dhall: 1.25.0 -> 1.26.0 2019-09-18 19:36:58 +02:00
Jan Tojnar 1716d62f63
Merge branch 'staging-next' into staging 2019-09-10 07:06:45 +02:00
Izorkin 329a88efa7 treewide: replace mysql.connector-c to libmysqlclient 2019-09-09 15:55:34 +03:00
Domen Kožar 98c17a68e7
cachix: fix build 2019-09-09 09:52:29 +02:00
(cdep)illabout c88651aab9 haskell: Run termonad tests 2019-08-19 10:52:30 +02:00
Domen Kožar 3db2a41854 ghcid: standalone small closure 2019-08-15 16:05:10 +02:00
Peter Simons 57343fb703 haskell-pantry: disable test suite to fix the build 2019-08-11 20:48:10 +02:00
Peter Simons 3b19d7de6a haskell-http-download: disable test suite to fix the build 2019-08-11 20:48:10 +02:00
Peter Simons 3cbe376b37 haskell-llvm-hs: drop obsolete version overrides 2019-08-11 20:48:10 +02:00
Peter Simons e10ae7afa6 haskell-clock & tasty: break infinite recursions 2019-08-11 20:48:09 +02:00
Peter Simons 41ff1335e9 haskell-dhall-to-cabal: update override for the latest version 2019-08-03 17:34:30 +02:00
Christian Höppner d7ee2e2f47
haskellPackages.servant-client-core: apply patch only to 0.15
A patch was added unconditionally that only applies to 0.15, breaking
builds of 0.14.

Apply patch only if version is 0.15
2019-07-05 14:31:12 +01:00
Jan Tojnar 93580a122e
haskellPackages.llvm-hs: fix build
It requires llvm_8
2019-06-20 00:47:30 +02:00
Peter Simons d28f44c56c haskell-dhall: fix broken overrides 2019-06-07 11:59:57 +02:00
Silvan Mosberger 1d512f5870 haskellPackages: clean up some overrides
- jailbreak-cabal override isn't needed, shared executables are disabled
  by default (or is this precautionary?)

- Removed and added some infinite recursion overrides, moved them to
  configuration-nix.nix

- Unbreak zstd and attparsec-varword

- mysql override is already in configuration-nix.nix

- Move some overrides for disabling tests due to internet connectivity
  to configuration-nix.nix

Closes https://github.com/NixOS/nixpkgs/pull/62407.
2019-06-07 10:07:39 +02:00
Mario Rodas 6673cc8ee9
haskell: x509-system fix on darwin
x509-system requires access to the `security` executable. Partially
reverts [1: d69cc779b5]

1: d69cc779b5
   Revert "Revert "darwin 10.12 commits""
2019-05-12 11:00:00 -05:00
Matthew Bauer d69cc779b5 Revert "Revert "darwin 10.12 commits""
This reverts commit 8505e710e7.
2019-04-20 23:17:04 -04:00
Domen Kožar b06201bf6f
cachix: use separate bin output to prove it's useful
Spares compilation time by not compiling the package twice.
2019-03-29 15:10:54 +07:00
Troels Henriksen 27f7cf2cad futhark: only wrap the 'futhark' executable
Newer versions of Futhark only care about this executable, and the
others are thin wrappers that will go away in a future version.
2019-03-17 22:51:20 +01:00
Vladimír Čunát 71f4ba29a3
Merge branch 'master' into staging-next
Hydra nixpkgs: ?compare=1506218
2019-02-22 17:51:01 +01:00
Domen Kožar 673f50f4d9
haskellPackages.servant-client-core: patch out runtime error 2019-02-22 17:03:52 +07:00
Matthew Bauer b1bbd94bb6 Merge remote-tracking branch 'NixOS/master' into staging 2019-02-18 20:36:48 -05:00
Ryan Mulligan 9a32caa376
Merge pull request #53480 from andrew-d/andrew/git-annex-darwin
gitAndTools.git-annex: wrap binary on not-Linux to use Nixpkgs' coreutils
2019-02-17 10:37:43 -08:00
Jan Tojnar 606ceda352
gnome3: stop using aliases 2019-02-14 02:31:15 +01:00
Matthew Bauer 8101cf8c23
Merge pull request #54989 from srhb/taffybar-unoverride
taffybar: Remove strictDeps and restore overrideAttrs
2019-02-08 17:33:19 -05:00
Sarah Brofeldt 73eb54db18 taffybar: Remove strictDeps and restore overrideAttrs 2019-01-31 13:00:27 +01:00
Peter Simons 6c8098da26 haskell-tonaparser: disable test suite to avoid infinite recursion 2019-01-29 10:23:54 +01:00
Bas van Dijk 8ad610b040
Merge pull request #53523 from jacereda/futhark-darwin
Fix futhark build on Darwin
2019-01-07 12:13:13 +01:00
Peter Simons 056227a877 haskell-yaya: break infinite recursion 2019-01-07 10:57:21 +01:00
Jorge Acereda 2118e66fc3 futhark: fix darwin build 2019-01-06 22:56:50 +01:00
Andrew Dunham a5d41a30e5 gitAndTools.git-annex: wrap binary on not-Linux to use Nixpkgs' coreutils 2019-01-06 06:45:55 -05:00
Wisut Hantanong 8ae21a85cc haskellPackage.greenclip: add missing dependency (xdmcp) (#53388)
fixes #53336
2019-01-04 09:13:36 +01:00