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

Commits on Feb 20, 2019

  1. git: build diff-highlight if Perl support is enabled 

    Fixes #27671.

git/git@0c977db made that script
require an extra build step.
    @delroth
    delroth committed Feb 20, 2019
    Copy the full SHA
    ce15daf View commit details

Commits on Jun 14, 2019

  1. Merge pull request #56069 from delroth/git-diff-highlight 

    git: build diff-highlight if Perl support is enabled
    @peti
    peti authored Jun 14, 2019
    Copy the full SHA
    eeffb47 View commit details
Showing with 3 additions and 1 deletion.
  1. +3 −1 pkgs/applications/version-management/git-and-tools/git/default.nix
4 changes: 3 additions & 1 deletion pkgs/applications/version-management/git-and-tools/git/default.nix
View file
Original file line number Diff line number Diff line change
@@ -96,7 +96,9 @@ stdenv.mkDerivation {

postBuild = ''
make -C contrib/subtree
'' + (stdenv.lib.optionalString stdenv.isDarwin ''
'' + (stdenv.lib.optionalString perlSupport ''
make -C contrib/diff-highlight
'') + (stdenv.lib.optionalString stdenv.isDarwin ''
make -C contrib/credential/osxkeychain
'') + (stdenv.lib.optionalString withLibsecret ''
make -C contrib/credential/libsecret