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

Commits on Mar 6, 2019

  1. Switch zsh-git-prompt to new fork.

    @qolii
    qolii committed Mar 6, 2019
    Copy the full SHA
    f4d1a4e View commit details

Commits on Mar 8, 2019

  1. Switch over to fetchFromGitHub, and update version to reflect tempora… 

    …ry nature.
    @qolii
    qolii committed Mar 8, 2019
    Copy the full SHA
    d7310a8 View commit details

  2. Merge pull request #56996 from qolii/zsh_git_prompt_change 

    zsh-git-prompt: switch to a new fork.
    @infinisil
    infinisil authored Mar 8, 2019
    Copy the full SHA
    f4a8b3d View commit details
Showing with 7 additions and 6 deletions.
  1. +7 −6 pkgs/shells/zsh/zsh-git-prompt/default.nix
13 changes: 7 additions & 6 deletions pkgs/shells/zsh/zsh-git-prompt/default.nix
View file
Original file line number Diff line number Diff line change
@@ -24,7 +24,7 @@
# More details are in share/doc/zsh-git-prompt/README.md, once
# installed.
#
{ fetchgit
{ fetchFromGitHub
, haskell
, python
, git
@@ -36,11 +36,12 @@ haskellPackages.callPackage
({ mkDerivation, base, HUnit, parsec, process, QuickCheck, stdenv }:
mkDerivation rec {
pname = "zsh-git-prompt";
version = "0.5";
src = fetchgit {
url = "https://github.com/olivierverdier/zsh-git-prompt.git";
rev = "0a6c8b610e799040b612db8888945f502a2ddd9d";
sha256 = "19x1gf1r6l7r6i7vhhsgzcbdlnr648jx8j84nk2zv1b8igh205hw";
version = "0.4z"; # While we await a real 0.5 release.
src = fetchFromGitHub {
owner = "starcraftman";
repo = "zsh-git-prompt";
rev = "11b83ba3b85d14c66cf2ab79faefab6d838da28e";
sha256 = "04aylsjfb03ckw219plkzpyiq4j9g66bjxa5pa56h1p7df6pjssb";
};
prePatch = ''
substituteInPlace zshrc.sh \