Commit Graph

17415 Commits

Author SHA1 Message Date
Martin Weinelt e78cb53f25
Merge pull request #133000 from NixOS/backport-132735-to-release-21.05
[Backport release-21.05] nixos/victoriametrics: set LimitNOFILE=1048576 to fix panic and restart loop
2021-08-08 14:36:00 +02:00
arcnmx 7be67825c8 nixos/pipewire: add bluez hardware database
(cherry picked from commit ef532a04436001249a7c24e13c628e970791dc7f)
Signed-off-by: Domen Kožar <domen@dev.si>
2021-08-08 12:39:11 +02:00
arcnmx 4ef889251c pipewire: 0.3.30 -> 0.3.31
(cherry picked from commit eb7e40f9c9bbf0d9f54d0a65722480abcd28c9d0)
Signed-off-by: Domen Kožar <domen@dev.si>
2021-08-08 12:38:52 +02:00
Jörg Thalheim 7174a61367
Merge pull request #130269 from NixOS/backport-125205-to-release-21.05
[Backport release-21.05] k3s: token file
2021-08-08 11:09:03 +01:00
Ivan Kozik b047dfa13d nixos/victoriametrics: set LimitNOFILE=1048576 to fix panic and restart loop
This fixes:

```
systemd[1]: Started VictoriaMetrics time series database.
victoria-metrics[379550]: 2021-08-04T19:33:39.833Z        panic        VictoriaMetrics/lib/storage/partition.go:954        FATAL: unrecoverable error when merging small parts in the partition "/var/lib/victoriametrics/data/small/2021_08": cannot open source part for merging: cannot open metaindex file in stream mode: cannot open file "/var/lib/victoriametrics/data/small/2021_08/1228_1228_20210804184120.712_20210804184121.899_16982E83CD7A763A/metaindex.bin": open /var/lib/victoriametrics/data/small/2021_08/1228_1228_20210804184120.712_20210804184121.899_16982E83CD7A763A/metaindex.bin: too many open files
victoria-metrics[379550]: panic: FATAL: unrecoverable error when merging small parts in the partition "/var/lib/victoriametrics/data/small/2021_08": cannot open source part for merging: cannot open metaindex file in stream mode: cannot open file "/var/lib/victoriametrics/data/small/2021_08/1228_1228_20210804184120.712_20210804184121.899_16982E83CD7A763A/metaindex.bin": open /var/lib/victoriametrics/data/small/2021_08/1228_1228_20210804184120.712_20210804184121.899_16982E83CD7A763A/metaindex.bin: too many open files
victoria-metrics[379550]: goroutine 629 [running]:
victoria-metrics[379550]: github.com/VictoriaMetrics/VictoriaMetrics/lib/logger.logMessage(0xbb3ea1, 0x5, 0xc001113800, 0x1e7, 0x4)
victoria-metrics[379550]:         github.com/VictoriaMetrics/VictoriaMetrics/lib/logger/logger.go:270 +0xc69
victoria-metrics[379550]: github.com/VictoriaMetrics/VictoriaMetrics/lib/logger.logLevelSkipframes(0x1, 0xbb3ea1, 0x5, 0xbe3f8b, 0x4b, 0xc000bb3f88, 0x2, 0x2)
victoria-metrics[379550]:         github.com/VictoriaMetrics/VictoriaMetrics/lib/logger/logger.go:138 +0xd1
victoria-metrics[379550]: github.com/VictoriaMetrics/VictoriaMetrics/lib/logger.logLevel(...)
victoria-metrics[379550]:         github.com/VictoriaMetrics/VictoriaMetrics/lib/logger/logger.go:130
victoria-metrics[379550]: github.com/VictoriaMetrics/VictoriaMetrics/lib/logger.Panicf(...)
victoria-metrics[379550]:         github.com/VictoriaMetrics/VictoriaMetrics/lib/logger/logger.go:126
victoria-metrics[379550]: github.com/VictoriaMetrics/VictoriaMetrics/lib/storage.(*partition).smallPartsMerger(0xc0014d7980)
victoria-metrics[379550]:         github.com/VictoriaMetrics/VictoriaMetrics/lib/storage/partition.go:954 +0x145
victoria-metrics[379550]: github.com/VictoriaMetrics/VictoriaMetrics/lib/storage.(*partition).startMergeWorkers.func1(0xc0014d7980)
victoria-metrics[379550]:         github.com/VictoriaMetrics/VictoriaMetrics/lib/storage/partition.go:933 +0x2b
victoria-metrics[379550]: created by github.com/VictoriaMetrics/VictoriaMetrics/lib/storage.(*partition).startMergeWorkers
victoria-metrics[379550]:         github.com/VictoriaMetrics/VictoriaMetrics/lib/storage/partition.go:932 +0x6c
systemd[1]: victoriametrics.service: Main process exited, code=exited, status=2/INVALIDARGUMENT
systemd[1]: victoriametrics.service: Failed with result 'exit-code'.
systemd[1]: victoriametrics.service: Consumed 587ms CPU time, received 6.5K IP traffic, sent 1.7K IP traffic.
systemd[1]: victoriametrics.service: Scheduled restart job, restart counter is at 2064.
systemd[1]: Stopped VictoriaMetrics time series database.
systemd[1]: victoriametrics.service: Consumed 587ms CPU time, received 6.5K IP traffic, sent 1.7K IP traffic.
systemd[1]: Starting VictoriaMetrics time series database...
```

(cherry picked from commit fb6fbcb85cd0167c9759b82f16013777327c07e5)
2021-08-07 10:39:13 +00:00
Artturi a870b495c3
Merge pull request #128977 from NixOS/backport-128865-to-release-21.05 2021-08-07 00:17:26 +03:00
Artturi c46a7373e7
Merge pull request #129438 from NixOS/backport-126158-to-release-21.05
[Backport release-21.05] nixos/btrfs: handle new checksum types in initrd
2021-08-07 00:10:39 +03:00
Artturi 739b046784
Merge pull request #130178 from NixOS/backport-129978-to-release-21.05 2021-08-06 20:05:54 +03:00
Artturi af5f7e15a0
Merge pull request #125224 from NixOS/backport-124991-to-release-21.05
[Backport release-21.05] nixos/pam: use new plasma5Packages, fixes #124973
2021-08-06 17:17:39 +03:00
davidak 3f0926f6b5 nixos-icons: fix icons not installed when documentation disabled
(cherry picked from commit aa8373ab1b98b700c411eac1fe9e3d858a802909)
2021-08-04 19:39:21 +00:00
Jörg Thalheim 51cfc3c6db
Merge pull request #132536 from NixOS/backport-129413-to-release-21.05
[Backport release-21.05] nixos/binfmt: run binfmt activation script after mounting /run
2021-08-03 17:35:01 +01:00
Silvan Mosberger 6f2e900e10
Merge pull request #132482 from Infinisil/vbox-size-backport
[backport] vbox-image: add new option to set free space in image
2021-08-03 17:38:11 +02:00
Kazutoshi Noguchi 3d3ced33c9 nixos/binfmt: run binfmt activation script after mounting /run
binfmt activation script creates /run/binfmt before mounting /run
when system activation.

To fix it I added dependency to specialfs to binfmt activation
script.

(cherry picked from commit bf227785854c9fd4a14c20db12dd6d3ebaf02981)
2021-08-03 11:24:05 +00:00
davidak 1fb9572267
Merge pull request #125221 from NixOS/backport-124404-to-release-21.05
[Backport release-21.05] Small option type adjustments
2021-08-03 06:33:12 +02:00
Luke Granger-Brown 2194711ae0 nixos/virtualbox-image: cast baseImageFreeSpace into str
This fixes an evaluation error that's blocking the nixos-unstable
channel (#132328).

(cherry picked from commit b5fab53628e8f080bae24ea1396f72d9d21e1f9b)
2021-08-03 02:47:14 +02:00
lassulus a2a5df1e63 vbox-image: add new option to set free space in image
(cherry picked from commit a6700d75f38cda83367a8af84651a2a72ce0f3ef)
2021-08-03 02:45:28 +02:00
Maximilian Bosch 985d2d0dec nixos/captive-browser: fix startup
It seems as since Chromium 92, `chromium` crashes on startup if
`XDG_CONFIG_HOME` points to a read-only (store-)path.

(cherry picked from commit 8c35a69a6ea206204ddfd3116c4497020b9f2724)
2021-08-02 18:22:00 +00:00
Domen Kožar 07255eea7b enableRedistributableFirmware: add rtw89-firmware
(cherry picked from commit 749620cd4f8001d1509c6af150814515003f3e72)
2021-08-02 15:56:36 +00:00
David Arnold a791442a31 nixos/nix-daemon: fix registry flake type
Before this commit, the `flake` option was typed with `types.unspecified`.

This type get's merged via [`mergeDefaultOption`](ebb592a04c/lib/options.nix (L119-L128)), which has a line
```nix
else if all isFunction list then x: mergeDefaultOption loc (map (f: f x) list)
```

`lib.isFunction` detects an attrs in the shape of `{__functor = ...}` as
a function and hence this line substitutes such attrs with a function
(f: f x).

If now, a flake input has a `__functor` as it's output, this will
coerce the once attrs to a function. This breaks a lot of things later
in the stack, for example a later `lib.filterAttrs seive <LAMBDA>` will
fail for obious reasons.

According to @infinisil, `types.unspecified` is due to deprecation. In
the meantime this PR provides a specific fix for the specific problem
discovered.

(cherry picked from commit ecae25c3ef137d972e909eb0e85960d90481789e)
2021-08-01 22:09:08 +00:00
Robert Hensing 3ed3b163aa
Merge pull request #131876 from NixOS/backport-131760-to-release-21.05
[Backport release-21.05] nixos/installer: force root fs type
2021-08-01 23:06:37 +02:00
Vladimír Čunát 11c662074e
Merge #131892: nix-fallback-paths.nix: 2.3.14 -> 2.3.15
... into release-21.05 as a part of fixing #126141.
(I think; I don't know how often the fallback gets used in practice.)
2021-07-31 08:57:18 +02:00
Martin Weinelt 0c50198047 nixos/bird: fix bird/bird6 description
(cherry picked from commit d902365913fd65abc2d5d5298c2b9b0beda2f2ca)
2021-07-30 06:44:37 +00:00
Eelco Dolstra 3460fd6959 nix-fallback-paths.nix: Update to 2.3.15
(cherry picked from commit 512ee6db3997920c51b2a15c3510683aac934b31)
2021-07-28 21:52:32 +00:00
David Arnold f6754032ee nixos/installer: force root fs type
installer media can be used on top of existing host configs. In such
scenarions, root fs types will already be defined.

Before this change, this will inevitably lead to the following error:
```console
error: The option `fileSystems./.fsType' has conflicting definition values:
       - In `/nix/store/2nl5cl4mf6vnldpbxhrbzfh0n8rsv9fm-source/DevOS/os/hardware/common.nix': "ext4"
       - In `/nix/store/jbch90yqx6gg1h3fq30jjj2b6h6jfjgs-source/nixos/modules/installer/cd-dvd/iso-image.nix': "tmpfs"
```

With this patch, the installers will override those values according to
their own local requirement.

Use `mkOverride 60` so that conscientious overriding specially targeted
at the installer, e.g. with `mkForce` is still straight forward.

(cherry picked from commit c219fdffad3fa76c43824bee34d5fb424ff95b87)
2021-07-28 20:27:51 +00:00
Michael Francis 6526d0e5c3
Only include ipsecTools if using ipsec
(cherry picked from commit adc368d2fc7dd74beb8486ff72880ed0212abb0d)
2021-07-27 19:46:56 +02:00
Niklas Hambüchen 0a532d8b22
Merge pull request #128818 from NixOS/backport-128546-to-release-21.05
[Backport release-21.05] kubernetes: make tests pass by fixing a conntrack-tools dep and a missing dir
2021-07-27 16:18:00 +02:00
Luke Granger-Brown 17b1b28402
Merge pull request #130978 from NixOS/backport-124799-to-release-21.05
[Backport release-21.05] nixos/unbound: fix define-tag option
2021-07-25 10:14:27 +01:00
Valentin Conrad 6a09c14a33 nextcloud: remove expires header
nextcloud default nginx config did not include the expires config
see: https://docs.nextcloud.com/server/latest/admin_manual/installation/nginx.html

(cherry picked from commit ceef268c4b8cca80bd8c9b73bc2b323be13e0970)
2021-07-23 10:33:24 +00:00
Timothy DeHerrera 6322c5baf7 zsh: include completions for nix-* commands
(cherry picked from commit 6dbf8c04097c8961bb1cb9cb319fee42eb19ab7a)
2021-07-22 14:29:13 +00:00
Timothy DeHerrera b16eb24c4d zsh: format module with nixpkgs-fmt
(cherry picked from commit 9ad645dce8e11a3ffcf27cd797abc99476c837f0)
2021-07-22 14:29:13 +00:00
Timothy DeHerrera a37709b232 zsh: remove conflicting nixUnstable completions
(cherry picked from commit d687fe88fdbb00b89f4e5b82824c7b187659d648)
2021-07-22 14:29:13 +00:00
Marc 'risson' Schmitt 49cd45c508 nixos/unbound: fix define-tag option
Signed-off-by: Marc 'risson' Schmitt <marc.schmitt@risson.space>
(cherry picked from commit 6b12cff0b5746af364066d1bcb2bc2563e978aa8)
2021-07-21 20:12:10 +00:00
Maximilian Bosch 5aefc30fb8
Merge pull request #130797 from NixOS/backport-130538-to-release-21.05
[Backport release-21.05] nixStable: 2.3.12 -> 2.3.14
2021-07-21 13:35:42 +02:00
Jan Tojnar 63ee5cd99a nixos/ddccontrol: init
(cherry picked from commit fc1e0e863c60dc9740304de36ffa883cbaddd760)
2021-07-20 22:32:07 -04:00
Maximilian Bosch 792c0160c6 nixStable: 2.3.12 -> 2.3.14
Changes: https://github.com/NixOS/nix/compare/2.3.12...2.3.14

Since this is a bugfix release that wasn't pushed to `nixpkgs`, I
decided to take care of it.

As it's usually done in `upload-release.pl`[1], I updated the
fallback-paths accordingly and used eval `1687468`[2] for this with Nix
2.3.14.

Also added a fallback-path for `aarch64-darwin` as Nix 2.3.14 seems to
support this now[3].

[1] https://github.com/NixOS/nix/blob/2.3-maintenance/maintainers/upload-release.pl
[2] https://hydra.nixos.org/eval/1687468
[3] 14262b86cc

(cherry picked from commit e66237af154f63998eaf45233763b2e535b78b95)
2021-07-20 15:13:18 +00:00
talyz 23c806f963 nixos/discourse: Update plugin documentation
Update the documentation regarding plugins to reflect recent changes.

(cherry picked from commit 20548f050e72a789ebbfe413b0fe7aa815e55c27)
2021-07-15 12:54:00 +00:00
Kim Lindberger 5fd730e210
Merge pull request #128823 from NixOS/backport-127931-to-release-21.05
[Backport release-21.05] discourse: Fix plugin support
2021-07-15 14:50:11 +02:00
Jörg Thalheim eacc0f7750 k3s: add tokenFile option
To avoid having secrets in the nix store.

(cherry picked from commit 11a38f62f0bfcb655e339498897b0d25ac37fa97)
2021-07-15 12:40:46 +00:00
Jörg Thalheim d15de4c6db nixos/k3s: add to environment.systemPackages for adminstration
(cherry picked from commit 852739337bd5ab4c57fd1eab9e62e76ac2f1a7cc)
2021-07-15 12:40:46 +00:00
Jeremy Kolb 94f0dea33b open-vm-tools: Copy the udev files over correctly
(cherry picked from commit 42ea61bc7dacc8360eb87152635f5f14f003c18d)
2021-07-14 13:18:01 +00:00
Yureka d36cd9e039 nixos/gitlab: improve psql assertion message
(cherry picked from commit c5a0551dc49b287d12d043298f9b7a4c8c355885)
2021-07-13 15:27:21 +02:00
Yureka e4deb36262 nixos/gitlab: require at least postgresql 12
(cherry picked from commit 2297eb35e5b92f657b85dfe4ee535e2323e360c1)
2021-07-13 15:27:21 +02:00
Maximilian Bosch f8b79de69e
nextcloud22: init at 22.0.0
Simplified, non-breaking version of e05f4101c16f08058a14ac4335886567e1ffe987.
2021-07-12 23:27:57 +02:00
illustris fa8a6d7e0a nixos/jitsi-meet: include jitsi prosody plugins in prosody extraPluginPaths
(cherry picked from commit e0089c38ca2f9f2b9a46ffcf74a9908f53d51459)
2021-07-10 00:02:59 +02:00
illustris 27d38294c6 nixos/jitsi-meet: Update jitsi prosody configs
Changes made as per b6f7f8fba7

(cherry picked from commit 34b9ba2e6161e68febe4312c96c089d707472d5e)
2021-07-10 00:02:59 +02:00
Robert Hensing 809cc5bf28 nixos/postgresqlBackup: Only replace backup when successful
Previously, a failed backup would always overwrite ${db}.sql.gz,
because the bash `>` redirect truncates the file; even if the
backup was going to fail.
On the next run, the ${db}.prev.sql.gz backup would be
overwritten by the bad ${db}.sql.gz.

Now, if the backup fails, the ${db}.in-progress.sql.gz is in an
unknown state, but ${db}.sql.gz will not be written.
On the next run, ${db}.prev.sql.gz (our only good backup) will
not be overwritten because ${db}.sql.gz does not exist.

(cherry picked from commit 81c8189a841728a813bcde8604b80427fcf33522)
2021-07-07 23:45:22 +00:00
Robert Hensing 44c232bbeb nixos/postgresqlBackup: Use PATH for readability
(cherry picked from commit c586e42763e0f093d16b4b655759cb340171ad42)
2021-07-07 23:45:22 +00:00
Atemu 95fc4eb09d nixos/btrfs: handle new checksum types in initrd
Can't mount a root formatted with those otherwise

(cherry picked from commit e85f2f43bda6e0fe245005b710091f854a7f0200)
2021-07-06 14:00:40 +00:00
Lucas Savva c192fd5d4c nixos/acme: Ensure certs are always protected
As per #121293, I ensured the UMask is set correctly
and removed any unnecessary chmod/chown/chgrp commands.
The test suite already partially covered permissions
checking but I added an extra check for the selfsigned
cert permissions.

(cherry picked from commit 083aba4f83b105c30a1386bdb214cb6c85e119e6)
2021-07-06 13:14:03 +00:00
Bjørn Forsman 688f6ec8d7 nixos/hamster: fix programs.hamster.enable text
mkEnableOption already adds "Whether to enable" and ends with a ".", so
remove that duplication from the help text.

Also reword it slightly while at it.

(cherry picked from commit 5d3dca497ba7d20c662e8144c0bedb69433a9e4a)
2021-07-05 14:32:16 +02:00
Philipp Hausmann d2352585bc slimserver: Fix user creation
(cherry picked from commit 8bfd84cf3c63b32299430cb15e53501922af893c)
2021-07-02 10:58:22 +00:00
Aaron Andersen 0315b6a3c7 zabbixAgent: add bash to $PATH
(cherry picked from commit a0a11fd22c5786aa7c0f025115506c6a83221951)
2021-07-01 03:11:24 +00:00
talyz 3b84448e67 discourse: Fix plugin support
For plugins to work properly, their assets need to be precompiled
along with the rest of Discourse's assets. This means we need to build
new packages when the list of plugins change.

(cherry picked from commit 9af3672f4faaafba0ce0129a87fc7925c14eeb61)
2021-06-30 22:07:25 +00:00
Alexandru Scvortov 3ee32f0ea9 kubernetes: fix conntrack-tools package name, missing dir, and tests
(cherry picked from commit ab1567e8121dfcdb4f7a395b39a3a345f41c7474)
2021-06-30 21:26:24 +00:00
Dima 892a6d4ce6 nixos/duplicity: fix typo in subcommand
In https://github.com/NixOS/nixpkgs/pull/120622 cleanup options were
added, but `remove-all-inc-of-but-n-full` was misspelled and as such
was not functioning.

(cherry picked from commit 0a977cf125a86b5580de6e05bfeaa07aa54c4a78)
2021-06-27 16:38:12 +00:00
Niklas Hambüchen df8bcca5fb
Merge pull request #128161 from NixOS/backport-128150-to-release-21.05
[Backport release-21.05] etcd: refactor the service to add etcd to systemPackages instead of the etcdctl alias
2021-06-27 14:28:07 +02:00
Alexandru Scvortov 733b7eedff etcd: fix old aliased package name to make tests pass
(cherry picked from commit e08b3f0c8580d1944c1e5a64d44b965c1499ddda)
2021-06-26 01:36:30 +00:00
Florian Klink f4b92c2975 nixos/getty: add missing --keep-baud
systemd ships `units/serial-getty@.service.m4` with the `--keep-baud`
option.

We override that unit, and didn't add the `--keep-baud` option. (We have
it in our other getty options there).

Having `--keep-baud` in `serial-getty@` makes a lot of sense - the
console keeps working if it's initialized with a less standard baud
rate, such as the [Helios64](https://wiki.kobol.io/helios64/intro/).

(cherry picked from commit ba42d639f16dc774f4fa661243b640b034d7be0a)
2021-06-25 23:32:04 +02:00
Florian Klink e453a9ed9b nixos/sdcard: make firmware partition offset configurable
Different boards using u-boot SPL require to write to different
locations. Sometimes, the 8MiB gap isn't sufficient - rk3399 boards
write to 0x16384 for example, which is at 8MiB, thus overriding the
fat32 partition with the SPL.

(cherry picked from commit 1db54a5522a2d523e406ce8713bfe88bb9e3f657)
2021-06-25 20:55:28 +00:00
talyz d726b9c204 nixos/fail2ban: Remove `reloadIfChanged = true`
This makes the service fail when upgrading the package, so let's
properly restart it instead.

(cherry picked from commit b4c069b1476a92a540e906ef95cd7fb380d29c63)
2021-06-20 16:01:18 +00:00
Martin Weinelt 6ee61426da nixos/solanum: implement reload and allow config changes
Reload only works with a static configuration path as there is no way to
pass the dynamically generated config path to a running solanum
instance, therefore we symlink the configuration to
/etc/solanum/ircd.conf.

But that will prevent reloads of the ircd, because the systemd unit
wouldn't change when the configuration changes. That is why we add the
actual location of the config file to restartTriggers and enable
reloadIfChanged, so changes will not restart, but reload on changes.

(cherry picked from commit 60c62214f5a3c7db6aa30d8a8e02c863b6abcf0a)
2021-06-16 02:09:04 +02:00
lassulus 0a8684cadd solanum: remove obsolete BANDB settings/patches
(cherry picked from commit 8eb5701aaf0eb7ad842a67f09e2f80826ac1ce80)
2021-06-16 02:09:00 +02:00
Robert Hensing 91d03cd360 nixos/ssh: Document authorizedKeysFiles properly
(cherry picked from commit dab747106e20268e6d3a7c1a758185bc75507bef)
2021-06-15 19:42:28 +00:00
Robert Hensing 89ecb51a6a nixos/ssh: Add an example of verbatim keys
This confused someone on SO.

(cherry picked from commit 8352cc9a23a5fea11d467a5b8341b24cd162c62a)
2021-06-15 19:42:27 +00:00
Domen Kožar 57606ed0af
Merge pull request #126605 from NixOS/backport-125311-to-release-21.05
[Backport release-21.05] pipewire: 0.3.27 -> 0.3.30
2021-06-15 18:44:16 +02:00
talyz d3d1674b3f gitlab: Make sure the FOSS version isn't identified as EE
(cherry picked from commit 8f16b1629155ad0022bb7830739081532d1bae50)
2021-06-15 15:16:10 +00:00
Vladimír Čunát 6d286be97a
Merge branch 'release-21.05' into staging-next-21.05
This brings not that many rebuilds but still some.
2021-06-12 07:21:42 +02:00
Bjørn Forsman a0fc6a7861 nixos/jenkins-job-builder: add support for folder jobs
Add support for folder jobs
(https://plugins.jenkins.io/cloudbees-folder/) by reworking the service
to support nested jobs.

This also fixes this deprecation warning (as a happy side effect):

  WARNING:jenkins_jobs.cli.subcommand.test:(Deprecated) The default output behavior of `jenkins-jobs test` when given the --output flag will change in JJB 3.0. Instead of writing jobs to OUTPUT/jobname; they will be written to OUTPUT/jobname/config.xml. The new behavior can be enabled by the passing `--config-xml` parameter

(cherry picked from commit 4bcb22e17aa8677c6b3fc4625732d4da791a576f)
2021-06-11 23:08:41 +02:00
Jan Solanti c2628780fc pipewire: 0.3.27 -> 0.3.30
(cherry picked from commit c702cc43213dce2573adb924ab9c67522616aea6)
2021-06-11 14:52:30 +00:00
Natan Lao b3ec6fd959 nixos/nvidia: fix hardware.nvidia.package example
(cherry picked from commit 86a31cc9719ed409d523d4f738aa2a994d79ff9e)
2021-06-08 20:59:02 -07:00
Jonathan Ringer 8e20586f52
Merge branch 'staging-next-21.05' into staging-21.05 2021-06-08 12:21:49 -07:00
rnhmjoj f2c9d568c8 nixos/wireless: only warn for no interfaces
A hard failure breaks the NixOS installer, which can't possibly
know the interface names in advance.

(cherry picked from commit be01320a6c39867eac0a20b4dfe04680d3b1ce26)
2021-06-08 08:52:41 -07:00
rnhmjoj df9df54d63 Revert "nixos/wireless: make wireless.interfaces mandatory"
This reverts commit 030a521adc9510207dd9f06b8d8b552ff7d999f9.

(cherry picked from commit eba5f5c1e5a61ef65a970c699b9f93aff87448bf)
2021-06-08 08:52:41 -07:00
Jan Tojnar 403fb2db47 nixos/gnome: fix option label
It is no longer GNOME 3.

(cherry picked from commit 99fcca7b6bc850e1c1c47e9fbad41fc3264170f6)
2021-06-07 17:34:08 -07:00
AmineChikhaoui 77e8ea81e3 ec2-amis: add release 21.05
(cherry picked from commit b7d74194b49c3b3f85d52e85054283211bce6c11)
2021-06-06 17:09:30 -07:00
rnhmjoj 662f2d19b3 nixos/wireless: make wireless.interfaces mandatory
This is the only way to solve issue #101963, for now.

(cherry picked from commit 030a521adc9510207dd9f06b8d8b552ff7d999f9)
2021-06-06 08:38:28 +00:00
talyz a60818cacd treewide: Fix mysql alias deprecation breakage
62733b37b4 broke evaluation in all
places `pkgs.mysql` was used. Fix this by changing all occurrences to
`pkgs.mariadb`.

(cherry picked from commit 59e0120aa5c1241d48048afa615e25c65d7e366d)
2021-06-05 17:11:40 +00:00
Maximilian Bosch 3c8dcd902a nixos/mail-exporter: add note about rspamd marking probe mails as spam
(cherry picked from commit ba9768f3143c728a47515d0548025a103fca9013)
2021-06-04 14:14:35 +00:00
Maximilian Bosch d7fbcd60a3 nixos/dovecot-exporter: fix documentation for old stats
(cherry picked from commit 6fb847c55643780c1ba3a98c57ba57541ed33d14)
2021-06-04 14:14:35 +00:00
Maximilian Bosch 619cf60d25 nixos/rspamd-exporter: fix metrics
In 0.3.0 of the json-exporter[1] it was switched to a different jsonpath
library which made some changes - especially for spaces in keys -
necessary. Also I decided to remove the pretty-printed JSON as this
would interfere with the bash quoting too much. If one needs
pretty-printed output, they can still pipe the output to `jq`.

[1] https://github.com/prometheus-community/json_exporter/releases/tag/v0.3.0

(cherry picked from commit 976d668e5c5566c3e96b17d667830a0f3ed1bbb5)
2021-06-04 14:14:35 +00:00
Samuel Dionne-Riel 7953561a9d iso-image: Improve disk detection
This should help in rare hardware-specific situations where the root is
not automatically detected properly.

We search using a marker file. This should help some weird UEFI setups
where the root is set to `(hd0,msdos2)` by default.

Defaulting to `(hd0)` by looking for the ESP **will break themeing**. It
is unclear why, but files in `(hd0,msdos2)` are not all present as they
should be.

This also fixes an issue introduced with cb5c4fcd3c
where rEFInd stopped booting in many cases. This is because it ended up
using (hd0) rather than using the `search` which was happening
beforehand, which in turn uses (hd0,msdos2), which is the ESP.
Putting back the `search` here fixes that.

(cherry picked from commit 20b023b5ea63a6513a4dce7f162736a00bce5cc8)
2021-06-03 08:03:07 -07:00
Samuel Dionne-Riel 2f5e4928c0 iso-image: unqualified root → ($root)
This technically changes nothing. In practice `$root` is always the
"CWD", whether searched for automatically or not.

But this serves to announce we are relying on `$root`... I guess...

(cherry picked from commit c9bb054dd68964b0eb9a38c51bdf824bfb212fc7)
2021-06-03 08:03:07 -07:00
Samuel Dionne-Riel 190f44da28 iso-image: change date on all files
It may be that in some conditions dates earlier than 1980 on FAT on GRUB
2.06~ish will cause failures

https://github.com/NixOS/nixpkgs/issues/123376#issuecomment-845515035
(cherry picked from commit 15eaed0718515db3f2fa7d4ed71676e6069d3fb5)
2021-06-03 08:03:07 -07:00
Samuel Dionne-Riel 8cb2ce0f52 iso-image: Force gfxmode
https://www.gnu.org/software/grub/manual/grub/html_node/gfxmode.html
(cherry picked from commit f93f0e72e9ef423ed591951030f08cafd209e637)
2021-06-03 08:03:07 -07:00
zowoq 0684f78698 nixos/podman-network-socket-ghostunnel: move condition to include socket
(cherry picked from commit 72f54c32a6114a69caec30170a29837c91434aff)
2021-06-02 10:20:11 +02:00
Robert Hensing c758b69375 nixos/podman-dnsname: init
(cherry picked from commit 54f2f1e5f1c7fd34e564a84443e8490477e26eb7)
2021-06-02 10:20:11 +02:00
Robert Hensing 9e4729617b nixos/podman: Add defaultNetwork.extraPlugins
(cherry picked from commit d81631fb98ea35b107d86f5de287cf727d0dfc18)
2021-06-02 10:20:11 +02:00
Robert Hensing f28df17dfa nixos/containers: Add virtualisation.containers.containersConf.cniPlugins
(cherry picked from commit efba949352271ec77d9d5e7d54f2d16b9c53ee4f)
2021-06-02 10:20:11 +02:00
Robert Hensing 833b005e37 nixos/podman-network-socket-ghostunnel: init
(cherry picked from commit b6570e723836167640c9b7efc63f327ff17b0755)
2021-06-02 10:20:10 +02:00
Robert Hensing ffde2bb4a1 nixos/podman: Add generic networkSocket interface
(cherry picked from commit 52844efcd67028a481a24103d8e93c7ef2bf4f08)
2021-06-02 10:20:10 +02:00
Robert Hensing 0c5e6d0bea nixos/podman: Add dockerSocket.enable
(cherry picked from commit ff4d83a66727ad13da0f51d00db4eda8a8c50590)
2021-06-02 10:20:10 +02:00
Robert Hensing db05ed8b0d nixos/podman: Change podman socket to new podman group
(cherry picked from commit fb8b0a38433c8e83a53c1dc0a739c5a7ad64e2fc)
2021-06-02 10:20:10 +02:00
zowoq f63aff597b nixos/podman: install cni config from package
(cherry picked from commit 30ae7e4ba983de461c7b71d02274d184ab55244d)
2021-06-02 10:20:10 +02:00
Julien Moutinho 437b2bfe18 nixos/pam: use new plasma5Packages, fixes #124973
(cherry picked from commit 61654ca131c1431b172cc0464c83227c40331e16)
2021-06-01 13:30:11 +00:00
Daniel Nagy 4d837a7a98 nixos/monero: set port type to `types.port`
(cherry picked from commit e57465a617f4cc993a7b32f90cb9e095f2b09596)
2021-06-01 13:15:25 +00:00
Daniel Nagy ab496da138 nixos/gitlab: set port type to `types.port`
(cherry picked from commit cc5517da4c2221ee42163b69e1648cc472fcba0e)
2021-06-01 13:15:25 +00:00
Daniel Nagy 28e57cb0c7 nixos/matrix-synapse: set port type to types.port
(cherry picked from commit 8e760f485873d202a0ad4aba7a78caabc85cf5db)
2021-06-01 13:15:24 +00:00
Daniel Nagy fda7b06830 nixos/syncserver: set port type to `types.port`
(cherry picked from commit 65b32a0afe69258e3fa2fb245ea2315c8683281f)
2021-06-01 13:15:24 +00:00
Daniel Nagy 2c97740c47 nixos/gitDaemon: set port type to `types.port`
(cherry picked from commit 048c45679fe6fda60b00bf45890e5990f0e6d9f2)
2021-06-01 13:15:24 +00:00
Daniel Nagy 98d6d1dbf7 nixos/redis: set port type to `types.port`
(cherry picked from commit 0cde374a7604821ceddd24d06ae21e44de59d04c)
2021-06-01 13:15:24 +00:00