about summary refs log tree commit diff
path: root/nixpkgs/pkgs/servers/mail
diff options
context:
space:
mode:
authorAlyssa Ross <hi@alyssa.is>2019-08-14 00:02:54 +0000
committerAlyssa Ross <hi@alyssa.is>2019-08-14 00:02:54 +0000
commitf9abd30e11337cf07034f2cc8ad1691aa4a69386 (patch)
treec3b5c34b1c533f5c231dc6707e96795fb3a9a138 /nixpkgs/pkgs/servers/mail
parent44e04ea2730f8e3b863b81b0056babe233c244f6 (diff)
parent1036dc664169b32613ec11b58cc1740c7511a340 (diff)
downloadnixlib-f9abd30e11337cf07034f2cc8ad1691aa4a69386.tar
nixlib-f9abd30e11337cf07034f2cc8ad1691aa4a69386.tar.gz
nixlib-f9abd30e11337cf07034f2cc8ad1691aa4a69386.tar.bz2
nixlib-f9abd30e11337cf07034f2cc8ad1691aa4a69386.tar.lz
nixlib-f9abd30e11337cf07034f2cc8ad1691aa4a69386.tar.xz
nixlib-f9abd30e11337cf07034f2cc8ad1691aa4a69386.tar.zst
nixlib-f9abd30e11337cf07034f2cc8ad1691aa4a69386.zip
Merge commit '1036dc664169b32613ec11b58cc1740c7511a340'
Diffstat (limited to 'nixpkgs/pkgs/servers/mail')
-rw-r--r--nixpkgs/pkgs/servers/mail/postfix/pflogsumm.nix4
-rw-r--r--nixpkgs/pkgs/servers/mail/spamassassin/default.nix5
2 files changed, 5 insertions, 4 deletions
diff --git a/nixpkgs/pkgs/servers/mail/postfix/pflogsumm.nix b/nixpkgs/pkgs/servers/mail/postfix/pflogsumm.nix
index 821999380606..8f85bc5f6d6d 100644
--- a/nixpkgs/pkgs/servers/mail/postfix/pflogsumm.nix
+++ b/nixpkgs/pkgs/servers/mail/postfix/pflogsumm.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, perlPackages }:
 
 perlPackages.buildPerlPackage rec {
-  name = "pflogsumm-${version}";
+  pname = "pflogsumm";
   version = "1.1.3";
 
   src = fetchurl {
-    url = "https://jimsun.linxnet.com/downloads/${name}.tar.gz";
+    url = "https://jimsun.linxnet.com/downloads/${pname}-${version}.tar.gz";
     sha256 = "0hkim9s5f1yg5sfs5048jydhy3sbxafls496wcjk0cggxb113py4";
   };
 
diff --git a/nixpkgs/pkgs/servers/mail/spamassassin/default.nix b/nixpkgs/pkgs/servers/mail/spamassassin/default.nix
index e95fcaa03ef1..186f4670153f 100644
--- a/nixpkgs/pkgs/servers/mail/spamassassin/default.nix
+++ b/nixpkgs/pkgs/servers/mail/spamassassin/default.nix
@@ -1,10 +1,11 @@
 { stdenv, fetchurl, perlPackages, makeWrapper, gnupg }:
 
 perlPackages.buildPerlPackage rec {
-  name = "SpamAssassin-3.4.2";
+  pname = "SpamAssassin";
+  version = "3.4.2";
 
   src = fetchurl {
-    url = "mirror://apache/spamassassin/source/Mail-${name}.tar.bz2";
+    url = "mirror://apache/spamassassin/source/Mail-${pname}-${version}.tar.bz2";
     sha256 = "1np8h293bzg33i0xn9gj9krwgr7k6xbyf1yhxr2j2xci95d080yg";
   };