Commit Graph

4038 Commits

Author SHA1 Message Date
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