Eelco Dolstra
|
f33fa1b66b
|
Merge remote-tracking branch 'origin/master' into staging
Conflicts:
pkgs/development/libraries/boost/generic.nix
|
2014-11-11 23:48:08 +01:00 |
|
Shea Levy
|
f207fee725
|
bird: bump
|
2014-11-11 14:27:21 -05:00 |
|
Pascal Wittmann
|
8df0e0b151
|
Fixed many descriptions
|
2014-11-11 14:36:34 +01:00 |
|
Eelco Dolstra
|
db4053fb59
|
httpd-2.2: Enable building of mod_cache and friends
|
2014-11-11 10:39:24 +01:00 |
|
Luca Bruno
|
6af0d6974f
|
Merge branch 'master' into staging
|
2014-11-10 10:03:52 +01:00 |
|
Domen Kožar
|
824879cfd4
|
tomcat-connectors: 1.2.32 -> 1.2.40
|
2014-11-08 19:48:54 +01:00 |
|
Luca Bruno
|
83221f3886
|
Merge branch 'master' into staging
Makes the build more useful:
- Disabled hybrid iso, makes installer tests pass again
- Imagemagick fixes to the "Illegal instruction" thing
|
2014-11-08 15:56:40 +01:00 |
|
Eelco Dolstra
|
2819063c37
|
mod_evasive: Add Apache version check
|
2014-11-07 11:42:43 +01:00 |
|
Eelco Dolstra
|
690154993d
|
mod_fastcgi: Fix building against Apache 2.4
|
2014-11-07 11:38:50 +01:00 |
|
Eelco Dolstra
|
bad2955079
|
mod_python: Update to 3.5.0
This fixes building against Apache 2.4.
|
2014-11-07 11:31:04 +01:00 |
|
Eelco Dolstra
|
0518ccf5af
|
Merge remote-tracking branch 'origin/master' into staging
Conflicts:
pkgs/stdenv/generic/default.nix
|
2014-11-06 10:16:39 +01:00 |
|
Mateusz Kowalczyk
|
007f80c1d0
|
Turn more licenses into lib.licenses style
Should eval cleanly, as far as -A tarball tells me.
Relevant: issue #2999, issue #739
|
2014-11-06 00:48:16 +00:00 |
|
Bjørn Forsman
|
4f220bd0c3
|
munin: add missing dependency on 'NetCIDR'
Fixes
munin-node[30100]: Can't locate Net/CIDR.pm in @INC (@INC contains: [...])
when using the 'cidr_allow' configuration directive.
|
2014-11-05 22:27:27 +01:00 |
|
Vladimír Čunát
|
52404a868d
|
Merge recent master into staging
Nixpkgs Hydra: ?compare=1157272
TODO: port e22889064f
Conflicts:
nixos/tests/gnome3_10.nix (auto-solved)
pkgs/applications/video/aegisub/default.nix
pkgs/development/libraries/boost/1.55.nix
|
2014-11-05 15:00:44 +01:00 |
|
Vladimír Čunát
|
dcd2590c98
|
xorg-server: major bump 1.14.* -> 1.16.1 (incl. deps)
|
2014-11-05 07:55:25 +01:00 |
|
Eelco Dolstra
|
7495c61d49
|
Merge remote-tracking branch 'origin/darwin-clang-stdenv' into staging
Conflicts:
pkgs/applications/editors/vim/macvim.nix
|
2014-11-04 14:30:43 +01:00 |
|
Rob Vermaas
|
40ccad06c9
|
mysql55: update from 5.5.39 to 5.5.40, potentially fixes CVE-2014-6464, CVE-2014-6469, CVE-2014-6491, CVE-2014-6494, CVE-2014-6496, CVE-2014-6500, CVE-2014-6507, CVE-2014-6555, CVE-2014-6559
|
2014-11-04 10:19:39 +01:00 |
|
lethalman
|
636a4c00ca
|
Merge pull request #4801 from robberer/pkgs/zabbix-server
zabbix-server: add extraConfig option
|
2014-11-04 00:32:46 +01:00 |
|
Peter Simons
|
b5fed52c43
|
Merge pull request #4238 from wkennington/master.boost
Make boost 156 the default
|
2014-11-03 23:03:01 +01:00 |
|
Michael Raskin
|
b7f7341169
|
Add Nginx 1.7.7; RTMP module fails for some reason
|
2014-11-04 00:54:15 +03:00 |
|
Michael Raskin
|
09e505a4c4
|
Update Squid proxy
|
2014-11-04 00:37:42 +03:00 |
|
Mateusz Kowalczyk
|
81b402faf8
|
mpd: 0.19.1 -> 0.19.2
|
2014-11-03 17:14:38 +00:00 |
|
Longrin Wischnewski
|
7fb934c4d0
|
zabbix-server: add new optional build options
|
2014-11-03 16:51:09 +01:00 |
|
William A. Kennington III
|
3aa7f22228
|
rippled: Refactor and update to 0.26.2
|
2014-11-02 17:22:28 -08:00 |
|
William A. Kennington III
|
aa3e800be7
|
boost: Remove boost.lib
|
2014-11-02 17:22:27 -08:00 |
|
Michael Raskin
|
1c5baac639
|
Update Apache Jena
|
2014-11-02 23:51:59 +03:00 |
|
Edward Tjörnhammar
|
942085daab
|
Merge pull request #4556 from edwtjo/elastic-river-twitter
elasticsearchPlugins.elasticsearch_river_twitter: added package
|
2014-11-02 21:38:12 +01:00 |
|
Luca Bruno
|
cb2752721e
|
mysql: use another download url, cdn.mysql.com is slow after 30%
|
2014-11-02 18:26:38 +01:00 |
|
Peter Simons
|
a9c53037fa
|
Merge remote-tracking branch 'origin/master' into staging.
|
2014-11-02 16:15:53 +01:00 |
|
Domen Kožar
|
12b909bba1
|
mongodb: 2.6.4 -> 2.6.5
|
2014-11-01 13:13:15 +01:00 |
|
Aristid Breitkreuz
|
53c287f5cd
|
postgresql 9.4beta3, but keep beta2 around because they are not compatible
|
2014-10-31 22:21:16 +01:00 |
|
Peter Simons
|
b11060d8db
|
Merge remote-tracking branch 'origin/master' into staging.
|
2014-10-31 11:14:24 +01:00 |
|
Edward Tjörnhammar
|
b69410764f
|
elasticsearchPlugins.elasticsearch_river_twitter: added package
|
2014-10-30 12:28:39 +01:00 |
|
cillianderoiste
|
2b706f6aaf
|
Merge pull request #4724 from flosse/prosody-update
prosody: updated to v0.9.6
|
2014-10-29 21:51:07 +01:00 |
|
Markus Kohlhase
|
bc86dfa6b5
|
prosody: updated to v0.9.6
|
2014-10-29 21:11:25 +01:00 |
|
Evgeny Egorochkin
|
40979710f7
|
mediatomb: fix build by fetching a slightly newer git revision which has patches for new versions of dependencies, add more dependencies, clean up.
|
2014-10-29 05:09:28 +02:00 |
|
Rickard Nilsson
|
b6f505c60a
|
postfix: Update from 2.11.1 to 2.11.3
|
2014-10-27 21:48:33 +01:00 |
|
Rickard Nilsson
|
2d58efd3e4
|
dovecot: Update from 2.2.14 to 2.2.15
|
2014-10-27 21:24:08 +01:00 |
|
Joachim Schiele
|
40f24dca0f
|
brickd: packaged version 2.1.1
|
2014-10-27 19:11:51 +01:00 |
|
Bjørn Forsman
|
e8dc583eb4
|
tomcat: set meta.platforms
|
2014-10-27 18:44:25 +01:00 |
|
Eelco Dolstra
|
f4be4f5e54
|
Merge remote-tracking branch 'origin/master' into staging
|
2014-10-24 12:24:13 +02:00 |
|
Aristid Breitkreuz
|
3c6b3c587d
|
Merge pull request #4603 from exlevan/master
mysql: make cleaner directory layout for 5.5.*
|
2014-10-23 21:24:58 +02:00 |
|
Vladimír Čunát
|
2cf17b0802
|
Merge recent master into staging
Hydra nixpkgs: ?compare=1156478
|
2014-10-23 17:40:41 +02:00 |
|
Rob Vermaas
|
6596dccfd9
|
zabbix.server: update from 1.8.20 to 1.8.21
|
2014-10-22 15:29:05 +02:00 |
|
Michael Raskin
|
6b727e8d68
|
Merge pull request #4596 from abbradar/rpmextract
Add "rpmextract" script and use it
|
2014-10-20 22:00:59 +04:00 |
|
Alexey Levan
|
4ea7e3e97b
|
mysql: make cleaner directory layout for 5.5.*
|
2014-10-20 19:39:48 +03:00 |
|
Nikolay Amiantov
|
307af9148b
|
use rpmextract in some packages
|
2014-10-20 03:16:59 +04:00 |
|
Vladimír Čunát
|
9877fdb39d
|
xorg: updates some modules; mostly minor changes
|
2014-10-19 20:10:19 +02:00 |
|
Mateusz Kowalczyk
|
67a1a96b49
|
mpd: update to 0.19.1
|
2014-10-19 17:34:13 +01:00 |
|
Domen Kožar
|
74fde7c388
|
Merge pull request #4495 from NixOS/pythonFull_improvements
PythonFull improvements
|
2014-10-16 13:24:18 +02:00 |
|