diff options
| author | Charles Strahan <charles.c.strahan@gmail.com> | 2014-12-27 14:35:01 -0500 |
|---|---|---|
| committer | Charles Strahan <charles.c.strahan@gmail.com> | 2014-12-27 14:35:01 -0500 |
| commit | a188373640738d81cfb18a3f7330ac23e99443cc (patch) | |
| tree | 6db65553361b3886b70b03b4ee1d20c1801fd43a /pkgs/development/python-modules/GitPython/hardcode-git-path.patch | |
| parent | 571af5b98878a0a213f4bf2ef2e93db035d5a4d7 (diff) | |
| parent | 5eba046b5df461d6cd162f22463d954e544ae7e8 (diff) | |
Merge branch 'master' of github.com:nixos/nixpkgs into ryghcjs
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