1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-12-15 09:03:48 +00:00
Commit graph

88 commits

Author SHA1 Message Date
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
Peter Simons 07dc607a8d
Merge pull request #40250 from LumiGuide/fix-base-compat-batteries
haskell: fix build of base-compat-batteries
2018-05-10 15:09:36 +02:00
Bas van Dijk 53d6997e5d haskell: fix build of base-compat-batteries 2018-05-09 22:59:54 +02:00
Jack Kelly 33bc4a7b3b haskellPackages.blank-canvas_0_6_2: dontCheck
Same reason as 2d01bb7f6a, but for the
specific-version package.
2018-05-09 12:05:26 +10:00
Jack Kelly c8b9ac9be6 haskellPackages.base-compat-batteries: fix bad dependency 2018-04-27 20:05:38 +10:00
Michael Alan Dorman 9358f60f94 taffybar: fix build
Closes https://github.com/NixOS/nixpkgs/issues/38531.
2018-04-12 09:06:33 +02:00
Jack Kelly c2ce7070b1 Whitespace lint 2018-04-09 07:27:03 +10:00
Jack Kelly 2d01bb7f6a haskellPackages.blank-canvas: disable tests
The tests require a browser and possibly some manual
intervention. See https://github.com/ku-fpg/blank-canvas/issues/73
2018-04-09 07:26:50 +10:00
Michael Alan Dorman c83682bb68 gtk-traymanager: fix build 2018-04-08 08:56:57 +02:00
Reuben D'Netto b66892931e haskellPackages.cuda: Fixed broken dependency 2018-03-09 18:33:28 +11:00
Vladimír Čunát 565bd805e6
Merge branch 'master' 2018-03-05 14:53:27 +01:00
Dominic Steinitz d1ac8d1e1a Merge branch 'master' of https://github.com/NixOS/nixpkgs 2018-03-01 09:14:18 +00:00
Dominic Steinitz 183c3603fa No longer needed and causes confusion 2018-03-01 09:11:45 +00:00
Nikolay Amiantov f6925dbdd8 opencv3: enable contrib by default 2018-02-25 22:24:10 +03:00
Alexander V. Nikolaev 0acec7e984 treewide: transition mesa to libGLU_combined 2018-02-24 17:06:49 +02:00
Alexander V. Nikolaev 8f2a22935c treewide: transition from mesa_noglu to libGL 2018-02-24 17:03:46 +02:00
Daiderd Jordan db7e0aeb42
llvm-packages: cleanup 2018-02-06 23:38:46 +01:00
Vladimír Čunát 1fcd92ce92
Merge branch 'master' into staging
A few thousand rebuilds from master, again.
Hydra: ?compare=1422362
2017-12-31 09:53:49 +01:00
Nick Hu 47c1711f68 llvm-hs: fix llvm-config dependency 2017-12-29 22:38:27 +00:00
Vladimír Čunát a1a3e54ac9
Merge branch 'master' into staging
Haskell rebuild :-)
Hydra: ?compare=1421865
2017-12-29 18:39:36 +01:00
Rickard Nilsson 1de251c664 haskellPackages.LDAP: Fix build 2017-12-29 11:42:20 +01:00
Robin Gloster ee1c85aee9 mariadb: lib -> connector-c 2017-12-29 02:18:35 +01:00
Orivej Desh d3a375fe58 haskell-configuration-nix: fix eval 2017-12-20 09:50:21 +00:00
Peter Simons 1c0c6d80e7 haskell-configuration-nix: drop obsolete overrides 2017-12-20 09:17:46 +01:00
Peter Simons d323c38082 haskell-htoml-megaparsec: update override for latest megaparsec version 2017-12-19 13:58:52 +01:00
Peter Simons bd0f541dbb haskell-colour: disable test suite to avoid infinite recursion 2017-12-15 13:11:16 +01:00
Peter Simons 8d8061ec20
Revert "Revive multiple outputs for Haskell packages." 2017-12-05 09:36:08 +01:00
Nicholas Clarke d90165c7db Revert "Revert "Merge pull request #27209 from nc6/nc/haskell-multiple-out""
This reverts commit 89f5d52cf4.
2017-11-27 16:05:22 +00:00
Peter Simons a7144523cf haskell-partial-semigroup: break cyclic reference that results in an infinite recursion 2017-10-17 20:35:29 +02:00
Michael Alan Dorman 11efabe29c htoml-megaparsec: build against newest megaparsec 2017-10-12 18:53:27 +01:00
Domen Kožar 61fbdb47a6
haskellPackages.foundation: disable tests on darwin 2017-09-26 19:00:27 +02:00
Ben Ford 94ba1c02f6 Change link in explanation to upstream issue 2017-09-08 13:45:56 +01:00