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

Commits on May 6, 2017

  1. gitAndTools.gitflow: fix runtime dependencies #25487 

    If `git-flow` was installed without explicitly installing `getopt` and `git`
too, it couldn't find those executables. Now it can find those and it can be
used as `git-flow` executable. Note, however, that in order to use `git-flow` as
git subcommand (`git flow`), one needs to install `git` too.
    @jluttine
    jluttine committed May 6, 2017

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    kalbasit Wael Nasreddine
    GPG key ID: FD437548E0BF0F5F
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    dee8865 View commit details

  2. Merge pull request #25548 from jluttine/gitflow-fix-dependencies 

    gitAndTools.gitflow: fix runtime dependencies #25487
    @Mic92
    Mic92 authored May 6, 2017

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    kalbasit Wael Nasreddine
    GPG key ID: FD437548E0BF0F5F
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    cc00ca6 View commit details
Showing with 4 additions and 3 deletions.
  1. +4 −3 pkgs/applications/version-management/git-and-tools/gitflow/default.nix
7 changes: 4 additions & 3 deletions pkgs/applications/version-management/git-and-tools/gitflow/default.nix
View file
Original file line number Diff line number Diff line change
@@ -14,15 +14,16 @@ stdenv.mkDerivation rec {
sha256 = "1i8bwi83qcqvi8zrkjn4mp2v8v7y11fd520wpg2jgy5hqyz34chg";
};

buildInputs = optionals (stdenv.isDarwin) [ pkgs.makeWrapper ];
buildInputs = [ pkgs.makeWrapper ];

preBuild = ''
makeFlagsArray+=(prefix="$out")
'';

postInstall = optional (stdenv.isDarwin) ''
postInstall = ''
wrapProgram $out/bin/git-flow \
--set FLAGS_GETOPT_CMD ${pkgs.getopt}/bin/getopt
--set FLAGS_GETOPT_CMD ${pkgs.getopt}/bin/getopt \
--suffix PATH : ${pkgs.git}/bin
'';

meta = with stdenv.lib; {