Jonathan Ringer
4b73049ccc
Merge remote-tracking branch 'origin/staging' into staging-next
...
Conflicts:
nixos/tests/custom-ca.nix
2021-11-22 21:33:23 -08: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
Artturin
03e8e5848b
nixos/tests/installer: increase memorySize to 3G
...
and increase the memory flags too
2021-11-21 23:06:58 +02: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]
daffc694ef
Merge staging-next into staging
2021-11-21 06:01:53 +00: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
github-actions[bot]
197135904f
Merge staging-next into staging
2021-11-21 00:02:25 +00:00
github-actions[bot]
43d088886e
Merge master into staging-next
2021-11-21 00:01:46 +00:00
Vladimír Čunát
60c5230968
nixosTests.installer: increase the VM memory
...
For me that fixes the i686 ZFS case:
https://hydra.nixos.org/build/158897777
I don't think it's worth chasing why RAM usage isn't very low here.
2021-11-20 23:00:43 +01:00
Artturin
471183f245
nixos/tests/hibernate: set memorySize to 2G
2021-11-20 22:21:39 +02:00
Sandro
79f22e571a
Merge pull request #146545 from rnhmjoj/pr-p11kit-fedora-staging
2021-11-20 19:38:58 +01:00
github-actions[bot]
2d03d542c7
Merge master into staging-next
2021-11-20 12:01:21 +00:00
Patrick Hilhorst
6b9977942a
nixosTests.vscodium: add comments
2021-11-20 11:26:30 +01: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
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
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
Francesco Gazzetta
f3ece9f26c
nixosTests.aseprite: init
2021-11-19 15:09:53 +01:00
github-actions[bot]
c83cfc58e5
Merge master into staging-next
2021-11-19 00:01:26 +00:00
rnhmjoj
a19b4efc77
nixos/tests/custom-ca: fix firefox test
...
- allocate more memory (yay!)
- fix processes not being really killed
- fix firefox process hanging
- remove the p11-kit log: it's not really useful
2021-11-18 22:38:22 +01:00
Sandro
4f0e1c04eb
Merge pull request #146123 from thiagokokada/libinput-module-fixes
2021-11-18 19:44:00 +01:00
Thiago Kenji Okada
63b4b8616b
nixos/libinput: add module tests
2021-11-16 13:09:02 -03:00
github-actions[bot]
617d1d1f17
Merge staging-next into staging
2021-11-16 12:02:01 +00:00
TredwellGit
c783c8d859
linux/hardened/patches/5.15: init at 5.15.2-hardened1
2021-11-15 19:38:09 +00: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
Francesco Gazzetta
df99f2326e
nixosTests.domination: init
2021-11-13 23:00:20 +01:00
Alyssa Ross
26b89bcd16
Merge remote-tracking branch 'nixpkgs/staging-next' into staging
2021-11-13 15:30:01 +00:00
sternenseemann
1a1e32f023
Merge remote-tracking branch 'origin/master' into staging-next
...
Conflicts were caused by 2043dbb6faa9e21b0fb500161542e30d6c8bc680
interacting with b2767b69ddc702eb926633a5f2336534352cb7b8.
2021-11-13 12:35:55 +01:00
Graham Christensen
fd1f8e1498
Merge branch 'master' into mjolnir-init
2021-11-12 20:56:14 -05:00
github-actions[bot]
fd8fae936e
Merge staging-next into staging
2021-11-12 06:02:01 +00:00
github-actions[bot]
9a30ed0017
Merge master into staging-next
2021-11-12 06:01:24 +00:00
Maximilian Bosch
41068b4865
Merge pull request #144968 from vcunat/p/nixos-tests-seafile-unreachable
...
nixosTests.seafile: link the committed test
2021-11-12 01:30:53 +01:00
github-actions[bot]
679a57d577
Merge staging-next into staging
2021-11-11 06:01:37 +00:00
github-actions[bot]
f0e180170d
Merge master into staging-next
2021-11-11 06:01:03 +00:00
Bernardo Meurer
9c1d31ce68
nixos/tests/installer: comment out nixos-option test for now
2021-11-10 15:57:18 -08:00
Bernardo Meurer
6a4d2207b1
nixos/test/boot: nix verify -> nix store verify
2021-11-10 15:57:00 -08:00
github-actions[bot]
9618986955
Merge staging-next into staging
2021-11-10 12:01:57 +00:00
github-actions[bot]
84d856a651
Merge master into staging-next
2021-11-10 12:01:22 +00:00
Bernardo Meurer
546d60c5e6
nixos/tests/misc: fix nix 2.4 support
2021-11-09 20:24:05 -08:00
github-actions[bot]
56736d0fbc
Merge staging-next into staging
2021-11-09 18:02:05 +00:00
github-actions[bot]
7414a16ee5
Merge master into staging-next
2021-11-09 18:01:23 +00:00
Bas van Dijk
8033c19932
Merge pull request #145093 from basvandijk/djbdns-softlimit-fix
...
djbdns: fix crash due to data ulimit
2021-11-09 18:41:14 +01:00
davidak
2103d78e0b
Merge pull request #144930 from artemist/bcachefs
...
linux_testing_bcachefs, bcachefs-tools: upgrade
2021-11-09 18:26:30 +01:00
github-actions[bot]
b1d2f20ea8
Merge staging-next into staging
2021-11-09 00:02:13 +00:00
