tangled
alpha
login
or
join now
pyrox.dev
/
nixpkgs
lol
0
fork
atom
overview
issues
pulls
pipelines
nox: updated to 0.0.2
Georges Dubus
10 years ago
eb9475d1
46516fc1
+2
-45
2 changed files
expand all
collapse all
unified
split
pkgs
tools
package-management
nox
default.nix
show-trace.patch
+2
-4
pkgs/tools/package-management/nox/default.nix
···
2
2
3
3
pythonPackages.buildPythonPackage rec {
4
4
name = "nox-${version}";
5
5
-
version = "0.0.1";
5
5
+
version = "0.0.2";
6
6
namePrefix = "";
7
7
8
8
src = fetchurl {
9
9
url = "https://pypi.python.org/packages/source/n/nix-nox/nix-nox-${version}.tar.gz";
10
10
-
sha256 = "1s1jhickdhym70qrb5h4qxq1mvkpwgdppqpfb2jnpfaf1az6c207";
10
10
+
sha256 = "1wpxh5fhj8nx4yx4cvmc087cnf4iqwxf7zd7rdh2ln3pgxrjfral";
11
11
};
12
12
-
13
13
-
patches = [ ./show-trace.patch ];
14
12
15
13
buildInputs = [ pythonPackages.pbr ];
16
14
-41
pkgs/tools/package-management/nox/show-trace.patch
···
1
1
-
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
2
2
-
Date: Tue, 2 Jun 2015 13:04:19 +0200
3
3
-
Subject: [PATCH] Run `nix-env` & `nix-shell` with `--show-trace`
4
4
-
5
5
-
Evaluation is broken often enough that this seems wise.
6
6
-
Debugging such errors without a backtrace is most unpleasant.
7
7
-
8
8
-
diff -Naur nix-nox-0.0.1/nox/nixpkgs_repo.py nix-nox-0.0.1b/nox/nixpkgs_repo.py
9
9
-
--- nox/nox/nixpkgs_repo.py 2014-10-26 21:50:33.000000000 +0100
10
10
-
+++ nox/nox/nixpkgs_repo.py 2015-07-03 04:46:08.114975479 +0200
11
11
-
@@ -75,7 +75,7 @@
12
12
-
13
13
-
def packages(path):
14
14
-
"""List all nix packages in the repo, as a set"""
15
15
-
- output = subprocess.check_output(['nix-env', '-f', path, '-qaP', '--drv-path'],
16
16
-
+ output = subprocess.check_output(['nix-env', '-f', path, '-qaP', '--drv-path', '--show-trace'],
17
17
-
universal_newlines=True)
18
18
-
return set(output.split('\n'))
19
19
-
20
20
-
diff -Naur nix-nox-0.0.1/nox/search.py nix-nox-0.0.1b/nox/search.py
21
21
-
--- nox/nox/search.py 2014-09-20 14:55:33.000000000 +0200
22
22
-
+++ nox/nox/search.py 2015-07-03 04:46:54.264813143 +0200
23
23
-
@@ -10,7 +10,7 @@
24
24
-
25
25
-
def nix_packages_json():
26
26
-
click.echo('Refreshing cache')
27
27
-
- output = subprocess.check_output(['nix-env', '-qa', '--json'],
28
28
-
+ output = subprocess.check_output(['nix-env', '-qa', '--json', '--show-trace'],
29
29
-
universal_newlines=True)
30
30
-
return json.loads(output)
31
31
-
32
32
-
@@ -70,7 +70,7 @@
33
33
-
value_proc=parse_input)
34
34
-
attributes = [p.attribute for p in packages]
35
35
-
if action == 'install':
36
36
-
- subprocess.check_call(['nix-env', '-iA'] + attributes)
37
37
-
+ subprocess.check_call(['nix-env', '-iA', '--show-trace'] + attributes)
38
38
-
elif action == 'shell':
39
39
-
attributes = [a[len('nixpkgs.'):] for a in attributes]
40
40
-
- subprocess.check_call(['nix-shell', '-p'] + attributes)
41
41
-
+ subprocess.check_call(['nix-shell', '-p', '--show-trace'] + attributes)