Commit graph

219 commits

Author SHA1 Message Date
Peter Simons
fc8ccfa780 haskell-dhall: update overrides for the latest version 2019-12-06 20:55:12 +01:00
Frederik Rietdijk
d14baf7747 Merge master into staging-next 2019-11-30 08:57:28 +01:00
(cdep)illabout
bb104abf63 spago: init at 0.12.1.0
This commit adds the spago package, a PureScript package manager and build tool.

https://github.com/spacchetti/spago
2019-11-29 10:13:35 +09:00
Frederik Rietdijk
5f8b0d7d99 Merge staging-next into staging 2019-11-19 14:53:29 +01:00
adisbladis
c9d8624ccd
treewide: Get rid of libGLU_combined 2019-11-18 20:10:43 +00:00
(cdep)illabout
22890f7b13 haskellPackages.llvm-hs: fix build on darwin 2019-11-15 21:08:45 +01:00
William R. Arellano
266ee8d74d Update pkgs/development/haskell-modules/configuration-nix.nix
Co-Authored-By: Dennis Gosnell <cdep.illabout@gmail.com>
2019-11-15 21:08:45 +01:00
William R. Arellano
227a8e0e7c dotnev: move changes from configuration-nix to configuration-common 2019-11-15 21:08:45 +01:00
William R. Arellano
b06de887f7 dotenv: fix broken package version 0.8.0.2 2019-11-15 21:08:45 +01:00
Domen Kožar
f1682a7f12
servant-client-core: patch a security issue leaking authorization header 2019-11-12 12:48:36 +01:00
William R. Arellano
aff8660932 hapistrano: addBuildTool -> addBuildTools 2019-11-08 18:52:37 +01:00
William R. Arellano
71446091a8 hapistrano: fix broken package 2019-11-08 18:52:36 +01:00
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
Jan Tojnar
a51a99c690
gobject-introspection: rename package
camelCase package name was a huge inconsistency in GNOME package set.
2018-12-02 12:42:29 +01:00
Peter Simons
95ae25600e ghc-8.6.x: update overrides 2018-10-19 14:44:22 +02:00
Ryan Mulligan
07f8104707 treewide: fix evaluation with allowAliases = false 2018-10-13 15:32:07 -07:00
Bas van Dijk
0c25079958
futhark: introduce the top-level futhark attribute
The fact that futhark is a Haskell package is an implementation detail. To
install it users should just have to specify `futhark` instead of
`haskellPackages.futhark`.

Additionally futhark is overridden with `haskell.lib.justStaticExecutables` to
reduce closure size.
2018-10-12 14:12:29 +02:00
Matthew Bauer
300ff965ae haskell: fix x509-system on mojave
darwin.security_tool is currently broken in Mojave. See issue #45042
for more info. Our security_tool stuff comes from 10.9 so I suspect
that it needs an update.

Here I am putting in a hack to get things working again. This uses the
system provided security binary at /usr/bin/security to avoid the
issue in Haskell’s x509-system package. Unfortunately, this will break
with the sandbox. I am also working on a proper fix, but this requires
updating lots of Apple stuff (and also copumpkin’s new CF). You can
follow the progress on this branch:

  https://github.com/matthewbauer/nixpkgs/tree/xcode-security

This commit should be backported to release-18.03 and release-18.09.

/cc @copumpkin @lnl7 @pikajude
2018-10-02 15:14:11 -05:00
Bas van Dijk
73cf1c26d8 haskellPackages.Frames-beam: disable tests because it requires a running PostgreSQL server 2018-09-23 21:57:17 +02:00
John Ericson
8a41a11d66
Merge pull request #47096 from obsidiansystems/fix-x509-system
haskellPackages.x509-system: Override based on the host, not target platform
2018-09-20 21:55:24 -04:00
John Ericson
45c637d8a0 haskellPackages.x509-system: Override based on the host, not target platform
There were many reverts back and forth, but it ultimately appears that I
am the source of this mistake. I clarified the comment so as not to
confuse myself or anyone else.
2018-09-20 21:48:06 -04:00
Nathan van Doorn
c8598daad4 haskellPackages.sbv: fix location of z3 executable
A lot of the functionality of the z3 library depends on it being able to
find the z3 executable on $PATH. Hard-coding it here means it will never
be unable to find it and z3 doesn't need to pollute $PATH.
2018-09-20 11:45:16 +01:00
(cdep)illabout
da86e4255b haskellPackages.termonad: Add dontCheck and remove from dont-distribute-packages.
The doctests for termonad fail to build only with nix.  When building
without nix, the doctests run correctly:

https://github.com/cdepillabout/termonad/issues/15

This PR disables the tests for termonad, as well as removing it from
dont-distribute-packages.
2018-09-12 10:31:09 +02:00
Peter Simons
11930854a2 haskell-yaml: drop obsolete override 2018-09-12 10:31:08 +02:00
Carlos D
0909282b1b haskellPackages.mattermost-api: skip check 2018-08-21 10:16:59 +10:00
Travis Whitaker
a3e7fc876a haskellPackages.llvm-hs: Use LLVM 6 with llvm-hs, don't run tests on Darwin. 2018-08-05 07:46:10 -07:00
Domen Kožar
059c2312be
haskell: move yaml overrides to configuration-nix 2018-07-25 15:17:56 +01:00
Jack Kelly
b2be524e30 haskellPackages.blank-canvas: Move fixes to configuration-common.nix 2018-07-24 10:32:00 +10:00
Bas van Dijk
f30bfcd623 doctest-discover: move override out of configuration-nix.nix
and move it to configuration-common.nix where it belongs.
configuration-nix.nix is only for fixing build failures
due to Nix.
2018-07-24 01:42:43 +02:00
Bas van Dijk
3d4ea59f20
Merge pull request #43959 from endgame/dontCheck-doctest-discover
haskellPackages.doctest-discover: Disable tests
2018-07-24 01:24:19 +02:00
Domen Kožar
cbb50b8188
haskellPackages.servant-streaming-server: dontCheck 2018-07-23 13:19:09 +01:00
Jack Kelly
2dd664140b haskellPackages.doctest-discover: Disable tests
The source package is missing a required file. See:

- https://github.com/karun012/doctest-discover/issues/22
- https://github.com/karun012/doctest-discover/issues/23
2018-07-22 17:08:43 +10:00
Peter Simons
b667721ce2
Merge pull request #43730 from srhb/dontcheck-spatial-rotation
haskellPackages.spatial-rotations: dontCheck for cyclic dependency
2018-07-19 14:00:55 +02:00
Sarah Brofeldt
b53b5950fc haskellPackages.spatial-rotations: dontCheck for cyclic dependency 2018-07-19 10:37:12 +02:00
Matthew Bauer
76999cc40e treewide: remove aliases in nixpkgs
This makes the command ‘nix-env -qa -f. --arg config '{skipAliases =
true;}'’ work in Nixpkgs.

Misc...

- qtikz: use libsForQt5.callPackage

  This ensures we get the right poppler.

- rewrites:

  docbook5_xsl -> docbook_xsl_ns
  docbook_xml_xslt -> docbook_xsl

diffpdf: fixup
2018-07-18 23:25:20 -04:00
Silvan Mosberger
d767c0c253
idris: Remove unneeded overrides
- The gmp issue has long been fixed and closed
- The preBuild thing was never used afaik, it works no problem without
it, especially since checks don't run (To get checks to work we'd have
to compile the libraries into idris, which are currently nicely
separated)
- The dependencies overrides aren't needed anymore
2018-07-13 00:59:30 +02:00
Peter Simons
62239af3ee haskell-manifolds: break infinite recursion in test suite dependencies 2018-07-10 20:10:26 +02:00
Peter Simons
a711d4342f Update Haskell overrides for lts-12.x. 2018-07-10 20:10:26 +02:00
John Ericson
740cfffcb2 haskell infra: Fix built-time overrides
These should all come from `buildHaskellPackages`
2018-07-09 18:09:17 -04:00
Peter Simons
6e07a3a19a
Revert "haskell generic-builder: Use strictDeps always" 2018-07-04 13:18:21 +02:00
Domen Kožar
9ed54a38bd configuration-common.nix: fix build tools 2018-07-03 19:24:40 -04:00
Matthew Bauer
fea9a71ff4 haskell: add more test tool depend for hspec-discover
Needed for new ‘strictDeps = true;’ handling.

Including-

- slim
- string-conversions
- skeletal-test
- catamorphism
- unliftio
- logging-facade
- distributive
- doctest
- http-types
- interpolate
- mockery
- mime-mail
- http2
2018-07-02 15:52:47 -04:00
Domen Kožar
5974bb7c9c
haskell: Move version dependent overrides from to configuration-common 2018-06-30 15:49:36 +01:00
Jan Tojnar
30c154d99b
haskellPackages.llvm-hs_6_3_0: fix build 2018-06-29 11:31:16 +02:00
Jan Tojnar
0bc250c48b
haskellPackages.llvm-hs_6_2_0: fix build 2018-06-14 12:32:59 +02:00
Michael Alan Dorman
ba17cbfd1f taffybar: turn on strictDeps 2018-06-07 15:22:16 +02:00
Michael Alan Dorman
b7a0c60e8b dbus-hslogger, status-notifier-item: specify dbus version 2018-06-07 15:22:16 +02:00
Michael Alan Dorman
2558c41192 gi-dbusmenugtk3: add dependency on gtk3 2018-06-07 15:22:16 +02:00
Moritz Angermann
63e5b3ce71 used stdenv.targetPlatform.isDarwin and not stdenv.isDarwin. 2018-05-23 10:27:42 -04:00
Peter Simons
5db3a9df5e
Revert "ghc, haskell infra: #40642 direct to master" 2018-05-23 09:36:16 +02:00
Moritz Angermann
f914fdd960 used stdenv.targetPlatform.isDarwin and not stdenv.isDarwin. 2018-05-21 15:11:11 -04:00