BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
96331 commits 1 branch 0 tags 3.8 GiB
Commit graph

3200 commits

Author SHA1 Message Date
Joachim Fasting
3851afc8eb opensmtpd service: path -> package for option procPackages 2016-10-26 03:01:56 +02:00
Joachim Fasting
946fe73b56 opensmtpd service: use explicit pkgs for consistency 2016-10-26 03:01:56 +02:00
Joachim Fasting
37afc5cda1 opensmtpd service: serviceConfiguration option as types.lines 2016-10-26 03:01:56 +02:00
Bjørn Forsman
cd1b09af5d nixos/tftpd: change default dir from /home/tftp to /srv/tftp 
/home is for real users. /srv is recommended by FHS (although there is
no consensus for what to name subdirs under /srv).
 2016-10-25 17:20:52 +02:00
Bjørn Forsman
d03dbfcbb8 nixos/tftpd: mention that it runs as an xinetd service 2016-10-25 17:20:52 +02:00
Domen Kožar
1622a21c68 Merge pull request #19453 from ryantrinkle/openfire-fix 
openfire: fix service expression
 2016-10-24 11:35:16 +02:00
Joachim F
bdc4397303 Merge pull request #19805 from joachifm/startAt-fixups 
Fixup remaining uses of startAt
 2016-10-23 20:39:53 +02:00
Emery Hemingway
7c6a4e6c35 nixos/octoprint: fixup extraConfig 2016-10-23 19:47:28 +02:00
Emery Hemingway
b675619391 nixos: use types.lines for extraConfig 2016-10-23 19:41:43 +02:00
Joachim Fasting
4c41c412a0
nix gc service: fix use of startAt 
`startAt = ""` as in `startAt = optionalString false ...` results
in an invalid timer unit (due to "" being promoted to a singleton
list and not filtered out).

Ref: c9941c4b5e
 2016-10-23 17:56:49 +02:00
Jörg Thalheim
eb3f23d9ba
openldap: apply correct type for configDir 
null is not a path
 2016-10-23 16:00:22 +02:00
Kranium Gikos Mendoza
1e3f622dbd openldap: set configDir as null 
fixes an error #19794 with this new option f3404b7 when using plain configuration files
 2016-10-23 11:55:23 +00:00
Bram Duvigneau
f1d45add3b brltty: 5.2 -> 5.4 2016-10-22 22:03:45 +00:00
Jörg Thalheim
fba9d231b4 Merge pull request #17394 from schneefux/znc-module 
ZNC: 1.6.2 -> 1.6.3, push 2015-12-07 -> 2016-07-28, module refactor
 2016-10-22 19:58:24 +02:00
Alexander Ried
459da7b86e gnome3: default to 3.22 (#19743) 
* gnome3: default to 3.22

* zuki-themes: add src for gnome 3.22, remove 3.18

* gnome3_22.vte_290: copy from gnome3.20

* termite: use vte-select-text from gnome3_20
 2016-10-22 19:54:20 +02:00
Jörg Thalheim
4bb91b315d Merge pull request #19601 from Hinidu/fix/neo4j-update-3 
neo4j: 2.1.3 -> 3.0.6
 2016-10-22 19:49:37 +02:00
Jörg Thalheim
fafe3ec40a Merge pull request #19624 from bjornfor/improve-atftpd-service 
nixos/atftpd: various improvements
 2016-10-22 18:08:53 +02:00
Frederik Rietdijk
e56832d730 Merge remote-tracking branch 'upstream/master' into HEAD 2016-10-22 17:23:24 +02:00
obadz
cf94cdb59b lightdm module: require accounts daemon module 2016-10-22 14:46:00 +01:00
schneefux
ee42e000dd
znc module: refactor 2016-10-22 13:52:20 +02:00
Jörg Thalheim
b0c38f450f Merge pull request #19347 from cedeel/bspwm-git 
bspwm-unstable: init at 2016-09-30
 2016-10-22 11:49:24 +02:00
Jörg Thalheim
6f99aa9a7e Merge pull request #19289 from DerTim1/openldap-add-configDir-option 
openldap: add configDir option
 2016-10-22 09:33:15 +02:00
Jörg Thalheim
20383d2606 Merge pull request #19635 from nhooyr/sshgen 
sshd: separate key generation into another service
 2016-10-21 23:40:16 +02:00
uwap
42e93b5f2a quassel-webserver: init at 2.1.1 2016-10-21 23:31:50 +02:00
Anmol Sethi
1a74eedd07 sshd: separate key generation into another service 
Fixes #19589
 2016-10-20 23:14:37 -04:00
Joachim F
858f54dd88 Merge pull request #19664 from eqyiel/revert-19591-master 
Revert "matrix-synapse: Pass required --report-stats opt"
 2016-10-21 01:47:12 +02:00
Tim Steinbach
99d9d32899 Merge pull request #19668 from groxxda/timers 
systemd.timers: automatically convert string to list
 2016-10-20 17:37:28 -04:00
Vladimír Čunát
4d5b893002 Merge #19081: gnome-3.22 
Also master commits are brought in.
 2016-10-20 23:04:10 +02:00
Tim Steinbach
0cbc4551ed Merge pull request #19729 from groxxda/supplicant 
supplicants: fix wants and wantedBy
 2016-10-20 16:39:59 -04:00
Jörg Thalheim
5f886fb8cb Merge pull request #19262 from chris-martin/riemann-health-ps 
Fix riemann-health service (add missing procps dependency)
 2016-10-20 22:11:43 +02:00
Alexander Ried
57d9c69c6a supplicant: fix wants and wantedBy 2016-10-20 20:17:17 +02:00
Eelco Dolstra
e6bcff4d53 display-manager: Require systemd-udev-settle.service 
It was already ordered after systemd-udev-settle.service, but that
doesn't do anything if no other units require
systemd-udev-settle.service. This was causing random failures during X
server startup, e.g.

machine# [   12.691372] display-manager[607]: (EE) open /dev/dri/card0: No such file or directory

http://hydra.nixos.org/build/41062823
 2016-10-20 17:49:40 +02:00
Robin Gloster
d05d063572
nginx: set correct acme permissions 2016-10-20 11:18:25 +02:00
Robin Gloster
c2eb39faba
gitlab: start sidekiq when starting gitlab 2016-10-20 11:18:21 +02:00
Peter Hoeg
1026bebee6
syncthing: use service files from upstream 
Currently only for the user services as NixOS handles the named system
instances slightly differently.

syncthing and syncthing-inotify are done the same way.

There are 4 parts to this:

 1) Copy in the upstream unit files
 2) Make the nixos module use the definition from upstream
 3) Enable restarting of all instances (system and user) on resume
 4) Allow the traffic in the firewall on default ports if wanted

fixes #18973
 2016-10-19 21:20:57 +02:00
Ryan Trinkle
928341132e openfire: fix service expression 
openfire is not in scope
 2016-10-19 11:06:07 -04:00
Edward Tjörnhammar
eacb020a0c
nixos: dictd, make wiktionary and wordnet default dicts 2016-10-19 08:43:30 +02:00
Edward Tjörnhammar
642366d103
nixos: dictd config location; bind to cfg 2016-10-19 08:43:30 +02:00
Alexander Ried
89ef1a1756 nix-optimise module: fix startAt 2016-10-19 02:22:12 +02:00
Ruben Maher
2e0d0af1c8 Revert "matrix-synapse: Pass required --report-stats opt" 2016-10-19 08:28:38 +10:30
Bjørn Forsman
f3876cbba0 nixos/atftpd: various improvements 
* Add extraOptions option, to pass arbitrary command line options to
  atftp. Especially useful to specify which address to bind to
  (--bind-addres ...).
* Improve descriptions (fix a typo, document default bind address,
  don't repeat service name in systemd description + capitalize)
* Change default server directory from /var/empty to /srv/tftp, and
  change types.str to types.path.
 2016-10-17 16:20:24 +02:00
Nikolay Amiantov
0842bc94e5 cachefilesd service: init 2016-10-16 19:58:33 +03:00
Pavel Platto
b835446563 neo4j: 2.1.3 -> 3.0.6 2016-10-16 17:11:05 +02:00
Ruben Maher
443d833947 matrix-synapse: Pass required --report-stats opt 2016-10-16 18:12:54 +10:30
Chris Darnell
137ce58317 bspwm-unstable: init at 2016-09-30 2016-10-16 01:28:11 -04:00
Graham Christensen
31b286467c
hound: Add description to services.hound.config 2016-10-15 19:09:33 -04:00
Benno Fünfstück
796264a708 nixos/avahi: use more upstream-like systemd units 
The new units mirror the upstream systemd units as closely as possible.
I could not find a reason why the service would need to be restarted on
resuming from suspend, and the upstream units also do not contain such a
restriction, so I removed the `partOf = [ "post-resume.target"]`.
This fixes #19525.
 2016-10-15 22:51:39 +02:00
Alexander Ried
4094d63dea NetworkManager-strongswan: init at 1.4.0 2016-10-15 20:32:16 +02:00
Alexander Ried
c2922a9157 xserverArgs fuckup 
gnome-x-session provides good defaults which we really should not
override.
We have to add assertions to gdm.nix if the user specified one of those.

enableTCP must be configured through a gnome setting

dunno why we have terminate but it probably breaks stuff

We should expose configFile so we can use it from gdm module.
 2016-10-15 20:32:14 +02:00
Alexander Ried
56d24b8e1d gdm module: enable user dbus session 2016-10-15 20:32:14 +02:00
Alexander Ried
a5aa926902 gdm module: only make xserver args overrideable 2016-10-15 20:32:14 +02:00
Alexander Ried
5125161a77 gnome3_22.gnome-session: lookup of gnome-settings-daemon.desktop 2016-10-15 20:32:14 +02:00
Alexander Ried
50adbbe65c displayManager.gdm: only gnome-session needs to be on path 2016-10-15 20:32:12 +02:00
Alexander Ried
e8ade4ff78 gnome3.gvfs module: make systemd services available 2016-10-15 20:32:12 +02:00
Alexander Ried
38212f6a0f gnome3.tracker module: add self to systemd path 
fixes GDBus.Error:org.freedesktop.systemd1.NoSuchUnit: Unit
tracker-store.service not found. - indexing for (null) will not work
 2016-10-15 20:32:12 +02:00
Alexander Ried
47dc33ded2 gnome3.evolution-data-server module: add self to systemd path 2016-10-15 20:32:12 +02:00
Alexander Ried
6457d1bbe3 gnome3.gnome-terminal-server: init module 
since gnome3.22 gnome-terminal uses a systemd service for it's backend
server.
 2016-10-15 20:32:12 +02:00
Graham Christensen
6c7a605714
hound: init module 2016-10-15 13:54:59 -04:00
romildo
0efba3b99c qlipper: init at 2016-09-26 2016-10-15 07:46:12 -03:00
romildo
0f78fcec7a
screengrab: init at 2016-02-24 
fixes #19561
 2016-10-15 12:10:16 +02:00
Frederik Rietdijk
cffdffe1f6 Merge pull request #19309 from FRidh/outputs 
Python: use separate output for tkinter
 2016-10-13 10:40:14 +02:00
Vladimír Čunát
727fc259d6 Merge branch 'master' into staging 2016-10-13 09:53:16 +02:00
Frederik Rietdijk
ad33e71c55 Merge pull request #19490 from regnat/taskserver 
taskserver : use pythonPackage.buildPythonPackage
 2016-10-12 18:24:43 +02:00
regnat
f697486122 taskserver : use pythonPackage.buildPythonPackage 2016-10-12 18:09:13 +02:00
Robin Gloster
dabcd7d4c8 dockerRegistry module: re-init with new underlying software 2016-10-12 14:05:09 +02:00
Robin Gloster
a0e791a14c errbot module: init 2016-10-12 13:17:46 +02:00
Franz Pletz
1749e86577 crowd module: init 2016-10-12 13:17:24 +02:00
Franz Pletz
96d0950ce3 jira module: init 2016-10-12 13:17:24 +02:00
Franz Pletz
cc89d6c8e9 confluence module: init 2016-10-12 13:17:24 +02:00
Profpatsch
bef6bef0d2
stdenv/stripHash: print to stdout, not to variable 
`stripHash` documentation states that it prints out the stripped name to
the stdout, but the function stored the value in `strippedName`
instead.

Basically all usages did something like
`$(stripHash $foo | echo $strippedName)` which is just braindamaged.
Fixed the implementation and all invocations.
 2016-10-11 18:34:36 +02:00
zimbatm
e026d5b9c8 x11 module: don't restart the display manager indefinitely (#19418) 
* x11 module: don't restart the display manager indefinitely

If the display managers crashes continuously in loops it prevents the
user from switching to the console and try to fix things. Especially
when using the "auto" display manager it can happen quite easily.

* x11 module: fix display manager restart timeouts

It takes more than 1 second to boot the X server.
 2016-10-10 21:35:37 +01:00
Joachim F
261c1780c5 Merge pull request #19420 from romildo/new.qps 
qps: init at 1.10.16
 2016-10-10 16:07:29 +02:00
Joachim F
1997761725 Merge pull request #19367 from cransom/smokeping-fix 
smokeping module: fix missing js, broken alerts
 2016-10-10 16:06:39 +02:00
romildo
6757b20cf4 qps: init at 1.10.16 2016-10-10 08:08:00 -03:00
Frederik Rietdijk
104c50dd1a Python: remove modules and pythonFull 2016-10-10 10:33:24 +02:00
Tim Digel
f3404b71a7 Add configDir option 2016-10-10 07:18:06 +02:00
Robin Gloster
c6b050fd2f
nixbot module: init 2016-10-09 15:05:27 +02:00
Jörg Thalheim
da5c0220aa Merge pull request #17622 from rvl/nixos-manual-writing-documentation 
Add documentation about writing NixOS documentation
 2016-10-09 13:39:08 +02:00
Franz Pletz
a3ec0f1593
nixos/nginx: reload on acme cert renewal 2016-10-09 12:55:24 +02:00
Franz Pletz
03c2b449f8
dhcpd service: Add extraFlags option 2016-10-09 11:38:34 +02:00
oida
725e04cc01
prometheus module: added default option values for relabel_config 2016-10-09 11:37:33 +02:00
Joachim Fasting
52d12b473a
mysql service: specify defaultText for package option 
Also provide an example that differs from the default.
 2016-10-09 11:28:51 +02:00
romildo
19779be536 lxqt: Add xscreensaver to systemPackages 2016-10-08 23:55:11 -03:00
Casey Ransom
74558c88fb smokeping module: fix missing js, broken alerts 
The initial commit accidentally left in some commented code and if you were
using alerts, they simply didn't work.

Smokeping also includes some JS code for the webui allowing you to zoom into
graphs and it was not passed into the homedir. Additionally, generate
static html pages for other webservers to serve the cache directory.

Add additional options to specify sendmail path or mailhost and verify that both
are not set.

Add one extra config hook that allows you to bypass all of the invidual config
stanzas and just hand it a string.
 2016-10-08 20:52:45 -04:00
Joachim F
ccd915ca27 Merge pull request #19358 from romildo/lxqt 
lximage-qt: init at 0.5.0
 2016-10-08 16:03:35 +02:00
romildo
22b86a8753 lximage-qt: init at 0.5.0 2016-10-08 10:37:10 -03:00
Jaka Hudoklin
afbe339e7d firewall service: add support for loose reverse path filter check (#19122) 2016-10-08 14:26:52 +02:00
Peter Hoeg
7e5a393e8c
deluge module: support specifying open file limit 
We also increase the limit to 4096.
 2016-10-07 22:14:03 +02:00
Jörg Thalheim
daf4e57577 Merge pull request #19209 from siddharthist/urxvtd/init 
urxvtd service: init
 2016-10-07 16:14:35 +02:00
Joachim F
030a298406 Merge pull request #19212 from romildo/new.lxqt 
lxqt: init at 0.11
 2016-10-07 14:00:54 +02:00
romildo
a5bbe8970f obconf-qt: init at 0.11.0 2016-10-07 06:57:25 -03:00
José Romildo Malaquias
0d7056331d compton-conf: init at 0.2.0 2016-10-06 19:01:04 -03:00
Langston Barrett
543494b815 urxvtd service: init 
adds pkgs.rxvt_unicode-with-plugins
adds appropriate environment.variables
no default target, must be enabled manually
 2016-10-06 20:03:06 +00:00
Thomas Tuegel
2e255a2edd
Merge branch 'staging' 2016-10-06 09:51:02 -05:00
Moritz Ulrich
c475234827 services.kippo: Add missing '}' 2016-10-06 13:39:21 +02:00
José Romildo Malaquias
fbe7c92bd5 lxqt: Add libkscreen to systemPackages 2016-10-06 08:02:44 -03:00
José Romildo Malaquias
0b4e3e7822 lxqt: Add qtsvg to systemPackages 2016-10-06 08:02:44 -03:00
José Romildo Malaquias
49ed3ab705 lxqt: fix small issues in nix expressions 2016-10-06 08:02:43 -03:00
José Romildo Malaquias
f3e8bfa823 lxqt service: init at 0.11 2016-10-06 08:02:43 -03:00
Frederik Rietdijk
6f836eb0d4 Kippo: move pythonPackages.twisted_11 to kippo expression 2016-10-06 12:59:05 +02:00
Domen Kožar
2fdda9ce04 Merge pull request #19281 from peterhoeg/php 
php-fpm: add reload support
 2016-10-06 11:49:03 +02:00
Eric Sagnes
0bd263ecc3
wireguard: add module 
fixes #17933
 2016-10-06 09:41:38 +02:00
Peter Hoeg
47a8f1ea85 php-fpm: add reload support 
Upstream recommends sending USR2 for a graceful reload.
 2016-10-06 10:22:24 +08:00
Nikolay Amiantov
2058c856a1 Merge pull request #19235 from aske/sddm-log 
sddm: fix missing X server logs
 2016-10-05 21:16:26 +04:00
Vladimír Čunát
30f551d8b2 Merge branch 'master' into staging 2016-10-05 19:02:48 +02:00
Peter Hoeg
5a6626f47c php fpm: add systemd support 
PHP FPM will now notify systemd when it's done initializing and ready to
serve requests.

Additionally ```systemctl status phpfpm``` will now show statistics such
as:

```
Status: "Processes active: 0, idle: 8, Requests: 0, slow: 0, Traffic: 0req/sec"
```
 2016-10-05 23:30:31 +08:00
Chris Martin
57023aba3d riemann-health service: add procps to path (#19237) 2016-10-05 10:52:15 -04:00
Gleb Peregud
5f0edde4b1 Fix typo in emacs.xml 2016-10-05 07:46:28 +02:00
Thomas Tuegel
d067b7bd35
Merge branch 'kde-5' into staging 2016-10-04 21:50:17 -05:00
Kirill Boltaev
1978d00458 sddm: wrap xserver in systemd-cat to make logs appear in the journal 2016-10-05 00:07:23 +03:00
Joachim F
94cf6b2d56 Merge pull request #19210 from joachifm/mysql 
Some light mysql service enhancements
 2016-10-04 22:30:53 +02:00
Andrew Scott
05b7aaae74 nix.optimise.dates should be list 2016-10-04 11:31:51 +01:00
Joachim Fasting
4358d3d439
mysql service: specify a default package 
A config ought to be buildable using just the defaults.
 2016-10-03 23:08:32 +02:00
Joachim Fasting
c2153538d9
mysql service: add some option types 
Note that this changes the type and default value of port to int
(previously default was a string, no type).
 2016-10-03 23:08:31 +02:00
Joachim Fasting
88265c8238
mysql service: order after network.target 2016-10-03 23:08:26 +02:00
Jörg Thalheim
888f6a1280 Merge pull request #19199 from wizeman/u/fix-help2man-hash 
help2man: fix hash
 2016-10-03 19:26:44 +02:00
Eelco Dolstra
69bb34673e Merge pull request #19196 from groxxda/xkbbindir 
xserver: replace XKB_BINDIR with compile time option
 2016-10-03 17:12:59 +02:00
Jörg Thalheim
a9cd913b73 Merge pull request #19176 from makefu/module-opentracker 
opentracker: init module
 2016-10-03 16:55:38 +02:00
Alexander Ried
e7ded267bd xserver: replace XKB_BINDIR with compile time option 
---

Using the configure option relieves us of the patch and passing the path
via the env var in many places. Also the env var may not be inherited
when components like gdm spawn new sessions.
 2016-10-03 15:03:02 +02:00
Tristan Helmich
81ff763541 emby: use makeWrapper to supply ffmpeg/probe paths 
Fixes NixOS/nixpkgs#19118
 2016-10-03 12:23:44 +02:00
makefu
e9039c8b5a
opentracker service: init 2016-10-03 11:29:33 +02:00
Charles Strahan
7df35fd268 Merge pull request #19143 from cstrahan/nixos-typematic 
nixos: xserver typematic configuration options
 2016-10-03 04:04:45 -04:00
Charles Strahan
f9a3835a14
nixos: xserver typematic configuration options 
This allows one to set the seat defaults for keyboard auto-repeat delay
and rate.
 2016-10-03 04:00:06 -04:00
Joachim F
0906a0f197 Merge pull request #18491 from groxxda/network-interfaces 
Replace Network-interfaces.target
 2016-10-02 16:34:37 +02:00
Jörg Thalheim
cd673d3c26 Merge pull request #19138 from nhooyr/openssh 
openssh: support prohibit-password for permitRootLogin
 2016-10-02 15:26:21 +02:00
Tuomas Tynkkynen
19225bf5cc Merge remote-tracking branch 'upstream/master' into staging 2016-10-02 10:36:47 +03:00
Anmol Sethi
6891bb1c59
openssh: support prohibit-password for permitRootLogin 
See 1dc8d93ce6

I also made it the default.
 2016-10-01 13:23:56 -04:00
Jörg Thalheim
7d3143990f Merge pull request #19136 from nhooyr/powerdns 
powerdns: removed PrivateTmp=true in serviceConfig
 2016-10-01 18:28:34 +02:00
Anmol Sethi
489ca7e5c0
powerdns: removed PrivateTmp=true in serviceConfig 
As discussed in #18718 PrivateTmp is unnecessary because powerdns is
chrooted to /var/lib/powerdns.

I also added myself as co-maintainer.
 2016-10-01 12:27:23 -04:00
Joachim F
7e80c42b0e Merge pull request #18511 from ericsagnes/feat/remove-optionSet 
modules: optionSet -> submodule
 2016-10-01 17:57:45 +02:00
Jaka Hudoklin
98a8146428 Merge pull request #19016 from offlinehacker/pkgs/flannel/update/0.6.2 
flannel: update, add nixos module, add tests
 2016-10-01 17:22:34 +02:00
Jaka Hudoklin
feb9fc3aff flannel service: init 2016-10-01 17:08:48 +02:00
Jörg Thalheim
f2f7420e2b Merge pull request #19115 from Ralith/matrix-synapse 
matrix-synapse: 0.17.1 -> 0.18.0
 2016-10-01 14:54:41 +02:00
Eelco Dolstra
e993506d4c samba: Use startup notification 
This ensures synchronous unit start.
 2016-09-30 21:22:58 +02:00
Robert Helgesson
db3579c332
ddclient service: minor spelling fix 2016-09-30 19:26:21 +02:00
Thomas Bereknyei
5bca9297ff
ddclient: add configFile option 
ddclient: improve documentation

Adopted @joachifm's suggestions.

ddclient additional refinement
 2016-09-30 19:13:56 +02:00
Joachim F
1ddc08a3ac Merge pull request #18452 from bendlas/init-postgrey 
postgrey: init at 1.36
 2016-09-30 15:31:44 +02:00
Shea Levy
b692e06686 supplicant: Make the device pull in the supplicant service. 
The udev rule should do this. Not sure why it doesn't.

Fixes #19029.
 2016-09-30 09:22:49 -04:00
Peter Hoeg
639e5401ff dbus: add socket activation but do not enable it 
The following changes are included:

1) install user unit files from upstream dbus
2) use absolute paths to config for --system and --session instances
3) make socket activation of user units configurable

There has been a number of PRs to address this, so this one does the
bare minimum, which is to make the functionality available and
configurable but defaults to off.

Related PRs:
 - #18382
 - #18222

(cherry picked from commit f7215c9b5b47dfb0a6dbe87ff33d7730729a32e5)
Signed-off-by: Domen Kožar <domen@dev.si>
 2016-09-30 13:14:53 +02:00
Eelco Dolstra
020e88704a kde4: Get rid of some Nepomuk cruft by default 2016-09-29 20:03:54 +02:00
Eelco Dolstra
c2495261a8 kde4: Allow disabling dependency on MariaDB 
This reduces the runtime closure of a KDE4 system by ~172 MiB.
 2016-09-29 20:03:50 +02:00
Joachim F
e2c7f7135d Merge pull request #19060 from bachp/confd-etcd-port 
confd service: change default etcd port 4001 -> 2379
 2016-09-29 14:59:51 +02:00
Joachim F
4d3282a8fe Merge pull request #18993 from ericsagnes/mod/php-fpm 
php-fpm module: cleanup
 2016-09-29 13:14:32 +02:00
Eelco Dolstra
518340624d Merge remote-tracking branch 'origin/master' into staging 2016-09-29 13:06:14 +02:00
Eelco Dolstra
75a1ec8a65 NixOS: Use runCommand instead of mkDerivation in a few places 2016-09-29 13:05:28 +02:00
Pascal Bach
7d6c02d45a confd service: change default etcd port 4001 -> 2379 
New versions of etcd listen on 2379 by default.
This is also the official IANA assigned port.
 2016-09-28 23:35:54 +02:00
Vladimír Čunát
77604964b6 Merge branch 'master' into staging 2016-09-28 17:13:59 +02:00
Graham Christensen
e2688e072d
moodle: mark as broken 
https://github.com/NixOS/nixpkgs/issues/18856
 2016-09-28 08:52:18 -04:00
Graham Christensen
310b3d39f7 Merge pull request #18994 from grahamc/mediawiki 
mediawiki: 1.23.13 -> 1.27.1
 2016-09-27 16:33:31 -04:00
Franz Pletz
77779323c5
gitlab: 8.11.2 -> 8.12.1 2016-09-27 18:41:02 +02:00