diff options
| author | Ryan Trinkle <ryan.trinkle@gmail.com> | 2014-10-06 13:12:58 -0400 |
|---|---|---|
| committer | Ryan Trinkle <ryan.trinkle@gmail.com> | 2014-10-06 13:12:58 -0400 |
| commit | 92f8d68b9947bfcd2d1ab768486e3c0d58927c2f (patch) | |
| tree | e6ef56025e229fcb74ae905f2a1c8b2a282acc36 /pkgs/development/python-modules/GitPython/hardcode-git-path.patch | |
| parent | e4ff3fd348290a09d3367af4522cead593aa13a8 (diff) | |
| parent | b4d12184cefa4d2d355a8a32e7149148cff06cad (diff) | |
Merge branch 'master' of https://github.com/NixOS/nixpkgs
Conflicts:
pkgs/development/libraries/haskell/ghcjs-dom/default.nix
pkgs/top-level/haskell-packages.nix
Diffstat (limited to 'pkgs/development/python-modules/GitPython/hardcode-git-path.patch')
0 files changed, 0 insertions, 0 deletions