Commit graph

626 commits

Author SHA1 Message Date
Tuomas Tynkkynen
2fec9c6e29 Merge remote-tracking branch 'upstream/master' into staging
Conflicts:
	pkgs/development/tools/build-managers/conan/default.nix
2018-03-13 23:04:18 +02:00
John Ericson
eeb8419c6a ceph: Fix --with-file-aio logic for new meta.platforms and cross 2018-03-12 18:55:41 -04:00
Jan Malakhovski
7079e744d4 Merge branch 'master' into staging
Resolved the following conflicts (by carefully applying patches from the both
branches since the fork point):

   pkgs/development/libraries/epoxy/default.nix
   pkgs/development/libraries/gtk+/3.x.nix
   pkgs/development/python-modules/asgiref/default.nix
   pkgs/development/python-modules/daphne/default.nix
   pkgs/os-specific/linux/systemd/default.nix
2018-03-10 20:38:13 +00:00
Franz Pletz
94db63f5d4
nginxMainline: 1.13.8 -> 1.13.9 2018-03-05 15:49:07 +01:00
Luka Blašković
75d4499e69 openresty: 1.9.3.1 -> 1.13.6.1 (#36289) 2018-03-04 19:52:32 +00:00
Ryan Mulligan
3a90c13d97 mod_wsgi: 3.5 -> 4.5.24
Semi-automatic update. These checks were performed:

- built on NixOS
- found 4.5.24 with grep in /nix/store/3a7nb1vrk4hfj3rarl1rfh319pab7j5i-mod_wsgi-4.5.24
- found 4.5.24 in filename of file in /nix/store/3a7nb1vrk4hfj3rarl1rfh319pab7j5i-mod_wsgi-4.5.24
2018-03-04 18:32:00 +00:00
Tuomas Tynkkynen
34f95d92a2 Merge remote-tracking branch 'upstream/master' into staging
Conflicts:
	pkgs/applications/misc/pytrainer/default.nix
	pkgs/development/tools/pew/default.nix
	pkgs/tools/misc/you-get/default.nix
2018-02-28 20:52:49 +02:00
Ryan Mulligan
4cac5a7e56 pshs: 0.3.1 -> 0.3.2
Semi-automatic update. These checks were performed:

- built on NixOS
- ran `/nix/store/s4z6nwhd7wqzkxaplrigy6xv9fk0pkgw-pshs-0.3.2/bin/pshs -h` got 0 exit code
- ran `/nix/store/s4z6nwhd7wqzkxaplrigy6xv9fk0pkgw-pshs-0.3.2/bin/pshs --help` got 0 exit code
- ran `/nix/store/s4z6nwhd7wqzkxaplrigy6xv9fk0pkgw-pshs-0.3.2/bin/pshs -V` and found version 0.3.2
- ran `/nix/store/s4z6nwhd7wqzkxaplrigy6xv9fk0pkgw-pshs-0.3.2/bin/pshs -v` and found version 0.3.2
- ran `/nix/store/s4z6nwhd7wqzkxaplrigy6xv9fk0pkgw-pshs-0.3.2/bin/pshs --version` and found version 0.3.2
- ran `/nix/store/s4z6nwhd7wqzkxaplrigy6xv9fk0pkgw-pshs-0.3.2/bin/pshs -h` and found version 0.3.2
- ran `/nix/store/s4z6nwhd7wqzkxaplrigy6xv9fk0pkgw-pshs-0.3.2/bin/pshs --help` and found version 0.3.2
- found 0.3.2 with grep in /nix/store/s4z6nwhd7wqzkxaplrigy6xv9fk0pkgw-pshs-0.3.2
- found 0.3.2 in filename of file in /nix/store/s4z6nwhd7wqzkxaplrigy6xv9fk0pkgw-pshs-0.3.2

cc "@eduarrrd"
2018-02-28 14:23:22 +00:00
Ryan Mulligan
f622b3f0c8 thttpd: 2.27 -> 2.28
Semi-automatic update. These checks were performed:

- built on NixOS
- ran `/nix/store/y5ysgh6ivjgwngq37kgzlamkh91mp0qk-thttpd-2.28/bin/syslogtocern --help` got 0 exit code
- ran `/nix/store/y5ysgh6ivjgwngq37kgzlamkh91mp0qk-thttpd-2.28/bin/syslogtocern help` got 0 exit code
- ran `/nix/store/y5ysgh6ivjgwngq37kgzlamkh91mp0qk-thttpd-2.28/bin/syslogtocern version` and found version 2.28
- ran `/nix/store/y5ysgh6ivjgwngq37kgzlamkh91mp0qk-thttpd-2.28/bin/syslogtocern help` and found version 2.28
- ran `/nix/store/y5ysgh6ivjgwngq37kgzlamkh91mp0qk-thttpd-2.28/bin/thttpd -V` and found version 2.28
- found 2.28 with grep in /nix/store/y5ysgh6ivjgwngq37kgzlamkh91mp0qk-thttpd-2.28
- found 2.28 in filename of file in /nix/store/y5ysgh6ivjgwngq37kgzlamkh91mp0qk-thttpd-2.28
2018-02-28 12:18:24 +01:00
Ryan Mulligan
1d513bc7d6 yaws: 2.0 -> 2.0.4
Semi-automatic update. These checks were performed:

- built on NixOS
- ran `/nix/store/946hqpkgmb964ilf2sbk9ln4kfy7jnkr-yaws-2.0.4/bin/yaws -v` and found version 2.0.4
- ran `/nix/store/946hqpkgmb964ilf2sbk9ln4kfy7jnkr-yaws-2.0.4/bin/yaws --version` and found version 2.0.4
- found 2.0.4 with grep in /nix/store/946hqpkgmb964ilf2sbk9ln4kfy7jnkr-yaws-2.0.4
- found 2.0.4 in filename of file in /nix/store/946hqpkgmb964ilf2sbk9ln4kfy7jnkr-yaws-2.0.4

cc "@goibhniu @the-kenny"
2018-02-27 19:20:46 -08:00
Frederik Rietdijk
d10c201252 Merge remote-tracking branch 'upstream/master' into HEAD 2018-02-27 16:22:37 +01:00
Ryan Mulligan
741c261cf7 hiawatha: 10.5 -> 10.7
Semi-automatic update. These checks were performed:

- built on NixOS
- ran `/nix/store/5x2w4d0fm3m3wr5snf6c7qys9g2kia3h-hiawatha-10.7/bin/ssi-cgi -h` got 0 exit code
- ran `/nix/store/5x2w4d0fm3m3wr5snf6c7qys9g2kia3h-hiawatha-10.7/bin/ssi-cgi -v` and found version 10.7
- ran `/nix/store/5x2w4d0fm3m3wr5snf6c7qys9g2kia3h-hiawatha-10.7/bin/ssi-cgi -h` and found version 10.7
- ran `/nix/store/5x2w4d0fm3m3wr5snf6c7qys9g2kia3h-hiawatha-10.7/bin/hiawatha -h` got 0 exit code
- ran `/nix/store/5x2w4d0fm3m3wr5snf6c7qys9g2kia3h-hiawatha-10.7/bin/hiawatha -v` and found version 10.7
- ran `/nix/store/5x2w4d0fm3m3wr5snf6c7qys9g2kia3h-hiawatha-10.7/bin/hiawatha -h` and found version 10.7
- ran `/nix/store/5x2w4d0fm3m3wr5snf6c7qys9g2kia3h-hiawatha-10.7/bin/wigwam -h` got 0 exit code
- ran `/nix/store/5x2w4d0fm3m3wr5snf6c7qys9g2kia3h-hiawatha-10.7/bin/wigwam -v` and found version 10.7
- ran `/nix/store/5x2w4d0fm3m3wr5snf6c7qys9g2kia3h-hiawatha-10.7/bin/wigwam -h` and found version 10.7
- found 10.7 with grep in /nix/store/5x2w4d0fm3m3wr5snf6c7qys9g2kia3h-hiawatha-10.7
- found 10.7 in filename of file in /nix/store/5x2w4d0fm3m3wr5snf6c7qys9g2kia3h-hiawatha-10.7

cc "@ndowens"
2018-02-26 18:40:18 -08:00
Will Dietz
40b14109d3 nginx/modules: brotli: no-op bump to latest that uses 1.0.2 as submodule
We have it use our system copy regardless, but might as well.

(yes, hash does not change, since we don't fetch submodule here)
2018-02-20 14:08:22 -06:00
Will Dietz
df9ebaf8c7 nginx/modules: use eustas' brotli module, google one is abandoned
This fork is also used by FreeBSD as of Dec 2017:
https://svnweb.freebsd.org/ports?view=revision&revision=455560

See also:
https://github.com/google/ngx_brotli/issues/62
2018-02-20 14:01:18 -06:00
Joachim F
0ab789639f
Merge pull request #34430 from dtzWill/update/pagespeed-1.13.35.2
psol, ngx_pagespeed: 1.13.35.1 -> 1.13.35.2
2018-02-17 10:20:59 +00:00
Austin Seipp
acd80e4725 h2o: init at 2.2.4
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2018-02-15 13:46:48 -06:00
Will Dietz
06e50006d4 nginxModules.pagespeed: be consistent about rev
Yes hash doesn't change, stable is copy of beta used previously.
2018-02-13 15:17:21 -06:00
Michael Raskin
fdcbb263ac
Merge pull request #32579 from leenaars/lwan
lwan: init -> 0.1
2018-02-06 21:26:18 +00:00
Will Dietz
75068a6770 psol, ngx_pagespeed: 1.13.35.1 -> 1.13.35.2 2018-01-31 05:46:52 +09:00
adisbladis
67906744ec
Merge pull request #33658 from dtzWill/update/ngx_pagespeed
ngx_pagespeed, psol: 1.11.33.4 -> 1.13.35.1
2018-01-10 20:04:59 +08:00
Will Dietz
be2e01f8a0 ngx_pagespeed, psol: 1.11.33.4 -> 1.13.35.1
Fixes build when used with nginxMainline.

(FWIW, 1.11.33.4 is from 2016-09-15)
2018-01-09 10:57:17 -06:00
Will Dietz
0bbcfb0d6d nginxMainline: 1.13.6 -> 1.13.8
See http://nginx.org/en/CHANGES
2018-01-09 10:55:52 -06:00
Andreas Rammhold
637d5dd00c tomcat9: 9.0.0.M17 -> 9.0.2
also renamed from tomcatUnstable to tomcat9
2018-01-09 01:31:06 +01:00
Andreas Rammhold
3498654f27 tomcat7: 7.0.81 -> 7.0.82 (fixes CVE-2017-12617)
For details see [1].

[1] http://tomcat.apache.org/security-7.html#Fixed_in_Apache_Tomcat_7.0.82
2018-01-09 01:31:06 +01:00
Andreas Rammhold
d065224202 tomcat8: 8.0.46 -> 8.0.47 (fixes CVE-2017-12617)
For details see [1].

[1] http://tomcat.apache.org/security-8.html#Fixed_in_Apache_Tomcat_8.0.47
2018-01-09 01:31:06 +01:00
Andreas Rammhold
15590701e2 tomcat85: 8.5.20 -> 8.5.23 (fixes CVE-2017-12617)
For details see [1].

[1] http://tomcat.apache.org/security-8.html#Fixed_in_Apache_Tomcat_8.5.23
2018-01-09 01:31:06 +01:00
Joachim F
3d8e5fe74c
Merge pull request #32952 from Izorkin/ModSecurity-nginx
modsecurity-nginx: 2017-08-23 -> 1.0.0 Stable
2018-01-07 19:39:36 +00:00
Orivej Desh
729f97ef9b apache-httpd: respect review in #33481 2018-01-06 18:40:44 +00:00
Eli Flanagan
f95d92ee96 apache-httpd: enable brotli support 2018-01-06 18:42:02 +01:00
Robin Gloster
ee1c85aee9 mariadb: lib -> connector-c 2017-12-29 02:18:35 +01:00
Michiel Leenaars
cefec62a27 lwan: init at 0.1 2017-12-23 23:35:12 +00:00
Izorkin
37d66db7f9 modsecurity-nginx: 2017-08-23 -> 1.0.0 Stable 2017-12-21 23:41:38 +03:00
Bjørn Forsman
dc9ea840c1 lighttpd: add enableLdap option (default false) 2017-12-21 08:50:22 +01:00
Jörg Thalheim
bc97af0b31
Merge pull request #32449 from Izorkin/ModSecurity-nginx
nginxModules.ModSecurity-beta: 2017-06-17 -> 2017-08-23
2017-12-16 23:21:12 -08:00
Joachim F
8a11e0d133
Merge pull request #32038 from andir/nginx-rtmp-gcc7
nginxModules.rtmp: v1.1.11 -> v1.2.0 & add support for gcc-7
2017-12-14 17:13:17 +00:00
Bjørn Forsman
72e635a4cd lighttpd: 1.4.45 -> 1.4.48 2017-12-10 21:05:24 +01:00
Izorkin
2c7912ce49 ModSecurity-nginx: update revision 2017-12-09 23:03:12 +03:00
Vladimír Čunát
6f5d989478
treewide: checkMeta fixes for x86_64-linux 2017-12-07 07:50:47 -05:00
Andreas Rammhold
a004f9f806
nginxModules.rtmp: v1.1.11 -> v1.2.1
adds support for gcc-7 and fixes nginx for #31747
2017-12-04 16:52:39 +01:00
Orivej Desh
6de0380378 nginxModules.brotli: 2015-11-18 -> 2016-12-02
This version bundles brotli.
2017-11-29 00:59:46 +00:00
Izorkin
cf6e90c104 nginx: add ModSecurity Nginx Connector (#28545)
nginx: add ModSecurity Nginx Connector
2017-11-26 07:57:19 -05:00
Andreas Rammhold
d41d43d850
apt-cacher-ng: 0.9.1 -> 3.1
Also helps compilation using gcc7.
2017-11-22 09:21:58 +01:00
Franz Pletz
3628595eba
couchdb2: 2.0.0 -> 2.1.1 for multiple CVEs
Fixes CVE-2017-12635, CVE-2017-12636.

https://blog.couchdb.org/2017/11/14/apache-couchdb-cve-2017-12635-and-cve-2017-12636/
2017-11-19 17:39:37 +01:00
Franz Pletz
0426b9456e
couchdb: 1.6.1 -> 1.7.1 for multiple CVEs
Fixes CVE-2017-12635, CVE-2017-12636.

https://blog.couchdb.org/2017/11/14/apache-couchdb-cve-2017-12635-and-cve-2017-12636/
2017-11-19 17:39:37 +01:00
Orivej Desh
6ab109a673 rdf4store: fix build with glibc 2.26
Tracking issue: #31696
2017-11-15 22:47:20 +00:00
Frederik Rietdijk
4fc2fd6d26
Merge pull request #31242 from rnhmjoj/python
hyp: move expression out python-packages.nix
2017-11-06 20:43:22 +01:00
rnhmjoj
632a1807db
hyp: move expression out python-packages.nix 2017-11-04 12:57:58 +01:00
c0bw3b
525380b472 treewide: abandon Google Code homepages 2017-11-03 18:52:28 +00:00
Piotr Bogdan
8904ce343a fix source root locations.
These have changed following commit
c3255fe8ec.

See also:

- https://github.com/NixOS/nixpkgs/pull/31004
- https://github.com/NixOS/nixpkgs/pull/31106
2017-11-02 13:53:36 +00:00
Vladimír Čunát
f90c468ea5
nginxModules.moreheaders: fix source hash
An amended git tag, apparently.  There are only changes in documentation
and whitespace changes in code.  Sigh.  Uncovered by c3255fe8ec.
2017-10-31 23:03:34 +01:00