Theodore Ni
80a74ec050
Merge branch 'master' into staging-next
...
Manually fixed a merge conflict between https://github.com/NixOS/nixpkgs/pull/227900
and https://github.com/NixOS/nixpkgs/pull/246022 .
2023-08-26 16:08:02 -07:00
Franz Pletz
da9db25ca4
Merge pull request #222515 from codedownio/tmux-run-plugins-last
2023-08-26 22:47:33 +02:00
Maciej Krüger
ebdd6efe6c
Merge pull request #251412 from karolinschlegel/update-odoo
2023-08-26 21:32:48 +02:00
Janik
321734bc2b
Merge pull request #251157 from NetaliDev/vmagent-extra-options
2023-08-26 21:21:11 +02:00
Janik
1f0c325739
Merge pull request #250976 from Shados/sddm-include-tmpfile-config
2023-08-26 20:21:20 +02:00
github-actions[bot]
3503eea847
Merge master into staging-next
2023-08-26 18:00:55 +00:00
Ryan Lahfa
72494b65bc
Merge pull request #219873 from r-ryantm/auto-update/dolibarr
2023-08-26 16:23:13 +02:00
Mario Rodas
913c460a8c
Merge pull request #251431 from adamcstephens/lxd/5.17
...
lxd: 5.16 -> 5.17
2023-08-26 09:19:53 -05:00
Adam Stephens
6175a329d2
lxd: fix passthru test building
2023-08-26 08:51:13 -04:00
Raito Bezarius
7207b25099
nixos/tests/dolibarr: use -X GET instead -X POST to test for redirection
...
Previously, we were POST-ing the homepage to test for redirection, this is wrong.
We are supposed to GET-ing it.
This is fixed.
2023-08-26 13:44:19 +02:00
Karolin Schlegel
19d7454123
odoo: 15.20230317 -> 16.20230722
2023-08-26 10:22:57 +02:00
github-actions[bot]
7acb56e802
Merge master into staging-next
2023-08-26 06:00:59 +00:00
Peter Hoeg
8a390e0210
doc: document baloo re-indexing
2023-08-26 06:45:39 +02:00
Franz Pletz
08c65ad526
Merge pull request #251370 from leona-ya/paperless-ngx-mail-ca-certs
...
nixos/paperless: allow systemd services to read ca-certificates
2023-08-26 03:20:25 +02:00
Franz Pletz
da37904672
Merge pull request #246772 from R-VdP/nixos-user-expiry
...
nixos/update-users-groups: add support for account expiry
2023-08-26 02:41:34 +02:00
github-actions[bot]
a23616289b
Merge master into staging-next
2023-08-26 00:01:43 +00:00
Franz Pletz
fe907aa37e
Merge pull request #242365 from h7x4/add-mysqld-exporter
...
services/prometheus/exporters: add mysqld
2023-08-25 23:56:22 +02:00
github-actions[bot]
e79f8fd118
Merge master into staging-next
2023-08-25 18:00:58 +00:00
Leona Maroni
87f21ac4e6
nixos/paperless: allow systemd services to read ca-certificates
...
This fixes a regression introduced with the update to 1.17.0.
Since this version paperless-ngx checks the ssl certificates of remote
email servers.
2023-08-25 16:54:04 +02:00
revol-xut
0ebb3b6ed8
nixos/netbox: add keycloakClientSecret option
2023-08-25 15:42:44 +01:00
Maximilian Bosch
c4494e2f9b
Merge pull request #251293 from linj-fork/fix-pass
...
pass: stop installing password-store.el
2023-08-25 14:32:57 +02:00
github-actions[bot]
8680fe99a1
Merge master into staging-next
2023-08-25 12:01:24 +00:00
Lin Jian
665651c736
emacs: remove outdated doc about package initialization
...
Since Emacs 27[1], there is no need to call package-initialize in the
init file.
[1]: https://git.savannah.gnu.org/cgit/emacs.git/tree/etc/NEWS.27?id=cae528457cb862dc886a34240c9d4c73035b6659#n227
2023-08-25 10:22:30 +00:00
Lin Jian
0d3ba90f52
nixos/emacs: replace emacs with Emacs in the doc
2023-08-25 10:22:30 +00:00
Arnout Engelen
4dcaa04151
Merge pull request #242942 from raboof/prometheus-nextcloud-auth-token
...
prometheus-exporter-nextcloud: support for auth tokens
2023-08-25 09:54:23 +02:00
Lin Jian
85217382d6
pass: stop installing password-store.el
...
password-store.el is on MELPA so it is available in Nixpkgs as
emacs.pkgs.password-store.
Using emacs.pkgs.password-store is preferred because of better package
quality:
- Emacs lisp package dependencies are automatically installed
- byte-compilation is done
- native-compilation is done
2023-08-25 12:33:54 +08:00
github-actions[bot]
d4c8d05cac
Merge master into staging-next
2023-08-25 00:01:49 +00:00
Ilan Joselevich
0f95d1cfe1
Merge pull request #248748 from acid-bong/zshLsColors
...
nixos/zsh: add enableLsColors
2023-08-24 22:04:43 +03:00
Ilan Joselevich
649fadd226
Merge pull request #250761 from gepbird/dwm-fix-java-gui
...
dwm: add _JAVA_AWT_WM_NONREPARENTING=1
2023-08-24 22:02:38 +03:00
github-actions[bot]
abaaf09a76
Merge master into staging-next
2023-08-24 18:00:52 +00:00
Benjamin Staffin
63f858bdf8
hddfancontrol: license and metadata tweaks ( #251184 )
...
* nixos/hddfancontrol: missed a few code review tweaks
Following up on https://github.com/NixOS/nixpkgs/pull/239801#pullrequestreview-1498132501
* hddfancontrol: Fix license field
2023-08-24 12:41:43 -04:00
Jennifer Graul
f0b76e7d10
nixos/vmagent: add extraOptions option
2023-08-24 15:09:29 +02:00
github-actions[bot]
4328391132
Merge master into staging-next
2023-08-24 12:01:05 +00:00
K900
9ab379753f
Merge pull request #250974 from K900/wine-binfmt-mask
...
nixos/binfmt: use PE magic to detect Wine executables
2023-08-24 12:54:21 +03:00
Ryan Lahfa
4fb9aeae23
Merge pull request #250843 from RaitoBezarius/listmonk
2023-08-24 10:59:58 +02:00
Pierre Bourdon
4428f3a79a
Revert "nixos/security/wrappers: simplifications and a fix for #98863 "
2023-08-24 08:35:11 +02:00
github-actions[bot]
a451dcf514
Merge master into staging-next
2023-08-24 06:01:14 +00:00
Mario Rodas
8720d96225
Merge pull request #248395 from adamcstephens/lxd/tests
...
nixos/tests/lxd: move into subdir, use minimal init, remove sleeps
2023-08-24 00:37:04 -05:00
Nick Cao
6408fedbfa
Merge pull request #248855 from NickCao/zram-generator
...
nixos/zram: use nixos/zram-generator as backing implementation
2023-08-24 08:57:22 +08:00
Nick Cao
8d524e610b
Merge pull request #249502 from oddlama/feat-influxdb-provision-full
...
nixos/influxdb2: add provisioning and nixos tests
2023-08-24 08:55:38 +08:00
Nick Cao
e2689c1c98
nixos/zram-generator: drop outdated comments
2023-08-24 08:47:19 +08:00
github-actions[bot]
18b5b2d448
Merge master into staging-next
2023-08-24 00:01:48 +00:00
Pierre Bourdon
0930308453
Merge pull request #199599 from robryk/suidwrapnoreal
...
nixos/security/wrappers: simplifications and a fix for #98863
2023-08-24 01:09:36 +02:00
Ilan Joselevich
49f76fea56
Merge pull request #251032 from Kranzes/twingate-resolved
...
nixos/twingate: avoid conflicts with resolved
2023-08-24 01:39:27 +03:00
Pol Dellaiera
ef45c82289
Merge pull request #250648 from mfrw/mfrw/tailscale
...
tailscale: 1.46.1 -> 1.48.1
2023-08-24 00:22:26 +02:00
Felix Bühler
fb6665f4de
Merge pull request #250970 from alyssais/virtualbox-test-eval
...
nixosTests.virtualbox: fix eval
2023-08-23 22:02:34 +02:00
Ilan Joselevich
e739ef8066
nixos/twingate: avoid conflicts with resolved
2023-08-23 23:01:47 +03:00
Emily
73a060e7ca
Merge pull request #244626 from Sohalt/caddy-rfc42
...
nixos/caddy: Add rfc42 settings option
2023-08-23 20:36:46 +02:00
github-actions[bot]
3e9e11f99a
Merge master into staging-next
2023-08-23 18:01:00 +00:00
Benjamin Staffin
5b198578db
Merge pull request #239801 from benley/hddfancontrol
...
hddfancontrol: init at 1.5.1 (plus nixos module)
2023-08-23 13:32:37 -04:00