public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #3518 from madjar/master

Browse Source 
Fixed deterministicness of fetchgit with leaveDotGit
This commit is contained in:
Domen Kožar 2014-08-10 17:05:01 +02:00
commit ac00b1fe85
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/build-support/fetchgit/nix-prefetch-git
View File

@ -227,8 +227,9 @@ clone_user_rev() {
echo "removing \`.git'..." >&2 echo "removing \`.git'..." >&2
find $dir -name .git\* | xargs rm -rf find $dir -name .git\* | xargs rm -rf
else else
# The logs and index contain timestamps # The logs and index contain timestamps, and the hooks contain
find $dir -name .git | xargs -I {} rm -rf {}/logs {}/index # the nix path of git's bash
find $dir -name .git | xargs -I {} rm -rf {}/logs {}/index {}/hooks
fi fi
} }

2
pkgs/tools/package-management/nox/default.nix
View File

@ -7,7 +7,7 @@ pythonPackages.buildPythonPackage rec {
src = fetchgit { src = fetchgit {
url = "git://github.com/madjar/nox.git"; url = "git://github.com/madjar/nox.git";
rev = "49e4bb7de473ac5e446a76c292bdaefa7e20a1c6"; rev = "49e4bb7de473ac5e446a76c292bdaefa7e20a1c6";
sha256 = "0z97anjhvf8qlyq73h3008np7qh1jvv3kafyxhcbjmi1hpimndyy"; sha256 = "1w1b2g44lj6nbs7f2j5dz5pijhfah3fyldspfb34zcv17j2nlv0b";
leaveDotGit = true; # required by pbr leaveDotGit = true; # required by pbr
}; };