diff options
| -rw-r--r-- | krebs/4lib/types.nix | 14 | ||||
| -rw-r--r-- | krebs/5pkgs/exim/default.nix | 4 |
2 files changed, 12 insertions, 6 deletions
diff --git a/krebs/4lib/types.nix b/krebs/4lib/types.nix index 32d1daf9..7255dc3e 100644 --- a/krebs/4lib/types.nix +++ b/krebs/4lib/types.nix @@ -186,10 +186,16 @@ types // rec { }; }); - # TODO - addr = str; - addr4 = str; - addr6 = str; + addr = either addr4 addr6; + addr4 = mkOptionType { + name = "IPv4 address"; + check = let + IPv4address = let d = "([1-9]?[0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])"; in + concatMapStringsSep "." (const d) (range 1 4); + in x: match IPv4address != null; + merge = mergeOneOption; + }; + addr6 = str; # TODO pgp-pubkey = str; diff --git a/krebs/5pkgs/exim/default.nix b/krebs/5pkgs/exim/default.nix index d8d1f0dc..0918e308 100644 --- a/krebs/5pkgs/exim/default.nix +++ b/krebs/5pkgs/exim/default.nix @@ -1,11 +1,11 @@ { coreutils, fetchurl, db, openssl, pcre, perl, pkgconfig, stdenv }: stdenv.mkDerivation rec { - name = "exim-4.86.2"; + name = "exim-4.87"; src = fetchurl { url = "http://mirror.switch.ch/ftp/mirror/exim/exim/exim4/${name}.tar.bz2"; - sha256 = "1cvfcc1hi60lydv8h3a2rxlfc0v2nflwpvzjj7h7cdsqs2pxwmkp"; + sha256 = "1jbxn13shq90kpn0s73qpjnx5xm8jrpwhcwwgqw5s6sdzw6iwsbl"; }; buildInputs = [ coreutils db openssl pcre perl pkgconfig ]; |