Show More
@@ -1,34 +1,14 b'' | |||
|
1 | 1 | { pkgs ? (import <nixpkgs> {}) |
|
2 | , vcsserverPath ? "./../rhodecode-vcsserver" | |
|
3 | , vcsserverNix ? "shell.nix" | |
|
2 | , pythonPackages ? "python27Packages" | |
|
4 | 3 | , doCheck ? true |
|
4 | , doDevelopInstall ? true | |
|
5 | 5 | }: |
|
6 | 6 | |
|
7 | 7 | let |
|
8 | ||
|
9 | # Convert vcsserverPath to absolute path. | |
|
10 | vcsserverAbsPath = | |
|
11 | if pkgs.lib.strings.hasPrefix "/" vcsserverPath then | |
|
12 | builtins.toPath "${vcsserverPath}" | |
|
13 | else | |
|
14 | builtins.toPath ("${builtins.getEnv "PWD"}/${vcsserverPath}"); | |
|
15 | ||
|
16 | # Import vcsserver if nix file exists, otherwise set it to null. | |
|
17 | vcsserver = | |
|
18 | let | |
|
19 | nixFile = "${vcsserverAbsPath}/${vcsserverNix}"; | |
|
20 | in | |
|
21 | if pkgs.lib.pathExists "${nixFile}" then | |
|
22 | builtins.trace | |
|
23 | "Using local vcsserver from ${nixFile}" | |
|
24 | import "${nixFile}" {inherit pkgs;} | |
|
25 | else | |
|
26 | null; | |
|
27 | ||
|
28 | hasVcsserver = !isNull vcsserver; | |
|
8 | sources = pkgs.config.rc.sources or {}; | |
|
29 | 9 | |
|
30 | 10 | enterprise-ce = import ./default.nix { |
|
31 | inherit pkgs doCheck; | |
|
11 | inherit pkgs pythonPackages doCheck; | |
|
32 | 12 | }; |
|
33 | 13 | |
|
34 | 14 | ce-pythonPackages = enterprise-ce.pythonPackages; |
@@ -73,7 +53,7 b' in enterprise-ce.override (attrs: {' | |||
|
73 | 53 | |
|
74 | 54 | buildInputs = |
|
75 | 55 | attrs.buildInputs ++ |
|
76 | pkgs.lib.optionals (hasVcsserver) vcsserver.propagatedNativeBuildInputs ++ | |
|
56 | pkgs.lib.lists.concatMap optionalDevelopInstallBuildInputs developInstalls ++ | |
|
77 | 57 | (with ce-pythonPackages; [ |
|
78 | 58 | bumpversion |
|
79 | 59 | invoke |
@@ -83,21 +63,19 b' in enterprise-ce.override (attrs: {' | |||
|
83 | 63 | # Somewhat snappier setup of the development environment |
|
84 | 64 | # TODO: think of supporting a stable path again, so that multiple shells |
|
85 | 65 | # can share it. |
|
86 | postShellHook = '' | |
|
66 | preShellHook = enterprise-ce.linkNodeAndBowerPackages + '' | |
|
87 | 67 | # Custom prompt to distinguish from other dev envs. |
|
88 | 68 | export PS1="\n\[\033[1;32m\][CE-shell:\w]$\[\033[0m\] " |
|
89 | 69 | |
|
70 | # Setup a temporary directory. | |
|
90 | 71 | tmp_path=$(mktemp -d) |
|
91 | 72 | export PATH="$tmp_path/bin:$PATH" |
|
92 | 73 | export PYTHONPATH="$tmp_path/${ce-pythonPackages.python.sitePackages}:$PYTHONPATH" |
|
93 | 74 | mkdir -p $tmp_path/${ce-pythonPackages.python.sitePackages} |
|
75 | ||
|
76 | # Develop installations | |
|
94 | 77 | python setup.py develop --prefix $tmp_path --allow-hosts "" |
|
95 | '' + enterprise-ce.linkNodeAndBowerPackages + | |
|
96 | pkgs.lib.strings.optionalString (hasVcsserver) '' | |
|
97 | # Setup the vcsserver development egg. | |
|
98 | pushd ${vcsserverAbsPath} | |
|
99 | python setup.py develop --prefix $tmp_path --allow-hosts "" | |
|
100 | popd | |
|
101 | ''; | |
|
78 | echo "Additional develop installs" | |
|
79 | '' + pkgs.lib.strings.concatMapStrings optionalDevelopInstall developInstalls; | |
|
102 | 80 | |
|
103 | 81 | }) |
General Comments 0
You need to be logged in to leave comments.
Login now