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
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
Ben Ford
30ce53d105
Add a note about the changes
2017-09-08 13:13:22 +01:00
Ben Ford
017a356082
Also had to add dontCheck integration test seems to hang
...
(unit tests all pass)
2017-09-08 13:08:26 +01:00
Ben Ford
3205d164c6
Fix hw-kafka-client haskell package
2017-09-08 12:31:02 +01:00
Peter Simons
89f5d52cf4
Revert "Merge pull request #27209 from nc6/nc/haskell-multiple-out"
...
This reverts commit dfb0f254847f8ff02437
2017-09-06 10:19:18 +02:00
Daiderd Jordan
d0d905668c
haskell-hscolour: fix darwin build
2017-09-05 22:56:09 +02:00
Nicholas Clarke
eb99d3a670
Fix git-annex.
2017-09-04 12:35:58 +01:00
Nicholas Clarke
414a557904
Add specific overrides for a number of failing packages.
...
Finish overriding bin output for broken packages.
Put stack bash completions in $bin.
2017-09-04 12:35:58 +01:00
Nicholas Clarke
a1d78fa5bc
Don't build separate bin output for alex.
...
It has files in /usr/share which reference the bin output.
2017-09-04 12:35:57 +01:00
Daiderd Jordan
d491eebffd
haskell-packages: fix evaluation
2017-08-17 22:43:15 +02:00
Domen Kožar
4f80406fdd
Merge pull request #27615 from NickHu/cuda
...
fix haskellPackages.cuda and some tools dependent on cudatoolkit
2017-08-07 16:13:49 +02:00
Domen Kožar
71bebd5254
{fs,h}notify: move to configuration-nix.nix
2017-08-06 10:42:37 +02:00
John Ericson
74f5fe5068
haskell infra: Misc cleanups
...
- The haskell lib is very close to not relying on Nixpkgs. I think
this is good---simpler to think about and matches Nixpkgs's lib.
- The haskell lib is only imported once
- stdenv is exposed more shallowly so it can be overriden more easily.
I'll eventually use this on Darwin to avoid the Sierra shared
library problems (unless changes are to be made system-wide).
Closes https://github.com/NixOS/nixpkgs/pull/27840 .
2017-08-03 13:12:01 +02:00
Nick Hu
34beeac70b
fix haskellPackages.cuda and some tools dependent on cudatoolkit
2017-07-24 16:55:11 +01:00
Peter Simons
85a70b50b9
haskell-hledger-iadd: drop obsolete override (the build fails with or without it)
2017-07-17 22:04:25 +02:00
Peter Simons
47feb45313
haskell-hsyslog: update version override
...
And move it from configuration-nix to configuration-common.
2017-07-17 22:04:25 +02:00
Peter Simons
78377ae5cf
haskell: fix builds of hledger-iadd, opencv-extra, and logging-facade-syslog
2017-06-29 17:35:44 +02:00
