Commit graph

15258 commits

Author SHA1 Message Date
github-actions[bot] e15af378fb
Merge master into staging-next 2021-07-18 18:01:12 +00:00
Robert Hensing c8c84795b4
Merge pull request #130114 from roberth/fix-neo4j-JAVA_HOME
Fix neo4j java home
2021-07-18 18:51:27 +02:00
github-actions[bot] 382fdc7ad3
Merge master into staging-next 2021-07-18 00:01:24 +00:00
Felix Buehler 82cb33a0ae treewide: remove meta.version 2021-07-18 00:07:38 +02:00
github-actions[bot] d6b748b2b3
Merge master into staging-next 2021-07-17 18:00:56 +00:00
Martin Weinelt 3553c0961f
Merge pull request #130435 from LeSuisse/openresty-1.19.3.2
openresty: 1.19.3.1 -> 1.19.3.2
2021-07-17 14:03:53 +02:00
github-actions[bot] 4ee4d805d2
Merge master into staging-next 2021-07-17 12:01:22 +00:00
Martin Weinelt 1ae6c6e921
Merge pull request #129967 from sumnerevans/heisenbridge-0.99.1
heisenbridge: unstable-2021-05-29 -> 0.99.1
2021-07-17 13:01:31 +02:00
Thomas Gerbet 2dbdca1aa4 openresty: 1.19.3.1 -> 1.19.3.2
Fixes CVE-2021-23017.

https://openresty.org/en/ann-1019003002.html
2021-07-17 10:33:10 +02:00
github-actions[bot] 046dece8d7
Merge master into staging-next 2021-07-16 18:01:09 +00:00
github-actions[bot] 9fe75f18c0
Merge master into staging-next 2021-07-16 12:01:03 +00:00
Vladimír Čunát 6582dd7e12
knot-dns: 3.0.7 -> 3.0.8
https://gitlab.nic.cz/knot/knot-dns/-/tags/v3.0.8
2021-07-16 12:40:07 +02:00
Bernardo Meurer 7642d0b427 tailscale: 1.10.1 -> 1.10.2 2021-07-16 12:15:46 +02:00
github-actions[bot] 7959589ea0
Merge master into staging-next 2021-07-16 06:01:04 +00:00
github-actions[bot] fa7a791586
Merge master into staging-next 2021-07-16 00:01:36 +00:00
Maxine Aubrey ccac09f2eb
consul: 1.10.0 -> 1.10.1 2021-07-15 23:57:01 +02:00
Sandro 6b19023292
Merge pull request #130223 from arezvov/exim_redis_lookup
exim: add redis lookup support
2021-07-15 20:43:17 +02:00
github-actions[bot] 2ccf7ae45c
Merge master into staging-next 2021-07-15 18:01:27 +00:00
foxit64 08479fc25f
remove foxit64 as maintainer (#130284)
Co-authored-by: foxit64 <foxit64@users.noreply.github.com>
Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
2021-07-15 19:36:37 +02:00
Sandro a0fe575c2c
Merge pull request #129812 from TredwellGit/xorg.xorgserver
xorg.xorgserver: 1.20.11 -> 1.20.12
2021-07-15 18:20:30 +02:00
Kim Lindberger 4dcf295417
Merge pull request #129464 from talyz/discourse-plugins
discourse: Updates and fixes
2021-07-15 14:50:28 +02:00
ajs124 ad1437bb6d
Merge pull request #130113 from helsinki-systems/upd/icingaweb2
icingaweb2: 2.8.3 -> 2.9.0
2021-07-15 14:48:54 +02:00
Ben Siraphob b04de31afc
Merge pull request #128627 from fpletz/pkgs/janus-gateway
janus-gateway: init at 0.11.3
2021-07-15 19:10:51 +07:00
Alexander Rezvov 9fd1126cd4 exim: add redis lookup support 2021-07-14 22:57:17 +03:00
github-actions[bot] f0bb8c9a78
Merge master into staging-next 2021-07-14 18:01:12 +00:00
Guillaume Girol 05e46e3e1f
Merge pull request #113242 from lopsided98/uwsgi-cross
uwsgi: fix cross-compilation
2021-07-14 14:22:22 +00:00
Jörg Thalheim 7afa51c2bd Merge remote-tracking branch 'upstream/master' into HEAD 2021-07-14 15:45:51 +02:00
talyz 60d78d7f1f
discourse: 2.7.4 -> 2.7.5 2021-07-14 13:18:23 +02:00
talyz 61f4429fbd
discourse: Use terser when building assets
Discourse prefers to use `terser` when building js assets, see
https://github.com/discourse/discourse/pull/12656. It still wants to
find `uglify-js` in order to not fall back to a ruby js compression
library, so let's keep it around for now. A fix for this has been
submitted upstream in
https://github.com/discourse/discourse/pull/13683.
2021-07-14 13:18:17 +02:00
talyz a2dbc3af1d
discourse: Remove architecture bound platforms from Gemfile.lock
Maybe bundix doesn't handle them properly? They cause runtime issues
and don't seem necessary when the binary gems are built from scratch
anyway.
2021-07-14 13:18:12 +02:00
talyz 3300282db3
discourse: Add update-plugins action to update.py 2021-07-14 13:17:55 +02:00
talyz d3bc5d5b7a
discourse.plugins: Update and add metadata 2021-07-14 13:17:49 +02:00
Rok Garbas ae7c092d88
Merge pull request #120297 from rsynnest/master
nixos/unifi-video module and supporting packages
2021-07-14 11:45:25 +02:00
Robert Hensing c43213bb67 neo4j: Clean up and make jre easy to override
Convention is to use `jre` and make it specific in the callPackage
call.
This way users can override it regardless of changes to the default
neo4j jre.
2021-07-14 09:25:16 +02:00
Ben Siraphob abdd929588
Merge pull request #130146 from SuperSandro2000/git.archlinux.org-move
treewide: convert all links git.archlinux.org to github.com/archlinux…
2021-07-14 09:59:30 +07:00
Sandro Jäckel 388a4ef423
treewide: convert all links git.archlinux.org to github.com/archlinux/svntogit-* 2021-07-14 03:35:21 +02:00
Sandro e85e671dee
Merge pull request #130001 from ymarkus/bookstack 2021-07-14 03:26:34 +02:00
Maximilian Bosch 632e5186b9
Merge pull request #129570 from sumnerevans/matrix-synapse-1.38.0
matrix-synapse: 1.37.1 -> 1.38.0
2021-07-14 00:15:48 +02:00
Sandro 48eef8297b
Merge pull request #130077 from MayNiklas/plex-update
plex: 1.23.3.4707-ebb5fe9f3 -> 1.23.4.4805-186bae04e
2021-07-13 23:38:52 +02:00
Sandro df18bce77d
Merge pull request #130080 from Atemu/xorgserver-host-kernel-in-binary 2021-07-13 23:26:27 +02:00
Atemu 4b4c8650a8 xorgserver: override build OS name 2021-07-13 22:41:16 +02:00
Roland Synnestvedt fa8f004781 Merge branch 'master' of https://github.com/nixos/nixpkgs 2021-07-13 10:09:12 -07:00
Janne Heß 3af5d881e0
icingaweb2-thirdparty: Init at 0.10.0 2021-07-13 18:22:12 +02:00
Janne Heß aae29c6e10
icingaweb2-ipl: Init at 0.6.0 2021-07-13 18:21:44 +02:00
Robert Hensing 63c241d6a7 neo4j: Fix JAVA_HOME 2021-07-13 18:16:35 +02:00
Janne Heß 2ff6e037a9
icingaweb2: 2.8.3 -> 2.9.0 2021-07-13 18:10:33 +02:00
ajs124 7716a2ea37
Merge pull request #130086 from r-ryantm/auto-update/icingaweb2
icingaweb2: 2.8.2 -> 2.8.3
2021-07-13 17:44:09 +02:00
Sumner Evans 8b055178de
matrix-synapse: 1.37.1 -> 1.38.0 2021-07-13 08:23:20 -06:00
R. RyanTM df3aa47c5a icingaweb2: 2.8.2 -> 2.8.3 2021-07-13 10:42:35 +00:00
Niklas 8ef45e7a25
plex: 1.23.3.4707-ebb5fe9f3 -> 1.23.4.4805-186bae04e 2021-07-13 10:31:42 +02:00