Show More
@@ -46,7 +46,6 b' let' | |||||
46 | }); |
|
46 | }); | |
47 |
|
47 | |||
48 | inherit (pkgs.lib) fix extends; |
|
48 | inherit (pkgs.lib) fix extends; | |
49 |
|
||||
50 | basePythonPackages = with builtins; if isAttrs pythonPackages |
|
49 | basePythonPackages = with builtins; if isAttrs pythonPackages | |
51 | then pythonPackages |
|
50 | then pythonPackages | |
52 | else getAttr pythonPackages pkgs; |
|
51 | else getAttr pythonPackages pkgs; | |
@@ -61,9 +60,8 b' let' | |||||
61 | let |
|
60 | let | |
62 | ext = last (splitString "." path); |
|
61 | ext = last (splitString "." path); | |
63 | in |
|
62 | in | |
64 | !elem (basename path) [ |
|
63 | !elem (basename path) [".hg" ".git" "__pycache__" ".eggs" | |
65 | ".git" ".hg" "__pycache__" ".eggs" "node_modules" |
|
64 | "node_modules" "build" "data" "tmp"] && | |
66 | "build" "data" "tmp"] && |
|
|||
67 | !elem ext ["egg-info" "pyc"] && |
|
65 | !elem ext ["egg-info" "pyc"] && | |
68 | !startsWith "result" path; |
|
66 | !startsWith "result" path; | |
69 |
|
67 | |||
@@ -71,8 +69,7 b' let' | |||||
71 |
|
69 | |||
72 | pythonGeneratedPackages = self: basePythonPackages.override (a: { |
|
70 | pythonGeneratedPackages = self: basePythonPackages.override (a: { | |
73 | inherit self; |
|
71 | inherit self; | |
74 | }) |
|
72 | }) // (scopedImport { | |
75 | // (scopedImport { |
|
|||
76 | self = self; |
|
73 | self = self; | |
77 | super = basePythonPackages; |
|
74 | super = basePythonPackages; | |
78 | inherit pkgs; |
|
75 | inherit pkgs; | |
@@ -80,18 +77,15 b' let' | |||||
80 | } ./pkgs/python-packages.nix); |
|
77 | } ./pkgs/python-packages.nix); | |
81 |
|
78 | |||
82 | pythonOverrides = import ./pkgs/python-packages-overrides.nix { |
|
79 | pythonOverrides = import ./pkgs/python-packages-overrides.nix { | |
83 | inherit |
|
80 | inherit basePythonPackages pkgs; | |
84 | basePythonPackages |
|
|||
85 | pkgs; |
|
|||
86 | }; |
|
81 | }; | |
87 |
|
82 | |||
88 | version = builtins.readFile ./vcsserver/VERSION; |
|
83 | version = builtins.readFile ./vcsserver/VERSION; | |
89 |
|
84 | |||
90 | pythonLocalOverrides = self: super: { |
|
85 | pythonLocalOverrides = self: super: { | |
91 | rhodecode-vcsserver = super.rhodecode-vcsserver.override (attrs: { |
|
86 | rhodecode-vcsserver = super.rhodecode-vcsserver.override (attrs: { | |
92 | inherit |
|
87 | inherit doCheck version; | |
93 | doCheck |
|
88 | ||
94 | version; |
|
|||
95 | name = "rhodecode-vcsserver-${version}"; |
|
89 | name = "rhodecode-vcsserver-${version}"; | |
96 | releaseName = "RhodeCodeVCSServer-${version}"; |
|
90 | releaseName = "RhodeCodeVCSServer-${version}"; | |
97 | src = rhodecode-vcsserver-src; |
|
91 | src = rhodecode-vcsserver-src; | |
@@ -112,6 +106,13 b' let' | |||||
112 | export PATH="$out/bin:$PATH" |
|
106 | export PATH="$out/bin:$PATH" | |
113 | ''; |
|
107 | ''; | |
114 |
|
108 | |||
|
109 | # put custom attrs here | |||
|
110 | checkPhase = '' | |||
|
111 | runHook preCheck | |||
|
112 | PYTHONHASHSEED=random py.test -p no:sugar -vv --cov-config=.coveragerc --cov=vcsserver --cov-report=term-missing vcsserver | |||
|
113 | runHook postCheck | |||
|
114 | ''; | |||
|
115 | ||||
115 | postInstall = '' |
|
116 | postInstall = '' | |
116 | echo "Writing meta information for rccontrol to nix-support/rccontrol" |
|
117 | echo "Writing meta information for rccontrol to nix-support/rccontrol" | |
117 | mkdir -p $out/nix-support/rccontrol |
|
118 | mkdir -p $out/nix-support/rccontrol |
General Comments 0
You need to be logged in to leave comments.
Login now