Show More
@@ -49,23 +49,10 b' let' | |||
|
49 | 49 | sources = pkgs.config.rc.sources or {}; |
|
50 | 50 | rhodecode-enterprise-ce-src = builtins.filterSource src-filter ./.; |
|
51 | 51 | |
|
52 | # Load the generated node packages | |
|
53 | nodePackages = pkgs.callPackage "${pkgs.path}/pkgs/top-level/node-packages.nix" rec { | |
|
54 | self = nodePackages; | |
|
55 | generated = pkgs.callPackage ./pkgs/node-packages.nix { inherit self; }; | |
|
52 | nodeEnv = import ./pkgs/node-default.nix { | |
|
53 | inherit pkgs; | |
|
56 | 54 | }; |
|
57 | ||
|
58 | # TODO: Should be taken automatically out of the generates packages. | |
|
59 | # apps.nix has one solution for this, although I'd prefer to have the deps | |
|
60 | # from package.json mapped in here. | |
|
61 | nodeDependencies = with nodePackages; [ | |
|
62 | grunt | |
|
63 | grunt-contrib-concat | |
|
64 | grunt-contrib-jshint | |
|
65 | grunt-contrib-less | |
|
66 | grunt-contrib-watch | |
|
67 | jshint | |
|
68 | ]; | |
|
55 | nodeDependencies = nodeEnv.shell.nodeDependencies; | |
|
69 | 56 | |
|
70 | 57 | pythonGeneratedPackages = self: basePythonPackages.override (a: { |
|
71 | 58 | inherit self; |
@@ -89,12 +76,14 b' let' | |||
|
89 | 76 | version = builtins.readFile ./rhodecode/VERSION; |
|
90 | 77 | linkNodeModules = '' |
|
91 | 78 | echo "Link node packages" |
|
92 | # TODO: check if this adds stuff as a dependency, closure size | |
|
93 | 79 | rm -fr node_modules |
|
94 |
mkdir |
|
|
95 | ${pkgs.lib.concatMapStrings (dep: '' | |
|
96 | ln -sfv ${dep}/lib/node_modules/${dep.pkgName} node_modules/ | |
|
97 | '') nodeDependencies} | |
|
80 | mkdir node_modules | |
|
81 | ||
|
82 | # johbo: Linking individual packages allows us to run "npm install" | |
|
83 | # inside of a shell to try things out. Re-entering the shell will | |
|
84 | # restore a clean environment. | |
|
85 | ln -s ${nodeDependencies}/lib/node_modules/* node_modules/ | |
|
86 | ||
|
98 | 87 | echo "DONE: Link node packages" |
|
99 | 88 | ''; |
|
100 | 89 | in super.rhodecode-enterprise-ce.override (attrs: { |
General Comments 0
You need to be logged in to leave comments.
Login now