##// END OF EJS Templates
nix: Use vcsserver from config instead of using command line argument.
Martin Bornhold -
r1132:b75aafd5 default
parent child Browse files
Show More
@@ -1,34 +1,14 b''
1 { pkgs ? (import <nixpkgs> {})
1 { pkgs ? (import <nixpkgs> {})
2 , vcsserverPath ? "./../rhodecode-vcsserver"
2 , pythonPackages ? "python27Packages"
3 , vcsserverNix ? "shell.nix"
4 , doCheck ? true
3 , doCheck ? true
4 , doDevelopInstall ? true
5 }:
5 }:
6
6
7 let
7 let
8
8 sources = pkgs.config.rc.sources or {};
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;
29
9
30 enterprise-ce = import ./default.nix {
10 enterprise-ce = import ./default.nix {
31 inherit pkgs doCheck;
11 inherit pkgs pythonPackages doCheck;
32 };
12 };
33
13
34 ce-pythonPackages = enterprise-ce.pythonPackages;
14 ce-pythonPackages = enterprise-ce.pythonPackages;
@@ -73,7 +53,7 b' in enterprise-ce.override (attrs: {'
73
53
74 buildInputs =
54 buildInputs =
75 attrs.buildInputs ++
55 attrs.buildInputs ++
76 pkgs.lib.optionals (hasVcsserver) vcsserver.propagatedNativeBuildInputs ++
56 pkgs.lib.lists.concatMap optionalDevelopInstallBuildInputs developInstalls ++
77 (with ce-pythonPackages; [
57 (with ce-pythonPackages; [
78 bumpversion
58 bumpversion
79 invoke
59 invoke
@@ -83,21 +63,19 b' in enterprise-ce.override (attrs: {'
83 # Somewhat snappier setup of the development environment
63 # Somewhat snappier setup of the development environment
84 # TODO: think of supporting a stable path again, so that multiple shells
64 # TODO: think of supporting a stable path again, so that multiple shells
85 # can share it.
65 # can share it.
86 postShellHook = ''
66 preShellHook = enterprise-ce.linkNodeAndBowerPackages + ''
87 # Custom prompt to distinguish from other dev envs.
67 # Custom prompt to distinguish from other dev envs.
88 export PS1="\n\[\033[1;32m\][CE-shell:\w]$\[\033[0m\] "
68 export PS1="\n\[\033[1;32m\][CE-shell:\w]$\[\033[0m\] "
89
69
70 # Setup a temporary directory.
90 tmp_path=$(mktemp -d)
71 tmp_path=$(mktemp -d)
91 export PATH="$tmp_path/bin:$PATH"
72 export PATH="$tmp_path/bin:$PATH"
92 export PYTHONPATH="$tmp_path/${ce-pythonPackages.python.sitePackages}:$PYTHONPATH"
73 export PYTHONPATH="$tmp_path/${ce-pythonPackages.python.sitePackages}:$PYTHONPATH"
93 mkdir -p $tmp_path/${ce-pythonPackages.python.sitePackages}
74 mkdir -p $tmp_path/${ce-pythonPackages.python.sitePackages}
75
76 # Develop installations
94 python setup.py develop --prefix $tmp_path --allow-hosts ""
77 python setup.py develop --prefix $tmp_path --allow-hosts ""
95 '' + enterprise-ce.linkNodeAndBowerPackages +
78 echo "Additional develop installs"
96 pkgs.lib.strings.optionalString (hasVcsserver) ''
79 '' + pkgs.lib.strings.concatMapStrings optionalDevelopInstall developInstalls;
97 # Setup the vcsserver development egg.
98 pushd ${vcsserverAbsPath}
99 python setup.py develop --prefix $tmp_path --allow-hosts ""
100 popd
101 '';
102
80
103 })
81 })
General Comments 0
You need to be logged in to leave comments. Login now