1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-12-11 15:15:36 +00:00
Commit graph

8139 commits

Author SHA1 Message Date
volth 08f68313a4 treewide: remove redundant rec 2019-08-28 11:07:32 +00:00
Frederik Rietdijk 5061fe0c2c Merge staging-next into staging 2019-08-28 08:26:42 +02:00
Frederik Rietdijk 98640fd482 Merge master into staging-next 2019-08-27 16:36:47 +02:00
Peter Simons 79c6d22c1f mod_wsgi: allow building this module with python 2.x and 3.x 2019-08-27 14:27:31 +02:00
Peter Simons 630e25ba5c
Merge pull request #67525 from peti/t/postorious
mailman: add the Postorious web UI
2019-08-27 12:24:51 +02:00
Aaron Andersen 87fdc06a97
Merge pull request #63634 from aanderse/moodle
moodle: init at 3.7.1
2019-08-26 21:12:44 -04:00
volth 35d68ef143 treewide: remove redundant quotes 2019-08-26 21:40:19 +00:00
Robin Gloster 6bff4c107e
mailman: add postorius testing 2019-08-26 22:51:53 +02:00
Robin Gloster 4b1cc7eebf
mailman: add meta to python deps 2019-08-26 22:51:33 +02:00
Robin Gloster 279bd6fcd9
xorg.xf86videosis: 0.10.9 -> 0.11.0
fixes build
2019-08-26 22:12:43 +02:00
Peter Simons 22af3829a4 mailman: add the Postorious web UI 2019-08-26 21:12:56 +02:00
Peter Simons da1ff985ae mailman: drop hard-coded references to /usr/bin 2019-08-26 16:20:20 +02:00
Peter Hoeg f729a79eae
Merge pull request #62974 from peterhoeg/f/zmtrigger
zoneminder: add perlPackages.DeviceSerialPort for zmtrigger.pl
2019-08-26 14:47:32 +08:00
Peter Hoeg 7c119ba48b zoneminder: use DeviceSerialPort for zmtrigger.pl 2019-08-26 14:46:59 +08:00
Peter Simons fa5a231313
Merge pull request #67366 from peti/t/mailman-v3
update mailman to version 3.2.2
2019-08-25 22:09:58 +02:00
Peter Simons 842942baaa mailman: update from 2.1.29 to version 3.2.2 2019-08-25 21:47:03 +02:00
Vladimír Čunát 985d1ac425
Merge branch 'master' into staging-next
There were several more conflicts from name -> pname+version;
all auto-solved by kdiff3, hopefully OK.

Hydra nixpkgs: ?compare=1538611
2019-08-25 14:57:11 +02:00
Marek Mahut 02dd0be8d9
Merge pull request #67436 from dasJ/update-rainloop
rainloop-standard: Update as well
2019-08-25 14:48:20 +02:00
Aaron Andersen 95b3b63555 moodle: init at 3.7.1 2019-08-25 08:12:23 -04:00
Janne Heß 9c167efffd rainloop-standard: Update as well 2019-08-25 13:31:04 +02:00
Alexander V. Nikolaev 885511cb5c rmilter: remove deprecated package (and module) 2019-08-24 17:33:48 +03:00
Marek Mahut 1c5efbb592
Merge pull request #67386 from aanderse/limesurvey
limesurvey: 3.17.1+190408 -> 3.17.12+190823
2019-08-24 16:19:52 +02:00
Aaron Andersen 0ebe0eaf29 limesurvey: 3.17.1+190408 -> 3.17.12+190823 2019-08-24 08:15:13 -04:00
Vladimír Čunát 2e6bf42a22
Merge branch 'master' into staging-next
There ver very many conflicts, basically all due to
name -> pname+version.  Fortunately, almost everything was auto-resolved
by kdiff3, and for now I just fixed up a couple evaluation problems,
as verified by the tarball job.  There might be some fallback to these
conflicts, but I believe it should be minimal.

Hydra nixpkgs: ?compare=1538299
2019-08-24 08:55:37 +02:00
Samuel Leathers 7cec032b9e
Merge pull request #67263 from pacien/exim-spf
exim: add SPF support (+ init libspf2 at 1.2.10)
2019-08-24 00:58:02 -04:00
Samuel Leathers b9db7497a4
Merge pull request #67298 from bachp/plex-1.16.5.1488
plex: 1.16.4.1469 -> 1.16.5.1488
2019-08-24 00:39:35 -04:00
Marek Mahut 9730ab8867
Merge pull request #67326 from Izorkin/nginx-unit
unit: 1.9.0 -> 1.10.0
2019-08-24 01:33:12 +02:00
Marek Mahut 3847e4d1b3
Merge pull request #67335 from cw789/unifi_update
unifiStable: 5.10.26 -> 5.11.39
2019-08-24 01:31:44 +02:00
Linus Heckemann d1d602f559 Merge remote-tracking branch 'origin/master' into openssl-1.1 2019-08-23 17:27:39 +02:00
Maximilian Bosch 826b492dc3
Merge pull request #67348 from mayflower/prometheus-exporter-mysqld-0.11.0
prometheus-mysqld-exporter: 0.10.0 -> 0.11.0
2019-08-23 16:44:42 +02:00
Robin Gloster f1512dfea3
prometheus-mysqld-exporter: 0.10.0 -> 0.11.0 2019-08-23 16:06:54 +02:00
Robin Gloster 7d1bd575e8
Merge pull request #67344 from mayflower/alertmanager-0.18.0
alertmanager: 0.16.2 -> 0.18.0
2019-08-23 16:06:44 +02:00
Robin Gloster 3ac9fd3046
Merge pull request #67315 from marsam/update-prometheus
prometheus_2: 2.11.1 -> 2.12.0
2019-08-23 16:01:24 +02:00
Linus Heckemann 9ae11067b8 torque: remove commented-out sbin handling
We have a setup hook for this!
2019-08-23 15:58:53 +02:00
Robin Gloster c6a082b8a7
Merge pull request #63763 from thefloweringash/node-exporter-update
prometheus-node-exporter: 0.17.0 -> 0.18.1; set version information
2019-08-23 15:57:59 +02:00
Robin Gloster 88b55379fd
alertmanager: 0.16.2 -> 0.18.0 2019-08-23 15:38:07 +02:00
Lassulus 8b12bfcb83
Merge pull request #66215 from ajs124/ejabberd/19.08
ejabberd: 19.05 -> 19.08
2019-08-23 13:27:55 +02:00
cw 62ba7964f4 unifiStable: 5.10.26 -> 5.11.39 2019-08-23 13:02:22 +02:00
Izorkin 9332861720 unit: 1.9.0 -> 1.10.0 2019-08-23 10:03:00 +03:00
Mario Rodas b0ea62045b
prometheus_2: 2.11.1 -> 2.12.0
Changelog: https://github.com/prometheus/prometheus/releases/tag/v2.12.0
2019-08-22 19:26:55 -05:00
Robin Gloster c7e75df21f
Merge remote-tracking branch 'upstream/master' into openssl-1.1 2019-08-23 02:00:31 +02:00
Marek Mahut 7226a61853
Merge pull request #67141 from r-ryantm/auto-update/sonarr
sonarr: 2.0.0.5322 -> 2.0.0.5338
2019-08-22 23:08:53 +02:00
Marek Mahut 33b19b83fa
Merge pull request #67131 from r-ryantm/auto-update/rainloop-community
rainloop-community: 1.12.1 -> 1.13.0
2019-08-22 23:06:48 +02:00
Marek Mahut eda626d897
Merge pull request #67137 from r-ryantm/auto-update/shaarli
shaarli: 0.11.0 -> 0.11.1
2019-08-22 23:06:18 +02:00
Pascal Bach c17bb171de plex: 1.16.4.1469 -> 1.16.5.1488 2019-08-22 22:23:01 +02:00
pacien f1ef419be3 exim: add SPF support 2019-08-22 21:25:44 +02:00
Marek Mahut 54c7663873
Merge pull request #67055 from cw789/unifi_update
unifiStable: 5.10.25 -> 5.10.26
2019-08-22 16:52:15 +02:00
Robin Gloster c89e5439a1
squid: fix build with openssl 1.1 2019-08-22 15:36:40 +02:00
Robin Gloster 948b3e34a5
squid: remove v3, default to v4 2019-08-22 00:39:52 +02:00
Robin Gloster 353323e055
erlang: pin to openssl 1.0.2 for < R20 2019-08-21 23:21:55 +02:00