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
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: ff12e10d124b
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 561edb92e6d9
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Oct 11, 2019

  1. alot: fix hardcoded Python in Zsh completion 

    This allows completing `alot compose --sender <Tab>`
    @minijackson
    minijackson committed Oct 11, 2019
    Copy the full SHA
    8dc4c39 View commit details

Commits on Nov 7, 2019

  1. Merge pull request #70903 from minijackson/fix-alot-completion 

    alot: fix hardcoded Python in Zsh completion
    @matthewbauer
    matthewbauer authored Nov 7, 2019
    Copy the full SHA
    561edb9 View commit details
Showing with 6 additions and 2 deletions.
  1. +6 −2 pkgs/development/python-modules/alot/default.nix
8 changes: 6 additions & 2 deletions pkgs/development/python-modules/alot/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ stdenv, lib, buildPythonPackage, fetchFromGitHub, isPy3k
{ stdenv, lib, buildPythonPackage, python, fetchFromGitHub, isPy3k
, notmuch, urwid, urwidtrees, twisted, python_magic, configobj, mock, file, gpgme
, service-identity
, gnupg ? null, sphinx, awk ? null, procps ? null, future ? null
@@ -39,14 +39,18 @@ buildPythonPackage rec {

checkInputs = [ awk future mock gnupg procps ];

postInstall = lib.optionalString withManpage ''
postInstall = let
completionPython = python.withPackages (ps: [ ps.configobj ]);
in lib.optionalString withManpage ''
mkdir -p $out/man
cp -r docs/build/man $out/man
''
+ ''
mkdir -p $out/share/{applications,alot}
cp -r extra/themes $out/share/alot
substituteInPlace extra/completion/alot-completion.zsh \
--replace "python3" "${completionPython.interpreter}"
install -D extra/completion/alot-completion.zsh $out/share/zsh/site-functions/_alot
sed "s,/usr/bin,$out/bin,g" extra/alot.desktop > $out/share/applications/alot.desktop