Commit Graph

363 Commits

Author SHA1 Message Date
Peter Simons
edb587633c Merge pull request #26420 from roblabla/feature-postfix
postfix: Add optional LDAP support, allow changing package in service
2017-07-04 14:57:40 +02:00
Vladimír Čunát
d1a89ae9d7
Merge branch 'master' into staging 2017-07-03 09:48:58 +02:00
Will Dietz
179936d75c mailman: Fix attempts to chmod g+s during installation 2017-06-28 13:34:21 -05:00
Franz Pletz
40a04291c9
Merge branch 'master' into staging 2017-06-26 02:23:38 +02:00
Samuel Leathers
5d7fd7e7fa mailhog: init at 1.0.0 (#26821)
* mailhog: init at 1.0.0

* formatting nitpicks
2017-06-24 17:05:34 +01:00
Franz Pletz
16aa92305b
exim: patch CVE-2017-1000369 (stack clash) 2017-06-22 00:44:05 +02:00
Joachim Schiele
507c207958 spamassassin: major service fixes -> added more perl packages to spamassassin and abstracted service to not use /etc/spamassassin, also running sa-update as spamd user periodically (#26470)
thanks @grahamc for IRC comments
2017-06-10 09:35:35 +02:00
roblabla
f1094050fd postfix: Add optional LDAP support 2017-06-06 13:09:40 +02:00
Léo Gaspard
4a0c7d1b2d dkimproxy: init at 1.4.1 (#26147)
* dkimproxy: init at 1.4.1

* dkimproxy: simplify by using mkDerivation

* dkimproxy: set ekleog as maintainer

* dkimproxy: style fix

* dkimproxy: also work without the right PERL5LIB environment variable
2017-05-28 23:25:29 +01:00
Daniel Ehlers
4338f096f5 nullmailer + service: init at 2.0 2017-05-02 01:46:12 +02:00
Profpatsch
92bb91f72f mlmmj: add docfiles to output 2017-03-16 18:47:11 +01:00
tv
ba0b527456 exim: 4.88 -> 4.89 (#23670) 2017-03-12 23:40:22 +01:00
Carles Pagès
86a1d6f4aa pfixtools: fix build with unbound-1.6.1 2017-03-03 10:21:32 +01:00
Parnell Springmeyer
9e36a58649
Merging against upstream master 2017-02-13 17:16:28 -06:00
Robin Gloster
72e2de3a07
rspamd: 1.4.1 -> 1.4.3 2017-02-02 19:33:21 +01:00
Parnell Springmeyer
4aa0923009
Getting rid of the var indirection and using a bin path instead 2017-01-29 04:11:01 -06:00
Parnell Springmeyer
e92b8402b0
Addressing PR feedback 2017-01-28 20:48:03 -08:00
Parnell Springmeyer
bae00e8aa8
setcap-wrapper: Merging with upstream master and resolving conflicts 2017-01-25 11:08:05 -08:00
Michael Raskin
35e3ea0966 dovecot: 2.2.25 -> 2.2.27 2016-12-28 15:04:51 +01:00
zimbatm
352e167c22 exim: 4.87 -> 4.88 for CVE-2016-9963 2016-12-25 10:12:01 +00:00
Franz Pletz
f97bfcec99
rspamd: 1.2.7 -> 1.4.1 2016-12-16 15:52:27 +01:00
Franz Pletz
60d29f526d
rmilter: 1.8.5 -> 1.10.0 2016-12-16 15:52:27 +01:00
Nikolay Amiantov
be95ceaff2 treewide: quote URLs in my packages 2016-11-24 01:17:52 +03:00
José Romildo Malaquias
b085f4a216 opensmtpd: 6.0.0p1 -> 6.0.2p1 (#19660)
Changelogs at
  https://www.opensmtpd.org/announces/release-6.0.1.txt
  https://www.opensmtpd.org/announces/release-6.0.2.txt
2016-10-18 19:59:59 +02:00
Franz Pletz
a7a34745b6
postfix: 3.1.2 -> 3.1.3 2016-10-14 17:34:26 +02:00
Joachim F
1ddc08a3ac Merge pull request #18452 from bendlas/init-postgrey
postgrey: init at 1.36
2016-09-30 15:31:44 +02:00
Periklis Tsirakidis
9772f0f9a1 dovecot: enable darwin build 2016-09-29 13:32:28 +02:00
Herwig Hochleitner
5609fe521d postgrey: init at 1.36 (includes service) 2016-09-27 15:35:02 +02:00
Arseniy Seroka
6fa0a4fafd Merge pull request #18900 from grahamc/mailman
mailman: 2.1.18 -> 2.1.23
2016-09-25 01:05:49 +04:00
schneefux
9cab11980b
maintainers: add schneefux 2016-09-24 09:17:36 +02:00
Graham Christensen
f7f4930912
mailman: 2.1.18 -> 2.1.23 2016-09-23 18:43:21 -04:00
Joachim F
2db487e6bf opensmtpd: 5.9.2p1 -> 6.0.0p1 (#18629)
Also change to https src.url.

Changelog at https://www.opensmtpd.org/announces/release-6.0.0.txt

In particular, note that
- logging format has been reworked so scripts that consume opensmtpd
  logs may need updating
- dhparams option has been removed
2016-09-15 16:19:51 +01:00
Gabriel Ebner
882cc8dc9a postfix: 3.1.1 -> 3.1.2 2016-09-03 10:00:19 +02:00
Parnell Springmeyer
98c058a1ee Adapting everything for the merged permissions wrappers work. 2016-09-01 19:21:06 -05:00
obadz
3de6e5be50 Merge branch 'master' into staging
Conflicts:
      pkgs/applications/misc/navit/default.nix
      pkgs/applications/networking/mailreaders/alpine/default.nix
      pkgs/applications/networking/mailreaders/realpine/default.nix
      pkgs/development/compilers/ghc/head.nix
      pkgs/development/libraries/openssl/default.nix
      pkgs/games/liquidwar/default.nix
      pkgs/games/spring/springlobby.nix
      pkgs/os-specific/linux/kernel/perf.nix
      pkgs/servers/sip/freeswitch/default.nix
      pkgs/tools/archivers/cromfs/default.nix
      pkgs/tools/graphics/plotutils/default.nix
2016-08-27 23:54:54 +01:00
Jaka Hudoklin
6e9c9b25c7 Merge pull request #17890 from schneefux/pflogsumm
pflogsumm: init at 1.1.3
2016-08-24 23:37:54 +02:00
obadz
0e8d2725dc Merge branch 'master' into staging 2016-08-23 18:50:06 +01:00
Tuomas Tynkkynen
282277dbc8 treewide: Use more makeBinPath 2016-08-23 01:18:10 +03:00
schneefux
509f24f240
pflogsumm: init at 1.1.3 2016-08-21 21:18:28 +02:00
Robin Gloster
33e1c78ae3 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-08-16 07:54:01 +00:00
Nikolay Amiantov
c60deb0266 quote homepages for better clickability
Done while I was traversing packages which I maintain to save extra clicks on
urxvt (it captures semicolon as a part of URL).
2016-08-14 22:37:10 +03:00
Robin Gloster
b7787d932e Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-08-12 09:46:53 +00:00
Vladimír Čunát
65dcc797eb opensmtpd-extras: fixup after mariadb changes
I hope this was the only package I've forgotten.
2016-08-07 22:39:48 +02:00
Vladimír Čunát
950feb70b2 treewide: fixup various mysql ocurrences after re-split 2016-08-07 20:46:37 +02:00
Robin Gloster
bfa5a27ed9 pfixtools: set -Wno-error=unused-result
hardening enables further warnings breaking the build
2016-08-03 20:13:49 +00:00
Robin Gloster
1b979d8384 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-08-03 13:34:44 +00:00
Tuomas Tynkkynen
21f17d69f6 treewide: Add lots of meta.platforms
Build-tested on x86_64 Linux & Mac.
2016-08-02 21:42:43 +03:00
Tuomas Tynkkynen
1bf5ded193 treewide: Lots of meta.hydraPlatforms -> meta.platforms
In all of these files, there is no meta.platforms but only
meta.hydraPlatforms, which doesn't seem to have any purpose except being
inconsistent.
2016-08-02 21:17:44 +03:00
Robin Gloster
f222d98746 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-07-25 12:47:13 +00:00
Gabriel Ebner
fda6e2f344 Merge pull request #17231 from womfoo/bump/dovecot-2.2.25
dovecot: 2.2.24 -> 2.2.25
2016-07-24 19:15:19 +02:00
Gabriel Ebner
97c0bb6eb3 postfix: 3.0.4 -> 3.1.1 2016-07-23 11:16:11 +02:00
Robin Gloster
5185bc1773 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-07-15 14:41:01 +00:00
Kranium Gikos Mendoza
65446c6377 dovecot: 2.2.24 -> 2.2.25 2016-07-03 21:43:55 +08:00
Franz Pletz
006f25f732 rmilter: 1.8.4 -> 1.8.5 2016-06-27 00:20:28 +02:00
Franz Pletz
35f308c2d5 rspamd: 1.2.6 -> 1.2.7 2016-06-27 00:20:21 +02:00
Bjørn Forsman
bd01fad0ed Captialize meta.description of all packages
In line with the Nixpkgs manual.

A mechanical change, done with this command:

  find pkgs -name "*.nix" | \
      while read f; do \
          sed -e 's/description\s*=\s*"\([a-z]\)/description = "\u\1/' -i "$f"; \
      done

I manually skipped some:

* Descriptions starting with an abbreviation, a user name or package name
* Frequently generated expressions (haskell-packages.nix)
2016-06-20 13:55:52 +02:00
Nikolay Amiantov
b195bf1ed2 dspam: disable on Darwin 2016-06-11 03:40:22 +03:00
Robin Gloster
2d382f3d98 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-05-30 19:39:34 +00:00
Vladimír Čunát
e4832c7541 Merge branch 'staging'
Includes a security update of libxml2.
2016-05-27 15:58:40 +02:00
José Romildo Malaquias
aa4e1093c5 opensmtpd: fix some configure options (#15742) 2016-05-27 13:36:42 +01:00
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