Unverified Commit 22e3f1ba authored by Sandro Jäckel's avatar Sandro Jäckel Committed by GitHub
Browse files

Merge pull request #232312 from chivay/aerc 

aerc: 0.14.0 -> 0.15.2
parents fe43923a c4e7a4e7

pkgs/applications/networking/mailreaders/aerc/default.nix

+11 −8
Original line number Diff line number Diff line
@@ -12,17 +12,17 @@ 


buildGoModule rec {

  pname = "aerc";

  version = "0.14.0";

  version = "0.15.2";



  src = fetchFromSourcehut {

    owner = "~rjarry";

    repo = "aerc";

    rev = version;

    hash = "sha256-qC7lNqjgljUqRUp+S7vBVLPyRB3+Ie5UOxuio+Q88hg=";

    hash = "sha256-OQDA4AHDcAdDzpwNSi8rW1FKjfYaFktOwiM0FEHPd70=";

  };



  proxyVendor = true;

  vendorHash = "sha256-MVek3TQpE3AChGyQ4z01fLfkcGKJcckmFV21ww9zT7M=";

  vendorHash = "sha256-NWOySC0czNgNOakpxFguZLtmEI7AvjJQKXDE2vFWeZg=";



  doCheck = false;
@@ -32,19 +32,22 @@ buildGoModule rec { 
  ];



  patches = [

    ./runtime-sharedir.patch

    ./runtime-libexec.patch

  ];



  postPatch = ''

    substituteAllInPlace config/aerc.conf

    substituteAllInPlace config/config.go

    substituteAllInPlace doc/aerc-config.5.scd



    # Prevent buildGoModule from trying to build this

    rm contrib/linters.go

  '';



  makeFlags = [ "PREFIX=${placeholder "out"}" ];



  pythonPath = [

    python3.pkgs.colorama

    python3.pkgs.vobject

  ];



  buildInputs = [ python3 notmuch gawk ];
@@ -60,11 +63,11 @@ buildGoModule rec { 
  postFixup = ''

    wrapProgram $out/bin/aerc \

      --prefix PATH ":" "${lib.makeBinPath [ ncurses ]}"

    wrapProgram $out/share/aerc/filters/html \

    wrapProgram $out/libexec/aerc/filters/html \

      --prefix PATH ":"  ${lib.makeBinPath [ w3m dante ]}

    wrapProgram $out/share/aerc/filters/html-unsafe \

    wrapProgram $out/libexec/aerc/filters/html-unsafe \

      --prefix PATH ":" ${lib.makeBinPath [ w3m dante ]}

    patchShebangs $out/share/aerc/filters

    patchShebangs $out/libexec/aerc/filters

  '';



  meta = with lib; {

pkgs/applications/networking/mailreaders/aerc/runtime-sharedir.patch→pkgs/applications/networking/mailreaders/aerc/runtime-libexec.patch

+87 −0
Original line number Diff line number Diff line 
diff --git i/config/aerc.conf w/config/aerc.conf

index 05ebbf4..db6877b 100644

--- i/config/aerc.conf

+++ w/config/aerc.conf

@@ -152,8 +152,7 @@

diff --git a/config/aerc.conf b/config/aerc.conf

index 7d33b43..4315f0e 100644

--- a/config/aerc.conf

+++ b/config/aerc.conf

@@ -202,8 +202,7 @@

 #

 #   ${XDG_CONFIG_HOME:-~/.config}/aerc/stylesets

 #   ${XDG_DATA_HOME:-~/.local/share}/aerc/stylesets
@@ -12,7 +12,7 @@ index 05ebbf4..db6877b 100644 
 #

 #stylesets-dirs=

 

@@ -445,8 +444,7 @@ message/rfc822=colorize

@@ -547,8 +546,7 @@ message/rfc822=colorize

 #

 #   ${XDG_CONFIG_HOME:-~/.config}/aerc/templates

 #   ${XDG_DATA_HOME:-~/.local/share}/aerc/templates
@@ -22,25 +22,28 @@ index 05ebbf4..db6877b 100644 
 #

 #template-dirs=

 

diff --git i/config/config.go w/config/config.go

index 09fb5ef..c73a7ee 100644

--- i/config/config.go

+++ w/config/config.go

@@ -60,8 +60,7 @@ func buildDefaultDirs() []string {

diff --git a/config/config.go b/config/config.go

index d70bcfe..c19e59a 100644

--- a/config/config.go

+++ b/config/config.go

@@ -54,10 +54,8 @@ func buildDefaultDirs() []string {

 	}

 

 	// Add fixed fallback locations

-	defaultDirs = append(defaultDirs, "/usr/local/libexec/aerc")

-	defaultDirs = append(defaultDirs, "/usr/local/share/aerc")

-	defaultDirs = append(defaultDirs, "/usr/libexec/aerc")

-	defaultDirs = append(defaultDirs, "/usr/share/aerc")

+	defaultDirs = append(defaultDirs, "@out@/libexec/aerc")

+	defaultDirs = append(defaultDirs, "@out@/share/aerc")

 

 	return defaultDirs

 }

diff --git i/doc/aerc-config.5.scd w/doc/aerc-config.5.scd

index d48e38a..39784c4 100644

--- i/doc/aerc-config.5.scd

+++ w/doc/aerc-config.5.scd

@@ -279,8 +279,7 @@ These options are configured in the *[ui]* section of _aerc.conf_.

diff --git a/doc/aerc-config.5.scd b/doc/aerc-config.5.scd

index 9e1f8a3..694abbc 100644

--- a/doc/aerc-config.5.scd

+++ b/doc/aerc-config.5.scd

@@ -300,8 +300,7 @@ These options are configured in the *[ui]* section of _aerc.conf_.

 	```

 	${XDG_CONFIG_HOME:-~/.config}/aerc/stylesets

 	${XDG_DATA_HOME:-~/.local/share}/aerc/stylesets
@@ -50,7 +53,7 @@ index d48e38a..39784c4 100644 
 	```

 

 *styleset-name* = _<string>_

@@ -822,8 +821,7 @@ These options are configured in the *[templates]* section of _aerc.conf_.

@@ -900,8 +899,7 @@ These options are configured in the *[templates]* section of _aerc.conf_.

 	```

 	${XDG_CONFIG_HOME:-~/.config}/aerc/templates

 	${XDG_DATA_HOME:-~/.local/share}/aerc/templates
@@ -60,25 +63,25 @@ index d48e38a..39784c4 100644 
 	```

 

 *new-message* = _<template_name>_

diff --git i/doc/aerc-templates.7.scd w/doc/aerc-templates.7.scd

index 6c9e319..0ef97ce 100644

--- i/doc/aerc-templates.7.scd

+++ w/doc/aerc-templates.7.scd

@@ -111,7 +111,7 @@ aerc provides the following additional functions:

diff --git a/doc/aerc-templates.7.scd b/doc/aerc-templates.7.scd

index ae9bc6d..5f42b14 100644

--- a/doc/aerc-templates.7.scd

+++ b/doc/aerc-templates.7.scd

@@ -319,7 +319,7 @@ aerc provides the following additional functions:

 	Execute external command, provide the second argument to its stdin.

 

 	```

-	{{exec `/usr/local/share/aerc/filters/html` .OriginalText}}

+	{{exec `@out@/share/aerc/filters/html` .OriginalText}}

-	{{exec `/usr/libexec/aerc/filters/html` .OriginalText}}

+	{{exec `@out@/libexec/aerc/filters/html` .OriginalText}}

 	```

 

 *toLocal*

@@ -142,7 +142,7 @@ aerc provides the following additional functions:

 	Example: Automatic HTML parsing for text/html mime type messages

 *.Local*

@@ -425,7 +425,7 @@ aerc provides the following additional functions:

 

 	```

 	{{if eq .OriginalMIMEType "text/html"}}

-	{{exec `/usr/local/share/aerc/filters/html` .OriginalText | wrap 72 | quote}}

+	{{exec `@out@/share/aerc/filters/html` .OriginalText | wrap 72 | quote}}

-	{{exec `/usr/libexec/aerc/filters/html` .OriginalText | wrap 72 | quote}}

+	{{exec `@out@/libexec/aerc/filters/html` .OriginalText | wrap 72 | quote}}

 	{{else}}

 	{{wrap 72 .OriginalText | quote}}

 	{{wrap 72 .OriginalText | trimSignature | quote}}

 	{{end}}