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: c40ba614a148
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: a005d724d052
Choose a head ref
  • 5 commits
  • 3 files changed
  • 2 contributors

Commits on Oct 8, 2020

  1. ikiwiki: add highlight dependency

    IkiWiki's highlight plugin requires this.
    
    Note that the current highlight version (3.57) is not compatible with
    ikiwiki version in nixpkgs. This will be fixed in the next commit.
    wentasah committed Oct 8, 2020
    Copy the full SHA
    8094b8a View commit details
    Browse the repository at this point in the history
  2. ikiwiki: 3.20190228 -> 3.20200202.3

    This fixes (among others) incompatibility with highlight from nixpkgs.
    See http://source.ikiwiki.branchable.com/?p=source.git;a=commit;h=4d06df9583e6c4145f8c6fc2fd51d7894c0b85ce
    wentasah committed Oct 8, 2020
    Copy the full SHA
    b06290f View commit details
    Browse the repository at this point in the history
  3. ikiwiki: Fix postInstall script to work with optional dependencies

    The line-continuation backslash should not be a part of optional
    string because it can lead to errors like this:
    
        /nix/store/333six1faw9bhccsx9qw5718k6b1wiq2-stdenv-linux/setup: line 90: --prefix: command not found
        builder for '/nix/store/lb07r900fpg7r1555zpf0j8n1n7g3wlx-ikiwiki-3.20200202.3.drv' failed with exit code 127
    wentasah committed Oct 8, 2020
    Copy the full SHA
    7e63308 View commit details
    Browse the repository at this point in the history
  4. ikiwiki: Fix docutils support

    Without this, the rst plugin complains as follows:
    
        cannot import docutils.core
    
    Also, python3 is needed for the rst plugin to work.
    wentasah committed Oct 8, 2020
    Copy the full SHA
    40a5a4c View commit details
    Browse the repository at this point in the history

Commits on Nov 27, 2020

  1. Copy the full SHA
    a005d72 View commit details
    Browse the repository at this point in the history