diff options
| author | lassulus <lass@lassul.us> | 2017-04-02 11:36:33 +0200 |
|---|---|---|
| committer | lassulus <lass@lassul.us> | 2017-04-02 11:36:33 +0200 |
| commit | 23bbf68204b51dc7da9706cd727c6008876302fd (patch) | |
| tree | e43c92e6e293b71308a4fabe9eb94fa8698261a9 /krebs | |
| parent | 61c40b84946038c3939da968291510a9049483b9 (diff) | |
| parent | c7cfb0a5ab66c8c9b54a54032b85c4b82fd16d30 (diff) | |
Merge remote-tracking branch 'prism/newest'
Diffstat (limited to 'krebs')
| -rw-r--r-- | krebs/3modules/makefu/default.nix | 2 | ||||
| -rw-r--r-- | krebs/5pkgs/exim.nix | 19 |
2 files changed, 1 insertions, 20 deletions
diff --git a/krebs/3modules/makefu/default.nix b/krebs/3modules/makefu/default.nix index 489f62b65..7a6a88e85 100644 --- a/krebs/3modules/makefu/default.nix +++ b/krebs/3modules/makefu/default.nix @@ -464,7 +464,7 @@ with import <stockholm/lib>; retiolum = { via = internet; ip4.addr = "10.243.0.211"; - ip6.addr = "42:f9f0:0000:0000:0000:0000:0000:70d2"; + # ip6.addr = "42:f9f0:0000:0000:0000:0000:0000:70d2"; aliases = [ "gum.r" "gum.retiolum" diff --git a/krebs/5pkgs/exim.nix b/krebs/5pkgs/exim.nix deleted file mode 100644 index 4bb69267c..000000000 --- a/krebs/5pkgs/exim.nix +++ /dev/null @@ -1,19 +0,0 @@ -diff --git a/pkgs/servers/mail/exim/default.nix b/pkgs/servers/mail/exim/default.nix -index 0918e30..5b7a587 100644 ---- a/pkgs/servers/mail/exim/default.nix -+++ b/pkgs/servers/mail/exim/default.nix -@@ -1,11 +1,11 @@ - { coreutils, fetchurl, db, openssl, pcre, perl, pkgconfig, stdenv }: - - stdenv.mkDerivation rec { -- name = "exim-4.87"; -+ name = "exim-4.88"; - - src = fetchurl { -- url = "http://mirror.switch.ch/ftp/mirror/exim/exim/exim4/${name}.tar.bz2"; -- sha256 = "1jbxn13shq90kpn0s73qpjnx5xm8jrpwhcwwgqw5s6sdzw6iwsbl"; -+ url = "ftp://ftp.exim.org/pub/exim/exim4/${name}.tar.bz2"; -+ sha256 = "0bca3wb45hl7h8m8bpvsmrmqa07jhbhqyigs9pl29hhzwgbmz78i"; - }; - - buildInputs = [ coreutils db openssl pcre perl pkgconfig ]; |