Commit graph

253 commits

Author SHA1 Message Date
Vladimír Čunát
81039713fa Merge branch 'master' into staging
... to get the systemd update (rebuilding ~7k jobs).
2016-05-26 16:50:22 +02:00
obadz
e0ef352ae7 opensmtpd: add two configuration options
unpriviledged_smtpctl_encrypt (defaults to true) -- lets you invoke
smtpctl encrypt without being root

tag_char -- lets you override the + as in user+tag@domain.tld
2016-05-23 22:10:33 +01:00
obadz
e69ed2b64b opensmtpd: 5.7.3p2 -> 5.9.2p1 2016-05-23 02:59:20 +01:00
Tuomas Tynkkynen
674eb400ef treewide: Make explicit that 'dev' output of libevent is used 2016-05-19 10:00:40 +02:00
Tuomas Tynkkynen
4e0307dcfc treewide: Make explicit that 'dev' output of cyrus_sasl is used 2016-05-19 10:00:30 +02:00
Franz Pletz
f8d481754c
Merge remote-tracking branch 'origin/master' into hardened-stdenv 2016-05-18 17:10:02 +02:00
Peter Simons
8e462995ba Bring my stdenv.lib.maintainers user name in line with my github nick. 2016-05-16 22:49:55 +02:00
Franz Pletz
70ac1ec422 dovecot: 2.2.21 -> 2.2.24 2016-05-03 16:03:41 +02:00
Franz Pletz
d092838a1c postfix: 3.0.3 -> 3.0.4 2016-05-03 16:03:41 +02:00
Alexander V. Nikolaev
7dea8d17a7 rmilter: 1.8.1 -> 1.8.4 2016-05-03 15:34:20 +03:00
Alexander V. Nikolaev
6f7fdda06e rspamd: 1.2.5 -> 1.2.6 2016-05-03 15:29:48 +03:00
Robin Gloster
c92bca56f8 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-05-02 22:58:02 +00:00
Franz Pletz
02760890f3 Merge pull request #14992 from avnik/rspamd
Rspamd/Rmilter update
2016-05-01 12:49:56 +02:00
Nikolay Amiantov
f0189a8b40 dspam: fix build with PostgreSQL support 2016-04-30 04:51:56 +03:00
Alexander V. Nikolaev
05036343dc rspamd: 1.2.0 -> 1.2.5
License changed to apache-2.0 by upstream
2016-04-28 14:21:21 +03:00
Alexander V. Nikolaev
ebdfc9dac1 rmilter: 1.7.3 -> 1.8.2 2016-04-28 14:21:20 +03:00
Alexander V. Nikolaev
5d26e80645 rspamd: typo 2016-04-28 14:21:17 +03:00
Alexander V. Nikolaev
40f82550d8 rmilter: use libmilter with patch to socket activation 2016-04-25 17:25:16 +03:00
Robin Gloster
d020caa5b2 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-04-18 13:49:22 +00:00
Nikolay Amiantov
8b7ebaffeb replace makeSearchPath tree-wise to take care of possible multiple outputs 2016-04-13 22:09:41 +03:00
Vladimír Čunát
30f14243c3 Merge branch 'master' into closure-size
Comparison to master evaluations on Hydra:
  - 1255515 for nixos
  - 1255502 for nixpkgs
2016-04-10 11:17:52 +02:00
Robin Gloster
3e68106afd Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-04-07 21:52:26 +00:00
tv
136c35bccb exim: 4.86.2 -> 4.87 2016-04-07 11:31:10 +02:00
Vladimír Čunát
ab15a62c68 Merge branch 'master' into closure-size
Beware that stdenv doesn't build. It seems something more will be needed
than just resolution of merge conflicts.
2016-04-01 10:06:01 +02:00
Robin Gloster
f60c9df0ba Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-03-28 15:16:29 +00:00
zimbatm
883f73f39d rspamd: 1.1.3 -> 1.2.0 2016-03-21 16:25:59 +00:00
Peter Simons
6c601ed1f0 Merge pull request #13838 from peti/drop-old-dovecot-versions
Drop support for dovecot 2.1.x from Nixpkgs and NixOS.
2016-03-16 14:36:52 +01:00
Robin Gloster
3f45f0948d Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-03-15 01:44:24 +00:00
Peter Simons
c73a22aed5 Drop support for dovecot 2.1.x from Nixpkgs and NixOS.
Version 2.2.x has been stable for a long time; let's give up support for
the obsolete version.
2016-03-11 16:03:09 +01:00
Peter Simons
24fe7bab08 Drop support for postfix 2.x from Nixpkgs and NixOS.
Version 3.x has been stable for a long time; let's give up support for
the obsolete versions.
2016-03-11 16:01:43 +01:00
Peter Simons
ce6a1a6cea Revert "Drop support for postfix 2.x from Nixpkgs and NixOS."
This reverts commit a889c683dd. Sorry, I
pushed to the wrong branch. :-(
2016-03-11 16:00:49 +01:00
Peter Simons
a889c683dd Drop support for postfix 2.x from Nixpkgs and NixOS.
Version 3.x has been stable for a long time; let's give up support for
the obsolete versions.
2016-03-11 15:58:03 +01:00
Vladimír Čunát
09af15654f Merge master into closure-size
The kde-5 stuff still didn't merge well.
I hand-fixed what I saw, but there may be more problems.
2016-03-08 09:58:19 +01:00
Franz Pletz
e9fc4e7db6 Merge remote-tracking branch 'origin/master' into hardened-stdenv 2016-03-07 22:08:27 +01:00
Hoang Xuan Phu
5ac1de516e archiveopteryx: override specific build settings instead of PREFIX
Closes #13708 and fixes #13707.
2016-03-06 11:37:24 +01:00
Franz Pletz
cb3d27df93 Merge remote-tracking branch 'origin/master' into hardened-stdenv 2016-03-05 18:55:30 +01:00
Franz Pletz
aff1f4ab94 Use general hardening flag toggle lists
The following parameters are now available:

  * hardeningDisable
    To disable specific hardening flags
  * hardeningEnable
    To enable specific hardening flags

Only the cc-wrapper supports this right now, but these may be reused by
other wrappers, builders or setup hooks.

cc-wrapper supports the following flags:

  * fortify
  * stackprotector
  * pie (disabled by default)
  * pic
  * strictoverflow
  * format
  * relro
  * bindnow
2016-03-05 18:55:26 +01:00
tv
fdf22fb5bb exim: 4.86 -> 4.86.2 2016-03-05 11:26:33 +01:00
Nikolay Amiantov
d7a98cb693 postsrsd: 1.3 -> 1.4 2016-03-04 14:46:45 +03:00
Robin Gloster
3b4765c9e5 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-02-28 16:32:57 +00:00
Hoang Xuan Phu
6bb016101f postfix: use relative symlinks for mailq and newaliases 2016-02-28 16:19:18 +08:00
Robin Gloster
cfffac2a90 postfix: use hardening flags from stdenv 2016-02-27 11:50:34 +00:00
Robin Gloster
bc21db3692 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-02-19 21:16:14 +00:00
Arseniy Seroka
bce982e082 Merge pull request #13076 from romildo/update-opensmtpd
opensmtpd: 5.7.3p1 -> 5.7.3p2
2016-02-19 22:53:59 +03:00
Franz Pletz
30213ffa3b rspamd: git-2016-01-16 -> 1.1.3 2016-02-18 13:03:01 +01:00
Franz Pletz
799a3f8147 rmilter: 1.6.7 -> 1.7.3
Fixes #13080.
2016-02-18 13:02:35 +01:00
José Romildo Malaquias
1199288de9 opensmtpd: 5.7.3p1 -> 5.7.3p2 2016-02-17 17:21:28 -02:00
Franz Pletz
41698c9efa Merge branch 'master' into hardened-stdenv 2016-02-15 20:05:29 +01:00
Vladimír Čunát
d039c87984 Merge branch 'master' into closure-size 2016-02-14 08:33:51 +01:00
Rickard Nilsson
2ce19d0ba4 Merge pull request #12935 from romildo/fix-opensmtp
opensmtpd: compile with support for 'db' tables
2016-02-13 08:02:26 +01:00
Robin Gloster
059ac0e03b postfix28: turn off format hardening 2016-02-12 15:29:23 +00:00
Nikolay Amiantov
59d1339c80 dspam: fix maintenance script 2016-02-12 18:00:01 +03:00
Franz Pletz
bfa4ff779c Merge pull request #12760 from jerith666/pfixtools-init
pfixtools: init at 0.9
2016-02-12 11:56:33 +01:00
José Romildo Malaquias
3971194490 opensmtpd: compile with support for 'db' tables 2016-02-11 11:29:10 -02:00
Eelco Dolstra
e2eca0c24c Fix misspelled meta.maintainers attributes 2016-02-10 23:27:34 +00:00
Eelco Dolstra
aea262f654 Fix misspelled meta.maintainers attributes 2016-02-10 14:59:50 +01:00
Matt McHenry
92dc00d0fd pfixtools: init at 0.9 2016-02-06 12:58:13 -05:00
Vladimír Čunát
ae74c356d9 Merge recent 'staging' into closure-size
Let's get rid of those merge conflicts.
2016-02-03 16:57:19 +01:00
Nikolay Amiantov
bf208745ab Merge pull request #12290 from abbradar/dovecot-updates
Rework dovecot module, add and update plugins, default Dovecot to 2.2
2016-01-23 12:02:23 +03:00
Peter Simons
e6d42dfe04 Merge pull request #12459 from avnik/fix-var-lib-postfix-permissions
Make /var/lib/postfix world-readable
2016-01-22 17:25:07 +01:00
Nikolay Amiantov
ec15cea84f dovecot_antispam: init at 20130429 2016-01-21 12:53:24 +03:00
Nikolay Amiantov
c956bc774b dovecot_pigeonhole: 0.4.3 -> 0.4.10 2016-01-21 12:53:21 +03:00
Nikolay Amiantov
57234b97df dovecot22: specify sysconfdir to use system-wide config 2016-01-21 12:50:03 +03:00
Nikolay Amiantov
cc0e255ab9 dovecot22: add options for building auth modules 2016-01-21 12:50:03 +03:00
Nikolay Amiantov
97e3c42523 dovecot22: move modules dir to /etc 2016-01-21 12:50:03 +03:00
Nikolay Amiantov
2e5b76ecc6 dovecot22: 2.2.19 -> 2.2.21 2016-01-21 12:50:03 +03:00
Nikolay Amiantov
dd09d2357c postfix: fix etc/etc path 2016-01-20 16:42:07 +03:00
Alexander V. Nikolaev
39bd9be5a9 postfix: use built-in set-permission tool to setup queue
Make top level /var/lib/postfix as root:root 0755

After generating custom configs in /var/lib/postfix/conf,
`postfix set-permissions` called, to perform all required tricks
related to queue handling (postfix use file mode bits to keep
some internal statuses, so `chmod -R` not recommended by authors,
see comments in $out/libexec/postfix/post-install for details)

Also post-install script was patched, to skip permission check/update
for files inside $out, as well as symlinks following to $NIX_STORE.

Config file `main.cf` extended with all default directory locations,
to prevent post-install script from guessing and overwrite them.

And finally all actions in activation script snippets performed
by postmap/postalias/postfix tools from current build, not random one
from paths.
2016-01-20 14:52:59 +02:00
Vladimír Čunát
716aac2519 Merge branch 'staging' into closure-size 2016-01-19 09:55:31 +01:00
Alexander V. Nikolaev
480083922c rspamd: init at git-2016-01-11 2016-01-16 15:10:36 +02:00
Alexander V. Nikolaev
59f0090ded rmilter: init at 1.6.7 2016-01-16 15:10:36 +02:00
Peter Simons
ae6fc4c5be Merge pull request #12293 from abbradar/postfix-updates
Rework postfix module and package
2016-01-13 14:12:50 +01:00
Nikolay Amiantov
f5835ce77f dspam: init at 3.10.2 2016-01-13 13:08:38 +03:00
Nikolay Amiantov
2053b3a32a postsrsd: init at 1.3 2016-01-13 13:03:07 +03:00
Nikolay Amiantov
be2b989842 postfix30: build with pcre, add database drivers support 2016-01-12 18:00:57 +03:00
Nikolay Amiantov
d65850e56f postfix30: split meta_directory from configuration, fix queue_directory and data_directory 2016-01-12 16:41:35 +03:00
Nikolay Amiantov
57c1d09857 postfix30: add patch to silence setuid-in-nix-store related warnings 2016-01-12 16:41:35 +03:00
Hoang Xuan Phu
ff49b7f91e postfix: patch to stop hard coding SHELL 2015-12-31 17:03:48 +08:00
Vladimír Čunát
f9f6f41bff Merge branch 'master' into closure-size
TODO: there was more significant refactoring of qtbase and plasma 5.5
on master, and I'm deferring pointing to correct outputs to later.
2015-12-31 09:53:02 +01:00
Vladimír Čunát
39c43bc6e2 archiveopteryx: improve install paths, parallel build 2015-12-27 08:19:19 +01:00
Hoang Xuan Phu
b8bc82a459 archiveopteryx: init at 3.2.0 2015-12-24 15:22:44 +08:00
Luca Bruno
5b0352a6a4 Merge branch 'master' into closure-size 2015-12-11 18:31:00 +01:00
Edward Tjörnhammar
4f4d1fdd33 mlmmj: 1.2.18.1 -> 1.2.19.0 2015-12-01 08:38:49 +01:00
Luca Bruno
920b1d3591 Merge branch 'master' into closure-size 2015-11-29 16:50:26 +01:00
Franz Pletz
862a2615e7 opensmtpd: 5.7.1p1 -> 5.7.3p1 2015-11-29 14:31:03 +01:00
Franz Pletz
ceca397a1a dovecot: 2.2.16 -> 2.2.19 2015-11-27 03:03:53 +01:00
Vladimír Čunát
333d69a5f0 Merge staging into closure-size
The most complex problems were from dealing with switches reverted in
the meantime (gcc5, gmp6, ncurses6).
It's likely that darwin is (still) broken nontrivially.
2015-11-20 14:32:58 +01:00
William A. Kennington III
6602f49495 Revert "Revert "Merge pull request #9543 from NixOS/staging.post-15.06""
This reverts commit 741bf840da.

This reverts the fallout from reverting the major changes.
2015-11-14 12:32:51 -08:00
William A. Kennington III
9579c9ec7f Merge commit 'cb21b77' into master.upstream
This is a partial merge of staging for builds which are working
2015-11-13 15:53:10 -08:00
Peter Simons
adb74ad2f9 Merge pull request #10620 from gebner/postfix-3.0.3
postfix: 2.11.5 -> 3.0.3
2015-11-08 18:10:26 +01:00
William A. Kennington III
dd2de66d61 Merge branch 'master.upstream' into staging.upstream 2015-10-30 17:16:07 -07:00
Domen Kožar
4355ef9e41 mailman: use python2.7 package dns 2015-10-28 18:23:17 +01:00
Domen Kožar
27d5fb07a0 pythonPackages{dns, dnspython}: merge 2015-10-28 18:20:43 +01:00
Gabriel Ebner
929e734f19 postfix: 2.11.5 -> 3.0.3 2015-10-26 11:46:17 +01:00
William A. Kennington III
8a44a36ca4 Merge branch 'master.upstream' into staging.upstream 2015-10-15 10:22:28 -07:00
Eelco Dolstra
741bf840da Revert "Merge pull request #9543 from NixOS/staging.post-15.06"
This reverts commit f61176c539, reversing
changes made to a27ca029ee.

Conflicts:
	pkgs/development/libraries/ncurses/default.nix
2015-10-06 15:24:20 +02:00
Vladimír Čunát
6d86a93c43 libevent: split into multiple outputs
Hopefully all references are fixed.
2015-10-05 15:58:37 +02:00
Gabriel Ebner
8fd982ec2b spamassassin: 3.4.0 -> 3.4.1 2015-10-04 17:26:12 +02:00
Gabriel Ebner
0dfddc5a54 opensmtpd: support filters. 2015-10-02 13:01:50 +02:00
Gabriel Ebner
db18b6e828 opensmtpd-extras: init at 5.7.1 2015-10-02 13:01:47 +02:00