github-actions[bot]
6b9c75bed5
Merge master into staging-next
2022-04-16 18:01:07 +00:00
Florian Klink
b2f5308400
nixos/doc: move "Building NixOS" into "Installation", not "Development"
...
This section mostly describes how to build various installer images, so
it fits better in that chapter.
Proposed in https://github.com/NixOS/nixpkgs/pull/168306#discussion_r848329534
2022-04-16 15:19:03 +02:00
Florian Klink
b2383b6329
Merge pull request #168306 from flokli/nixos-doc-installer-drivers
...
nixos/doc: add notes on additional drivers or firmware
2022-04-16 15:03:24 +02:00
github-actions[bot]
6be56bfc2e
Merge master into staging-next
2022-04-16 12:01:10 +00:00
Luflosi
faad370edc
nixos/ipfs: fix the services.ipfs.autoMigrate option
...
Apparently this was never properly tested and never worked. When the IPFS repo needs upgrading, the first call to ipfs, which is run before running the migration, fails with the error message "Error: ipfs repo needs migration".
To fix this, simply run the migration before any `ipfs config` calls but don't run it when `dataDir` is empty and we need to call `ipfs init`.
Writing a NixOS test for this would require keeping at least two versions of IPFS in Nixpkgs, which we don't currently do.
2022-04-16 07:38:13 -04:00
Luflosi
8a5e51525d
nixos/ipfs: add Luflosi as maintainer
2022-04-16 07:38:13 -04:00
Luflosi
6b2eca8d56
nixos/ipfs: remove unused code
...
This code became obsolete with 4044d81d5c
, just a couple days after it was introduced.
2022-04-16 07:38:13 -04:00
Franz Pletz
fc4e939cef
Merge pull request #162550 from fortuneteller2k/polybar
2022-04-16 12:47:18 +02:00
Thiago Kenji Okada
113a29b107
Merge pull request #168816 from thiagokokada/graalvm-cleanup
...
graalvmXX-ee: remove; graalvmXX-ce: remove Ruby/Python/WASM support
2022-04-16 11:36:41 +01:00
fortuneteller2k
3016d0aeb8
polybar: 3.5.7 -> 3.6.2
...
Co-authored-by: Alexander Foremny <aforemny@posteo.de>
2022-04-16 08:26:44 +00:00
Nick Cao
70d0e24568
nixos/logrotate: use packages from buildPackages in configuration checkPhase, fixing cross compilation
2022-04-16 10:22:39 +02:00
github-actions[bot]
c58a108aaa
Merge master into staging-next
2022-04-16 06:01:08 +00:00
Azat Bahawi
67565c3af8
tests/emacs-daemon: fix failure for unset $DISPLAY
...
axelf4 figured[1] out a workaround for fixing a failure due to an unset
$DISPLAY variable.
[1] https://github.com/NixOS/nixpkgs/pull/168076#issuecomment-1098083299
2022-04-16 16:53:45 +12:00
Mario Rodas
9bad452131
Merge pull request #129304 from yisraeldov/patch-1
...
programs.chromium: fix policies for brave
2022-04-15 22:08:43 -05:00
Martin Weinelt
2bd8fc9378
Merge remote-tracking branch 'origin/master' into staging-next
2022-04-16 00:52:15 +02:00
Luflosi
17a406f28a
nixos/matrix-synapse: fix typo in mkRemovedOptionModule replacementInstructions
...
The correct capitalisation is lower-case here.
2022-04-15 22:52:29 +02:00
Lassulus
2bd0053d94
Merge pull request #162509 from mkg20001/haste
...
haste-server: init at 3dcc43578b99dbafac35dece9d774ff2af39e8d0
2022-04-15 21:08:27 +01:00
Kim Lindberger
ce2895263d
Merge pull request #167378 from talyz/keycloak-quarkus
...
keycloak: Switch to the new Quarkus version of Keycloak
2022-04-15 22:02:42 +02:00
Thiago Kenji Okada
4f8562f682
nixos/doc: add note about the recent graalvmXX-ce changes
2022-04-15 20:34:09 +01:00
github-actions[bot]
40f288fa90
Merge master into staging-next
2022-04-15 18:01:30 +00:00
Michele Guerini Rocco
68a102a2e4
Merge pull request #168764 from rnhmjoj/pr-pdns-ncdns
...
nixos/ncdns: listen on IPv6 by default
2022-04-15 17:34:57 +02:00
Martin Weinelt
a7fc5aaa76
Merge remote-tracking branch 'origin/master' into staging-next
2022-04-15 13:30:48 +02:00
Michele Guerini Rocco
09f816e976
Merge pull request #156401 from TLATER/tlater/gitea-hide-secrets
...
nixos/gitea: Prevent secrets from being exposed at ExecStart time
2022-04-15 10:26:12 +02:00
github-actions[bot]
eef7dee538
Merge master into staging-next
2022-04-15 06:01:16 +00:00
Will Dietz
dde5b0ca7a
python3Packages.fenics: fix build, pin to older boost ( #166728 )
...
* python3Packages.fenics: fix build, pin to older boost
Looking at upstream, there are various issues with newer boost.
(At least some of them have been since fixed)
For now, fix the build by using a version of boost that works
with the current version.
Error here was complaining about `std::min_element`,
which is no longer available, apparently, due to newer boost
no longer (transitively) including <algorithm>.
This was added in C++17, so I'm not sure the cmake flag
specifying dolfin built with C++11 makes sense or is used.
Leaving for now :).
* nixos/tests/fenics: fix name of machine/node in script
Still fails for now.
* python3Packages.fenics: fix accidentally changed strings in subst
Looks like in migration to pkg-config this was erroneously
changed from `pkgconfig` (python package, and source string)
to `pkg-config` (nix package name, tool name).
(see 9bb3fccb5b
)
Fixes the NixOS test.
2022-04-14 19:37:20 -05:00
github-actions[bot]
1c0229dbfd
Merge staging-next into staging
2022-04-15 00:03:21 +00:00
Janne Heß
0efb6720a4
nixos/console: Fix attribute path to fix eval
2022-04-14 22:07:41 +01:00
Lassulus
15b5c29a41
Merge pull request #168600 from helsinki-systems/feat/systemd-stage-1-keymap
...
nixos/stage-1-systemd: Add keymap support
2022-04-14 21:50:52 +01:00
rnhmjoj
3bb46db14e
nixos/release-notes: document ncdns incompatible changes
2022-04-14 21:30:00 +02:00
rnhmjoj
a1cb6e5a88
nixos/tests/ncdns: fix test
...
1. Add another wait_for_unit("pdns-recursor")
(this is needed when DNSSEC is disabled)
2. Make everything IPv6
2022-04-14 21:07:15 +02:00
rnhmjoj
d39a10daa8
nixos/ncdns: listen on IPv6 by default
2022-04-14 21:07:15 +02:00
github-actions[bot]
795332a20e
Merge staging-next into staging
2022-04-14 18:01:48 +00:00
Michele Guerini Rocco
e674ea6956
Merge pull request #168535 from rnhmjoj/pr-pdns-nixos
...
nixos/pdns-recursor: update default values
2022-04-14 18:02:29 +02:00
Janne Heß
289f38a65b
Merge pull request #168301 from helsinki-systems/feat/systemd-stage-1-mdadm
...
nixos/stage-1-systemd: Add mdraid support (+ test)
2022-04-14 17:56:36 +02:00
rnhmjoj
bad701b1d3
doc/release-notes: mention pdns-recursor options changes
2022-04-14 17:32:57 +02:00
rnhmjoj
fe27976534
nixos/tests/pdns-recursor: test a DNS query
2022-04-14 17:31:27 +02:00
rnhmjoj
fd480f55df
nixos/pdns-recursor: update default values
...
1. Update the default values of several addresses-related settings
that have been changed by upstream.
2. Make `dns.address` take multiple addresses. This is needed
for dual stack, now working by default.
2022-04-14 17:31:16 +02:00
Florian Klink
e97fc37e55
Merge pull request #161253 from flokli/kexec-boot
...
nixos/installer: add kexec-boot
2022-04-14 15:30:30 +02:00
Florian Klink
6ceedff331
nixosTests.kexec: fix tests with kexecBoot format
2022-04-14 15:15:33 +02:00
Alyssa Ross
b825f6db56
nixos/doc/md-to-db.sh: consistent pandoc version
...
Until now, this script has used the version of pandoc from unstable.
This means that running the script on the same version of Nixpkgs
could produce different results, and meant that when Pandoc's output
was changed, random PRs were changing the whole manual when they ran
the script to regenerate docs[1][2].
Here I've changed the manual to use a consistent version of pandoc —
the one from the latest release tag, which will avoid this problem in
future. This will avoid this problem in future. The only time we'll
need to worry about pandoc output changes is when we bump the version
used in this script.
I also considered using the version from the current Nixpkgs branch,
but decided against it as it's unlikely that e.g. the person bumping
Pandoc will remember to regenerate the manual.
[1]: https://github.com/NixOS/nixpkgs/pull/162550
[2]: https://github.com/NixOS/nixpkgs/pull/168535
2022-04-14 12:57:51 +00:00
github-actions[bot]
999a16ca63
Merge staging-next into staging
2022-04-14 12:02:14 +00:00
Jacek Galowicz
6b414c5b66
Merge pull request #168609 from rnhmjoj/pr-test-driver
...
nixos/test-driver: highlight driver log lines
2022-04-14 13:09:36 +02:00
pennae
3e9855f8ac
Merge pull request #168328 from K900/fix-nix-ld-test
...
tests/nix-ld: fix invocation
2022-04-14 10:41:26 +00:00
Janne Heß
dda7e9e3ee
nixos/stage-1-systemd: Add mdraid support (+ test)
2022-04-14 11:39:57 +01:00
Janne Heß
0581d31bf9
Merge pull request #167393 from iblech/patch-docs-cc
...
nixos-rebuild, switch-to-configuration: document and protect against cross compilation subtlety
2022-04-14 12:30:39 +02:00
rnhmjoj
ca1b1f6dc0
nixos/test-driver: highlight driver log lines
...
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:
[2mmachine # [ 6.647826] dhcpcd[668]: eth0: adding default route via 10.0.2.2[0m
[2mmachine # I've had a great day![0m
(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)
[1m[32msubtest: Blocks are working[0m
machine: [1m[32mwaiting for TCP port 443[0m
[2mmachine # Connection to localhost (::1) 443 port [tcp/https] succeeded![0m
(finished: waiting for TCP port 443, in 0.03 seconds)
machine: [1m[32mmust fail: curl -f https://example.com/ads 1>&2[0m
[2mmachine # [ 6.730608] nscd[742]: 742 monitored file `/etc/resolv.conf` was written to[0m
[2mmachine # [ 6.733071] privoxy[814]: 2022-04-14 09:41:01.695 7fa995c39640 Actions: +block{Fake ads} ...
[2mmachine # curl: (22) The requested URL returned error: 403[0m
[2mmachine # [ 6.753098] systemd[1]: Stopping Name Service Cache Daemon...[0m
[2mmachine # [ 6.755632] systemd[1]: nscd.service: Deactivated successfully.[0m
[2mmachine # [ 6.757069] systemd[1]: Stopped Name Service Cache Daemon.[0m
(finished: must fail: curl -f https://example.com/ads 1>&2, in 0.07 seconds)
machine: [1m[32mmust succeed: curl -f https://example.com/PRIVOXY-FORCE/ads 1>&2[0m
[2mmachine # [ 6.765099] systemd[1]: Starting Name Service Cache Daemon...[0m
[2mmachine # [ 6.781519] nscd[925]: 925 monitoring file `/etc/passwd` (1)[0m
[2mmachine # [ 6.844105] systemd[1]: Reached target Network is Online.[0m
[2mmachine # [ 6.848860] privoxy[814]: 2022-04-14 09:41:01.805 7fa995c39640 Actions: +block{Fake ads} ...
[2mmachine # [ 6.856068] nscd[925]: 925 monitoring file `/etc/nsswitch.conf` (8)[0m
[2mmachine # [ 6.858229] systemd[1]: Reached target Multi-User System.[0m
[2mmachine # [ 6.858934] nscd[925]: 925 monitoring directory `/etc` (2)[0m
[2mmachine # [ 6.861315] systemd[1]: Startup finished in 2.374s (kernel) + 4.451s (userspace) = 6.826s.[0m
[2mmachine # Hot Nixpkgs PRs in your area. Click here![0m
[2mmachine # [ 6.873055] nscd[925]: 925 monitoring directory `/etc` (2)[0m
[2mmachine # [ 6.874489] nscd[925]: 925 monitoring file `/etc/nsswitch.conf` (8)[0m
[2mmachine # [ 6.875599] nscd[925]: 925 monitoring directory `/etc` (2)[0m
(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)
[1m[32msubtest: Temporary certificates are cleaned[0m
machine: [1m[32mmust succeed: test $(ls /run/privoxy/certs | wc -l) -gt 0[0m
(finished: must succeed: test $(ls /run/privoxy/certs | wc -l) -gt 0, in 0.02 seconds)
machine: [1m[32mmust succeed: date -s "$(date --date '12 days')"[0m
(finished: must succeed: date -s "$(date --date '12 days')", in 0.02 seconds)
[2mmachine # [ 6.959589] systemd[1]: Started Logrotate Service.[0m
[2mmachine # [ 6.966685] systemd[1]: Starting Cleanup of Temporary Directories...[0m
[2mmachine # [ 6.974783] systemd[1]: logrotate.service: Deactivated successfully.[0m
[2mmachine # [ 7.004493] systemd[1]: systemd-tmpfiles-clean.service: Deactivated successfully.[0m
[2mmachine # [ 7.005457] systemd[1]: Finished Cleanup of Temporary Directories.[0m
machine: [1m[32mmust succeed: test $(ls /run/privoxy/certs | wc -l) -eq 0[0m
(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
[1m[32mcleanup[0m
kill machine (pid 8)
2022-04-14 11:54:21 +02:00
Janne Heß
6d6c1c341c
nixos/stage-1-systemd: Add keymap support
...
Makes my life a lot easier with my non-american keyboard layout
2022-04-14 10:25:04 +01:00
Lassulus
7392416a53
Merge pull request #168302 from helsinki-systems/feat/systemd-stage-1-lvm
...
nixos/stage-1-systemd: Add LVM2 support (+ test)
2022-04-14 09:52:24 +01:00
Janne Heß
cb1624c130
Merge pull request #168477 from helsinki-systems/feat/systemd-stage-1-hibernation
...
nixos/stage-1-systemd: Implement and test hibernation
2022-04-14 10:15:28 +02:00
Vladimír Čunát
d5d94127fd
Merge branch 'staging-next' into staging
...
Minor conflicts; I hope I didn't mess up:
pkgs/development/tools/misc/binutils/default.nix
pkgs/games/openjk/default.nix
2022-04-14 09:53:21 +02:00