Show More
@@ -5,14 +5,15 b'' | |||||
5 | # "shell.nix" so that it does not have to clutter this file. |
|
5 | # "shell.nix" so that it does not have to clutter this file. | |
6 |
|
6 | |||
7 | args@ |
|
7 | args@ | |
8 | { pythonPackages ? "python27Packages" |
|
8 | { system ? builtins.currentSystem | |
|
9 | , pythonPackages ? "python27Packages" | |||
9 | , pythonExternalOverrides ? self: super: {} |
|
10 | , pythonExternalOverrides ? self: super: {} | |
10 | , doCheck ? false |
|
11 | , doCheck ? false | |
11 | , ... |
|
12 | , ... | |
12 | }: |
|
13 | }: | |
13 |
|
14 | |||
14 | let |
|
15 | let | |
15 | pkgs_ = (import <nixpkgs> {}); |
|
16 | pkgs_ = args.pkgs or (import <nixpkgs> { inherit system; }); | |
16 | in |
|
17 | in | |
17 |
|
18 | |||
18 | let |
|
19 | let |
@@ -1,12 +1,20 b'' | |||||
1 | # This file defines how to "build" for packaging. |
|
1 | # This file defines how to "build" for packaging. | |
2 |
|
2 | |||
3 | { doCheck ? true |
|
3 | { pkgs ? import <nixpkgs> {} | |
|
4 | , system ? builtins.currentSystem | |||
|
5 | , doCheck ? false | |||
4 | }: |
|
6 | }: | |
5 |
|
7 | |||
6 | let |
|
8 | let | |
7 | vcsserver = import ./default.nix { |
|
9 | vcsserver = import ./default.nix { | |
8 | inherit |
|
10 | inherit | |
9 |
doCheck |
|
11 | doCheck | |
|
12 | system; | |||
|
13 | ||||
|
14 | # disable checkPhase for build | |||
|
15 | checkPhase = '' | |||
|
16 | ''; | |||
|
17 | ||||
10 | }; |
|
18 | }; | |
11 |
|
19 | |||
12 | in { |
|
20 | in { |
General Comments 0
You need to be logged in to leave comments.
Login now