21965 Commits

Author SHA1 Message Date
Martin Weinelt
e9434d6728 nixos/tests/custom-ca: disable firefox test integration
Firefox has been decoupled from the system certificate store since the
nss p11-kit integration in combination with our cacert package does not
expose CKA_NSS_MOZILLA_CA_POLICY, which among other things is required
for addon updates.

(cherry picked from commit 2d4ed9bae6f9c80d75cf5ef18ccdac85cf889ff3)
2021-06-09 12:55:23 +00:00
Maximilian Bosch
3993e891e4
nixos/tests/kernel-generic: fix evaluation
The test doesn't evaluate since #125469 because Linux 5.11 got removed
as it's EOL.

As this fixes the evaluation of the test and it only removes a
declaration that was apparently forgotten, I figured that a push to
unbreak the test is fine.

(cherry picked from commit 10eab5b6b3d1d38ffd3594fa6e4be13924dafd15)
2021-06-09 13:03:14 +02:00
Natan Lao
b3ec6fd959 nixos/nvidia: fix hardware.nvidia.package example
(cherry picked from commit 86a31cc9719ed409d523d4f738aa2a994d79ff9e)
2021-06-08 20:59:02 -07:00
Jonathan Ringer
8e20586f52
Merge branch 'staging-next-21.05' into staging-21.05 2021-06-08 12:21:49 -07:00
rnhmjoj
f2c9d568c8 nixos/wireless: only warn for no interfaces
A hard failure breaks the NixOS installer, which can't possibly
know the interface names in advance.

(cherry picked from commit be01320a6c39867eac0a20b4dfe04680d3b1ce26)
2021-06-08 08:52:41 -07:00
rnhmjoj
df9df54d63 Revert "nixos/wireless: make wireless.interfaces mandatory"
This reverts commit 030a521adc9510207dd9f06b8d8b552ff7d999f9.

(cherry picked from commit eba5f5c1e5a61ef65a970c699b9f93aff87448bf)
2021-06-08 08:52:41 -07:00
Jan Tojnar
403fb2db47 nixos/gnome: fix option label
It is no longer GNOME 3.

(cherry picked from commit 99fcca7b6bc850e1c1c47e9fbad41fc3264170f6)
2021-06-07 17:34:08 -07:00
AmineChikhaoui
77e8ea81e3 ec2-amis: add release 21.05
(cherry picked from commit b7d74194b49c3b3f85d52e85054283211bce6c11)
2021-06-06 17:09:30 -07:00
rnhmjoj
662f2d19b3 nixos/wireless: make wireless.interfaces mandatory
This is the only way to solve issue #101963, for now.

(cherry picked from commit 030a521adc9510207dd9f06b8d8b552ff7d999f9)
2021-06-06 08:38:28 +00:00
talyz
a60818cacd treewide: Fix mysql alias deprecation breakage
62733b37b4a866cabafe1fc8bb7415240126eb0b broke evaluation in all
places `pkgs.mysql` was used. Fix this by changing all occurrences to
`pkgs.mariadb`.

(cherry picked from commit 59e0120aa5c1241d48048afa615e25c65d7e366d)
2021-06-05 17:11:40 +00:00
Vladimír Čunát
7b686ba07b
Merge branch 'release-21.05' into staging-21.05 2021-06-05 07:30:40 +02:00
Maximilian Bosch
3c8dcd902a nixos/mail-exporter: add note about rspamd marking probe mails as spam
(cherry picked from commit ba9768f3143c728a47515d0548025a103fca9013)
2021-06-04 14:14:35 +00:00
Maximilian Bosch
d7fbcd60a3 nixos/dovecot-exporter: fix documentation for old stats
(cherry picked from commit 6fb847c55643780c1ba3a98c57ba57541ed33d14)
2021-06-04 14:14:35 +00:00
Maximilian Bosch
619cf60d25 nixos/rspamd-exporter: fix metrics
In 0.3.0 of the json-exporter[1] it was switched to a different jsonpath
library which made some changes - especially for spaces in keys -
necessary. Also I decided to remove the pretty-printed JSON as this
would interfere with the bash quoting too much. If one needs
pretty-printed output, they can still pipe the output to `jq`.

[1] https://github.com/prometheus-community/json_exporter/releases/tag/v0.3.0

(cherry picked from commit 976d668e5c5566c3e96b17d667830a0f3ed1bbb5)
2021-06-04 14:14:35 +00:00
Anders Kaseorg
19f959fccb nixos/release-notes: Fix link to GNOME 40 release notes
Signed-off-by: Anders Kaseorg <andersk@mit.edu>
(cherry picked from commit a681951902631d20e439fc60f53100967ba1cc72)
2021-06-04 09:17:01 +00:00
Samuel Dionne-Riel
7953561a9d iso-image: Improve disk detection
This should help in rare hardware-specific situations where the root is
not automatically detected properly.

We search using a marker file. This should help some weird UEFI setups
where the root is set to `(hd0,msdos2)` by default.

Defaulting to `(hd0)` by looking for the ESP **will break themeing**. It
is unclear why, but files in `(hd0,msdos2)` are not all present as they
should be.

This also fixes an issue introduced with cb5c4fcd3c5d4070f040d591b2dd1da580f234d1
where rEFInd stopped booting in many cases. This is because it ended up
using (hd0) rather than using the `search` which was happening
beforehand, which in turn uses (hd0,msdos2), which is the ESP.
Putting back the `search` here fixes that.

(cherry picked from commit 20b023b5ea63a6513a4dce7f162736a00bce5cc8)
2021-06-03 08:03:07 -07:00
Samuel Dionne-Riel
2f5e4928c0 iso-image: unqualified root → ($root)
This technically changes nothing. In practice `$root` is always the
"CWD", whether searched for automatically or not.

But this serves to announce we are relying on `$root`... I guess...

(cherry picked from commit c9bb054dd68964b0eb9a38c51bdf824bfb212fc7)
2021-06-03 08:03:07 -07:00
Samuel Dionne-Riel
190f44da28 iso-image: change date on all files
It may be that in some conditions dates earlier than 1980 on FAT on GRUB
2.06~ish will cause failures

https://github.com/NixOS/nixpkgs/issues/123376#issuecomment-845515035
(cherry picked from commit 15eaed0718515db3f2fa7d4ed71676e6069d3fb5)
2021-06-03 08:03:07 -07:00
Samuel Dionne-Riel
8cb2ce0f52 iso-image: Force gfxmode
https://www.gnu.org/software/grub/manual/grub/html_node/gfxmode.html
(cherry picked from commit f93f0e72e9ef423ed591951030f08cafd209e637)
2021-06-03 08:03:07 -07:00
Patrick Hilhorst
9452c8fb4b nixos/tests/test-driver: make it clear when shell is ready
Co-authored-by: Domen Kožar <domen@enlambda.com>
(cherry picked from commit fd739c4dee12fbe57199f73c44ec22db2355028e)
2021-06-03 09:49:17 +00:00
Patrick Hilhorst
5ed752dd35 nixos/tests/test-driver: mention drawback
(cherry picked from commit 287144273162acd869f514f7770a3daae4649d37)
2021-06-03 09:49:17 +00:00
Patrick Hilhorst
9046996543 nixos/tests/test-driver: document shell_interact
(cherry picked from commit 9469433e341f7337308468bb4b9ccfff84b2951b)
2021-06-03 09:49:17 +00:00
Patrick Hilhorst
e3e37d20ce nixos/tests/test-driver: add shell_interact
(cherry picked from commit 5a589b5ba8941d734e9c3aebbf2be2f50d7c32a5)
2021-06-03 09:49:17 +00:00
Robert Hensing
297970378b
Merge pull request #125341 from hercules-ci/backport-podman-improvements
[Backport release-21.05] podman improvements
2021-06-02 18:23:15 +02:00
Thomas Depierre
0894deca29 beam-packages: drop erlang R18 R19 R20 and cuter
(cherry picked from commit f55c3e2f21073be564fed477847ad5bd649c9fb9)
2021-06-02 19:23:26 +09:00
zowoq
0684f78698 nixos/podman-network-socket-ghostunnel: move condition to include socket
(cherry picked from commit 72f54c32a6114a69caec30170a29837c91434aff)
2021-06-02 10:20:11 +02:00
Robert Hensing
c758b69375 nixos/podman-dnsname: init
(cherry picked from commit 54f2f1e5f1c7fd34e564a84443e8490477e26eb7)
2021-06-02 10:20:11 +02:00
Robert Hensing
9e4729617b nixos/podman: Add defaultNetwork.extraPlugins
(cherry picked from commit d81631fb98ea35b107d86f5de287cf727d0dfc18)
2021-06-02 10:20:11 +02:00
Robert Hensing
f28df17dfa nixos/containers: Add virtualisation.containers.containersConf.cniPlugins
(cherry picked from commit efba949352271ec77d9d5e7d54f2d16b9c53ee4f)
2021-06-02 10:20:11 +02:00
Robert Hensing
29ee113277 podman: Add iproute2, fixing docker network rm
(cherry picked from commit db31d8354d9c1988968f076c4e01843330162e03)
2021-06-02 10:20:11 +02:00
Robert Hensing
833b005e37 nixos/podman-network-socket-ghostunnel: init
(cherry picked from commit b6570e723836167640c9b7efc63f327ff17b0755)
2021-06-02 10:20:10 +02:00
Robert Hensing
ffde2bb4a1 nixos/podman: Add generic networkSocket interface
(cherry picked from commit 52844efcd67028a481a24103d8e93c7ef2bf4f08)
2021-06-02 10:20:10 +02:00
Robert Hensing
0c5e6d0bea nixos/podman: Add dockerSocket.enable
(cherry picked from commit ff4d83a66727ad13da0f51d00db4eda8a8c50590)
2021-06-02 10:20:10 +02:00
Robert Hensing
db05ed8b0d nixos/podman: Change podman socket to new podman group
(cherry picked from commit fb8b0a38433c8e83a53c1dc0a739c5a7ad64e2fc)
2021-06-02 10:20:10 +02:00
zowoq
f63aff597b nixos/podman: install cni config from package
(cherry picked from commit 30ae7e4ba983de461c7b71d02274d184ab55244d)
2021-06-02 10:20:10 +02:00
Robert Hensing
fb8409427c dockerTools: Allow omitting all store paths
Adds includeStorePaths, allowing the omission of the store paths.
You generally want to leave it on, but tooling may disable this
to insert the store paths more efficiently via other means, such
as bind mounting the host store.

(cherry picked from commit 5259d66b7487b94233821e28aafb0683ae3f1df6)
2021-06-02 07:51:33 +00:00
Sandro
d790395393 changelog: fix typo
(cherry picked from commit 8217ea50000728c55fe8b21454ca2572743d8302)
2021-06-01 14:36:54 +00:00
Julien Moutinho
437b2bfe18 nixos/pam: use new plasma5Packages, fixes #124973
(cherry picked from commit 61654ca131c1431b172cc0464c83227c40331e16)
2021-06-01 13:30:11 +00:00
Daniel Nagy
4d837a7a98 nixos/monero: set port type to types.port
(cherry picked from commit e57465a617f4cc993a7b32f90cb9e095f2b09596)
2021-06-01 13:15:25 +00:00
Daniel Nagy
ab496da138 nixos/gitlab: set port type to types.port
(cherry picked from commit cc5517da4c2221ee42163b69e1648cc472fcba0e)
2021-06-01 13:15:25 +00:00
Daniel Nagy
28e57cb0c7 nixos/matrix-synapse: set port type to types.port
(cherry picked from commit 8e760f485873d202a0ad4aba7a78caabc85cf5db)
2021-06-01 13:15:24 +00:00
Daniel Nagy
fda7b06830 nixos/syncserver: set port type to types.port
(cherry picked from commit 65b32a0afe69258e3fa2fb245ea2315c8683281f)
2021-06-01 13:15:24 +00:00
Daniel Nagy
2c97740c47 nixos/gitDaemon: set port type to types.port
(cherry picked from commit 048c45679fe6fda60b00bf45890e5990f0e6d9f2)
2021-06-01 13:15:24 +00:00
Daniel Nagy
98d6d1dbf7 nixos/redis: set port type to types.port
(cherry picked from commit 0cde374a7604821ceddd24d06ae21e44de59d04c)
2021-06-01 13:15:24 +00:00
Daniel Nagy
d71b353d15 nixos/discourse: set port type to types.port
(cherry picked from commit 73f9c29a2cd4e298493751ba1e3f1f5750021ad2)
2021-06-01 13:15:24 +00:00
Daniel Nagy
24e35b8c44 nixos/terraria: adapt option types
(cherry picked from commit 137924cc96b589c8d335ff4a420b0e3bb208ac9e)
2021-06-01 13:15:24 +00:00
Daniel Nagy
33ce03a653 nixos/lighttpd: set port type to types.port
(cherry picked from commit 941fd008ede8ad2423c257a18681011939d9fe11)
2021-06-01 13:15:23 +00:00
Daniel Nagy
dad9958503 nixos/darkhttpd: set port type to types.port
(cherry picked from commit a5321aecfb51c7abdd45254d821e8122820850d3)
2021-06-01 13:15:23 +00:00
Damien Diederen
d300b598da nixos/lib/make-ext4-fs: Fix: `resize2fs -M' can leave insufficient slack
The root filesystem resizing step, `resize2fs -M', does not provide any
control over the amount of slack left in the result.  It can produce an
arbitrarily tight fit, depending on how well the payload aligns with
ext4 data structures.

This is problematic, as NixOS must create a few files and directories
during its first boot, before the root is enlarged to match the size of
the containing SD card.

An overly tight fit can cause failures in the first stage:

    mkdir: can't create directory '/mnt-root/proc': No space left on device

or in the second stage:

    install: cannot create directory '/var': No space left on device

A previous version of `make-ext4-fs' (before PR #79368) was explicitly
"reserving" 16 MiB of free space in the final filesystem.  Manually
calculating the size of an ext4 filesystem is a perilous endeavor,
however, and the method it employed was apparently unreliable.

Reverting is consequently not a good option.

A solution would be to create some sort of "balloon" occupying inodes
and blocks in the image prior to invoking `resize2fs -M', and to remove
these temporary files/directories before the compression step.

This changeset takes the simpler approach of simply dropping the
resizing step.

Note that this does *not* result in a larger image in general, as the
current procedure does not truncate the `.img' file anyway.  In fact, it
has been observed to yield *smaller* compressed images---probably
because of some "noise" left after resizing.  E.g., before-vs-after:

    -r--r--r-- 2 root root 607M  1. Jan 1970  nixos-sd-image-21.11pre-git-x86_64-linux.img.zst

    -r--r--r-- 2 root root 606M  1. Jan 1970  nixos-sd-image-21.11pre-git-x86_64-linux.img.zst

(cherry picked from commit 7c2adb1d5c1f0b05dc030365f9a811a6431af0e1)
2021-06-01 04:58:07 +00:00
Jonathan Ringer
7e9b0dff97 nixos/release-notes: move non-highlights to other mentions
(cherry picked from commit 9a3e8699976bd673f9f4eee64e254ccb7a1fadce)
2021-05-31 20:06:55 -07:00