JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
283,333 Commits 2 Branches 0 Tags 13 GiB
27b95afbb8
Commit Graph

21017 Commits

Author SHA1 Message Date
Tim Steinbach
13c3f30d11 kernel: Remove old kernel tests 2021-04-08 09:00:15 -04:00
Tim Steinbach
bd7fed9a2f kernel: Add tests to passthru.tests 2021-04-08 09:00:15 -04:00
Sandro
936f450e3d
Merge pull request #118805 from helsinki-systems/fix/eval/no-aliases-iproute2 
treewide: fix eval without aliases after 9378fdf87e0626e8c63a90a378c3…
 2021-04-08 14:20:12 +02:00
Kim Lindberger
5a1bd5ff66
Merge pull request #116074 from talyz/discourse 
discourse: Add package and NixOS module
 2021-04-08 14:19:49 +02:00
ajs124
c6d4dae35d treewide: fix eval without aliases after 9378fdf87e 2021-04-08 13:33:09 +02:00
Robert Schütz
5e0defcb25 nixos/home-assistant: use override before overridePythonAttrs 2021-04-08 12:30:59 +02:00
Peter Hoeg
b7f5bc61f3 document packagekit 2021-04-08 09:23:54 +08:00
github-actions[bot]
8d1d992273
Merge master into staging-next 2021-04-08 00:17:24 +00:00
Martin Weinelt
c11a3f5fd4
Merge pull request #118633 from mweinelt/home-assistant-team 2021-04-08 01:55:27 +02:00
Bernardo Meurer
890b13b38c
Merge pull request #118701 from jansol/pipewire 
pipewire: 0.3.24 -> 0.3.25
 2021-04-07 21:35:29 +00:00
Sandro
318115515b
Merge pull request #118742 from FRidh/tailscale 
services.tailscale: add openresolv to path
 2021-04-07 23:31:10 +02:00
Phillip Cloud
7c36ce8d3a nixos/containers: move extraConfig to settings model 2021-04-07 16:08:18 -04:00
Vladimír Čunát
b132849dae
Merge #117519: nixos/amdgpu: remove 2021-04-07 20:25:55 +02:00
github-actions[bot]
6e4d572602
Merge master into staging-next 2021-04-07 18:14:53 +00:00
Frederik Rietdijk
b9ef51a84b services.tailscale: add openresolv to path 
Without openresolv, magic dns is not very usable.
 2021-04-07 18:40:04 +02:00
Viktor Kronvall
10019ab879 dockerTools: test that mergeImages preserves owner 2021-04-08 00:22:59 +09:00
Viktor Kronvall
bcc3f8eab5 dockerTools: test mergeImages 2021-04-08 00:22:59 +09:00
Jan Solanti
f94c84f844 pipewire: 0.3.24 -> 0.3.25 2021-04-07 16:23:43 +03:00
Robert Hensing
58b21dea78
Merge pull request #116749 from vroad/docker-layered-image-fakeroot 
dockerTools.streamLayeredImage: add fakeRootCommands option
 2021-04-07 15:02:24 +02:00
Stéphan Kochen
20481bd027 doh-proxy-rust: init at 0.3.8 2021-04-07 14:23:55 +02:00
Emery Hemingway
32a5b44b8d nixos/samba: remove bad example for "securityType" option 
Setting "security = share" causes silent failures.
 2021-04-07 14:18:01 +02:00
github-actions[bot]
1d48804dab
Merge master into staging-next 2021-04-07 12:06:23 +00:00
vroad
63e7c4186f dockerTools.streamLayeredImage: Add test for fakeRootCommands 2021-04-07 18:11:02 +09:00
Sandro
d9f9a4a976
Merge pull request #117554 from Zopieux/snapcast-meta 2021-04-07 10:30:32 +02:00
Sandro
597f75375b
Merge pull request #118706 from lukegb/pomerium 
nixos/pomerium: fix useACMEHost
 2021-04-07 09:50:36 +02:00
Milan Pässler
e0d8f6b183
nixos/gitlab: do not set backup.upload by default 2021-04-07 09:21:18 +02:00
Luke Granger-Brown
ddf4795824 nixos/pomerium: fix useACMEHost 
useACMEHost doesn't work properly, because I forgot to actually define
the variable that is being relied upon here. Oops.
 2021-04-07 01:26:44 +00:00
Martin Weinelt
dc84583452
home-assistant: Move maintainership to home-assistant team 2021-04-07 02:33:24 +02:00
github-actions[bot]
5e509a83ed
Merge master into staging-next 2021-04-07 00:15:14 +00:00
Jens Nolte
f7ff874701
nixos/greetd: Add greetd module (#118294) 
* nixos/greetd: Add greetd module

* nixos/greetd: Configure 'greeter'-user

* nixos/greetd: Add default for restart-option

Co-authored-by: Jens Nolte <git@queezle.net>
 2021-04-06 19:35:32 +00:00
Jan Tojnar
c04a14edd6 Merge branch 'master' into staging-next 2021-04-06 16:01:14 +02:00
Ryan Horiguchi
5171c5c2ee
nixos/networkmanager: add missing kernel module for wpa authenticaion 2021-04-06 13:50:51 +02:00
Peter Hoeg
aa22be179a nixos/packagekit: RFC42 support and drop pointless setting 2021-04-06 11:41:37 +08:00
Martin Weinelt
b0cf9f6775
Merge pull request #118503 from dotlambda/home-assistant-dont-maintain 
home-assistant: remove dotlambda from maintainers
 2021-04-06 01:09:31 +02:00
Pavol Rusnak
073fbba9bf
Merge pull request #89267 from mmilata/bitcoin-exporter 
nixos/prometheus-bitcoin-exporter: init
 2021-04-06 00:08:33 +02:00
Martin Milata
6b028bcf35 nixos/prometheus-bitcoin-exporter: init 2021-04-05 23:50:42 +02:00
Сухарик
1517e6a14b
nixos/droidcam: init (#109267) 
Co-authored-by: Pascal Bach <pascal.bach@nextrem.ch>
 2021-04-05 21:32:21 +02:00
talyz
bc26a46943
rl-2105: Add Discourse module note 2021-04-05 13:56:02 +02:00
talyz
642854055c
nixos/discourse: Add NixOS manual entry 2021-04-05 13:55:57 +02:00
talyz
3c7df2a3cb
nixos/discourse: Add test 2021-04-05 13:55:44 +02:00
talyz
8dddb70bb9
nixos/discourse: Init 2021-04-05 13:54:25 +02:00
Lassulus
e2080b39e6
Merge pull request #89951 from KoviRobi/nixos-user-name-not-attr-name 
nixos/users-groups: Use user name not attribute name for /etc/profiles/…
 2021-04-05 13:52:25 +02:00
Guillaume Girol
4e83ef8026
Merge pull request #113703 from symphorien/disable-sane-master 
nixos/sane: allow to disable enabled-by-default plugins
 2021-04-05 13:49:43 +02:00
Gabriel Ebner
a23dd38f5c
Merge pull request #118384 from gebner/pidmax 
nixos/systemd: increase default numeric PID range
 2021-04-05 11:42:48 +02:00
Sandro
e039d12c85
Merge pull request #117847 from SuperSandro2000/jmusicbot 2021-04-05 06:20:56 +02:00
Sandro
fb9a2414dc nixos/nginx: use http 1.1 in "recommended" proxySettings 
This allows http keep-alive by default which requires http 1.1.
 2021-04-05 05:30:18 +02:00
Sandro
7c932296e0
Merge pull request #116335 from SuperSandro2000/move-aliases.nix 2021-04-05 04:07:15 +02:00
github-actions[bot]
44e3fc61fe
Merge master into staging-next 2021-04-05 00:16:38 +00:00
happysalada
d434251d1c vector: remove deprecated --no-topology 2021-04-05 08:30:52 +09:00
happysalada
bb7da110d1 vector: format with nixpkgs-fmt 2021-04-05 08:30:12 +09:00
Robert Scott
0874169a0c
Merge pull request #118505 from mmilata/domain-exporter 
prometheus-domain-exporter: init at 1.10.0
 2021-04-04 23:00:46 +01:00
Martin Weinelt
c26f97af10
Merge pull request #118443 from SuperSandro2000/SuperSandro2000-patch-2 
nixos/nginx: set "recommended" proxy timeouts to 60s
 2021-04-04 23:59:04 +02:00
Martin Milata
6840746f2d nixos/prometheus-domain-exporter: init 2021-04-04 22:25:12 +02:00
Robert Schütz
d01376d81d home-assistant: remove dotlambda from maintainers 
I'm currently not using it.
 2021-04-04 22:15:13 +02:00
talyz
46d935a4ce
nixos/nginx: Add an option to specify additional third-party modules 2021-04-04 13:44:36 +02:00
Sandro
db5a15676c
nixos/nginx: set "recommended" proxy timeouts to 60s 
According to the nginx documentation [1] those values  cannot usually exceed 75 seconds.
The defaults are 60s and should probably be lowered to something reasonable like 20 or 30 seconds.

[1] https://nginx.org/en/docs/http/ngx_http_proxy_module.html#proxy_connect_timeout
 2021-04-04 07:47:45 +02:00
Sandro Jäckel
9378fdf87e
iproute: deprecate alias 2021-04-04 01:43:46 +02:00
github-actions[bot]
3bf92ca4db
Merge master into staging-next 2021-04-03 18:18:51 +00:00
Izorkin
9d4aaf2366
nixos/redis: allow access to runtime and state directories to only redis user 2021-04-03 19:07:27 +03:00
Izorkin
86d8b31e00
nixos/redis: add option unixSocketPerm 2021-04-03 19:07:27 +03:00
Maximilian Bosch
4364fd3038
Merge pull request #118305 from Ma27/openldap-exporter 
prometheus-openldap-exporter: init at 2.1
 2021-04-03 15:02:59 +02:00
github-actions[bot]
bc845e51f0
Merge master into staging-next 2021-04-03 12:06:14 +00:00
Martin Weinelt
2c0c4d222a
Merge pull request #118392 from dotlambda/home-assistant-overridePythonAttrs 
nixos/home-assistant: use overridePythonAttrs
 2021-04-03 14:03:21 +02:00
Rémi NICOLE
8442c216af
nixos/shiori: fix SystemCallFilter after libseccomp update (#108160) 
fixes #108146
 2021-04-03 06:44:24 -04:00
Robert Schütz
f9bd8b1b7b nixos/home-assistant: use overridePythonAttrs 2021-04-03 12:43:10 +02:00
Gabriel Ebner
c709fd42d9 nixos/systemd: increase default numeric PID range 2021-04-03 10:11:52 +02:00
Gabriel Ebner
3ab6e84b79
Merge pull request #118327 from gebner/spnav 
libspnav: remove nonstandard patches, fix segfaults
 2021-04-03 08:11:52 +02:00
Sandro Jäckel
d8a43688c9
nixos/jmusicbot: init 2021-04-03 02:34:12 +02:00
github-actions[bot]
74200a7126
Merge master into staging-next 2021-04-03 00:14:57 +00:00
Gabriel Ebner
295acf0460 nixos/spacenavd: start as system service 
This is the configuration supported by upstream.
 2021-04-02 23:05:50 +02:00
Pascal Bach
e58bd1763e
Merge pull request #117941 from em0lar/grafana-module-socket 
nixos/grafana: add socket configuration option
 2021-04-02 22:35:20 +02:00
Pascal Bach
c259908251
Merge pull request #117977 from aanderse/nixos/kodi 
nixos/kodi: add package option
 2021-04-02 21:57:03 +02:00
Sandro
dbed6e97f4
Merge pull request #118349 from sternenseemann/pomerium-stdenv-lib 
nixos/tests/pomerium: stdenv.lib → lib
 2021-04-02 21:25:19 +02:00
sternenseemann
ef13dc6637 nixos/tests/pomerium: stdenv.lib → lib 
Just to be safe doesn't seem to have broken any evaluation checks so far.
 2021-04-02 20:53:00 +02:00
github-actions[bot]
b3a0328b7f
Merge master into staging-next 2021-04-02 18:14:54 +00:00
Maximilian Bosch
4794829734
prometheus-openldap-exporter: init at 2.1 2021-04-02 19:16:50 +02:00
Guillaume Girol
fe0e0afbc0
Merge pull request #92929 from symphorien/postgresql-check-config-file 
nixos/postgresql: check config file syntax at build time
 2021-04-02 16:27:03 +00:00
Martin Weinelt
54d286365d
Merge pull request #87750 from oxzi/ubertooth 2021-04-02 15:23:30 +02:00
github-actions[bot]
60739e07d2
Merge master into staging-next 2021-04-02 12:06:12 +00:00
Doron Behar
785d2c03a0
Merge pull request #116677 from alexarice/agda-test-hello-world 2021-04-02 10:19:00 +00:00
github-actions[bot]
636e58e31b
Merge staging-next into staging 2021-04-02 00:21:46 +00:00
Sandro
0a62eadc3c
Merge pull request #118279 from SuperSandro2000/SuperSandro2000-patch-1 
tests/croc: remove stdenv.lib
 2021-04-01 23:53:51 +02:00
Kim Lindberger
11ac9ab827
Merge pull request #118154 from talyz/pipewire-media-session-fixes 
nixos/pipewire: Use formats.json, stricter typing and break up extremely long lines
 2021-04-01 23:00:20 +02:00
Sandro
1dcbed50e3
tests/croc: remove stdenv.lib 2021-04-01 21:27:50 +02:00
Alyssa Ross
b0854238b0 nixos/zfs: fix autoScrub.enable description 
This was previously "Whether to enable Enables periodic scrubbing of
ZFS pools.."
 2021-04-01 19:19:00 +00:00
github-actions[bot]
85e9b4acf4
Merge staging-next into staging 2021-04-01 12:06:32 +00:00
ajs124
2f42097c88
Merge pull request #118090 from helsinki-systems/upd/xfsprogs 
xfsprogs: 5.10.0 -> 5.11.0
 2021-04-01 13:51:01 +02:00
D Anzorge
5d81fcdf37 nixos/netdata: add config option for disabling analytics 
Option disables analytics through the DO_NOT_TRACK environment variable,
as detailed in
https://learn.netdata.cloud/docs/agent/anonymous-statistics

Default is analytics off
 2021-04-01 13:06:04 +02:00
talyz
2a3c276b53
nixos/pipewire: Use formats.json, stricter typing, line breaks 
The upstream pipewire config is written in an almost, but not quite
JSON format. The parser accepts standard JSON, though, so we don't
need to write our file in the same nonstandard version.

The typing for all config options is changed from `types.attrs`, which
behaves poorly when the option is set from multiple locations, to the
formats.json-type.

Also, rewrite some very long one-liners for improved readability.
 2021-04-01 12:08:29 +02:00
Sandro
ca6a01c9a1
Merge pull request #117946 from andreisergiu98/ombi-init 2021-04-01 12:01:10 +02:00
Andrei Pampu
b3082615d9
nixos/ombi: add test for ombi to ensure startup 2021-04-01 10:34:40 +03:00
Andrei Pampu
a364121ef9
nixos/ombi: create ombi service 2021-04-01 10:34:40 +03:00
Linus Heckemann
99238d7ebe
Merge pull request #116639 from Ma27/pi-secrets 
nixos/privacyidea: use envsubst to avoid leaking secrets to the store
 2021-04-01 08:40:42 +02:00
Mario Rodas
72ab382fb6 postgresql_9_5: drop 
PostgreSQL 9.5 has reached EOL on February 11, 2021.
See https://www.postgresql.org/support/versioning/
 2021-04-01 04:20:00 +00:00
github-actions[bot]
b152812791
Merge staging-next into staging 2021-04-01 00:15:44 +00:00
Martin Weinelt
b2ebc881cf
Merge pull request #113988 from piegamesde/matrix-appservice-irc 2021-04-01 01:39:24 +02:00
Jamie McClymont
92acecb548 nixos/tests/matrix-appservice-irc: init 2021-04-01 01:17:24 +02:00
Jamie McClymont
fe228cb25b nixos/matrix-appservice-irc: init 
Co-authored-by: Brian McKenna <brian@brianmckenna.org>
Co-authored-by: piegames <git@piegames.de>
 2021-04-01 01:16:23 +02:00
rnhmjoj
61b7cab481
treewide: use perl.withPackages when possible 
Since 03eaa48 added perl.withPackages, there is a canonical way to
create a perl interpreter from a list of libraries, for use in script
shebangs or generic build inputs. This method is declarative (what we
are doing is clear), produces short shebangs[1] and needs not to wrap
existing scripts.

Unfortunately there are a few exceptions that I've found:

  1. Scripts that are calling perl with the -T switch. This makes perl
  ignore PERL5LIB, which is what perl.withPackages is using to inform
  the interpreter of the library paths.

  2. Perl packages that depends on libraries in their own path. This
  is not possible because perl.withPackages works at build time. The
  workaround is to add `-I $out/${perl.libPrefix}` to the shebang.

In all other cases I propose to switch to perl.withPackages.

[1]: https://lwn.net/Articles/779997/
 2021-03-31 21:35:37 +02:00
Guillaume Girol
f19434ad4a
Merge pull request #113994 from pborzenkov/calibre-web 
calibre-web: init at 0.6.11
 2021-03-31 18:25:45 +00:00
Martin Weinelt
285301cd1f linuxPackages: 5.4 -> 5.10 
The 5.10 series is the next longterm version of the linux kernel and
I've been using it on multiple x86_64 machines ever since it came out.

I think it is time to switch over the default now, so we get some
additional testing in time for NixOS 21.05.
 2021-03-31 11:29:33 -04:00
adisbladis
f5a14a3124
Merge pull request #108745 from lukegb/pomerium 
pomerium: init at 0.13.3
 2021-03-31 17:10:12 +02:00
Sandro
05fca4c71c
Merge pull request #118129 from samuelgrf/fix-enableAllFirmware 2021-03-31 16:51:17 +02:00
Maximilian Bosch
4a4f7dfb77
nixos/privacyidea: use envsubst to avoid leaking secrets to the store 2021-03-31 13:27:30 +02:00
Frederik Rietdijk
9b9e9cff00
Merge pull request #117015 from NixOS/staging-next 
Staging next
 2021-03-31 12:42:19 +02:00
Samuel Gräfenstein
b1bda26ec0
nixos/all-firmware: fix eval with allowAliases set to false 
Fix eval when `nixpkgs.config.allowAliases = false;` is set.
 2021-03-31 10:50:07 +02:00
davidak
fe3eb35133
Merge pull request #97565 from samuelgrf/defaultPackages-nano 
nixos/config: move nano to defaultPackages
 2021-03-31 09:17:56 +02:00
github-actions[bot]
e880daefc6
Merge master into staging-next 2021-03-31 06:05:41 +00:00
Peter Hoeg
f533440d69 nixos/sata: support SATA timeouts 2021-03-31 09:34:08 +08:00
github-actions[bot]
4ba71fb819
Merge master into staging-next 2021-03-31 00:12:29 +00:00
Felix Tenley
0f92c208bb nixos/tests/etebase-server: init 2021-03-30 23:32:26 +02:00
Felix Tenley
410d181739 nixos/etebase-server: add missing static directory setup 2021-03-30 23:32:26 +02:00
Felix Tenley
dccd915adf nixos/etebase-server: replace customIni with more flexible settings option 
Fixes #112834 where incorrect documentation of options was reported.

customIni used to replace the entire default configuration while the
new settings option is merged in with the default configuration
and still allows overriding options when needed.
 2021-03-30 23:32:26 +02:00
github-actions[bot]
f555f95ed8
Merge master into staging-next 2021-03-30 18:15:05 +00:00
ajs124
db8b545233 xfsprogs: 5.10.0 -> 5.11.0 
also try to correct meta.license
 2021-03-30 20:14:53 +02:00
talyz
abba76a3b9
nixos/gitlab: Document automatic backups 2021-03-30 19:15:33 +02:00
talyz
7b5cbde81f
nixos/gitlab: Gitlab -> GitLab 2021-03-30 19:13:43 +02:00
talyz
35582c5af7
gitlab.tests: Test backup and restore 
Test the automatic backup and restore functionality by backing up the
instance after running the initial tests, stopping GitLab and removing
all state, running the restore rake task, then running the tests
again, but without pushing data.
 2021-03-30 19:13:37 +02:00
talyz
3fb04ca505
nixos/gitlab: Introduce automatic backup support 
Add support for automatically backing up GitLab state, both locally
and to remote locations.
 2021-03-30 19:13:31 +02:00
Sandro
7d0dad76ef
Merge pull request #116936 from hercules-ci/logstash-jdk 2021-03-30 17:22:21 +02:00
Samuel Gräfenstein
e6cd793a74
nixos/config: move nano to defaultPackages 
Some people already have another editor installed and may want to
get rid of applications they don't use.
 2021-03-30 11:50:03 +02:00
github-actions[bot]
db6366f318
Merge master into staging-next 2021-03-30 00:14:33 +00:00
Philip Munksgaard
299d054a7f
bitwarden_rs: 1.19.0 -> 1.20.0 (#117931) 
* bitwarden_rs: 1.19.0 -> 1.20.0

* bitwarden_rs: Fix failing integration tests
 2021-03-30 00:33:00 +02:00
Aaron Andersen
31f9775f20 nixos/kodi: add package option 2021-03-29 16:47:30 -04:00
github-actions[bot]
f7049b343c
Merge master into staging-next 2021-03-29 18:13:15 +00:00
Doron Behar
c2b66f2702
Merge pull request #98734 from ju1m/zerobin 2021-03-29 17:18:29 +00:00
Leo Maroni
c162597465
nixos/grafana: add socket configuration option 2021-03-29 15:59:24 +02:00
github-actions[bot]
b1788736fd
Merge master into staging-next 2021-03-29 12:06:25 +00:00
Luke Granger-Brown
309e836c33 nixos/tests/pomerium: init 2021-03-29 10:41:41 +00:00
Luke Granger-Brown
cb2f1df034 nixos/pomerium: init 2021-03-29 10:41:41 +00:00
Jörg Thalheim
96e4052d70
nixos/hydra: gc-check-reachability no longer exists in nix 2.4 (#117925) 
* nixos/hydra: gc-check-reachability no longer exists in nix 2.4

fixup! nixos/hydra: gc-check-reachability no longer exists in nix 2.4

* Update nixos/modules/services/continuous-integration/hydra/default.nix

Co-authored-by: Sandro <sandro.jaeckel@gmail.com>

Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
 2021-03-29 11:14:16 +02:00
Peter Hoeg
860e87d363 nixos/geoclue2: do not start geoclue agent for system users 2021-03-29 16:57:49 +08:00
Sandro
da7bf30372
nixos/containers: update example path to match defaults 2021-03-29 03:40:44 +02:00
github-actions[bot]
d495e7527f
Merge master into staging-next 2021-03-29 00:15:48 +00:00
Maximilian Bosch
c2836eb953
Merge pull request #117809 from mayflower/graylog-4 
graylog: improve JRE handling
 2021-03-28 23:47:26 +02:00
Doron Behar
9d47c33ee0
Merge pull request #82005 from esclear/mpd-socket 
nixos/mpd: allow autostart when listening for unix socket
 2021-03-28 20:04:31 +00:00
Sander van der Burg
b8258843d4 nixos/misc/ids: reclaim uid for disnix 2021-03-28 21:40:44 +02:00
Sander van der Burg
13b367df5f nixos/dysnomia: configure systemd unit path 2021-03-28 21:39:23 +02:00
Sander van der Burg
4ae1fa61ad Revert "nixos/dysnomia nixos/disnix: Drop modules" 
This reverts commit a3f4db8679.
 2021-03-28 21:37:43 +02:00
Xinglu Chen
273f5c38a3
nixos/privoxy: add missing "/" to "forward-socks5" option 
Without this, Privoxy will silently fail, meaning that no traffic
would be routed through Tor, giving users a false sense of privacy.
 2021-03-28 21:16:55 +02:00
Vladimír Čunát
56f308bb2f
nixos/kresd: trivial cleanup 2021-03-28 21:01:50 +02:00
Vladimír Čunát
6e562fd6a7
Merge #101043: nixos/kresd: Listen on IPv4 wildcard, too 
This makes sense to me.  I can't see any reference (incl. PR #78628)
why that commit of mine (ae74a0e27c) used 127.0.0.1 instead of 0.0.0.0
 2021-03-28 20:53:33 +02:00
Vladimír Čunát
0032a3fc81
Merge #100592: nixos/kresd: Fix unportable regex 2021-03-28 20:27:49 +02:00
github-actions[bot]
b9456ca263
Merge master into staging-next 2021-03-28 18:14:11 +00:00
oxalica
80a1336bb9 nixos/filesystems: always write mount options for swap devices 
According to fstab(5), unlike last two fields `fs_freq` and `fs_passno`,
the 4-th field `fs_mntops` is NOT optional, though it works when omitted.

For best-practice and easier to be parsed by other programs, we should always
write `defaults` as default mount options for swap devices.
 2021-03-28 19:54:03 +02:00
Aaron Andersen
d6fd7c6613 nixos/zabbixAgent: add a few minor tweaks to make configuration file compatible with both zabbix agent 1 and 2 2021-03-28 13:35:21 -04:00
Linus Heckemann
4aacd02d33
Merge pull request #115792 from ncfavier/patch-2 
nixos/stage-1: make cpio quiet
 2021-03-28 14:38:46 +02:00
Linus Heckemann
22de3c19e7 graylog: improve JRE handling 
Since the upstream graylogctl script will prefer finding its java
executable based on JAVA_HOME, we now set this instead of PATH in
order to allow it to find the JRE. By setting it conditionally on it
not already being set, we allow selecting a different JRE at runtime.

We also explicitly use openjdk11, which supports the
UseConcMarkSweepGC option which graylog insists on using.
 2021-03-28 14:37:28 +02:00
github-actions[bot]
732dc6ef8f
Merge master into staging-next 2021-03-28 00:15:41 +00:00
Maximilian Bosch
ae73ec2b68
Merge pull request #116738 from Ma27/wiki-js 
wiki-js: init at 2.5.191
 2021-03-27 22:03:35 +01:00