Commit Graph

9734 Commits

Author SHA1 Message Date
Sandro
513a3ea665
Merge pull request #110680 from helsinki-systems/amuled_types 2021-01-24 13:52:02 +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
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
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
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
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
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
Fritz Otlinghaus
0a38f6da4f
nixos/tomcat: add extraGroups type (#110486) 2021-01-22 16:22:06 +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
800b90ea3f
nixos/bitlbee: Add types to options (#110446) 2021-01-22 11:07:29 +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
Symphorien Gibol
f45f22d519 nixos/evolution: enable gnome-keyring 2021-01-20 19:51:32 +01:00
Scriptkiddi
1572940688
networking, chrony, ntpd, timesyncd: add timeServers option type 2021-01-20 10:54:24 +01: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
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
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
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
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
Jan Tojnar
c0d2951fa6
Merge branch 'master' into staging-next 2021-01-15 17:46:46 +01: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
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
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