Commit graph

3898 commits

Author SHA1 Message Date
github-actions[bot] dd1ff149da
Merge master into staging-next 2023-01-31 00:02:31 +00:00
Izorkin ee7e096c48
nixos/nginx: update recommended gzip settings 2023-01-30 23:03:01 +03:00
Sandro Jäckel 2d3efd3301
nixos/nginx: clear clients Connection headers 2023-01-30 20:25:22 +01:00
pennae 5b6dcece88
Merge pull request #212684 from pennae/nixos-render-docs
nixos-render-docs: init, use for some manual rendering to docbook
2023-01-30 19:26:07 +01:00
github-actions[bot] 872d17dee8
Merge master into staging-next 2023-01-30 18:01:30 +00:00
Vladimír Čunát 23ce77d76e Revert #178290: nixos/virtualisation: add option
...for explicitly named network interfaces

This reverts commit 6ae3e7695e.
(and evaluation fixups 08d26bbb72 7aed90a969)
Some of the tests fail or time out after the merge.
2023-01-30 07:55:50 -08:00
github-actions[bot] b460ba1998
Merge master into staging-next 2023-01-28 12:01:10 +00:00
Colin Arnott 64f3a304db
nixos/wordpress: ensure default sites includes a theme 2023-01-28 10:31:56 +00:00
Colin Arnott 1754920c76
wordpress: remove bundled plugins and themes
Wordpress bundles some non-essential plugins and themes, then pesters
users to upgrade them. As we make the whole webroot readonly, it is
not possible to trivially delete them. Instead we should have users
explicitly install plugins via the existing nixos module.
2023-01-28 10:17:21 +00: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
github-actions[bot] 8291dfb1b4
Merge master into staging-next 2023-01-27 18:01:31 +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
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
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
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 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
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
Eduardo Quiros 730163b3ed
tut: 1.0.34 -> 2.0.0 2023-01-25 00:22:01 -06:00
github-actions[bot] f22d2b21d8
Merge master into haskell-updates 2023-01-25 00:13:57 +00: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
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
Matt Melling c281dd3e05
nixos/cloudlog: init 2023-01-23 22:41:07 +00:00
Sandro e3d6edd75f
Merge pull request #209045 from Izorkin/update-dhcpcd-ipv6rs 2023-01-23 23:25:03 +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
github-actions[bot] eadaaa7d20
Merge master into staging-next 2023-01-23 12:01:24 +00: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
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
Riey 0db47bd50e kime: 2.5.6 -> 3.0.2 2023-01-22 19:57:34 +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
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
github-actions[bot] 4b19a2dca3
Merge master into haskell-updates 2023-01-22 00:14:05 +00:00
Guillaume Girol d26caea94b doc: adapt to nativeCheckInputs 2023-01-21 16:42:10 +01:00
Guillaume Girol 90c78aee6c Merge branch 'nativeCheckInputs' into staging-nativeCheckInputs 2023-01-21 12:00:00 +00: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
Guillaume Girol aa4780077a Revert "nixos: add release notes for nginx config validation"
This reverts commit 26a411b2cb.
2023-01-20 20:09:15 +01:00
Sandro d12f8d563b
Merge pull request #208804 from justinas/teleport-11 2023-01-20 13:54:49 +01:00
github-actions[bot] c292bbcf0b
Merge master into haskell-updates 2023-01-20 00:13:21 +00:00
Bruno Inec 988feead01
nixos/goeland: init 2023-01-20 00:39:31 +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
guangtao b5a3f795c3 nixos/nomad: fix multi-plugin-dir path 2023-01-18 22:22:43 -08:00
github-actions[bot] a7de82a797
Merge master into haskell-updates 2023-01-18 00:13:10 +00: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
github-actions[bot] a311aaac39
Merge master into haskell-updates 2023-01-17 00:13:12 +00:00
github-actions[bot] 5a50475572
Merge staging-next into staging 2023-01-16 18:01:50 +00:00
Michael Alan Dorman 2bb560b367 gmrender-resurrect: Add gmediarender service
This creates a systemd unit that will start and supervise the
gmediarender daemon.
2023-01-16 17:28:56 +01:00
Jonas Heinrich c51dd42311 nixos/wordpress: add settings option 2023-01-16 14:06:10 +01:00
Nick Cao a6f2beeedd
Merge pull request #209264 from anthonyroussel/iputils
iputils: 20211215 -> 20221126
2023-01-16 16:38:07 +08:00
github-actions[bot] b69010491a
Merge master into haskell-updates 2023-01-16 00:13:17 +00:00
maralorn 0d88794d58
Merge pull request #210762 from sternenseemann/nix-ghc-docdir
ghc.withPackages: install documentation to -with-packages output
2023-01-15 19:38:56 +01:00
Ryan Lahfa e2ac17f781
Merge pull request #207466 from Patryk27/fix/174065
nixos: add --specialisation to nixos-rebuild
2023-01-15 18:52:09 +01:00
Ryan Lahfa 503c288f4e
Merge pull request #207567 from Stunkymonkey/photoprism-module-init
nixos/photoprism: init module
2023-01-15 18:36:13 +01:00
Patryk Wychowaniec 2c55eba8f4
nixos: add --specialisation to nixos-rebuild
This commit fixes a papercut in nixos-rebuild where people wanting to
switch to a specialisation (or test one) were forced to manually figure
out the specialisation's path and run its activation script - since now,
there's a dedicated option to do just that.

This is a backwards-compatible change which doesn't affect the existing
behavior, which - to be fair - might still be considered sus by some
people, the painful scenario here being:

- you boot into specialisation `foo`,
- you run `nixos-rebuild switch`,
- whoops, you're no longer at specialisation `foo`, but you're rather
  brought back to the base system.

(it's especially painful for cases where specialisation is used to load
extra drivers, e.g. Nvidia, since then launching `nixos-rebuild switch`,
while forgetting that you're inside a specialisation, can cause some
parts of your system to get accidentally unloaded.)

I've tried to mitigate that by improving specialisations so that they
create a dedicated file somewhere in `/run/current-system` containing
the specialisation's name (which `nixos-rebuild` could then use as the
default value for `--specialisation`), but I haven't been able to come
up with anything working (plus it would be a breaking change then).

Closes https://github.com/NixOS/nixpkgs/issues/174065
2023-01-15 18:16:49 +01:00
Felix Buehler fb9e8b9bd4 nixos/photoprism: init module 2023-01-15 18:02:43 +01:00
sternenseemann 727491cd95 ghc.withPackages: install documentation to -with-packages output
* Will make it so that GHC.Paths's docdir NIX_GHC_DOCDIR points to an
  actual directory.

* Documentation of all packages in the environment is available in
  `$out/share/doc`.

This has previously been attempted in #76842 and reverted in #77442,
since documentation can collide when the libraries wouldn't (thanks to
the hash in the lib filename). `symlinkJoin` allows collision, so this
solution should be akin to #77523 (minus `buildEnv`, one step at a
time). `installDocumentation = false` restores the old behavior.

Collision in the documentation only happen if the dependency closure of
the given packages has more than one different derivation for the same
library of the very same version. I'm personally inclined not to claim
that our infrastructure does anything sensible in this case.
Additionally, the documentation is likely largely the same in such
cases (unless it is heavily patched).

Resolves #150666.
Resolves #76837.
Closes #150968.
Closes #77523.
2023-01-15 17:35:42 +01:00
Matthieu Coudron cf10d7aef8
services.openssh: support freeform settings (#193757)
* services.openssh: support freeform settings

Keep "extraConfig" but introduces "settings".

Also renames several options

(mkRenamedOptionModule [ "services" "openssh" "kbdInteractiveAuthentication" ] [  "services" "openssh" "settings" "KbdInteractiveAuthentication" ])
(mkRenamedOptionModule [ "services" "openssh" "passwordAuthentication" ] [  "services" "openssh" "settings" "PasswordAuthentication" ])
(mkRenamedOptionModule [ "services" "openssh" "useDns" ] [  "services" "openssh" "settings" "UseDns" ])
(mkRenamedOptionModule [ "services" "openssh" "permitRootLogin" ] [  "services" "openssh" "settings" "PermitRootLogin" ])

* updated doc
* regen doc
2023-01-15 16:32:46 +01:00
github-actions[bot] 49722fd14a
Merge master into staging-next 2023-01-13 18:01:34 +00:00
Anthony Roussel d4c1e368e1
iputils: 20211215 -> 20221126 2023-01-13 17:25:49 +01: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
Fabian Möller cc4de1aa3a
nixos-rebuild: Allow local builds when --target-host is used again
This is a followup of #148921, to allow local builds when
`--target-host` is used again. It also documents the change in
behavior, regarding the specialty of the `localhost` value.

By removing the special handling of an empty `buildHost` and non empty
`targetHost`, this change also slightly alters the behavior of
`nixos-rebuild`.

Originally by specifying `--target-host target --build-host ""`, the
now removed special case would transform those arguments to
`--target-host target --build-host target`.
Now the empty `--build-host` would result in a local build.
2023-01-13 10:16:46 +01:00
Martin Weinelt 5342b695b1 Merge remote-tracking branch 'origin/master' into staging-next 2023-01-12 23:07:01 +01:00
Sandro a9fb542957
Merge pull request #202095 from DeeUnderscore/update/git-bug-0.8.0 2023-01-12 16:32:53 +01:00
Naïm Favier 7e1cf49870
Merge pull request #161237 from miallo/nixos-version-configuration-revision 2023-01-12 12:31:54 +01:00
Izorkin 0e9cb9fcfd
nixos/dhcpcd: don't solicit or accept ipv6 router advertisements if use static addresses 2023-01-12 09:57:17 +03:00
Martin Weinelt c1e6c6af69 Merge remote-tracking branch 'origin/master' into staging-next 2023-01-11 03:51:33 +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
pennae 53fc887582 nixos/manual: move "edit the MD file" comments to generated XML 2023-01-10 12:34:37 +01:00
pennae bf92eaebe4 nixos/manual: generate module chapters with md-to-db.sh 2023-01-10 10:32:00 +01:00
pennae 785c0f2afa nixos/manual: mention that module chapters should use markdown 2023-01-10 10:31:59 +01:00
github-actions[bot] e4fc9a910a
Merge master into staging-next 2023-01-09 12:01:24 +00:00
Naïm Favier bff4bb5540
Merge pull request #208762 from ncfavier/link-manpages-options-doc 2023-01-09 11:57:01 +01:00
D Anzorge 2d6f90f667 git-bug-migration: init at 0.3.4 2023-01-07 02:41:39 +01:00
github-actions[bot] 0789ea69b1
Merge master into staging-next 2023-01-07 00:02:25 +00: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
Artturin decb4a675b nixos/stevenblack: init 2023-01-06 00:35:17 +02:00
github-actions[bot] 0c8280b1c4
Merge staging-next into staging 2023-01-05 06:01:39 +00:00
pennae 9da5f12ecf modules: add mkPackageOptionMD
another transitional option factory, like mkAliasOptionModuleMD.
2023-01-05 02:33:13 +01:00
github-actions[bot] 789ae2c93d
Merge staging-next into staging 2023-01-04 18:01:36 +00:00
figsoda 3ae8752abe
Merge pull request #208925 from figsoda/channel
doc/installation: fix incorrect channel link
2023-01-04 10:22:38 -05:00
github-actions[bot] 47507cf77a
Merge staging-next into staging 2023-01-04 06:01:44 +00:00
zowoq 469aec905b nixos/podman, podman: switch to netavark network stack 2023-01-04 14:25:14 +10:00
figsoda 85053313e7 doc/installation: fix incorrect channel link 2023-01-03 15:24:36 -05:00
Michael Lohmann c09f6c3db0 nixos-version: output configurationRevision
`nixos-version --configuration-revision` will show the
configurationRevision.
2023-01-03 20:40:35 +01:00