Commit Graph

4444 Commits

Author SHA1 Message Date
Orivej Desh
89912165e1
Merge pull request #31378 from michaelpj/imp/plymouth-nixos-branding
breeze-plymouth: add optional nixos branding, enable for plasma5
2017-11-18 10:37:26 +00:00
Michael Peyton Jones
eec4c31d89 plasma5: enable NixOS branding in plymouth theme 2017-11-18 10:36:23 +00:00
Oliver Charles
560400773c nixos/prometheus: Correct documentation for external_labels
As description is literal XML, I need to escape < and > by hand.
2017-11-17 11:06:03 +00:00
Oliver Charles
acb7f43db9 nixos/prometheus: add external_labels option 2017-11-17 10:16:21 +00:00
Oliver Charles
f0334c0336 nixos/prometheus: add scrape_configs.honor_labels 2017-11-17 10:15:37 +00:00
Parnell Springmeyer
cb11bf73a5 nixos/nghttpx: add module for the nghttpx proxy server (#31680)
* nghttpx: Add a new NixOS module for the nghttpx proxy server

This change also adds a global `uid` and `gid` for a `nghttpx` user
and group as well as an integration test.

* nixos/nghttpx: fix building manual
2017-11-16 18:21:02 +00:00
Franz Pletz
903a7e2f94
Merge pull request #31641 from danbst/patch-13
mysql module: fix flaky check
2017-11-16 00:07:55 +01:00
Tim Steinbach
c9b8bbd039
Merge pull request #31268 from Ma27/x11-defaults
services.xserver: fix defaults of X11
2017-11-15 16:41:52 +00:00
Jan Tojnar
a3509f6c22
gnome3.gnome-online-miners: add missing dleyna dependency 2017-11-15 14:02:37 +01:00
Jan Tojnar
e1b8636181
dleyna-server: init at 0.6.0 2017-11-15 14:02:37 +01:00
Jan Tojnar
abb17136de
gnome3.gnome-photos: add missing dleyna depenency 2017-11-15 14:02:37 +01:00
Jan Tojnar
a04cfdea12
dleyna-renderer: init at 0.6.0 2017-11-15 14:02:37 +01:00
Robin Gloster
9181faac41
dovecot: fix config if mailboxes == [] 2017-11-14 16:49:53 +01:00
Franz Pletz
775fb7e127
Merge pull request #31616 from jerith666/smartd-cat
smartd: fix 'cat: command not found' error
2017-11-14 12:32:23 +01:00
Franz Pletz
06d0ba1ee9
Merge pull request #31477 from andir/fix-babeld-config
Fix babeld config
2017-11-14 12:12:59 +01:00
Danylo Hlynskyi
9f7315caf2
mysql module: fix flaky check
Comparing packages via equality will lead to different results when package and module are from different
`nixpkgs` checkouts.

Also, because MariaDB is actually supported, added a note to option description to make this knowledge more discover-able.
2017-11-14 03:08:15 +02:00
Graham Christensen
9a4b2de497
Merge pull request #31630 from Ma27/fix-postgres-quoting
services.postgres: fix quoting in the description of `superUser`
2017-11-13 17:01:05 -05:00
Maximilian Bosch
82062f7080
services.postgres: fix quoting in the description of superUser
`nixos-option` evals the description and the '`' is used to
define shell commands.

Due to this, the following error appears:

```
$ nixos-option services.postgresql.superUser
Value:
"root"

Default:
"root"

Description:

/run/current-system/sw/bin/nixos-option: line 294: root: command not found
/run/current-system/sw/bin/nixos-option: line 294: postgres: command not found
NixOS traditionally used  as superuser, most other distros use .
From 17.09 we also try to follow this standard. Internal since changing this value
would lead to breakage while setting up databases.
```
2017-11-13 22:22:35 +01:00
Tom Smeets
81295c479d fractalart service: init, Generate wallpapers (#23231)
* Add a service for generating wallpapers
This service will generate a new wallpaper using the "FractalArt" haskell package.
2017-11-13 19:56:08 +01:00
Matt McHenry
292715ce23 smartd: fix 'cat: command not found' error 2017-11-13 12:52:24 -05:00
Samuel Leathers
e0483a59cc
Merge pull request #31532 from romildo/upd.enlightenment
enlightenment: 0.21.10 -> 0.22.0
2017-11-12 21:44:54 -05:00
José Romildo Malaquias
c42a0fbf09 enlightenment: 0.21.10 -> 0.22.0
- Update to version 0.22.0
- Switch build tools from autotools to meson
- Change handling of setuid programs
2017-11-13 00:22:01 -02:00
rnhmjoj
2918f6a3f0
nixos/wireless: add manual network configuration 2017-11-11 23:11:46 +01:00
Renaud
1503409aac
Merge pull request #30943 from csingley/nzbget
nzbget.service override nzbget.conf broken paths with current derivation
2017-11-11 22:04:29 +01:00
Orivej Desh
30cbba9061
Merge pull request #31390 from Ma27/fix-buildphase-expressions
treewide: get rid of invalid `buildPhases` argument
2017-11-11 00:04:37 +00:00
Andreas Rammhold
5feed06535
babeld module: updated example config
Previosuly the example config did feature the deprecated `wired`
paramter. Wired can now be configured using the `type` parameter.
2017-11-10 11:54:21 +01:00
Andreas Rammhold
5d9073747a
babeld module: support non-boolean default arguments
Previosuly only boolean values would be rendered properly. All other
values would cause an error. Even the example configuration did fail.
2017-11-10 11:54:15 +01:00
Andreas Rammhold
236a7c5452
babeld module: separate default options by space
In the previous version multiple default values would generate an
invalid babeld config file since all options would be concatenated
without any separator.
2017-11-10 11:54:08 +01:00
aszlig
0e790b9f66
nixos/atlassian: Fix eval error in jrePackage
The error got introduced by 4f3d971ef5,
which removed the *Text attributes from the option.

This in turn leads to an evaluation error while building the
manual/manpage, because oraclejre8 is marked unfree.

Signed-off-by: aszlig <aszlig@nix.build>
Cc: @jbgi, @orivej, @globin
2017-11-09 20:31:41 +01:00
Jean-Baptiste Giraudeau
4f3d971ef5 Atlassian apps: remove misleading JRE switch logic
Only the Oracle JRE is supported by Atlassian appsAtlassian apps
 (see https://jira.atlassian.com/browse/JRASERVER-46152)
 Plus Atlassian apps are non free so the switch logic always chose
 Oracle JRE anyway.
 Option is kept in case someone want to patch apps to support openjdk.
2017-11-09 12:56:11 +01:00
Jean-Baptiste Giraudeau
3c06d9f0b0 Fix atlassian services (optional attr. and systemd)
- Properly handle optional configuration.
 - Use ExecStart/ExecStop instead of script/stopScript.
2017-11-09 12:56:11 +01:00
Maximilian Bosch
161e80e3fd
treewide: get rid of invalid buildPhases argument
I don't know where this comes from (I accidentally did that as well
once), but some derivations seem to use `buildPhases` rather than
`phases` in their derivations.

This kills all improper usages as the lack of a `phases` argument
didn't break the build, so this can be safely removed.
2017-11-08 21:38:06 +01:00
Jörg Thalheim
999bcd098d
Merge pull request #31296 from ryantm/mattermost43
mattermost, nixos/mattermost: update to 4.3.0
2017-11-08 17:45:42 +00:00
Renaud
792dc7a859
Merge pull request #31252 from shaunren/compton
compton: change extraOptions type to types.lines
2017-11-07 23:10:41 +01:00
Maximilian Bosch
410f0f0db2
services.xserver: fix apply of default DM/WM
This is needed to pick the first enabled DM/WM
if the default is `none`
2017-11-07 12:18:24 +01:00
Raphael Das Gupta
27c8fd24e5 nixos/mysql: fix typo in description of mysql.bind option 2017-11-07 11:09:40 +01:00
Orivej Desh
4435bb8ba8
Merge pull request #30665 from michaelpj/imp/plymouth-themes
plymouth: fix breeze-plymouth (and other themes)
2017-11-06 06:18:38 +00:00
Orivej Desh
30bd994724
Merge pull request #31161 from nocent/master
networkmanager: add power saving and mac address randomization options for wifi devices
2017-11-06 06:17:16 +00:00
Ryan Mulligan
e8c8370425 nixos/mattermost: fix for webapp being renamed to client 2017-11-05 13:53:50 -08:00
Markus Mueller
4874862732
babeld module: init 2017-11-05 21:15:23 +01:00
Franz Pletz
711303952e
wireguard module: add device name environment var
This makes the interface name available as an environment variable for
the pre/post hooks.
2017-11-05 16:42:25 +01:00
Shaun Ren
eca212741e compton: change extraOptions type to types.lines 2017-11-05 20:23:44 +09:00
Frederik Rietdijk
dd851a8d75
Merge pull request #31254 from LumiGuide/graphite-python-overrides
graphite: override django and django_tagging
2017-11-05 09:40:59 +01:00
Maximilian Bosch
5b70c1855b
Revert "Revert "services.xserver: assert that either desktop- or window manager is not "none"""
This reverts commit e64dc25434.
2017-11-05 07:32:56 +01:00
Herwig Hochleitner
e64dc25434 Revert "services.xserver: assert that either desktop- or window manager is not "none""
This reverts commit 93c54acf97.
This reopens #30517 @nbp @Ma27

Breaking people's config for this is hardly reasonable as is. If it
absolutely cannot be avoided, at the very least, we need to provide
clear instructions on what people need to upgrade in their config. I
actually had to bisect to the commit, to even find out what property I
should change or define, as the error message was useless. It didn't
even mention a property name.

Discussion on the PR seems to be ongoing, so I'm reverting this, so we
don't break people's systems on unstable.
2017-11-05 01:51:13 +01:00
Guillaume Maudoux
7325ad9ab7 graphite: override django and django_tagging
instead of depending on specific versions in the django_tagging_0_4_3
and graphite_web derivations.

This should fix: https://github.com/NixOS/nixpkgs/pull/30277#discussion_r145393088

This was joint work of @basvandijk and @layus at NixCon 2017.
2017-11-04 17:53:35 +01:00
Maximilian Bosch
93c54acf97 services.xserver: assert that either desktop- or window manager is not "none"
resolves #11064
2017-11-04 15:30:20 +01:00
Benjamin Staffin
600f393bc7
keybase service: Turn off debug logging
Keybase is _extremely_ verbose with its debug output when run with -d.
2017-11-03 14:45:08 -04:00
Daiderd Jordan
9a1534496a
Merge pull request #31149 from LumiGuide/pgmanage-10.0.2
postage: replaced by pgmanage-10.0.2
2017-11-03 12:32:29 +01:00
Joerg Thalheim
2e6daff704 nixos/unbound: correct indented interface/access lists 2017-11-03 08:37:02 +00:00