Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
base: 8b38149d616c
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: c9ad46815a35
Choose a head ref
  • 4 commits
  • 1 file changed
  • 2 contributors

Commits on Jun 19, 2020

  1. neomutt: Make it not reference .dev outputs. 

    (cherry picked from commit 3b9a8f5)
    @doronbehar @Ma27
    doronbehar authored and Ma27 committed Jun 19, 2020
    Copy the full SHA
    2a0c129 View commit details
    Browse the repository at this point in the history

  2. neomutt: make manual.txt not empty 

    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

(cherry picked from commit b8f6521)
    @doronbehar @Ma27
    doronbehar authored and Ma27 committed Jun 19, 2020
    Copy the full SHA
    5ca29c7 View commit details
    Browse the repository at this point in the history

  3. neomutt: Remove old fixes for failing tests 

    Includes both rfc2047 tests workarounds and locale workarounds.
Fixes #86896. See neomutt/neomutt#2314 .

(cherry picked from commit b58227a)
    @doronbehar @Ma27
    doronbehar authored and Ma27 committed Jun 19, 2020
    Copy the full SHA
    657aa0b View commit details
    Browse the repository at this point in the history

  4. neomutt: 20200501 -> 20200619 

    https://github.com/neomutt/neomutt/releases/tag/20200619
(cherry picked from commit 499d188)
    @Ma27
    Ma27 committed Jun 19, 2020
    Copy the full SHA
    c9ad468 View commit details
    Browse the repository at this point in the history