3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

31493 commits

Author SHA1 Message Date
Jonas Heinrich ebf6fc346e
Merge pull request #212912 from urandom2/nextcloud
nextcloud26: init at 26.0.0beta1
2023-01-28 10:58:54 +01:00
Vladimír Čunát 08d26bbb72
nixos/tests/networking.nix: hotfix evaluation
It broke by merge 8803f1da6.
2023-01-28 09:34:11 +01:00
Martin Weinelt 52029b8e00 Merge remote-tracking branch 'origin/master' into staging-next 2023-01-27 23:50:36 +01:00
pennae 0a6e6cf7e6 nixos/manual: render module chapters with nixos-render-docs
this converts meta.doc into an md pointer, not an xml pointer. since we
no longer need xml for manual chapters we can also remove support for
manual chapters from md-to-db.sh

since pandoc converts smart quotes to docbook quote elements and our
nixos-render-docs does not we lose this distinction in the rendered
output. that's probably not that bad, our stylesheet didn't make use of
this anyway (and pre-23.05 versions of the chapters didn't use quote
elements either).

also updates the nixpkgs manual to clarify that option docs support all
extensions (although it doesn't support headings at all, so heading
anchors don't work by extension).
2023-01-27 20:07:34 +01:00
pennae e8c5618b67 nixos-render-docs: add some better CLI infrastructure
using environment variables isn't great once multiple input or output
formats get involved (which will happen soon). now is a good time to set
a pattern for future converters.
2023-01-27 20:07:34 +01:00
pennae be6a25368f nixos-render-docs: init from optionsToDocbook.py
this new package shall eventually contain the rendering code necessary
to produce the entirety of the nixos (not nixpkgs) manual, in all of its
various output formats.
2023-01-27 20:07:33 +01:00
github-actions[bot] 8291dfb1b4
Merge master into staging-next 2023-01-27 18:01:31 +00:00
ckie 1859e56a7f
nixos/no-x-libs: don't mask self/super in nested override
From SuperSandro2000's post-merge review of the PR adding this,
nixos/no-x-libs: add qtbase. Sandro added a comment about this after I had
already merged it; self'/super' previously masked the top level self/super.
2023-01-27 19:24:59 +02:00
Jonas Heinrich 748c2b416c
nixos/wordpress: fix minor syntax error 2023-01-27 16:35:46 +01:00
Colin Arnott aefbc9623b
nextcloud26: init at 26.0.0beta1
Because nextcloud ships their prerelease versions on a different url, we
are not parsing the version string to detect which path to use. We also
enabled and validated this change via nixos module testing.
2023-01-27 15:28:41 +00:00
Colin Arnott 66e0e5ad74
nixos/wordpress: plugins and themes as attrs
In an effort to better encode version strings and use descriptive pnames
that do not conflict with top level pkgs, we currently use
wordpress-${type}-${pname} for pname. This is good for the nix store,
but when we synthesize the wordpress derivation in our module, we reuse
this pname for the output directory.

Internally wordpress can handle this fine, since plugins must register
via php, not directory. Unfortunately, many plugins like civicrm and
wpforms-lite are designed to rely upon the name of their install
directory for homing or discovery.

As such, we should follow both the upstream convention and
services.nextcloud.extraApps and use an attribute set for these options.
This allows us to not have to deal with the implementation details of
plugins and themes, which differ from official and third party, but also
give users the option to override the install location. The only issue
is that it breaks the current api.
2023-01-27 15:24:19 +00:00
Jörg Thalheim e80e3878b3
Merge pull request #178533 from Mic92/nixos-tests-shell
nixos/tests: extend shell_interact to accept alternative socat addresses
2023-01-27 12:24:08 +00:00
Jörg Thalheim 29db54c373 nixos/tests: extend shell_interact to accept alternative socat addresses
`shell_interact()` is currently not nice to use.  If you try to cancel
the socat process, it will also break the nixos test. Furthermore
ptpython creates it's own terminal that subprocesses are running in,
which breaks some of the terminal features of socat.
Hence this commit extends `shell_interact` to allow also to connect to
arbitrary servers i.e. tcp servers started by socat.
2023-01-27 13:09:25 +01:00
Vladimír Čunát 8a77ed60ac
Merge branch 'master' into staging-next 2023-01-27 09:36:55 +01:00
Jan Tojnar 42930c79dd nixos/fwupd: Upgrade ESP path config key
This setting was renamed and moved to the main config file in fwupd 1.8.5:
5d38e0aeea

Without this patch, fwupd tries to migrate the config and crashes when it meets the immutable:

    FuEngine             migrating OverrideESPMountPoint=/boot to EspLocation
    Failed to load daemon: failed to load engine: Failed to create file ?/etc/fwupd/daemon.conf.6HZBZ1?: Read-only file system

The setting was first introduced to the module in 08547ff642 to override the store paths set during build.5d38e0aeea
2023-01-27 00:54:17 +01:00
github-actions[bot] 578f1ba854
Merge master into staging-next 2023-01-26 18:01:29 +00:00
sternenseemann 4671a0d96b Merge remote-tracking branch 'origin/master' into haskell-updates 2023-01-26 16:18:50 +01:00
K900 c2182db406
Merge pull request #212440 from K900/fwupd-fix
nixos/fwupd: fix config parameter name
2023-01-26 17:27:10 +03:00
Nick Cao 124c0f3d27
Merge pull request #210477 from wineee/deepin-lib
deepin(library): init at 20.8
2023-01-26 21:56:17 +08:00
zowoq b93752ceb0 nixos/nix-fallback-paths: 2.12.0 -> 2.13.2 2023-01-26 22:54:25 +10:00
github-actions[bot] d7e7d75f99
Merge master into staging-next 2023-01-26 06:01:24 +00:00
Nick Cao 124946330f
Merge pull request #212541 from equirosa/tut-2.0.0
tut: 1.0.34 -> 2.0.0
2023-01-26 13:58:42 +08:00
Nick Cao 39b5d060cb
Merge pull request #212512 from NickCao/stratis
stratisd: 3.4.4 -> 3.5.0
2023-01-26 13:49:08 +08:00
github-actions[bot] 0f008a08f0
Merge master into haskell-updates 2023-01-26 00:13:32 +00:00
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