Show More
@@ -19,7 +19,8 b' let' | |||||
19 | overlays = [ |
|
19 | overlays = [ | |
20 | (import ./pkgs/overlays.nix) |
|
20 | (import ./pkgs/overlays.nix) | |
21 | ]; |
|
21 | ]; | |
22 |
inherit |
|
22 | inherit | |
|
23 | (pkgs_) | |||
23 | system; |
|
24 | system; | |
24 | }); |
|
25 | }); | |
25 |
|
26 | |||
@@ -47,7 +48,11 b' let' | |||||
47 |
|
48 | |||
48 | sources = |
|
49 | sources = | |
49 | let |
|
50 | let | |
50 | inherit (pkgs.lib) all isString attrValues; |
|
51 | inherit | |
|
52 | (pkgs.lib) | |||
|
53 | all | |||
|
54 | isString | |||
|
55 | attrValues; | |||
51 | sourcesConfig = pkgs.config.rc.sources or {}; |
|
56 | sourcesConfig = pkgs.config.rc.sources or {}; | |
52 | in |
|
57 | in | |
53 | # Ensure that sources are configured as strings. Using a path |
|
58 | # Ensure that sources are configured as strings. Using a path | |
@@ -161,12 +166,19 b' let' | |||||
161 | getAttr pythonPackages pkgs; |
|
166 | getAttr pythonPackages pkgs; | |
162 |
|
167 | |||
163 | pythonGeneratedPackages = import ./pkgs/python-packages.nix { |
|
168 | pythonGeneratedPackages = import ./pkgs/python-packages.nix { | |
164 |
inherit |
|
169 | inherit | |
165 | inherit (pkgs) fetchurl fetchgit fetchhg; |
|
170 | pkgs; | |
|
171 | inherit | |||
|
172 | (pkgs) | |||
|
173 | fetchurl | |||
|
174 | fetchgit | |||
|
175 | fetchhg; | |||
166 | }; |
|
176 | }; | |
167 |
|
177 | |||
168 | pythonVCSServerOverrides = import ./pkgs/python-packages-overrides.nix { |
|
178 | pythonVCSServerOverrides = import ./pkgs/python-packages-overrides.nix { | |
169 | inherit pkgs basePythonPackages; |
|
179 | inherit | |
|
180 | pkgs | |||
|
181 | basePythonPackages; | |||
170 | }; |
|
182 | }; | |
171 |
|
183 | |||
172 |
|
184 |
General Comments 0
You need to be logged in to leave comments.
Login now