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

Commits on Oct 12, 2018

  1. hugo: apply upstream patch to call rst2html directly on Nix 

    Initially, rst2html was called via the python interpreter which would
fail if the script was wrapped in a launcher as on NixOS.
    @shreyanshk
    shreyanshk committed Oct 12, 2018
    Copy the full SHA
    d4f88f1 View commit details

Commits on Oct 13, 2018

  1. Merge pull request #47600 from shreyanshk/master 

    hugo: helpers/content.go: call rst2html directly to render content
    @Mic92
    Mic92 authored Oct 13, 2018

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    2993047 View commit details
Showing with 8 additions and 1 deletion.
  1. +8 −1 pkgs/applications/misc/hugo/default.nix
9 changes: 8 additions & 1 deletion pkgs/applications/misc/hugo/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ stdenv, buildGoPackage, fetchFromGitHub }:
{ stdenv, buildGoPackage, fetchFromGitHub, fetchpatch }:

buildGoPackage rec {
name = "hugo-${version}";
@@ -13,6 +13,13 @@ buildGoPackage rec {
sha256 = "0n27vyg66jfx4lwswsmdlybly8c9gy5rk7yhy7wzs3rwzlqv1jzj";
};

patches = [
(fetchpatch {
url = "https://github.com/gohugoio/hugo/commit/b137ad4dbd6d14d0a9af68c044aaee61f2c87fe5.diff";
sha256 = "0w1gpg11idqywqcpwzvx4xabn02kk8y4jmyz4h67mc3yh2dhq3ll";
})
];

goDeps = ./deps.nix;

buildFlags = "-tags extended";