3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

4178 commits

Author SHA1 Message Date
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
Moritz Hedtke 9d01ce82ac
nixos/tests: add step-ca test 2021-11-13 12:40:47 +01:00
sternenseemann 1a1e32f023 Merge remote-tracking branch 'origin/master' into staging-next
Conflicts were caused by 2043dbb6fa
interacting with b2767b69dd.
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
github-actions[bot] 707b006bf7
Merge master into staging-next 2021-11-09 00:01:30 +00:00
sternenseemann d14ae62671 nixos/terminfo: inherit TERMINFO* env vars also for doas
This should mirror the behavior we implement for sudo: The TERMINFO and
TERMINFO_DIRS variables are inherited from the normal user's
environment, so terminfo files installed in the user's profile can be
found by ncurses applications running as root.
2021-11-08 14:05:24 -08:00
Bas van Dijk b0a1847999 nixos/tests/tinydns.nix: test a few more queries 2021-11-08 21:35:29 +00:00
github-actions[bot] 9ecd6bf4df
Merge staging-next into staging 2021-11-08 18:02:05 +00:00
github-actions[bot] f14d7cb2f6
Merge master into staging-next 2021-11-08 18:01:24 +00:00
Bas van Dijk 7a8b4907e2 djbdns: fix crash due to data ulimit
This fixes: https://github.com/NixOS/nixpkgs/issues/119066.

When `djbdns` is repeatedly queried it will crash with:

```
mmap: tinydns (842): VmData 331776 exceed data ulimit 300000. Update limits or use boot option ignore_rlimit_data.
```

So we increase the softlimit from 300000 to 4500000 as suggested in
the issue.

The `tinydns` NixOS test has been extended with testing for the faulty
behaviour.
2021-11-08 17:28:41 +00:00
Bas van Dijk 0e4abb0df7 nixos/prometheus: remove services.prometheus.environmentFile
The option `services.prometheus.environmentFile` has been removed since it was causing [issues](https://github.com/NixOS/nixpkgs/issues/126083) and Prometheus now has native support for secret files.
2021-11-07 14:45:40 +00:00
Vladimír Čunát c504b01331
nixosTests.seafile: link the committed test
It succeeds for me.  Apparently this line was forgotten in PR #119719.
2021-11-07 09:05:36 +01:00
github-actions[bot] 8130cf6764
Merge staging-next into staging 2021-11-07 06:01:36 +00:00
github-actions[bot] 1093ddf273
Merge master into staging-next 2021-11-07 06:01:02 +00:00
Peter Hoeg c207be6591
handbrake: 1.3.3 -> 1.4.2 (#143654)
* handbrake: 1.3.3 -> 1.4.2
* handbrake: minor test cleanups
2021-11-07 09:03:58 +08:00
github-actions[bot] 8ddea08a85
Merge staging-next into staging 2021-11-07 00:02:20 +00:00
github-actions[bot] 9166210176
Merge master into staging-next 2021-11-07 00:01:38 +00:00
Artemis Tosini 8f4289267c
linux_testing_bcachefs, bcachefs-tools: unstable-2021-07-08 → unstable-2021-11-06
bcachefs now supports snapshots so we need the latest version to use
them. Additionally, it appears to build on AArch64 so I've removed the
x86 requirement.
2021-11-06 21:32:57 +00:00
Janne Heß d64f7a76fb
nixos/tests.plasma5: Fix after #142747 2021-11-06 21:51:08 +01:00
github-actions[bot] 64baf2593d
Merge staging-next into staging 2021-11-06 18:01:35 +00:00
github-actions[bot] eeb7e66e97
Merge master into staging-next 2021-11-06 18:01:01 +00:00
Vladimír Čunát 26e1daaa43
treewide: eliminate stdenv.lib usage
It was breaking evaluation on Hydra.
2021-11-06 17:20:11 +01:00
Robert Hensing 68f6d76684 nixosTests.chromium: Avoid blocking on xclip stdout 2021-11-06 13:46:51 +01:00
github-actions[bot] e57ae1d6b3
Merge staging-next into staging 2021-11-06 12:01:54 +00:00
github-actions[bot] 89ec09c858
Merge master into staging-next 2021-11-06 12:01:12 +00:00
Florian Klink 6ae271565d
Merge pull request #140046 from jrobsonchase/systemd-boot/fix-regexp
nixos/systemd-boot: Fix installed version regexp
2021-11-06 12:24:32 +01:00
Jörg Thalheim 185aeb4ab8
Merge pull request #142765 from pennae/mosquitto-fixes
nixos/mosquitto: restore checkPasswords=false from old module, add module doc chapter
2021-11-06 10:08:43 +00:00
github-actions[bot] a41ea4ced3
Merge master into staging-next 2021-11-06 06:01:07 +00:00
Bernardo Meurer cbc785a8b2
Merge pull request #144795 from hercules-ci/fix-issue-144613-nixosTest-wait-stdout-followup
nixosTests: followup stdout blocking fixes
2021-11-05 21:05:37 -07:00
github-actions[bot] 0d70d17925
Merge master into staging-next 2021-11-06 00:01:27 +00:00
Andreas Rammhold ea58baa275
Merge pull request #141189 from piegamesde/update-appservice-irc
matrix-appservice-irc 0.26.1 -> 0.30.0
2021-11-05 23:54:32 +01:00
Robert Hensing d659856747 nixosTests.service-runner: Redirect stdout to avoid blocking 2021-11-05 21:22:31 +01:00
Robert Hensing 1927b71928 nixosTests.xfce: Redirect stdout to avoid blocking 2021-11-05 21:13:47 +01:00
Robert Hensing 0fb806301d nixosTests.pantheon: Redirect stdout to avoid blocking 2021-11-05 21:13:36 +01:00
Robert Hensing edc67d3862 nixosTests.chromium: Redirect stdout to avoid blocking 2021-11-05 21:13:25 +01:00
github-actions[bot] 933da575d4
Merge master into staging-next 2021-11-05 18:01:07 +00:00
Josh Robson Chase 3efc2de6d1
nixos/systemd-boot: Use the correct version string from the bootctl --version output 2021-11-05 12:11:22 -04:00
Josh Robson Chase 4ddc78818e
nixos/systemd-boot: Re-add the verison check, but as equivalence-only 2021-11-05 12:11:21 -04:00
Josh Robson Chase 71ed9d096e
nixos/systemd-boot: Remove the installed version check altogether
bootctl does it as a part of its update process anyway, so we're just
duplicating code.
2021-11-05 12:11:20 -04:00
Josh Robson Chase f275d82a2f
nixos/systemd-boot: Update test for version regexp
This should fail since the regexp in systemd-boot-builder.py won't match
the '.' in the version string.
2021-11-05 12:11:18 -04:00
Bernardo Meurer 66c041e3bb
Merge pull request #144703 from lovesegfault/fix-owncast-tests 2021-11-05 08:22:13 -07:00
github-actions[bot] 2663e5b623
Merge master into staging-next 2021-11-05 12:01:17 +00:00
Vladimír Čunát 555a4016a2
Merge branch 'staging-next' into staging 2021-11-05 10:48:58 +01:00
Simon Bruder 59225ebaf1
deluge: fix test (#144718)
In 780135ad5c the nodes for testing Deluge
1.x were removed, but the test script still referred to it.

This removes the references in the test script and also renames the
nodes to drop the 2 suffix.
2021-11-05 10:44:25 +01:00
Bernardo Meurer 1403ce522d
Merge pull request #144239 from illustris/hadoop
nixos/hadoop: Add HA services and HTTPFS
2021-11-04 23:30:47 -07:00
Bernardo Meurer 86373221ae
Merge pull request #144679 from hercules-ci/fix-issue-144613-nixosTest-wait-stdout
nixosTest: document wait for stdout behavior, fix #144613
2021-11-04 22:57:06 -07:00
Bernardo Meurer 9bd3a51bba
nixos/tests/owncast: rewrite test 2021-11-04 22:30:45 -07:00
Robert Hensing 739c51ae4e nixosTests: Redirect stdout to stderr when detaching
Avoids blocking on stdout.
2021-11-05 02:41:26 +01:00
github-actions[bot] ac4cb43546
Merge staging-next into staging 2021-11-05 00:02:01 +00:00
Bernardo Meurer 98749ffa5f
nixos/tests/wine: syntax fix 2021-11-04 15:20:06 -07:00
Bernardo Meurer b3e7ddabfb
Merge pull request #125118 from chkno/wine
wine: gecko 2.47.1 -> 2.47.2 and add tests
2021-11-04 13:11:38 -07:00
github-actions[bot] 20bee66ec8
Merge staging-next into staging 2021-11-04 18:01:44 +00:00
Bas van Dijk 0140e239f3
Merge pull request #143147 from basvandijk/prometheus-reload
nixos/prometheus: optionally support reloading on config changes
2021-11-04 13:54:18 +01:00