Commit Graph

24069 Commits

Author SHA1 Message Date
github-actions[bot]
4712ed9439
Merge master into staging-next 2023-01-14 00:02:26 +00:00
Robert Hensing
e973da60cd
Merge pull request #200225 from pacien/nixos-qemu-vm-restrictnetwork
nixos/qemu-vm: add option "restrictNetwork"
2023-01-13 21:47:21 +01:00
github-actions[bot]
49722fd14a
Merge master into staging-next 2023-01-13 18:01:34 +00:00
pennae
d6e464b4c5
Merge pull request #208983 from pennae/nixos-manual-md
nixos/manual: convert module chapters to markdown
2023-01-13 13:29:01 +01:00
Peder Bergebakken Sundt
5c7fa218c1 nixos/flexget: add package option 2023-01-13 13:08:05 +01:00
github-actions[bot]
85724d692e
Merge master into staging-next 2023-01-13 12:01:30 +00:00
Robin Gloster
96edaa02de
Merge pull request #210511 from mayflower/gitaly-runtime-dir
nixos/gitlab: set gitaly runtime dir
2023-01-13 12:33:37 +01:00
Franz Pletz
b88913fb11
nixos/gitlab: set gitaly runtime dir
If `runtime_dir` is not set, gitaly will use `/tmp` as a place for sockets
and packed binaries like `git2go`. If the gitlab instance does not experience
much traffic and gitlay is not restarted regularly, systemd-tmpfiles will
remove the binaries. This breaks some gitlab functionality until gitaly is
restarted manually.
2023-01-13 11:26:52 +01:00
Janne Heß
ea98d03597
Merge pull request #209755 from ivanbrennan/fix-neovim-runtime
nixos.programs.neovim: fix runtime
2023-01-13 09:43:07 +01:00
Martin Weinelt
5342b695b1 Merge remote-tracking branch 'origin/master' into staging-next 2023-01-12 23:07:01 +01:00
Naïm Favier
7e1cf49870
Merge pull request #161237 from miallo/nixos-version-configuration-revision 2023-01-12 12:31:54 +01:00
Martin Weinelt
2895576165 Merge remote-tracking branch 'origin/master' into staging-next 2023-01-11 15:37:38 +01:00
K900
b2a819f15f nixos/kernel: fix docs typo 2023-01-11 10:18:28 +03:00
Martin Weinelt
c1e6c6af69 Merge remote-tracking branch 'origin/master' into staging-next 2023-01-11 03:51:33 +01:00
Sandro
32eceb420a
Merge pull request #209927 from thanegill/patch-4 2023-01-11 02:47:07 +01:00
Thane Gill
f851fbc19f
changedetection-io: remove podman.defaultNetwork.dnsname.enable 2023-01-11 00:32:59 +01:00
Robert Obryk
9dbdb05924 nixos/restic: add exclude parameter
This provides an easy way to specify exclude patterns in config. It was
already possible via extraBackupOptions; this change creates a simpler,
similar to other backup services, way to specify them.
2023-01-11 00:06:13 +01:00
Robert Obryk
751b9063a7 nixos/restic: assert that repository name is specified 2023-01-11 00:06:08 +01:00
K900
cd1c574ebe nixos/kernel: better docs for boot.kernelPatches 2023-01-10 23:13:46 +03:00
Åsmund Østvold
ca0175017d
waagent: update to 2.8.0.11 (#206974)
The agent has not been updated for a very long time.  In addition to
updating to the newest tagged version the change creates a package for
it.

The existing version has issues with the new python2.7 package not
containing crypt.so file. And the commit
6910a4eea0 I believe introduced
regression that caused the shebang to not be updated.
2023-01-10 20:58:20 +01:00
Artturi
a08b0ed485
Merge pull request #169694 from fortuneteller2k/stevenblock-module 2023-01-10 19:26:24 +02:00
linsui
a2e21c76c7 rename config.qt5 -> config.qt 2023-01-10 20:50:15 +08:00
linsui
16f0d689de Add gnome theme for qt6 2023-01-10 20:48:45 +08:00
pennae
53fc887582 nixos/manual: move "edit the MD file" comments to generated XML 2023-01-10 12:34:37 +01:00
pennae
b15f4d0f97 nixos/akkoma: auto-generate module chapter from MD 2023-01-10 10:47:14 +01:00
pennae
bf92eaebe4 nixos/manual: generate module chapters with md-to-db.sh 2023-01-10 10:32:00 +01:00
pennae
dc7788efb8 nixos/manual: regenerate chapter xml files
apparently pandoc has changed behavior over the past releases, so the
files are no longer in sync. occasionally this requires edits
to the markdown source to not remove an anchor that was there
before (albeit wth a very questionable id), or where things were simply
being misrendered due to syntax errors.
2023-01-10 10:31:59 +01:00
pennae
23ea73b416 nixos/manual: enable smart quotes for all MD chapters 2023-01-10 10:31:59 +01:00
pennae
03c72f224c nixos/pantheon: convert manual chapter to MD 2023-01-10 10:31:59 +01:00
pennae
da6641a57a nixos/gnome: convert manual chapter to MD 2023-01-10 10:31:59 +01:00
pennae
8a86d1f759 nixos/garage: convert manual chapter to MD 2023-01-10 10:31:59 +01:00
pennae
1bb00a9c12 nixos/plausible: convert manual chapter to MD 2023-01-10 10:31:58 +01:00
pennae
42ea3f2699 nixos/nextcloud: convert manual chapter to MD 2023-01-10 10:31:58 +01:00
pennae
66fdc39d80 nixos/matomo: convert manual chapter to MD 2023-01-10 10:31:58 +01:00
pennae
760eaa3c94 nixos/keycloak: convert manual chapter to MD 2023-01-10 10:31:58 +01:00
pennae
b5990a47e0 nixos/jitsi-meet: convert manual chapter to MD 2023-01-10 10:31:58 +01:00
pennae
1be48def96 nixos/grocy: convert manual chapter to MD 2023-01-10 10:31:58 +01:00
pennae
7318430f92 nixos/discourse: convert manual chapter to MD 2023-01-10 10:31:57 +01:00
pennae
e4897cdf16 nixos/yggdrasil: convert manual chapter to MD 2023-01-10 10:31:57 +01:00
pennae
963c6f54aa nixos/prosody: convert manual chapter to MD 2023-01-10 10:31:57 +01:00
pennae
5917123885 nixos/pleroma: convert manual chapter to MD 2023-01-10 10:31:57 +01:00
pennae
d075d2c276 nixos/litestream: convert manual chapter to MD 2023-01-10 10:31:57 +01:00
pennae
ce319f60ad nixos/prometheus/exporters: convert manual chapter to MD 2023-01-10 10:31:57 +01:00
pennae
8c17c417a1 nixos/weechat: convert manual chapter to MD 2023-01-10 10:31:57 +01:00
pennae
2928e0c487 nixos/taskserver: convert manual chapter to MD 2023-01-10 10:31:56 +01:00
pennae
0cc9d6cf5d nixos/sourcehut: convert manual chapter to MD 2023-01-10 10:31:56 +01:00
pennae
73d8b04f30 nixos/gitlab: convert manual chapter to MD 2023-01-10 10:31:56 +01:00
pennae
ad540ad4a5 nixos/synapse: convert manual chapter to MD 2023-01-10 10:31:56 +01:00
pennae
078707524e nixos/mjolnir: convert manual chapter to MD 2023-01-10 10:31:56 +01:00
pennae
5320b4cff8 nixos/mailman: convert manual chapter to MD 2023-01-10 10:31:56 +01:00
pennae
a553f57cb6 nixos/trezord: convert manual chapter to MD 2023-01-10 10:31:55 +01:00
pennae
77ee5a1436 nixos/emacs: convert manual chapter to MD 2023-01-10 10:31:55 +01:00
pennae
296ffb4f1f nixos/blackfire: convert manual chapter to MD 2023-01-10 10:31:55 +01:00
pennae
8422592cf8 nixos/flatpak: convert manual chapter to MD 2023-01-10 10:31:55 +01:00
pennae
453b2bed05 nixos/postgresql: convert manual chapter to MD 2023-01-10 10:31:55 +01:00
pennae
5b012f2c55 nixos/foundationdb: convert manual chapter to MD 2023-01-10 10:31:55 +01:00
pennae
1ce4fde27b nixos/borgbackup: convert manual chapter to MD 2023-01-10 10:31:54 +01:00
pennae
53935b445f nixos/acme: convert manual chapter to MD 2023-01-10 10:31:54 +01:00
pennae
f60e9eac85 nixos/oh-my-zsh: convert manual chapter to MD 2023-01-10 10:31:54 +01:00
pennae
eb2e1b04a6 nixos/plotinus: convert manual chapter to MD 2023-01-10 10:31:54 +01:00
pennae
0a70ea5e69 nixos/digitalbitbox: convert manual chapter to MD 2023-01-10 10:31:54 +01:00
pennae
3395f41bd1 nixos/input-method: convert manual chapter to MD 2023-01-10 10:31:54 +01:00
pennae
14cc405a69 nixos/manual: inline callout lists
we only have three uses at the moment, all of them in code blocks where
they could just as well (or maybe better) be comments. markdown can't do
callouts without another pandoc filter, so we'll turn them into comments
instead.

synapse would've benefited from inline links, but referencing an
external numbered list as plain text (instead of clickable links, like
callout lists had) seems even worse than putting urls into comments as
plain text.
2023-01-10 10:31:54 +01:00
pennae
90b4cb8ed2 nixos/manual: replace most examples with anchors
markdown doesn't really have examples as a first-class construct. we'll
keep all examples that are referenced around for now, but all
unreferenced examples turn into invisible anchors. (turning them into
fourth-level headings in their files, as would be necessary for emacs,
removes them from the TOC anyway.)
2023-01-10 10:31:53 +01:00
pennae
25ec23b9aa nixos/manual: strip un-MD-able tags
productname, application, acronym, guilabel, and guibutton were so far
not rendered specially and can go away completely.

replaceable does render differently, but since it was only used twice
and in places where the intent should be clear without the extra markup
it can go as well.
2023-01-10 10:31:53 +01:00
pennae
d6fb4b0738 nixos/manual: replace <quote> with quotes
pandoc will turn them back into <quote> elements once we turn smart
quotes on (which we will not do at the start to keep diffs small).
2023-01-10 10:31:53 +01:00
pennae
21c0c631bc nixos/manual: normalize <function> -> <literal>
use <literal> instead since markdown will have them as inline code blocks.
2023-01-10 10:31:53 +01:00
pennae
6aa4c2f9fc nixos/manual: normalize <firstterm> -> <emphasis>
they're emphasized, so we can't just throw them out.
2023-01-10 10:31:53 +01:00
pennae
90c61bc706 nixos/manual: normalize <screen>
as with program listings, the leading/trailing newlines do not affect
rendering but make markdown translation easier.
2023-01-10 10:31:53 +01:00
pennae
22144ba269 nixos/manual: normalize <package> -> <literal>
markdown can only do <literal>, so normalize to that. without
auto-linking to a package index the distinction is not very useful anyway.
2023-01-10 10:31:52 +01:00
pennae
d60f02b753 nixos/manual: normalize <code> -> <literal>
markdown can only translate to <literal>, so normalize to that or to
other more appropriate tags.
2023-01-10 10:31:52 +01:00
pennae
0715ecf936 nixos/manual: normalize <programlisting>
makes sure that program listing tags are separated from their contents
by exactly a newline character. this makes the markdown translation
easier to verify (since no new newlines need to be inserted), and
there's no rendering difference anyway.
2023-01-10 10:31:52 +01:00
pennae
6930425922 nixos/manual: normalize <literal><link> -> <link><literal>
MD can only do the latter, so change them all over now to keeps diffs reviewable.

this also includes <literal><xref> -> <xref> where options are referenced since
the reference will implicitly add an inner literal tag.
2023-01-10 10:31:52 +01:00
pennae
80a78f2e1e nixos/manual: remove links from program listings
markdown cannot represent those links. remove them all now instead of in
each chapter conversion to keep the diff for each chapter small and more
understandable.
2023-01-10 10:31:52 +01:00
Anderson Torres
593d558f05
Merge pull request #208196 from s1341/init_kasmweb
kasmweb: init at 1.12.0
2023-01-09 20:28:10 -03:00
Sandro Jäckel
b973513d04
nixos/nginx: cleanup, remove old todo 2023-01-09 22:04:06 +01:00
Sandro
42094ae7fc
Merge pull request #209515 from SuperSandro2000/mastodon-dupe 2023-01-09 21:57:51 +01:00
Artturi
27c1ec2ecf
Merge pull request #209816 from Artturin/deprecate-top-level-platform-aliases 2023-01-09 22:15:50 +02:00
Artturin
2eeb34c273 treewide: {build,host,target}Platform -> stdenv.{build,host,target}Platform 2023-01-09 21:13:22 +02:00
github-actions[bot]
33aa224777
Merge master into staging-next 2023-01-09 18:01:24 +00:00
Sandro
a5ca4cfdf1
Merge pull request #209758 from mattmelling/xastir-doc-fix 2023-01-09 16:49:18 +01:00
Naïm Favier
b8ee437596
Merge pull request #208643 from ncfavier/installer-test-tmp 2023-01-09 13:20:02 +01:00
Ross Gardiner
b199b821c2 nixos/grafana: fix spelling 2023-01-09 13:02:36 +01:00
github-actions[bot]
e4fc9a910a
Merge master into staging-next 2023-01-09 12:01:24 +00:00
Naïm Favier
aa3dc8b8c3
Merge pull request #208694 from ncfavier/resolvconf-nixos-enter 2023-01-09 12:58:31 +01:00
Naïm Favier
bff4bb5540
Merge pull request #208762 from ncfavier/link-manpages-options-doc 2023-01-09 11:57:01 +01:00
Naïm Favier
8cd3fc50f9
Merge pull request #209031 from ncfavier/fail2ban-nftables 2023-01-09 11:54:03 +01:00
Vincent Haupert
57a517db35 nixos/github-runner{,s}: add @veehaitch and @newam as maintainers 2023-01-09 09:37:00 +01:00
Vincent Haupert
b634dbe576 nixos/github-runners: fix format of service file 2023-01-09 09:36:59 +01:00
Vincent Haupert
66dbf9b199 nixos/github-runners: use mkMerge for serviceConfig
The `serviceOverrides` module option is commonly used to loosen the
systemd unit's hardening. This commit merges the `serviceConfig` with
`mkMerge` instead of using the update operator `//` which discards all
existing values on conflict. To avoid a breaking change which requires
defining each option with a higher priority (e.g., through `mkForce`),
this commit prefixes hardening values with `mkDefault`.

Notable exceptions are list hardening options which use `mkBefore`
instead of `mkDefault`. This allows for easy extension of the existing
settings. Resetting redefinitions are still possible through `mkForce`.
2023-01-09 09:36:04 +01:00
s1341
dbfe3bd2e7 kasmweb: init at 1.12.0 2023-01-09 07:19:54 +02:00
github-actions[bot]
fce67420c4
Merge master into staging-next 2023-01-09 00:02:14 +00:00
Aaron Andersen
4769274f53
Merge pull request #205526 from newAM/github-runner-oom
nixos/github-runner: add workDir option
2023-01-08 19:01:44 -05:00
Sandro
2eb836b43e
Merge pull request #208864 from GaetanLepage/fwupd 2023-01-09 00:57:48 +01:00
Matt Melling
f8c8f22104
nixos/xastir: fix enable option doc string 2023-01-08 21:17:41 +00:00
ivanbrennan
418fda2293
nixos.programs.neovim: fix runtime
When this module was first introduced, it processed the runtime option
in a way that nested the resulting files and directories under an etc
directory.
https://github.com/NixOS/nixpkgs/pull/98506/files#diff-685092dbb1852fbf30857fe3505d25dc471dc79d0f31c466523b5f5822b68127R11-R21

That implementation relied on nixos/modules/system/etc/make-etc.sh, a
script that was later removed.
eb7120dc79

The implementation was updated to use linkFarm, which changed the
behavior slightly, in that the configured files and directories are no
longer automatically nested under an etc directory.
307b1253a7

But the module still configures neovim's runtimepath in a way that
assumes the old nesting behavior.
04f574a1c0/nixos/modules/programs/neovim.nix (L173)

Restore the original behavior, nesting runtime files and directories
under an etc directory.
2023-01-08 16:15:56 -05:00
github-actions[bot]
9fdb4a743d
Merge master into staging-next 2023-01-08 18:01:08 +00:00
Robert Hensing
22eb959f37 nixos/amazon-option: Tolerate harmless ec2.hvm for compatibility
Throwing an error necessitates changes in NixOps that are not safe yet.
2023-01-08 19:01:02 +01:00
Maciej Pasternacki
c3ec444a61 nixos/gitlab-runner: fix style issues flagged by statix 2023-01-08 17:37:43 +01:00
Maciej Pasternacki
d5cb89b024 nixos/gitlab-runner: fix problems introduced by last #209716 2023-01-08 17:36:45 +01:00
Martin Weinelt
4d65509504 Merge remote-tracking branch 'origin/master' into staging-next 2023-01-08 16:34:30 +01:00
K900
337d358300 nixos/n8n: disable telemetry by default
Originally intended to just speed up the tests, but probably a good idea in general.
2023-01-08 14:43:53 +03:00
github-actions[bot]
b60b0a223e
Merge master into staging-next 2023-01-08 06:01:06 +00:00
R. Ryantm
2d72d4775e cri-o: 1.25.1 -> 1.26.0 2023-01-08 13:30:27 +10:00
zowoq
448dc91db4 nixos/cri-o: source cni and crictl from package 2023-01-08 13:30:27 +10:00
zowoq
5da87a8c7b nixos/containers: source policy from separate skopeo output 2023-01-08 13:30:27 +10:00
github-actions[bot]
4bf238a8fb
Merge master into staging-next 2023-01-08 00:02:31 +00:00
voidzero
29749d22a3 zsh-syntax-highlighting: add regexp to list of highlighters 2023-01-07 19:39:31 +01:00
Felix Bühler
a4eb1b11bc
Merge pull request #209254 from Stunkymonkey/freshrss-srv-pgsql
nixos/freshrss: fix permissions and add database test
2023-01-07 19:13:30 +01:00
github-actions[bot]
3b3114f45d
Merge master into staging-next 2023-01-07 18:01:08 +00:00
Sandro Jäckel
3071db258b
nixos/mastodon: remove duplicated shebang 2023-01-07 18:06:57 +01:00
amesgen
a429cecd3c
nixos/gitea: don't run gitea-dump on activation 2023-01-07 15:50:36 +01:00
Thiago Kenji Okada
c2fdf2d137
Merge pull request #209191 from wegank/mongodb-more-drops
mongodb-4_0: drop
2023-01-07 13:04:34 +00:00
github-actions[bot]
76d33189ba
Merge master into staging-next 2023-01-07 12:01:24 +00:00
Aneesh Agrawal
2fc8504223 nixos/etebase-server: Leverage $PATH
This simplifies the existing module
but also enables consumers to call `etebase-server`
from custom preStart commands (i.e. user creation commands).
2023-01-07 12:20:03 +01:00
Naïm Favier
88a7218236
nixos/fail2ban: support nftables with default configuration 2023-01-07 11:26:40 +01:00
github-actions[bot]
0789ea69b1
Merge master into staging-next 2023-01-07 00:02:25 +00:00
Moritz 'e1mo' Fromm
ee41b6b457
dokuwiki: Combine mechanism for plugins and templates
Copy templates and plugins into Dokuwiki instead of linking to address
template compatibility. As noted by @sinavir[^1], (some) templates would
fail due to relative PHP imports.

[^1]: https://github.com/NixOS/nixpkgs/pull/208299#issuecomment-1370413116
2023-01-06 23:52:49 +01:00
Moritz 'e1mo' Fromm
8d4251f491
nixos/dokuwiki: Add e1mo as maintainer 2023-01-06 23:40:09 +01:00
Moritz 'e1mo' Fromm
236d90fde0
nixos/dokuwiki: Overhaul for structured settings
Added the RFC42-style added the posibility to use
`services.dokuwiki.sites.<name>.settings' instead of passing a plain
string to `<name>.extraConfig`. ´<name>.pluginsConfig` now also accepts
structured configuration.
2023-01-06 22:02:37 +01:00
Felix Buehler
0e2787884e nixos/freshrss: fix permissions and add database test 2023-01-06 21:16:50 +01:00
Jonas Heinrich
059e0f8958
Merge pull request #209316 from e1mo/dokuwiki/housekeeping
nixosTests.dokuwiki: Deduplicate node configuration
2023-01-06 21:10:50 +01:00
Sandro Jäckel
5703c16118
nixos/uptime-kuma: add option to enable apprise support 2023-01-06 16:51:18 +01:00
Moritz 'e1mo' Fromm
055100611d
nixos/dokuwiki: Simplify plugin fetching examples
Also replaced apache httpd referenced with ones to caddy
2023-01-06 15:12:47 +01:00
Moritz 'e1mo' Fromm
4649662802
nixos/dokuwiki: Take phpPackage and phpOptions 2023-01-06 01:09:46 +01:00
github-actions[bot]
e3480cf1cc
Merge master into staging-next 2023-01-06 00:02:28 +00:00
Artturin
decb4a675b nixos/stevenblack: init 2023-01-06 00:35:17 +02:00
Thiago Kenji Okada
492690e923
Merge pull request #209182 from jamesbt365/opentabletdriver-configurations
opentabletdriver: remove hardcoded config path
2023-01-05 20:46:37 +00:00
Thiago Kenji Okada
1deddf959c
Merge pull request #209175 from gador/unifi-fix-monogdb-version
nixos/unifi: fix mongodb to a stable version
2023-01-05 20:39:14 +00:00
Vladimír Čunát
c21cf32722
Merge branch 'master' into staging-next 2023-01-05 20:21:03 +01:00
Naïm Favier
8822e9620c
nixos/iay: use mkPackageOptionMD 2023-01-05 20:01:57 +01:00
Naïm Favier
0a8bfb520c
nixos/iay: put mkPackageOptionMD in scope 2023-01-05 19:48:27 +01:00
Martin Weinelt
cd890b9b5e
nixos/iay: Fix iay package option (#209188) 2023-01-05 19:45:40 +01:00
Weijia Wang
3a8a14d894 nixos/unifi-video: bump default mongodb version 2023-01-05 19:10:35 +01:00
Robin Gloster
271c20dd40
Merge pull request #209022 from mayflower/fix-mailman-hyperkitty-css
nixos/mailman: fix hyperkitty css/js when virtualRoot is `/`
2023-01-05 17:29:08 +01:00
Martin Weinelt
afd962b51c Merge remote-tracking branch 'origin/master' into staging-next 2023-01-05 17:16:26 +01:00
jamesbt365
ad491fec88
opentabletdriver: remove hardcoded config path 2023-01-05 15:15:08 +00:00
Florian Brandes
45d27d43c4 nixos/unifi: fix mongodb to a stable version
Otherwise unifi might break on a next big update
just like https://github.com/NixOS/nixpkgs/pull/207382#issuecomment-1371303817

Also this requires an update of the unifi package. With the LTS
version, newer mongodb versions aren't supported. The current supported
version of unifi 7 is mongodb 3.6 acording to
https://community.ui.com/releases/UniFi-Network-Application-7-0-20/3e4a4099-c063-42f6-8e21-5fb2c99fcea9 which isn't even supplied by nixpkgs anymore.

mongodb-4_2 isn't officially supported, but works.

Signed-off-by: Florian Brandes <florian.brandes@posteo.de>
2023-01-05 15:16:02 +01:00
Lassulus
c366c3dbc8
Merge pull request #209064 from Lassulus/os-release-extra 2023-01-05 14:14:09 +01:00
github-actions[bot]
4acd5a978b
Merge staging-next into staging 2023-01-05 12:01:57 +00:00
Anderson Torres
6124309e74
Merge pull request #207797 from omasanori/iay-module
nixos/iay: add module; iay: add myself as a maintainer
2023-01-05 08:22:16 -03:00
Matthieu Coudron
c61f554c1a modules.gitlab-runner: accept space in names
when you register a runner with spaces in its name (possible if you use 'description' option) then the runners never get unregistered because our bash scripts assume no space in names.

This solves the issue

Retreiving the fullname of the runner via `gitlab-runner list` got surprisingly hard between lazy-capture issues and `gitlab-runner list` displaying invisible (CSI) characters that break the regex etc.
Which is why I fell back on the pseudo-json format.

This PR adds the hash in the name, which allows to keep both the
stateless aspect of the module while allowing for a freeform name.

I found using bash associative arrays easier to use/debug than the current
approach.
2023-01-05 11:43:32 +01:00
github-actions[bot]
0c8280b1c4
Merge staging-next into staging 2023-01-05 06:01:39 +00:00
Aneesh Agrawal
1e94e9146f radicale: Drop self (aneeshusa) from maintainership
I have switched to using etebase/etesync.
2023-01-05 00:14:38 -05:00
pennae
3339892da9 nixos/plasma5: use mkPackageOptionMD 2023-01-05 13:46:54 +10:00
pennae
9da5f12ecf modules: add mkPackageOptionMD
another transitional option factory, like mkAliasOptionModuleMD.
2023-01-05 02:33:13 +01:00
pennae
4c1cfbdb84 modules: add mkAliasOptionModuleMD
mkAliasOptionModule should not default to mdDoc descriptions because
that can break out-of-tree users of documentation infrastructure. add an
explicitly-MD variant for now, to be removed some time after the MD
transition is complete.
2023-01-05 02:33:13 +01:00
github-actions[bot]
0c98bf3e85
Merge staging-next into staging 2023-01-05 00:02:56 +00:00
Bjørn Forsman
295c552dc9 nixos/apcupsd: wrap CLI with "-f ${configFile}"
This ensures that the CLI is in sync with the service configuration.

(I tried building apcupsd with --sysconfdir=/etc instead, but it wants
to install stuff there at build time, so I backed out.)

Fixes https://github.com/NixOS/nixpkgs/issues/208204.
2023-01-04 21:45:58 +01:00
lassulus
5464e0a018 nixos/misc: add VARIANT_ID in /etc/os-release for identifying nixos installer
This is a feature useful for nixos-remote and other installation tools
that try to identify if the remote machine has been successfully booted
into an installer.
2023-01-04 19:11:41 +01:00