Vladimír Čunát
2e6bf42a22
Merge branch 'master' into staging-next
...
There ver very many conflicts, basically all due to
name -> pname+version. Fortunately, almost everything was auto-resolved
by kdiff3, and for now I just fixed up a couple evaluation problems,
as verified by the tarball job. There might be some fallback to these
conflicts, but I believe it should be minimal.
Hydra nixpkgs: ?compare=1538299
2019-08-24 08:55:37 +02:00
Samuel Leathers
8943fb5f24
Merge pull request #67365 from dywedir/hcxtools
...
hcxtools: 5.1.6 -> 5.2.0
2019-08-23 23:23:44 -04:00
Samuel Leathers
5f202e0b22
Merge pull request #67367 from jtojnar/nextcloud-cleanup
...
nextcloud-client: clean up
2019-08-23 23:22:06 -04:00
Jan Tojnar
aff3036a6f
gnome3.hitori: 3.31.92 → 3.32.0
...
https://gitlab.gnome.org/GNOME/hitori/blob/3.32.0/NEWS#L1-7
2019-08-24 02:54:20 +02:00
Marek Mahut
9730ab8867
Merge pull request #67326 from Izorkin/nginx-unit
...
unit: 1.9.0 -> 1.10.0
2019-08-24 01:33:12 +02:00
Marek Mahut
3847e4d1b3
Merge pull request #67335 from cw789/unifi_update
...
unifiStable: 5.10.26 -> 5.11.39
2019-08-24 01:31:44 +02:00
Mario Rodas
7294e168cd
Merge pull request #67316 from marsam/update-terraform
...
terraform_0_12: 0.12.6 -> 0.12.7
2019-08-23 16:33:46 -05:00
Jan Tojnar
80fbcf2d33
nextcloud-client: format expression
2019-08-23 22:54:41 +02:00
Jan Tojnar
fc79a83e68
nextcloud-client: clean up
...
Continuation of https://github.com/NixOS/nixpkgs/pull/67306
* Switched to non-deprecated dbus config path.
* Removed CMake flags for finding dependencies, the project can find them on its own.
* Properly fixed the RPATH issue from https://github.com/NixOS/nixpkgs/pull/15406 – ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}.
* Dropped changing Icon name in the desktop file as it was fixed upstream.
* Switched to fetchFromGitHub, as the submodules are only for Win, Mac & crash reporting.
* Dropped enableParallelBuilding = true, as it is on by default with CMake.
2019-08-23 22:51:39 +02:00
worldofpeace
0552f4dc73
Merge pull request #67214 from stefano-m/master
...
adoptopenjdk-icedtea-web: rename from icedtea_web
2019-08-23 16:43:52 -04:00
Vladyslav M
9a2b01ad8c
hcxtools: 5.1.6 -> 5.2.0
2019-08-23 23:14:23 +03:00
Stefano Mazzucco
a6d234e9e9
adoptopenjdk-icedtea-web: rename from icedtea_web
...
This is a follow up of https://github.com/NixOS/nixpkgs/pull/66422
- rename icedtea_web to adoptopenjdk-icedtea-web to reflect the new governance
- add icedtea_web and icedtea8_web to aliases.nix for backwards compatibility
- update the attribute name where icedtea_web is used
2019-08-23 21:12:59 +01:00
worldofpeace
eaf95bef86
Merge pull request #63273 from colemickens/nixpkgs-gelasio
...
gelasio: init at unstable-2018-08-13
2019-08-23 16:12:39 -04:00
Cole Mickens
6039ccef9e
gelasio: init at unstable-2018-08-13
2019-08-23 22:01:04 +02:00
Matthew Bauer
1329703616
Merge pull request #67225 from matthewbauer/tramp-zshrc-fix
...
nixos/zsh: Fix tramp support
2019-08-23 15:14:46 -04:00
Samuel Leathers
e7581c2976
Merge pull request #67362 from mmahut/CVE-2019-14493
...
opencv: CVE-2019-14493
2019-08-23 14:53:43 -04:00
Marek Mahut
589405a563
opencv: CVE-2019-14493
2019-08-23 20:36:31 +02:00
Jan Tojnar
a8d3aebdce
Merge pull request #67318 from jtojnar/gnome-photos
...
gnome-photos: 3.32.0 → 3.32.1
2019-08-23 19:49:43 +02:00
Jan Tojnar
c6eb691fb8
gnome-photos: add installed tests
2019-08-23 19:31:14 +02:00
Doron Behar
b4ae37b39a
syncthingtray: init at 0.9.1 ( #65480 )
2019-08-23 18:18:56 +02:00
Linus Heckemann
25559a5597
Merge pull request #22357 from NixOS/openssl-1.1
...
Use openssl 1.1 by default
2019-08-23 17:51:52 +02:00
Vincent Laporte
c02aa1b575
ocamlPackages.sedlex: 1.99.4 -> 1.99.5
2019-08-23 15:48:47 +00:00
Marek Mahut
8f84220eb2
Merge pull request #67331 from mmahut/jormungandrv0.3.3
...
jormungandr: 0.3.2 -> 0.3.3
2019-08-23 17:35:22 +02:00
Maximilian Bosch
57cbd294f9
Merge pull request #67341 from etu/phpstan-0-11-15
...
phpPackages.phpstan: 0.11.12 -> 0.11.15
2019-08-23 17:31:13 +02:00
Linus Heckemann
d1d602f559
Merge remote-tracking branch 'origin/master' into openssl-1.1
2019-08-23 17:27:39 +02:00
worldofpeace
a4083fb455
Merge pull request #67236 from Chiiruno/dev/general
...
Update: easyjson, quicktemplate, statik, qtchan, vlang
2019-08-23 11:14:00 -04:00
worldofpeace
54f385241e
Merge pull request #67306 from Ma27/bump-nextcloud-client
...
nextcloud-client: 2.5.2 -> 2.5.3
2019-08-23 11:05:01 -04:00
Maximilian Bosch
a35b734f28
Merge pull request #67354 from mayflower/scrot-1.2
...
scrot: 0.8-18 -> 1.2
2019-08-23 16:59:59 +02:00
Maximilian Bosch
8d62a398a8
nextcloud-client: 2.5.2 -> 2.5.3
...
https://github.com/nextcloud/desktop/releases/tag/v2.5.3
Also move explicitly dbus configuration files to the store path rather than
`/etc/dbus-1/services`.
2019-08-23 16:52:01 +02:00
Peter Simons
ddfb9a1f2c
Add a build for cabal-install-3.0.0.0 beta release.
2019-08-23 16:50:30 +02:00
Maximilian Bosch
826b492dc3
Merge pull request #67348 from mayflower/prometheus-exporter-mysqld-0.11.0
...
prometheus-mysqld-exporter: 0.10.0 -> 0.11.0
2019-08-23 16:44:42 +02:00
worldofpeace
3fffe5a1ae
Merge pull request #67270 from greizgh/qt/seafile-client
...
seafile-client: Use qt5's mkDerivation
2019-08-23 10:33:22 -04:00
Greizgh
041c82eb40
seafile-client: Use qt5's mkDerivation
...
Following guidelines from #65399
2019-08-23 10:32:44 -04:00
Robin Gloster
39f9042e65
Merge pull request #67346 from mayflower/clamav-0.101.4
...
clamav: 0.101.3 -> 0.101.4
2019-08-23 16:29:41 +02:00
Robin Gloster
c55d90b81c
scrot: 0.8-18 -> 1.2
2019-08-23 16:28:51 +02:00
Sarah Brofeldt
3a64303a20
Merge pull request #63539 from ivan/usbguard-nox
...
usbguard-nox: init at 0.7.4
2019-08-23 16:25:13 +02:00
zimbatm
79c2ed6b60
nixpkgs-fmt: init at 0.2.0
2019-08-23 16:12:50 +02:00
Robin Gloster
f1512dfea3
prometheus-mysqld-exporter: 0.10.0 -> 0.11.0
2019-08-23 16:06:54 +02:00
Robin Gloster
7d1bd575e8
Merge pull request #67344 from mayflower/alertmanager-0.18.0
...
alertmanager: 0.16.2 -> 0.18.0
2019-08-23 16:06:44 +02:00
Robin Gloster
3ac9fd3046
Merge pull request #67315 from marsam/update-prometheus
...
prometheus_2: 2.11.1 -> 2.12.0
2019-08-23 16:01:24 +02:00
Linus Heckemann
9ae11067b8
torque: remove commented-out sbin handling
...
We have a setup hook for this!
2019-08-23 15:58:53 +02:00
Robin Gloster
c6a082b8a7
Merge pull request #63763 from thefloweringash/node-exporter-update
...
prometheus-node-exporter: 0.17.0 -> 0.18.1; set version information
2019-08-23 15:57:59 +02:00
Robin Gloster
47a219d8e7
clamav: 0.101.3 -> 0.101.4
2019-08-23 15:53:07 +02:00
Robin Gloster
88b55379fd
alertmanager: 0.16.2 -> 0.18.0
2019-08-23 15:38:07 +02:00
Michael Weiss
7126eedd4f
Merge pull request #67205 from primeos/ffmpeg-full
...
ffmpeg-full: 4.1.4 -> 4.2
2019-08-23 15:36:15 +02:00
Mario Rodas
911ec73fa8
Merge pull request #67309 from marsam/fix-pycurl-darwin-build
...
pythonPackages.pycurl: fix build on darwin
2019-08-23 08:32:56 -05:00
Sarah Brofeldt
33e33eebbe
Merge pull request #66252 from ivan/scream-receivers
...
scream-receivers: init at 3.3
2019-08-23 15:30:48 +02:00
Elis Hirwing
cbf5909771
phpPackages.phpstan: 0.11.12 -> 0.11.15
...
Changelog: https://github.com/phpstan/phpstan/releases/tag/0.11.15
Changelog: https://github.com/phpstan/phpstan/releases/tag/0.11.14
Changelog: https://github.com/phpstan/phpstan/releases/tag/0.11.13
2019-08-23 14:50:00 +02:00
Robin Gloster
8279e5faab
Merge pull request #67294 from bachp/gitlab-runner-12.2.0
...
gitlab-runner: 12.1.0 -> 12.2.0
2019-08-23 14:49:19 +02:00
Mario Rodas
f7c9670cd8
dune: add marsam as maintainer
2019-08-23 12:33:38 +00:00