github-actions[bot]
2d03d542c7
Merge master into staging-next
2021-11-20 12:01:21 +00:00
Patrick Hilhorst
c247bf87da
Merge pull request #123680 from Synthetica9/test-vscodium-wayland
2021-11-20 12:57:36 +01:00
Patrick Hilhorst
6b9977942a
nixosTests.vscodium: add comments
2021-11-20 11:26:30 +01:00
github-actions[bot]
0373476c4a
Merge master into staging-next
2021-11-20 06:01:21 +00:00
Patrick Hilhorst
1334a62539
test-driver.py: directly import pathlib.Path
2021-11-20 01:37:08 +01: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
Patrick Hilhorst
7201052de2
nixosTests.vscodium: wait for different text
2021-11-19 23:04:53 +01:00
Patrick Hilhorst
2a04ae8b12
nixosTests.vscodium: rename machines
2021-11-19 23:04:26 +01:00
Patrick Hilhorst
9e71014ede
test-driver.py: always export single machine as 'machine'
2021-11-19 23:02:30 +01: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
Patrick Hilhorst
a8f693ed48
test-driver.py: fix weird non-pythonism
2021-11-19 22:28:32 +01:00
Patrick Hilhorst
7ed2f6e55d
nixos/tests/vscodium{,-wayland}: merge tests
2021-11-19 21:21:20 +01:00
Patrick Hilhorst
6ecb9a352f
nixos/tests/vscodium-wayland: init
2021-11-19 21:20:53 +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
0cfcd37c77
Merge pull request #146509 from fgaz/libresprite/init
2021-11-19 17:00:10 +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
Francesco Gazzetta
f3ece9f26c
nixosTests.aseprite: init
2021-11-19 15:09:53 +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
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
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
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
