Sandro
05fca4c71c
Merge pull request #118129 from samuelgrf/fix-enableAllFirmware
2021-03-31 16:51:17 +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
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
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
github-actions[bot]
b1788736fd
Merge master into staging-next
2021-03-29 12:06:25 +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
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
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
github-actions[bot]
95c24d591a
Merge master into staging-next
2021-03-27 18:14:08 +00:00
Michele Guerini Rocco
b01e00ba8f
Merge pull request #114688 from rnhmjoj/tcsd-no-udev-settle
...
nixos/tcsd: several improvements and fixes
2021-03-27 16:31:17 +01:00
github-actions[bot]
70fb533d57
Merge master into staging-next
2021-03-26 18:13:54 +00:00
Justin Humm
347a9168ae
nixos/hledger-web: set capabilites as boolean
2021-03-26 13:45:13 +01:00
Justin Humm
569940b9fd
nixos/hledger-web: add stateDir, use own user, fix ExecStart
...
This allows for shared hledger installations, where the web interface is
available via network and multiple user share a SSH access to the
hledger user.
Also added `--serve` to the CLI options, as hledger-web tries to open a
webbrowser otherwise:
hledger-web: xdg-open: rawSystem: runInteractiveProcess: exec: does not
exist (No such file or directory)
Co-authored-by: Aaron Andersen <aaron@fosslib.net>
2021-03-26 13:45:13 +01:00
github-actions[bot]
eddd1a74ec
Merge master into staging-next
2021-03-26 12:06:41 +00:00
Maciej Krüger
c8d2f4a3a8
cjdns: reduce password length to 32
...
Maximum password length per cjdns code is somehwhere less than that, see
ecd01e7681/client/AdminClient.c (L80)
2021-03-26 11:35:09 +01:00
Robert Hensing
363d7c86b0
Merge pull request #117603 from lbpdt/fix/docker-tools-layered-image-env
...
dockerTools.streamLayeredImage: resolve duplicate env vars
2021-03-26 09:52:18 +01:00
github-actions[bot]
b068d2e437
Merge master into staging-next
2021-03-26 00:15:53 +00:00
