diff --git a/pkgs/tools/package-management/nox/default.nix b/pkgs/tools/package-management/nox/default.nix index bbb576400f0..2930e6fdce2 100644 --- a/pkgs/tools/package-management/nox/default.nix +++ b/pkgs/tools/package-management/nox/default.nix @@ -2,16 +2,14 @@ pythonPackages.buildPythonPackage rec { name = "nox-${version}"; - version = "0.0.1"; + version = "0.0.2"; namePrefix = ""; src = fetchurl { 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 ]; pythonPath = with pythonPackages; [ diff --git a/pkgs/tools/package-management/nox/show-trace.patch b/pkgs/tools/package-management/nox/show-trace.patch deleted file mode 100644 index 6b464d3a4b2..00000000000 --- a/pkgs/tools/package-management/nox/show-trace.patch +++ /dev/null @@ -1,41 +0,0 @@ -From: Tobias Geerinckx-Rice -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)