alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity
334297 commits 217 branches 121 tags 4.5 GiB
Commit graph

24424 commits

Author SHA1 Message Date
Victor Freire 47f638403e nixos/xmrig: add kernel module msr 2021-11-17 18:53:58 -03:00
Michele Guerini Rocco 90bb5d0e19
Merge pull request #146409 from aanderse/zabbix 
nixos/zabbixServer: explicitely set security.wrappers ownership
 2021-11-17 22:05:16 +01:00
Artturi e727217620
Merge pull request #145574 from l0b0/refactor/avoid-extra-empty-lines-in-etc-pamd-files 2021-11-17 21:20:42 +02:00
Artturin 0894568aee nixos/cadvisor: add zfs to path when zfs enabled 
fixes https://github.com/NixOS/nixpkgs/issues/105139
 2021-11-17 20:47:44 +02:00
github-actions[bot] c77daf4da1
Merge master into staging-next 2021-11-17 18:00:59 +00:00
Aaron Andersen ebbf93136f nixos/zabbixServer: explicitely set security.wrappers ownership 2021-11-17 11:26:14 -05:00
Victor Freire ed312a6815 nixos/xmrig: add services.xmrig to module-list.nix 2021-11-17 12:29:40 -03:00
Robert Hensing 715f634119
Merge pull request #146335 from SuperSandro2000/locate 
nixos/locate: ignore nix logs
 2021-11-17 14:17:56 +01:00
github-actions[bot] cf671bd5e9
Merge master into staging-next 2021-11-17 12:01:23 +00:00
Janne Heß ba34952f0d
Merge pull request #146268 from helsinki-systems/upd/nginx 
nginxStable: 1.20.1 -> 1.20.2
 2021-11-17 12:02:50 +01:00
Sandro 4c138f6bd6
nixos/locate: exclude by default version control systems and .cache 
follows Debian and Ubuntu
 2021-11-17 04:19:53 +01:00
Sandro a0d2a3efbb
nixos/locate: ignore nix logs 2021-11-17 02:50:02 +01:00
github-actions[bot] 90829d83e5
Merge master into staging-next 2021-11-17 00:01:49 +00:00
n0emis eeac1c543d
nixos/networkd: add BatmanAdvanced options (#145963) 
Since systemd v248 networkd supports BatmanAdvanced.
This adds the according config options to the networkd-module
 2021-11-16 23:41:17 +01:00
Robert Hensing f03db46d3d
Merge pull request #146266 from Artturin/minimalprofile1 
nixos/profiles/minimal: disable command-not-found
 2021-11-16 23:36:42 +01:00
Artturin 3f339f3cf4 profiles/base: add mtools 2021-11-17 00:26:31 +02:00
Artturin 670f5474b9 nixos/{startx,xserver,sx}: make it possible to use both a gui dm 
and startx at the same time without using lib.mkForce
 2021-11-16 23:30:27 +02:00
Artturi c366024777
Merge pull request #145758 from Artturin/swapdd 2021-11-16 22:12:55 +02:00
Artturin a7ea834b17 nixos/plex: replace literalExample with literalExpression 2021-11-16 20:37:44 +02:00
Johannes Schleifenbaum 62cec07035
nixos/mjolnir: set rawHomeserverUrl in config 2021-11-16 19:21:33 +01:00
Bernardo Meurer cf0e83f5c4
Merge pull request #137157 from rebeccaskinner/fix/nvidia-settings 
nixos/modules/hardware/video/nvidia: Fix incorrect reference to 'nvid…
 2021-11-16 10:18:16 -08:00
Sandro a0a5e0be1c
Merge pull request #139553 from andrew-d/andrew/plex-scanners 2021-11-16 19:17:31 +01:00
ajs124 c408cd921f nixos/nginx: fix SystemCallFilter after 1fc113f0df 2021-11-16 17:30:57 +01:00
Artturin 115e6e7299 nixos/profiles/minimal: disable command-not-found 
reduces size by about 1M
 2021-11-16 18:27:38 +02:00
Thiago Kenji Okada 63b4b8616b nixos/libinput: add module tests 2021-11-16 13:09:02 -03:00
Jonathan Ringer a2e621d20d
Merge remote-tracking branch 'origin/master' into staging-next 2021-11-16 07:50:20 -08:00
Vanilla 79dc6a5629
nixos/hbase: use jre8 instead of latest. 2021-11-16 22:15:46 +08:00
github-actions[bot] 617d1d1f17
Merge staging-next into staging 2021-11-16 12:02:01 +00:00
Maximilian Bosch 1e156e3b5d
Merge pull request #146178 from TredwellGit/linux 
Kernels 2021-11-15
 2021-11-16 12:02:04 +01:00
Victor Engmark ef58bbf9b7 nixos/pam: avoid extra lines in pam files 2021-11-16 19:26:43 +13:00
github-actions[bot] 112c228b4b
Merge staging-next into staging 2021-11-16 06:01:37 +00:00
Bobby Rong b4d72c7292
Merge pull request #146203 from bobby285271/pantheon 
nixos/pantheon: cleanup FAQ section
 2021-11-16 10:34:43 +08:00
Bobby Rong cd58f44937
nixos/pantheon: cleanup FAQ section 2021-11-16 10:06:24 +08:00
Bobby Rong 18d56c5c6e
Merge pull request #146094 from VergeDX/influxdb2 
nixos/influxdb2: Add Hyperlink highlight for url.
 2021-11-16 10:04:01 +08:00
github-actions[bot] 69a9c90876
Merge staging-next into staging 2021-11-16 00:02:03 +00:00
Florian Klink 4890bee027
Merge pull request #146142 from Artturin/usrneededfor 
nixos/lib: add /usr to pathsNeededForBoot
 2021-11-15 22:59:25 +01:00
sternenseemann debf4fc929 gnat: 9 -> 11 
Update the default GNAT version from 9 to 11, as GNAT >= 11 is required
to compile the 22.* AdaCore libraries.

To allow this, we need to pick a patch from ghdl's master fixing a
compilation problem with GNAT 11.
 2021-11-15 22:41:56 +01:00
Robert Scott 5e15d5da4a
Merge pull request #142522 from risicle/ris-strongswan-5.9.4 
strongswan: 5.8.1 -> 5.9.4
 2021-11-15 21:08:20 +00:00
Robert Scott d13480917a strongswan: 5.8.1 -> 5.9.4 
remove two now-included patches, add new nixos module parameter
ca_id
 2021-11-15 21:06:57 +00:00
Artturin f93a7f8b56 nixos-generate-config: automatically enable microcode updates 2021-11-15 22:28:41 +02:00
TredwellGit c783c8d859 linux/hardened/patches/5.15: init at 5.15.2-hardened1 2021-11-15 19:38:09 +00:00
github-actions[bot] cfaff97318
Merge staging-next into staging 2021-11-15 18:01:43 +00:00
Mikael Voss aeaafd1502 doc: Explain daemon(IO)NiceLevel removal in release note 2021-11-15 18:34:17 +01:00
Mikael Voss ee8e993fd4 modules/nix-daemon: Replace daemon(IO)NiceLevel options 
The nix.daemonNiceLevel options allows for setting the nice level of the
Nix daemon process. On a modern Linux kernel with group scheduling the
nice level only affects threads relative to other threads in the same
task group (see sched(7)). Therefore this option has not the effect one
might expect.

The options daemonCPUSchedPolicy and daemonIOSchedClass are introduced
and the daemonIONiceLevel option renamed to daemonIOSchedPrority for
consistency. These options allow for more effective control over CPU
and I/O scheduling.

Instead of setting daemonNiceLevel to a high value to increase the
responsiveness of an interactive system during builds -- which would not
have the desired effect, as described above -- one could set both
daemonCPUSchedPolicy and daemonIOSchedClass to idle.
 2021-11-15 18:34:17 +01:00
Artturin 83f892c511 nixos/lib: add /usr to pathsNeededForBoot 
if /usr is split from root then it has to be mounted at boot
See https://github.com/NixOS/nixpkgs/issues/146115
 2021-11-15 16:28:22 +02:00
Janne Heß bfd9fd291a
Merge pull request #145450 from Radvendii/master 
etc module: make `.text` and `.source` the same priority
 2021-11-15 14:16:45 +01:00
Taeer Bar-Yam 0bef0c38f7 lib.modules: add mkDerivedConfig 
mkDerivedConfig : Option a -> (a -> Definition b) -> Definition b

Create config definitions with the same priority as the definition of another option.
This should be used for option definitions where one option sets the value of another as a convenience.
For instance a config file could be set with a `text` or `source` option, where text translates to a `source`
value using `mkDerivedConfig options.text (pkgs.writeText "filename.conf")`.

It takes care of setting the right priority using `mkOverride`.
 2021-11-15 07:03:41 -05:00
github-actions[bot] faf5da6aed
Merge staging-next into staging 2021-11-15 12:01:44 +00:00
Thiago Kenji Okada c7a180ab0c nixos/libinput: improve docs 2021-11-15 08:55:25 -03:00
Vladimír Čunát 64065d76f4
Merge #144730: branch 'staging-next' 2021-11-15 11:52:15 +01:00
Sandro 6f0ff67bb0
Merge pull request #135026 from ckiee/cnping 2021-11-15 11:35:59 +01:00
Vanilla baeb944384
nixos/influxdb2: Add Hyperlink highlight for url. 2021-11-15 16:12:15 +08:00
Michele Guerini Rocco 78b93845a8
Merge pull request #146018 from alyssais/qemu-guest-agent 
nixos/qemu-guest-agent: use qemu_kvm
 2021-11-15 08:47:53 +01:00
Taeer Bar-Yam 0e590c91d2 etc module: make .text and .source the same priority 
Before this change, one could set environment.etc.*.text and .source.
.source would always take precedence, regardless of the priorities set.
This change means that if, for instance, .text is set with mkForce but
.source is set normally, the .text content will be the one to take
effect. If they are set with the same priority they will conflict.
 2021-11-14 18:47:09 -05:00
Andreas Fuchs 8a37d710fd nixos: zsh: Remove hack for zsh-nix-completions on nix 2.4 
The zsh-nix-completions package now sets a priority, which helps avoid
conflicts with newer nix versions without patching the package from
the module.
 2021-11-14 22:09:01 +01:00
Alyssa Ross 42adeef9ec
nixos/qemu-guest-agent: use qemu_kvm 
Since e791519f0f ("nixos/qemu-vm: use qemu_kvm"), VMs generated with
nixos-rebuild build-vm use the qemu_kvm package instead of the qemu
package.  (The difference between them is that qemu_kvm is only built
with support for the host architecture, not all architectures.)

But with this change, nixos-rebuild build-vm would now depend on
_both_ QEMUs, because the guest agent module was still using the one
from the full QEMU package.  There's no need for it to use this
instead of the lighter qemu_kvm, because the guest agent shouldn't be
affected by which platforms QEMU can emulate.
 2021-11-14 20:28:06 +00:00
Maciej Krüger dc19eaec1b
Merge pull request #144965 from mkg20001/ts-firewall 2021-11-14 21:23:55 +01:00
Alyssa Ross 4e1852096f
Merge remote-tracking branch 'nixpkgs/staging-next' into staging 
Conflicts:
	pkgs/development/tools/parsing/flex/2.6.1.nix
 2021-11-14 14:17:46 +00:00
github-actions[bot] 9b5a105856
Merge master into staging-next 2021-11-14 00:01:47 +00:00
Thiago Kenji Okada beff4b8178
Merge pull request #145802 from fgaz/domination/1.2.4 
domination: 1.2.3 -> 1.2.4, add nixos test
 2021-11-13 19:12:28 -03:00
Francesco Gazzetta df99f2326e nixosTests.domination: init 2021-11-13 23:00:20 +01:00
Sandro 95382df163
Merge pull request #138125 from juselius/unified-cgroup-fix 2021-11-13 21:21:28 +01:00
Artturin 17c61e9772 nixos/swap: remove fallocate and use dd as the main swap creation method 
https://github.com/NixOS/nixpkgs/issues/144572
https://github.com/NixOS/nixpkgs/issues/91986

nixos/swap: remove expansion if else because the file is already
recreated if file size is not the same as the configured size

nixos/swap: remove old fixme
 2021-11-13 17:49:42 +02:00
Alyssa Ross 26b89bcd16
Merge remote-tracking branch 'nixpkgs/staging-next' into staging 2021-11-13 15:30:01 +00:00
sternenseemann 1a1e32f023 Merge remote-tracking branch 'origin/master' into staging-next 
Conflicts were caused by 2043dbb6fa
interacting with b2767b69dd.
 2021-11-13 12:35:55 +01:00
Graham Christensen 87ef832e49 nixos: mjolnir: literalExample -> literalExpression 2021-11-12 21:06:17 -05:00
Graham Christensen fd1f8e1498
Merge branch 'master' into mjolnir-init 2021-11-12 20:56:14 -05:00
Sandro 312a3af375
Merge pull request #145257 from astro/openwebrx 2021-11-13 02:43:01 +01:00
Artturi 76439257f4
Merge pull request #145394 from Artturin/removedeprecated1 2021-11-13 03:19:16 +02:00
github-actions[bot] e972a20a60
Merge staging-next into staging 2021-11-13 00:02:24 +00:00
github-actions[bot] c0c7fbda14
Merge master into staging-next 2021-11-13 00:01:45 +00:00
Artturi 4e61e1242c
Merge pull request #144933 from Artturin/ananicyinit 
ananicy: init at unstable-2021-11-05
 2021-11-12 21:08:14 +02:00
github-actions[bot] 65356b24bf
Merge staging-next into staging 2021-11-12 18:01:48 +00:00
github-actions[bot] 699560194d
Merge master into staging-next 2021-11-12 18:01:08 +00:00
Sandro 6aa376ea9b
Merge pull request #138336 from shdpl/release-21.05 2021-11-12 18:43:15 +01:00
Sandro fee23ab3f1
Merge pull request #84154 from eadwu/clight/location-assertion 2021-11-12 18:09:40 +01:00
Mariusz `shd` Gliwiński 8e3d255347
[nixos/lightdm] allow for background option to be either path or color 2021-11-12 17:31:13 +01:00
Travis Athougies 82037871bb
nixos/postfix: Use better types for submissionOptions and submissionsOptions (#138205) 2021-11-12 17:28:39 +01:00
github-actions[bot] fd8fae936e
Merge staging-next into staging 2021-11-12 06:02:01 +00:00
github-actions[bot] 9a30ed0017
Merge master into staging-next 2021-11-12 06:01:24 +00:00
Maximilian Bosch 41068b4865
Merge pull request #144968 from vcunat/p/nixos-tests-seafile-unreachable 
nixosTests.seafile: link the committed test
 2021-11-12 01:30:53 +01:00
github-actions[bot] a4e03b8977
Merge staging-next into staging 2021-11-11 18:01:50 +00:00
github-actions[bot] f2d7271432
Merge master into staging-next 2021-11-11 18:01:13 +00:00
Maximilian Bosch dbe1a4804d
Merge pull request #145192 from happysalada/plausible_add_release_cookie 
plausible: add remote connection with iex
 2021-11-11 18:24:10 +01:00
Timothy DeHerrera a2e610cfca
Merge pull request #145442 from NixOS/uefi-ami 
amis: enable setting ami boot mode on registration
 2021-11-11 09:18:00 -07:00
Timothy DeHerrera f0aec20cd7
create-amis.sh: possible deprecation 2021-11-11 09:04:29 -07:00
Sandro d3f2137f5c
Merge pull request #144250 from aanderse/nixos/zabbixWeb 2021-11-11 15:21:09 +01:00
Sandro 8f5e231aae
Merge pull request #144618 from fgaz/staticjinja/4.1.1 2021-11-11 14:43:45 +01:00
github-actions[bot] 679a57d577
Merge staging-next into staging 2021-11-11 06:01:37 +00:00
github-actions[bot] f0e180170d
Merge master into staging-next 2021-11-11 06:01:03 +00:00
Timothy DeHerrera ed4170733c
amis: enable setting ami boot mode on registration 
This is important since legacy bios mode is still the default for Intel
and AMD based instances on AWS. That is, even if your image is setup to
use UEFI on the OS level, the AMI will still use BIOS unless the boot
mode is explicitly set during registration.
 2021-11-10 17:38:58 -07:00
Artturin 8743e81cd3 nixos/ananicy: init 2021-11-11 02:05:42 +02:00
github-actions[bot] 62b9b0d9e8
Merge staging-next into staging 2021-11-11 00:02:20 +00:00
github-actions[bot] b199af176d
Merge master into staging-next 2021-11-11 00:01:45 +00:00
Bernardo Meurer 9c1d31ce68
nixos/tests/installer: comment out nixos-option test for now 2021-11-10 15:57:18 -08:00
Bernardo Meurer 6a4d2207b1
nixos/test/boot: nix verify -> nix store verify 2021-11-10 15:57:00 -08:00
Astro f1020d20fa nixos/openwebrx: init 2021-11-10 23:42:18 +01:00
Artturin 0686311257 nixos/lxc-container: remove deprecated literalExample 2021-11-10 23:55:13 +02:00
Sandro 93a0ff08d8
Merge pull request #141551 from astro/collectd-plugin-config 2021-11-10 20:11:24 +01:00
github-actions[bot] 5e2757bf32
Merge staging-next into staging 2021-11-10 18:02:01 +00:00
github-actions[bot] 259e08cd22
Merge master into staging-next 2021-11-10 18:01:21 +00:00
Robert Hensing 6c690b07f7
Merge pull request #144788 from hercules-ci/double-default-qemu-diskSize 
virtualisation/qemu-vm: Double the default diskSize
 2021-11-10 17:47:29 +01:00
Anderson Torres d8f5d7f06b
Merge pull request #145227 from Synthetica9/julia-to-stable 
julia: point to -stable instead of -lts
 2021-11-10 12:58:23 -03:00
github-actions[bot] 9618986955
Merge staging-next into staging 2021-11-10 12:01:57 +00:00
github-actions[bot] 84d856a651
Merge master into staging-next 2021-11-10 12:01:22 +00:00
xaverdh 03a257e5a3
treewide: quote urls according to rfc 0045 (#145260) 
Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
 2021-11-10 11:37:56 +01:00
Bernardo Meurer 546d60c5e6
nixos/tests/misc: fix nix 2.4 support 2021-11-09 20:24:05 -08:00
github-actions[bot] d5964b8c81
Merge staging-next into staging 2021-11-10 00:02:09 +00:00
github-actions[bot] 6e4d2d1f10
Merge master into staging-next 2021-11-10 00:01:31 +00:00
Timothy DeHerrera 4d765caecd create_amis.sh: fix logic for non-zfs amis 2021-11-09 15:56:04 -08:00
Janne Heß edb295084a
Merge pull request #145181 from helsinki-systems/release-notes/openssh 
nixos/changelog: Mention OpenSSH upgrade
 2021-11-09 21:56:43 +01:00
Sandro e5ac2e1a52
Merge pull request #122452 from ju1m/tor 2021-11-09 21:50:57 +01:00
Christian Kögler 33ffba995d
NixOS: Document impurity issues with boot.binfmt.emulatedSystems (#142778) 
* NixOS: Document impurity issues with boot.binfmt.emulatedSystems

* Update nixos/modules/system/boot/binfmt.nix

Co-authored-by: Sandro <sandro.jaeckel@gmail.com>

* Update nixos/modules/system/boot/binfmt.nix

Co-authored-by: Moritz Hedtke <13287984+mohe2015@users.noreply.github.com>

* Update nixos/modules/system/boot/binfmt.nix

Co-authored-by: Moritz Hedtke <13287984+mohe2015@users.noreply.github.com>

* Update nixos/modules/system/boot/binfmt.nix

Co-authored-by: markuskowa <markus.kowalewski@gmail.com>

* Apply suggestions from code review

Co-authored-by: markuskowa <markus.kowalewski@gmail.com>

Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
Co-authored-by: Moritz Hedtke <13287984+mohe2015@users.noreply.github.com>
Co-authored-by: markuskowa <markus.kowalewski@gmail.com>
 2021-11-09 21:49:45 +01:00
Sandro Jäckel c819ee9b67
nixos/tinc: disable chroot by default 2021-11-09 21:30:18 +01:00
Eelco Dolstra 58a9cca8cd
nix-fallback-paths.nix: Update to 2.4 2021-11-09 10:47:10 -08:00
Bernardo Meurer 8aa7ae22b8
nixos/doc/manual/release-notes/rl-2111: Nix 2.4 2021-11-09 10:47:08 -08:00
Maciej Krüger dc4f539af6
Merge pull request #139286 from bachp/antennas 2021-11-09 19:43:50 +01:00
Patrick Hilhorst 6a75497278
julia: -lts -> -stable 2021-11-09 19:05:26 +01:00
github-actions[bot] 56736d0fbc
Merge staging-next into staging 2021-11-09 18:02:05 +00:00
github-actions[bot] 7414a16ee5
Merge master into staging-next 2021-11-09 18:01:23 +00:00
Bas van Dijk 8033c19932
Merge pull request #145093 from basvandijk/djbdns-softlimit-fix 
djbdns: fix crash due to data ulimit
 2021-11-09 18:41:14 +01:00
davidak 2103d78e0b
Merge pull request #144930 from artemist/bcachefs 
linux_testing_bcachefs, bcachefs-tools: upgrade
 2021-11-09 18:26:30 +01:00
Pascal Bach 9abd378c7e nixos/antennas: initial service 2021-11-09 17:00:06 +01:00
Maciej Krüger 11f1d8620a
nixos/matomo: delete tmp folder to fix borked upgrades 2021-11-09 15:14:31 +01:00
Maciej Krüger 769f20e20a
nixos/matomo: allow changing hostname easily 2021-11-09 15:10:01 +01:00
happysalada aff0f5792b plausible: add remote connection with iex 2021-11-09 08:15:53 -05:00
Janne Heß fd567ad54a
nixos/changelog: Mention OpenSSH upgrade 2021-11-09 11:38:30 +01:00
github-actions[bot] b1d2f20ea8
Merge staging-next into staging 2021-11-09 00:02:13 +00:00
github-actions[bot] 707b006bf7
Merge master into staging-next 2021-11-09 00:01:30 +00:00
Maximilian Bosch 25e6a0ad62
Merge pull request #143345 from happysalada/update_plausible 
plausible: 1.3.0 -> 1.4.0
 2021-11-08 23:48:53 +01:00
sternenseemann d14ae62671 nixos/terminfo: inherit TERMINFO* env vars also for doas 
This should mirror the behavior we implement for sudo: The TERMINFO and
TERMINFO_DIRS variables are inherited from the normal user's
environment, so terminfo files installed in the user's profile can be
found by ncurses applications running as root.
 2021-11-08 14:05:24 -08:00
Bas van Dijk b0a1847999 nixos/tests/tinydns.nix: test a few more queries 2021-11-08 21:35:29 +00:00
github-actions[bot] 9ecd6bf4df
Merge staging-next into staging 2021-11-08 18:02:05 +00:00
github-actions[bot] f14d7cb2f6
Merge master into staging-next 2021-11-08 18:01:24 +00:00
Bas van Dijk 7a8b4907e2 djbdns: fix crash due to data ulimit 
This fixes: https://github.com/NixOS/nixpkgs/issues/119066.

When `djbdns` is repeatedly queried it will crash with:

```
mmap: tinydns (842): VmData 331776 exceed data ulimit 300000. Update limits or use boot option ignore_rlimit_data.
```

So we increase the softlimit from 300000 to 4500000 as suggested in
the issue.

The `tinydns` NixOS test has been extended with testing for the faulty
behaviour.
 2021-11-08 17:28:41 +00:00
Sandro 1d30bfc9f1
Merge pull request #145050 from bb2020/swap 2021-11-08 17:28:39 +01:00
Astro 19fc2904f3 nixos/collectd: give plugins option a mergeable type 2021-11-08 17:09:56 +01:00
Peng Mei Yu 5609f84d1b nixos/webdav: init 2021-11-08 23:56:27 +08:00
bb2020 8a3a429da6 nixos/swap: add randomEncryption.allowDiscards option 2021-11-08 18:17:00 +03:00
Bas van Dijk 8cd0da0015
Merge pull request #144984 from basvandijk/prometheus-rm-option-environmentFile 
nixos/prometheus: remove services.prometheus.environmentFile
 2021-11-08 15:37:29 +01:00
fernsehmuell 4fe305186d
add opcache to list of php packages 
opcache is used later, but was never added to phpExt.
 2021-11-08 10:29:16 +01:00
github-actions[bot] aa164b77b8
Merge staging-next into staging 2021-11-08 00:02:29 +00:00
John Ericson 4f81865aa1 Merge remote-tracking branch 'upstream/master' into staging-next 2021-11-07 20:51:04 +00:00
Bas van Dijk 7f7780daa5 nixos/prometheus: throw a helpful error when services.prometheus.environmentFile is defined 2021-11-07 19:04:24 +00:00
Thiago Kenji Okada b142bd35d5 nixos/neovim: fix withRuby, add with{Python3,NodeJs} 
`withRuby` was declared but not referenced before, this commit fixes
this issue.

It also adds support for `withPython3` and `withNodeJs`.
 2021-11-07 19:40:07 +01:00
github-actions[bot] ba6336466e
Merge staging-next into staging 2021-11-07 18:01:44 +00:00
github-actions[bot] 14f1b9f2ac
Merge master into staging-next 2021-11-07 18:01:14 +00:00
illustris 8d197bffd8
nixos/proxmox-image: init (#144013) 
Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
 2021-11-07 16:02:54 +01:00
Bas van Dijk 0e4abb0df7 nixos/prometheus: remove services.prometheus.environmentFile 
The option `services.prometheus.environmentFile` has been removed since it was causing [issues](https://github.com/NixOS/nixpkgs/issues/126083) and Prometheus now has native support for secret files.
 2021-11-07 14:45:40 +00:00
Bas van Dijk dd1edacb7b
Merge pull request #142654 from yrd/prometheus-config-modules 
nixos/prometheus: add new configuration options
 2021-11-07 15:37:12 +01:00