Commit Graph

61889 Commits

Author SHA1 Message Date
markuskowa 889e0bf512
Merge pull request #57314 from r-ryantm/auto-update/mapnik
mapnik: 3.0.21 -> 3.0.22
2019-03-17 14:50:45 +01:00
Ryan Mulligan 4979238e80
Merge pull request #57399 from r-ryantm/auto-update/python3.7-django-cors-headers
python37Packages.django-cors-headers: 2.4.0 -> 2.5.0
2019-03-17 06:31:37 -07:00
Alyssa Ross 46026e8247
Merge commit 'refs/pull/57762/head' of https://github.com/NixOS/nixpkgs into master 2019-03-17 10:56:46 +00:00
Bjørn Forsman 83d56298aa lcov: 1.13 -> 1.14
No need to set BIN_DIR, MAN_DIR anymore, but have to set LCOV_PERL_PATH
now.
2019-03-17 11:04:02 +01:00
Peter Simons 3447973b9b xmonad-extras: drop obsolete override 2019-03-17 09:43:14 +01:00
Peter Simons 7c04e3eb75 haskell-arbtt: add build products into $PATH for the check phase
Fixes https://github.com/NixOS/nixpkgs/pull/57585.
2019-03-17 09:43:14 +01:00
Peter Simons e98e4d21fa hackage-packages.nix: automatic Haskell package set update
This update was generated by hackage2nix v2.14.2-3-gea0f0ca from Hackage revision
83ddbaad89.
2019-03-17 09:21:20 +01:00
Michael Peyton Jones 387c513d12 generic Haskell builder: don't copy packages from GHC
In order to build the package databases that we will use when compiling
a Haskell package, we iterate over the relevant dependencies, and if
they contain a package db, we copy its contents over.

So far so good, except when one of those dependencies is GHC. This
doesn't happen ordinarily, but it will happen when we construct the
package database for compiling `Setup.hs`.  This is compiled for the
build architecture, so we get the build deps, including both the native
and the cross GHC (if there is one).

In this case, we end up copying the packages from the GHC's package
database. This is at best unnecessary, since we will get those packages
from the GHC when we compile with it.

At worst, however, this is semantically questionable. We can end up
having multiple copies of e.g. Cabal with the same version, but
(potentially) different contents. At the moment, GHC will expose one of
these at semi-random depending on which one it looks at "first".
However, there is a MR open [in
GHC](https://gitlab.haskell.org/ghc/ghc/merge_requests/545) which as a
side effect will instead expose both, leading to ambiguous module
warnings (which is not unreasonable, since it *is* ambiguous).

So what can we do about it? The simplest solution is just to not copy
the package databases from GHC. GHC is special in this regard, so I
think it's okay to treat it specially.

This PR should have no effect on anything now, but will prevent any
breakage when/if the GHC patch lands.

Closes https://github.com/NixOS/nixpkgs/pull/57706.
2019-03-17 09:21:20 +01:00
Will Dietz e37f63daaf
Merge pull request #57540 from dtzWill/update/sqlite-replication-and-dqlite
dqlite,sqlite-replication,lxd: updates!
2019-03-17 00:48:18 -05:00
worldofpeace 0125544e2a bamf: add wrapGAppsHook 2019-03-16 23:10:23 -04:00
Vladyslav M b9ebc84f8d yarn: 1.14.0 -> 1.15.2 (#57727) 2019-03-17 00:32:18 +01:00
Sarah Brofeldt 44b5166f91
Merge pull request #57760 from LinArcX/jcal
jcal: init at 0.4.1
2019-03-16 22:35:48 +01:00
Timo Kaufmann e6fc8c7ac3
Merge pull request #57764 from timokau/pyzmq-upgrade
python.pkgs.pyzmq: 17.1.3 -> 18.0.1, disable flaky test
2019-03-16 21:22:44 +00:00
linarcx c3e17e7d76 jcal: init at 0.4.1 2019-03-17 00:42:40 +03:30
Peter Simons 26073f4a8d vaultenv: disable broken build
(cherry picked from commit 3642a3a69ccd92ce5baa3fcf48580f8e4a9e5753)
2019-03-16 20:31:23 +01:00
Peter Simons bdd4e11278 haskell-pandoc: update overrides for the new 2.7.1 version
(cherry picked from commit 96c7ea5f6d1b9d41afcdcac1b156813013a5d04d)
2019-03-16 20:31:23 +01:00
Peter Simons b514a6d351 hackage-packages.nix: automatic Haskell package set update
This update was generated by hackage2nix v2.14.2-3-gea0f0ca from Hackage revision
faa5a059ee.
2019-03-16 20:31:23 +01:00
Peter Simons 2df9351953 LTS Haskell 13.13
(cherry picked from commit fee2f975ecd5a478f5a4fc60b4d6aaa53696e19e)
2019-03-16 20:30:58 +01:00
Peter Simons 93e4a90502 ghc: switch our default compiler to version 8.6.4
Also, drop obsolete 8.6.x minor releases 8.6.1, 8.6.2, and 8.6.3.

(cherry picked from commit 7fde42b8ebddbd673342b98d9d7c892a0c521583)
2019-03-16 20:30:58 +01:00
Timo Kaufmann 4f2d842a98 python.pkgs.pyzmq: disable flaky test
Recently failed on staging.
2019-03-16 19:46:04 +01:00
Timo Kaufmann 92ed05be3b python.pkgs.pyzmq: 17.1.3 -> 18.0.1 2019-03-16 19:46:04 +01:00
Sarah Brofeldt 106db715f9
Merge pull request #57756 from marsam/update-brakeman
brakeman: 4.4.0 -> 4.5.0
2019-03-16 19:31:49 +01:00
Sarah Brofeldt 6d9649528c
Merge pull request #55002 from clacke/racket-gl
racket: add libGL and libGLU to libPath
2019-03-16 19:27:50 +01:00
Mario Rodas 342773c78c
ruby_2_6: 2.6.1 -> 2.6.2 2019-03-16 12:41:28 -05:00
Mario Rodas cadc359a0a
ruby_2_5: 2.5.3 -> 2.5.5 2019-03-16 12:40:51 -05:00
Mario Rodas 69d80d7d21
ruby: update RVM patchsets 2019-03-16 12:36:22 -05:00
Mario Rodas ad219bcbc6
brakeman: 4.4.0 -> 4.5.0 2019-03-16 12:20:30 -05:00
Peter Simons 17c62c98d3
Merge pull request #57587 from erictapen/hakyll-pandoc-bump
haskellPackages.hakyll: bump pandoc dependency to 2.7
2019-03-16 13:47:33 +01:00
Robert Schütz f7156588b2 python.pkgs.PyICU: fix build
fallout of https://github.com/NixOS/nixpkgs/pull/54182
2019-03-16 09:50:29 +01:00
xeji b18d76628a
Merge pull request #57451 from r-ryantm/auto-update/python3.7-QtAwesome
python37Packages.qtawesome: 0.5.6 -> 0.5.7
2019-03-15 23:45:15 +01:00
R. RyanTM 734341104c python37Packages.radio_beam: 0.2 -> 0.3.1 (#57450)
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/python3.7-radio_beam/versions
2019-03-15 23:29:49 +01:00
R. RyanTM 99f9563830 ocamlPackages.resource-pooling: 0.5.2 -> 0.6 (#55237)
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/ocaml4.06.1-resource-pooling/versions
2019-03-15 23:27:24 +01:00
R. RyanTM 49b9040354 hyperscan: 5.0.0 -> 5.1.0 (#55303)
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/hyperscan/versions
2019-03-15 23:17:15 +01:00
xeji d1589cdd37
Merge pull request #56614 from r-ryantm/auto-update/closure-compiler
closurecompiler: 20190121 -> 20190215
2019-03-15 23:08:19 +01:00
Robert Schütz 0866dd09e9
Merge pull request #57705 from terlar/add-python-package-google-auth-oauthlib
pythonPackages.google-auth-oauthlib: init at 0.2.0
2019-03-15 22:47:18 +01:00
Robert Schütz 8c594fc8b3 python.pkgs.ordered-set: fix build 2019-03-15 22:28:37 +01:00
Terje Larsen 44fcb4aa13
pythonPackages.google-auth-oauthlib: init at 0.2.0
Fix #57022
2019-03-15 22:26:53 +01:00
Robert Schütz 790b92739d python.pkgs.robotframework-tools: fix build, mark as broken on Python 3 2019-03-15 22:12:47 +01:00
Robert Schütz b5ddc8f377 python.pkgs.moretools: fix build 2019-03-15 22:12:47 +01:00
Robert Schütz 8eee646d96 python.pkgs.zetup: fix build 2019-03-15 22:12:47 +01:00
R. RyanTM a2c49a7f13 thrift: 0.11.0 -> 0.12.0 (#53509)
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/thrift/versions
2019-03-15 21:52:49 +01:00
Orivej Desh caa5ad4327 xxHash: 0.6.5 -> 0.7.0 2019-03-15 20:32:16 +00:00
R. RyanTM 0c32653a61 python37Packages.keepkey: 4.0.2 -> 6.0.2 (#55202)
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/python3.7-keepkey/versions
2019-03-15 20:58:32 +01:00
R. RyanTM 566d0aedd9 yarn: 1.13.0 -> 1.14.0 (#55135)
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/yarn/versions
2019-03-15 20:48:32 +01:00
Matthew Bauer d3dd0875ed
Merge pull request #56226 from marsam/nodejs-install-npm-manpages
nodejs: Install npm manpages
2019-03-15 15:32:10 -04:00
Matthew Bauer 6d52e26818
Merge pull request #56792 from timor/libdwarf-dwarfdump-zlib
libdwarf: add zlib to buildInputs
2019-03-15 15:28:47 -04:00
jacereda 412a25e74b nodejs: fix gyp errors when building scuttlebot on Darwin (#57632)
* nodejs: fix gyp errors when building scuttlebot

* nodejs-slim: fix build on Darwin
2019-03-15 15:23:50 -04:00
Robert Schütz b1ad192bf9 python3.pkgs.google-music-utils: 2.0.0 -> 2.1.0 2019-03-15 20:17:45 +01:00
Robert Schütz f06bec0e65 python3.pkgs.google-music: fix build 2019-03-15 20:17:45 +01:00
Robert Schütz 2f3edc1736 python3.pkgs.audio-metadata: fix build 2019-03-15 20:17:45 +01:00