Show More
@@ -9,7 +9,7 b'' | |||||
9 | # { |
|
9 | # { | |
10 | # # Thoughts on how to configure the dev environment |
|
10 | # # Thoughts on how to configure the dev environment | |
11 | # rc = { |
|
11 | # rc = { | |
12 |
# codeInternalUrl = "https://usr:token@ |
|
12 | # codeInternalUrl = "https://usr:token@code.rhodecode.com/internal"; | |
13 | # sources = { |
|
13 | # sources = { | |
14 | # rhodecode-vcsserver = "/home/user/work/rhodecode-vcsserver"; |
|
14 | # rhodecode-vcsserver = "/home/user/work/rhodecode-vcsserver"; | |
15 | # rhodecode-enterprise-ce = "/home/user/work/rhodecode-enterprise-ce"; |
|
15 | # rhodecode-enterprise-ce = "/home/user/work/rhodecode-enterprise-ce"; | |
@@ -24,20 +24,20 b' args@' | |||||
24 | , doCheck ? false |
|
24 | , doCheck ? false | |
25 | , ... |
|
25 | , ... | |
26 | }: |
|
26 | }: | |
27 | let pkgs_ = (import <nixpkgs> {}); in |
|
|||
28 |
|
27 | |||
29 | let |
|
28 | let | |
30 | # Use nixpkgs from args or import them. We use this indirect approach |
|
29 | pkgs_ = (import <nixpkgs> {}); | |
31 | # through args to be able to use the name `pkgs` for our customized packages. |
|
30 | in | |
32 | # Otherwise we will end up with an infinite recursion. |
|
31 | ||
33 | pkgs = args.pkgs or (import <nixpkgs> { |
|
32 | let | |
|
33 | pkgs = import <nixpkgs> { | |||
34 | overlays = [ |
|
34 | overlays = [ | |
35 | (import ./pkgs/overlays.nix) |
|
35 | (import ./pkgs/overlays.nix) | |
36 | ]; |
|
36 | ]; | |
37 | inherit |
|
37 | inherit | |
38 | (pkgs_) |
|
38 | (pkgs_) | |
39 | system; |
|
39 | system; | |
40 |
} |
|
40 | }; | |
41 |
|
41 | |||
42 | # Works with the new python-packages, still can fallback to the old |
|
42 | # Works with the new python-packages, still can fallback to the old | |
43 | # variant. |
|
43 | # variant. |
@@ -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 ? false | |
4 | , doCheck ? false |
|
|||
5 | }: |
|
4 | }: | |
6 |
|
5 | |||
7 | let |
|
6 | let | |
8 | enterprise_ce = import ./default.nix { |
|
7 | enterprise_ce = import ./default.nix { | |
9 | inherit |
|
8 | inherit | |
10 | doCheck |
|
9 | doCheck; | |
11 | pkgs; |
|
|||
12 |
|
10 | |||
13 | # disable checkPhase for build |
|
11 | # disable checkPhase for build | |
14 | checkPhase = '' |
|
12 | checkPhase = '' |
General Comments 0
You need to be logged in to leave comments.
Login now