3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

28727 commits

Author SHA1 Message Date
LoveIsGrief 881512e23f
x11: Source .profile and .xprofile
Other popular distros (OpenSuse, Ubuntu, Gentoo, Arch) read $HOME/.profile when starting X11 display managers.
When moving to nixOS, that is then broken leading to unpredictable behavior (probably programs not working).

This adds similar behavior to https://github.com/sddm/sddm/blob/develop/data/scripts/Xsession

Related to #185979
2022-08-17 20:37:33 +02:00
Jan Tojnar 299611a634
Merge pull request #187132 from ElvishJerricco/gnome-disable-packagekit
nixos: Don't enable packagekit by default
2022-08-17 20:24:05 +02:00
Will Fancher d3e5bd0228 nixos: Don't enable packagekit by default 2022-08-17 13:53:21 -04:00
Bernardo Meurer 5fcc2ff7a1
Merge pull request #187029 from lovesegfault/fwupdmgr-udisks
nixos/fwupd: enable udisks2
2022-08-17 09:04:55 -07:00
Yannik Rödel 9898e975af outline: init at 0.65.2 2022-08-17 16:30:16 +02:00
Sandro a9f3c22db5
Merge pull request #182382 from SuperSandro2000/portunus 2022-08-17 15:20:45 +02:00
ckie 6c36827e98
Merge pull request #186536 from tpwrules/add-spice-webdavd-module
nixos/spice-webdavd: init
2022-08-17 13:41:43 +03:00
Kim Lindberger eed71ab5db
Merge pull request #185820 from talyz/discourse-2.9.0.beta8
discourse: 2.9.0.beta4 -> 2.9.0.beta9
2022-08-17 10:41:28 +02:00
Peter Hoeg 28116cfd9b nixos/https-dns-proxy: add OpenDNS support 2022-08-17 10:25:31 +08:00
Bernardo Meurer fb5bceb3ff
nixos/fwupd: enable udisks2
Without this, you get a warning that fwupd is unable to find the ESP
partition.

c.f. https://github.com/fwupd/fwupd/wiki/PluginFlag:esp-not-found
2022-08-16 18:15:18 -04:00
Christian Kögler 7721c9db08 nixos/test: Remove workaround for broken nscd 2022-08-16 21:22:49 +02:00
Lassulus 8471526587
Merge pull request #186785 from helsinki-systems/feat/nss-lookup-nscd 2022-08-16 20:45:45 +02:00
Maximilian Bosch 9e8ea1b855
Merge pull request #183717 from NetaliDev/mysql-auth
nixos: add mysql/mariadb user authentication module
2022-08-16 20:30:16 +02:00
Paul-Henri Froidmont d2ce318bd4 nixos/patroni: init 2022-08-16 18:57:15 +02:00
Bobby Rong 89988e61c3
Merge pull request #183935 from NickCao/pdns
pdns: 4.6.2 -> 4.6.3, fix pname and tests
2022-08-16 23:14:16 +08:00
Jonas Heinrich 0d85bb5e4a
Merge pull request #186668 from r-ryantm/auto-update/pipewire
pipewire: 0.3.56 -> 0.3.56
2022-08-16 15:48:34 +02:00
Sandro e1951451e0
Merge pull request #186914 from evils/tuptime 2022-08-16 15:18:27 +02:00
markuskowa 7511c04c10
Merge pull request #186310 from ck3d/machinectl-auto-start
nixos/test/systemd-machinectl: Add auto-start test
2022-08-16 11:44:23 +02:00
Evils 3895a5baa2 tuptime: 5.1.0 -> 5.2.0
add meta.changelog

and update module to upstream wording
2022-08-16 10:03:12 +02:00
Lassulus 05d4c2162b
Merge pull request #182487 from alois31/suspend-then-hibernate
nixos/power-management: run post-resume after suspend-then-hibernate
2022-08-16 08:22:04 +02:00
Christian Kögler 8d2fd875b7 nixos/test/systemd-machinectl: Add auto-start test 2022-08-16 07:36:57 +02:00
Jörg Thalheim 7a8a3dfd8b
Merge pull request #181939 from Mic92/vault-2
vault: fix assertions when raft backend is used
2022-08-16 05:24:01 +01:00
Jörg Thalheim e19518cdab
Merge pull request #180111 from Mic92/syncoid
syncoid: handle syncing dataset without a parent
2022-08-16 05:19:44 +01:00
Jörg Thalheim 2c3f6055fb syncoid: handle syncing dataset without a parent 2022-08-16 06:18:54 +02:00
Jörg Thalheim e8e20bc30c
Merge pull request #171562 from Mic92/nixos-docs
nixos/doc/installation: fix alignment of created partitions
2022-08-16 05:05:13 +01:00
Maxine Aubrey b474599529
nomad: default to nomad_1_3, add to release notes 2022-08-16 01:12:41 +02:00
ajs124 9fd1ae2f4e
Merge pull request #185413 from Luflosi/skip-fsck-for-more-filesystems 2022-08-15 20:09:59 +02:00
Vincent Haupert 786f72c32e nixos/github-runner: start Runner.Listener directly in ExecStart=
The `runsvc.sh` script wraps a JavaScript script which starts
`Runner.Listener` and also handles failures. This has the downside that
the service _always_ exits with status code 0, i.e., success. This
causes frequent service restarts when running in ephemeral mode with a
faulty config as Systemd always sees a success exit status. To prevent
this, this commit changes the service config to call `Runner.Listener`
directly. The JavaScript wrapper stops the process with a SIGINT, hence,
the Systemd unit now sends a SIGINT to stop the service.
2022-08-15 13:13:58 -04:00
Vincent Haupert 006d9d2dfb release-notes: add github-runner support for PAT and ephemeral 2022-08-15 13:13:58 -04:00
Vincent Haupert 987a4b4231 nixos/github-runner: add support for ephemeral runners
Adds the module option `ephemeral`. If set to true, configures the
runner registration with the `--ephemeral` option. This causes the
runner to exit after processing a single job, to de-register itself, and
to delete its configuration. Afterward, systemd restarts the service
which triggers a new ephemeral registration with a clean state.
2022-08-15 13:13:58 -04:00
Vincent Haupert 3f075e5bb1 nixos/github-runner: add PAT support
This commit introduces support for runner registrations through a
personal access token (PAT). To use a PAT instead of a registration
token, place an appropriately scoped PAT in `tokenFile`. If the file
contains a PAT, the configuration script queries a new runner
registration token. Using a runner registration token directly continues
to work as before.
2022-08-15 13:13:58 -04:00
Vincent Haupert 65542a6348 nixos/github-runner: use state instead of runtime dir as RUNNER_ROOT
Using the runtime directory as `RUNNER_ROOT` is wrong. We should always
use the state directory like we already do when invoking the runner
configure script. Otherwise, the runner constructs the wrong path for
some files (.credentials, .runner, ...).
2022-08-15 13:13:58 -04:00
Jörg Thalheim 66c94cd524
Merge pull request #185856 from NoneTirex/fix-headscale-tls-config
headscale: fix tls challengeType enum possible values
2022-08-15 17:51:49 +01:00
Bobby Rong 50c0564bc8
Merge pull request #186742 from bobby285271/cinnamon
Cinnamon updates 2022-08-15
2022-08-15 21:22:50 +08:00
Christian Kögler 0884cb0ba2
Merge pull request #177577 from jmbaur/globalprotect-openconnect_config
nixos/globalprotect: add settings option for service configuration
2022-08-15 14:43:13 +02:00
Bobby Rong 9c69f307ce nixos/cinnamon: install gnome-screenshot
Closes #169178
2022-08-15 19:35:43 +08:00
Janne Heß 8cef7eec93
nixos/nscd: Add requiredBy for the nss targets
This is to ensure the targets are stopped when nscd is stopped to
prevent races on switch. Example interaction: nscd is stopped, some
service that requires nss-user-lookup.target is restarted. Without this
PR, nss-user-lookup.target would still be active, hence the service
would start without nscd running.
2022-08-15 13:18:03 +02:00
Bobby Rong fcc28fe306
Merge pull request #186587 from midchildan/fix/mirakurun-add-logo-dir
nixos/mirakurun: set the LOGO_DATA_DIR_PATH environment variable
2022-08-15 17:40:26 +08:00
Robert Schütz 243053e521 python310Packages.mistune: 0.8.4 -> 2.0.4
Remove mistune_0_8 because it's insecure.
2022-08-15 06:53:01 +00:00
Sebastián Mancilla 10a745eac8
Merge pull request #179896 from erikarvstedt/fix-bash-exit-handler
treewide: fix bash exit handlers
2022-08-14 21:42:41 -04:00
Winter dbd18a63a7 fetchgit: allow disabling cone mode for sparse checkouts, fix test 2022-08-14 23:03:07 +02:00
Thomas Watson 9c52987b51 nixos/spice-webdavd: init 2022-08-14 12:28:05 -05:00
Robert Hensing d00583540b
Merge pull request #184368 from DieracDelta/jr/wrappers-run-size-option
nixos/security: add size option to /run/wrappers
2022-08-14 19:13:17 +02:00
ppom 565a729f7c make plausible service start after clickhouse service
Plausible fails on start because clickhouse is not ready,
when clickhouse has low CPU available, eg.
```nix
{systemd.services.clickhouse.serviceConfig.CPUWeight = 20;}
```

Fixed with
```nix
{systemd.services.plausible.after = [ "clickhouse.service" ];}
```
2022-08-14 17:09:05 +02:00
R. Ryantm 813a4ba8a0 pipewire: 0.3.56 -> 0.3.56 2022-08-14 14:31:51 +00:00
Justin Restivo 82640adbf0 nixos/security: add size option to /run/wrappers 2022-08-14 07:31:37 -07:00
Robert Hensing 6851adc178 nixos/qemu-vm: Fix warning message 2022-08-14 12:48:43 +02:00
midchildan 664b01f082
nixos/mirakurun: set the LOGO_DATA_DIR_PATH environment variable 2022-08-14 16:34:47 +09:00
Robert Hensing bd3fb4069d
Merge pull request #181746 from hercules-ci/nixosTest-erofs
nixos/qemu-vm: Use disposable EROFS for store when writableStore = false
2022-08-14 08:46:21 +02:00
Bernardo Meurer 8979e6cc69
Merge pull request #186369 from lovesegfault/fix-localtime-service 2022-08-13 12:57:35 -07:00
Mario Rodas 95cb3b7fd9
Merge pull request #185156 from kilianar/nixosTests.isso-fix
nixosTests.isso: fix failing test
2022-08-13 11:53:14 -05:00
Bernardo Meurer 5975411744
nixos/localtimed: fix service 2022-08-12 22:46:16 -04:00
gardspirito aa6a8bd8dd nixos/neo4j: HTTP connector toggling 2022-08-12 15:45:48 -07:00
gardspirito 8d6f4552cd nixos/neo4j: fix typo 2022-08-12 15:45:48 -07:00
Kerstin Humm a20d988932 nixos/neo4j: use full systemd unit name 2022-08-12 15:45:48 -07:00
Kerstin Humm a22112e88a neo4j: remove deprecated config 2022-08-12 15:45:48 -07:00
Kerstin Humm 9b60931986 neo4j: add erictapen as maintainer 2022-08-12 15:45:48 -07:00
Kerstin Humm 5f2ae2e43f neo4j: add release notes about version bump 2022-08-12 15:45:48 -07:00
Kerstin Humm b653d62a00 nixos/neo4j: increase memorySize in NixOS test 2022-08-12 15:45:48 -07:00
Kerstin Humm 60b6ad6f37 nixos/neo4j: set some settings so warnings at startup disappear 2022-08-12 15:45:48 -07:00
Kerstin Humm 6dcbcb3a53 increase diskSize for neo4j test to avoid No space left on device exception 2022-08-12 15:45:48 -07:00
Jonathan Ringer 0fbce25144 neo4j: 3.5.14 -> 4.1.1 2022-08-12 15:45:48 -07:00
Weathercold 8fb63401af
nixos/switch-to-configuration: fix units starting with dash
Fix units starting with `-` being recognized as options.
2022-08-12 18:36:15 -04:00
pennae 50f9b3107a
Merge pull request #185474 from pennae/option-docs-md
nixos/*: more options md conversion
2022-08-12 23:23:26 +02:00
Sandro df97735064
Merge pull request #173669 from SuperSandro2000/gitea 2022-08-12 15:33:46 +02:00
Martin Weinelt 66f08894d7
Merge pull request #184452 from r-ryantm/auto-update/systemd_exporter 2022-08-12 12:58:53 +02:00
Scott Worley ebf7f86489 nixos/tests/prometheus-exporters/systemd: Update for 0.5.0 release 2022-08-12 12:53:23 +02:00
talyz 7feea0d062
discourse: 2.9.0.beta4 -> 2.9.0.beta9
Co-authored-by: Tobias Stenzel <ts@flyingcircus.io>
2022-08-12 12:20:17 +02:00
Richard Marko 9ba8f7d8b3 services/klipper: add CPUScheduling and IOScheduling tuning 2022-08-12 17:31:02 +08:00
Richard Marko 1410d89398 nixos/klipper: add OOMScoreAdjust -999
to make it unlikely that klipper gets killed by OOM killer.
2022-08-12 17:31:02 +08:00
Winter ce63730df8 Update nixos/modules/services/misc/tautulli.nix 2022-08-11 22:49:50 -04:00
Ryan Horiguchi feba340314 nixos/tautulli: add option to open firewall 2022-08-11 22:49:50 -04:00
Martin Weinelt a58668f0a0
Merge pull request #176835 from pennae/syncserver 2022-08-12 01:33:26 +02:00
pennae bd1978e911 nixos/firefox-syncserver: init 2022-08-12 00:45:25 +02:00
Emery Hemingway 300c5c98c6 nixos/yggdrasil: rename "config" option to "settings"
Make this service consistent with rfc42.

https://github.com/NixOS/rfcs/blob/master/rfcs/0042-config-option.md
2022-08-11 16:09:42 -05:00
Kim Lindberger 51998bc19e
Merge pull request #185760 from michaeladler/fix-ssh-hostkey-gen
fix: ssh-keygen fails if directory does not exist
2022-08-11 16:39:58 +02:00
Janne Heß d69a36d1c1
Merge pull request #186028 from helsinki-systems/disable-udisks2-by-default
nixos/udisks2: don't enable by default
2022-08-11 14:02:02 +02:00
ajs124 90d88829da nixos/gvfs: enable udisks2
can be used by gvfs and is disabled by default after
f763710065
2022-08-11 13:28:31 +02:00
Sergei Trofimovich 925a9bb753
Merge pull request #185530 from trofi/restore-stage-1-strip
nixos/stage-1: srestore striping of bin/ and lib/
2022-08-11 08:50:45 +01:00
Jörg Thalheim 5a436f538f
Merge pull request #179619 from Informatic/plymouth-systemd-stage1-themes
nixos/plymouth: fix theme dependency resolution in systemd stage 1
2022-08-11 08:38:33 +01:00
ajs124 f763710065 nixos/udisks2: don't enable by default
This was enabled by default in 18a7ce76fc
with the reason that it would be "useful regardless of the desktop
environment.", which I'm not arguing against.

The reason why this should not be enabled by default is that there are a
lot of systems that NixOS runs on that are not desktop systems.
Users on such systems most likely do not want or need this feature and
could even consider this an antifeature.
Furthermore, it is surprising to them to find out that they have this
enabled on their systems.
They might be even more surprised to find that they have polkit enabled
by default, which was a default that was flipped in
a813be071c. For some discussion as to why
see https://github.com/NixOS/nixpkgs/pull/156858.

Evidently, this default is not only surprising to users, but also module
developers, as most if not all modules for desktop environments already
explicity set services.udisks2.enable = true; which they don't need to
right now.
2022-08-11 02:47:34 +02:00
Sergei Trofimovich 5ad2e70f95
Merge pull request #181079 from profianinc/init/nixos/amd-sev
nixos/amd.sev: init
2022-08-10 23:32:39 +01:00
adisbladis 053ab2f7a8
Merge pull request #185153 from puppe/enable-container-warning
nixos/nixos-containers: Fix ineffective warning
2022-08-10 23:24:14 +08:00
Franz Pletz a7f89ddd63
Merge pull request #185763 from srhb/zfs-scrub-synchronously
nixos/zfs: scrub synchronously
2022-08-10 15:20:52 +02:00
Sandro 43ee224113
Merge pull request #185629 from mlyxshi/master 2022-08-10 14:47:29 +02:00
zowoq eb6a50aa14 Revert "Update preface.xml (#185868)"
This reverts commit 9bbdfff80c.

manual fails to build
2022-08-10 20:26:01 +10:00
Flávio Martins Prado 9bbdfff80c
Update preface.xml (#185868)
Corrected the link to matrix on the manual preface (it was broken)
2022-08-10 08:31:43 +01:00
Bernardo Meurer 4bd7ee8870
Merge pull request #185301 from lovesegfault/geoclue-wifi-wait 2022-08-09 23:15:22 -07:00
Bernardo Meurer ee0b8a7eaa
nixos/geoclue2: wait for network to be up when wifi provider is enabled 2022-08-09 23:52:50 -04:00
Mario Rodas 0ac85cc7e8
Merge pull request #184003 from Izorkin/update-peertube
peertube: 4.2.1 -> 4.2.2
2022-08-09 21:47:34 -05:00
tirex 8f9ef1c30e headscale: fix tls challengeType enum possible values 2022-08-10 03:09:41 +02:00
Kira Bruneau b739495304
Merge pull request #185068 from kira-bruneau/linuxPackages.xpadneo
nixos/xpadneo: don't disable ertm on kernel 5.12 or later
2022-08-09 18:54:37 -04:00
Bernardo Meurer a26aa97276
Merge pull request #185463 from phaer/patch-1
zfs: Make zpool available for zpool-expand-pools
2022-08-09 15:48:18 -07:00
Janne Heß 1120326a5b
Merge pull request #185067 from stigtsp/refactor/stc-no-net-debus
nixos/switch-to-configuration: replace Net::DBus with busctl
2022-08-09 20:28:49 +02:00
Thiago Kenji Okada 35348fcc07
Merge pull request #182831 from otavio/topic/use-postStop-for-restic
nixos/restic: use postStop for `backupCleanupCommand`
2022-08-09 18:39:42 +01:00
Izorkin 0b98d77ff5
nixos/peertube: fix start service 2022-08-09 18:58:02 +03:00
Lara 87942da08e
nixos/sssd: Add secrets handling
Currently, it is not possible to supply sensitive credentials like
`ldap_default_authtok` without writing them to the nix store. This
This commit introduces a new option `environmentFile` where those
credentials can be supplied via environment substitution.
2022-08-09 17:28:37 +02:00
Michael Adler d8b356caaf fix: ssh-keygen fails if directory does not exist 2022-08-09 12:16:17 +02:00
Sarah Brofeldt ab2e77ea82 nixos/zfs: scrub synchronously
This prevents spurious systemd failures if the timer unit starts a new
scrub before a long-running one has finished.
2022-08-09 07:06:09 +02:00
Anderson Torres 14c47e30b8
Merge pull request #185630 from AndersonTorres/wip-hackedbox
hackedbox: init at 0.8.5.1
2022-08-08 17:57:37 -03:00
Sandro Jäckel 49da90755b
nixos/portunus: init 2022-08-08 19:14:50 +02:00
M. A 6efa5c77ed nixos/snipe-it: Add private_uploads to tmpfiles
Through testing Snipe-IT's backup feature I discovered that it expects
the `${dataDir}/storage/private_uploads` folder to be present.
2022-08-08 11:11:48 -04:00
K900 d68ba1d746 nixos/plasma5: default runUsingSystemd to on
Upstream switched as of 5.25
2022-08-08 22:31:26 +08:00
Robert Hensing 661c29c806
Merge pull request #181222 from hercules-ci/module-specialArgs
`_module.specialArgs` + unit test for nixos/documentation module
2022-08-08 11:53:10 +02:00
AndersonTorres 7b6ad60ab4 hackedbox: init at 0.8.5.1 2022-08-08 03:30:35 -03:00
mlyxshi 228a897afd
Update nitter.nix 2022-08-07 22:50:42 -07:00
illustris 9c16c997a6 nixos/hadoop.hbase: fix indentation 2022-08-07 21:21:45 +02:00
illustris dffa97f03c nixos/hbase-standalone: add mkRenamedOptionModule and rename file 2022-08-07 21:21:45 +02:00
illustris a92ca6263a nixos/hadoop.hbase: change mkOption to mkEnableOption 2022-08-07 21:21:45 +02:00
illustris 3e212a42d7 nixos/hbase: update release notes 2022-08-07 21:21:45 +02:00
illustris d1af9d1517 nixos/hadoop: allow overriding conf files generated by site options with extraconfdirs 2022-08-07 21:21:45 +02:00
illustris 1285a586c5 nixos/hadoop: fix incorrect merging of yarnSiteInternal 2022-08-07 21:21:45 +02:00
illustris ac403b83fb nixos/hadoop: add HBase submodule 2022-08-07 21:21:45 +02:00
Martin Weinelt a171b96ed8
Merge pull request #185323 from mweinelt/nss-nspr-passthru-tests 2022-08-07 12:15:03 +02:00
Sergei Trofimovich fb324910bf nixos/stage-1: srestore striping of bin/ and lib/
commit 0507725061 ("setup-hooks/strip.sh: run RANLIB on static
archives after stripping") added an extra argument to `stripDirs()`
helper.

I did not realize it's used outside the strip hook itself. Restore
stripping by passing $RANLIB as a new argument.
2022-08-07 11:05:29 +01:00
Bobby Rong 9c16fe5b87
Merge #181918: Cinnamon 5.4
https://www.linuxmint.com/rel_vanessa_cinnamon_whatsnew.php
2022-08-07 10:07:01 +08:00
Paul Haerle 944a466373
fix whitespace 2022-08-06 21:57:14 +02:00
Paul Haerle cc477fb34d
zfs: Make zpool available for zpool-expand-pools
...if cfgExpandOnBoot == "all", otherwise it fails during runtime:
```
Aug 06 19:38:05 nixos zpool-expand-pools-start[981]: /nix/store/ka3vivdray82mi9dql12yf258gkw643l-unit-script-zpool-expand-pools-start/bin/zpool-expand-pools-start: line 3: zpool: command not found
```
2022-08-06 21:51:31 +02:00
pennae 087472b1e5 nixos/*: automatically convert option docs 2022-08-06 20:39:12 +02:00
Netali e23ace6268
nixos/mysql-auth: add VM-Test 2022-08-06 19:43:34 +02:00
Netali 1a35b5aacb
nixos/pam: move pam_unix to the end of the account chain 2022-08-06 19:43:28 +02:00
Netali f23a1e6a54
nixos: add mysql/mariadb user authentication 2022-08-06 19:39:23 +02:00
Netali 7a6c3cf4ae
nixos/nscd: use a static user instead of systemd DynamicUser 2022-08-06 19:39:22 +02:00
Luflosi dd80fa1e9b
nixos/filesystems: skip fsck for more filesystems
This commit prevents warning messages like
```
systemd-fstab-generator: Checking was requested for "/path/to/device", but it is not a device.
```
in `dmesg` when one of the filesystems 9p, cifs, prl_fs or vmhgfs is added to the list of `fileSystems`.
This happens because the generated /etc/fstab entry contains a non-zero fsck pass number, which doesn't make sense for these filesystems.
2022-08-06 15:21:57 +02:00
Lin Jian b6d45f1448 nixos/kanata: sync with version 1.0.6
- improve some descriptions
- device -> devices
- add options
  - extraArgs
  - port
- create a symlink in RUNTIME_DIRECTORY
- grant it read permission of /dev/uinput
- relax network-related restrictions when port is used
- change type of some hardening options to list to align with systemd
  - CapabilityBoundingSet
  - IPAddressDeny
  - SystemCallArchitectures
2022-08-06 15:07:44 +02:00
Emery Hemingway c0eaefb30c nixos/yggdrasil: want/before systemd's network.target 2022-08-06 07:25:15 -05:00
Martin Weinelt a65e6b08c5
nixos/tests/firefox: use pname to identify tested package 2022-08-06 11:36:37 +02:00
Bernardo Meurer 5b3a9a815d
Merge pull request #185089 from NickCao/bind
nixos/stage-1-systemd: fix initrd-fstab generation for bind mounts
2022-08-05 14:25:11 -07:00
pennae 423545fe48 nixos/*: normalize manpage references to single-line form
now nix-doc-munge will not introduce whitespace changes when it replaces
manpage references with the MD equivalent.

no change to the manpage, changes to the HTML manual are whitespace only.
2022-08-05 18:34:50 +02:00
pennae 93c57a9884
Merge pull request #185056 from pennae/option-docs-md
nixos/*: more option docs conversions
2022-08-05 17:36:49 +02:00
pennae af98bacbe0 Revert "nixos/docs: cache mergeJSON md conversion on baseOptionsJSON"
This reverts commit 52b0ad17e3.

we only needed this because mergeJSON was slow, but in the interim we
found a better solution to the slowness.
2022-08-05 17:13:47 +02:00
Robert Hensing c5abcd4270
Merge pull request #183361 from olafklingt/jane2alice
use consistently user alice for examples
2022-08-05 15:28:03 +02:00
olaf 9f041684de dont use common names as password in test 2022-08-05 14:35:10 +02:00
kilianar 02e32729c3
nixosTests.prometheus-exporters.smartctl: fix type mismatch
The method wait_for_open_port used in the smartctl test expects an int
but was given a string.

Fix the same issue in the example in the comments.
2022-08-05 19:59:00 +08:00
Franz Pletz eac2af98eb
Merge pull request #185001 from fpletz/pkgs/lyst-removal
cutelyst,virtlyst: remove
2022-08-05 13:47:25 +02:00
olaf f5e7b38c82 or consistency use bob in tests instead of john 2022-08-05 13:27:03 +02:00
olaf de0c734300 for consistency use bob in example instead of joe 2022-08-05 13:13:24 +02:00
olaf 4e13c1f958 for consistency use bob in tests instead of joe 2022-08-05 13:13:24 +02:00
olaf 5a6853b3bf use consistently user alice for examples 2022-08-05 13:13:24 +02:00
Christian Kögler 04d94dc8ff
Merge pull request #183897 from amarshall/networkd-fix-ipv6prefixes-example
nixos/networkd: Fix some invalid examples
2022-08-04 23:02:40 +02:00
kilianar 1339f1e02b nixosTests.isso: fix failing test
The test failed because the python variable port wasn't defined. We
insert the nix variable port with string interpolation instead.
2022-08-04 22:58:38 +02:00
Martin Puppe 82c64d154b nixos/nixos-containers: Fix ineffective warning
A warning regarding enabling NixOS containers and
virtualisation.containers at the same time with state versions < 22.05
had been added in commit 3c49151f15. But
this warning had accidentally been defined in the wrong place, and the
warning has therefore not actually been in effect. This commit fixes
that.
2022-08-04 22:52:16 +02:00
Martin Weinelt 7accd4b5cd
Merge pull request #185121 from mweinelt/home-assistant 2022-08-04 18:22:35 +02:00
sternenseemann 214c9d5cef
Merge pull request #184194 from NixOS/haskell-updates
haskellPackages: update hackage and stackage; GHC 9.2.4
2022-08-04 16:37:18 +02:00
Sandro 6c55138d9b
Merge pull request #184786 from danc86/fido2luks-discard 2022-08-04 15:08:58 +02:00
Sandro c70ac648b5
Merge pull request #184454 from NixOS/lightdm 2022-08-04 15:05:13 +02:00
sternenseemann 17746af0c5 Merge remote-tracking branch 'origin/master' into haskell-updates 2022-08-04 14:31:47 +02:00
sternenseemann 53b33eee25 nixos/xmonad: don't reference nonexistent package sets in docs 2022-08-04 14:29:05 +02:00
sternenseemann 531ff521d4 nixos/xmonad: rename NIX_GHC env var to XMONAD_GHC
Upstream XMonad was using our xmonad patch file for their flake build to
support our nixos module. This would of course break the build upstream
if the version we patched and their master branch diverged. We
[discussed] that it'd make sense to upstream the environment var code.
In the process it seemed sensible to rename the NIX_GHC variable as
well, since it isn't really Nix-specific – it's just a way to set the
GHC binary to execute. This change has been [implemented] upstream in an
unreleased version of xmonad now – meaning we'll be able to drop the
xmonad patch soon!

This also clarifies the situation in nixpkgs a bit: NIX_GHC is easy to
confuse with the environment variable used in the ghcWithPackages
wrapper where it is used to set an alternative prefix for a GHC-wrapper
for applications trying to discover it via e.g. ghc-paths. It is an
implementation detail in this context, as it is in the case of the
xmonad module. Since they are different implementations doing different
things, different names also make sense.

[discussed]: 36d5761b3e
[implemented]: 23f36d7e23
2022-08-04 14:29:05 +02:00
K900 1a5602e833
Merge pull request #143885 from peat-psuwit/all-hardware-reset-raspberry
profiles/all-hardware.nix: add reset-raspberry for USB on RPi 4
2022-08-04 15:28:43 +03:00