diff options
author | Georges Dubus <georges.dubus@compiletoi.net> | 2014-08-10 16:25:29 +0200 |
---|---|---|
committer | Georges Dubus <georges.dubus@compiletoi.net> | 2014-08-10 16:25:29 +0200 |
commit | ca0b0a68e8364f7ac73c9897661a7e430cbd7f60 (patch) | |
tree | 3323575d1a54a00d26d374d7452985ea18e59a03 /pkgs | |
parent | 05e81e0d9fdb0d99ae832906a99b79c2bedc6a5b (diff) | |
download | nixlib-ca0b0a68e8364f7ac73c9897661a7e430cbd7f60.tar nixlib-ca0b0a68e8364f7ac73c9897661a7e430cbd7f60.tar.gz nixlib-ca0b0a68e8364f7ac73c9897661a7e430cbd7f60.tar.bz2 nixlib-ca0b0a68e8364f7ac73c9897661a7e430cbd7f60.tar.lz nixlib-ca0b0a68e8364f7ac73c9897661a7e430cbd7f60.tar.xz nixlib-ca0b0a68e8364f7ac73c9897661a7e430cbd7f60.tar.zst nixlib-ca0b0a68e8364f7ac73c9897661a7e430cbd7f60.zip |
Fixed deterministicness of fetchgit with leaveDotGit
The shebang of .git/hooks depended the git's bash, which made the result depend of that bash's path.
Diffstat (limited to 'pkgs')
-rwxr-xr-x | pkgs/build-support/fetchgit/nix-prefetch-git | 5 | ||||
-rw-r--r-- | pkgs/tools/package-management/nox/default.nix | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/pkgs/build-support/fetchgit/nix-prefetch-git b/pkgs/build-support/fetchgit/nix-prefetch-git index 4ddf8a4cb9f3..fcb012627834 100755 --- a/pkgs/build-support/fetchgit/nix-prefetch-git +++ b/pkgs/build-support/fetchgit/nix-prefetch-git @@ -227,8 +227,9 @@ clone_user_rev() { echo "removing \`.git'..." >&2 find $dir -name .git\* | xargs rm -rf else - # The logs and index contain timestamps - find $dir -name .git | xargs -I {} rm -rf {}/logs {}/index + # The logs and index contain timestamps, and the hooks contain + # the nix path of git's bash + find $dir -name .git | xargs -I {} rm -rf {}/logs {}/index {}/hooks fi } diff --git a/pkgs/tools/package-management/nox/default.nix b/pkgs/tools/package-management/nox/default.nix index 3bdf5e101d1c..93c671287d63 100644 --- a/pkgs/tools/package-management/nox/default.nix +++ b/pkgs/tools/package-management/nox/default.nix @@ -7,7 +7,7 @@ pythonPackages.buildPythonPackage rec { src = fetchgit { url = "git://github.com/madjar/nox.git"; rev = "49e4bb7de473ac5e446a76c292bdaefa7e20a1c6"; - sha256 = "0z97anjhvf8qlyq73h3008np7qh1jvv3kafyxhcbjmi1hpimndyy"; + sha256 = "1w1b2g44lj6nbs7f2j5dz5pijhfah3fyldspfb34zcv17j2nlv0b"; leaveDotGit = true; # required by pbr }; |