public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nox: updated to 0.0.2

Browse Source
This commit is contained in:
Georges Dubus 2015-07-20 17:09:33 +02:00
parent 46516fc19e
commit eb9475d110
2 changed files with 2 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/tools/package-management/nox/default.nix
View File

@ -2,16 +2,14 @@
pythonPackages.buildPythonPackage rec { pythonPackages.buildPythonPackage rec {
name = "nox-${version}"; name = "nox-${version}";
version = "0.0.1"; version = "0.0.2";
namePrefix = ""; namePrefix = "";
src = fetchurl { src = fetchurl {
url = "https://pypi.python.org/packages/source/n/nix-nox/nix-nox-${version}.tar.gz"; url = "https://pypi.python.org/packages/source/n/nix-nox/nix-nox-${version}.tar.gz";
sha256 = "1s1jhickdhym70qrb5h4qxq1mvkpwgdppqpfb2jnpfaf1az6c207"; sha256 = "1wpxh5fhj8nx4yx4cvmc087cnf4iqwxf7zd7rdh2ln3pgxrjfral";
}; };
patches = [ ./show-trace.patch ];
buildInputs = [ pythonPackages.pbr ]; buildInputs = [ pythonPackages.pbr ];
pythonPath = with pythonPackages; [ pythonPath = with pythonPackages; [

41
pkgs/tools/package-management/nox/show-trace.patch
View File

@ -1,41 +0,0 @@
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Tue, 2 Jun 2015 13:04:19 +0200
Subject: [PATCH] Run `nix-env` & `nix-shell` with `--show-trace`
Evaluation is broken often enough that this seems wise.
Debugging such errors without a backtrace is most unpleasant.
diff -Naur nix-nox-0.0.1/nox/nixpkgs_repo.py nix-nox-0.0.1b/nox/nixpkgs_repo.py
--- nox/nox/nixpkgs_repo.py 2014-10-26 21:50:33.000000000 +0100
+++ nox/nox/nixpkgs_repo.py 2015-07-03 04:46:08.114975479 +0200
@@ -75,7 +75,7 @@
def packages(path):
"""List all nix packages in the repo, as a set"""
- output = subprocess.check_output(['nix-env', '-f', path, '-qaP', '--drv-path'],
+ output = subprocess.check_output(['nix-env', '-f', path, '-qaP', '--drv-path', '--show-trace'],
universal_newlines=True)
return set(output.split('\n'))
diff -Naur nix-nox-0.0.1/nox/search.py nix-nox-0.0.1b/nox/search.py
--- nox/nox/search.py 2014-09-20 14:55:33.000000000 +0200
+++ nox/nox/search.py 2015-07-03 04:46:54.264813143 +0200
@@ -10,7 +10,7 @@
def nix_packages_json():
click.echo('Refreshing cache')
- output = subprocess.check_output(['nix-env', '-qa', '--json'],
+ output = subprocess.check_output(['nix-env', '-qa', '--json', '--show-trace'],
universal_newlines=True)
return json.loads(output)
@@ -70,7 +70,7 @@
value_proc=parse_input)
attributes = [p.attribute for p in packages]
if action == 'install':
- subprocess.check_call(['nix-env', '-iA'] + attributes)
+ subprocess.check_call(['nix-env', '-iA', '--show-trace'] + attributes)
elif action == 'shell':
attributes = [a[len('nixpkgs.'):] for a in attributes]
- subprocess.check_call(['nix-shell', '-p'] + attributes)
+ subprocess.check_call(['nix-shell', '-p', '--show-trace'] + attributes)