3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

7955 commits

Author SHA1 Message Date
markuskowa 59670b0c56
Merge pull request #76939 from lourkeur/fix_76184_tsocks
nixos/tsocks: Add types to the options
2020-01-09 21:33:18 +01:00
Florian Klink 5a523d70f6
Merge pull request #77158 from aanderse/mysql
nixos/mysql: restart systemd service on abort
2020-01-09 17:04:40 +01:00
Jörg Thalheim 5121edc703
home-assistant: 0.100.3 -> 0.103.2 (#76088)
home-assistant: 0.100.3 -> 0.103.2
2020-01-09 11:29:04 +00:00
Florian Klink 959034d8e9
Merge pull request #77355 from andersk/gdm-tmpfiles
nixos/gdm: Fix tmpfiles configuration syntax
2020-01-09 12:12:57 +01:00
Jörg Thalheim 283e3e7218
nixos/home-assistant: support for secrets 2020-01-09 10:39:50 +00:00
Anders Kaseorg 07ccbc099a nixos/gdm: Fix tmpfiles configuration syntax
Fixes this error from `nixos-rebuild switch` introduced by #75893:

setting up tmpfiles
[/etc/tmpfiles.d/nixos.conf:7] Invalid age 'yes'.
warning: error(s) occurred while switching to the new configuration

Signed-off-by: Anders Kaseorg <andersk@mit.edu>
2020-01-08 19:51:32 -08:00
Léo Gaspard b31660e5bb
Merge branch 'master' into ihatemoney 2020-01-09 03:49:03 +01:00
Silvan Mosberger 228a7b173e
nixos/certmgr: Flip either submodule path type
For upcoming allowance of paths as submodules
2020-01-08 23:54:45 +01:00
Pascal Bach 0319241132 nixos/mxisd: fix empty user name 2020-01-08 23:18:26 +01:00
Pascal Bach 76506ae42f nixos/matrix-synapse: fix empty user name 2020-01-08 23:18:26 +01:00
Aaron Andersen 336a6f471f nixos/httpd: symlink apache configuration to /etc/httpd/httpd.conf for use in the apachectl command 2020-01-08 10:37:46 -05:00
worldofpeace 79de730e77 nixos/buildbot: fix eval
Fixes https://github.com/NixOS/nixpkgs/issues/77309
2020-01-08 10:06:08 -05:00
Milan Pässler 2a31a6a412 tree-wide: fix errors and warning related to loaOf deprecation 2020-01-07 06:23:28 +01:00
Aaron Andersen df059f89e6 nixos/mysql: restart systemd service on abort 2020-01-06 20:08:51 -05:00
worldofpeace c496b1b102
Merge pull request #63103 from rnhmjoj/loaof
Deprecate types.loaOf [WIP]
2020-01-06 11:00:17 -05:00
WilliButz 482b39a7e5
nixos/oxidized: add missing slash to PIDFile path 2020-01-06 16:58:54 +01:00
rnhmjoj 1d61efb7f1 treewide: use attrs instead of list for types.loaOf options 2020-01-06 10:39:18 -05:00
worldofpeace 00c813a636
Merge pull request #75893 from worldofpeace/gdm-tmpfiles
nixos/gdm: use systemd tmpfiles instead of preStart
2020-01-06 09:51:59 -05:00
Robert Hensing e1ce60ae7a
Merge pull request #76947 from juliancoffee/master
Fix example for xkbOptions
2020-01-05 23:35:27 +01:00
Robert Hensing 933003e684
Merge pull request #73394 from pasqui23/xkbopt
nixos/xserver:services.xserver.xkbOptions is now commas
2020-01-05 23:34:59 +01:00
Louis Bettens caa9ce1caa nixos/tsocks: Add types to the options 2020-01-05 00:15:26 +01:00
Louis Bettens d49737836a nixos/gnunet: Add types to the options 2020-01-05 00:07:50 +01:00
Danylo Hlynskyi cef68c4580
nixos/nginx: don't hide nginx config errors on nixos-rebuild --switch with reload enabled (#76179)
nixos/nginx: don't hide nginx config errors on nixos-rebuild --switch
with reload enabled

Closes https://github.com/NixOS/nixpkgs/issues/73455
2020-01-05 00:39:23 +02:00
Illia Denysenko 73b38ff7c5
Fix example for xkbOptions
###### Motivation for this change
With space between two options, multiple options just don't work
Looks like xkbOptions then used for generation of xorg.conf.d/00-keyboard.conf.
kbd's man says XkbOptions must be comma-separated without spaces.
https://linux.die.net/man/4/kbd

###### Things done

<!-- Please check what applies. Note that these are not hard requirements but merely serve as information for reviewers. -->

- [ ] Tested using sandboxing ([nix.useSandbox](http://nixos.org/nixos/manual/options.html#opt-nix.useSandbox) on NixOS, or option `sandbox` in [`nix.conf`](http://nixos.org/nix/manual/#sec-conf-file) on non-NixOS linux)
- Built on platform(s)
   - [ ] NixOS
   - [ ] macOS
   - [ ] other Linux distributions
- [ ] Tested via one or more NixOS test(s) if existing and applicable for the change (look inside [nixos/tests](https://github.com/NixOS/nixpkgs/blob/master/nixos/tests))
- [ ] Tested compilation of all pkgs that depend on this change using `nix-shell -p nixpkgs-review --run "nixpkgs-review wip"`
- [ ] Tested execution of all binary files (usually in `./result/bin/`)
- [ ] Determined the impact on package closure size (by running `nix path-info -S` before and after)
- [ ] Ensured that relevant documentation is up to date
- [ ] Fits [CONTRIBUTING.md](https://github.com/NixOS/nixpkgs/blob/master/.github/CONTRIBUTING.md).

###### Notify maintainers

cc @
2020-01-04 20:54:19 +02:00
adisbladis aec68f4e7e
nixos/compton: Rename module to picom
With a backwards compatibility alias
2020-01-03 12:52:02 +00:00
Frederik Rietdijk 7aa2b0215b Merge master into staging-next 2020-01-03 10:25:14 +01:00
Bernardo Meurer d80570f3f5
rogue: boot.extraTTYs -> console.extraTTYs 2020-01-02 16:59:43 -08:00
Bernardo Meurer 992245f844
nixos-manual: boot.extraTTYs -> console.extraTTYs 2020-01-02 16:53:15 -08:00
Frederik Rietdijk f08e3e38d4 Merge master into staging-next 2020-01-02 21:41:13 +01:00
Christian Kauhaus 129c73802f
Merge pull request #76153 from arcnmx/connman-iwd
nixos/connman: optional iwd backend
2020-01-02 21:35:54 +01:00
Silvan Mosberger cdf79db19d
Module system improvements for NixOS as a submodule (#75031)
Module system improvements for NixOS as a submodule
2020-01-02 20:38:45 +01:00
Aaron Andersen ebf58a3404
Merge pull request #76709 from aanderse/httpd-ssl
nixos/httpd: update default ssl protocols
2020-01-02 11:28:25 -05:00
Silvan Mosberger bc42515736
nixos/syncthing: Fix submodule name usage
Module arguments should be taken from the arguments directly. This
allows evalModule's specialArgs to override them if necessary
2020-01-02 09:59:35 +01:00
Tim J. Baumann 36b98fdf26 networkmanager: fix dispatcherScripts example
Before, the example script didn't actually exit when the event type
didn't match "up".
2020-01-01 15:32:15 +01:00
zimbatm ab64518d0f
nixos/redmine: update example to more recent Ruby 2020-01-01 00:27:14 +00:00
Frederik Rietdijk 555037a667 Merge master into staging-next 2019-12-31 16:35:53 +01:00
Jakub Sokołowski 3238beab0a nixos/transmission: fix from where service loads config
Currently if you specify home to be someplace else than ~/ for user
then Transmissions always attempts to load the config from the
default location which is $HOME/.config/transmission-daemon based on documentation:
https://github.com/transmission/transmission/wiki/Configuration-Files

Which means that the changes done to the config under settingsDir in
ExecPreStart have no effect because they are modifying a file that is never loaded.

I've added an explicit --config-dir ${settingsDir} to make sure
that Transmission loads the correct config file even when home is changed.

Signed-off-by: Jakub Sokołowski <jakub@status.im>
2019-12-31 15:21:29 +01:00
Daniel Frank 6d671372b5
nextcloud module: https is important not only for proxies 2019-12-31 13:01:46 +01:00
Jonathan Ringer d72c4791bc Merge remote-tracking branch 'origin' into staging-next 2019-12-30 14:36:16 -08:00
Aaron Andersen 66bf75415f
Merge pull request #76551 from symphorien/nagios2
nagios: various improvements
2019-12-30 14:21:03 -05:00
Jonathan Ringer 446fec8c2d
Merge branch 'master' of github.com:NixOS/nixpkgs into staging-next 2019-12-30 10:14:18 -08:00
Ryan Mulligan 3a644e30b9
Merge pull request #46131 from ju1m/shorewall
shorewall: init at 5.2.3.3
2019-12-30 10:04:31 -08:00
Julien Moutinho 56a73dfb35 shorewall: init at 5.2.3.3
nixos/shorewall: init
2019-12-30 09:42:03 -08:00
Aaron Andersen 6777926911 nixos/httpd: update default ssl protocols 2019-12-30 11:24:11 -05:00
Aaron Andersen 7c8d98f8df nixos/sysstat: provide a type for each module option 2019-12-30 17:10:53 +01:00
symphorien+git@xlumurb.eu be25e45fc8 nagios: various improvements
* structured config for main config file allows to launch nagios in
debug mode without having to write the whole config file by hand
* build time syntax check
* all options have types, one more example
* I find it misleading that the main nagios config file is linked in
/etc but that if you change the link in /etc/ and restart nagios, it
has no effect. Have nagios use /etc/nagios.cfg
* fix paths in example nagios config files, which allows to reuse it:
  services.nagios.objectDefs =
   (map (x: "${pkgs.nagios}/etc/objects/${x}.cfg")
   [ "templates" "timeperiods" "commands" ]) ++ [ ./main.cfg ]
* for the above reason, add mailutils to default plugins

Co-Authored-By: Aaron Andersen <aaron@fosslib.net>
2019-12-30 16:40:52 +01:00
Merijn Broeren 133103d709
treewide: replace make/build/configure/patchFlags with nix lists 2019-12-30 12:58:11 +01:00
Frederik Rietdijk fb66525297 Merge master into staging-next 2019-12-29 10:19:39 +01:00
Tor Hedin Brønner 3d70d4ba0b
nixos/displayManager: fix typo in legacy sessions (#76626)
xsession gets passed `dm` `wm`, so the desktop manager would be launched
before the window manager resulting in a regular desktop manager
session.

Fixes https://github.com/NixOS/nixpkgs/issues/76625
2019-12-29 02:02:24 +01:00
Jan Tojnar 332cfab4ce
Merge pull request #76591 from lourkeur/set_XKB_CONFIG_ROOT
Fix services.xserver.extraLayouts under GNOME 3
2019-12-28 20:34:56 +01:00
Louis Bettens 636dabcf80 nixos/xserver: set $XKB_CONFIG_ROOT 2019-12-28 12:34:56 +01:00
Aaron Andersen c95aef92b9 nixos/awstats: add missing description to extraConfig option (#76575) 2019-12-28 01:09:47 +02:00
Vladimír Čunát c3d4998e41
Merge #75803: kresd service: unify listen declarations 2019-12-27 15:55:38 +01:00
Aaron Andersen 4d2dd15546
Merge pull request #73113 from aanderse/httpd-vhost
nixos/httpd: support overridable virtual hosts
2019-12-26 08:09:08 -05:00
danbst 50d6e93dc8 nixos/nginx: fixup permissions for Nginx state dir
The commit b0bbacb521 was a bit too fast
It did set executable bit for log files.

Also, it didn't account for other directories in state dir:
```
 # ls -la /var/spool/nginx/
total 32
drwxr-x--- 8 nginx nginx 4096 Dec 26 12:00 .
drwxr-xr-x 4 root  root  4096 Oct 10 20:24 ..
drwx------ 2 root  root  4096 Oct 10 20:24 client_body_temp
drwx------ 2 root  root  4096 Oct 10 20:24 fastcgi_temp
drwxr-x--- 2 nginx nginx 4096 Dec 26 12:00 logs
drwx------ 2 root  root  4096 Oct 10 20:24 proxy_temp
drwx------ 2 root  root  4096 Oct 10 20:24 scgi_temp
drwx------ 2 root  root  4096 Oct 10 20:24 uwsgi_temp
```

With proposed change, only ownership is changed for state files, and mode is left as is
except that statedir/logs is now group accessible.
2019-12-26 14:16:29 +02:00
Yurii Izorkin b0bbacb521 nixos/nginx: recursively change logs directory owner/group (#76174)
This change brings pre-existing installations (where the logfiles
are owned by root) in line with the new permssions (where logfiles
are owned by the nginx user)
2019-12-26 13:51:10 +02:00
Jörg Thalheim c5aacb2350
Merge pull request #76514 from Thra11/fix-udev-hwdb-description
udev: fix option description
2019-12-26 06:43:02 +00:00
Yorick van Pelt 470c8a2a36 nixos/borgbackup: install job wrappers to systemPackages for easy borg access
Currently to run borg job manually, you have to use systemctl:
```
$ systemctl start borgbackup-job-jobname.service
```

This commit makes wrappers around borg jobs available in $PATH, which have
BORG_REPO and connection args set correctly:
```
$ borg-job-jobname list
$ borg-job-jobname mount ::jobname-archive-2019-12-25T00:01:29 /mnt/some-path
$ borg-job-jobname create ::test /some/path
```

Closes: https://github.com/NixOS/nixpkgs/pull/64888
Co-authored-by: Danylo Hlynskyi <abcz2.uprola@gmail.com>
2019-12-26 07:50:03 +02:00
Silvan Mosberger 5dc7050bd6
Merge pull request #75400 from nand0p/ethminer-v18
ethminer: 0.18.0-rc.0 -> 0.18.0
2019-12-25 23:56:24 +01:00
Tom Hall 08d31b74ec udev: fix option description
The two file paths were changed from 10-local to 99-local, but only one
of the descriptions was changed.
2019-12-25 20:51:01 +00:00
Fernando J Pando 90ee16dbfc nixos/ethminer: always restart 2019-12-25 10:33:50 -05:00
Aaron Andersen 79215f0df1 nixos/httpd: limit serving web content to virtual hosts, convert virtualHosts option type from listOf to attrsOf, add ACME integration 2019-12-24 20:27:48 -05:00
Ben Harper dade94cdb9 nixos/awstats: refactor module 2019-12-24 12:20:52 -05:00
worldofpeace 48557d3c57
Merge pull request #76160 from worldofpeace/mate-settings-daemon/fixup
nixos/mate: drop g-s-d enable
2019-12-23 08:53:10 -05:00
Aaron Andersen 133a5c345c
Merge pull request #74763 from nek0/restya-board-config-fix
restya-board: Restya board config fix
2019-12-23 07:42:37 -05:00
Florian Klink eeaf1f702d
Merge pull request #75103 from sternenseemann/spacecookie
services/spacecookie: init
2019-12-23 11:09:52 +01:00
nek0 acd1240fd1 restya-board: fix configuration option and switch to file based password provisioning 2019-12-23 05:45:15 +01:00
worldofpeace 35b7b17125
Merge pull request #76116 from worldofpeace/pantheon-cleanup
Pantheon cleanups
2019-12-22 22:59:21 -05:00
Aaron Andersen 086d1ad906
Merge pull request #75047 from kampka/trilium-server
Add trilium server and module
2019-12-22 20:26:57 -05:00
Pasquale f43d112ac2 nixos/xserver: services.xserver.xkbOptions is now commas 2019-12-22 10:50:40 +01:00
worldofpeace ab60b0e0c3 nixos/mate: drop g-s-d enable
I believe I forgot to remove this in 68ab37aa44.
2019-12-21 23:12:45 -05:00
worldofpeace 016c589bb4 nixos/pantheon: options for extra switchboard plugs and wingpanel indicators 2019-12-21 23:08:13 -05:00
worldofpeace 4ed65a891c nixos/pantheon: don't abstract default packages to pkgs
Also cleanup a bit, we enabled gnome-settings-daemon even when using elementary-settings-daemon.
I wanted the nixos module ascribe the defaults, not these lists in pkgs.
2019-12-21 23:08:13 -05:00
worldofpeace 4fb91d10c8 nixos/pantheon: add an apps.enable option 2019-12-21 23:08:13 -05:00
arcnmx 7753d58e89 nixos/connman: optional iwd backend 2019-12-21 13:48:15 -08:00
markuskowa 898f188fd0
Merge pull request #68301 from gnidorah/cde2
cdesktopenv: init at 2019-11-30
2019-12-21 13:22:33 +01:00
Florian Klink 0a41dae98b
Merge pull request #56255 from Izorkin/nginx-temp1
nginx: do not run anything as root
2019-12-20 23:34:55 +01:00
Silvan Mosberger 8c39d6917e
Merge pull request #76054 from turboMaCk/imwheel-fixes
services.xserver.imwheel: Fix default extraOptions
2019-12-20 15:43:15 +01:00
worldofpeace ee75a460af nixos/pantheon: move contractor module into xservice 2019-12-20 09:26:35 -05:00
worldofpeace 1ec2b545dd nixos/pantheon/files: remove
Made nun sense.
2019-12-20 09:25:37 -05:00
Marek Fajkus 66eef90547
services.xserver.imwheel: Fix default extraOptions 2019-12-20 12:52:43 +01:00
Florian Klink e46abc6b8d
Merge pull request #76069 from misuzu/package-3proxy
nixos/3proxy: manual validation fix
2019-12-20 02:15:45 +01:00
misuzu b6f87c688b nixos/3proxy: manual validation fix 2019-12-20 00:17:49 +02:00
brprice 5b210859f6 nixos/nginx: drop extra semicolon in return example (#76055) 2019-12-19 21:59:01 +02:00
Michael Raskin 6210c15573
Merge pull request #67507 from misuzu/package-3proxy
3proxy: init at 0.8.13
2019-12-19 15:42:15 +00:00
Christian Kampka 9f97485399
trilium-server: Add nginx reverse proxy configuration to module 2019-12-19 10:14:13 +01:00
Christian Kampka 82f038d468
trilium-server: Add module 2019-12-19 10:14:12 +01:00
worldofpeace 15a9c80c05 nixos/gdm: use systemd tmpfiles instead of preStart
Thet was a mess before. This should be more reliable.
2019-12-18 15:40:12 -05:00
Jan Tojnar 6be14ee97b
Merge pull request #53843 from hedning/session-default
nixos/displayManager: introduce defaultSession
2019-12-18 21:16:06 +01:00
sternenseemann 25503db8e8 nixos/spacecookie: add service module and test 2019-12-17 14:17:03 +01:00
Dustin Frisch f886a14dbd
kresd: Unified listen declarations
Deperecates the interfaces option which was used to generate a host:port
list whereas the port was always hardcoded to 53. This unifies the
listen configuration for plain and TLS sockets and allows to specify a
port without an address for wildcard binds.
2019-12-17 12:44:24 +01:00
Linus Heckemann 6eff44f9fb
Merge pull request #75578 from WilliButz/oxidized-pidfile
nixos/oxidized: specify PID file in service
2019-12-17 11:39:41 +01:00
Lassulus f061413686
Merge pull request #74722 from gnidorah/mame
mame: 0.215 -> 0.216
2019-12-17 07:57:54 +01:00
Leonhard Markert 56622fa339
lorri: add git to daemon path
Lorri's daemon invokes Nix which requires Git on its path.
https://github.com/target/lorri/issues/255
2019-12-16 10:09:59 +01:00
gnidorah c527e31c99 cdesktopenv: init at 2019-11-30 2019-12-15 22:28:31 +03:00
Christian Kampka 2387deec3d
postgresql-backup: Use saner defaults for pg_dump 2019-12-15 13:14:21 +01:00
Izorkin 2a413da57e nixos/nginx: do not run anything as root 2019-12-15 11:21:08 +03:00
Bernardo Meurer 5ee439eb08
nixos: fix ip46tables invocation in nat 2019-12-14 20:13:12 -08:00
Jan Tojnar 8dc5ff7dcf
nixos/displayManager: deprecate separate options for default wm/dm
The upstream session files display managers use have no concept of sessions being composed from
desktop manager and window manager. To be able to set upstream session files as default
session, we need a single option. Having two different ways to set default session would be confusing,
though, so we decided to deprecate the old method.

We also created separate script for each session, just like we already had a separate desktop
file for each one, and started using displayManager.sessionPackages mechanism to make the
session handling more uniform.
2019-12-15 04:16:20 +01:00
Tor Hedin Brønner 53ef29c138
nixos/lightdm: enable wayland sessions
Note: can't launch gnome on wayland due to duplicate entry names:
  https://github.com/CanonicalLtd/lightdm/issues/16
2019-12-15 04:16:20 +01:00