github-actions[bot]
acbec64db0
Merge master into staging-next
2023-07-18 18:01:26 +00:00
Robert Hensing
8ad59ed1b2
Merge pull request #242098 from hercules-ci/nixos-no-nix-channel
...
nixos: Disable nix-channel
2023-07-18 15:27:24 +02:00
Martin Weinelt
cd71c603a1
Merge pull request #244137 from flokli/web-eid-app-programs-firefox
...
nixos/firefox: stop reading nixpkgs.config.firefox.enableEUWebID
2023-07-18 14:52:49 +02:00
github-actions[bot]
1e4fbbcda3
Merge master into staging-next
2023-07-18 12:01:37 +00:00
Sandro
cacb77fb27
Merge pull request #206273 from wucke13/master
2023-07-18 13:12:06 +02:00
Sandro
065fd18e5c
Merge pull request #240452 from NickCao/bpftune
2023-07-18 12:43:02 +02:00
Nick Cao
3f751bfdf6
nixos/bpftune: drop flaky tests
2023-07-18 16:58:37 +08:00
Florian Klink
ca1dd491c6
nixos/firefox: stop reading nixpkgs.config.firefox.enableEUWebID
...
This can cause firefox to be overridden with nativeMessagingHosts
pointing to web-eid-app twice, causing a conflict during build.
2023-07-18 11:48:17 +03:00
github-actions[bot]
eebfb7a54e
Merge master into staging-next
2023-07-18 06:01:08 +00:00
Vladimír Čunát
8b0f52c6ae
Merge branch 'staging' into staging-next
2023-07-18 07:06:15 +02:00
Mario Rodas
752b3281a4
Merge pull request #244061 from schra/fix/typo-vaultwarden
...
nixos/vaultwarden: Fix Markdown syntax of link
2023-07-17 20:15:58 -05:00
pennae
d0299f7fa1
Merge pull request #243570 from dotlambda/patroni-python310
...
nixos/patroni: use Python 3.10
2023-07-18 01:28:29 +02:00
André Schröder
9858973dad
nixos/vaultwarden: Fix Markdown syntax of link
...
The typo was introduced in 1d41cff3dc
2023-07-17 23:41:44 +02:00
Vladimír Čunát
9f6bb855c2
Merge #244006 : linux_rt_5_4: fix build
2023-07-17 22:00:59 +02:00
Sandro
61dfd95022
Merge pull request #236778 from awakesecurity/jsoo1/buildkite-agent-hooks
...
nixos/buildkite-agents: simplify service definition
2023-07-17 21:46:12 +02:00
Sandro
aa90c57672
Merge pull request #240774 from tollb/w20230630c_fix_atop_systemd_units
...
nixos/atop: Fix regression in enabling atop units
2023-07-17 21:26:21 +02:00
github-actions[bot]
8717af0ce1
Merge staging-next into staging
2023-07-17 18:01:56 +00:00
Emily
00a7b91eac
Merge pull request #243366 from vamega/sambda-wsdd-firewall-config
...
nixos/samba-wsdd: add openFirewall option
2023-07-17 19:21:58 +02:00
Maximilian Bosch
10ff0a076b
nixos/tests/kernel-generic: also expose rt kernels and linux_libre
2023-07-17 18:47:01 +02:00
ppom
139259a377
slskd: init module ( #233648 )
...
* slskd: init module
* Update nixos/modules/services/web-apps/slskd.nix
* Update nixos/modules/services/web-apps/slskd.nix
* add description to slskd module options
---------
Co-authored-by: ppom <ppom@ppom.me>
Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
2023-07-17 18:40:54 +02:00
Varun Madiath
d237a7318c
nixos/samba-wsdd: add openFirewall option
2023-07-17 10:22:43 -04:00
github-actions[bot]
0a4cedc7f8
Merge staging-next into staging
2023-07-17 12:02:20 +00:00
Jon Seager
5e73f0c1c9
nixos/lxd: fix default ui package
2023-07-17 08:04:42 -03:00
Nick Cao
4cd70e125d
nixos/bpftune: init basic test
2023-07-17 15:59:50 +08:00
Nick Cao
b47c483bf8
nixos/bpftune: init
2023-07-17 15:59:49 +08:00
github-actions[bot]
5b36eb4172
Merge staging-next into staging
2023-07-17 00:03:32 +00:00
Otavio Salvador
0a93242075
rio: add nixosTests support using terminal-emulators existing set
...
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
2023-07-16 20:20:04 -03:00
github-actions[bot]
786f620d45
Merge staging-next into staging
2023-07-16 12:01:41 +00:00
Colin
e7059632c6
nixos/trust-dns: init
...
Co-authored-by: Yt <happysalada@tuta.io>
2023-07-16 15:24:10 +08:00
Jan Tojnar
cea188cbbb
Merge branch 'staging-next' into staging
...
Conflicts:
- pkgs/tools/networking/shadowfox/default.nix between e989daa65f
and 1c29673fcc
- pkgs/tools/networking/wuzz/default.nix between 7d80417710
and 1c29673fcc
2023-07-16 02:20:49 +02:00
Artturi
d1abbbd9b6
Merge pull request #242309 from Artturin/ananicyextraxadd
2023-07-16 00:43:45 +03:00
Yureka
e16a75d3be
redis: use system jemalloc ( #243398 )
...
* redis: use system jemalloc
2023-07-15 13:02:13 -05:00
github-actions[bot]
26b725b3fe
Merge master into staging-next
2023-07-15 12:01:05 +00:00
pennae
45ae0efbbc
Merge pull request #243271 from woojiq/keyd-support-multiple-configs
...
nixos/keyd: add support for multiple configuration in different files
2023-07-15 13:59:57 +02:00
Nick Cao
d9dd68efda
Merge pull request #243004 from baloo/baloo/keepalived/vrrp-router-id
...
keepalived: fixup `virtualRouterId` documentation
2023-07-15 05:36:10 -06:00
woojiq
2d3bf20086
nixos/keyd: add support for multi-file configuration
...
Add `keyboards` option to define different configurations for different IDs. This creates the appropriate files in `/etc/keyd` instead of just `default.conf` as before.
Add `23.11` release note entry.
Add `mkRemovedOptionModule` for the old API with a note on how to revert the old behavior.
2023-07-15 11:33:41 +03:00
github-actions[bot]
407ebc6fd7
Merge staging-next into staging
2023-07-15 06:01:54 +00:00
github-actions[bot]
2a22bb7087
Merge master into staging-next
2023-07-15 06:01:19 +00:00
Matti
162039a233
nixos/swraid: Add missing mkRenamedOption
2023-07-15 03:56:54 +02:00
Robert Schütz
c9e8e912cb
nixos/patroni: use Python 3.10
2023-07-14 18:20:14 -07:00
Sandro
545f079f5e
Merge pull request #243475 from vtuan10/enable-klipper-flash
...
nixos/klipper: add enableKlipperFlash option
2023-07-15 02:54:47 +02:00
adisbladis
110489e12a
Merge pull request #243373 from adisbladis/pict-rs_0_4
...
pict-rs: 0.3.3 -> 0.4.0
2023-07-15 12:36:05 +12:00
github-actions[bot]
0ef9a6190c
Merge staging-next into staging
2023-07-15 00:03:09 +00:00
github-actions[bot]
73205ff524
Merge master into staging-next
2023-07-15 00:02:34 +00:00
Arthur Gautier
ee38adc8e2
keepalived: use ints.between
...
Signed-off-by: Arthur Gautier <baloo@superbaloo.net>
2023-07-14 20:52:48 +00:00
Lassulus
a4ffd00fb9
Merge pull request #243251 from schnusch/cgit-regex
...
nixos/cgit: fix \v and \f in regexEscape
2023-07-14 22:03:44 +02:00
schnusch
8980fdd9b5
nixos/cgit: fix \v and \f in regexEscape
2023-07-14 21:14:01 +02:00
github-actions[bot]
8c2cf79031
Merge staging-next into staging
2023-07-14 18:02:05 +00:00
github-actions[bot]
0f179253f1
Merge master into staging-next
2023-07-14 18:01:25 +00:00
Sandro
75cfb4925a
Merge pull request #242126 from kjeremy/vmware-guest-aarch64
...
vmware-guest module: work under aarch64
2023-07-14 19:51:14 +02:00