about summary refs log tree commit diff
path: root/pkgs/servers
Commit message (Expand)AuthorAge
* Merge remote-tracking branch 'upstream/master' into HEADFrederik Rietdijk2017-11-25
|\
| * munin-node: patch to configure plugin-conf.dKjetil Orbekk2017-11-25
| * munin-node: add patch to preserve environment variablesKjetil Orbekk2017-11-25
| * munin: 2.0.33 -> 2.0.34Kjetil Orbekk2017-11-25
| * traefik: 1.3.8 -> 1.4.4adisbladis2017-11-25
* | Merge remote-tracking branch 'upstream/master' into HEADFrederik Rietdijk2017-11-25
|\|
| * influxdb: make it know what version it isPeter Hoeg2017-11-25
| * Merge pull request #31981 from pbogdan/update-wordpressGraham Christensen2017-11-24
| |\
| | * wordpress: 4.8.3 -> 4.9Piotr Bogdan2017-11-23
| * | Merge branch 'staging' (older one)Vladimír Čunát2017-11-24
| |\ \ | | |/ | |/|
* | | Merge remote-tracking branch 'upstream/master' into HEADFrederik Rietdijk2017-11-23
|\| |
| * | inginious: mark as brokenzimbatm2017-11-23
| * | cockroachdb: 1.1.1 -> 1.1.2Austin Seipp2017-11-22
| * | double-conversion: rename attr from double_conversionOrivej Desh2017-11-22
| * | init: restya-board at 0.6Thomas Strobel2017-11-22
| * | apt-cacher-ng: 0.9.1 -> 3.1Andreas Rammhold2017-11-22
* | | Merge pull request #31775 from obsidiansystems/stdenv-both-propagated-filesJohn Ericson2017-11-22
|\ \ \ | |_|/ |/| |
| * | stdenv setup: Always use both propagated filesJohn Ericson2017-11-21
* | | Merge branch 'master' into stagingOrivej Desh2017-11-21
|\ \ \ | | |/ | |/|
| * | samba: 4.6.8 -> 4.6.11 to address CVEs CVE-2017-14746 & CVE-2017-15275Andreas Rammhold2017-11-21
| * | sqlite-jdbc: init at 3.20.0 (#31816)jraygauthier2017-11-20
* | | Merge branch 'master' into stagingOrivej Desh2017-11-20
|\| |
| * | shairplay: init at 2016-01-01Peter Hoeg2017-11-20
* | | treewide: update the usage of makeWrapper after #31497Orivej Desh2017-11-19
* | | Merge branch 'master' into stagingFranz Pletz2017-11-19
|\| |
| * | zabbix22: 2.2.16 -> 2.2.20Franz Pletz2017-11-19
| * | zabbix20: 2.0.11 -> 2.0.21 for multiple CVEsFranz Pletz2017-11-19
| * | owncloud705: remove vulnerable versionFranz Pletz2017-11-19
| * | couchdb2: 2.0.0 -> 2.1.1 for multiple CVEsFranz Pletz2017-11-19
| * | couchdb: 1.6.1 -> 1.7.1 for multiple CVEsFranz Pletz2017-11-19
* | | Merge branch 'master' into stagingOrivej Desh2017-11-19
|\| |
| * | matrix-synapse: 0.24.1 -> 0.25.1Ruben Maher2017-11-19
| * | grafana: 4.6.1 -> 4.6.2WilliButz2017-11-19
| * | mattermost: add ryantm as maintainerRyan Mulligan2017-11-17
| * | mattermost: 4.4.0 -> 4.4.1Ryan Mulligan2017-11-17
* | | Merge branch 'master' into stagingOrivej Desh2017-11-17
|\| |
| * | tvheadend: 4.2.1 -> 4.2.4Peter Hoeg2017-11-17
* | | treewide: use --set-default and --set-eval where appropriateOrivej Desh2017-11-17
|/ /
* | Merge pull request #31749 from ryantm/mattermost-4.4.0Orivej Desh2017-11-16
|\ \
| * | mattermost: 4.3.0 -> 4.4.0Ryan Mulligan2017-11-16
* | | matterbridge: 1.1.0 -> 1.4.1Ryan Mulligan2017-11-16
|/ /
* | Rspamd 1.4.3 -> 1.6.5Robin Raymond2017-11-16
* | pgpool: 3.4.2 -> 3.4.14Orivej Desh2017-11-16
* | rdf4store: fix build with glibc 2.26Orivej Desh2017-11-15
* | emby: 3.2.33.0 -> 3.2.36.0Tristan Helmich2017-11-14
* | influxdb: 1.0.2 -> 1.4.1Dmitry Moskowski2017-11-14
* | Merge pull request #31653 from bflyblue/plex-1.9.6.4429Franz Pletz2017-11-14
|\ \
| * | plex: 1.9.5 -> 1.9.6Shaun Sharples2017-11-14
* | | Revert "plex: 1.9.5 -> 1.9.7"Graham Christensen2017-11-13
* | | plex: 1.9.5 -> 1.9.7Shaun Sharples2017-11-13