From f4d1a4e899a6fdf9ec2a270b69820bb0285990ba Mon Sep 17 00:00:00 2001 From: qolii Date: Wed, 6 Mar 2019 14:22:20 -0800 Subject: [PATCH 1/2] Switch zsh-git-prompt to new fork. --- pkgs/shells/zsh/zsh-git-prompt/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/shells/zsh/zsh-git-prompt/default.nix b/pkgs/shells/zsh/zsh-git-prompt/default.nix index 761ad071da95..3ba4144b3eb1 100644 --- a/pkgs/shells/zsh/zsh-git-prompt/default.nix +++ b/pkgs/shells/zsh/zsh-git-prompt/default.nix @@ -38,9 +38,9 @@ haskellPackages.callPackage pname = "zsh-git-prompt"; version = "0.5"; src = fetchgit { - url = "https://github.com/olivierverdier/zsh-git-prompt.git"; - rev = "0a6c8b610e799040b612db8888945f502a2ddd9d"; - sha256 = "19x1gf1r6l7r6i7vhhsgzcbdlnr648jx8j84nk2zv1b8igh205hw"; + url = "https://github.com/starcraftman/zsh-git-prompt.git"; + rev = "11b83ba3b85d14c66cf2ab79faefab6d838da28e"; + sha256 = "04aylsjfb03ckw219plkzpyiq4j9g66bjxa5pa56h1p7df6pjssb"; }; prePatch = '' substituteInPlace zshrc.sh \ From d7310a8092be5b41848af7d3ea3fda972388d476 Mon Sep 17 00:00:00 2001 From: qolii Date: Fri, 8 Mar 2019 13:14:14 -0800 Subject: [PATCH 2/2] Switch over to fetchFromGitHub, and update version to reflect temporary nature. --- pkgs/shells/zsh/zsh-git-prompt/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/shells/zsh/zsh-git-prompt/default.nix b/pkgs/shells/zsh/zsh-git-prompt/default.nix index 3ba4144b3eb1..6ec5e816bb62 100644 --- a/pkgs/shells/zsh/zsh-git-prompt/default.nix +++ b/pkgs/shells/zsh/zsh-git-prompt/default.nix @@ -24,7 +24,7 @@ # More details are in share/doc/zsh-git-prompt/README.md, once # installed. # -{ fetchgit +{ fetchFromGitHub , haskell , python , git @@ -36,9 +36,10 @@ haskellPackages.callPackage ({ mkDerivation, base, HUnit, parsec, process, QuickCheck, stdenv }: mkDerivation rec { pname = "zsh-git-prompt"; - version = "0.5"; - src = fetchgit { - url = "https://github.com/starcraftman/zsh-git-prompt.git"; + version = "0.4z"; # While we await a real 0.5 release. + src = fetchFromGitHub { + owner = "starcraftman"; + repo = "zsh-git-prompt"; rev = "11b83ba3b85d14c66cf2ab79faefab6d838da28e"; sha256 = "04aylsjfb03ckw219plkzpyiq4j9g66bjxa5pa56h1p7df6pjssb"; };