diff options
Diffstat (limited to 'nixpkgs/pkgs/applications/networking/mailreaders')
3 files changed, 50 insertions, 19 deletions
diff --git a/nixpkgs/pkgs/applications/networking/mailreaders/aerc/default.nix b/nixpkgs/pkgs/applications/networking/mailreaders/aerc/default.nix index f53f2244e9f1..584128356393 100644 --- a/nixpkgs/pkgs/applications/networking/mailreaders/aerc/default.nix +++ b/nixpkgs/pkgs/applications/networking/mailreaders/aerc/default.nix @@ -1,6 +1,7 @@ { stdenv, buildGoModule, fetchurl , go, ncurses, notmuch, scdoc , python3, perl, w3m, dante +, fetchFromGitHub }: let @@ -14,7 +15,21 @@ in buildGoModule rec { sha256 = "1bx2fypw053v3bzalfgyi6a0s5fvv040z8jy4i63s7p53m8gmzs9"; }; - modSha256 = "127xrah6xxrvc224g5dxn432sagrssx8v7phzapcsdajsnmagq6x"; + libvterm = fetchFromGitHub { + owner = "ddevault"; + repo = "go-libvterm"; + rev = "b7d861da381071e5d3701e428528d1bfe276e78f"; + sha256 = "06vv4pgx0i6hjdjcar4ch18hp9g6q6687mbgkvs8ymmbacyhp7s6"; + }; + + vendorSha256 = "0rnyjjlsxsi0y23m6ckyd52562m33qr35fvdcdzy31mbfpi8kl2k"; + + overrideModAttrs = (_: { + postBuild = '' + cp -r --reflink=auto ${libvterm}/libvterm vendor/github.com/ddevault/go-libvterm + cp -r --reflink=auto ${libvterm}/encoding vendor/github.com/ddevault/go-libvterm + ''; + }); nativeBuildInputs = [ scdoc @@ -60,4 +75,4 @@ in buildGoModule rec { license = licenses.mit; platforms = platforms.unix; }; -} +} \ No newline at end of file diff --git a/nixpkgs/pkgs/applications/networking/mailreaders/balsa/default.nix b/nixpkgs/pkgs/applications/networking/mailreaders/balsa/default.nix index 04d00a166aa8..055aa15b2ec8 100644 --- a/nixpkgs/pkgs/applications/networking/mailreaders/balsa/default.nix +++ b/nixpkgs/pkgs/applications/networking/mailreaders/balsa/default.nix @@ -1,16 +1,32 @@ -{ stdenv, fetchurl, pkgconfig, intltool, glib, gtk3, gmime, gnutls, - webkitgtk, libesmtp, openssl, libnotify, gtkspell3, gpgme, - libcanberra-gtk3, libsecret, gtksourceview, gobject-introspection, - wrapGAppsHook +{ stdenv +, fetchurl +, glib +, gmime3 +, gnutls +, gobject-introspection +, gpgme +, gtk3 +, gtksourceview +, gtkspell3 +, intltool +, libcanberra-gtk3 +, libesmtp +, libical +, libnotify +, libsecret +, openssl +, pkgconfig +, webkitgtk +, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "balsa"; - version = "2.5.9"; + version = "2.6.1"; src = fetchurl { url = "https://pawsa.fedorapeople.org/balsa/${pname}-${version}.tar.bz2"; - sha256 = "19gs1qfvbk9qx4rjmgrmvid00kl9k153zjjx8zjii2lz09w7g19i"; + sha256 = "1xkxx801p7sbfkn0bh3cz85wra4xf1z1zhjqqc80z1z1nln7fhb4"; }; nativeBuildInputs = [ @@ -22,23 +38,23 @@ stdenv.mkDerivation rec { buildInputs = [ glib - gtk3 - gmime + gmime3 gnutls - webkitgtk - openssl - libnotify - gtkspell3 gpgme - libcanberra-gtk3 + gtk3 gtksourceview - libsecret + gtkspell3 + libcanberra-gtk3 libesmtp + libical + libnotify + libsecret + openssl + webkitgtk ]; configureFlags = [ "--with-canberra" - "--with-gpgme" "--with-gtksourceview" "--with-libsecret" "--with-ssl" diff --git a/nixpkgs/pkgs/applications/networking/mailreaders/hasmail/default.nix b/nixpkgs/pkgs/applications/networking/mailreaders/hasmail/default.nix index 49f0ac533659..b02788e67722 100644 --- a/nixpkgs/pkgs/applications/networking/mailreaders/hasmail/default.nix +++ b/nixpkgs/pkgs/applications/networking/mailreaders/hasmail/default.nix @@ -19,7 +19,7 @@ buildGoModule rec { sha256 = "1p6kwa5xk1mb1fkkxz1b5rcyp5kb4zc8nfif1gk6fab6wbdj9ia1"; }; - modSha256 = "0z3asz7v1izg81f9xifx9s2sp5hly173hajsn9idi3bkv0h78is2"; + vendorSha256 = "0sblgjmn3i3k31jfq5zy3bx7bv5z2cg6rjzr7aj87c57yhzzcmk7"; nativeBuildInputs = [ pkgconfig @@ -38,4 +38,4 @@ buildGoModule rec { maintainers = with maintainers; [ doronbehar ]; platforms = platforms.all; }; -} +} \ No newline at end of file |