Commit Graph

31519 Commits

Author SHA1 Message Date
github-actions[bot]
e91d2acb23
Merge master into staging-next 2023-01-26 00:02:34 +00:00
pennae
9ff987764c nixos/make-options-doc: enable smartquotes and replacements
the rest of the nixos manual has them enabled, so we should enable them
here too for consistency.

this changes rendered output pervasively. changes also include quotes in
types (eg in `strings concatenated with "\n"`), but since those are not
code this is probably fine. if not we can probably add a myst role to
inhibit replacements.
2023-01-26 00:38:06 +01:00
pennae
de22a26b4c nixos/make-options-doc: render option types through md
no changes to rendered output, but options.xml loses a few spaces.
2023-01-26 00:38:06 +01:00
pennae
6b677d9148 nixos/make-options-doc: disable inline html
we target not only html, but also manpages. inline html is not helpful
for the latter.
2023-01-26 00:38:06 +01:00
pennae
ba1f533134 nixos/make-option-docs: wrap md parser+renderer into Converter
the new rendering tool will consist of a number of different Converters,
each with a possibly specialized Renderer.
2023-01-26 00:38:06 +01:00
pennae
3e45994a3b nixos/make-options-doc: don't use inspect for optionsToDocbook
the rules are fixed, and we want to support all of them (or throw a
useful error message). this will also become the base for a generic
renderer system, so let's just list all the rules statically.
2023-01-26 00:38:06 +01:00
Robert Hensing
d255493e8f nixos/optionsToDocbook.py: Add docbook ns for when the appendix tag is omitted 2023-01-26 00:32:56 +01:00
pennae
617822c95b nixos/manual: remove olinkdb
as far as we can tell nixos has only ever had a total of one olink, and
currently has no olinks at all. we can't currently represent olinks in
markdown docs, and if we re-add support for cross-document links they
will take a different form (and not use docbook, which will have to be
phased out before we re-add anything).

the olinkdb is thus unused and takes 10 seconds on our machine to build,
holding up the rest of the manual for no benefit.
2023-01-26 00:32:56 +01:00
pennae
0175a91aa3 nixos/make-options-doc: split docbook conversion from mergeJSON
this restores mergeJSON to its former glory if…merging json, and
extracts the MD rendering into a new script that will run instead of the
py+nix+xslt pipeline we previously ran to convert options.json to docbook.

this change alone gives a noticable performance boost when building
docs (18s instead of 27s to build optionsDocBook).

no changes to rendered output, except for a single example in the
rsnapshot module that uses hard tabs for indentation instead of spaces.
this probably isn't important.

docbook warnings remain with mergeJSON since the other processing steps
output single files instead of directories. since we'll only keep the
check until 23.11 this is probably also not important to fix.

also contains a few improvements to error reporting in the MD renderers.
2023-01-26 00:32:56 +01:00
pennae
381dcd7f9d nixos/make-options-doc: remove program argument to xslt
this doesn't seem to be set anywhere, not from make-options-doc nor
anywhere else.
2023-01-26 00:32:56 +01:00
rnhmjoj
688d658a96
nixos/wireless: fix failure on missing config file
This change prevents doing the secret substitution when the config is
missing, which would result in an error.

The service can be useful even without configuration; for example
connman controls wpa_supplicant using dbus and as such it does not need
a config file nor any other declarative options.
2023-01-26 00:31:21 +01:00
github-actions[bot]
a1c257a1c6
Merge master into staging-next 2023-01-25 18:01:20 +00:00
Ryan Lahfa
8803f1da66
Merge pull request #178290 from andrew-hoff/ahh/qemu-interfaces
nixos/virtualisation: add option for explicitly named network interfaces
2023-01-25 17:32:53 +01:00
sternenseemann
4eafb91fbf Merge remote-tracking branch 'origin/master' into haskell-updates 2023-01-25 17:13:37 +01:00
Eduardo Quiros
730163b3ed
tut: 1.0.34 -> 2.0.0 2023-01-25 00:22:01 -06:00
github-actions[bot]
a2f216a003
Merge master into staging-next 2023-01-25 06:01:06 +00:00
Nick Cao
d469096dbd
nixos/fwupd: do no use renamed options in tests 2023-01-25 13:37:00 +08:00
Bobby Rong
776cc63480
Merge pull request #212210 from bobby285271/rm/gnome-documents
nixos/gnome-documents: remove
2023-01-25 11:04:08 +08:00
Nick Cao
e5c6f32b81
nixosTests.stratis.simple: enlarge disk size to avoid test hanging due
to out of space
2023-01-25 08:58:41 +08:00
github-actions[bot]
f22d2b21d8
Merge master into haskell-updates 2023-01-25 00:13:57 +00:00
github-actions[bot]
c47e4b69a3
Merge master into staging-next 2023-01-25 00:02:20 +00:00
Jörg Thalheim
9ccde6dcca
Merge pull request #212268 from Mic92/tpm-crb-riscv64
disable tpm-crb on riscv64
2023-01-24 22:05:45 +00:00
Yurii Izorkin
e673e90753
nixos/no-x-libs: add qtbase (#212460)
Previously, `services.murmur.enable` would not work with `environment.noXlibs = true;`.
2023-01-24 23:31:59 +02:00
Luflosi
78f357f134
nixos/kubo: make the configuration options idempotent
Without this commit, unsetting any of the `services.kubo.settings` options does not reset the value back to the default. This commit gets rid of this statefulness.
This is achieved by generating the default config, applying the user specified config options to it and then patching the `Identity` and `Pinning` config options from the old config back in. This new config is then applied using `ipfs config replace`.
The only remaining stateful parts of the config are the `Identity` and `Pinning.RemoteServices` settings as those can't be changed with `ipfs config replace`. `Pinning.RemoteServices` also contains secrets that shouldn't be in the Nix store. Setting these options wasn't possible before as it would result in an error when the daemon tried to start. I added some assertions to guard against this case.
2023-01-24 16:33:03 +01:00
K900
a68cd68b45 nixos/fwupd: adjust for config parameter migration 2023-01-24 18:08:09 +03:00
Vladimír Čunát
411405c9f6
Merge branch 'master' into staging-next
Trivial conflict in release notes, except that the xml/docbook parts
are horrible for (semi-)automatic conflict resolution.
Fortunately that's generated anyway.
2023-01-24 12:22:38 +01:00
Sandro
17631ae82d
Merge pull request #208712 from mattmelling/cloudlog
cloudlog: init at 2.3
2023-01-24 02:52:36 +01:00
Sandro
ad2c56acb3
Merge pull request #212133 from mdarocha/remove-dotnet-5
dotnet-sdk_5: remove package
2023-01-24 02:51:10 +01:00
github-actions[bot]
a67028b842
Merge master into haskell-updates 2023-01-24 00:13:06 +00:00
github-actions[bot]
727e365f02
Merge master into staging-next 2023-01-24 00:02:11 +00:00
Sandro
deeba2fb9e
Merge pull request #206257 from matklad/throttledup 2023-01-23 23:54:18 +01:00
Matt Melling
c281dd3e05
nixos/cloudlog: init 2023-01-23 22:41:07 +00:00
Sandro
d105aed7f5
Merge pull request #210435 from Stunkymonkey/activemq-broker-phases 2023-01-23 23:37:51 +01:00
Sandro
e3d6edd75f
Merge pull request #209045 from Izorkin/update-dhcpcd-ipv6rs 2023-01-23 23:25:03 +01:00
Sandro
9cf61a285c
Merge pull request #206746 from georgyo/mastodon-secretenv 2023-01-23 23:07:57 +01:00
mdarocha
5234f4ce93 dotnet-sdk_5: remove package
It's EOL and not used in nixpkgs anymore
2023-01-23 19:16:58 +01:00
Bernardo Meurer
271dbd928e
nixos/blocky: restart on failure 2023-01-23 11:45:56 -05:00
Jörg Thalheim
86d5b67260 disable tpm-crb on riscv64 2023-01-23 15:00:41 +01:00
github-actions[bot]
eadaaa7d20
Merge master into staging-next 2023-01-23 12:01:24 +00:00
Maximilian Bosch
48665a4150
linux_6_0: drop
EOLed by upstream, doesn't receive any patches anymore, so let's drop
it.

Currently depends on #211886 which bumps the latest compatible ZFS
version to 6.1.

Also, clean up some old aliases.
2023-01-23 10:59:20 +01:00
Nick Cao
3cd694d1bd
Merge pull request #210382 from B4dM4n/nixos-rebuild-local
nixos-rebuild: Allow local builds when --target-host is used again
2023-01-23 16:37:41 +08:00
Nick Cao
a7a0d03ecc
Merge pull request #211229 from Luflosi/fix-modprobeConfig-typo
nixos/modprobe: fix typo in boot.modprobeConfig.enable documentation
2023-01-23 16:02:09 +08:00
Nick Cao
b9576dd927
Merge pull request #211723 from tpwrules/fix-systemd-boot-more
nixos/systemd-boot: fix tests and upgrade issues
2023-01-23 15:55:57 +08:00
github-actions[bot]
d8bfd0a059
Merge master into staging-next 2023-01-23 06:01:12 +00:00
Bobby Rong
00a6553266
nixos/gnome-documents: remove
We disabled this in gnome module starting from dcbad82
and the package was removed e84c8d6.
2023-01-23 11:59:57 +08:00
Bobby Rong
9d801f40e6
Merge pull request #211953 from bobby285271/upd/nixosTests.pantheon
nixosTests.pantheon: ensure switchboard starts + various changes
2023-01-23 10:05:46 +08:00
github-actions[bot]
6042b633db
Merge master into haskell-updates 2023-01-23 00:13:05 +00:00
github-actions[bot]
44319c878e
Merge master into staging-next 2023-01-23 00:02:15 +00:00
Julien Malka
808663bd02
nixos/uptime-kuma: add ping in path (#212001)
Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
2023-01-22 23:03:45 +01:00
Riey
0db47bd50e kime: 2.5.6 -> 3.0.2 2023-01-22 19:57:34 +01:00
Jörg Thalheim
c0dc2ef1ff nixos/rtorrent: make directory permissions configurable 2023-01-22 19:43:39 +01:00
Maximilian Bosch
ad6cd4173f
Merge pull request #211894 from chvp/grafana-image-renderer-use-module
nixos/grafana-image-renderer: use grafana freeform settings in provisioning
2023-01-22 19:06:35 +01:00
github-actions[bot]
feb2240b37
Merge master into staging-next 2023-01-22 18:01:03 +00:00
Andrew Hoff
6ae3e7695e nixos/virtualisation: add option for explicitly named network interfaces
Adds a new option to the virtualisation modules that enables specifying
explicitly named network interfaces in QEMU VMs. The existing
`virtualisation.vlans` is still supported for cases where the name of
the network interface is irrelevant.
2023-01-22 12:20:40 -05:00
Ryan Lahfa
04bf8215a9
Merge pull request #209075 from symphorien/nginx-validate-config-revert
nixos/nginx: revert config validation
2023-01-22 17:57:46 +01:00
pennae
e2019c49d4 nixos/make-options-doc: use markdown-it-py for rendering
only whitespace changes (mostly empty descriptions rendered as literal
line breaks and trailing space toPretty generates, but that were dropped
by mistune).
2023-01-22 17:50:09 +01:00
pennae
248e1b957d nixos/make-options-doc: render related packages with md
don't generate docbook for related packages, generate markdown instead.
this could be extended further to not even generate markdown but have
mergeJSON handle all of the rendering. markdown will work fine for now
though.
2023-01-22 17:50:09 +01:00
pennae
fa8a594c56 nixos/make-options-doc: deprecate \n\n parbreak
only whitespace changes to rendered outputs, all in the vicinity or body
of admonitions. previously admonitions would not receive paragraph
breaks even when they should have because the description postprocessing
did not match on their contents.
2023-01-22 17:50:09 +01:00
pennae
c93e5dde67 nixos/make-options-doc: rearrange paras in related packages/defaults/examples
this mirrors what we will be able to create with markdown. no change to
rendered outputs.
2023-01-22 17:50:09 +01:00
pennae
3a5f1ae029 nixos/make-options-doc: render default/example contents through MD
removes some trailing whitespaces from the html output, no other changes.
2023-01-22 17:50:09 +01:00
pennae
2bd8129a47 nixos/make-options-doc: make whitespace more md-compatible
markdown-it-py creates different whitespace leaders/trailers than are
currently emitted, and when we convert examples and defaults to render
via markdown the spacing will change too. this has no effect on rendered
output.
2023-01-22 17:50:09 +01:00
pennae
d1aa187c0e nixos/make-options-doc: don't escape link urls twice
mistune already does escaping. it does escaping for html, but the
difference is small enough that can just ignore that we're actually
targeting docbook here.
2023-01-22 17:50:09 +01:00
pennae
2cb43da587 nixos/make-options-doc: remove trailing whitespace from strings
this was done only to make the conversion to MD easier to verify. we no
longer need it, and not keeping whitespace does not affect rendered outputs.

stripping will have to stay for now because description postprocessing
would add empty paragraphs otherwise.
2023-01-22 17:50:09 +01:00
pennae
e067d9e33e nixos/redsocks: fix option description formatting 2023-01-22 17:50:09 +01:00
pennae
cf792cfde3 nixos/envfs: fix envfs package option default
mdDoc is not valid here, but isn't currently rejected for xslt reasons.
2023-01-22 17:50:09 +01:00
Julien Malka
85c34d334b nixos/uptime-kuma: add julienmalka as maintainer 2023-01-22 17:39:22 +01:00
Xavier Lambein
3f3524a447 nixos/autosuspend: init at version 4.3.0
`autosuspend` is a daemon that periodically runs user-defined checks to
verify whether the system should be suspended.  It's already available
in nixpkgs.  This adds a NixOS module which starts the daemon as a
systemd service.

Co-authored-by: pennae <82953136+pennae@users.noreply.github.com>
2023-01-22 17:25:01 +01:00
pennae
ad8d5cf731 nixos/manual: clarify mk{Enable,Package}Option MD usage
the examples were incorrect, but not catastrophically. running a docs
build would've issued a warning with the correct instructions.
2023-01-22 17:08:40 +01:00
pennae
df09c21fb2 nixos/documentation: deprecate docbook option docs
following the plan in https://github.com/NixOS/nixpkgs/pull/189318#discussion_r961764451

also adds an activation script to print the warning during activation
instead of during build, otherwise folks using the new CLI that hides
build logs by default might never see the warning.
2023-01-22 17:08:40 +01:00
Bobby Rong
30d5a2216f
nixosTests.pantheon: nodes.machine.config -> nodes.machine
Silence a warning:
warning: Module argument `nodes.machine.config` is deprecated. Use `nodes.machine` instead.
2023-01-22 20:45:30 +08:00
Bobby Rong
009cdb01c7
nixosTests.pantheon: ensure switchboard starts
I noticed this is something that can be easily broken during libsoup3 migration.
2023-01-22 20:45:30 +08:00
Bobby Rong
5461c2c4b7
nixosTests.pantheon: remove a TODO
Pantheon is moving away from Bamf.
2023-01-22 20:45:29 +08:00
Nick Cao
c128da46bf
Merge pull request #211640 from Izorkin/update-iso-channel
nixos/installer/cd-dvd: removing duplicate nixpkgs
2023-01-22 16:31:54 +08:00
Nick Cao
831ce5cb71
Merge pull request #211830 from sorpaas/patch-11
nixos/systemd-confinement: remove unused rootName
2023-01-22 16:25:44 +08:00
Nick Cao
99f9998309
Merge pull request #204386 from robryk/resticassert
nixos/restic: small enhancements
2023-01-22 16:23:04 +08:00
sternenseemann
79d5c004d9 Merge remote-tracking branch 'origin/master' into haskell-updates 2023-01-22 02:27:05 +01:00
Nick Cao
c2de985844
Merge pull request #211559 from GTrunSec/nomad-credential
nixos/nomad: add LoadCredential option
2023-01-22 08:27:44 +08:00
github-actions[bot]
4b19a2dca3
Merge master into haskell-updates 2023-01-22 00:14:05 +00:00
zowoq
e75ac30903 Revert "nixos/nix-fallback-paths: 2.12.0 -> 2.13.1"
This reverts commit 37a44ff3a0.
2023-01-22 09:48:21 +10:00
Naïm Favier
8bf63a5ed4
Merge pull request #211992 from ncfavier/remove-stray-spaces 2023-01-21 21:51:52 +01:00
Naïm Favier
3aa1337a71
nixos: remove stray spaces 2023-01-21 21:46:53 +01:00
Evils
e6fe2eb0ed nixos/tuptime: 5.2.2 renamed option -x to -q 2023-01-21 21:01:26 +01:00
Naïm Favier
363158603a nixos: fix backticks in Markdown descriptions 2023-01-21 18:08:38 +01:00
guangtao
6c46078aad nixos/nomad: add LoadCredential option 2023-01-21 06:09:22 -08:00
Guillaume Girol
33afbf39f6 treewide: switch to nativeCheckInputs
checkInputs used to be added to nativeBuildInputs. Now we have
nativeCheckInputs to do that instead. Doing this treewide change allows
to keep hashes identical to before the introduction of
nativeCheckInputs.
2023-01-21 12:00:00 +00:00
Guillaume Girol
d26caea94b doc: adapt to nativeCheckInputs 2023-01-21 16:42:10 +01:00
Jan Tojnar
5c87c72c1f nixos/init-script: fix eval
error: attribute 'nixos' missing

This was missed in d3528cdc3d
2023-01-21 13:26:47 +01:00
Guillaume Girol
90c78aee6c Merge branch 'nativeCheckInputs' into staging-nativeCheckInputs 2023-01-21 12:00:00 +00:00
Charlotte Van Petegem
f8a3c4e94f
nixos/grafana-image-renderer: use grafana freeform settings in provisioning 2023-01-21 10:16:41 +01:00
Aaron Andersen
ad161ee67c
Merge pull request #206099 from sweenu/add-goeland-module
nixos/goeland: init
2023-01-20 23:06:12 -05:00
github-actions[bot]
4684c03fe1
Merge master into haskell-updates 2023-01-21 00:12:47 +00:00
Martin Weinelt
890226f9ba
Merge pull request #210705 from dermetfan/ceph-dashboard
ceph: add missing python library
2023-01-21 00:03:58 +00:00
Robin Stumm
093e3eb20d ceph: enable dashboard in nixos test 2023-01-20 23:59:26 +01:00
Wei Tang
ec8d74d58a
nixos/systemd-confinement: remove unused rootName 2023-01-20 22:39:16 +01:00
zowoq
37a44ff3a0 nixos/nix-fallback-paths: 2.12.0 -> 2.13.1 2023-01-21 06:44:18 +10:00
Guillaume Girol
cb73862665 Revert "nixos/nginx: validate syntax of config file at build time"
This reverts commit a768871934.

This is too fragile, it breaks at least on:
* ssl dh params
* hostnames in proxypass and upstreams are resolved in the sandbox
2023-01-20 20:10:19 +01:00
Guillaume Girol
aa4780077a Revert "nixos: add release notes for nginx config validation"
This reverts commit 26a411b2cb.
2023-01-20 20:09:15 +01:00
Guillaume Girol
ecb06398e7 Revert "nixos/nginx: disable configuration validation for now"
This reverts commit 7ef58bce9d.
2023-01-20 20:07:47 +01:00
Michele Guerini Rocco
10222e1e37
Merge pull request #211295 from rnhmjoj/pr-nixos-install
nixos-install: remove root requirement for bind mount
2023-01-20 18:34:38 +01:00
Bruno Inec
dbbb062d47
Apply suggestion
Co-authored-by: Aaron Andersen <aaron@fosslib.net>
2023-01-20 14:39:35 +01:00
Luflosi
2dfc86b838
nixos/modprobe: fix typo in boot.modprobeConfig.enable documentation
This typo was introduced in f4d8e64bed.
Also remove the dot at the end of the sentence since otherwise there would be two dots in the documentation.
2023-01-20 13:58:15 +01:00
Sandro
d12f8d563b
Merge pull request #208804 from justinas/teleport-11 2023-01-20 13:54:49 +01:00
Sandro
fe34a633e8
Merge pull request #204287 from Artturin/addmorenox 2023-01-20 13:37:52 +01:00
Thomas Watson
8f2babd032 nixos/systemd-boot: pass EFI variable flags during update too
On some systems, EFI variables are not supported or otherwise wonky.
bootctl attempting to access them causes failures during bootloader
installations and updates. For such systems, NixOS provides the options
`boot.loader.efi.canTouchEfiVariables` and
`boot.loader.systemd-boot.graceful` which pass flags to bootctl that
change whether and how EFI variables are accessed.

Previously, these flags were only passed to bootctl during an install
operation. However, they also apply during an update operation, which
can cause the same sorts of errors. This change passes the flags during
update operations as well to prevent those errors.

Fixes https://github.com/NixOS/nixpkgs/issues/151336
2023-01-19 23:52:57 -06:00
Thomas Watson
ddc5d34f61 nixos/tests/systemd-boot: only patch systemd-boot during update test
The update test patches the systemd-boot binary to report a known
version then tests that this is the version updated from. The previous
patch would also search the kernel and initrd binaries, which would
cause sed to write out a temporary file that might cause the disk
to run out of space and the test to fail.

Only attempt to patch binaries which contain systemd-boot (usually
`BOOT<arch>.EFI` and `systemd-boot<arch>.efi` to avoid this problem.
As a bonus, this reduces test time by 20-30%.
2023-01-19 23:52:35 -06:00
Thomas Watson
8736edfd95 nixos/qemu-vm: fix useBootLoader builds on aarch64-linux
The aarch64-linux kernel and initrd recently eclipsed 60M, causing the
boot disk image build to run out of space and fail. Double the size of
the image to 120M to fix the issue.

The disk image is stored in expandable qcow2 format, so only the space
actually used by files in the image is consumed. Therefore, other
architectures are not unfairly penalized, and the output size does not
suddenly double.

This also fixes NixOS tests which use this option, like systemd-boot's.
2023-01-19 23:28:01 -06:00
Thomas Watson
d12040e858 nixos/tests/systemd-boot: fix update test
At some point many months ago, the systemd-boot update script stopped
outputting parentheses around the version being upgraded from, causing
the test to fail. Remove the parentheses from the expected message to
fix the test.
2023-01-19 22:45:41 -06:00
Nick Cao
cd5c34bb18
Merge pull request #188795 from Sohalt/oci-containers-wait-for-network
nixos/oci-containers: wait for network before starting container
2023-01-20 09:11:19 +08:00
github-actions[bot]
c292bbcf0b
Merge master into haskell-updates 2023-01-20 00:13:21 +00:00
Artturi
257f9de9b6
Merge pull request #211574 from Artturin/remacreintol
treewide: remove accidentally introduced -l
2023-01-20 01:52:14 +02:00
Artturin
9a34bb217e
nixos/no-x-libs: add more replacements
all-packages: change -nox overrides to callPackage's so there is no
infinite recursion when replacing the package with a overlay
2023-01-20 00:45:37 +01:00
Bruno Inec
edb6b10966
add warning if not using password_file 2023-01-20 00:39:34 +01:00
Bruno Inec
5edf9bd76f
Apply suggestion
Co-authored-by: Aaron Andersen <aaron@fosslib.net>
2023-01-20 00:39:34 +01:00
Bruno Inec
15414ff8e1
databaseDirectory -> StateDir and changed description 2023-01-20 00:39:33 +01:00
Bruno Inec
8f10857af4
let systemd handle /var/lib/goeland creation 2023-01-20 00:39:32 +01:00
Bruno Inec
988feead01
nixos/goeland: init 2023-01-20 00:39:31 +01:00
Izorkin
058951e85d
nixos/installer/cd-dvd: removing duplicate nixpkgs 2023-01-19 22:52:45 +03:00
rnhmjoj
b139c467e9
Revert "Revert "nixos/tests/installer: test relative paths in initrd secrets""
This reverts commit 8d45d82c71.

The tests shold pass now that systemd-boot handles failures in initrd
for older boot entries.
2023-01-19 20:50:59 +01:00
rnhmjoj
4ed9893770
nixos/systemd-boot: improve initrd-secrets error messages
This is the equivalent of eccc1e5b but for systemd-boot
2023-01-19 20:50:17 +01:00
rnhmjoj
2bc5625877
nixos-install: remove root requirement for bind mount
This moves the creation of the bind mount inside the `nixos-enter`
invocation. The command are executed in an unshared mount namespace, so
they can be run as an unprivileged user.
2023-01-19 20:50:17 +01:00
Alyssa Ross
1fc2a79ee1 makeSetupHook: make "name" argument mandatory
It's very frustrating to try to read through a derivation graph full
of derivations that are all just called "hook", so let's try to avoid
that.
2023-01-19 15:00:36 +00:00
Artturi
f837537cdd
Merge pull request #207034 from ShamrockLee/root-layout 2023-01-19 15:51:39 +02:00
Artturin
e59b23d062 treewide: remove accidentally introduced -l
they were all removed in
c2b898da76
but these changes were made before that and merged after it
2023-01-19 15:07:45 +02:00
Vladimír Čunát
8d45d82c71
Revert "nixos/tests/installer: test relative paths in initrd secrets"
This reverts commit 9bb888c9f8 from PR #210812.
We first need to fix nixosTests.installer.simpleUefiSystemdBoot
2023-01-19 10:25:22 +01:00
guangtao
b5a3f795c3 nixos/nomad: fix multi-plugin-dir path 2023-01-18 22:22:43 -08:00
github-actions[bot]
d5af6be128
Merge master into haskell-updates 2023-01-19 00:13:19 +00:00
Naïm Favier
556a4a7951 nixos/installation-cd-minimal: include HTML doc
Although we don't really need HTML documentation in the minimal installer,
not including it may cause annoying cache misses in the case of the NixOS manual.
2023-01-19 00:30:33 +01:00
sternenseemann
252ace8166 Merge remote-tracking branch 'origin/master' into haskell-updates 2023-01-18 21:18:03 +01:00
Vladimír Čunát
2b988c76fd
Revert "nixosTests.installer: bump memorySize"
This reverts commit 309ed272be.
The bump caused nixosTests.installer.luksroot hang, e.g. see
https://hydra.nixos.org/build/205951019
(I don't know why.)

The OOM issues were avoided by 6dccdc4585 (newer but merged earlier)
2023-01-18 11:45:48 +01:00
Pascal Bach
e229ca64d0
Merge pull request #211005 from AtaraxiaSjel/nixos/gitea-zstd
nixos/gitea: add tar.zst to the dump type
2023-01-18 09:22:38 +01:00
github-actions[bot]
a7de82a797
Merge master into haskell-updates 2023-01-18 00:13:10 +00:00
Ryan Lahfa
eb6d457115
Merge pull request #209246 from e1mo/dokuwiki/package-overriding
dokuwiki: Combine mechanism for plugins and templates
2023-01-18 00:51:18 +01:00
K900
860f1b67da
Merge pull request #198287 from K900/kpackage-fix
nixos/plasma5: make kpackage able to resolve dependencies
2023-01-17 21:46:42 +03:00
Jonas Heinrich
e8731b8778
Merge pull request #210701 from onny/wordpress-settings
nixos/wordpress: add settings option
2023-01-17 19:38:17 +01:00
Martin Weinelt
5770984a95
Merge pull request #211252 from schnusch/systemd-user-tmpfiles-rules
nixos: systemd: systemd.user.tmpfiles.users add default
2023-01-17 17:41:41 +00:00
schnusch
f0f2c6bec9 nixos: systemd: systemd.user.tmpfiles.users add default 2023-01-17 16:53:45 +01:00
Florian Klink
24b4189619
Merge pull request #207468 from schnusch/systemd-user-tmpfiles-rules
nixos: systemd: add systemd.user.tmpfiles.rules, systemd.user.tmpfiles.users.<name>.rules
2023-01-17 14:39:44 +01:00
schnusch
34ad8447c3 nixos: systemd: add systemd.user.tmpfiles 2023-01-17 12:19:40 +01:00
Naïm Favier
cd4f1a1df5
nixos-install: only mount if root 2023-01-17 11:39:34 +01:00
Maximilian Bosch
91054ce6ce
Merge pull request #207748 from blargg/wiki-js
nixos/wiki-js: Add git and openssh to the wiki-js service path to enable git backups.
2023-01-17 08:35:58 +01:00
Nick Cao
2b3c8ae88a
Merge pull request #209767 from 0x4A6F/master-coturn-tests
test/coturn: add some sanity-checks
2023-01-17 10:34:51 +08:00
Nick Cao
8f34f01185
Merge pull request #194343 from oxalica/fix/swap-btrfs
nixos/swap: fix creation on BTRFS and refactor assertions
2023-01-17 08:35:15 +08:00
Sandro
8986570cb3
Merge pull request #208956 from SuperSandro2000/profile-base-tcpdump 2023-01-17 01:20:31 +01:00
github-actions[bot]
a311aaac39
Merge master into haskell-updates 2023-01-17 00:13:12 +00:00
Tom Jankauski
eef1f70919 nixos/wiki-js: Add git and openssh to enable git backups. 2023-01-16 16:04:40 -08:00
Michele Guerini Rocco
594b94b4c3
Merge pull request #210812 from rnhmjoj/pr-initrd-secrets
boot.initrd.secrets fixes
2023-01-17 00:48:58 +01:00
oxalica
eecb6c2bd8 nixos/tests/swap-file-btrfs: init 2023-01-17 06:56:55 +08:00
oxalica
87a0c9490d nixos/swap: fix creation on BTRFS and refactor assertions 2023-01-17 06:47:21 +08:00
Jeff Huffman
96ec8c7623 nixos/documentation.man.mandb: Add skipPackages option, and include nixos-version
prevents unnecessary recreation of man caches

Fixes #209835
2023-01-16 22:24:02 +01:00
github-actions[bot]
5a50475572
Merge staging-next into staging 2023-01-16 18:01:50 +00:00