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

Commits on Jun 3, 2017

  1. fetchgit: add postFetch argument

    @LnL7
    LnL7 committed Jun 3, 2017
    Copy the full SHA
    7567c5c View commit details

Commits on Jun 4, 2017

  1. Merge pull request #26358 from LnL7/fetchgit-postfetch 

    fetchgit: add postFetch argument
    @Mic92
    Mic92 authored Jun 4, 2017
    Copy the full SHA
    ee22e3d View commit details
Showing with 5 additions and 1 deletion.
  1. +1 −0 pkgs/build-support/fetchgit/builder.sh
  2. +4 −1 pkgs/build-support/fetchgit/default.nix
1 change: 1 addition & 0 deletions pkgs/build-support/fetchgit/builder.sh
View file
Original file line number Diff line number Diff line change
@@ -12,4 +12,5 @@ $SHELL $fetcher --builder --url "$url" --out "$out" --rev "$rev" \
${fetchSubmodules:+--fetch-submodules} \
${branchName:+--branch-name "$branchName"}

runHook postFetch
stopNest
5 changes: 4 additions & 1 deletion pkgs/build-support/fetchgit/default.nix
View file
Original file line number Diff line number Diff line change
@@ -15,6 +15,9 @@ in
, fetchSubmodules ? true, deepClone ? false
, branchName ? null
, name ? urlToName url rev
, # Shell code executed after the file has been fetched
# successfully. This can do things like check or transform the file.
postFetch ? ""
}:

/* NOTE:
@@ -54,7 +57,7 @@ stdenv.mkDerivation {
outputHashMode = "recursive";
outputHash = sha256;

inherit url rev leaveDotGit fetchSubmodules deepClone branchName;
inherit url rev leaveDotGit fetchSubmodules deepClone branchName postFetch;

GIT_SSL_CAINFO = "${cacert}/etc/ssl/certs/ca-bundle.crt";