jolheiser/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
124,084 Commits 266 Branches 122 Tags 5.3 GiB
1ff879f15e
Commit Graph

2714 Commits

Author SHA1 Message Date
Frederik Rietdijk
2d0bead714 Merge remote-tracking branch 'upstream/master' into HEAD 2017-12-30 17:04:54 +01:00
Peter Simons
016aa581a7 haskell: extend generic builder to recognize mis-configured Cabal 2.x builds 
Cabal 1.x says:

 | Warning: This package indirectly depends on multiple versions of the same
 | package. This is highly likely to cause a compile failure.

But in version 2.x, that warning is split into two lines differently:

 | Warning:
 |     This package indirectly depends on multiple versions of the same package. This is very likely to cause a compile failure.

This commit modifies the call to "egrep" to recognize both versions by virtue
of the "-z" flag, which essentially interprets the whole configure-time output
as one long line.
 2017-12-30 13:53:05 +01:00
Peter Simons
7eeea3d7e2 haskell: configure overrides to fix numerous package builds with GHC 7.10.3 2017-12-30 13:53:04 +01:00
Peter Simons
f84d863793 hackage-packages.nix: automatic Haskell package set update 
This update was generated by hackage2nix v2.7.1-1-gc1b61fc from Hackage revision
fa9adf335b.
 2017-12-30 13:53:04 +01:00
Peter Simons
0232282eb5 hackage2nix: disable broken Hydra builds 
- Ping @khumba for failing "hoppy-runtime":
   https://hydra.nixos.org/build/66704172.

 - Drop "persistent-redis" from the list of maintained packages (@psibi)
   because it continues to fail: https://hydra.nixos.org/build/66704120.
 2017-12-30 13:51:48 +01:00
Peter Simons
f5a501074f Drop Haskell package set for GHC 7.8.4. 
We support only the last three major releases, i.e. 7.10.x is the latest
compiler we worry about.

The *compiler* is still there, though; it's just the package set that's been
removed.
 2017-12-30 13:51:07 +01:00
Peter Simons
4a01a175a3
Merge pull request #33158 from shlevy/hslib-haskell-build-inputs-again 
Revert "Revert "hslib: Function to extract the haskell build inputs of a package.""
 2017-12-29 20:51:24 +01:00
Shea Levy
961907de47
Add haskell-ide-engine 2017-12-29 14:41:15 -05:00
Shea Levy
1ee61d8f23
Revert "Revert "hslib: Function to extract the haskell build inputs of a package."" 
Trying again, without changing the generic builder.

This reverts commit 65138e8a411244c81aefa21be280323d30010b96.
 2017-12-29 14:37:24 -05:00
Vladimír Čunát
a1a3e54ac9
Merge branch 'master' into staging 
Haskell rebuild :-)
Hydra: ?compare=1421865
 2017-12-29 18:39:36 +01:00
Peter Simons
40a3d775a5 hackage-packages.nix: automatic Haskell package set update 
This update was generated by hackage2nix v2.7.1-1-gc1b61fc from Hackage revision
246f2ece36.
 2017-12-29 15:47:44 +01:00
Peter Simons
504016f753
Merge pull request #32993 from shlevy/haskell-internal-libs 
haskell generic-builder: Support installing internal libs.
 2017-12-29 15:41:19 +01:00
Rickard Nilsson
1de251c664 haskellPackages.LDAP: Fix build 2017-12-29 11:42:20 +01:00
Vladimír Čunát
f29000b002
Merge branch 'master' into staging 
Hydra: ?compare=1421760
 2017-12-29 10:13:33 +01:00
Robin Gloster
ee1c85aee9 mariadb: lib -> connector-c 2017-12-29 02:18:35 +01:00
Peter Simons
65138e8a41 Revert "hslib: Function to extract the haskell build inputs of a package." 
This reverts commit d545ef3fa11198f12e525b641aeb33887694f97f. Please don't
commit substantial changes to the generic Haskell builder without giving me a
chance to review them.
 2017-12-28 19:23:41 +01:00
Shea Levy
a7334eb476
Merge branch 'hslib-haskell-build-inputs' 2017-12-28 11:24:45 -05:00
Peter Simons
635c10140f hackage-packages.nix: automatic Haskell package set update 
This update was generated by hackage2nix v2.7-7-g6012213 from Hackage revision
e61097beb3.
 2017-12-27 21:33:17 +01:00
Peter Simons
071c6bb8ab LTS Haskell 10.1 
Fixes https://github.com/NixOS/nixpkgs/issues/33097.
 2017-12-27 21:33:12 +01:00
Peter Simons
39eb15b028 haskell-scalendar: break the infinite recursion to avoid evaluation errors 
Suggested in https://github.com/NixOS/nixpkgs/pull/33077#issuecomment-353993598.
 2017-12-27 18:33:45 +01:00
Peter Simons
adabca4b13
Revert "haskellPackages.{SC,sc}alendar: nullify to fix ofborg eval" 2017-12-26 22:24:30 +01:00
Piotr Bogdan
416d9bd7f8 haskellPackages.{SC,sc}alendar: nullify to fix ofborg eval 2017-12-26 16:52:36 +00:00
Michael Alan Dorman
48c4901a7a taggy: remove patch 
The newly released 0.2.1 includes it.
 2017-12-26 11:36:28 +01:00
Peter Simons
052fdc9427 hackage-packages.nix: automatic Haskell package set update 
This update was generated by hackage2nix v2.7-5-g07d8814 from Hackage revision
72f75113ed.
 2017-12-26 11:36:23 +01:00
Peter Simons
eb0da3e8af haskell: drop package sets for GHC 6.12.x, 7.0.x, 7.2.x, 7.4.x, and 7.6.x 
These old package sets have been broken and unmaintained for a long time now.
 2017-12-26 11:35:26 +01:00
Julien Langlois
aaf62f7f6e (haskell.packages.ghc802.ghc): (fix llvm dependency) 
Fix incorrect LLVM dependency of GHC 8.0.x to be 3.7 instead of 3.5.
 2017-12-25 23:45:19 +00:00
Shea Levy
d545ef3fa1
hslib: Function to extract the haskell build inputs of a package. 
This works by extracting out some logic from generic-builder.nix to
make it possible to get at the relevant information by overriding
mkDerivation for the haskell package.
 2017-12-23 11:44:18 -05:00
Shea Levy
b6d215aa79
haskell generic-builder: Support installing internal libs. 
Fixes #32980.
 2017-12-22 19:44:37 -05:00
Shea Levy
ea9b677046
haskellPackages.coordinate: Fix build on ghc 8.2 2017-12-22 14:04:59 -05:00
Shea Levy
e32bc0b5c0
haskellPackages.lenz: Fix against latest hs-functors 2017-12-22 13:54:01 -05:00
Shea Levy
4c66ebb0d1
hadoop-rpc: Fix build on ghc 8.2 2017-12-22 13:31:35 -05:00
Shea Levy
5e8a0786b0
Disable tests on haskellPackages.protobuf 2017-12-22 12:48:07 -05:00
Shea Levy
7f410df1c6
haskell-modules: Request older haddock-library to match haddock-api. 2017-12-22 09:16:12 -05:00
Shea Levy
302202ccde
haskellPackages.monad-memo: Fix testsuite 2017-12-22 09:11:41 -05:00
Shea Levy
bd424fdce9
ghc-exactprint: Fix build on GHC-8.2 2017-12-22 09:01:03 -05:00
Peter Simons
8cb0b71374
Merge pull request #32959 from alunduil/readd-network-uri-json 
remove network-uri-json from dont-distribute-packages
 2017-12-22 11:23:02 +01:00
Alex Brandt
b57fc1f183 remove siren-json from dont-distribute-packages 
I've fixed the build issues with siren-json and uploaded the new package
to hackage.  This should be successful going forward.
 2017-12-21 23:02:03 -06:00
Alex Brandt
cfa636c646 remove network-uri-json from dont-distribute-packages 
I've fixed the build issues with network-uri-json and uploaded the new
package to hackage.  This should be successful going forward.
 2017-12-21 17:14:13 -06:00
Pierre Radermecker
b8ac2ddf06 HaskellPackages.language-puppet: enable x86_64 build again 
Timeout haddock issue has been fixed with PR #32896
 2017-12-21 16:52:07 +01:00
Alex Brandt
ca7d54c1a1 add alunduil as maintainer for haskell packages 
Adding myself, alunduil, as a maintainer on network-uri-json and
siren-json.
 2017-12-20 21:01:35 -06:00
Michael Alan Dorman
8e6d5639c3 pointfree, taffybar: jailbreak 2017-12-20 20:59:33 +01:00
Peter Simons
211a1ee84b hackage-packages.nix: automatic Haskell package set update 
This update was generated by hackage2nix v2.7-5-g07d8814 from Hackage revision
4112e5cd3d.
 2017-12-20 20:59:33 +01:00
Peter Simons
15b9537f37 haskell-wai-secure-cookies: drop obsolete overrides 2017-12-20 20:59:18 +01:00
Peter Simons
e4bb2a784d liquidhaskell: drop obsolete override 2017-12-20 20:59:18 +01:00
Peter Simons
e058744dd4 hackage-packages.nix: automatic Haskell package set update 
This update was generated by hackage2nix v2.7-5-g07d8814 from Hackage revision
4112e5cd3d.
 2017-12-20 20:59:18 +01:00
Peter Simons
acc6389bea hackage2nix: update list of broken builds 
Ping @alunduil for broken "collection-json" build.
Ping @gridaphobe for broken ghc-srcspan-plugin build.
Ping @gebner for broken hledger-diff build.
Ping @khumba for broken hoppy-docs and hoppy-runtime builds.
Ping @psibi for broken persistent-redis build.
 2017-12-20 20:59:04 +01:00
Peter Simons
c1dcbad256
Merge pull request #32821 from ttuegel/haskell/shell-env-build-inputs 
haskell: set buildInputs in nix-shell env
 2017-12-20 20:58:31 +01:00
Pierre Radermecker
3e22c56161 Haskell-language-puppet: don't build haddock 2017-12-20 15:16:57 +01:00
Orivej Desh
6e2df0aed8 haskellPackages.SCalendar: try to restore the bot capacity to evaluate 
Remove infinite recursion between SCalendar and scalendar:

https://gist.github.com/GrahamcOfBorg/eb6d5675657ddc3cc3f054305b11dcb5
 2017-12-20 10:08:36 +00:00
Orivej Desh
d3a375fe58 haskell-configuration-nix: fix eval 2017-12-20 09:50:21 +00:00