summary refs log tree commit diff
path: root/nixos
Commit message (Collapse)AuthorAge
* Merge staging-next into staginggithub-actions[bot]2022-04-14
|\
| * Merge pull request #168609 from rnhmjoj/pr-test-driverJacek Galowicz2022-04-14
| |\ | | | | | | nixos/test-driver: highlight driver log lines
| | * nixos/test-driver: highlight driver log linesrnhmjoj2022-04-14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There is a whole lot of noise in a NixOS test log due to journal, commands, and test driver messages all being mixing together. With this commit the test driver messages are highlighted so you don't have to squint too much to see where a subtest starts and ends or what was the last command being run. Here's an excerpt from a highlighted log: machine # [ 6.647826] dhcpcd[668]: eth0: adding default route via 10.0.2.2 machine # I've had a great day! (finished: must succeed: curl -sfL https://example.com/how-are-you? | tee /dev/stderr, in 0.19 seconds) (finished: subtest: Privoxy can filter https requests, in 0.22 seconds) subtest: Blocks are working machine: waiting for TCP port 443 machine # Connection to localhost (::1) 443 port [tcp/https] succeeded! (finished: waiting for TCP port 443, in 0.03 seconds) machine: must fail: curl -f https://example.com/ads 1>&2 machine # [ 6.730608] nscd[742]: 742 monitored file `/etc/resolv.conf` was written to machine # [ 6.733071] privoxy[814]: 2022-04-14 09:41:01.695 7fa995c39640 Actions: +block{Fake ads} ... machine # curl: (22) The requested URL returned error: 403 machine # [ 6.753098] systemd[1]: Stopping Name Service Cache Daemon... machine # [ 6.755632] systemd[1]: nscd.service: Deactivated successfully. machine # [ 6.757069] systemd[1]: Stopped Name Service Cache Daemon. (finished: must fail: curl -f https://example.com/ads 1>&2, in 0.07 seconds) machine: must succeed: curl -f https://example.com/PRIVOXY-FORCE/ads 1>&2 machine # [ 6.765099] systemd[1]: Starting Name Service Cache Daemon... machine # [ 6.781519] nscd[925]: 925 monitoring file `/etc/passwd` (1) machine # [ 6.844105] systemd[1]: Reached target Network is Online. machine # [ 6.848860] privoxy[814]: 2022-04-14 09:41:01.805 7fa995c39640 Actions: +block{Fake ads} ... machine # [ 6.856068] nscd[925]: 925 monitoring file `/etc/nsswitch.conf` (8) machine # [ 6.858229] systemd[1]: Reached target Multi-User System. machine # [ 6.858934] nscd[925]: 925 monitoring directory `/etc` (2) machine # [ 6.861315] systemd[1]: Startup finished in 2.374s (kernel) + 4.451s (userspace) = 6.826s. machine # Hot Nixpkgs PRs in your area. Click here! machine # [ 6.873055] nscd[925]: 925 monitoring directory `/etc` (2) machine # [ 6.874489] nscd[925]: 925 monitoring file `/etc/nsswitch.conf` (8) machine # [ 6.875599] nscd[925]: 925 monitoring directory `/etc` (2) (finished: must succeed: curl -f https://example.com/PRIVOXY-FORCE/ads 1>&2, in 0.12 seconds) (finished: subtest: Blocks are working, in 0.22 seconds) subtest: Temporary certificates are cleaned machine: must succeed: test $(ls /run/privoxy/certs | wc -l) -gt 0 (finished: must succeed: test $(ls /run/privoxy/certs | wc -l) -gt 0, in 0.02 seconds) machine: must succeed: date -s "$(date --date '12 days')" (finished: must succeed: date -s "$(date --date '12 days')", in 0.02 seconds) machine # [ 6.959589] systemd[1]: Started Logrotate Service. machine # [ 6.966685] systemd[1]: Starting Cleanup of Temporary Directories... machine # [ 6.974783] systemd[1]: logrotate.service: Deactivated successfully. machine # [ 7.004493] systemd[1]: systemd-tmpfiles-clean.service: Deactivated successfully. machine # [ 7.005457] systemd[1]: Finished Cleanup of Temporary Directories. machine: must succeed: test $(ls /run/privoxy/certs | wc -l) -eq 0 (finished: must succeed: test $(ls /run/privoxy/certs | wc -l) -eq 0, in 0.01 seconds) (finished: subtest: Temporary certificates are cleaned, in 0.15 seconds) (finished: run the VM test script, in 7.44 seconds) test script finished in 7.48s cleanup kill machine (pid 8)
| * | Merge pull request #168328 from K900/fix-nix-ld-testpennae2022-04-14
| |\ \ | | | | | | | | tests/nix-ld: fix invocation
| | * | tests/nix-ld: fix invocationK9002022-04-12
| | | |
| * | | Merge pull request #167393 from iblech/patch-docs-ccJanne Heß2022-04-14
| |\ \ \ | | | | | | | | | | nixos-rebuild, switch-to-configuration: document and protect against cross compilation subtlety
| | * | | nixos/switch-to-configuration: Provider better error message in ↵Ingo Blechschmidt2022-04-05
| | | | | | | | | | | | | | | | | | | | cross-compiling situations
| | * | | nixos-rebuild: document cross compilation subtletyIngo Blechschmidt2022-04-05
| | | | |
| * | | | Merge pull request #168302 from helsinki-systems/feat/systemd-stage-1-lvmLassulus2022-04-14
| |\ \ \ \ | | | | | | | | | | | | nixos/stage-1-systemd: Add LVM2 support (+ test)
| | * | | | nixos/stage-1-systemd: Add LVM2 supportJanne Heß2022-04-13
| | | | | |
| * | | | | Merge pull request #168477 from ↵Janne Heß2022-04-14
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | helsinki-systems/feat/systemd-stage-1-hibernation nixos/stage-1-systemd: Implement and test hibernation
| | * | | | | nixos/stage-1-systemd: Implement hibernation + testJanne Heß2022-04-13
| | | | | | |
| | * | | | | nixos/stage-1-systemd: Fix booting grub testsJanne Heß2022-04-13
| | | | | | |
| * | | | | | Merge pull request #137939 from kfiz/update-mongodb-44/50Pascal Bach2022-04-14
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | Update mongodb to 4.4/5.0
| | * | | | | | mongodb: add 4.4Doro Rose2022-04-09
| | | | | | | |
* | | | | | | | Merge branch 'staging-next' into stagingVladimír Čunát2022-04-14
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Minor conflicts; I hope I didn't mess up: pkgs/development/tools/misc/binutils/default.nix pkgs/games/openjk/default.nix
| * | | | | | | nixos/desktop-managers: Fix evalJan Tojnar2022-04-14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | nixos/lib/utils.nix is actually passed as `utils` argument to modules so https://github.com/NixOS/nixpkgs/pull/168194 broke the eval. Fixes: https://github.com/NixOS/nixpkgs/issues/168569
| * | | | | | | nixos/gnome: set default wallpaper for dark mode as wellJan Tojnar2022-04-13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | GNOME 42 needs two wallpaper pictures – for the default (light) colour scheme and for the dark one. Because we are clearing out the paths in `gsettings-desktop-schemas` to prevent closure from bloating, we need to set them in the NixOS module. Since the wallpaper for the default colour scheme is dark, will relegate it to the dark colour scheme and switch to a light blue variant for the default colour scheme. That one has inverted roundel for the NixOS logo but it is the only light-ish background that has the logo of the same size and placing as the dark wallpaper.
| * | | | | | | Merge pull request #167775 from otavio/topic/improve-shellhub-moduleThiago Kenji Okada2022-04-13
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | nixos: shellhub-agent: support more options
| | * | | | | | | nixos/shellhub-agent: use package internally, avoiding it in PATHOtavio Salvador2022-04-10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
| | * | | | | | | nixos/shellhub-agent: avoid code duplication for environmentOtavio Salvador2022-04-10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
| | * | | | | | | nixos/shellhub-agent: use mkPackageOption to simplify codeOtavio Salvador2022-04-10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
| | * | | | | | | nixos/shellhub-agent: allow setting the preferredHostnameOtavio Salvador2022-04-10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
| | * | | | | | | nixos/shellhub-agent: allow setting the keepAliveIntervalOtavio Salvador2022-04-09
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
| | * | | | | | | nixos/shellhub-agent: use new configuration variablesOtavio Salvador2022-04-09
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The old variables still work but will eventually stop to be supported so move to the new ones. Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
| | * | | | | | | nixos/shellhub-agent: use mkEnableOption to simplify codeOtavio Salvador2022-04-09
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
| | * | | | | | | nixos/shellhub-agent: reformat code using nixpkgs-fmtOtavio Salvador2022-04-08
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
| * | | | | | | | Merge pull request #168196 from lucasew/fix/xfce-screensaverThiago Kenji Okada2022-04-13
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | nixos/xfce4: option to disable xfce4-screensaver
| | * | | | | | | | nixos/xfce: option to disable xfce4-screensaverlucasew2022-04-13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: lucasew <lucas59356@gmail.com>
| * | | | | | | | | Merge pull request #168292 from whentze/cockroach-module-improvementsSilvan Mosberger2022-04-13
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / | |/| | | | | | | | nixos/cockroachdb: add `extraArgs` and properly escape systemd exec args
| | * | | | | | | | nixos/cockroachdb: use `escapeSystemdExecArgs` for ExecStart argsWanja Hentze2022-04-12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Co-authored-by: pennae <82953136+pennae@users.noreply.github.com>
| | * | | | | | | | nixos/cockroachdb: add `extraArgs` optionWanja Hentze2022-04-12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There are a bunch of args to `cockroach start` that simply can not be set given the current set of options, so this escape hatch enables them.
| * | | | | | | | | Merge pull request #168194 from SuperSandro2000/xserver-excludePackagesSandro2022-04-13
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Xserver exclude packages
| | * | | | | | | | | nixos/utils: move removePackagesByName to here from gnomeSandro Jäckel2022-04-11
| | | | | | | | | | |
| | * | | | | | | | | nixos/xserver: add excludePackages optionSandro Jäckel2022-04-11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to remove packages environment.systemPackages
| * | | | | | | | | | Merge pull request #140607 from jkarlson/terminfoSandro2022-04-13
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | nixos/terminfo: add enableAllTerminfo optionEmil Karlson2022-04-13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add an option to install all .terminfo packages, normally this should add no runtime bloat, if caches are used.
| * | | | | | | | | | | Merge pull request #168288 from erikarvstedt/paperless-ngxMartin Weinelt2022-04-12
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / / / | |/| | | | | | | | | |
| | * | | | | | | | | | nixos/paperless-ng: rename to `paperless`, use `paperless-ngx` packageErik Arvstedt2022-04-12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use this opportunity to rename `paperless-(ng)-server` to `paperless-scheduler`. This follows the naming scheme in the paperless repo and docs.
| | * | | | | | | | | | nixos/paperless-ng: simplify redis logicErik Arvstedt2022-04-12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Rename `hasCustomRedis` -> `enableRedis` - Extract var `redisServer`
| | * | | | | | | | | | nixos/paperless-ng: fix /proc access for serviceErik Arvstedt2022-04-11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows django-q to set the number of workers according to the CPU core count and to show memory stats via `manage.py qmonitor`. This also fixes a non-critical psutil error in paperless-ng-server.
| | * | | | | | | | | | nixos/paperless-ng: minor improvmentsErik Arvstedt2022-04-11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Service: - Fix misleading comment: We could in fact implement password copying as a preStart script by amending BindReadOnlyPaths, but adding an extra service is simpler. Test: - Add more detailed subtest names - Simplify date check
| * | | | | | | | | | | Merge pull request #167349 from helsinki-systems/feat/udev-systemd-stage-1Lassulus2022-04-12
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | nixos/udev: Add systemd stage 1 support
| | * | | | | | | | | | | nixos/udev: Put all initrd options into a namespaceJanne Heß2022-04-12
| | | | | | | | | | | | |
| | * | | | | | | | | | | nixos/udev: Add systemd stage 1 supportJanne Heß2022-04-11
| | | | | | | | | | | | |
| * | | | | | | | | | | | Merge pull request #167323 from alyssais/mailman-ext_dirLinus Heckemann2022-04-12
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / / | |/| | | | | | | | | | | nixos/mailman: remove obsolete setting
| | * | | | | | | | | | | nixos/mailman: remove obsolete settingAlyssa Ross2022-04-05
| | | |_|_|_|_|_|_|/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was dropped in mailman 3.2.0.
| * | | | | | | | | | | Merge pull request #165481 from talyz/discourse-2.9.0.beta3Kim Lindberger2022-04-12
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / / | |/| | | | | | | | | | discourse: 2.9.0.beta1 -> 2.9.0.beta3
| | * | | | | | | | | | nixos/discourse: Update redis server settings...talyz2022-03-25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ...to match the updated redis module.
| | * | | | | | | | | | discourse: 2.9.0.beta1 -> 2.9.0.beta3talyz2022-03-25
| | | | | | | | | | | |
generated by cgit-pink 1.4.1 (git 2.36.1) at 2024-07-15 20:20:29 +0000