c17ec06f66
Merge pull request #60569 from dtzWill/update/vnstat-2.2
...
vnstat: 2.1 -> 2.2
2019-05-09 20:09:40 +02:00
bb7e5566c7
Merge pull request #44086 from erikarvstedt/paperless
...
paperless: add package and service
2019-05-08 17:17:49 -04:00
7261ffc18e
Merge pull request #60776 from alyssais/xerror
...
nixos/xserver: improve DM error message when X off
2019-05-08 12:19:14 +00:00
80c3ddbad8
paperless service: init
2019-05-08 09:26:32 +02:00
e5d049e469
rngd: harden service config, from arch
2019-05-07 22:53:09 -05:00
a2bdd63c4f
Merge pull request #61072 from dtzWill/feature/rngd-debug-flag
...
rngd: add option to run w/debug flag
2019-05-07 14:59:39 -05:00
87a5d8fede
Merge staging-next into staging
2019-05-07 19:30:14 +02:00
5ef1223f30
nixos/tests/docker-tools: verify order of layers in stacked images
2019-05-07 16:52:13 +02:00
10d3a0e10b
nixos/tests/hardened: test hardened malloc
2019-05-07 13:45:42 +02:00
48ff4f1197
nixos/hardened: use graphene-hardened malloc by default
2019-05-07 13:45:39 +02:00
a84be28270
nixos/malloc: configure system-wide malloc provider
...
Currently, this uses the somewhat crude method of setting LD_PRELOAD in the
system environment. This works, but should be considered a stepping stone to
a more robust solution.
2019-05-07 13:45:38 +02:00
b24a87fafe
jellyfin: remove assertion if emby enabled: no emby module exists
2019-05-07 11:04:57 +02:00
b809071ffb
rngd: add option to run w/debug flag
...
Added while testing if adding hardening
directives to the service blocked access
to various sources, might be useful in the future.
2019-05-06 23:44:38 -05:00
864f4f084a
Merge pull request #60237 from mayflower/kexec-no-clobber
...
nixos/kexec: don't clobber existing kexec-loaded kernel
2019-05-06 21:53:47 +02:00
f965fb26a9
nixos/kubernetes: upgrade CoreDNS 1.3.1 -> 1.5.0
2019-05-06 13:10:32 +02:00
4806c8c38d
nixos/all-firmware: Enable facetimehd only for i686/x86_64
2019-05-06 10:49:42 +02:00
b12ea62ec9
nixos/systemd-boot: add support for memtest86 EFI app
...
This commit adds support for installing the memtest86 EFI app and adding
a boot entry for it with systemd-boot.
2019-05-06 17:08:55 +09:00
b4941a463e
Merge pull request #59943 from romildo/fix.deepin.modules
...
nixos/deepin: use only one module for deepin services
2019-05-05 20:52:13 -03:00
f3535aeea3
nix.systemFeatures: minor fix
...
following up #59148
I forgot the default case of the architectures which do not have minor brothers whose code they can run ("westmere" or any of of AMD)
2019-05-05 22:14:24 +00:00
1ea22b8868
Merge pull request #60217 from dotlambda/home-assistant-0.92
...
home-assistant: 0.91.4 -> 0.92.2
2019-05-05 23:31:31 +02:00
78f176158c
nixos/deepin: add deepin-anything service
2019-05-05 18:01:28 -03:00
8ed9f9fedf
nixos/deepin: add dde-dock dbus service
2019-05-05 17:37:46 -03:00
9e9b96f073
nixos/deepin: install polkit local authority files in /etc
2019-05-05 17:14:42 -03:00
9a1890cafb
nixos/deepin: add deepin-screenshot dbus service
2019-05-05 17:14:42 -03:00
65c6aff217
nixos/deepin: add deepin-image-viewer dbus service
2019-05-05 17:14:41 -03:00
f239997fde
nixos/deepin: add dde-session-ui dbus service
2019-05-05 17:14:41 -03:00
1294aaece6
nixos/deepin: add dde-calendar dbus service
2019-05-05 17:14:41 -03:00
788b45fa13
nixos/deepin: add deepin-turbo systemd service
2019-05-05 17:14:41 -03:00
77fa14725f
nixos/deepin: move deepin-menu.nix into deepin.nix
2019-05-05 17:14:41 -03:00
6121a8e3b5
nixos/deepin: fix the deepin-daemon user and group
2019-05-05 17:14:41 -03:00
7c60ac71cf
nixos/deepin: add dde-api services and user/group
2019-05-05 17:14:41 -03:00
4fcaded92b
nixos/deepin: rename dde-daemon module
...
The deepin module is used to set basic dbus and systedmd services, kernel modules,
groups and users needed by the Deepin Desktop Environment.
2019-05-05 17:14:41 -03:00
7770495cd7
Merge pull request #59148 from volth/gcc.arch.v3
...
compilation for particular x86_64 architecture
2019-05-05 19:12:12 +00:00
45f58cad33
nixos/misc/nixpkgs: fixed syntax error in overlays example
...
I was pointed towards a small syntax error in the `nixpkgs.overlays`
documentation. There was a trailing semicolon after the overlay
function.
I also aligned the code a bit better so opening and closing brackets can
be visually matched much better (IMO).
2019-05-04 17:29:04 +02:00
d280603bd1
nixos/home-assistant: account for introduction of manifest.json
...
The `availableComponents` now only contain a single attribute for
every integration.
2019-05-04 12:01:23 +02:00
966ee252c2
Merge pull request #59367 from Ma27/fix-hostapd-interface-naming
...
nixos/hostapd: escape interface names for hostapd
2019-05-03 19:04:00 +02:00
a01943c7f0
Merge pull request #59856 from c00w/external_gpu
...
nixos/nvidia: Add NVIDIA optimus option to allow external GPUs
2019-05-03 10:31:11 -04:00
5ad1e9f0bf
Merge pull request #60575 from dtzWill/feature/obfs4proxy
...
obfs4: init at 0.0.10, use in tor-browser-bundle's, tor service
2019-05-03 09:48:02 +00:00
329df95958
vnstat: 2.1 -> 2.2
...
https://humdi.net/vnstat/CHANGES
* enable tests
* add hardening options from upstream's
example service
* fix "documentation" setting in service:
either needs to be `unitConfig.Documentation`
(uppercase) or lowercase but not within unitConfig.
2019-05-03 01:47:57 -05:00
6698c37fe1
Merge pull request #60630 from etu/drop-emby
...
emby: Drop package and module and refer to jellyfin
2019-05-03 07:58:30 +02:00
bc5b262c9c
Merge pull request #60333 from azazel75/fix-grafana_reporter
...
grafana_reporter: Fix library function name
2019-05-03 06:29:09 +02:00
be1ada3140
Merge pull request #60081 from Streetwalrus/nginx_stapling
...
nginx: use fullchain.pem for ssl_trusted_certificate
2019-05-03 06:28:38 +02:00
d67494972d
nixos/nvidia: Add NVIDIA optimus option to allow external GPUs
...
Without this option - NVIDIA refuses to use an external GPU.
2019-05-02 23:57:28 -04:00
e775587d63
softether: 4.25 -> 4.29 ( #60665 )
...
* softether: 4.25 -> 4.29
* softether_4_29: restrict to x86_64-linux
Does not build on aarch64 because of upstream "-m64" compile flag
2019-05-02 19:38:37 +02:00
e3dfd6a8ad
Merge pull request #60543 from Infinisil/fix/znc-gen
...
nixos/znc: Fix config generator for certain null values
2019-05-02 18:23:10 +02:00
a3e84ba63a
Merge pull request #55771 from Infinisil/nixos/znapzend/parallel
...
nixos/znapzend: Run znapzendzetup import in parallel
2019-05-02 18:22:44 +02:00
7658c90f21
nixos/xserver: improve DM error message when X off
...
Previously, if you, for example, set
services.xserver.displayManager.sddm.enable, but forgot to set
services.xserver.enable, you would get an error message that looked like
this:
error: attribute 'display-manager' missing
Which was not particularly helpful.
Using assertions, we can make this message much better.
2019-05-02 16:19:59 +00:00
f24f72e60b
nixos tor: use obfs4proxy, make transport list customizable
2019-05-01 21:56:05 -05:00
b6a6162919
Merge pull request #55422 from nand0p/ethminer
...
ethminer: init at 0.18.0-rc.0
2019-05-02 01:29:09 +02:00
3325773754
nixos/ethminer: init
...
- Tested on NixOS
2019-05-01 17:20:26 -04:00
c68124b5f0
Merge pull request #60097 from Mic92/openldap-rootpw-file
...
nixos/openldap: make rootpw option optional
2019-05-01 22:29:55 +02:00
02cd2b00e7
emby: Drop package and module and refer to jellyfin
2019-05-01 17:47:32 +02:00
ea439dc4d0
Merge pull request #60617 from nyanloutre/jellyfin_10_3_2
...
jellyfin: 10.3.1 -> 10.3.2
2019-05-01 13:39:09 +02:00
f82bfd5e80
nixos/jellyfin: add test to all-tests.nix
2019-05-01 11:57:34 +02:00
a27dc9d3ab
nixos/znc: Fix config generator for certain null values
...
The type of ZNC's config option specifies that a configuration like
config.User.paul = null;
should be valid, which is useful for clearing/disabling property sets
like Users and Networks. However until now the config generator
implementation didn't actually cover null values, meaning you'd get an
error like
error: value is null while a set was expected, at /foo.nix:29:10
This fixes the implementation to correcly allow clearing of property
sets.
2019-05-01 00:06:11 +02:00
7df410c6d4
Merge pull request #59630 from worldofpeace/setcap-gnome-keyring
...
gnome3.gnome-keyring: CAP_IPC_LOCK gnome-keyring-daemon
2019-04-30 13:17:03 -04:00
5a2356cff1
nix.systemFeatures: minor refactor
2019-04-30 16:28:21 +00:00
5ad79dc4bb
compilation for particular x86_64 architecture
2019-04-30 14:28:04 +00:00
fd2bd6e433
Merge staging-next into master
2019-04-30 15:50:24 +02:00
10c671ff7c
Merge pull request #60415 from johanot/kubernetes-fix-control-plane-online-unit
...
nixos/kubernetes: fix control-plane-online prestart dependency
2019-04-30 11:52:05 +02:00
6b6f25e926
nixos/kexec: log what's happening
2019-04-29 22:43:16 +02:00
29bf511ef9
nixos/kubernetes: fix control-plane-online prestart dependency
...
The kubeconfig provided to the kubernetes-control-plane-online.service
is invalid. However, the apiserver /healthz endpoint can be accessed without auth so it's
simpler to just use curl for that.
2019-04-29 17:42:16 +02:00
b2a165e786
Merge pull request #60377 from joachifm/feat/apparmor-systemd
...
nixos/apparmor: service unit improvements
2019-04-29 12:36:24 +00:00
786f02f7a4
treewide: Remove usage of isNull
...
isNull "is deprecated; just write e == null instead" says the Nix manual
2019-04-29 14:05:50 +02:00
2f936f85d8
Merge master into staging-next
2019-04-29 13:46:20 +02:00
da4f6a2a09
browserpass: Remove v2 and switch to buildGoModule ( #60282 )
2019-04-28 11:05:24 -07:00
162546f0a1
nixos/luksroot: create /run/cryptsetup ( #60235 )
...
Needed since 2.0.0
Changed to /run/cryptsetup from /run/lock/cryptsetup in 2.0.1
2019-04-28 17:49:32 +00:00
aa24c4e95b
nixos/apparmor: allow reloading profiles without losing confinement
...
Define ExecReload, otherwise reload implies stop followed by start, which
leaves existing processes in unconfined state [1].
[1]: https://gitlab.com/apparmor/apparmor/wikis/AppArmorInSystemd
2019-04-28 17:38:12 +02:00
f824dad19a
nixos/apparmor: order before sysinit.target
...
Otherwise, profiles may be loaded way too late in the init process.
2019-04-28 17:38:07 +02:00
e666cc4e7e
Merge pull request #60334 from bhipple/fix/doc-typo
...
nixos.grafana: fix docstring typo
2019-04-28 15:07:06 +00:00
3fce35fde2
Merge pull request #59465 from minijackson/module-jellyfin
2019-04-28 10:21:35 -04:00
6852c080d8
nixos/sks: Fix another regression from ab5dcc7068
...
The two directories KDB and PTree do not exist before the SKS DB is
build for the first time. If /var/db/sks is empty and the module is
enabled via "services.sks.enable = true;" the following error will
occur:
...-unit-script-sks-db-pre-start[xxx]:
ln: failed to create symbolic link 'KDB/DB_CONFIG': No such file or directory
To avoid this both links have to be created after the DB is build.
Note: Creating the directories manually might be better but the initial
build might be skipped as a result:
unit-script-sks-db-pre-start[xxxxx]: KeyDB directory already exists. Exiting.
unit-script-sks-db-pre-start[xxxxx]: PTree directory already exists. Exiting.
2019-04-28 14:45:21 +02:00
ab9378980a
nixos/jellyfin: add simple test
2019-04-28 11:03:51 +02:00
eb8dac2fcd
nixos/jellyfin: init
2019-04-28 11:03:50 +02:00
5fb48557f5
documize-module: refactor and add more options
2019-04-28 07:45:17 +02:00
698388bc61
Revert "nixos/switch-to-configuration: Never stop system.slice"
...
This change was only a temporary workaround and isn't required anymore,
since /etc/systemd/system/system.slice should not be present on any
recent NixOS system (which makes this change a no-op).
This reverts commit 7098b0fcdf
2019-04-28 07:21:34 +02:00
77fb90d27e
Merge pull request #59731 from ajs124/ejabberd_test
...
ejabberd: refactor module, add test
2019-04-27 23:36:52 +02:00
15010f0436
sway: Read the configuration from /etc before /nix/store ( #60319 )
...
This change will load all configuration files from /etc, to make it easy
to override them, but fallback to /nix/store/.../etc/sway/config to make
Sway work out-of-the-box with the default configuration on non NixOS
systems.
2019-04-27 22:38:18 +02:00
753e1e0bab
nixos/sks: Fix the module (the pre-start script was broken)
...
Unfortunately the changes in ab5dcc7068
2019-04-27 19:19:27 +02:00
22348f951c
Merge pull request #60197 from etu/patch-gitea-generated-config
...
nixos/gitea: Don't include not needed database options depending on type
2019-04-27 19:16:33 +02:00
d084937fe7
nixos.grafana: fix docstring typo
2019-04-27 13:09:48 -04:00
47f62b4821
grafana_reporter: Fix library function name
2019-04-27 19:09:06 +02:00
033882e0b7
Merge pull request #60019 from aanderse/nzbget
...
nzbget: fix broken service, as well as some improvements
2019-04-27 18:26:50 +02:00
8d64ec7a17
Merge pull request #59424 from florianjacob/journalwatch
...
journalwatch: fix broken package, general maintenance
2019-04-27 10:58:45 -04:00
9cda3faecd
Merge pull request #53444 from wedens/earlyoom-notifications
...
nixos/earlyoom: add notificationsCommand option
2019-04-27 21:34:37 +09:00
7ba9b0a41b
nixos: Fix build of manual
...
The build error has been introduced by 56dcc319cf
2019-04-27 12:39:37 +02:00
03fb00d565
Merge pull request #60223 from Ma27/write-i3cfg-to-etc
...
nixos/window-managers/i3: write config file to `/etc/i3/config`
2019-04-27 18:46:57 +09:00
f099d3d8b6
Merge pull request #57561 from aaronjanse/patch-5
...
nixos/manual: document auto-login
2019-04-27 16:07:06 +09:00
21fe4fd176
Merge pull request #58181 from fgaz/nixos/zeronet/fix1
...
nixos/zeronet: add fileserverPort option
2019-04-27 15:45:30 +09:00
883232c00d
Merge master into staging-next
2019-04-27 07:01:38 +02:00
a1ffabe4de
nixos/window-managers/i3: write config file to `/etc/i3/config`
...
The default config of i3 provides a key binding to reload, so changes
take effect immediately:
```
bindsym $mod+Shift+c reload
```
Unfortunately the current module uses the store path of the `configFile`
option. So when I change the config in NixOS, a store path will be
created, but the current i3 process will continue to use the old one,
hence a restart of i3 is required currently.
This change links the config to `/etc/i3/config` and alters the X
startup script accordingly so after each rebuild, the config can be
reloaded.
2019-04-26 21:12:52 +02:00
eb6ce1c8a9
Merge pull request #60146 from peterhoeg/f/packagekit
...
nixos/packagekit: make it not error out + test
2019-04-26 14:19:46 +08:00
5b76046db3
nixos/nzbget: fix broken service, add a nixos test, as well as some general improvements
2019-04-25 20:28:39 -04:00
4d667685c2
nixos/kexec: don't clobber existing kexec-loaded kernel
2019-04-26 00:35:10 +02:00
d4cd164082
nixos/tinc: remove ordering dependency on network.target
...
This allows configuring IP addresses on a tinc interface using
networking.interfaces."tinc.${n}".ipv[46].addresses.
Previously, this would fail with timeouts, because of the dependency
chain
tinc.${netname}.service
--after--> network.target
--after--> network-addresses-tinc.${n}.service (and network-link-…)
--after--> sys-subsystem-net-devices-tinc.${n}.device
But the network interface doesn't exist until tinc creates it! So
systemd waits in vain for the interface to appear, and by then the
network-addresses-* and network-link-* units have failed. This leads
to the network link not being brought up and the network addresses not
being assigned, which in turn stops tinc from actually working.
2019-04-25 22:54:11 +02:00
c01ea27ce3
nixos-generate-config: do not build btrfs-tools when btrfs is not used
...
cross-compilation of `btrfs-tools` is broken, and this usually needless dependency of each system closure on `btrfs-tools` prevents cross-compilation of whole system closures
2019-04-25 12:08:20 +00:00
71450b1c1a
nixos/gitea: Don't include not needed database options depending on type
...
This was discovered in https://github.com/NixOS/nixpkgs/pull/60014
2019-04-25 08:30:14 +02:00
e916cdf02d
nixos/journalwatch: permissionsStartOnly is deprecated
...
See #53852 for details,
related to the efforts in #56265
2019-04-24 21:26:29 +02:00
857069293d
Merge pull request #56565 from andrew-d/adunham/plex-fhs
...
plex: rewrite to use FHS userenv
2019-04-24 15:00:30 -04:00
b2c1ed6355
Merge pull request #53043 from exi/wg-quick
...
nixos/modules/networking/wg-quick Add wg-quick options support
2019-04-24 17:16:32 +00:00
0a7bcb3b03
Merge staging into staging-next
2019-04-24 18:38:11 +02:00
ab15949f81
nixos/packagekit: add test
2019-04-24 22:31:36 +08:00
1bc408ec3a
nixos/packagekit: make it not error out and use upstream systemd unit
2019-04-24 22:31:36 +08:00
f81ddbf8e7
Merge pull request #60149 from peterhoeg/u/mosquitto_160
...
mosquitto: 1.5.8 -> 1.6 + nixos tests
2019-04-24 22:29:08 +08:00
28a95c4f7f
Merge pull request #60138 from grahamc/wireguard-generate-key
...
wireguard: add generatePrivateKeyFile option + test
2019-04-24 16:00:34 +02:00
06c83a14e1
Wrap 'wg' commands in <command>
2019-04-24 07:46:01 -04:00
f57fc6c881
wireguard: add generatePrivateKeyFile option + test
...
Ideally, private keys never leave the host they're generated on - like
SSH. Setting generatePrivateKeyFile to true causes the PK to be
generate automatically.
2019-04-24 07:46:01 -04:00
c5af9fd4dd
nixos/mosquitto: add test
2019-04-24 17:02:20 +08:00
9f7f367bf5
plex: rewrite to use FHS userenv
2019-04-23 20:19:33 -07:00
84d00355e8
Merge remote-tracking branch 'NixOS/master' into staging
2019-04-23 22:00:42 -04:00
508fd8f133
Merge pull request #55413 from msteen/bitwarden_rs
...
bitwarden_rs: init at 1.8.0
2019-04-24 00:25:08 +02:00
ef1a43030b
nixos/bitwarden_rs: init
2019-04-23 23:46:57 +02:00
ca37c23f91
Merge pull request #58096 from pacien/tedicross-init
...
tedicross: init at 0.8.7
2019-04-23 23:14:22 +02:00
d3423dd5c2
nixos/tedicross: add module
2019-04-23 22:52:23 +02:00
d43dc68db3
nixos/openldap: make rootpw option optional
...
This allows to store passwords in external files outside of the world-readable
nix store.
2019-04-23 16:35:33 +01:00
5fbf306760
nixos/icingaweb2: Fix environment.etc assignment
2019-04-23 14:04:40 +02:00
3e32e150cb
nixos/ejabberd: migrate to tmpfiles, drop runit
2019-04-23 14:00:49 +02:00
83c9b6ee39
nginx: use fullchain.pem for ssl_trusted_certificate
...
Some ACME clients do not generate full.pem, which is the same as
fullchain.pem + the certificate key (key.pem), which is not necessary
for verifying OCSP staples.
2019-04-23 12:33:19 +03:00
d0e70ac2d3
Merge pull request #60010 from JohnAZoidberg/https-urls
...
HTTPS urls
2019-04-22 23:37:07 +02:00
92cccb6f83
treewide: Use HTTPS for readthedocs URLs
2019-04-22 20:46:18 +02:00
8a74ebeb01
nixos/virtualbox: Fixes configuration to evaluate
...
Fixes issue introduced by #57557
2019-04-22 11:22:00 -04:00
c3f69d1373
Merge pull request #59381 from aanderse/automysqlbackup
...
automysqlinit: init at 3.0_rc6
2019-04-22 08:30:23 -04:00
b33da46a8e
nixos/hardened: split description of allowUserNamespaces into paras
2019-04-21 13:11:25 +02:00
113bb0a7e9
nixos/display-managers/startx: fix typos for startx option description
...
`~/.xinintrc` => `~/.xinitrc`
`autmatically` => `automatically`
2019-04-21 07:46:37 +00:00
429e554714
nixos/virtualbox: Fixes configuration to evaluate
...
Fixes issue introduced by #57557
2019-04-20 23:04:13 -04:00
2a8ca24215
Merge pull request #59435 from furrycatherder/fix-tarball
...
nixos: fix system-tarball
2019-04-20 20:58:42 -04:00
451961ead2
Merge pull request #59880 from florianjacob/matrix-synapse-identity-servers
...
nixos/matrix-synapse: correct trusted_third_party_id_servers default
2019-04-21 02:41:21 +02:00
799fa4d404
Merge remote-tracking branch 'origin/master' into staging
2019-04-20 19:31:35 -04:00
4a11ce7f26
cleanup redundant text in modules utilizing mkEnableOption
...
Closes #59911
2019-04-20 14:44:02 +02:00
abf60791e2
nixos/modules/networking/wg-quick Add wg-quick options support
...
This is an implementation of wireguard support using wg-quick config
generation.
This seems preferrable to the existing wireguard support because
it handles many more routing and resolvconf edge cases than the
current wireguard support.
It also includes work-arounds to make key files work.
This has one quirk:
We need to set reverse path checking in the firewall to false because
it interferes with the way wg-quick sets up its routing.
2019-04-20 14:02:54 +02:00
d3259ed673
Merge branch 'master' into staging
2019-04-20 12:49:01 +02:00
c1fd154fb6
Merge pull request #57557 from matthewbauer/ova-swap
...
nixos/virtualbox: add swap file
2019-04-19 10:17:36 -04:00
dbc4543812
nixos/virtualbox: add swap file
...
Puts 2G swap in /var/swap of OVA. This serves as backup when you hit
the memory cap for the image.
Fixes #57171 and fixes #22696
2019-04-19 10:15:48 -04:00
2b84c8d560
nixos/ejabberd: add basic test
2019-04-19 12:44:43 +02:00
34aa25b8dc
nixos/matrix-synapse: correct trusted_third_party_id_servers default
...
the servers are equivalent and synchronized, but Riot defaults to use vector.im
Source: https://github.com/matrix-org/synapse/blob/v0.99.3/docs/sample_config.yaml#L701
2019-04-19 11:54:06 +02:00
548932640b
ec2-amis.nix: add 19.03 amis
2019-04-18 23:07:14 -04:00
3464b50c61
Merge pull request #59389 from aanderse/issue/53853-1
...
replace deprecated usage of PermissionsStartOnly (part 1)
2019-04-18 20:46:28 -04:00
dac0051e60
Merge pull request #59188 from gnidorah/maxx
...
maxx: 1.1.0 -> 2.0.1
2019-04-18 21:48:01 +02:00
42c107c2aa
Merge pull request #49537 from mayflower/stage1-symlink-fix
...
nixos stage-1: fix init existence test
2019-04-18 17:59:08 +02:00
5d2bb3d715
nixos/stage-1: "find-libs" shell script is for the host
2019-04-18 15:02:51 +02:00
cccc7a93d2
Merge pull request #59828 from basvandijk/prometheus-refactoring
...
nixos/prometheus: refactored & added more missing options
2019-04-18 13:43:53 +02:00
cdd82681b3
nixos/prometheus: add more missing options
2019-04-18 12:53:13 +02:00
285fd3c05a
nixos/prometheus: abstract over optional option creation
2019-04-18 11:55:43 +02:00
9bc23f31d2
Merge pull request #48337 from transumption/201810/nginx-etag
...
nginx: if root is in Nix store, use path's hash as ETag
2019-04-18 16:41:49 +07:00
d533285224
nixos/tests/nginx: Add subtest for Nix ETag patch
...
This is to make sure that we get different ETag values whenever we
switch to a different store path but with the same file contents.
I've checked this against the old behaviour without the patch and it
fails as expected.
Signed-off-by: aszlig <aszlig@nix.build>
2019-04-18 09:41:13 +02:00
2346182c2c
Merge staging-next into staging
2019-04-18 08:26:30 +02:00
e03932bbca
xmpp-sendmessage: init script file, use in prosody test
2019-04-17 23:36:07 +02:00
7abeda982a
gnome3.gsettings-desktop-schemas -> gsettings-desktop-schemas
...
gnome3.pomodoro is left out because I don't want to create a conflict.
2019-04-17 13:39:23 -04:00
b278cd86e1
Merge branch 'master' into kube-apiserver-preferred-address-types
2019-04-17 16:40:06 +00:00
44afc81af1
Merge pull request #57693 from mayflower/kube-apiserver-proxy-client-certs
...
nixos/kubernetes: Add proxy client certs to apiserver
2019-04-17 16:38:51 +00:00
Renaud
worldofpeace
Alyssa Ross
Erik Arvstedt
Will Dietz
Frederik Rietdijk
Antoine Eiche
Joachim Fasting
David Izquierdo
Linus Heckemann
Alberto Berti
Bastian Köcher
(cdep)illabout
José Romildo Malaquias
volth
Robert Schütz
Michael Raskin
Andreas Rammhold
Joachim F
Elis Hirwing
Silvan Mosberger
Colin L Rice
Hsiang-Cheng Yang
Fernando J Pando
nyanloutre
volth
Frederik Rietdijk
Sarah Brofeldt
Johan Thomsen
Daniel Schaefer
Edmund Wu
Aaron Andersen
Michael Weiss
Minijackson
elseym
Benjamin Hipple
Florian Klink
Lassulus
aszlig
Matthieu Coudron
Maximilian Bosch
Peter Hoeg
Florian Jacob
Graham Christensen
Robin Gloster
Andrew Dunham
Matthew Bauer
Matthijs Steen
pacien
Jörg Thalheim
Janne Heß
ajs124
Dan Elkouby
markuskowa
Samuel Dionne-Riel
mlvzk
Léo Gaspard
Reno Reckling
Jan Tojnar
AmineChikhaoui
Pierre Bourdon
Bas van Dijk
Domen Kožar