alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity
170029 commits 217 branches 116 tags 4 GiB
Commit graph

12179 commits

Author SHA1 Message Date
Matthew Bauer b1bbd94bb6 Merge remote-tracking branch 'NixOS/master' into staging 2019-02-18 20:36:48 -05:00
Kai Wohlfahrt de7abf63b8 nixos/ssh: apply options after extraConfig 
Otherwise, the standard options (e.g. AddressFamily) cannot be overriden
in extraConfig, as the option is applied on the first (not most
specific) match. Closes #52267
 2019-02-18 21:58:46 +00:00
Silvan Mosberger a3f85f0dc0
Merge pull request #55410 from aanderse/apache-defaults 
nixos/httpd: improve security in configuration file
 2019-02-18 03:27:18 +01:00
Silvan Mosberger ac953a4a6b
Merge pull request #55766 from Lucus16/bump-quassel 
nixos/quassel: Add support for certificate file
 2019-02-18 03:04:56 +01:00
rembo10 8e151c1e86
Merge branch 'master' into headphones 2019-02-18 09:14:14 +08:00
Ryan Mulligan a52d280cc4
Merge pull request #55955 from rnhmjoj/diod 
Fixes for diod
 2019-02-17 14:23:26 -08:00
Justin Bedő 05ab1a6e5a
Merge branch 'master' into singularity 2019-02-17 21:49:37 +00:00
Ryan Mulligan c3f9fdbf42
Merge pull request #55957 from dasJ/icingaweb2-module 
nixos/icingaweb2: Init the module
 2019-02-17 11:12:23 -08:00
Janne Heß 1caa886f6c nixos/icingaweb2: Init the module 
The module is indeed very large but allows configuring every aspect of
icingaweb2. The built-in monitoring module is in an own file because
there are actually more (third-party) modules and this structure means
every module can get an own file.
 2019-02-17 19:08:47 +01:00
rnhmjoj 6871e43937
nixos/diod: fix permissions 2019-02-17 18:26:00 +01:00
Ryan Mulligan b2a04d4484
Merge pull request #55922 from tek/master 
fix syntax error in tt-rss pre-start script
 2019-02-17 05:11:36 -08:00
Torsten Schmits 97bb693927 nixos/tt-rss: fix syntax error in pre-start script 2019-02-17 10:50:24 +01:00
Ryan Mulligan 55fa356613
Merge pull request #55920 from matix2267/logind-lid-switch-external-power 
nixos/logind: Add option for HandleLidSwitchExternalPower
 2019-02-16 22:01:14 -08:00
Mateusz Gołębiewski fb9619ca03 nixos/logind: Add option for HandleLidSwitchExternalPower 
The default according to `man logind.conf` is to perform the same action as in
HandleLidSwitch.
 2019-02-16 23:56:22 +01:00
Thomas Tuegel 3c9e2820ac
Merge pull request #55351 from timor/kio-extras-man-protocol 
kio-extras: enable man protocol
 2019-02-16 13:47:56 -06:00
Frederik Rietdijk fd48a94b62 Merge staging-next into staging 2019-02-16 09:30:46 +01:00
Frederik Rietdijk 6fe10d2779 Merge master into staging-next 2019-02-16 09:29:54 +01:00
Jan Tojnar 23eff453a2
Merge pull request #55742 from aanderse/php-fpm 
nixos/phpfpm: allow configuring php.ini files per-pool
 2019-02-16 07:28:07 +01:00
Graham Christensen a1525c5d48
docs: give matomo an ID 2019-02-15 17:51:00 -05:00
Jaka Hudoklin 5ae048071d
Merge pull request #55649 from johanot/flannel-with-kubernetes-backend 
nixos/flannel: add kubernetes as storage backend (and fix test)
 2019-02-15 19:55:56 +01:00
Peter Hoeg 507855e56c
Merge pull request #55667 from amazari/master 
zoneminder: fix build issue when using createLocally database
 2019-02-15 22:00:31 +08:00
Samuel Dionne-Riel 98419a0f64 nixos/tests/switch-test: Ensures the test fails on failure (#55744) 
The `| tee` invocation always masked the return value of the
switch-to-configuration test.

```
~ $ false | tee && echo "oh no"
oh no
```

The added wrapper script will still output everything to stderr, while
passing failures to the test harness.
 2019-02-14 22:55:16 +01:00
Silvan Mosberger b1bda29f5c
Merge pull request #55517 from florianjacob/cups-fix-ssl-dir 
nixos/cups: Fix Unable to encrypt connection:
 2019-02-14 21:19:57 +01:00
Silvan Mosberger 8a5925b7eb
Merge pull request #55301 from telotortium/tt-rss_disable_automatic_updates 
Remove option config.services.tt-rss.checkForUpdates (forced to false)
 2019-02-14 21:15:30 +01:00
Silvan Mosberger 3df95cfd9a
Merge pull request #55540 from florianjacob/matomo 
Security: Matomo 3.7.0 -> 3.8.1
 2019-02-14 21:13:57 +01:00
Silvan Mosberger c84488329b
Merge pull request #47747 from florianjacob/matomo-archive-processing-service 
Matomo archive processing service
 2019-02-14 21:05:16 +01:00
Florian Jacob 33b3272692 nixos/cups: Fix Unable to encrypt connection: 
Unable to create server credentials
by creating /var/lib/cups/ssl directory.
 2019-02-14 20:43:26 +01:00
Silvan Mosberger 80480598d4
Merge pull request #55515 from rycee/wpa_supplicant_citerefentry 
nixos/wpa_supplicant: use `<citerefentry>`
 2019-02-14 20:38:05 +01:00
Lars Jellema 85675c139f
nixos/quassel: Add support for certificate file 2019-02-14 14:36:21 +01:00
Frederik Rietdijk a25d48cd4f Merge master into staging 2019-02-14 11:35:50 +01:00
Jan Tojnar 606ceda352
gnome3: stop using aliases 2019-02-14 02:31:15 +01:00
Aaron Andersen 5eef3590ae nixos/phpfpm: allow configuring php.ini files per-pool 2019-02-13 19:58:02 -05:00
Michael Raskin f539a6a70e
Merge pull request #55138 from oxij/tree/random-fixes 
random cleanups and a tiny fix
 2019-02-13 20:16:07 +00:00
Alex Whitt 58d6951971 nzbget: Fix script for copying default config file template (#51235) 
* nzbget: Fix configFile / dataDir checking in service script

* nzbget: improve the description for the `configFile` option

* nzbget: Add detail to the `configFile` option description

* nzbget: Improve wording of `configFile` option

* nzbget: Refactor dataDir management into systemd config

* nzbget: Remove debug
 2019-02-13 17:38:32 +01:00
Johan Thomsen 94136fdc1b nixos/flannel: node name needs to be configured for flannel to work with kubernetes storage backend 2019-02-13 17:17:52 +01:00
Frederik Rietdijk 7257dedd7c Merge master into staging-next 2019-02-13 12:33:29 +01:00
Francesco Zanini ab912cf744 atlassian services: allow overriding package (#55685) 2019-02-13 08:08:13 +00:00
Alexandre Mazari b93ea9c26f zoneminder: fix build issue when using createLocally database 2019-02-12 22:32:11 +01:00
Johan Thomsen adc9da6178 nixos/flannel: fix flannel nixos test, add test to all-tests.nix 2019-02-12 18:26:39 +01:00
Johan Thomsen 9522ca5ce9 nixos/flannel: add options to configure kubernetes as config backend for flannel 2019-02-12 18:26:39 +01:00
lewo b2f3738336
Merge pull request #55589 from johanot/docker-preloader-mkif-guard 
nixos/dockerPreloader: guard the entire implemetation with mkIf on image list
 2019-02-12 10:16:21 +01:00
Franz Pletz adb837eea7
Merge pull request #55024 from telotortium/airsonic-virtualHost 
airsonic: Add virtualHost option to set up nginx virtual host
 2019-02-12 02:09:25 +00:00
Johan Thomsen 302c4df41d nixos/dockerPreloader: guard the entire implemetation with mkIf on image list 2019-02-11 23:35:25 +01:00
Florian Klink 4aa2592905
Merge pull request #55550 from edude03/patch-2 
Push plex logs to syslog/journald
 2019-02-11 22:28:57 +01:00
Florian Klink e6df4dfe59
Merge pull request #54800 from nlewo/nova 
Remove cloud-init from the Openstack image configuration
 2019-02-11 22:23:32 +01:00
Antoine Eiche ff31014687 nixos/tests/ec2: reuse ssh keys from ssh-keys.nix 2019-02-11 20:58:45 +01:00
Antoine Eiche 933da6de91 nixos: Add ec2-metadata-fetcher.nix file 
To share the metadata fetcher script between ec2 and Openstack images.
 2019-02-11 20:58:45 +01:00
Antoine Eiche 78acac050f nixos/openstackImage: default hostname is empty string 
This is to let the `ec2-data.nix` module sets the hostname from the
metadata API value.
 2019-02-11 20:58:45 +01:00
Antoine Eiche d190b204f0 Rename novaImage to openstackImage 
People don't necessary know `nova` is related to Openstack (it is a
component of Openstack). So, it is more explicit to call it
`openstackImage`.
 2019-02-11 20:58:44 +01:00
Florian Jacob faac33bc77 nixos/matomo: 3.8.0 introduces matomo.{php,js} files 2019-02-11 17:33:44 +01:00