Show More
@@ -62,7 +62,11 b' let' | |||||
62 |
|
62 | |||
63 | sources = |
|
63 | sources = | |
64 | let |
|
64 | let | |
65 | inherit (pkgs.lib) all isString attrValues; |
|
65 | inherit | |
|
66 | (pkgs.lib) | |||
|
67 | all | |||
|
68 | isString | |||
|
69 | attrValues; | |||
66 | sourcesConfig = pkgs.config.rc.sources or {}; |
|
70 | sourcesConfig = pkgs.config.rc.sources or {}; | |
67 | in |
|
71 | in | |
68 | # Ensure that sources are configured as strings. Using a path |
|
72 | # Ensure that sources are configured as strings. Using a path | |
@@ -75,7 +79,8 b' let' | |||||
75 |
|
79 | |||
76 | buildBowerComponents = pkgs.buildBowerComponents; |
|
80 | buildBowerComponents = pkgs.buildBowerComponents; | |
77 | nodeEnv = import ./pkgs/node-default.nix { |
|
81 | nodeEnv = import ./pkgs/node-default.nix { | |
78 |
inherit |
|
82 | inherit | |
|
83 | pkgs; | |||
79 | }; |
|
84 | }; | |
80 | nodeDependencies = nodeEnv.shell.nodeDependencies; |
|
85 | nodeDependencies = nodeEnv.shell.nodeDependencies; | |
81 |
|
86 | |||
@@ -261,8 +266,13 b' let' | |||||
261 | getAttr pythonPackages pkgs; |
|
266 | getAttr pythonPackages pkgs; | |
262 |
|
267 | |||
263 | pythonGeneratedPackages = import ./pkgs/python-packages.nix { |
|
268 | pythonGeneratedPackages = import ./pkgs/python-packages.nix { | |
264 |
inherit |
|
269 | inherit | |
265 | inherit (pkgs) fetchurl fetchgit fetchhg; |
|
270 | pkgs; | |
|
271 | inherit | |||
|
272 | (pkgs) | |||
|
273 | fetchurl | |||
|
274 | fetchgit | |||
|
275 | fetchhg; | |||
266 | }; |
|
276 | }; | |
267 |
|
277 | |||
268 | pythonCommunityOverrides = import ./pkgs/python-packages-overrides.nix { |
|
278 | pythonCommunityOverrides = import ./pkgs/python-packages-overrides.nix { |
@@ -50,7 +50,10 b' let' | |||||
50 | nixFile = "${path}/default.nix"; |
|
50 | nixFile = "${path}/default.nix"; | |
51 |
|
51 | |||
52 | derivate = import "${nixFile}" { |
|
52 | derivate = import "${nixFile}" { | |
53 | inherit doCheck pkgs pythonPackages; |
|
53 | inherit | |
|
54 | doCheck | |||
|
55 | pkgs | |||
|
56 | pythonPackages; | |||
54 | }; |
|
57 | }; | |
55 | in |
|
58 | in | |
56 | pkgs.lib.lists.optionals doIt ( |
|
59 | pkgs.lib.lists.optionals doIt ( |
General Comments 0
You need to be logged in to leave comments.
Login now