Martin Weinelt
da1a690688
Merge remote-tracking branch 'origin/master' into staging-next
2023-03-10 01:50:42 +01:00
Artturi
eec92afc64
Merge pull request #220374 from Artturin/qt5splicing
2023-03-09 23:26:49 +02:00
Rick van Schijndel
8d8f5ede91
Merge pull request #216451 from Mindavi/hydra/systemd-target
...
nixos/hydra: wait for network-online before evaluator start
2023-03-09 20:53:21 +01:00
Artturin
2cbbef006b
qt5: use makeScopeWithSplicing
...
if there is more than one qt5 attr and this file is copied then the arg
to generateSplicesForMkScope should be changed
2023-03-09 21:16:03 +02:00
github-actions[bot]
39f6788067
Merge master into staging-next
2023-03-09 12:01:27 +00:00
Florian Klink
2a278943b5
Merge pull request #220232 from aanderse/nixos/systemd-oomd
...
nixos/systemd-oomd: avoid unintentionally creating the systemd-oomd u…
2023-03-09 10:15:56 +01:00
Domen Kožar
6a231a6eb7
Merge pull request #197613 from shyim/add-coder
...
coder: fix web frontend building
2023-03-09 12:04:16 +04:00
github-actions[bot]
98d00577f6
Merge master into staging-next
2023-03-09 06:01:01 +00:00
Will Fancher
46089f7efe
Merge pull request #217886 from lilyinstarlight/fix/qemu-vm-initrd-mkdir-0755
...
nixos/qemu-vm: fix minor typo
2023-03-08 19:17:28 -05:00
github-actions[bot]
c8c1423cd9
Merge master into staging-next
2023-03-09 00:02:23 +00:00
Aaron Andersen
374fc068ec
nixos/systemd-oomd: disable systemd-oomd when enableUnifiedCgroupHierarchy is false
...
fixup for https://github.com/NixOS/nixpkgs/pull/203596
2023-03-08 18:39:18 -05:00
Jonas Heinrich
9f10a2e82a
Merge pull request #218633 from onny/networkd-dispatcher-rules
...
nixos/networkd-dispatcher: add rules option
2023-03-08 20:41:06 +01:00
github-actions[bot]
7072ae38b6
Merge master into staging-next
2023-03-08 18:01:34 +00:00
K900
23b0152ffb
Merge pull request #218530 from K900/murmur-dbus
...
nixos/murmur: expose dbus
2023-03-08 18:35:56 +03:00
K900
d8d8b55e7d
nixos/murmur: expose dbus
2023-03-08 18:03:51 +03:00
Martin Weinelt
4729f61158
Merge remote-tracking branch 'origin/master' into staging-next
2023-03-08 15:04:13 +01:00
Ilan Joselevich
944436f290
Merge pull request #218921 from wineee/waybar
...
nixos/waybar: allow change waybar package to use
2023-03-08 14:05:03 +02:00
Jonas Heinrich
26e14e57af
nixos/networkd-dispatcher: add rules option
2023-03-08 10:20:47 +01:00
rewine
ffcf148a8d
nixos/waybar: allow change waybar package to use
...
also add waybar package to environment.systemPackages
2023-03-08 17:16:37 +08:00
Robert Schütz
9af96def95
Merge branch 'master' into staging-next
2023-03-07 21:35:26 -08:00
SharzyL
5e651fe37e
nixos/nexttrace: init
2023-03-08 11:21:06 +08:00
Rick van Schijndel
60446dda1f
nixos/hydra: wait for network-online before evaluator start
...
This prevents issues I'm seeing with the hydra I'm running on my laptop.
Every time I reboot it I see eval errors like this:
```
error fetching latest change from git repo at `https://github.com/nixos/nixpkgs.git ':
fatal: unable to access 'https://github.com/nixos/nixpkgs.git/ ': Could not resolve host: github.com
```
This is because the evaluator already starts before the network is
actually online. It should wait until the network is fully online before
starting evaluation to prevent evaluation errors like above.
2023-03-07 21:58:23 +01:00
github-actions[bot]
f1b48b2a95
Merge master into staging-next
2023-03-07 18:01:12 +00:00
Izorkin
5eb5d881a4
nixos/nginx: add defaultMimeTypes option
2023-03-07 19:37:18 +03:00
github-actions[bot]
fa94414f70
Merge master into staging-next
2023-03-07 00:02:41 +00:00
7c6f434c
c5b8a7f55b
Merge pull request #218718 from KoviRobi/atop-service-no-previous-logs
...
nixos/atop: Don't choke if no existing atop logs
2023-03-06 20:27:25 +00:00
Martin Weinelt
86eedea2fe
Merge remote-tracking branch 'origin/master' into staging-next
2023-03-06 17:38:35 +00:00
Ilan Joselevich
edff57cff4
Merge pull request #218455 from veehaitch/gh-runner-builddotnet
...
github-runner: switch to `buildDotnetModule`
2023-03-06 19:11:06 +02:00
Martin Weinelt
bcf6c81a88
Merge remote-tracking branch 'origin/master' into staging-next
2023-03-06 16:55:14 +00:00
Valentin Gagarin
e16a8baa41
Merge pull request #218830 from fricklerhandwerk/command-line-suggestion
...
configuration.nix: suggest a command line program
2023-03-06 15:59:33 +01:00
Martin Weinelt
b04848e5fe
Merge remote-tracking branch 'origin/master' into staging-next
2023-03-06 08:21:14 +01:00
Sandro
66ee57d44d
Merge pull request #217555 from SuperSandro2000/nox-qt5-no-self
2023-03-06 01:17:25 +01:00
Naïm Favier
6082d5bd0a
Merge pull request #219549 from SEIAROTg/master
...
nixos/wireguard: fix mtu after switching netns.
2023-03-05 22:56:29 +01:00
Ryan Lahfa
c91b85416b
Merge pull request #216015 from r-ryantm/auto-update/dolibarr
...
dolibarr: 16.0.3 -> 16.0.4
2023-03-05 21:19:46 +01:00
SEIAROTg
5a4dc2128e
nixos/wireguard: fix mtu after switching netns.
...
mtu is set after switching netns and thus the new netns should be used.
2023-03-04 18:51:12 +00:00
Martin Weinelt
e93e71ce44
Merge remote-tracking branch 'origin/master' into staging-next
2023-03-04 14:58:24 +01:00
K900
3c5319ad3a
Merge pull request #219463 from K900/virtualbox-7.0.6
...
virtualbox: 6.1.40 -> 7.0.6
2023-03-04 15:14:45 +03:00
github-actions[bot]
8480c21d06
Merge master into staging-next
2023-03-04 12:01:17 +00:00
Naïm Favier
45e44c56f1
Merge pull request #217342 from pennae/nrd-html-manual
...
nixos-render-docs: add manual html renderer, use it for the nixos manual
2023-03-04 12:58:38 +01:00
K900
e8fbf83f5e
nixos/virtualbox-image: remove the raw image trick
...
This is slower, but the raw image thing no longer works with VirtualBox 7.0.6.
2023-03-04 13:39:50 +03:00
Ryan Lahfa
fd09c1bdc5
Merge pull request #214759 from Tom-Hubrecht/borgmatic
...
nixos/borgmatic: Allow defining multiple configurations
2023-03-04 11:38:39 +01:00
Raito Bezarius
51b00a5e89
nixos/web-apps/dolibarr: lib.optionalAttr -> lib.optionalAttrs typo
2023-03-04 11:31:28 +01:00
Frederik Rietdijk
8cf8d77121
Merge master into staging-next
2023-03-04 09:38:25 +01:00
K900
18f85de76d
nixos/firewall: assert that the kernel supports conntrack helper auto-loading
2023-03-04 10:53:47 +03:00
Linus Heckemann
48269da315
Merge pull request #206839 from lheckemann/stateless-vms
...
nixos/qemu-vm: allow use without a disk image
2023-03-04 02:02:45 +01:00
github-actions[bot]
a74c8d03ea
Merge staging-next into staging
2023-03-03 18:01:44 +00:00
Sandro
2665f5e379
Merge pull request #178447 from Francesco149/dendrite-prestart
2023-03-03 18:45:09 +01:00
Martin Weinelt
0580d85143
Merge remote-tracking branch 'origin/staging-next' into staging
2023-03-03 04:46:31 +01:00
Maximilian Bosch
72f45f225f
Merge pull request #218269 from theHedgehog0/gitea-module-getexe
...
nixos/gitea: Move to lib.getExe
2023-03-02 19:46:45 +01:00
Pyrox
98dd7f5307
nixos/gitea: Move to lib.getExe
...
This makes it so that alternative packages, such as `pkgs.forgejo` are
able to be used instead of the default `pkgs.gitea`.
Also adds myself as a maintainer of the module.
The varible `gitea`, which was used instead of `cfg.package`, has been
replaced with the variable `exe`, and is instead the value of the main
executable, as gotten from `lib.getExe`. `cfg.package` is used when this
value is not appropriate.
2023-03-02 12:16:30 -05:00
