github-actions[bot]
77a94d88ad
Merge master into staging-next
2021-07-03 06:01:13 +00:00
Luke Granger-Brown
4670c25e3d
Merge pull request #128920 from wamserma/luks-trim-ae-note
...
nixos/luksroot: add note about AE to allowDiscards
2021-07-03 01:47:38 +01:00
github-actions[bot]
c1fb3b22cd
Merge master into staging-next
2021-07-03 00:01:32 +00:00
aszlig
3895ec33ad
nixos/tests/zsh-history: Fix matching prompt
...
In commit fbbaa4d40f
, the Zsh default
prompt has changed from "walters" to "suse". So instead of:
root@default>
... we now have:
root@default:~/ >
However, in the NixOS VM test, we are matching "root@default>", which
doesn't include the current working directory and thus eventually leads
to a test failure after timing out.
To fix this, I changed the regex to include a newline at the beginning
and made sure that the hostname ends with a word boundary. This way it
doesn't matter whether the prompt is "walters" or "suse", because after
all the test is not about the prompt but about whether the history
mechanism works (or not).
Signed-off-by: aszlig <aszlig@nix.build>
2021-07-02 21:01:49 +02:00
github-actions[bot]
4147e7d4a9
Merge master into staging-next
2021-07-02 18:01:01 +00:00
Ben Siraphob
28acaac96f
Merge pull request #128271 from Kreyren/localBinInPath
2021-07-02 22:17:44 +07:00
Ryan Mulligan
74f12354e6
Merge pull request #128987 from bobby285271/pr9
...
nixos/doc: convert "Chapter 62. NixOS Tests" to CommonMark
2021-07-02 06:55:19 -07:00
Kim Lindberger
90ed906797
Merge pull request #126058 from talyz/geoip-fixes
...
nixos/geoipupdater: Fix initial setup, add stricter security, fix a filename
2021-07-02 14:30:49 +02:00
Bobby Rong
47fe2c7e93
nixos: nixos/doc/manual/development/running-nixos-tests-interactively.xml to CommonMark
2021-07-02 20:24:02 +08:00
Bobby Rong
8fafcfa3ea
nixos: nixos/doc/manual/development/running-nixos-tests.xml to CommonMark
2021-07-02 20:23:38 +08:00
Bobby Rong
163976c296
nixos: nixos/doc/manual/development/writing-nixos-tests.xml to CommonMark
2021-07-02 20:22:58 +08:00
github-actions[bot]
03ea42ab93
Merge master into staging-next
2021-07-02 12:01:08 +00:00
Markus S. Wamser
8e48b24d76
modules/luksroot: add note about AE to allowDiscards
2021-07-01 23:37:07 +02:00
github-actions[bot]
26416f52eb
Merge master into staging-next
2021-07-01 12:01:05 +00:00
Philipp Hausmann
8bfd84cf3c
slimserver: Fix user creation
2021-07-01 11:33:38 +02:00
Jörg Thalheim
f75e2a648c
Merge pull request #128023 from max-privatevoid/patch-1
...
nixos/systemd-boot: Use os.path.realpath to fully resolve symlinks
2021-07-01 07:17:50 +01:00
Jörg Thalheim
e12188c0f2
nixos/systemd-confinment: use /var/empty as chroot mountpoint
...
bind mounting directories into the nix-store breaks nix commands.
In particular it introduces character devices that are not supported
by nix-store as valid files in the nix store. Use `/var/empty` instead
which is designated for these kind of use cases. We won't create any
files beause of the tmpfs mounted.
2021-07-01 08:01:18 +02:00
github-actions[bot]
9ae4f4c991
Merge master into staging-next
2021-07-01 06:01:03 +00:00
Jonathan Ringer
cd687af9f4
nixos/test/vault: fix assertion logic
...
"vault status" now returns exit code 2 when the
vault is still unsealed.
2021-06-30 22:50:01 -07:00
Sandro
993a678217
Merge pull request #123334 from Luflosi/ipfs-replace-deprecated-option
2021-07-01 03:03:55 +02:00
github-actions[bot]
7350c52b9b
Merge master into staging-next
2021-07-01 00:01:35 +00:00
gwitmond
bbe66636f4
nixos/sshd: add -D flag to prevent forking into a separate process ( #122844 )
...
It makes it easier for init-processes to monitor correct startup and liveness.
2021-07-01 00:43:54 +02:00
Luke Granger-Brown
ef4e133b1c
Merge branch 'master' into Xe/tailscale-sysctl-not-found
2021-06-30 23:10:54 +01:00
Luke Granger-Brown
272773e1cb
Merge pull request #127931 from talyz/discourse-plugins
...
discourse: Fix plugin support
2021-06-30 23:03:57 +01:00
Sandro
30e2735f5d
Merge pull request #83904 from ju1m/sanoid
...
sanoid: fix sanoid.conf generation
2021-06-30 23:55:26 +02:00
Jacob Hrbek
55a211ae31
Removed wrong comment
2021-06-30 21:32:08 +02:00
Jacob Hrbek
67af267cf7
Update nixos/modules/config/shells-environment.nix
...
lgtm
Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
2021-06-30 21:27:56 +02:00
Luflosi
2b02b34029
nixos/ipfs: replace deprecated command line option
...
According to https://docs.ipfs.io/reference/cli/#ipfs the --local command line option is deprecated and should be replaced with --offline.
2021-06-30 17:32:38 +02:00
github-actions[bot]
629cea2cd0
Merge master into staging-next
2021-06-30 12:04:22 +00:00
Pascal Bach
69f2fd9721
Merge pull request #123834 from bachp/minio-module-update
...
nixos/minio: replace deprecated variables
2021-06-30 08:10:27 +02:00
github-actions[bot]
7f05df0a91
Merge master into staging-next
2021-06-30 06:04:18 +00:00
Ryan Mulligan
073f462987
nixos/gdm: expand gdm.autoSuspend description
...
closes #100390
2021-06-29 19:35:26 -07:00
Martin Weinelt
c865d03690
Merge pull request #128205 from felixsinger/flashrom/add-udev
...
flashrom: Install udev-rules file
2021-06-30 04:03:56 +02:00
Felix Singer
b7a2309786
flashrom: Install udev-rules file
...
Add the udev-rules file from flashrom source to the out directory. The
file contains rules for programmers used by flashrom. Members of the
`flashrom` system group are allowed to access these devices.
Also, add a module for installing flashrom and adding flashrom to udev
packages. The module can be used by setting `programs.flashrom.enable`
to `true`.
Signed-off-by: Felix Singer <felixsinger@posteo.net>
2021-06-30 03:43:35 +02:00
Sandro
2e3727eae0
Merge pull request #128183 from rummik/patch-1
2021-06-30 02:21:18 +02:00
github-actions[bot]
0fa08dae1b
Merge master into staging-next
2021-06-30 00:08:50 +00:00
Sandro
defb64fd5b
Merge pull request #128461 from kittywitch/fvwm-gestures-fix
...
nixos/fvwm: gestures -> enableGestures as of #118256
2021-06-30 02:07:12 +02:00
Sandro
3a0d1ab3e2
Merge pull request #128546 from scvalex/fix-kubernetes-tests
...
kubernetes: make tests pass by fixing a conntrack-tools dep and a missing dir
2021-06-30 01:49:58 +02:00
Timothy DeHerrera
7e59c19715
nixos-option: remove if nix.package
is unstable
...
This was done in a0a61c3e34
, but users
typically install `nixUnstable` via `nix.package`, not by overlaying
`pkgs.nix` directly.
2021-06-29 16:13:52 -07:00
github-actions[bot]
943ac1310d
Merge master into staging-next
2021-06-29 18:04:10 +00:00
Linus Heckemann
34d960aecb
Merge pull request #124486 from xaverdh/linux-patch-once
...
nixos/boot: properly override the kernel in boot.kernelPatches
2021-06-29 19:01:46 +02:00
github-actions[bot]
dcfd9788a1
Merge master into staging-next
2021-06-29 00:10:52 +00:00
Luke Granger-Brown
0dccbe2729
nixos/tests/kernel-generic: fix evaluation
...
This is breaking the tarball build, because #128502 depends on this test
existing. After this commit, nixpkgs.tarball once again evaluates.
2021-06-28 22:41:56 +00:00
Alexandru Scvortov
ab1567e812
kubernetes: fix conntrack-tools package name, missing dir, and tests
2021-06-28 20:33:17 +01:00
github-actions[bot]
3a3d290719
Merge master into staging-next
2021-06-28 18:12:01 +00:00
Maciej Krüger
3029af3051
Merge pull request #128522 from j0hax/patch-1
2021-06-28 18:18:31 +02:00
Johannes Arnold
3a30f52676
nixos/nginx: fix typo
2021-06-28 18:08:31 +02:00
Robert Schütz
a3d043387f
nixos/tests/home-assistant: don't test package
...
The modules overrides extraComponents which leads to a costly rebuild of
the home-assistant package with all tests. Make it less costly by not
running the tests, as does the default for the package option. The
package's tests are already run by ofborg on every pull request as well
as by Hydra when building home-assistant.
2021-06-28 14:34:18 +02:00
github-actions[bot]
e6001bb168
Merge master into staging-next
2021-06-28 12:05:19 +00:00
Elis Hirwing
536cb54f81
Merge pull request #127989 from ymatsiuk/appgate
...
appgate-sdp: minimize and improve derivation
2021-06-28 10:28:10 +02:00