Skip to content
This repository has been archived by the owner on Oct 7, 2022. It is now read-only.

Enable relative paths for -O option #119

Merged
merged 2 commits into from
Apr 9, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion examples/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -233,7 +233,7 @@ tornado: tornado.nix

tornado.nix: tornado.txt $(PYPI2NIX)
echo "generating tornado.nix expressions ..."
$(PYPI2NIX) -v --basename tornado -r tornado.txt -I $(NIX_PATH) -V "3.5" -O 'https://raw.githubusercontent.com/garbas/nixpkgs-python/master/overrides.nix' -O 'git+https://github.com/garbas/nixpkgs-python.git#path=overrides.nix&rev=28ecf4bc8cf5e718862159eb1f324ddcf227dfef'
$(PYPI2NIX) -v --basename tornado -r tornado.txt -I $(NIX_PATH) -V "3.5" -O 'https://raw.githubusercontent.com/garbas/nixpkgs-python/master/overrides.nix' -O 'git+https://github.com/garbas/nixpkgs-python.git#path=overrides.nix&rev=28ecf4bc8cf5e718862159eb1f324ddcf227dfef' -O './tornado-override/empty.nix'

tornado.txt: tornado-clear
echo "-e git+git://github.com/tornadoweb/tornado.git@69253c820df473407c562a227d0ba36df25018ab#egg=tornado" > tornado.txt
Expand Down
5 changes: 5 additions & 0 deletions examples/tornado-override/empty.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{ pkgs, python }:

self: super: {

}
4 changes: 3 additions & 1 deletion src/pypi2nix/overrides.py
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,9 @@ def nix_expression(self):

def url_to_overrides(url_string):
url = urlparse(url_string)
if url.scheme == 'file' or '':
if url.scheme == '':
return OverridesFile(url.path)
elif url.scheme == 'file':
return OverridesFile(url.path)
elif url.scheme == 'http' or url.scheme == 'https':
return OverridesUrl(url.geturl())
Expand Down