Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

neomutt: 20200501 -> 20200619 #91110

Merged
merged 4 commits into from Jun 19, 2020
Merged

neomutt: 20200501 -> 20200619 #91110

merged 4 commits into from Jun 19, 2020

Conversation

Ma27
Copy link
Member

@Ma27 Ma27 commented Jun 19, 2020

Motivation for this change

https://github.com/neomutt/neomutt/releases/tag/20200619


I didn't encounter any breaking things, so from my PoV it should be fine to backport.


Closes #86896
Closes #89813

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

doronbehar and others added 4 commits June 19, 2020 18:15
Without elinks / w3m / lynx in the nativeBuildInputs, there are these
errors in the build:

LC_ALL=C w3m -dump -O UTF8 docs/manual.html > docs/manual.txt || \
LC_ALL=C lynx -dump -nolist -with_backspaces \
        -display_charset=us-ascii docs/manual.html > docs/manual.txt || \
LC_ALL=C elinks -dump -no-numbering -no-references \
        docs/manual.html | sed -e 's,\\001, ,g' > docs/manual.txt
/nix/store/xfbmj7sl2ikicym9x3yq7cms5qx1w39k-bash-4.4-p23/bin/bash: w3m: command not found
/nix/store/xfbmj7sl2ikicym9x3yq7cms5qx1w39k-bash-4.4-p23/bin/bash: line 1: lynx: command not found
/nix/store/xfbmj7sl2ikicym9x3yq7cms5qx1w39k-bash-4.4-p23/bin/bash: line 3: elinks: command not found
Includes both rfc2047 tests workarounds and locale workarounds.
Fixes NixOS#86896. See neomutt/neomutt#2314 .
@teto
Copy link
Member

teto commented Jun 19, 2020

is elinks mandatory now ? impact on closure size ?

@Ma27
Copy link
Member Author

Ma27 commented Jun 19, 2020

is elinks mandatory now

Well, kind of. As explained in b8f6521 this is needed to properly generated the full user manual.

impact on closure size ?

None:

(bump-neomutt) → nix path-info -f . neomutt -S -h
/nix/store/wsmxvnwz48dpici3cnql7dnpbk8r7sjg-neomutt-20200619	 230.4M
(master) → nix path-info -f . neomutt -S -h
/nix/store/lcnwbayhsbsqp7yzmpqnl6242qblgh9w-neomutt-20200501	 253.2M

I assume this is thanks ot 3b9a8f5 which removed references to .dev outputs.

@flokli flokli merged commit 0364e80 into NixOS:master Jun 19, 2020
@Ma27 Ma27 deleted the bump-neomutt branch June 19, 2020 21:43
@Ma27
Copy link
Member Author

Ma27 commented Jun 19, 2020

Ported to stable as 2a0c129, 5ca29c7, 657aa0b and c9ad468.

@Ma27 Ma27 added 8.has: port to stable A PR already has a backport to the stable release. and removed 9.needs: port to stable A PR needs a backport to the stable release. labels Jun 19, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Next neomutt can drop the locale for testing purposes
4 participants