Commit Graph

45945 Commits

Author SHA1 Message Date
Shea Levy 0ebcd097fe
Merge branch 'master' into staging 2018-03-17 21:50:27 -04:00
Shea Levy 0d0672e95c
lsof: Add (temporary?) tarball URL and fix eval on darwin. 2018-03-17 21:39:16 -04:00
Michael Raskin ed4165570e
Merge pull request #35667 from vcunat/p/poppler-darwin
poppler: fix build on Darwin
2018-03-17 21:01:55 +00:00
Peter Simons 54c1ca5fe9 haskell-xmonad: patch to fix the build with ghc-8.4.x 2018-03-17 21:16:49 +01:00
Peter Simons 13b154aee4 haskell-data-inttrie: patch to fix the build with ghc-8.4.x 2018-03-17 21:16:49 +01:00
Peter Simons b8ab77c1f0 haskell-th-printf: jailbreak to fix the build with ghc-8.4.x 2018-03-17 21:16:49 +01:00
Peter Simons c044a82caf haskell-json: patch to fix the build with ghc-8.4.x 2018-03-17 21:16:49 +01:00
Peter Simons 148646e630 haskell-matrix: override to latest version for ghc-8.4.x 2018-03-17 21:16:49 +01:00
Peter Simons 93d241e3dd haskell-timezone-olson: override to latest version for ghc-8.4.x 2018-03-17 21:16:49 +01:00
Peter Simons 7d5a69c265 haskell-GenericPretty: drop obsolete override for ghc-8.4.x 2018-03-17 21:16:49 +01:00
Peter Simons 8848a95575 haskell-boxes: drop obsolete override for ghc-8.4.x 2018-03-17 21:16:49 +01:00
Peter Simons cedf31b04a haskell-brick: override to latest version to fix build with ghc-8.4.x 2018-03-17 21:16:49 +01:00
Peter Simons 84bd9be9ce haskell-cabal2spec: fix build with ghc-8.2.x 2018-03-17 21:16:49 +01:00
Peter Simons 69c7aabbf8 hackage-packages.nix: automatic Haskell package set update
This update was generated by hackage2nix v2.9.1-1-g63041e4 from Hackage revision
f91c8f61e9.
2018-03-17 21:16:49 +01:00
Peter Simons 03cae069fe haskell-pandoc: use current git version when building with ghc-8.4.x 2018-03-17 21:16:48 +01:00
Peter Simons bb6b99287b cabal2nix: drop obsolete overrides for ghc-8.4.x 2018-03-17 21:16:48 +01:00
Peter Simons 3c978a82ca haskell-doctemplates: drop obsolete override for ghc-8.4.x 2018-03-17 21:16:48 +01:00
Peter Simons b59905bfe4 haskell-conduit: use latest version when compiling with ghc-8.4.x 2018-03-17 21:16:48 +01:00
Peter Simons e772848b44 haskell-tasty: drop obsolete override for ghc-8.4.x 2018-03-17 21:16:48 +01:00
Peter Simons 6a71804bea hackage-packages.nix: automatic Haskell package set update
This update was generated by hackage2nix v2.9.1 from Hackage revision
04b554ad3b.
2018-03-17 21:16:48 +01:00
Robert Schütz 6d3232f7aa
Merge pull request #37247 from Ma27/fix-tablib
pythonPackages.tablib: fix build
2018-03-17 20:45:15 +01:00
Michael Raskin 85531d4ff9
Merge pull request #37259 from ryantm/auto-update/allegro
allegro: 5.2.3.0 -> 5.2.4.0
2018-03-17 19:30:11 +00:00
lewo cb735c3961
Merge pull request #37034 from ryantm/auto-update/liblouis
liblouis: 3.4.0 -> 3.5.0
2018-03-17 20:18:12 +01:00
Daiderd Jordan 1798563e62
libconfuse: fix tests on darwin
/cc ZHF #36454
2018-03-17 19:40:59 +01:00
Gabriel Ebner f54cd16ba5
Merge pull request #36956 from coreyoconnor/merge
Merge swi-prolog 7.4.2 -> 7.6.4 plus enable JPL feature
2018-03-17 18:23:11 +01:00
Ryan Mulligan 51a0ef4bdd allegro: 5.2.3.0 -> 5.2.4.0
Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 5.2.4.0 with grep in /nix/store/ffhc3yjpm6avrds564k83vgn1ppw00yr-allegro-5.2.4.0
- directory tree listing: https://gist.github.com/1045c5013f37df121b7965ce4f5c9f5a
2018-03-17 09:40:48 -07:00
Thomas Tuegel c66e5e0c10
Merge pull request #37162 from ryantm/auto-update/atlas
atlas: 3.10.2 -> 3.10.3
2018-03-17 10:06:05 -05:00
Gabriel Ebner 77835bd3d2
Merge pull request #36461 from timokau/givaro-4.0.4
givaro: 4.0.2 -> 4.0.4
2018-03-17 16:00:05 +01:00
Gabriel Ebner 065fda260a
Merge pull request #37189 from fdns/libtins
libtins: init at 3.5
2018-03-17 15:58:05 +01:00
Maximilian Bosch 4a0c0401b5
pythonPackages.tablib: fix build
`openpyxl` v5 breaks `tablib`, the following patch fixes the API
incompatibility: https://github.com/kennethreitz/tablib/pull/296

See https://hydra.nixos.org/build/70694938/log
See ticket #36453
2018-03-17 15:21:59 +01:00
Shea Levy 7215194f64
Merge branch 'pyspark' 2018-03-17 10:11:24 -04:00
Michael Weiss f9134b08c2 wlroots: 2017-12-22 -> 2018-03-16 2018-03-17 15:06:49 +01:00
Shea Levy 2963d76ca3
pythonPackages.pyspark: Init at 2.3.0 2018-03-17 09:54:12 -04:00
Shea Levy 4322f2b8c8
pythonPackages.py4j: Init at 0.10.6. 2018-03-17 09:17:48 -04:00
Gabriel Ebner 4f8419b0b8
Merge pull request #37036 from ryantm/auto-update/libraw
libraw: 0.18.7 -> 0.18.8
2018-03-17 13:55:30 +01:00
Gabriel Ebner 71d9dfa498
Merge pull request #37069 from ryantm/auto-update/opendht
opendht: 1.5.0 -> 1.6.0
2018-03-17 13:51:50 +01:00
Gabriel Ebner e70d3f0a35
Merge pull request #37106 from ryantm/auto-update/sassc
sassc: 3.4.8 -> 3.5.0
2018-03-17 13:42:39 +01:00
Gabriel Ebner cf7ef3c32e
Merge pull request #37176 from ryantm/auto-update/eccodes
eccodes: 2.6.0 -> 2.7.0
2018-03-17 13:34:46 +01:00
Gabriel Ebner 82c5beeccb
Merge pull request #37237 from matthewbauer/auto-update/antlr4
antlr4: 4.7 -> 4.7.1
2018-03-17 13:29:55 +01:00
Gabriel Ebner f1ff1fe244
Merge pull request #36942 from xeji/p/manticore
manticore: 2014.08.18 -> 2017.08.22, fix build
2018-03-17 13:24:28 +01:00
Gabriel Ebner 8d83f1134b
Merge pull request #36939 from xeji/p/libs3
libs3: 2015-04-23 -> 2017-06-01, fix build
2018-03-17 13:22:04 +01:00
Gabriel Ebner 593e71889f
Merge pull request #37101 from xeji/p/itk
itk: 4.11.0 -> 4.12.2, fix build
2018-03-17 13:17:14 +01:00
Peter Simons 38bd7183c5 brick: undo update to revision 1, which breaks the build with GHC 8.2.2
Hopefully, upstream fixes this quickly.
2018-03-17 11:42:36 +01:00
Matthew Bauer 7e59fd5b84 antlr4: 4.7 -> 4.7.1
Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done:
- built on NixOS
- ran `/nix/store/i4ipx4vd247inysxw0ygp7smcfx5yf05-antlr-4.7.1/bin/grun -h` got 0 exit code
- ran `/nix/store/i4ipx4vd247inysxw0ygp7smcfx5yf05-antlr-4.7.1/bin/grun --help` got 0 exit code
- ran `/nix/store/i4ipx4vd247inysxw0ygp7smcfx5yf05-antlr-4.7.1/bin/grun help` got 0 exit code
- found 4.7.1 with grep in /nix/store/i4ipx4vd247inysxw0ygp7smcfx5yf05-antlr-4.7.1
2018-03-17 03:53:53 -05:00
Tuomas Tynkkynen 07e2f29772 Merge remote-tracking branch 'upstream/master' into staging 2018-03-17 09:58:02 +02:00
Peter Simons 6fbf6efcf3 haskell-esqueleto: drop the markBroken for ghc 8.4.1
Although accurate, the override causes evaluation errors that serve little
purpose but poison our dashboard at [1].

[1] https://hydra.nixos.org/jobset/nixpkgs/haskell-updates
2018-03-17 08:21:24 +01:00
Peter Simons fe0be794fb haskell-pandoc-types: update override for ghc 8.4.x 2018-03-17 08:21:23 +01:00
Peter Simons f3f5d68ca3 haskell-generic-builder: cosmetic 2018-03-17 08:21:23 +01:00
Peter Simons 1978fa444d haskell-generic-builder: disable shared executable linking by default
This change raises the question of whether we should disable building of shared
libraries altogether (since we don't link them). Unfortunately, we can't,
because GHC expects shared libraries to be around when building and running
test suites, and no amount of passing --disable-shared flags at configure time
changes the fact. I *guess* that's related to the DYNAMIC_GHC_PROGRAMS = YES
flag we set when building GHC itself, but I haven't investigated it further
yet.

Closes https://github.com/NixOS/nixpkgs/issues/29011.
2018-03-17 08:21:23 +01:00
Peter Simons db5be10a4a haskell-generic-builder: fix confusion about --enable-static vs. --enable-library-vanilla 2018-03-17 08:21:23 +01:00