1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-30 09:31:01 +00:00
Commit graph

16216 commits

Author SHA1 Message Date
Sandro 1b77b735ea
Merge pull request #111428 from helsinki-systems/prayer
nixos/prayer: Add port type
2021-01-31 15:05:59 +01:00
Sandro cc80d6d5d4
Merge pull request #111425 from helsinki-systems/openafs
nixos/openafs: add types
2021-01-31 15:05:21 +01:00
Sandro 53f4c40d39
Merge pull request #111424 from helsinki-systems/nginx
nixos/nginx: add logError type
2021-01-31 15:05:02 +01:00
Sandro ab61ee3563
Merge pull request #111423 from helsinki-systems/netatalk
nixos/netatalk: add types
2021-01-31 15:04:52 +01:00
Sandro 5008c20426
Merge pull request #111421 from helsinki-systems/mediawiki
nixos/mediawiki: add name type
2021-01-31 15:04:14 +01:00
Sandro 49f5e8799b
Merge pull request #111420 from helsinki-systems/mailpile
nixos/mailpile add types switch port to port type
2021-01-31 15:04:01 +01:00
Sandro 60b597ad3b
Merge pull request #111419 from helsinki-systems/lshd
nixos/lshd: add types
2021-01-31 15:03:45 +01:00
Sandro 0fc3bc21ab
Merge pull request #111418 from helsinki-systems/k3s
nixos/k3s: add extraFlags type
2021-01-31 15:02:31 +01:00
Sandro af78f11035
Merge pull request #111417 from helsinki-systems/ircd-hybrid
nixos/ircd-hybrid: add types
2021-01-31 15:02:07 +01:00
Fritz Otlinghaus 58ab3a3249
nixos/bind: update zone file type 2021-01-31 14:59:54 +01:00
Fritz Otlinghaus 54e7528009
nixos/radvd: add type (#111430) 2021-01-31 13:54:30 +01:00
Fritz Otlinghaus 8de8e40d64
nixos/postfix: add types (#111426) 2021-01-31 13:52:46 +01:00
Fritz Otlinghaus d7c39c01ae
nixos/xen: add types 2021-01-31 13:47:57 +01:00
Fritz Otlinghaus 821f19a975
nixos/quassel: add types (#111429) 2021-01-31 13:46:29 +01:00
Lassulus 4c181d179b
Merge pull request #110131 from helsinki-systems/bind_types
bind: Add types for options
2021-01-31 13:44:14 +01:00
Fritz Otlinghaus 4e353723d6
nixos/unit: add stateDir and logDir types 2021-01-31 13:41:53 +01:00
Fritz Otlinghaus 9489f3450c
nixos/xtreemfs: add types 2021-01-31 13:23:26 +01:00
Fritz Otlinghaus 3ecf072d9b
nixos/yandex-disk: add types 2021-01-31 13:10:20 +01:00
Fritz Otlinghaus 1bf9ebc8b2
nixos/weechat: add binary 2021-01-31 12:59:04 +01:00
Fritz Otlinghaus 37f575cd7e
nixos/xmonad: add haskellPackages type 2021-01-31 12:57:14 +01:00
Fritz Otlinghaus 234f4fe5c4
nixos/exwm: add loadScript type 2021-01-31 12:55:40 +01:00
Fritz Otlinghaus 8f261f1552
nixos/xserver: add serverFlagsSection type 2021-01-31 12:53:41 +01:00
Fritz Otlinghaus c44f508e3e
nixos/lightdm-greeters/gtk: add type 2021-01-31 12:41:17 +01:00
Fritz Otlinghaus 1307b605d7
nixos/gnome3: add sessionPath type 2021-01-31 12:40:13 +01:00
Fritz Otlinghaus ccd2965c70
nixos/pantheon: add sessionPath type 2021-01-31 12:39:07 +01:00
Fritz Otlinghaus b9f972a5d8
nixos/cinnamon: add sessionPath type 2021-01-31 12:36:30 +01:00
Kevin Cox 969e43e394
Merge pull request #95406 from Mic92/mountpoint-type
nixos/filesystems: don't allow mountpoints with trailing slash
2021-01-31 06:28:02 -05:00
Fritz Otlinghaus 3fc73679c0
nixos/synergy: add types 2021-01-31 12:17:41 +01:00
Fritz Otlinghaus 02c592efff
nixos/svnserve: add svnBaseDir type 2021-01-31 12:15:45 +01:00
Fritz Otlinghaus a94c7ef24e
nixos/shairport-sync: add types 2021-01-31 12:14:01 +01:00
Fritz Otlinghaus 14a8446dc1
nixos/sabnzbd: add types 2021-01-31 12:12:59 +01:00
Fritz Otlinghaus c3edcddb5e
nixos/rippled: add extraConfig type 2021-01-31 12:10:14 +01:00
Fritz Otlinghaus f0932a6c41
nixos/prayer: Add port type 2021-01-31 12:01:41 +01:00
Fritz Otlinghaus b0113ee268
nixos/openafs: add types 2021-01-31 11:56:52 +01:00
Fritz Otlinghaus a55d0b80ff
nixos/nginx: add logError type 2021-01-31 11:37:38 +01:00
Fritz Otlinghaus 74cfc4d692
nixos/netatalk: add types 2021-01-31 11:31:24 +01:00
Fritz Otlinghaus e67b6193aa
nixos/mediawiki: add name type 2021-01-31 11:28:04 +01:00
Fritz Otlinghaus 295de63e90
nixos/lshd: add types 2021-01-31 11:27:20 +01:00
Fritz Otlinghaus f50a26d257
nixos/mailpile add types switch port to port type 2021-01-31 11:26:07 +01:00
Fritz Otlinghaus 3c7c9a43dc
nixos/k3s: add extraFlags type 2021-01-31 11:21:54 +01:00
Fritz Otlinghaus adacfb44cc
nixos/ircd-hybrid: add types 2021-01-31 11:17:03 +01:00
Dmitry Kalinkin 8468a9878c
Merge pull request #87856 from eadwu/kernel/same-kernel
nixos/kernel.nix: ensure same kernel is used
2021-01-30 22:13:02 -05:00
Dmitry Kalinkin efda1be800
Merge pull request #99314 from eadwu/clight/fix-config-file
nixos/clight: fix config file generation
2021-01-30 22:10:13 -05:00
Dmitry Kalinkin 161b9b2436
Merge pull request #99323 from eadwu/nvidia/hardware.nvidia.package
nixos: hardware.nvidia.package option for selecting nvidia package
2021-01-30 22:08:37 -05:00
Elias Probst 27da11972d nixos/restic: correct location of cache directory
By default, restic determines the location of the cache based on the XDG
base dir specification, which is `~/.cache/restic` when the environment
variable `$XDG_CACHE_HOME` isn't set.
As restic is executed as root by default, this resulted in the cache being
written to `/root/.cache/restic`, which is not quite right for a system
service and also meant, multiple backup services would use the same cache
directory - potentially causing issues with locking, data corruption,
etc.

The goal was to ensure, restic uses the correct cache location for a
system service - one cache per backup specification, using `/var/cache`
as the base directory for it.

systemd sets the environment variable `$CACHE_DIRECTORY` once
`CacheDirectory=` is defined, but restic doesn't change its behavior
based on the presence of this environment variable.
Instead, the specifier [1] `%C` can be used to point restic explicitly
towards the correct cache location using the `--cache-dir` argument.

Furthermore, the `CacheDirectoryMode=` was set to `0700`, as the default
of `0755` is far too open in this case, as the cache might contain
sensitive data.

[1] https://www.freedesktop.org/software/systemd/man/systemd.unit.html#Specifiers
2021-01-30 18:24:51 -08:00
Sandro fccda5aae6
Merge pull request #108819 from SuperSandro2000/nginx-module 2021-01-30 21:46:35 +01:00
Guillaume Girol 04af7c02cd
Merge pull request #108725 from veehaitch/ath_regd_optional
kernelPatches: ath driver: allow setting regulatory domain
2021-01-30 14:07:25 +00:00
Dustin Frisch 891d1aa885
nixos/nginx: serve unknown MIME-Types as binary
The built-in default for unknown MIME-Types is `text/plain` whereas the
upstream default config changes it to `application/octet-stream`. By
changing the default tpye, unknown files will be downloaded by browsers
instead of being displayed.
2021-01-30 12:52:02 +01:00
Silvan Mosberger 45a7914186
Merge pull request #109035 from turion/dev_nextcloud_php
Nextcloud: Add phpExtraExtensions
2021-01-30 02:41:13 +01:00
Sandro 548dc3cc62
Merge pull request #111125 from helsinki-systems/gocd-agent
nixos/gocd-agent nixos/gocd-server: add types
2021-01-30 02:22:03 +01:00
Silvan Mosberger aa48e205a2
Merge pull request #110787 from tfc/cartesian-product
lib/attrsets: add cartesianProductOfSets function
2021-01-29 20:22:12 +01:00
Florian Klink dfb2bc857b nixos/acme: fix docs 2021-01-29 18:56:28 +01:00
Svein Ove Aas c9f8884592 nVidia: Support dynamic (fine-grained) power management 2021-01-29 12:55:51 -05:00
Svein Ove Aas 6021ab7820 nvidia: Add AMD APU option for Prime 2021-01-29 12:55:51 -05:00
adisbladis d25c7c1450
Merge pull request #111033 from szlend/fix-oci-containers-service-depends
nixos/oci-containers: Remove dependency on system.path
2021-01-29 18:35:49 +01:00
Simon Žlender ede24160fc nixos/oci-containers: Remove dep on system.path 2021-01-29 18:29:07 +01:00
Sandro 532dd98cdb
Merge pull request #111155 from helsinki-systems/hostapd
nixos/hostapd: add interface type
2021-01-29 17:47:39 +01:00
Sandro 32fb3b7bc3
Merge pull request #111154 from helsinki-systems/hoogle
nixos/hoogle: add type
2021-01-29 17:47:26 +01:00
Matthew Bauer 6307346fd9
Merge pull request #98858 from sorki/cross/rpifw
raspberrypi-builder: allow passing firmware package as argument
2021-01-29 10:21:32 -06:00
Florian Klink 82102fc37d
Merge pull request #100356 from m1cr0man/docsupdate
nixos/acme: Docs, explain how to set permissions
2021-01-29 17:16:06 +01:00
WORLDofPEACE 3eae73d862
Merge pull request #97618 from lf-/fix-bad-caddy-configs
nixos/caddy: fix overwriting of tls settings in config
2021-01-29 10:08:46 -05:00
Anderson Torres 79256619ce
Merge pull request #108294 from GovanifY/silent-boot
boot.initrd: add verbose option
2021-01-29 11:56:20 -03:00
Scriptkiddi 679e369ba2
nixos/hostapd: add interface type 2021-01-29 13:04:50 +01:00
Scriptkiddi 3f41fbc8e8
nixos/hoogle: add type 2021-01-29 13:03:37 +01:00
Scriptkiddi 0cbbc2dfcd
nixos/hadoop: add types 2021-01-29 13:01:42 +01:00
Scriptkiddi c1b25f2529
nixos/gocd-agent nixos/gocd-server: add types 2021-01-29 12:59:55 +01:00
Gabriel Gonzalez 80f6769ebc
Don't createHome for the hydra user (#110722)
Co-authored-by: Cole Helbling <cole.e.helbling@outlook.com>
2021-01-29 09:22:49 +00:00
Sandro 1f730f2918
Merge pull request #111126 from helsinki-systems/gogoclient
nixos/gogoclient: add types
2021-01-29 09:52:35 +01:00
Scriptkiddi 5f40e68c9c nixos/consul: add types 2021-01-29 00:32:32 -08:00
Scriptkiddi f2764e1f71
nixos/gogoclient: add types 2021-01-29 08:39:51 +01:00
Jacek Galowicz 001ba3934e Use lib.cartesianProducOfSets where lib.crossLists was used 2021-01-28 23:49:05 +01:00
Scriptkiddi 624b5608c4 nixos/deluge: add type 2021-01-28 14:30:23 -08:00
Scriptkiddi 1d22f05d64 nixos/fprot: add type 2021-01-28 14:12:15 -08:00
Scriptkiddi 103ea99b99 nixos/gvpe: add types 2021-01-28 13:58:33 -08:00
Simon Žlender 683f0b8938 nixos/oci-containers: Use docker.package 2021-01-28 21:27:50 +01:00
Marijan Petričević f56089ded5 nixos/hledger-web: init module and test 2021-01-28 15:29:53 +01:00
Emery Hemingway f32d7e4e03 nixos: add services.rsyncd.socketActivated option
Define systemd-socket activation using the upstream configuration
files as a reference. The "rsyncd" systemd unit has been renamed
to "rsync" for consistency with upstream.
2021-01-28 11:22:31 +01:00
Scriptkiddi f697a31b93 nixos/elasticsearch-curator: add type 2021-01-27 11:50:19 -08:00
Scriptkiddi f8236681be nixos/felix: add types 2021-01-27 11:44:59 -08:00
Scriptkiddi f2ce0f543d nixos/flashpolicyd: add types 2021-01-27 11:44:15 -08:00
Erik Arvstedt 0b5fd3b784 qemu-guest: remove security.rngd setting
Since release 20.09 `rngd.enable` defaults to false, so this setting is redundant.

Also fix the `qemu-quest` section of the manual that incorrectly claimed
that `rngd` was enabled.
2021-01-27 18:27:34 +01:00
Sandro b237f724fc
Merge pull request #110799 from helsinki-systems/dysnomia_drop
nixos/disnix nixos/dysnomia: drop modules
2021-01-27 17:53:59 +01:00
Florian Klink 1030745555
Merge pull request #106857 from m1cr0man/master
nixos/acme: Fixes for account creation and remove tmpfiles usage
2021-01-27 17:52:16 +01:00
Jörg Thalheim 0998756db2
Merge pull request #109342 from Mic92/wrappers 2021-01-27 14:32:38 +00:00
Ninjatrappeur ab224b550c
Merge pull request #103138 from NinjaTrappeur/nin-pleroma 2021-01-27 13:28:44 +01:00
Scriptkiddi a3f4db8679
nixos/dysnomia nixos/disnix: Drop modules 2021-01-27 11:27:09 +01:00
Manuel Bärenz 0ff63a3fa6 nixos/nextcloud: Conditionally enable caching PHP extensions 2021-01-27 11:05:08 +01:00
Manuel Bärenz 6cf2b5466d nixos/nextcloud: add documentation for phpExtraExtensions option 2021-01-27 11:05:07 +01:00
Aaron Andersen f72c123b6e nixos/nextcloud: remove duplicate php.ini entries 2021-01-27 11:05:07 +01:00
Aaron Andersen 434a2783b8 nixos/nextcloud: add phpExtraExtensions option 2021-01-27 11:05:00 +01:00
Robert Hensing d2a41be2f3
Merge pull request #110707 from Infinisil/functionTo
Bring back `types.functionTo`
2021-01-27 10:50:13 +01:00
Scriptkiddi 26c4dcf8fa nixos/babeld: add type extraConfig 2021-01-26 20:06:29 -08:00
WORLDofPEACE ebc22e9921
Merge pull request #93372 from bb2020/oss
nixos/alsa: disable OSSEmulation by default
2021-01-26 19:39:42 -05:00
Scriptkiddi 5f472181f2 nixos/cntlm: add types 2021-01-26 13:17:19 -08:00
Félix Baylac-Jacqué 231c5a576a
nixos/pleroma: init
Adding a new pleroma NixOS module and its associated documentation.

co-authored-by: duponin <duponin@locahlo.st>
2021-01-26 18:11:38 +01:00
bb2020 603e14c793 nixos/alsa: disable OSSEmulation by default
OSS Emulation is considered incomplete so disabling it by default.
Using user level alsa-oss library (nix-env -iA nixos.alsaOss) over
this kernel module is recommended.
2021-01-26 15:06:33 +03:00
Julien Moutinho 39a5e2c76b nixos/freeciv: init 2021-01-26 12:33:59 +01:00
Fritz Otlinghaus d40f7dcb31 nixos/cgminer: add types 2021-01-26 12:24:48 +01:00
misuzu 1e38f0bdf9
nixos/gitlab-runner: add support for 'docker+machine' and 'docker-ssh+machine' executors (#108763) 2021-01-26 00:01:54 +00:00
Sandro 896a3428ec
Merge pull request #110444 from helsinki-systems/bacula_types
nixos/bacula: adding types to all options
2021-01-26 00:51:18 +01:00
John Ericson e34a53c4ea
Merge pull request #110803 from Ericson2314/fix-nixos-misc-linux-config
nixos treewide: Fix references to linux-kernel.target
2021-01-25 13:39:20 -05:00
John Ericson 63b02e55db nixos treewide: Fix references to linux-kernel.target
Thanks @ajs124 in
https://github.com/NixOS/nixpkgs/pull/110544#discussion_r563828722 for
catching this. According to:

    git grep 'inherit.*Platform.*platform'
    git grep ' linux-kernel'

We now don't have any remaining problems of this sort, thankfully.
2021-01-25 13:06:12 -05:00
Fritz Otlinghaus 41f4784e65
bacula: add types 2021-01-25 19:00:01 +01:00
Matthew Bauer e8338c9c1d
Merge pull request #110739 from matthewbauer/fix-binfmt-nix-sandbox
nixos/binfmt: add bash to sandboxPaths
2021-01-25 11:53:27 -06:00
Florian Klink b2f3bd4d79
Merge pull request #100155 from primeos/nixos-add-fqdn-option
nixos/networking: Add a read-only option for the FQDN
2021-01-25 16:45:45 +01:00
Aamaruvi Yogamani 30b4f71c15
nixos/auto-cpufreq: init module 2021-01-25 09:24:07 -05:00
talyz dd6ebb7871
google-compute-config: Reintroduce fetch-ssh-keys
Reintroduce the `fetch-ssh-keys` service so that GCE images that work
with NixOps can once again be built. Also, reformat the code a bit.

The service was removed in 88570538b3,
likely due to a comment saying it should be removed. It was still
needed for images to work with NixOps, however, and probably needed to
be replaced or rewritten rather than removed.
2021-01-25 14:14:00 +01:00
rnhmjoj f62d2652e2
nixos/uwsgi: set up the default runtime directory
Fix issue #110691
2021-01-25 14:05:39 +01:00
Jörg Thalheim 76360c005f
nixos/filesystems: don't allow mountpoints with trailing slash
They are semantically the same as the non-slash version and therefore
are potential source of duplicates.

Also fixes https://github.com/NixOS/nixpkgs/issues/78951

Alternative to https://github.com/NixOS/nixpkgs/pull/95308
2021-01-25 11:10:03 +01:00
Matthew Bauer 35bd8f1153 nixos/binfmt: add bash to sandboxPaths
bash is needed to run the new binfmt shell script.

Fixes #110540
2021-01-24 22:47:59 -06:00
Sandro a36bf6faf9
Merge pull request #101796 from luc65r/pkg/tilp2 2021-01-25 01:11:50 +01:00
Yorick van Pelt 9df9c1992b
beam-packages: move wxSupport arg up to package set, add beam_nox
This allows us to override the erlang wxSupport argument globally from
an overlay, fixing builds for e.g. rabbitmq with noXlibs set.
2021-01-24 21:04:52 +01:00
Sheena Artrip 52fc21b10f command-not-found: fix zsh exit code 2021-01-24 20:14:16 +01:00
Bernardo Meurer 105b9eb1b8
Merge pull request #109768 from cpcloud/nomad-datadir-cleanup
nixos/nomad: enforce specific data_dir semantics
2021-01-24 18:20:08 +00:00
Bas van Dijk 8ac4b251c8
nixos: use functionTo to prevent evaluation errors while merging
Without this patch merging options like
services.xserver.windowManager.xmonad.extraPackages
results in the evaluation error:

  error: value is a list while a set was expected, at nixpkgs/lib/options.nix:77:23

With this patch we get the desired merging behaviour that just concatenates the
resulting package lists.

(cherry picked from commit 6e99f9fdec)

Co-Authored-By: Silvan Mosberger <contact@infinisil.com>
2021-01-24 17:18:37 +01:00
Sandro 81e3b9d15b
Merge pull request #110670 from siraben/double-quotes-fix
treewide: fix double quoted strings in one-liners
2021-01-24 16:17:14 +01:00
Kim Lindberger 2632551494
Merge pull request #110689 from talyz/fish-foreign-env-function-path
nixos/fish: Fix foreign-env function path
2021-01-24 14:37:08 +01:00
Sandro 0dd579a3e6
Merge pull request #110686 from helsinki-systems/chrony_types
nixos/chrony: add types
2021-01-24 14:18:51 +01:00
luc65r 1900b6e2d7
nixos/tilp2: init 2021-01-24 14:06:42 +01:00
volth bc0d605cf1 treewide: fix double quoted strings in meta.description
Signed-off-by: Ben Siraphob <bensiraphob@gmail.com>
2021-01-24 19:56:59 +07:00
Sandro 513a3ea665
Merge pull request #110680 from helsinki-systems/amuled_types 2021-01-24 13:52:02 +01:00
Fritz Otlinghaus 31345193f0
nixos/chrony: add types 2021-01-24 13:50:35 +01:00
Robert Hensing 530df49d7a
Merge pull request #108411 from hercules-ci/vault-multiple-config-files
vault: Support multiple config files (no secrets in store)
2021-01-24 13:49:06 +01:00
Sandro 0a81d0846a
Merge pull request #110682 from helsinki-systems/buildbot_types
nixos/buildbot: add pythonPackages type
2021-01-24 13:45:05 +01:00
talyz 6230ff7dd8
nixos/fish: Fix foreign-env function path 2021-01-24 13:41:37 +01:00
Fritz Otlinghaus 6054aa2bc1
nixos/amuled: add types 2021-01-24 13:37:09 +01:00
Fritz Otlinghaus 72691e14ec
nixos/buildbot: add pythonPackages type 2021-01-24 13:20:35 +01:00
Fritz Otlinghaus 91311fcb46
nixos/autofs: add timeout type 2021-01-24 13:17:07 +01:00
Gauvain 'GovanifY' Roussel-Tarbouriech bc1b5fdfe0
boot.initrd: add verbose option 2021-01-24 07:16:21 +01:00
Sandro 51ea855376
Merge pull request #109735 from berberman/fcitx5-mozc 2021-01-24 02:47:37 +01:00
Potato Hatsue e8ffe04c79
fcitx5: update doc 2021-01-24 02:10:23 +01:00
Phillip Cloud c7c3b9e4ae nixos/nomad: remove User setting entirely 2021-01-23 19:44:37 -05:00
Phillip Cloud 2a3cb407b0 nixos/nomad: only set User if privileges are dropped 2021-01-23 19:44:37 -05:00
Phillip Cloud 5ce4ce6174 nixos/nomad: make formatting consistent in mkMerge call 2021-01-23 19:44:37 -05:00
Phillip Cloud 12b9249cf3 nixos/nomad: unconditionally set user to nomad 2021-01-23 19:44:37 -05:00
Phillip Cloud 5d0b3b7228 nixos/nomad: fix markup and remove suggestion 2021-01-23 19:44:37 -05:00
Phillip Cloud bddb7ac406 nixos/nomad: fix typo and spell out ExecStartPre usage 2021-01-23 19:44:37 -05:00
Phillip Cloud b72a46713f nixos/nomad: reformat SupplementaryGroups expression 2021-01-23 19:44:37 -05:00
Phillip Cloud b80c454459 nixos/nomad: add mkIf for StateDirectory 2021-01-23 19:44:37 -05:00
Phillip Cloud 58fe45936e nixos/nomad: move serviceConfig into mkMerge and mkIf for docker SupplementaryGroups 2021-01-23 19:44:37 -05:00
Phillip Cloud f3aa71b7ec nixos/nomad: describe the nomad cluster manager responsibilities 2021-01-23 19:44:37 -05:00
Phillip Cloud 3e00482ba8 nixos/nomad: add assertion for the value of dropPrivileges and its relation to data_dir 2021-01-23 19:44:37 -05:00
Phillip Cloud f1778cd90e
nixos/nomad: add extraSettingsFiles option to nomad service (#109761) 2021-01-23 23:52:19 +01:00
John Ericson 12881a7aa7
Merge pull request #110544 from Ericson2314/no-platform
top-level, lib: Remove platform attribute of platforms
2021-01-23 16:32:36 -05:00
tv 530d3ffbcc nixos/users: use proper name for per-user packages
Fixes #107353
2021-01-23 21:36:14 +01:00
Phillip Cloud 2861d26df5 nixos/nomad: move data_dir default setting to allow propagation of default 2021-01-23 12:50:01 -05:00
Phillip Cloud 0bbed1c273 nixos/nomad: add newline 2021-01-23 12:50:01 -05:00
Jörg Thalheim 17da58acca
Merge pull request #108242 from GovanifY/grub-additional
boot.loader.grub: add extraInstallCommands option
2021-01-23 16:18:22 +00:00
John Ericson 9c213398b3 lib: Clean up how linux and gcc config is specified
Second attempt of 8929989614589ee3acd070a6409b2b9700c92d65; see that
commit for details.

This reverts commit 0bc275e634.
2021-01-23 10:01:28 -05:00
Michael Weiss 237c20ac61
nixos/smokeping: Replace the tabs in cfg.targetConfig
This was inconsistent with the rest of the module.
2021-01-23 14:03:16 +01:00
Michael Weiss 87fb5d381f
nixos/smokeping: Add a PoC for using networking.fqdn 2021-01-23 14:03:16 +01:00
Jonathan Ringer 0bc275e634
Revert "lib: Clean up how linux and gcc config is specified"
This is a stdenv-rebuild, and should not be merged
into master

This reverts commit 8929989614.
2021-01-22 14:07:06 -08:00
John Ericson d95aebbe0e
Merge pull request #107214 from Ericson2314/linux-config-cleanup
lib: Clean up how linux and gcc config is specified
2021-01-22 15:15:58 -05:00
Kevin Griffin 515d801aee fish: add babelfish translation option
Configuration may be ran through fenv at shell start time
(as previously) or translated to fish at build time with
the babelfish package.
2021-01-22 09:24:40 -08:00
Fritz Otlinghaus 0a38f6da4f
nixos/tomcat: add extraGroups type (#110486) 2021-01-22 16:22:06 +01:00
Rémy Grünblatt cea5fca275 galene: init at 0.2 2021-01-22 15:56:05 +01:00
Anderson Torres 0f31f03f22
Merge pull request #108578 from ctem/feature/chrony
nixos/chrony: add support for Network Time Security (NTS) authentication
2021-01-22 09:36:08 -03:00
Florian Klink ad87ca737d
Merge pull request #110403 from thiagokokada/fix-renamed-option
nixos/libinput: add missing renamed module
2021-01-22 12:25:44 +01:00
Fritz Otlinghaus c1efc32740
nixos/module/jboss: Add types to options (#110451) 2021-01-22 11:11:40 +01:00
Fritz Otlinghaus 332a53728c
activemq: add type to configurationDir (#110450) 2021-01-22 11:11:05 +01:00
Fritz Otlinghaus fc0d3f8da8
nixos/crashdump: Add type to option (#110448) 2021-01-22 11:10:26 +01:00
Fritz Otlinghaus 800b90ea3f
nixos/bitlbee: Add types to options (#110446) 2021-01-22 11:07:29 +01:00
Robert Hensing bbaff89ceb
Merge pull request #109976 from hercules-ci/systemd-allow-preStart-with-ExecStartPre
nixos/systemd: allow preStart with other ExecStartPre cmdlines
2021-01-22 10:18:11 +01:00
John Ericson 8929989614 lib: Clean up how linux and gcc config is specified
The `platform` field is pointless nesting: it's just stuff that happens
to be defined together, and that should be an implementation detail.

This instead makes `linux-kernel` and `gcc` top level fields in platform
configs. They join `rustc` there [all are optional], which was put there
and not in `platform` in anticipation of a change like this.

`linux-kernel.arch` in particular also becomes `linuxArch`, to match the
other `*Arch`es.

The next step after is this to combine the *specific* machines from
`lib.systems.platforms` with `lib.systems.examples`, keeping just the
"multiplatform" ones for defaulting.
2021-01-21 22:44:09 -05:00
Thiago Kenji Okada c6cf9bcf0b nixos/libinput: add missing renamed module
Related PR #108909.
2021-01-21 19:52:57 -03:00
Guillaume Girol 7ed3d2df76
Merge pull request #103135 from symphorien/pr/92775
Evolution ews: wrap evolution and evolution data server, fix nixos module.
2021-01-21 19:42:45 +00:00
Linus Heckemann 5153deedd8
Merge pull request #108909 from thiagokokada/libinput-by-device-type
nixos/libinput: separate settings by mouse/touchpad
2021-01-21 10:43:44 +01:00
Matthew Bauer da9fc7b068
Merge pull request #108072 from matthewbauer/fix-binfmt-activation
nixos/binfmt.nix: fix running commands in binfmt
2021-01-20 16:31:53 -06:00
Symphorien Gibol f45f22d519 nixos/evolution: enable gnome-keyring 2021-01-20 19:51:32 +01:00
Scriptkiddi 2800882b4b
bind: Add types for options 2021-01-20 14:34:34 +01:00
Scriptkiddi 1572940688
networking, chrony, ntpd, timesyncd: add timeServers option type 2021-01-20 10:54:24 +01:00
WORLDofPEACE 35ad1687a7
Merge pull request #109060 from MetaDark/nixos/xdg/portal
nixos/xdg/portal: fix loading portals from systemd service
2021-01-20 03:29:16 -05:00
Robert Hensing d51d15e1cf
Merge pull request #109665 from prusnak/stdenv-lib-nixos
nixos/modules: stdenv.lib -> lib
2021-01-19 23:50:30 +01:00
Sandro f591395492
Merge pull request #108319 from KaiHa/pr/nitrokey-app-1.4.2 2021-01-19 19:20:35 +01:00
Robert Hensing 04946f4246 nixos/vault: extraConfigPaths -> extraSettingsPaths
Align with RFC42 language, even if in advance of the actual settings
attribute.
2021-01-19 18:14:29 +01:00
Robert Hensing 3936d85ec3 nixos/systemd: allow preStart with other ExecStartPre cmdlines
Declaring them as lists enables the concatenation, supporting
lib.mkBefore, lib.mkOrder, etc.

This is useful when you need to extend a service with a pre-start
script that needs to run as root.
2021-01-19 16:29:29 +01:00
Jonathan Ringer e2fcf81d2a nixos/modules: pkgconfig -> pkg-config 2021-01-19 01:16:25 -08:00
Christian Kampka f0ec10a829
treewide: remove kampka as maintainer (#109813) 2021-01-18 21:23:49 +01:00
Maximilian Bosch 2abfc93a68
nixos/grafana-image-renderer: typo fix
Since the service doesn't do a strict config check, this worked fine
before, however the settings in the block never applied properly.
2021-01-18 18:44:58 +01:00
Maximilian Bosch fbdd82bf9b
Merge pull request #109691 from nh2/manual-element-base_url
manual: Element: Fix misleading `base_url`.
2021-01-18 14:32:54 +01:00
github-actions[bot] ef2abc20bc
Merge master into staging-next 2021-01-18 06:42:35 +00:00
Kai Harries 991aba30f8 module nitrokey: drop option group
Since the update of the nitrokey-app to 1.4.2 the group option is no
longer supported.
2021-01-18 07:36:51 +01:00
Niklas Hambüchen b954e0a12f manual: Element: Fix misleading base_url.
Judging from `"${pkgs.element-web}/config.sample.json"`,
this needs be a URL starting with `https://`; without it one gets:

    Your Element is misconfigured

    Invalid base_url for m.homeserver
2021-01-18 04:43:32 +01:00
Bernardo Meurer e1340190a9
nixos/nomad: default enableDocker to true 2021-01-17 18:54:06 -08:00
Bernardo Meurer 1f8d0d771c
nixos/nomad: init
Co-authored-by: Niklas Hambüchen <mail@nh2.me>
2021-01-17 15:11:16 -08:00
Pavol Rusnak 66dc9dbb59
nixos/modules: stdenv.lib -> lib 2021-01-17 21:40:51 +01:00
Jörg Thalheim 1279bf812c
Merge remote-tracking branch 'upstream/master' into HEAD 2021-01-17 18:08:59 +01:00
WilliButz 254b510ce7
nixos/promtheus-nextcloud-exporter: update module and test
Use new command-line flags of release 0.3.0 and always answer with the
expected XML in the VM test instead of using a test-specific fixed path.

Co-authored-by: ajs124 <git@ajs124.de>
2021-01-17 15:25:18 +01:00
github-actions[bot] 9541eb734d
Merge master into staging-next 2021-01-17 12:38:49 +00:00
markuskowa 2756a5b4df
Merge pull request #109607 from alesguzik/improve_snapper_example
nixos/snapper: improve config example
2021-01-17 11:39:00 +01:00
Symphorien Gibol d671677eab nixos: rework evolution-data-server module 2021-01-17 11:13:54 +01:00
Daniel Șerbănescu e44b3c5187 evolution-with-plugins: added support for evolution-ews. 2021-01-17 11:13:54 +01:00
Ales Huzik 6e65b724be nixos/snapper: improve config example
In the default configuration we have timers for creating and deleting
snapper snapshots, and it looks like if we just create configs with
correct mountpoints we will get automatic snapshots (which either
used to be true, or seems to be only true on Archlinux according to
their wiki). In default snapper configuration TIMELINE_CREATE and
TIMELINE_CLEANUP are set to "no", so just providing configs won't
be enough for having automatic backups, which are the main usecase
for snapper. In other linux distributions you would use `snapper
create-config` to generate configs for partitions and you'd have a
chance to notice that TIMELINE_CREATE is set to no. Also, my guess is
that it might be set to no by default for safety reasons in regular distros,
so that the config won't be actioned upon until the user finishes
customizing it.
2021-01-17 19:13:35 +11:00
github-actions[bot] f46cb85082
Merge master into staging-next 2021-01-16 18:51:05 +00:00
Jörg Thalheim 21d78fa465
Merge pull request #109494 from ipetkov/nixos-zpool-trim-persistent-timer
nixos/zfs: make zpool-trim timer persistent
2021-01-16 13:20:18 +00:00
Aaron Andersen 6b0ba74baa
Merge pull request #109099 from jpotier/fix-deprecation-warning-azure-agent
nixos/azure-agent: fix deprecation warning
2021-01-16 07:52:05 -05:00
github-actions[bot] 2445824f40
Merge master into staging-next 2021-01-16 12:40:04 +00:00
Ivan Petkov e2fa74dc68
nixos/zfs: make zpool-trim timer persistent
If the machine is powered off when the zpool-trim timer is supposed to
trigger (usually around midnight) then the timer will be skipped
outright in favor of the next instance.

For desktop systems which are usually powered off at this time, zpool
trimming will never be run which can degrade SSD performance.

By marking the timer as `Persistent = yes` we ensure that it will run at
the first possible opportunity after the trigger date is reached.
2021-01-15 20:23:16 -08:00
Domen Kožar c32f5b22f1
move nixos-rebuild into pkgs 2021-01-15 20:07:38 +01:00
Jan Tojnar c0d2951fa6
Merge branch 'master' into staging-next 2021-01-15 17:46:46 +01:00
Kevin Cox bb96017198
Merge pull request #108932 from Atemu/iso-image-compress-filter
iso-image: enable XZ compress filter
2021-01-15 11:32:21 -05:00
Atemu 2fcab516c4 iso-image: enable XZ compress filter
Minimal ISO:
1m21 -> 2m25
625M -> 617M

Plasma5 ISO:
2m45 -> 5m18
1.4G -> 1.3G

Decompression speed stays about the same. It's just a few seconds for the whole
image anyways and, with that kind of speed, you're going to be bottlenecked by
IO long before the CPU.
2021-01-15 17:17:52 +01:00
Milan Pässler 4000091123
nixos/docker: change misleading error message
The socketActivation option was removed, but later on socket activation
was added back without the option to disable it. The description now reflects
that socket activation is used unconditionally in the current setup.
2021-01-15 15:00:11 +01:00
Mark Vainomaa a81c27cd54
docker: fix systemd socket activation 2021-01-15 15:53:31 +02:00
clerie 10eed48d10
nixos/gitea: make more secrets persistent (#108676)
Added JWT_SECRET and INTERNAL_TOKEN to be persistent, like SECRET_KEY and LFS_JWT_SECRET do. Also renamed some vars belonging to SECRET_KEY and LFS_JWT_SECRET to get a consistent naming scheme over all secrets.
2021-01-15 12:54:14 +01:00
Erik Arvstedt 9a283a038d
nixos-container: fix nixpkgs container options being ignored
Since the introduction of option `containers.<name>.pkgs`, the
`nixpkgs.*` options (including `nixpkgs.pkgs`, `nixpkgs.config`, ...) were always
ignored in container configs, which broke existing containers.

This was due to `containers.<name>.pkgs` having two separate effects:
(1) It sets the source for the modules that are used to evaluate the container.
(2) It sets the `pkgs` arg (`_module.args.pkgs`) that is used inside the container
    modules.
    This happens even when the default value of `containers.<name>.pkgs` is unchanged, in which
    case the container `pkgs` arg is set to the pkgs of the host system.
    Previously, the `pkgs` arg was determined by the `containers.<name>.config.nixpkgs.*` options.

This commit reverts the breaking change (2) while adding a backwards-compatible way to achieve (1).
It removes option `pkgs` and adds option `nixpkgs` which implements (1).
Existing users of `pkgs` are informed by an error message to use option
`nixpkgs` or to achieve only (2) by setting option `containers.<name>.config.nixpkgs.pkgs`.
2021-01-15 12:49:42 +01:00
Jörg Thalheim f3042e3078
Merge pull request #108862 from cpcloud/refactor-nvidia-containers 2021-01-15 11:10:09 +00:00
Jörg Thalheim 9c4a18591f
Merge pull request #109096 from ju1m/tor
nixos/tor: fix openFirewall when ORPort isInt
2021-01-15 08:37:22 +00:00
github-actions[bot] 83c50873f5
Merge master into staging-next 2021-01-15 06:40:38 +00:00
Milan 4171cd53d6
redis: make masterAuth option optional (#109417) 2021-01-15 03:21:27 +01:00
github-actions[bot] 9f69dadafd
Merge master into staging-next 2021-01-15 01:16:33 +00:00
Andreas Rammhold 3be09b94fb
Merge pull request #108860 from endocrimes/dani/fix-tmp
modules/boot: Specify the type for tmpfs mounts
2021-01-15 00:31:14 +01:00
Kevin Cox 5666f34b28
Merge pull request #91813 from Mic92/types1
nixos/*: Add types to the database module options
2021-01-14 17:04:54 -05:00
Alyssa Ross 3893d6c6d7 gitAndTools: move everything to the top level
The comment at the top of git-and-tools/default.nix said:

    /* All git-relates tools live here, in a separate attribute set so that users
     * can get a fast overview over what's available.

but unfortunately that hasn't actually held up in practice.

Git-related packages have continued to be added to the top level, or
into gitAndTools, or sometimes both, basically at random, so having
gitAndTools is just confusing.  In fact, until I looked as part of
working on getting rid of gitAndTools, one program (ydiff) was
packaged twice independently, once in gitAndTools and once at the top
level (I fixed this in 98c3490196).

So I think it's for the best if we move away from gitAndTools, and
just put all the packages it previously contained at the top level.
I've implemented this here by just making gitAndTools an alias for the
top level -- this saves having loads of lines in aliases.nix.  This
means that people can keep referring to gitAndTools in their
configuration, but it won't be allowed to be used within Nixpkgs, and
it won't be presented to new users by e.g. nix search.

The only other change here that I'm aware of is that
appendToName "minimal" is not longer called on the default git
package, because doing that would have necessitated having a private
gitBase variable like before.  I think it makes more sense not to do
that anyway, and reserve the "minimal" suffix only for gitMinimal.
2021-01-14 21:27:48 +00:00
github-actions[bot] 183b673b64
Merge master into staging-next 2021-01-14 18:54:05 +00:00
Michael Raskin 01372e6624
Merge pull request #109066 from michael-p-m-white/reenable-working-clfswm
Reenable working clfswm
2021-01-14 14:14:56 +00:00
github-actions[bot] 730ff71234
Merge master into staging-next 2021-01-14 12:42:20 +00:00
Alyssa Ross 011d073393 nixos/postfix: deprecate services.postfix.useDane
Now that smtp_tls_security_level is using mkDefault, and therefore can
be overridden, there's no need for an option for overriding it to a
specific value.
2021-01-14 10:24:31 +00:00
Alyssa Ross 9ed5ee909b nixos/postfix: allow custom smtp_tls_security_level
I run Postfix on my workstation as a smarthost, where it only ever
talks to my SMTP server.  Because I know it'll only ever connect to
this server, and because I know this server supports TLS, I'd like to
set smtp_tls_security_level to "encrypt" so Postfix won't fall back to
an unencrypted connection.
2021-01-14 10:24:31 +00:00
Michele Guerini Rocco 721a4ecfa6
Merge pull request #109114 from illustris/searx
searx: 0.17.0 -> 0.18.0
2021-01-14 10:15:37 +01:00
Jörg Thalheim dbd05a5289
Update nixos/modules/security/wrappers/wrapper.nix
Co-authored-by: Cole Helbling <cole.e.helbling@outlook.com>
2021-01-14 09:00:34 +00:00
rnhmjoj f741cccd45
nixos/searx: remove settings.yml merging script
Starting with 0.18.0, searx can merge the settings.yml automatically
with the default values, so the script is obsolete.
2021-01-14 09:48:02 +01:00
Jörg Thalheim eadffd9154
nixos/wrappers: fix applying capabilities
With libcap 2.41 the output of cap_to_text changed, also the original
author of code hoped that this would never happen.
To counter this now the security-wrapper only relies on the syscall
ABI, which is more stable and robust than string parsing. If new
breakages occur this will be more obvious because version numbers will
be incremented.
Furthermore all errors no make execution explicitly fail instead of
hiding errors behind debug environment variables and the code style was
more consistent with no goto fail; goto fail; vulnerabilities (https://gotofail.com/)
2021-01-14 08:46:57 +01:00
github-actions[bot] d247d74ff9
Merge master into staging-next 2021-01-14 06:44:24 +00:00
Sandro 7ab8f240ba
Merge pull request #109303 from ilian/fix/openldap-maintainers-typo
openldap: fix typo when specifying maintainers list
2021-01-14 07:43:50 +01:00
Jan Tojnar b813710c04
Merge branch 'master' into staging-next 2021-01-14 02:24:17 +01:00
Silvan Mosberger ffdefb66c0
Merge pull request #108966 from pstn/murmurPswitch
nixos/murmur: Add overrideable package switch
2021-01-14 01:07:56 +01:00
sephalon 76fad08473
nixos/matrix-synapse: enable HTTPS in example (#109230)
The /.well-known endpoint must use HTTPS, see specification:
https://matrix.org/docs/spec/server_server/latest#resolving-server-names.
2021-01-13 22:20:17 +01:00
ilian 52a6cc02c5 openldap: fix typo in maintainers 2021-01-13 19:15:18 +01:00
adisbladis 4003f8cbc7
treewide: emacsPackages -> emacs.pkgs & emacsWithPackages -> emacs.pkgs.withPackages
The previous names are now aliases and shouldn't be used anywhere inside nixpkgs.
2021-01-13 17:13:10 +01:00
Vladimír Čunát 9e2880e5fa
nixos ISO image: revert another part of 8ca33835ba 2021-01-13 15:25:19 +01:00
Vladimír Čunát 1a16428c17
nixos ISO image: revert a part of 8ca33835ba
Thanks @ primeos.  This wasn't really needed; my mistake.
2021-01-13 14:50:40 +01:00
Vladimír Čunát 8ca33835ba
nixos: fixup build of aarch64 minimal ISO (fixes #109252)
Perhaps it's not pretty nor precise; feel free to improve.
2021-01-13 14:05:45 +01:00
Thiago Kenji Okada cd15b3a30a nixos/libinput: separate settings by mouse/touchpad
This commits deprecates `services.xserver.libinput` for multiple
settings, one for each kind of device:

- `services.xserver.libinput.mouse`
- `services.xserver.libinput.touchpad`

Looking at `man 4 libinput`, they basically have the same options so I
simply replicated them, even if some options doesn't make sense for
mouse (`tapping` for example).

With this commit this is now possible:

```nix
{
  services.xserver.libinput = {
    enable = true;
    mouse = {
      accelProfile = "flat";
    };
    touchpad = {
      naturalScrolling = true;
    };
  };
}
```

And you will have a mouse with no natural scrolling but with accel
profile flat, while touchpad will have natural scrolling but accel
profile adaptative (default).

It is possible to support more device types
(tablets/keyboards/touchscreens), but at least looking at the
libinput manual for those devices it doesn't seem that it has any
configuration options for them. They can still be configured using
`services.xserver.inputClassSections` though, and this will work now
since there is no rule by default that matches them.

Closes issue #75007, while also making configuration of mouses and
touchpads using Nix attrs possible like said in PR #73785.
2021-01-13 09:54:28 -03:00
Mark Vainomaa b451286b1f
docker: 19.03.4 -> 20.10.2 (#108960)
This commit refactors the build process to handle Docker engine and
CLI split.
2021-01-13 11:33:14 +01:00
github-actions[bot] 318e673af0
Merge master into staging-next 2021-01-13 06:40:30 +00:00
Silvan Mosberger 0cd5058afd
Merge pull request #85842 from iblech/patch-whitebophir
whitebophir: init at 1.7.0 (package and service)
2021-01-13 03:06:34 +01:00
Ingo Blechschmidt 46292d7f86 nixos/whitebophir: init 2021-01-13 01:25:43 +01:00
Lucas Savva 514a0b6d8a nixos/acme: Fix bash issue, enable debug
I found a logical error in the bash script, but during
debugging I enabled command echoing and realised it
would be a good idea to have it enabled all the time for
ease of bug reporting.
2021-01-12 19:11:52 +00:00
Stefan Wiehler b6f8ee9f83 nixos/nextcloud: document adminpassFile permissions 2021-01-12 19:31:14 +01:00
Martin Potier de02ae9350
nixos/azure-agent: fix deprecation warning 2021-01-12 13:00:38 +02:00
Julien Moutinho 7a62c0bc95 nixos/tor: fix openFirewall when ORPort isInt 2021-01-12 10:14:14 +01:00
Kira Bruneau a13064ae27 nixos/xdg/portal: fix loading portals from systemd service 2021-01-11 19:22:22 -05:00
Michael White 952f2c76e0 nixos/clfswm: Restore working quicklisp package 2021-01-11 17:19:50 -07:00
github-actions[bot] 757ad34b82
Merge master into staging-next 2021-01-11 18:42:29 +00:00
Frederik Rietdijk 450cb04f16
nixos: hardware.nvidia.package option for selecting nvidia package
Make it possible to select a derivation to use. This also moves some
logic that belongs to the derivation back into it.
2021-01-11 13:01:48 -05:00
Edmund Wu 771199faf3
nixos/clight: fix config file generation 2021-01-11 13:01:19 -05:00
Edmund Wu 78f915a002
nixos/kernel.nix: ensure same kernel is used
Originally, changes to the kernel don't propagate to the other
derivation within the same package set. This commit allows for the
changes in the kernel to be propagated.

A distinct example is setting `boot.kernel.randstructSeed` to a non-zero
length string which would result in building 2 kernels, one with the
correct seed and the other with the zero length seed. Then, when using
an out-of-tree kernel driver, it would be built with the zero length
seed which differs from the non-zero length seed used to boot,
contradicting the purpose of the `boot.kernel.randstructSeed`.
2021-01-11 12:57:34 -05:00
Amine Chikhaoui ecf84de70c
ec2-amis: 2020-11-23 update (#104740) 2021-01-11 12:37:14 -05:00
Michele Guerini Rocco b1fb65a741
Merge pull request #101849 from rnhmjoj/searx
nixos/searx: declarative configuration
2021-01-11 18:17:10 +01:00