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

Commits on Oct 23, 2019

  1. khal: fix build, help find sphinxcontrib_newsfeed 

    This isn't pretty but seems to do the job, improvements very welcome :)

An alternative approach (untested) would be buiding man pages separately
and linking them into a unified result. FWIW.
    @dtzWill
    dtzWill committed Oct 23, 2019
    Copy the full SHA
    2c50765 View commit details

  2. Merge pull request #71836 from dtzWill/fix/khal-sphinx-workaround 

    khal: fix build, help find sphinxcontrib_newsfeed
    @gebner
    gebner authored Oct 23, 2019
    Copy the full SHA
    d01c8be View commit details
Showing with 1 addition and 0 deletions.
  1. +1 −0 pkgs/applications/misc/khal/default.nix
1 change: 1 addition & 0 deletions pkgs/applications/misc/khal/default.nix
View file
Original file line number Diff line number Diff line change
@@ -42,6 +42,7 @@ with python3.pkgs; buildPythonApplication rec {
install -D misc/__khal $out/share/zsh/site-functions/__khal
# man page
PATH="${python3.withPackages (ps: with ps; [ sphinx sphinxcontrib_newsfeed ])}/bin:$PATH" \
make -C doc man
install -Dm755 doc/build/man/khal.1 -t $out/share/man/man1