Commit Graph

31389 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
K900
a68cd68b45 nixos/fwupd: adjust for config parameter migration 2023-01-24 18:08:09 +03: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
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
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
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
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
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
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