diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2014-01-21 12:54:58 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2014-01-21 12:58:55 +0100 |
| commit | 668310a2b578d57a59dad7481db651ab3a258256 (patch) | |
| tree | dbe782a40c0146c04096c7009b357c9357f3a915 /pkgs/development/python-modules/GitPython/hardcode-git-path.patch | |
| parent | 8088837dc8f35ef7853787f88bb1db7248900cc4 (diff) | |
| parent | 28d51a31eeff92677132c84436c0a3536a34bea7 (diff) | |
Merge stdenv-updates into master
This is a re-merge, in fact. Now the first parent is master
as of right before the "first merge" (ac6761c9).
A few commits pushed in-between into master now look like coming
from stdenv-updates, but otherwise this seems to fix the situation.
Cf. https://github.com/NixOS/nixpkgs/commit/320209a618221728e022222a2aafee1af72037bb#commitcomment-5125991
Diffstat (limited to 'pkgs/development/python-modules/GitPython/hardcode-git-path.patch')
0 files changed, 0 insertions, 0 deletions