Kevin Cox
2b35c41b81
Merge pull request #147153 from LibreCybernetics/enable-nvidia-wayland-on-gdm-by-default
...
nixos/gdm: enable nvidiaWayland by default
2021-11-29 17:15:06 -05:00
Artturi
04a499cdde
Revert "nixos/hidpi: add xserver dpi"
2021-11-29 23:26:46 +02:00
Sandro
61c3243dc7
Merge pull request #113887 from xaverdh/install-grub-editorconfig-fixup
2021-11-29 21:03:41 +01:00
Aaron Andersen
a4977db2e8
caddy: include and utilize systemd service from upstream ( #147305 )
2021-11-29 23:16:25 +09:00
Aaron Andersen
f366af7a1b
Merge pull request #136630 from mweinelt/logrotate-hourly
...
nixos/logrotate: allow hourly frequency
2021-11-29 07:42:14 -05:00
Peng Mei Yu
640e54cda9
maintainers: Rename pengmeiyu to pmy
2021-11-29 18:39:31 +08:00
Lucas Savva
be952aba1c
nixos/acme: Fix rate limiting of selfsigned services
...
Closes NixOS/nixpkgs#147348
I was able to reproduce this intermittently in the
test suite during the tests for HTTPd. Adding
StartLimitIntervalSec=0 to disable rate limiting
for these services works fine. I added it anywhere
there was a ConditionPathExists.
2021-11-29 11:15:31 +01:00
Maciej Krüger
e14fadd95c
Merge pull request #147080 from mkg20001/cinstuff
2021-11-29 07:26:02 +01:00
Michele Guerini Rocco
af63e81ad9
Merge pull request #147683 from rnhmjoj/pr-monero-cli
...
monero: rename to monero-cli
2021-11-28 16:54:21 +01:00
rnhmjoj
97a3b2af1d
monero: rename to monero-cli
...
To make repology.org happy, use the -cli suffix.
2021-11-28 11:35:14 +01:00
Artturi
f62e110ae4
Merge pull request #147323 from Artturin/vmwareguest
2021-11-28 06:56:56 +02:00
Artturi
16eb003524
Merge pull request #146467 from l0b0/test-pam-d-generation
2021-11-27 22:32:46 +02:00
Victor Engmark
dcb941f3ed
security/pam: Document test location
2021-11-27 20:36:50 +02:00
Michael Weiss
1cfecb636b
Revert "Merge pull request #141192 from helsinki-systems/feat/improved-socket-handling2"
...
This reverts commit 57961d2b83b04f913afcFix : #146727
[0]: https://github.com/NixOS/nixpkgs/pull/73871#issuecomment-559783752
2021-11-27 17:22:22 +01:00
Dominik Xaver Hörl
0360e03520
nixos/install-grub: fix whitespace
...
This time hopefully without changing the generated boot script.
2021-11-27 10:18:21 +01:00
Dominik Xaver Hörl
19447850a2
Revert "nixos/install-grub: normalize whitespace"
...
This morally reverts commit 0e8d7f9b3d
2021-11-27 10:18:04 +01:00
Maciej Krüger
7aff811292
nixos/cinnamon: add xapps to extra app list
2021-11-27 09:10:58 +01:00
Thiago Kenji Okada
25cdc0a9c9
Merge pull request #147490 from illdefined/nix-daemon
...
modules/nix-daemon: Add missing mk(Rename|Removed)OptionModule
2021-11-26 19:31:02 -03:00
Thiago Kenji Okada
6f4eab2bd1
Merge pull request #147459 from samueldr/fix/nix-bash-completion-2.4
...
Fix bash completion for stable nix-* commands with Nix 2.4
2021-11-26 10:32:51 -03:00
Mikael Voss
257e92258e
modules/nix-daemon: Add missing mk(Rename|Removed)OptionModule
...
Commit 3a92a1a replaced the nix.daemonNiceLevel and nix.daemonIONiceLevel
options. This commit adds appropriate mk(Rename|Removed)OptionModule.
2021-11-26 13:25:20 +01:00
Samuel Dionne-Riel
8e92630aae
nixos: Provide nix-bash-completions again for stable commands
2021-11-26 02:16:56 -05:00
Victor Engmark
e0f1682910
nixos/installer: Quote variable references
...
See <https://github.com/koalaman/shellcheck/wiki/SC2086 >.
2021-11-26 18:58:08 +13:00
Victor Engmark
c9a7385997
nixos/installer: Use -n instead of ! -z
...
See <https://github.com/koalaman/shellcheck/wiki/SC2236 >.
2021-11-26 18:55:53 +13:00
Victor Engmark
adb8f5c858
nixos/installer: Mark scripts as Bash for ShellCheck
...
See <https://github.com/koalaman/shellcheck/wiki/SC2239 >.
2021-11-26 18:54:23 +13:00
Julien Moutinho
b84beda44c
nixos/transmission: disable downloadDirPermissions by default
2021-11-25 03:48:31 +01:00
Artturin
21585dc683
nixos/vmware-guest: add display-manager to after and
...
add ConditionVirtualization
and remove unneeded before and wants which are not in the upstream
package, the wantedBy should be enough
2021-11-25 04:33:05 +02:00
Sandro
fef107d5a5
Merge pull request #142839 from ivan/zsh-autosuggestions-config-async
2021-11-25 00:09:18 +01:00
Poscat
942f57e79b
nixos/acme: add an option for reloading systemd services after renewal
2021-11-24 13:50:20 -08:00
Artturi
c4851c0d71
Revert msize related commits ( #147180 )
2021-11-24 02:33:53 +02:00
Fabián Heredia Montiel
539811a4d3
nixos/gdm: enable nvidiaWayland by default
2021-11-23 12:17:05 -06:00
Martin Weinelt
386a1e79eb
nixos/smartctl-exporter: init
2021-11-23 11:30:28 +01:00
Yurii Matsiuk
8e986f6389
nixos/bluetooth: fix bluetooth warnings
2021-11-23 10:54:26 +01:00
sternenseemann
55c7dfade0
nixos/documentation: index devman by default if enabled
...
It's quite ridiculous that we currently require manual intervention just
to have devman indexed if dev.enable == true.
2021-11-22 23:39:42 +01:00
Graham Christensen
6cfd23fa0b
nixos-install: support --no-root-password
2021-11-22 22:09:50 +02:00
github-actions[bot]
28641f51dc
Merge master into staging-next
2021-11-22 18:01:08 +00:00
Artturi
859f7617a7
Merge pull request #146964 from Artturin/systemdreadd
2021-11-22 18:17:16 +02:00
Sandro
4eb8b9decd
Merge pull request #143886 from Julow/xmonad-large-closure
2021-11-22 16:26:25 +01:00
Sandro
338bf1f1b2
Merge pull request #143995 from erictapen/systemd-workingdirectory
2021-11-22 16:25:54 +01:00
Rok Garbas
e3cd002ada
Merge pull request #145049 from fernsehmuell/patch-1
...
add opcache to list of php packages
2021-11-22 06:15:57 -08:00
Artturin
7f24a5ff35
nixos/systemd: readd dbus-org.freedesktop.login1.service to upstreamSystemUnits
...
it was removed in
eb862c48dd (diff-5ea4693beb4bdd8f7efcdd3204ceea67c86f59b3d1c28cde063ddf03e1d20fbfL66)
2021-11-22 05:59:05 +02:00
Jonathan Ringer
09e494f4c2
Merge remote-tracking branch 'origin/master' into staging-next
...
Conflicts:
pkgs/applications/window-managers/sway/default.nix
2021-11-21 14:40:40 -08:00
Patrick Hilhorst
5a14b59cd7
Merge pull request #122995 from primeos/sway-install-default-wallpaper
2021-11-21 21:57:49 +01:00
Niklas Hambüchen
0939143e24
Merge pull request #137176 from GoldsteinE/clickhouse-package
...
nixos/clickhouse: add package option
2021-11-21 21:43:58 +01:00
Goldstein
427941d737
nixos/clickhouse: add package option
...
Consistent with other services and helps to work around #130101
2021-11-21 20:29:41 +01:00
Aaron Andersen
c9fde80d80
Merge pull request #146445 from GTrunSec/nomad
...
nixos/nomad: add flag of plugin-dir
2021-11-21 13:45:25 -05:00
Aaron Andersen
65bdad3185
Merge pull request #146728 from newAM/sabnzbd-package-option
...
nixos/sabnzbd: add package option
2021-11-21 13:43:16 -05:00
ajs124
5816eb198f
Merge pull request #141833 from poscat0x04/dovecot-quota-backend
...
nixos/dovecot: use the count backend for quota plugin
2021-11-21 19:37:08 +01:00
github-actions[bot]
18ad263272
Merge master into staging-next
2021-11-21 18:01:07 +00:00
Artturi
53edfe1d1c
Merge pull request #146804 from Artturin/qemudefaultmem
2021-11-21 17:48:08 +02:00
Artturin
54ece050b8
nixos/qemu-vm: default memorySize 384 -> 1024
...
the default hasn't been changed since 2009
this can improve our test performances
nixos/tests: remove explicit memorySize <1024
1024MiB is now the default
2021-11-21 17:27:58 +02:00
Sandro
07f29d2db2
Merge pull request #146829 from r-burns/isx86
2021-11-21 14:20:12 +01:00
github-actions[bot]
6ad93ecdbb
Merge master into staging-next
2021-11-21 06:01:18 +00:00
Ryan Burns
2175b157ac
treewide: refactor isi686 && isx86_64 -> isx86
2021-11-20 17:50:41 -08:00
Artturi
a0d4895e9d
Merge pull request #146709 from Artturin/underscorename
2021-11-21 03:12:31 +02:00
github-actions[bot]
43d088886e
Merge master into staging-next
2021-11-21 00:01:46 +00:00
Artturin
2077956e78
nixos/network-interfaces: add a warning for underscores in hostname
...
until the issues in https://github.com/NixOS/nixpkgs/pull/138978
have been resolved
2021-11-21 01:39:39 +02:00
Vanilla
35ec24523b
nixos/hbase: Fix missing top-level in hbase-site.xml
2021-11-20 15:29:36 +08:00
github-actions[bot]
0373476c4a
Merge master into staging-next
2021-11-20 06:01:21 +00:00
Alex Martens
4639589f88
nixos/sabnzbd: add package option
2021-11-19 20:01:24 -08:00
maralorn
2a1b1189ef
Merge pull request #146398 from hercules-ci/hercules-ci-agent-update-0.8.4
...
hercules-ci-agent: 0.8.3 -> 0.8.4
2021-11-20 01:11:17 +01:00
github-actions[bot]
7495684853
Merge master into staging-next
2021-11-20 00:01:21 +00:00
Artturi
1c005b3de1
Merge pull request #139337 from Artturin/tempaddr
2021-11-20 01:27:13 +02:00
Artturi
dd4ce550b3
Merge pull request #146456 from Artturin/misc-updates1
2021-11-20 01:14:44 +02:00
Jonathan Ringer
fadaef5aed
Merge remote-tracking branch 'origin/master' into staging-next
...
Conflicts:
pkgs/applications/networking/browsers/chromium/common.nix
2021-11-19 14:31:57 -08:00
Robert Hensing
9c217dfadb
Merge pull request #146626 from TerrorJack/auto-upgrade-add-ssh
...
NixOS auto upgrade: add openssh to path
2021-11-19 22:38:24 +01:00
github-actions[bot]
f1703ab30f
Merge master into staging-next
2021-11-19 18:01:18 +00:00
Artturi
5de36a0410
Merge pull request #131416 from Artturin/x11-module-fixes
2021-11-19 18:55:37 +02:00
Jonathan Ringer
6ede9cd761
Merge remote-tracking branch 'origin/master' into staging-next
...
Conflicts:
pkgs/applications/audio/hybridreverb2/default.nix
2021-11-19 08:44:33 -08:00
Sandro
29b7d4ada1
Merge pull request #145035 from pmeiyu/master
2021-11-19 17:05:50 +01:00
Sandro
aa3130f1f7
Merge pull request #146638 from NixOS/mmahut/nginx_bool
2021-11-19 16:52:03 +01:00
Artturi
935c9a3601
Merge pull request #146179 from Artturin/nixosgenerateconfig1
2021-11-19 17:46:14 +02:00
Marek Mahut
2e75b280a7
prometheus-nginx-exporter: boolean conversion to string
2021-11-19 16:22:04 +01:00
Cheng Shao
4cd015e65e
NixOS auto upgrade: add openssh to path
2021-11-19 12:52:36 +00:00
github-actions[bot]
9d44a614de
Merge master into staging-next
2021-11-19 12:01:09 +00:00
Robert Hensing
3a98abe8bd
nixos/hercules-ci-agent: Update module
2021-11-19 11:05:04 +01:00
Jörg Thalheim
4665684cee
Merge pull request #146525 from GWspekulatius/getty_remove_serialSpeed
...
nixos/getty: remove serialSpeed option
2021-11-19 09:57:54 +00:00
Michael Schneider
1331b3d252
nixos/getty: remove serialSpeed
...
It is expected that the baudrate is already initialized before the getty is started. Therefore the serialSpeed option is redundant.
2021-11-19 10:17:26 +01:00
Ivan Kozik
b897f5fe70
nixos/autosuggestions: add config to control whether suggestions are async
...
zsh-autosuggestions now defaults to asynchronous suggestions, but they can
be annoying when they take several frames longer to show up after typing.
2021-11-19 01:09:44 +00:00
github-actions[bot]
c83cfc58e5
Merge master into staging-next
2021-11-19 00:01:26 +00:00
Kim Lindberger
76f5b6bb9c
Merge pull request #142577 from helsinki-systems/feat/larger-p9-msize
...
vmTools: Make msize larger to silence warning
2021-11-19 00:49:26 +01:00
Artturin
31759dc4b7
nixos/networkmanager: remove redundant ipv6.ip6-privacy
...
this setting was added in 2016 in commit
bcdd81d9e11fec496f382485e6399ehttps://man.archlinux.org/man/NetworkManager.conf.5
2021-11-19 01:12:25 +02:00
Artturi
02e95c2fd7
Merge pull request #146288 from Artturin/mtoolsandsuch
2021-11-19 00:21:08 +02:00
Artturi
aa64f17479
Merge pull request #146420 from Artturin/cadvisorfix
2021-11-18 23:40:03 +02:00
Sandro
9cb930ff68
nixos/nginx: fix start when recommendedOptimisation is off
...
Also done by other distros for example Fedora https://bodhi.fedoraproject.org/updates/FEDORA-2020-78690e2cdd
2021-11-18 21:47:12 +01:00
Janne Heß
ecf388e90b
vmTools: Make msize larger to silence warning
...
See https://issues.guix.gnu.org/47225
2021-11-18 21:21:49 +01:00
Sandro
d09e223320
Merge pull request #146344 from SuperSandro2000/locate-prune-names
2021-11-18 21:02:37 +01:00
Artturin
a96a6e7515
nixos/qemu-vm: fix deprecation readonly -> readonly=on
...
machine # qemu-system-x86_64: -drive if=pflash,format=raw,unit=0,readonly,...: warning:
short-form boolean option 'readonly' deprecated
vm-test-run-systemd-boot-specialisation> machine # Please use readonly=on instead
2021-11-18 21:32:56 +02:00
Sandro
4f0e1c04eb
Merge pull request #146123 from thiagokokada/libinput-module-fixes
2021-11-18 19:44:00 +01:00
github-actions[bot]
91e24d05d7
Merge master into staging-next
2021-11-18 18:01:14 +00:00
Sandro
f271698f25
Merge pull request #146287 from jojosch/mjolnir-1.2.0
2021-11-18 18:40:45 +01:00
Aaron Andersen
b6d40f7f79
Merge pull request #146343 from VergeDX/hbase
...
nixos/hbase: add settings option for hbase-site.xml
2021-11-18 08:35:04 -05:00
github-actions[bot]
385e4f8531
Merge master into staging-next
2021-11-18 06:01:22 +00:00
Vanilla
cb5f41a067
nixos/hbase: add settings option for hbase-site.xml
2021-11-18 11:54:41 +08:00
Niklas Hambüchen
a807630064
Merge pull request #144123 from nh2/logstash-service-jvm-options
...
nixos/logstash: Add logstashJvmOptionsFile option
2021-11-18 02:53:35 +01:00
github-actions[bot]
841469e4d8
Merge master into staging-next
2021-11-18 00:01:36 +00:00
GTrunSec
6a1fdd60e6
nixos/nomad: add flag of plugin-dir
2021-11-17 15:42:05 -08:00
Thiago Kenji Okada
467c58cd11
Merge pull request #146422 from ratsclub/service-xmrig
...
nixos/xmrig: add kernel module msr
2021-11-17 20:08:55 -03:00
Victor Freire
47f638403e
nixos/xmrig: add kernel module msr
2021-11-17 18:53:58 -03:00
Michele Guerini Rocco
90bb5d0e19
Merge pull request #146409 from aanderse/zabbix
...
nixos/zabbixServer: explicitely set security.wrappers ownership
2021-11-17 22:05:16 +01:00
Artturi
e727217620
Merge pull request #145574 from l0b0/refactor/avoid-extra-empty-lines-in-etc-pamd-files
2021-11-17 21:20:42 +02:00
Artturin
0894568aee
nixos/cadvisor: add zfs to path when zfs enabled
...
fixes https://github.com/NixOS/nixpkgs/issues/105139
2021-11-17 20:47:44 +02:00
github-actions[bot]
c77daf4da1
Merge master into staging-next
2021-11-17 18:00:59 +00:00
Aaron Andersen
ebbf93136f
nixos/zabbixServer: explicitely set security.wrappers ownership
2021-11-17 11:26:14 -05:00
Victor Freire
ed312a6815
nixos/xmrig: add services.xmrig to module-list.nix
2021-11-17 12:29:40 -03:00
Robert Hensing
715f634119
Merge pull request #146335 from SuperSandro2000/locate
...
nixos/locate: ignore nix logs
2021-11-17 14:17:56 +01:00
github-actions[bot]
cf671bd5e9
Merge master into staging-next
2021-11-17 12:01:23 +00:00
Janne Heß
ba34952f0d
Merge pull request #146268 from helsinki-systems/upd/nginx
...
nginxStable: 1.20.1 -> 1.20.2
2021-11-17 12:02:50 +01:00
Sandro Jäckel
5287d0146d
nixos/locate: PRUNE_BIND_MOUNTSFR -> PRUNE_BIND_MOUNTS
...
PRUNE_BIND_MOUNTSFR seems to be a typo.
The man page only mentions it in a header and further in the paragraph
it is PRUNE_BIND_MOUNTS.
Also breaks plocate which complains about the unknown option.
2021-11-17 04:26:42 +01:00
Sandro
4c138f6bd6
nixos/locate: exclude by default version control systems and .cache
...
follows Debian and Ubuntu
2021-11-17 04:19:53 +01:00
Sandro
129c47ae88
nixos/locate: include missing filesystems
...
taken from Ubuntu config
2021-11-17 02:55:36 +01:00
Sandro
a0d2a3efbb
nixos/locate: ignore nix logs
2021-11-17 02:50:02 +01:00
github-actions[bot]
90829d83e5
Merge master into staging-next
2021-11-17 00:01:49 +00:00
n0emis
eeac1c543d
nixos/networkd: add BatmanAdvanced options ( #145963 )
...
Since systemd v248 networkd supports BatmanAdvanced.
This adds the according config options to the networkd-module
2021-11-16 23:41:17 +01:00
Robert Hensing
f03db46d3d
Merge pull request #146266 from Artturin/minimalprofile1
...
nixos/profiles/minimal: disable command-not-found
2021-11-16 23:36:42 +01:00
Artturin
3f339f3cf4
profiles/base: add mtools
2021-11-17 00:26:31 +02:00
Artturin
670f5474b9
nixos/{startx,xserver,sx}: make it possible to use both a gui dm
...
and startx at the same time without using lib.mkForce
2021-11-16 23:30:27 +02:00
Artturi
c366024777
Merge pull request #145758 from Artturin/swapdd
2021-11-16 22:12:55 +02:00
Artturin
a7ea834b17
nixos/plex: replace literalExample with literalExpression
2021-11-16 20:37:44 +02:00
Johannes Schleifenbaum
62cec07035
nixos/mjolnir: set rawHomeserverUrl in config
2021-11-16 19:21:33 +01:00
Bernardo Meurer
cf0e83f5c4
Merge pull request #137157 from rebeccaskinner/fix/nvidia-settings
...
nixos/modules/hardware/video/nvidia: Fix incorrect reference to 'nvid…
2021-11-16 10:18:16 -08:00
Sandro
a0a5e0be1c
Merge pull request #139553 from andrew-d/andrew/plex-scanners
2021-11-16 19:17:31 +01:00
ajs124
c408cd921f
nixos/nginx: fix SystemCallFilter after 1fc113f0df
2021-11-16 17:30:57 +01:00
Artturin
115e6e7299
nixos/profiles/minimal: disable command-not-found
...
reduces size by about 1M
2021-11-16 18:27:38 +02:00
Jonathan Ringer
a2e621d20d
Merge remote-tracking branch 'origin/master' into staging-next
2021-11-16 07:50:20 -08:00
Vanilla
79dc6a5629
nixos/hbase: use jre8 instead of latest.
2021-11-16 22:15:46 +08:00
Victor Engmark
ef58bbf9b7
nixos/pam: avoid extra lines in pam files
2021-11-16 19:26:43 +13:00
github-actions[bot]
112c228b4b
Merge staging-next into staging
2021-11-16 06:01:37 +00:00
Bobby Rong
b4d72c7292
Merge pull request #146203 from bobby285271/pantheon
...
nixos/pantheon: cleanup FAQ section
2021-11-16 10:34:43 +08:00
Bobby Rong
cd58f44937
nixos/pantheon: cleanup FAQ section
2021-11-16 10:06:24 +08:00
Bobby Rong
18d56c5c6e
Merge pull request #146094 from VergeDX/influxdb2
...
nixos/influxdb2: Add Hyperlink highlight for url.
2021-11-16 10:04:01 +08:00
github-actions[bot]
69a9c90876
Merge staging-next into staging
2021-11-16 00:02:03 +00:00
Robert Scott
5e15d5da4a
Merge pull request #142522 from risicle/ris-strongswan-5.9.4
...
strongswan: 5.8.1 -> 5.9.4
2021-11-15 21:08:20 +00:00
Robert Scott
d13480917a
strongswan: 5.8.1 -> 5.9.4
...
remove two now-included patches, add new nixos module parameter
ca_id
2021-11-15 21:06:57 +00:00
Artturin
f93a7f8b56
nixos-generate-config: automatically enable microcode updates
2021-11-15 22:28:41 +02:00
github-actions[bot]
cfaff97318
Merge staging-next into staging
2021-11-15 18:01:43 +00:00
Mikael Voss
ee8e993fd4
modules/nix-daemon: Replace daemon(IO)NiceLevel options
...
The nix.daemonNiceLevel options allows for setting the nice level of the
Nix daemon process. On a modern Linux kernel with group scheduling the
nice level only affects threads relative to other threads in the same
task group (see sched(7)). Therefore this option has not the effect one
might expect.
The options daemonCPUSchedPolicy and daemonIOSchedClass are introduced
and the daemonIONiceLevel option renamed to daemonIOSchedPrority for
consistency. These options allow for more effective control over CPU
and I/O scheduling.
Instead of setting daemonNiceLevel to a high value to increase the
responsiveness of an interactive system during builds -- which would not
have the desired effect, as described above -- one could set both
daemonCPUSchedPolicy and daemonIOSchedClass to idle.
2021-11-15 18:34:17 +01:00
Janne Heß
bfd9fd291a
Merge pull request #145450 from Radvendii/master
...
etc module: make `.text` and `.source` the same priority
2021-11-15 14:16:45 +01:00
Taeer Bar-Yam
0bef0c38f7
lib.modules: add mkDerivedConfig
...
mkDerivedConfig : Option a -> (a -> Definition b) -> Definition b
Create config definitions with the same priority as the definition of another option.
This should be used for option definitions where one option sets the value of another as a convenience.
For instance a config file could be set with a `text` or `source` option, where text translates to a `source`
value using `mkDerivedConfig options.text (pkgs.writeText "filename.conf")`.
It takes care of setting the right priority using `mkOverride`.
2021-11-15 07:03:41 -05:00
github-actions[bot]
faf5da6aed
Merge staging-next into staging
2021-11-15 12:01:44 +00:00
Thiago Kenji Okada
c7a180ab0c
nixos/libinput: improve docs
2021-11-15 08:55:25 -03:00
Vladimír Čunát
64065d76f4
Merge #144730 : branch 'staging-next'
2021-11-15 11:52:15 +01:00
Sandro
6f0ff67bb0
Merge pull request #135026 from ckiee/cnping
2021-11-15 11:35:59 +01:00
Vanilla
baeb944384
nixos/influxdb2: Add Hyperlink highlight for url.
2021-11-15 16:12:15 +08:00
Michele Guerini Rocco
78b93845a8
Merge pull request #146018 from alyssais/qemu-guest-agent
...
nixos/qemu-guest-agent: use qemu_kvm
2021-11-15 08:47:53 +01:00
Taeer Bar-Yam
0e590c91d2
etc module: make .text and .source the same priority
...
Before this change, one could set environment.etc.*.text and .source.
.source would always take precedence, regardless of the priorities set.
This change means that if, for instance, .text is set with mkForce but
.source is set normally, the .text content will be the one to take
effect. If they are set with the same priority they will conflict.
2021-11-14 18:47:09 -05:00
Andreas Fuchs
8a37d710fd
nixos: zsh: Remove hack for zsh-nix-completions on nix 2.4
...
The zsh-nix-completions package now sets a priority, which helps avoid
conflicts with newer nix versions without patching the package from
the module.
2021-11-14 22:09:01 +01:00
Alyssa Ross
42adeef9ec
nixos/qemu-guest-agent: use qemu_kvm
...
Since e791519f0f
2021-11-14 20:28:06 +00:00
Maciej Krüger
dc19eaec1b
Merge pull request #144965 from mkg20001/ts-firewall
2021-11-14 21:23:55 +01:00
Alyssa Ross
4e1852096f
Merge remote-tracking branch 'nixpkgs/staging-next' into staging
...
Conflicts:
pkgs/development/tools/parsing/flex/2.6.1.nix
2021-11-14 14:17:46 +00:00
github-actions[bot]
9b5a105856
Merge master into staging-next
2021-11-14 00:01:47 +00:00
