Commit Graph
233620 Commits
Author SHA1 Message Date
Jan Tojnar f38d3df11c Revert "qt5.qtwebkit: Fix paths in pc files"
This reverts commit dee7377508.
2020-07-05 19:01:54 +02:00
Jan Tojnar cfe7e12d38 Revert "cmake: only set output paths with multiple outputs"
This reverts commit be1b22538a.

The commit broke Qt modules using CMake because they disable setOutputFlags.

There is no need to have these flags limited to multiple output derivations since it
should just work. If it does not, it is a bug that should be fixed as per
https://github.com/jtojnar/cmake-snips#assuming-cmake_install_dir-is-relative-path
Likewise, having a variable to disable passing the flags is also unnecessary,
since CMake, unlike some configure scripts, ignores unknown flags. And if a person
does not like the values, they can just override them by passing the offending
flag with a different value to cmakeFlags.
2020-07-05 19:01:53 +02:00
Jan Tojnar 4bca7dfb27 Merge branch 'master' into staging-next 2020-07-04 23:59:32 +02:00
Ludovic ClaudeandJon 6eeb612a9b gradle: 5.6.4 -> 6.5.1
Co-authored-by: Daniël de Kok <me@github.danieldk.eu>
Use https for all urls
fix version for native library
pin gradle for jd-gui
2020-07-04 14:56:12 -07:00
Marcus BoydandJon db1835a599 cq-editor: use python37Packages 2020-07-04 14:54:20 -07:00
Marcus BoydandJon 5e759553ae pythonPackages.pylint: propagate toml 2020-07-04 14:54:20 -07:00
Ludovic ClaudeandJon dc2dfe277f jd-gui: pin gradle to 5.X in build 2020-07-04 14:52:54 -07:00
Jan Tojnar dee7377508 qt5.qtwebkit: Fix paths in pc files
In https://github.com/NixOS/nixpkgs/commit/be1b22538a60e52987d238bb11f93043682b6e9a,
CMake setup-hook started to respect setOutputFlags. Since qtModule disables it by default,
cmake no longer received the multiple-output adjusted installation directory flags when
building the qtwebkit package. This resulted in incorrect paths in generated pkg-config files
and CMake config files.

Let’s temporarily enable setOutputFlags in the qtwebkit expression, until the commit is reverted.
2020-07-04 23:52:38 +02:00
Maximilian BoschandGitHub 9203abb204 Merge pull request #92246 from r-ryantm/auto-update/liquibase
liquibase: 3.10.0 -> 3.10.1
2020-07-04 23:22:06 +02:00
Maximilian Bosch 67a1c36929 cargo-watch: 7.4.1 -> 7.5.0
https://github.com/passcod/cargo-watch/releases/tag/v7.5.0

Also fixes the `aarch64`-build: https://hydra.nixos.org/build/123187262
2020-07-04 23:13:30 +02:00
Ryan MulliganandGitHub c4264d0f3a Merge pull request #92254 from doronbehar/stale-bot
stale-bot: Make its message more instructive
2020-07-04 13:55:12 -07:00
Maximilian BoschandGitHub 59ce86a730 Merge pull request #92275 from jonringer/fix-google-music-scripts
google-music-scripts: fix build
2020-07-04 22:47:54 +02:00
Doron Behar 29c538392c stale-bot: Make it's messages more instructive
As somewhat discussed at: https://git.io/JJkRa, make the bot's message a
bit more instructive, and clearer as for what it will and won't do, so
random contributors will have a better idea what this is about.

Also: Split stale issues' and PRs' messages because each should
suggest different actions to do.
2020-07-04 23:13:28 +03:00
Mario RodasandGitHub ffbbdf247a Merge pull request #90055 from r-ryantm/auto-update/libwhereami
libwhereami: 0.3.1 -> 0.5.0
2020-07-04 14:15:15 -05:00
Mario RodasandGitHub dc80d7bc4a Merge pull request #92242 from r-ryantm/auto-update/cpp-hocon
cpp-hocon: 0.2.2 -> 0.3.0
2020-07-04 13:14:29 -05:00
Mario RodasandGitHub 2150d372a3 Merge pull request #92239 from r-ryantm/auto-update/bettercap
bettercap: 2.27.1 -> 2.28
2020-07-04 13:13:48 -05:00
Mario RodasandGitHub 1a0b923a6d Merge pull request #92258 from r-ryantm/auto-update/tendermint
tendermint: 0.33.5 -> 0.33.6
2020-07-04 13:11:40 -05:00
Vladimír Čunát 8e3e3bfb55 Merge #91932: thunderbird*: 68.9.0 -> 68.10.0 2020-07-04 20:09:38 +02:00
Vladimír Čunát ab35379cdb evince: remove myself from meta.maintainers
That reflects reality of the past couple of years.  I used to spend
really large fraction of my time reading PDFs but not anymore.
Fortunately there seem to be enough other maintainers...
2020-07-04 20:08:45 +02:00
Mario RodasandGitHub c70f0c6548 Merge pull request #92257 from r-ryantm/auto-update/tebreak
tebreak: 1.0 -> 1.1
2020-07-04 12:45:00 -05:00
Mario RodasandGitHub b3aa101728 Merge pull request #92259 from r-ryantm/auto-update/terragrunt
terragrunt: 0.23.23 -> 0.23.31
2020-07-04 12:42:21 -05:00
Benjamin HippleandGitHub 4dbd1d54c1 Merge pull request #92278 from jonringer/fix-soil
soil: fix build
2020-07-04 13:39:17 -04:00
Maximilian BoschandGitHub 248c9ef9bb Merge pull request #92287 from dasj19/evince-update
evince: 3.36.6 -> 3.36.7
2020-07-04 19:39:02 +02:00
Mario RodasandGitHub d0d53fb34e Merge pull request #92262 from r-ryantm/auto-update/watchexec
watchexec: 1.13.1 -> 1.14.0
2020-07-04 12:30:27 -05:00
Maximilian BoschandGitHub 3897eb5836 Merge pull request #92234 from samuelgrf/update/nixos-wallpapers
nixos-artwork: add missing wallpapers
2020-07-04 19:27:15 +02:00
Vladimír Čunát ca2b95ba87 xapian: 1.4.15 -> 1.4.16
https://trac.xapian.org/wiki/ReleaseOverview/1.4.16
It seems quite minor and the parent commit rebuilds it anyway.
2020-07-04 19:11:31 +02:00
Vladimír Čunát 4fba844a0f xapian: skip time-sensitive tests
I think I've seen this break builds on Hydra repeatedly, e.g:
https://hydra.nixos.org/build/123513191
2020-07-04 19:08:49 +02:00
Daniel Șerbănescu 1c98b0781d evince: 3.36.6 -> 3.36.7 2020-07-04 18:55:52 +02:00
Maximilian BoschandGitHub eb7113f2c0 Merge pull request #92279 from jonringer/prawcore-disable-py2
python2Packages.prawcore: disable on python2
2020-07-04 18:48:44 +02:00
Benjamin HippleandGitHub ad5f34afa2 Merge pull request #92280 from jonringer/fix-zope-contenttype
python3Packages.zope_contenttype: fix build
2020-07-04 12:35:33 -04:00
Benjamin HippleandGitHub 68a0a9b433 Merge pull request #92281 from jonringer/detox-remove
pythonPackages.detox: remove
2020-07-04 12:35:00 -04:00
Maximilian Bosch 8842a387ef mautrix-whatsapp: 0.1.1 -> 0.1.2
https://github.com/tulir/mautrix-whatsapp/releases/tag/v0.1.2
2020-07-04 18:33:35 +02:00
Benjamin HippleandGitHub 0eabb1b779 Merge pull request #92277 from jonringer/fix-pipdate
python3Packages.pipdate: fix dependency management
2020-07-04 12:33:11 -04:00
betaboonandJon e747fc91fa python3.pkgs.pyls-black: 0.4.4 -> 0.4.6 2020-07-04 09:27:54 -07:00
Frederik RietdijkandGitHub 9ffa14d581 Merge pull request #92261 from FRidh/gstreamer
gst-plugins-base: mark as broken
2020-07-04 18:12:08 +02:00
Jonathan Ringer ba5559fd7a pythonPackages.detox: remove 2020-07-04 08:53:59 -07:00
Jonathan Ringer 93e7581c9a python3Packages.zope_contenttype: fix build 2020-07-04 08:39:36 -07:00
Jonathan Ringer 01f1f3d5d0 python2Packages.prawcore: disable on python2
no longer compatible with python2's urllib

```
  prawcore/exceptions.py:2: in <module>
      from urllib.parse import urlparse
  E   ImportError: No module named parse
  builder for '/nix/store/3l1rqygq58hbwyzn6fqx8x4djbmzgggh-python2.7-prawcore-1.4.0.drv' failed with exit code
```
2020-07-04 08:32:46 -07:00
Vladimír Čunát 92b7ce99f7 wxGTK3*: switch to gstreamer 1.x
Configure log still prints `checking for GST... yes`
and the new GST libs appear in RPATH.
wxGTK28 does't seem able to configure with non-legacy GST,
but it's almost unused... so I didn't touch it.
2020-07-04 17:31:18 +02:00
Sirio BalmelliandJon f0c7019005 python3Packages.testfixtures: fix build (ignore failing tests)
Signed-off-by: Sirio Balmelli <sirio@b-ad.ch>
Co-authored-by: Joh <jonringer@users.noreply.github.com>
2020-07-04 08:27:07 -07:00
Jonathan Ringer ee63ff7d4e soil: fix build 2020-07-04 08:13:22 -07:00
Jonathan Ringer 7e6e87e7eb python3Packages.pipdate: fix dependency management 2020-07-04 08:05:53 -07:00
Jonathan RingerandJon ff5aaa33e9 python3Packages.aiorun: fix build 2020-07-04 07:43:58 -07:00
Jonathan Ringer 2e050546b8 google-music-scripts: fix build 2020-07-04 07:42:19 -07:00
worldofpeaceandGitHub d3a40e7cfc Merge pull request #92270 from samuelgrf/fix/whether-typo
nixos/*: fix misspellings of whether
2020-07-04 09:34:28 -04:00
Robert ScottandGitHub f499144c32 Merge pull request #91987 from r-ryantm/auto-update/afl
afl: 2.56b -> 2.57b
2020-07-04 14:25:10 +01:00
Samuel Gräfenstein 5bb0b72720 nixos/*: wheter -> whether 2020-07-04 15:20:41 +02:00
Samuel Gräfenstein 850d7d1790 nixos/*: wether -> whether 2020-07-04 15:17:03 +02:00
Niklas HambüchenandGitHub 7c903ca1d2 Merge pull request #92205 from chkno/qemu-vm-cleanup
qemu-vm device name cleanup
2020-07-04 15:08:52 +02:00
Peter HoegandGitHub 770faa044a Merge pull request #92118 from NixOS/f/calibre
calibre: use webengine i/o webkit
2020-07-04 20:50:56 +08:00