From 0185daf3abe725881cb88c448770841cab36491a Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Sun, 24 Feb 2019 10:46:15 -0600 Subject: [PATCH 1/2] gitAndTools.hub: 2.9.0 -> 2.10.0 https://github.com/github/hub/releases/tag/v2.10.0 --- .../version-management/git-and-tools/hub/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/hub/default.nix b/pkgs/applications/version-management/git-and-tools/hub/default.nix index 8ae600ed360..1af9160f66e 100644 --- a/pkgs/applications/version-management/git-and-tools/hub/default.nix +++ b/pkgs/applications/version-management/git-and-tools/hub/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "hub"; - version = "2.9.0"; + version = "2.10.0"; goPackagePath = "github.com/github/hub"; @@ -13,7 +13,7 @@ buildGoPackage rec { owner = "github"; repo = pname; rev = "v${version}"; - sha256 = "0yxpr606xx23l8823hjqj16cvjjrwb28c7z08ml1pkfvaf7w4n81"; + sha256 = "1vvrc3k81jm9c664g0j9666i7ypn7n7jfyj4gxcybq3sg2d4di27"; }; nativeBuildInputs = [ groff ronn utillinux glibcLocales ]; From 46c41005526707ef9f6ccafc7b2158e0572851b4 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Wed, 27 Feb 2019 15:37:23 -0600 Subject: [PATCH 2/2] gitAndTools.hub: simplify --- .../version-management/git-and-tools/hub/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/hub/default.nix b/pkgs/applications/version-management/git-and-tools/hub/default.nix index 1af9160f66e..9f18beda7f9 100644 --- a/pkgs/applications/version-management/git-and-tools/hub/default.nix +++ b/pkgs/applications/version-management/git-and-tools/hub/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoPackage, fetchFromGitHub, ronn, ruby, groff, Security, utillinux, git, glibcLocales }: +{ stdenv, buildGoPackage, fetchFromGitHub, groff, Security, utillinux }: buildGoPackage rec { pname = "hub"; @@ -16,9 +16,8 @@ buildGoPackage rec { sha256 = "1vvrc3k81jm9c664g0j9666i7ypn7n7jfyj4gxcybq3sg2d4di27"; }; - nativeBuildInputs = [ groff ronn utillinux glibcLocales ]; - buildInputs = [ ruby ] ++ - stdenv.lib.optional stdenv.isDarwin Security; + nativeBuildInputs = [ groff utillinux ]; + buildInputs = stdenv.lib.optional stdenv.isDarwin Security; postPatch = '' patchShebangs . @@ -30,7 +29,8 @@ buildGoPackage rec { install -D etc/hub.bash_completion.sh "$bin/share/bash-completion/completions/hub" install -D etc/hub.fish_completion "$bin/share/fish/vendor_completions.d/hub.fish" - PATH=$PATH:${git}/bin LC_ALL=en_US.utf-8 make man-pages + LC_ALL=C.UTF8 \ + make man-pages cp -vr --parents share/man/man[1-9]/*.[1-9] $bin/ '';