summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorlassulus <lass@lassul.us>2016-12-25 12:13:43 +0100
committerlassulus <lass@lassul.us>2016-12-25 12:13:43 +0100
commit8f16b738c75f25738ca94f146d84c5cc5ec7eaa3 (patch)
tree9a56ec4c499875be8df8722e1c5fa2edf4a549b0
parentacb2f0b0427b5437c02bd976aacb45ce71508fe4 (diff)
parentdf7e24c93dc318084322fae3441d1f3f94833041 (diff)
Merge remote-tracking branch 'ni/master'
-rw-r--r--krebs/5pkgs/exim.nix19
-rw-r--r--tv/1systems/xu.nix1
2 files changed, 19 insertions, 1 deletions
diff --git a/krebs/5pkgs/exim.nix b/krebs/5pkgs/exim.nix
new file mode 100644
index 000000000..4bb69267c
--- /dev/null
+++ b/krebs/5pkgs/exim.nix
@@ -0,0 +1,19 @@
+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 ];
diff --git a/tv/1systems/xu.nix b/tv/1systems/xu.nix
index b6fe6dc5c..974d820d5 100644
--- a/tv/1systems/xu.nix
+++ b/tv/1systems/xu.nix
@@ -17,7 +17,6 @@ with import <stockholm/lib>;
../2configs/retiolum.nix
../2configs/binary-cache
../2configs/xserver
- ../2configs/xu-qemu0.nix
{
environment.systemPackages = with pkgs; [