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

Commits on Sep 27, 2017

  1. hugo: 0.27.1 -> 0.29

    @sigma
    sigma committed Sep 27, 2017
    Copy the full SHA
    b3433ab View commit details

Commits on Sep 28, 2017

  1. Merge pull request #29876 from sigma/pr/hugo-0.29 

    hugo: 0.27.1 -> 0.29
    @Mic92
    Mic92 authored Sep 28, 2017
    Copy the full SHA
    767977d View commit details
Showing with 31 additions and 13 deletions.
  1. +2 −2 pkgs/applications/misc/hugo/default.nix
  2. +29 −11 pkgs/applications/misc/hugo/deps.nix
4 changes: 2 additions & 2 deletions pkgs/applications/misc/hugo/default.nix
View file
Original file line number Diff line number Diff line change
@@ -2,15 +2,15 @@

buildGoPackage rec {
name = "hugo-${version}";
version = "0.27.1";
version = "0.29";

goPackagePath = "github.com/gohugoio/hugo";

src = fetchFromGitHub {
owner = "gohugoio";
repo = "hugo";
rev = "v${version}";
sha256 = "0vxzjwm9dsan314cz0gnj4spssg4w8y6ywsak8n9c6w0l45xf07p";
sha256 = "1vklws05534ig9rj55cqnxpqfsvns64kfdg6zjyrcpz7l0z07a33";
};

goDeps = ./deps.nix;
40 changes: 29 additions & 11 deletions pkgs/applications/misc/hugo/deps.nix
View file
Original file line number Diff line number Diff line change
@@ -26,6 +26,15 @@
sha256 = "13r896yy71i6jj1cwv2pjp53wjfxkg7bh884fggv6y79ly0qr63j";
};
}
{
goPackagePath = "github.com/alecthomas/chroma";
fetch = {
type = "git";
url = "https://github.com/alecthomas/chroma";
rev = "b0295f66bdb7c61d54906003d7649185794e21b4";
sha256 = "1hnvv13nphbzr9xm21fys7lgm0kd6qlbk58vc8fi802lxzsfmdis";
};
}
{
goPackagePath = "github.com/bep/gitmap";
fetch = {
@@ -40,8 +49,8 @@
fetch = {
type = "git";
url = "https://github.com/chaseadamsio/goorgeous";
rev = "677defd0e024333503d8c946dd4ba3f32ad3e5d2";
sha256 = "1mcncs3qdb62m9xwhkxy743ddvgsjfbmbl2djnhqmz1va05njna1";
rev = "098da33fde5f9220736531b3cb26a2dec86a8367";
sha256 = "1cwag5vzgrzy22rvcp12whzgqbgrmdmaxar0fl4nwqxdhy90s67k";
};
}
{
@@ -53,6 +62,15 @@
sha256 = "1a87v4cnd5y5whcdkjcqjpg1s5pxqhrspdxrsk2af49zsw9fsj9f";
};
}
{
goPackagePath = "github.com/danwakefield/fnmatch";
fetch = {
type = "git";
url = "https://github.com/danwakefield/fnmatch";
rev = "cbb64ac3d964b81592e64f957ad53df015803288";
sha256 = "0cbf511ppsa6hf59mdl7nbyn2b2n71y0bpkzbmfkdqjhanqh1lqz";
};
}
{
goPackagePath = "github.com/dchest/cssmin";
fetch = {
@@ -62,6 +80,15 @@
sha256 = "09sdijfx5d05z4cd5k6lhl7k3kbpdf2amzlngv15h5v0fff9qw4s";
};
}
{
goPackagePath = "github.com/dlclark/regexp2";
fetch = {
type = "git";
url = "https://github.com/dlclark/regexp2";
rev = "487489b64fb796de2e55f4e8a4ad1e145f80e957";
sha256 = "144s81ndviwhyy20ipxvvfvap8phv5p762glxrz6aqxprkxfarj5";
};
}
{
goPackagePath = "github.com/eknkc/amber";
fetch = {
@@ -206,15 +233,6 @@
sha256 = "0fxjgmwn9927wckl2xx8byv64cxgc0yxdwpfzval5n3wm5l5ij1i";
};
}
{
goPackagePath = "github.com/pelletier/go-buffruneio";
fetch = {
type = "git";
url = "https://github.com/pelletier/go-buffruneio";
rev = "c37440a7cf42ac63b919c752ca73a85067e05992";
sha256 = "0l83p1gg6g5mmhmxjisrhfimhbm71lwn1r2w7d6siwwqm9q08sd2";
};
}
{
goPackagePath = "github.com/pelletier/go-toml";
fetch = {