diff options
| author | Graham Christensen <graham@grahamc.com> | 2019-12-18 20:05:41 -0500 |
|---|---|---|
| committer | Graham Christensen <graham@grahamc.com> | 2019-12-18 20:05:57 -0500 |
| commit | e19e95d86d8bb2f1880ea6f38a2b9d4f04880877 (patch) | |
| tree | 7e88a949951f2aab190770086c830a8c6a0b750a /pkgs | |
| parent | ad7c7cfe7a6873e17078478a845168ebefb4aa17 (diff) | |
| download | nixpkgs-e19e95d86d8bb2f1880ea6f38a2b9d4f04880877.tar nixpkgs-e19e95d86d8bb2f1880ea6f38a2b9d4f04880877.tar.gz nixpkgs-e19e95d86d8bb2f1880ea6f38a2b9d4f04880877.tar.bz2 nixpkgs-e19e95d86d8bb2f1880ea6f38a2b9d4f04880877.tar.lz nixpkgs-e19e95d86d8bb2f1880ea6f38a2b9d4f04880877.tar.xz nixpkgs-e19e95d86d8bb2f1880ea6f38a2b9d4f04880877.tar.zst nixpkgs-e19e95d86d8bb2f1880ea6f38a2b9d4f04880877.zip | |
mailutils: 3.2 -> 3.8
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/tools/networking/mailutils/default.nix | 14 | ||||
| -rw-r--r-- | pkgs/tools/networking/mailutils/fix-test-ali-awk.patch | 16 |
2 files changed, 4 insertions, 26 deletions
diff --git a/pkgs/tools/networking/mailutils/default.nix b/pkgs/tools/networking/mailutils/default.nix index 40eeed7f050..dcf377ca0c0 100644 --- a/pkgs/tools/networking/mailutils/default.nix +++ b/pkgs/tools/networking/mailutils/default.nix @@ -1,15 +1,15 @@ { stdenv, fetchurl, fetchpatch, autoreconfHook, dejagnu, gettext, pkgconfig , gdbm, pam, readline, ncurses, gnutls, guile, texinfo, gnum4, sasl, fribidi, nettools -, python, gss, libmysqlclient, system-sendmail }: +, python3, gss, libmysqlclient, system-sendmail }: stdenv.mkDerivation rec { name = "${project}-${version}"; project = "mailutils"; - version = "3.2"; + version = "3.8"; src = fetchurl { url = "mirror://gnu/${project}/${name}.tar.xz"; - sha256 = "0zh7xn8yvnw9zkc7gi5290i34viwxp1rn0g1q9nyvmckkvk59lwn"; + sha256 = "1wkn9ch664477r4d8jk9153w5msljsbj99907k7zgzpmywbs6ba7"; }; postPatch = '' @@ -29,17 +29,11 @@ stdenv.mkDerivation rec { buildInputs = [ gdbm pam readline ncurses gnutls guile texinfo gnum4 sasl fribidi nettools - gss libmysqlclient python + gss libmysqlclient python3 ]; patches = [ - (fetchpatch { - url = "https://git.savannah.gnu.org/cgit/mailutils.git/patch/?id=afbb33cf9ff"; - excludes = [ "NEWS" ]; - sha256 = "0yzkfx3j1zkkb43fhchjqphw4xznbclj39bjzjggv32gppy6d1db"; - }) ./fix-build-mb-len-max.patch - ./fix-test-ali-awk.patch ./path-to-cat.patch ]; diff --git a/pkgs/tools/networking/mailutils/fix-test-ali-awk.patch b/pkgs/tools/networking/mailutils/fix-test-ali-awk.patch deleted file mode 100644 index 3d301d530de..00000000000 --- a/pkgs/tools/networking/mailutils/fix-test-ali-awk.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff --git a/mh/tests/ali.at b/mh/tests/ali.at -index 28c0e5451..c76cf9363 100644 ---- a/mh/tests/ali.at -+++ b/mh/tests/ali.at -@@ -85,9 +85,9 @@ ali -a ./mh_aliases korzen | tr -d ' ' - [expout]) - - MH_CHECK([ali: group id],[ali05 ali-group-id ali-gid],[ --cat /etc/passwd | awk -F : '/^#/ { next } $4==0 { print $1 }' > expout -+cat /etc/passwd | awk -F : '/^#/ { next } $4==0 { print $1; exit }' > expout - test -s expout || AT_SKIP_TEST --name=`awk -F : '/^#/ { next } $3==0 { print $1 }' /etc/group < /dev/null` -+name=`awk -F : '/^#/ { next } $3==0 { print $1; exit }' /etc/group < /dev/null` - test -z "$name" && AT_SKIP_TEST - - echo "korzen: +$name" > mh_aliases |