Show More
@@ -11,18 +11,19 b' args@' | |||||
11 | , ... |
|
11 | , ... | |
12 | }: |
|
12 | }: | |
13 |
|
13 | |||
14 | let pkgs_ = (import <nixpkgs> {}); in |
|
14 | let | |
|
15 | pkgs_ = (import <nixpkgs> {}); | |||
|
16 | in | |||
15 |
|
17 | |||
16 | let |
|
18 | let | |
17 |
|
19 | pkgs = import <nixpkgs> { | ||
18 | pkgs = args.pkgs or (import <nixpkgs> { |
|
|||
19 | overlays = [ |
|
20 | overlays = [ | |
20 | (import ./pkgs/overlays.nix) |
|
21 | (import ./pkgs/overlays.nix) | |
21 | ]; |
|
22 | ]; | |
22 | inherit |
|
23 | inherit | |
23 | (pkgs_) |
|
24 | (pkgs_) | |
24 | system; |
|
25 | system; | |
25 |
} |
|
26 | }; | |
26 |
|
27 | |||
27 | # Works with the new python-packages, still can fallback to the old |
|
28 | # Works with the new python-packages, still can fallback to the old | |
28 | # variant. |
|
29 | # variant. | |
@@ -39,7 +40,7 b' let' | |||||
39 | in |
|
40 | in | |
40 | !builtins.elem (basename path) [ |
|
41 | !builtins.elem (basename path) [ | |
41 | ".git" ".hg" "__pycache__" ".eggs" ".idea" ".dev" |
|
42 | ".git" ".hg" "__pycache__" ".eggs" ".idea" ".dev" | |
42 | "bower_components" "node_modules" |
|
43 | "node_modules" "node_binaries" | |
43 | "build" "data" "result" "tmp"] && |
|
44 | "build" "data" "result" "tmp"] && | |
44 | !builtins.elem ext ["egg-info" "pyc"] && |
|
45 | !builtins.elem ext ["egg-info" "pyc"] && | |
45 | # TODO: johbo: This check is wrong, since "path" contains an absolute path, |
|
46 | # TODO: johbo: This check is wrong, since "path" contains an absolute path, |
@@ -1,14 +1,12 b'' | |||||
1 | # This file defines how to "build" for packaging. |
|
1 | # This file defines how to "build" for packaging. | |
2 |
|
2 | |||
3 | { pkgs ? import <nixpkgs> {} |
|
3 | { doCheck ? true | |
4 | , doCheck ? true |
|
|||
5 | }: |
|
4 | }: | |
6 |
|
5 | |||
7 | let |
|
6 | let | |
8 | vcsserver = import ./default.nix { |
|
7 | vcsserver = import ./default.nix { | |
9 | inherit |
|
8 | inherit | |
10 | doCheck |
|
9 | doCheck; | |
11 | pkgs; |
|
|||
12 | }; |
|
10 | }; | |
13 |
|
11 | |||
14 | in { |
|
12 | in { |
General Comments 0
You need to be logged in to leave comments.
Login now