##// END OF EJS Templates
release: Merge default into stable for release preparation
marcink -
r37:897dca31 merge stable
parent child
Show More
@@ -1,6 +1,6
1 [bumpversion]
1 [bumpversion]
2 current_version = 4.1.2
2 current_version = 4.2.0
3 message = release: Bump version {current_version} to {new_version}
3 message = release: Bump version {current_version} to {new_version}
4
4
5 [bumpversion:file:vcsserver/VERSION]
5 [bumpversion:file:vcsserver/VERSION]
6
6
@@ -1,16 +1,14
1 [DEFAULT]
1 [DEFAULT]
2 done = false
2 done = false
3
3
4 [task:bump_version]
4 [task:bump_version]
5 done = true
5 done = true
6
6
7 [task:fixes_on_stable]
7 [task:fixes_on_stable]
8 done = true
9
8
10 [task:pip2nix_generated]
9 [task:pip2nix_generated]
11 done = true
12
10
13 [release]
11 [release]
14 state = prepared
12 state = in_progress
15 version = 4.1.2
13 version = 4.2.0
16
14
@@ -1,144 +1,145
1 # Nix environment for the community edition
1 # Nix environment for the community edition
2 #
2 #
3 # This shall be as lean as possible, just producing the rhodecode-vcsserver
3 # This shall be as lean as possible, just producing the rhodecode-vcsserver
4 # derivation. For advanced tweaks to pimp up the development environment we use
4 # derivation. For advanced tweaks to pimp up the development environment we use
5 # "shell.nix" so that it does not have to clutter this file.
5 # "shell.nix" so that it does not have to clutter this file.
6
6
7 { pkgs ? (import <nixpkgs> {})
7 { pkgs ? (import <nixpkgs> {})
8 , pythonPackages ? "python27Packages"
8 , pythonPackages ? "python27Packages"
9 , pythonExternalOverrides ? self: super: {}
9 , pythonExternalOverrides ? self: super: {}
10 , doCheck ? true
10 , doCheck ? true
11 }:
11 }:
12
12
13 let pkgs_ = pkgs; in
13 let pkgs_ = pkgs; in
14
14
15 let
15 let
16 pkgs = pkgs_.overridePackages (self: super: {
16 pkgs = pkgs_.overridePackages (self: super: {
17 # Override subversion derivation to
17 # Override subversion derivation to
18 # - activate python bindings
18 # - activate python bindings
19 # - set version to 1.8
19 # - set version to 1.8
20 subversion = super.subversion18.override {
20 subversion = super.subversion18.override {
21 httpSupport = true;
21 httpSupport = true;
22 pythonBindings = true;
22 pythonBindings = true;
23 python = self.python27Packages.python;
23 python = self.python27Packages.python;
24 };
24 };
25 });
25 });
26
26
27 inherit (pkgs.lib) fix extends;
27 inherit (pkgs.lib) fix extends;
28
28
29 basePythonPackages = with builtins; if isAttrs pythonPackages
29 basePythonPackages = with builtins; if isAttrs pythonPackages
30 then pythonPackages
30 then pythonPackages
31 else getAttr pythonPackages pkgs;
31 else getAttr pythonPackages pkgs;
32
32
33 elem = builtins.elem;
33 elem = builtins.elem;
34 basename = path: with pkgs.lib; last (splitString "/" path);
34 basename = path: with pkgs.lib; last (splitString "/" path);
35 startsWith = prefix: full: let
35 startsWith = prefix: full: let
36 actualPrefix = builtins.substring 0 (builtins.stringLength prefix) full;
36 actualPrefix = builtins.substring 0 (builtins.stringLength prefix) full;
37 in actualPrefix == prefix;
37 in actualPrefix == prefix;
38
38
39 src-filter = path: type: with pkgs.lib;
39 src-filter = path: type: with pkgs.lib;
40 let
40 let
41 ext = last (splitString "." path);
41 ext = last (splitString "." path);
42 in
42 in
43 !elem (basename path) [
43 !elem (basename path) [
44 ".git" ".hg" "__pycache__" ".eggs" "node_modules"
44 ".git" ".hg" "__pycache__" ".eggs" "node_modules"
45 "build" "data" "tmp"] &&
45 "build" "data" "tmp"] &&
46 !elem ext ["egg-info" "pyc"] &&
46 !elem ext ["egg-info" "pyc"] &&
47 !startsWith "result" path;
47 !startsWith "result" path;
48
48
49 rhodecode-vcsserver-src = builtins.filterSource src-filter ./.;
49 rhodecode-vcsserver-src = builtins.filterSource src-filter ./.;
50
50
51 pythonGeneratedPackages = self: basePythonPackages.override (a: {
51 pythonGeneratedPackages = self: basePythonPackages.override (a: {
52 inherit self;
52 inherit self;
53 })
53 })
54 // (scopedImport {
54 // (scopedImport {
55 self = self;
55 self = self;
56 super = basePythonPackages;
56 super = basePythonPackages;
57 inherit pkgs;
57 inherit pkgs;
58 inherit (pkgs) fetchurl fetchgit;
58 inherit (pkgs) fetchurl fetchgit;
59 } ./pkgs/python-packages.nix);
59 } ./pkgs/python-packages.nix);
60
60
61 pythonOverrides = import ./pkgs/python-packages-overrides.nix {
61 pythonOverrides = import ./pkgs/python-packages-overrides.nix {
62 inherit
62 inherit
63 basePythonPackages
63 basePythonPackages
64 pkgs;
64 pkgs;
65 };
65 };
66
66
67 version = builtins.readFile ./vcsserver/VERSION;
67 version = builtins.readFile ./vcsserver/VERSION;
68
68
69 pythonLocalOverrides = self: super: {
69 pythonLocalOverrides = self: super: {
70 rhodecode-vcsserver = super.rhodecode-vcsserver.override (attrs: {
70 rhodecode-vcsserver = super.rhodecode-vcsserver.override (attrs: {
71 inherit
71 inherit
72 doCheck
72 doCheck
73 version;
73 version;
74 name = "rhodecode-vcsserver-${version}";
74 name = "rhodecode-vcsserver-${version}";
75 releaseName = "RhodeCodeVCSServer-${version}";
75 src = rhodecode-vcsserver-src;
76 src = rhodecode-vcsserver-src;
76
77
77 propagatedBuildInputs = attrs.propagatedBuildInputs ++ ([
78 propagatedBuildInputs = attrs.propagatedBuildInputs ++ ([
78 pkgs.git
79 pkgs.git
79 pkgs.subversion
80 pkgs.subversion
80 ]);
81 ]);
81
82
82 # TODO: johbo: Make a nicer way to expose the parts. Maybe
83 # TODO: johbo: Make a nicer way to expose the parts. Maybe
83 # pkgs/default.nix?
84 # pkgs/default.nix?
84 passthru = {
85 passthru = {
85 pythonPackages = self;
86 pythonPackages = self;
86 };
87 };
87
88
88 # Somewhat snappier setup of the development environment
89 # Somewhat snappier setup of the development environment
89 # TODO: move into shell.nix
90 # TODO: move into shell.nix
90 # TODO: think of supporting a stable path again, so that multiple shells
91 # TODO: think of supporting a stable path again, so that multiple shells
91 # can share it.
92 # can share it.
92 shellHook = ''
93 shellHook = ''
93 # Set locale
94 # Set locale
94 export LC_ALL="en_US.UTF-8"
95 export LC_ALL="en_US.UTF-8"
95
96
96 tmp_path=$(mktemp -d)
97 tmp_path=$(mktemp -d)
97 export PATH="$tmp_path/bin:$PATH"
98 export PATH="$tmp_path/bin:$PATH"
98 export PYTHONPATH="$tmp_path/${self.python.sitePackages}:$PYTHONPATH"
99 export PYTHONPATH="$tmp_path/${self.python.sitePackages}:$PYTHONPATH"
99 mkdir -p $tmp_path/${self.python.sitePackages}
100 mkdir -p $tmp_path/${self.python.sitePackages}
100 python setup.py develop --prefix $tmp_path --allow-hosts ""
101 python setup.py develop --prefix $tmp_path --allow-hosts ""
101 '';
102 '';
102
103
103 # Add VCSServer bin directory to path so that tests can find 'vcsserver'.
104 # Add VCSServer bin directory to path so that tests can find 'vcsserver'.
104 preCheck = ''
105 preCheck = ''
105 export PATH="$out/bin:$PATH"
106 export PATH="$out/bin:$PATH"
106 '';
107 '';
107
108
108 postInstall = ''
109 postInstall = ''
109 echo "Writing meta information for rccontrol to nix-support/rccontrol"
110 echo "Writing meta information for rccontrol to nix-support/rccontrol"
110 mkdir -p $out/nix-support/rccontrol
111 mkdir -p $out/nix-support/rccontrol
111 cp -v vcsserver/VERSION $out/nix-support/rccontrol/version
112 cp -v vcsserver/VERSION $out/nix-support/rccontrol/version
112 echo "DONE: Meta information for rccontrol written"
113 echo "DONE: Meta information for rccontrol written"
113
114
114 ln -s ${self.pyramid}/bin/* $out/bin #*/
115 ln -s ${self.pyramid}/bin/* $out/bin #*/
115 ln -s ${self.gunicorn}/bin/gunicorn $out/bin/
116 ln -s ${self.gunicorn}/bin/gunicorn $out/bin/
116
117
117 # Symlink version control utilities
118 # Symlink version control utilities
118 #
119 #
119 # We ensure that always the correct version is available as a symlink.
120 # We ensure that always the correct version is available as a symlink.
120 # So that users calling them via the profile path will always use the
121 # So that users calling them via the profile path will always use the
121 # correct version.
122 # correct version.
122 ln -s ${pkgs.git}/bin/git $out/bin
123 ln -s ${pkgs.git}/bin/git $out/bin
123 ln -s ${self.mercurial}/bin/hg $out/bin
124 ln -s ${self.mercurial}/bin/hg $out/bin
124 ln -s ${pkgs.subversion}/bin/svn* $out/bin
125 ln -s ${pkgs.subversion}/bin/svn* $out/bin
125
126
126 for file in $out/bin/*; do #*/
127 for file in $out/bin/*; do #*/
127 wrapProgram $file \
128 wrapProgram $file \
128 --prefix PYTHONPATH : $PYTHONPATH \
129 --prefix PYTHONPATH : $PYTHONPATH \
129 --set PYTHONHASHSEED random
130 --set PYTHONHASHSEED random
130 done
131 done
131 '';
132 '';
132
133
133 });
134 });
134 };
135 };
135
136
136 # Apply all overrides and fix the final package set
137 # Apply all overrides and fix the final package set
137 myPythonPackages =
138 myPythonPackages =
138 (fix
139 (fix
139 (extends pythonExternalOverrides
140 (extends pythonExternalOverrides
140 (extends pythonLocalOverrides
141 (extends pythonLocalOverrides
141 (extends pythonOverrides
142 (extends pythonOverrides
142 pythonGeneratedPackages))));
143 pythonGeneratedPackages))));
143
144
144 in myPythonPackages.rhodecode-vcsserver
145 in myPythonPackages.rhodecode-vcsserver
@@ -1,363 +1,363
1 {
1 {
2 Beaker = super.buildPythonPackage {
2 Beaker = super.buildPythonPackage {
3 name = "Beaker-1.7.0";
3 name = "Beaker-1.7.0";
4 buildInputs = with self; [];
4 buildInputs = with self; [];
5 doCheck = false;
5 doCheck = false;
6 propagatedBuildInputs = with self; [];
6 propagatedBuildInputs = with self; [];
7 src = fetchurl {
7 src = fetchurl {
8 url = "https://pypi.python.org/packages/97/8e/409d2e7c009b8aa803dc9e6f239f1db7c3cdf578249087a404e7c27a505d/Beaker-1.7.0.tar.gz";
8 url = "https://pypi.python.org/packages/97/8e/409d2e7c009b8aa803dc9e6f239f1db7c3cdf578249087a404e7c27a505d/Beaker-1.7.0.tar.gz";
9 md5 = "386be3f7fe427358881eee4622b428b3";
9 md5 = "386be3f7fe427358881eee4622b428b3";
10 };
10 };
11 };
11 };
12 Jinja2 = super.buildPythonPackage {
12 Jinja2 = super.buildPythonPackage {
13 name = "Jinja2-2.8";
13 name = "Jinja2-2.8";
14 buildInputs = with self; [];
14 buildInputs = with self; [];
15 doCheck = false;
15 doCheck = false;
16 propagatedBuildInputs = with self; [MarkupSafe];
16 propagatedBuildInputs = with self; [MarkupSafe];
17 src = fetchurl {
17 src = fetchurl {
18 url = "https://pypi.python.org/packages/f2/2f/0b98b06a345a761bec91a079ccae392d282690c2d8272e708f4d10829e22/Jinja2-2.8.tar.gz";
18 url = "https://pypi.python.org/packages/f2/2f/0b98b06a345a761bec91a079ccae392d282690c2d8272e708f4d10829e22/Jinja2-2.8.tar.gz";
19 md5 = "edb51693fe22c53cee5403775c71a99e";
19 md5 = "edb51693fe22c53cee5403775c71a99e";
20 };
20 };
21 };
21 };
22 Mako = super.buildPythonPackage {
22 Mako = super.buildPythonPackage {
23 name = "Mako-1.0.4";
23 name = "Mako-1.0.4";
24 buildInputs = with self; [];
24 buildInputs = with self; [];
25 doCheck = false;
25 doCheck = false;
26 propagatedBuildInputs = with self; [MarkupSafe];
26 propagatedBuildInputs = with self; [MarkupSafe];
27 src = fetchurl {
27 src = fetchurl {
28 url = "https://pypi.python.org/packages/7a/ae/925434246ee90b42e8ef57d3b30a0ab7caf9a2de3e449b876c56dcb48155/Mako-1.0.4.tar.gz";
28 url = "https://pypi.python.org/packages/7a/ae/925434246ee90b42e8ef57d3b30a0ab7caf9a2de3e449b876c56dcb48155/Mako-1.0.4.tar.gz";
29 md5 = "c5fc31a323dd4990683d2f2da02d4e20";
29 md5 = "c5fc31a323dd4990683d2f2da02d4e20";
30 };
30 };
31 };
31 };
32 MarkupSafe = super.buildPythonPackage {
32 MarkupSafe = super.buildPythonPackage {
33 name = "MarkupSafe-0.23";
33 name = "MarkupSafe-0.23";
34 buildInputs = with self; [];
34 buildInputs = with self; [];
35 doCheck = false;
35 doCheck = false;
36 propagatedBuildInputs = with self; [];
36 propagatedBuildInputs = with self; [];
37 src = fetchurl {
37 src = fetchurl {
38 url = "https://pypi.python.org/packages/c0/41/bae1254e0396c0cc8cf1751cb7d9afc90a602353695af5952530482c963f/MarkupSafe-0.23.tar.gz";
38 url = "https://pypi.python.org/packages/c0/41/bae1254e0396c0cc8cf1751cb7d9afc90a602353695af5952530482c963f/MarkupSafe-0.23.tar.gz";
39 md5 = "f5ab3deee4c37cd6a922fb81e730da6e";
39 md5 = "f5ab3deee4c37cd6a922fb81e730da6e";
40 };
40 };
41 };
41 };
42 PasteDeploy = super.buildPythonPackage {
42 PasteDeploy = super.buildPythonPackage {
43 name = "PasteDeploy-1.5.2";
43 name = "PasteDeploy-1.5.2";
44 buildInputs = with self; [];
44 buildInputs = with self; [];
45 doCheck = false;
45 doCheck = false;
46 propagatedBuildInputs = with self; [];
46 propagatedBuildInputs = with self; [];
47 src = fetchurl {
47 src = fetchurl {
48 url = "https://pypi.python.org/packages/0f/90/8e20cdae206c543ea10793cbf4136eb9a8b3f417e04e40a29d72d9922cbd/PasteDeploy-1.5.2.tar.gz";
48 url = "https://pypi.python.org/packages/0f/90/8e20cdae206c543ea10793cbf4136eb9a8b3f417e04e40a29d72d9922cbd/PasteDeploy-1.5.2.tar.gz";
49 md5 = "352b7205c78c8de4987578d19431af3b";
49 md5 = "352b7205c78c8de4987578d19431af3b";
50 };
50 };
51 };
51 };
52 Pyro4 = super.buildPythonPackage {
52 Pyro4 = super.buildPythonPackage {
53 name = "Pyro4-4.41";
53 name = "Pyro4-4.41";
54 buildInputs = with self; [];
54 buildInputs = with self; [];
55 doCheck = false;
55 doCheck = false;
56 propagatedBuildInputs = with self; [serpent];
56 propagatedBuildInputs = with self; [serpent];
57 src = fetchurl {
57 src = fetchurl {
58 url = "https://pypi.python.org/packages/56/2b/89b566b4bf3e7f8ba790db2d1223852f8cb454c52cab7693dd41f608ca2a/Pyro4-4.41.tar.gz";
58 url = "https://pypi.python.org/packages/56/2b/89b566b4bf3e7f8ba790db2d1223852f8cb454c52cab7693dd41f608ca2a/Pyro4-4.41.tar.gz";
59 md5 = "ed69e9bfafa9c06c049a87cb0c4c2b6c";
59 md5 = "ed69e9bfafa9c06c049a87cb0c4c2b6c";
60 };
60 };
61 };
61 };
62 WebOb = super.buildPythonPackage {
62 WebOb = super.buildPythonPackage {
63 name = "WebOb-1.3.1";
63 name = "WebOb-1.3.1";
64 buildInputs = with self; [];
64 buildInputs = with self; [];
65 doCheck = false;
65 doCheck = false;
66 propagatedBuildInputs = with self; [];
66 propagatedBuildInputs = with self; [];
67 src = fetchurl {
67 src = fetchurl {
68 url = "https://pypi.python.org/packages/16/78/adfc0380b8a0d75b2d543fa7085ba98a573b1ae486d9def88d172b81b9fa/WebOb-1.3.1.tar.gz";
68 url = "https://pypi.python.org/packages/16/78/adfc0380b8a0d75b2d543fa7085ba98a573b1ae486d9def88d172b81b9fa/WebOb-1.3.1.tar.gz";
69 md5 = "20918251c5726956ba8fef22d1556177";
69 md5 = "20918251c5726956ba8fef22d1556177";
70 };
70 };
71 };
71 };
72 WebTest = super.buildPythonPackage {
72 WebTest = super.buildPythonPackage {
73 name = "WebTest-1.4.3";
73 name = "WebTest-1.4.3";
74 buildInputs = with self; [];
74 buildInputs = with self; [];
75 doCheck = false;
75 doCheck = false;
76 propagatedBuildInputs = with self; [WebOb];
76 propagatedBuildInputs = with self; [WebOb];
77 src = fetchurl {
77 src = fetchurl {
78 url = "https://pypi.python.org/packages/51/3d/84fd0f628df10b30c7db87895f56d0158e5411206b721ca903cb51bfd948/WebTest-1.4.3.zip";
78 url = "https://pypi.python.org/packages/51/3d/84fd0f628df10b30c7db87895f56d0158e5411206b721ca903cb51bfd948/WebTest-1.4.3.zip";
79 md5 = "631ce728bed92c681a4020a36adbc353";
79 md5 = "631ce728bed92c681a4020a36adbc353";
80 };
80 };
81 };
81 };
82 configobj = super.buildPythonPackage {
82 configobj = super.buildPythonPackage {
83 name = "configobj-5.0.6";
83 name = "configobj-5.0.6";
84 buildInputs = with self; [];
84 buildInputs = with self; [];
85 doCheck = false;
85 doCheck = false;
86 propagatedBuildInputs = with self; [six];
86 propagatedBuildInputs = with self; [six];
87 src = fetchurl {
87 src = fetchurl {
88 url = "https://pypi.python.org/packages/64/61/079eb60459c44929e684fa7d9e2fdca403f67d64dd9dbac27296be2e0fab/configobj-5.0.6.tar.gz";
88 url = "https://pypi.python.org/packages/64/61/079eb60459c44929e684fa7d9e2fdca403f67d64dd9dbac27296be2e0fab/configobj-5.0.6.tar.gz";
89 md5 = "e472a3a1c2a67bb0ec9b5d54c13a47d6";
89 md5 = "e472a3a1c2a67bb0ec9b5d54c13a47d6";
90 };
90 };
91 };
91 };
92 dulwich = super.buildPythonPackage {
92 dulwich = super.buildPythonPackage {
93 name = "dulwich-0.12.0";
93 name = "dulwich-0.13.0";
94 buildInputs = with self; [];
94 buildInputs = with self; [];
95 doCheck = false;
95 doCheck = false;
96 propagatedBuildInputs = with self; [];
96 propagatedBuildInputs = with self; [];
97 src = fetchurl {
97 src = fetchurl {
98 url = "https://pypi.python.org/packages/6f/04/fbe561b6d45c0ec758330d5b7f5ba4b6cb4f1ca1ab49859d2fc16320da75/dulwich-0.12.0.tar.gz";
98 url = "https://pypi.python.org/packages/84/95/732d280eee829dacc954e8109f97b47abcadcca472c2ab013e1635eb4792/dulwich-0.13.0.tar.gz";
99 md5 = "f3a8a12bd9f9dd8c233e18f3d49436fa";
99 md5 = "6dede0626657c2bd08f48ca1221eea91";
100 };
100 };
101 };
101 };
102 greenlet = super.buildPythonPackage {
102 greenlet = super.buildPythonPackage {
103 name = "greenlet-0.4.7";
103 name = "greenlet-0.4.7";
104 buildInputs = with self; [];
104 buildInputs = with self; [];
105 doCheck = false;
105 doCheck = false;
106 propagatedBuildInputs = with self; [];
106 propagatedBuildInputs = with self; [];
107 src = fetchurl {
107 src = fetchurl {
108 url = "https://pypi.python.org/packages/7a/9f/a1a0d9bdf3203ae1502c5a8434fe89d323599d78a106985bc327351a69d4/greenlet-0.4.7.zip";
108 url = "https://pypi.python.org/packages/7a/9f/a1a0d9bdf3203ae1502c5a8434fe89d323599d78a106985bc327351a69d4/greenlet-0.4.7.zip";
109 md5 = "c2333a8ff30fa75c5d5ec0e67b461086";
109 md5 = "c2333a8ff30fa75c5d5ec0e67b461086";
110 };
110 };
111 };
111 };
112 gunicorn = super.buildPythonPackage {
112 gunicorn = super.buildPythonPackage {
113 name = "gunicorn-19.6.0";
113 name = "gunicorn-19.6.0";
114 buildInputs = with self; [];
114 buildInputs = with self; [];
115 doCheck = false;
115 doCheck = false;
116 propagatedBuildInputs = with self; [];
116 propagatedBuildInputs = with self; [];
117 src = fetchurl {
117 src = fetchurl {
118 url = "https://pypi.python.org/packages/84/ce/7ea5396efad1cef682bbc4068e72a0276341d9d9d0f501da609fab9fcb80/gunicorn-19.6.0.tar.gz";
118 url = "https://pypi.python.org/packages/84/ce/7ea5396efad1cef682bbc4068e72a0276341d9d9d0f501da609fab9fcb80/gunicorn-19.6.0.tar.gz";
119 md5 = "338e5e8a83ea0f0625f768dba4597530";
119 md5 = "338e5e8a83ea0f0625f768dba4597530";
120 };
120 };
121 };
121 };
122 hgsubversion = super.buildPythonPackage {
122 hgsubversion = super.buildPythonPackage {
123 name = "hgsubversion-1.8.6";
123 name = "hgsubversion-1.8.6";
124 buildInputs = with self; [];
124 buildInputs = with self; [];
125 doCheck = false;
125 doCheck = false;
126 propagatedBuildInputs = with self; [mercurial subvertpy];
126 propagatedBuildInputs = with self; [mercurial subvertpy];
127 src = fetchurl {
127 src = fetchurl {
128 url = "https://pypi.python.org/packages/ce/97/032e5093ad250e9908cea04395cbddb6902d587f712a79b53b2d778bdfdd/hgsubversion-1.8.6.tar.gz";
128 url = "https://pypi.python.org/packages/ce/97/032e5093ad250e9908cea04395cbddb6902d587f712a79b53b2d778bdfdd/hgsubversion-1.8.6.tar.gz";
129 md5 = "9310cb266031cf8d0779885782a84a5b";
129 md5 = "9310cb266031cf8d0779885782a84a5b";
130 };
130 };
131 };
131 };
132 infrae.cache = super.buildPythonPackage {
132 infrae.cache = super.buildPythonPackage {
133 name = "infrae.cache-1.0.1";
133 name = "infrae.cache-1.0.1";
134 buildInputs = with self; [];
134 buildInputs = with self; [];
135 doCheck = false;
135 doCheck = false;
136 propagatedBuildInputs = with self; [Beaker repoze.lru];
136 propagatedBuildInputs = with self; [Beaker repoze.lru];
137 src = fetchurl {
137 src = fetchurl {
138 url = "https://pypi.python.org/packages/bb/f0/e7d5e984cf6592fd2807dc7bc44a93f9d18e04e6a61f87fdfb2622422d74/infrae.cache-1.0.1.tar.gz";
138 url = "https://pypi.python.org/packages/bb/f0/e7d5e984cf6592fd2807dc7bc44a93f9d18e04e6a61f87fdfb2622422d74/infrae.cache-1.0.1.tar.gz";
139 md5 = "b09076a766747e6ed2a755cc62088e32";
139 md5 = "b09076a766747e6ed2a755cc62088e32";
140 };
140 };
141 };
141 };
142 mercurial = super.buildPythonPackage {
142 mercurial = super.buildPythonPackage {
143 name = "mercurial-3.8.3";
143 name = "mercurial-3.8.3";
144 buildInputs = with self; [];
144 buildInputs = with self; [];
145 doCheck = false;
145 doCheck = false;
146 propagatedBuildInputs = with self; [];
146 propagatedBuildInputs = with self; [];
147 src = fetchurl {
147 src = fetchurl {
148 url = "https://pypi.python.org/packages/56/bc/af1561195d43638d44bc3ac286c21f187430966234bee1f235711d80dfb6/mercurial-3.8.3.tar.gz";
148 url = "https://pypi.python.org/packages/56/bc/af1561195d43638d44bc3ac286c21f187430966234bee1f235711d80dfb6/mercurial-3.8.3.tar.gz";
149 md5 = "97aced7018614eeccc9621a3dea35fda";
149 md5 = "97aced7018614eeccc9621a3dea35fda";
150 };
150 };
151 };
151 };
152 mock = super.buildPythonPackage {
152 mock = super.buildPythonPackage {
153 name = "mock-1.0.1";
153 name = "mock-1.0.1";
154 buildInputs = with self; [];
154 buildInputs = with self; [];
155 doCheck = false;
155 doCheck = false;
156 propagatedBuildInputs = with self; [];
156 propagatedBuildInputs = with self; [];
157 src = fetchurl {
157 src = fetchurl {
158 url = "https://pypi.python.org/packages/15/45/30273ee91feb60dabb8fbb2da7868520525f02cf910279b3047182feed80/mock-1.0.1.zip";
158 url = "https://pypi.python.org/packages/15/45/30273ee91feb60dabb8fbb2da7868520525f02cf910279b3047182feed80/mock-1.0.1.zip";
159 md5 = "869f08d003c289a97c1a6610faf5e913";
159 md5 = "869f08d003c289a97c1a6610faf5e913";
160 };
160 };
161 };
161 };
162 msgpack-python = super.buildPythonPackage {
162 msgpack-python = super.buildPythonPackage {
163 name = "msgpack-python-0.4.6";
163 name = "msgpack-python-0.4.6";
164 buildInputs = with self; [];
164 buildInputs = with self; [];
165 doCheck = false;
165 doCheck = false;
166 propagatedBuildInputs = with self; [];
166 propagatedBuildInputs = with self; [];
167 src = fetchurl {
167 src = fetchurl {
168 url = "https://pypi.python.org/packages/15/ce/ff2840885789ef8035f66cd506ea05bdb228340307d5e71a7b1e3f82224c/msgpack-python-0.4.6.tar.gz";
168 url = "https://pypi.python.org/packages/15/ce/ff2840885789ef8035f66cd506ea05bdb228340307d5e71a7b1e3f82224c/msgpack-python-0.4.6.tar.gz";
169 md5 = "8b317669314cf1bc881716cccdaccb30";
169 md5 = "8b317669314cf1bc881716cccdaccb30";
170 };
170 };
171 };
171 };
172 py = super.buildPythonPackage {
172 py = super.buildPythonPackage {
173 name = "py-1.4.29";
173 name = "py-1.4.29";
174 buildInputs = with self; [];
174 buildInputs = with self; [];
175 doCheck = false;
175 doCheck = false;
176 propagatedBuildInputs = with self; [];
176 propagatedBuildInputs = with self; [];
177 src = fetchurl {
177 src = fetchurl {
178 url = "https://pypi.python.org/packages/2a/bc/a1a4a332ac10069b8e5e25136a35e08a03f01fd6ab03d819889d79a1fd65/py-1.4.29.tar.gz";
178 url = "https://pypi.python.org/packages/2a/bc/a1a4a332ac10069b8e5e25136a35e08a03f01fd6ab03d819889d79a1fd65/py-1.4.29.tar.gz";
179 md5 = "c28e0accba523a29b35a48bb703fb96c";
179 md5 = "c28e0accba523a29b35a48bb703fb96c";
180 };
180 };
181 };
181 };
182 pyramid = super.buildPythonPackage {
182 pyramid = super.buildPythonPackage {
183 name = "pyramid-1.6.1";
183 name = "pyramid-1.6.1";
184 buildInputs = with self; [];
184 buildInputs = with self; [];
185 doCheck = false;
185 doCheck = false;
186 propagatedBuildInputs = with self; [setuptools WebOb repoze.lru zope.interface zope.deprecation venusian translationstring PasteDeploy];
186 propagatedBuildInputs = with self; [setuptools WebOb repoze.lru zope.interface zope.deprecation venusian translationstring PasteDeploy];
187 src = fetchurl {
187 src = fetchurl {
188 url = "https://pypi.python.org/packages/30/b3/fcc4a2a4800cbf21989e00454b5828cf1f7fe35c63e0810b350e56d4c475/pyramid-1.6.1.tar.gz";
188 url = "https://pypi.python.org/packages/30/b3/fcc4a2a4800cbf21989e00454b5828cf1f7fe35c63e0810b350e56d4c475/pyramid-1.6.1.tar.gz";
189 md5 = "b18688ff3cc33efdbb098a35b45dd122";
189 md5 = "b18688ff3cc33efdbb098a35b45dd122";
190 };
190 };
191 };
191 };
192 pyramid-jinja2 = super.buildPythonPackage {
192 pyramid-jinja2 = super.buildPythonPackage {
193 name = "pyramid-jinja2-2.5";
193 name = "pyramid-jinja2-2.5";
194 buildInputs = with self; [];
194 buildInputs = with self; [];
195 doCheck = false;
195 doCheck = false;
196 propagatedBuildInputs = with self; [pyramid zope.deprecation Jinja2 MarkupSafe];
196 propagatedBuildInputs = with self; [pyramid zope.deprecation Jinja2 MarkupSafe];
197 src = fetchurl {
197 src = fetchurl {
198 url = "https://pypi.python.org/packages/a1/80/595e26ffab7deba7208676b6936b7e5a721875710f982e59899013cae1ed/pyramid_jinja2-2.5.tar.gz";
198 url = "https://pypi.python.org/packages/a1/80/595e26ffab7deba7208676b6936b7e5a721875710f982e59899013cae1ed/pyramid_jinja2-2.5.tar.gz";
199 md5 = "07cb6547204ac5e6f0b22a954ccee928";
199 md5 = "07cb6547204ac5e6f0b22a954ccee928";
200 };
200 };
201 };
201 };
202 pyramid-mako = super.buildPythonPackage {
202 pyramid-mako = super.buildPythonPackage {
203 name = "pyramid-mako-1.0.2";
203 name = "pyramid-mako-1.0.2";
204 buildInputs = with self; [];
204 buildInputs = with self; [];
205 doCheck = false;
205 doCheck = false;
206 propagatedBuildInputs = with self; [pyramid Mako];
206 propagatedBuildInputs = with self; [pyramid Mako];
207 src = fetchurl {
207 src = fetchurl {
208 url = "https://pypi.python.org/packages/f1/92/7e69bcf09676d286a71cb3bbb887b16595b96f9ba7adbdc239ffdd4b1eb9/pyramid_mako-1.0.2.tar.gz";
208 url = "https://pypi.python.org/packages/f1/92/7e69bcf09676d286a71cb3bbb887b16595b96f9ba7adbdc239ffdd4b1eb9/pyramid_mako-1.0.2.tar.gz";
209 md5 = "ee25343a97eb76bd90abdc2a774eb48a";
209 md5 = "ee25343a97eb76bd90abdc2a774eb48a";
210 };
210 };
211 };
211 };
212 pytest = super.buildPythonPackage {
212 pytest = super.buildPythonPackage {
213 name = "pytest-2.8.5";
213 name = "pytest-2.8.5";
214 buildInputs = with self; [];
214 buildInputs = with self; [];
215 doCheck = false;
215 doCheck = false;
216 propagatedBuildInputs = with self; [py];
216 propagatedBuildInputs = with self; [py];
217 src = fetchurl {
217 src = fetchurl {
218 url = "https://pypi.python.org/packages/b1/3d/d7ea9b0c51e0cacded856e49859f0a13452747491e842c236bbab3714afe/pytest-2.8.5.zip";
218 url = "https://pypi.python.org/packages/b1/3d/d7ea9b0c51e0cacded856e49859f0a13452747491e842c236bbab3714afe/pytest-2.8.5.zip";
219 md5 = "8493b06f700862f1294298d6c1b715a9";
219 md5 = "8493b06f700862f1294298d6c1b715a9";
220 };
220 };
221 };
221 };
222 repoze.lru = super.buildPythonPackage {
222 repoze.lru = super.buildPythonPackage {
223 name = "repoze.lru-0.6";
223 name = "repoze.lru-0.6";
224 buildInputs = with self; [];
224 buildInputs = with self; [];
225 doCheck = false;
225 doCheck = false;
226 propagatedBuildInputs = with self; [];
226 propagatedBuildInputs = with self; [];
227 src = fetchurl {
227 src = fetchurl {
228 url = "https://pypi.python.org/packages/6e/1e/aa15cc90217e086dc8769872c8778b409812ff036bf021b15795638939e4/repoze.lru-0.6.tar.gz";
228 url = "https://pypi.python.org/packages/6e/1e/aa15cc90217e086dc8769872c8778b409812ff036bf021b15795638939e4/repoze.lru-0.6.tar.gz";
229 md5 = "2c3b64b17a8e18b405f55d46173e14dd";
229 md5 = "2c3b64b17a8e18b405f55d46173e14dd";
230 };
230 };
231 };
231 };
232 rhodecode-vcsserver = super.buildPythonPackage {
232 rhodecode-vcsserver = super.buildPythonPackage {
233 name = "rhodecode-vcsserver-4.1.2";
233 name = "rhodecode-vcsserver-4.1.2";
234 buildInputs = with self; [mock pytest WebTest];
234 buildInputs = with self; [mock pytest WebTest];
235 doCheck = true;
235 doCheck = true;
236 propagatedBuildInputs = with self; [configobj dulwich hgsubversion infrae.cache mercurial msgpack-python pyramid Pyro4 simplejson subprocess32 waitress WebOb];
236 propagatedBuildInputs = with self; [configobj dulwich hgsubversion infrae.cache mercurial msgpack-python pyramid Pyro4 simplejson subprocess32 waitress WebOb];
237 src = ./.;
237 src = ./.;
238 };
238 };
239 serpent = super.buildPythonPackage {
239 serpent = super.buildPythonPackage {
240 name = "serpent-1.12";
240 name = "serpent-1.12";
241 buildInputs = with self; [];
241 buildInputs = with self; [];
242 doCheck = false;
242 doCheck = false;
243 propagatedBuildInputs = with self; [];
243 propagatedBuildInputs = with self; [];
244 src = fetchurl {
244 src = fetchurl {
245 url = "https://pypi.python.org/packages/3b/19/1e0e83b47c09edaef8398655088036e7e67386b5c48770218ebb339fbbd5/serpent-1.12.tar.gz";
245 url = "https://pypi.python.org/packages/3b/19/1e0e83b47c09edaef8398655088036e7e67386b5c48770218ebb339fbbd5/serpent-1.12.tar.gz";
246 md5 = "05869ac7b062828b34f8f927f0457b65";
246 md5 = "05869ac7b062828b34f8f927f0457b65";
247 };
247 };
248 };
248 };
249 setuptools = super.buildPythonPackage {
249 setuptools = super.buildPythonPackage {
250 name = "setuptools-20.8.1";
250 name = "setuptools-20.8.1";
251 buildInputs = with self; [];
251 buildInputs = with self; [];
252 doCheck = false;
252 doCheck = false;
253 propagatedBuildInputs = with self; [];
253 propagatedBuildInputs = with self; [];
254 src = fetchurl {
254 src = fetchurl {
255 url = "https://pypi.python.org/packages/c4/19/c1bdc88b53da654df43770f941079dbab4e4788c2dcb5658fb86259894c7/setuptools-20.8.1.zip";
255 url = "https://pypi.python.org/packages/c4/19/c1bdc88b53da654df43770f941079dbab4e4788c2dcb5658fb86259894c7/setuptools-20.8.1.zip";
256 md5 = "fe58a5cac0df20bb83942b252a4b0543";
256 md5 = "fe58a5cac0df20bb83942b252a4b0543";
257 };
257 };
258 };
258 };
259 simplejson = super.buildPythonPackage {
259 simplejson = super.buildPythonPackage {
260 name = "simplejson-3.7.2";
260 name = "simplejson-3.7.2";
261 buildInputs = with self; [];
261 buildInputs = with self; [];
262 doCheck = false;
262 doCheck = false;
263 propagatedBuildInputs = with self; [];
263 propagatedBuildInputs = with self; [];
264 src = fetchurl {
264 src = fetchurl {
265 url = "https://pypi.python.org/packages/6d/89/7f13f099344eea9d6722779a1f165087cb559598107844b1ac5dbd831fb1/simplejson-3.7.2.tar.gz";
265 url = "https://pypi.python.org/packages/6d/89/7f13f099344eea9d6722779a1f165087cb559598107844b1ac5dbd831fb1/simplejson-3.7.2.tar.gz";
266 md5 = "a5fc7d05d4cb38492285553def5d4b46";
266 md5 = "a5fc7d05d4cb38492285553def5d4b46";
267 };
267 };
268 };
268 };
269 six = super.buildPythonPackage {
269 six = super.buildPythonPackage {
270 name = "six-1.9.0";
270 name = "six-1.9.0";
271 buildInputs = with self; [];
271 buildInputs = with self; [];
272 doCheck = false;
272 doCheck = false;
273 propagatedBuildInputs = with self; [];
273 propagatedBuildInputs = with self; [];
274 src = fetchurl {
274 src = fetchurl {
275 url = "https://pypi.python.org/packages/16/64/1dc5e5976b17466fd7d712e59cbe9fb1e18bec153109e5ba3ed6c9102f1a/six-1.9.0.tar.gz";
275 url = "https://pypi.python.org/packages/16/64/1dc5e5976b17466fd7d712e59cbe9fb1e18bec153109e5ba3ed6c9102f1a/six-1.9.0.tar.gz";
276 md5 = "476881ef4012262dfc8adc645ee786c4";
276 md5 = "476881ef4012262dfc8adc645ee786c4";
277 };
277 };
278 };
278 };
279 subprocess32 = super.buildPythonPackage {
279 subprocess32 = super.buildPythonPackage {
280 name = "subprocess32-3.2.6";
280 name = "subprocess32-3.2.6";
281 buildInputs = with self; [];
281 buildInputs = with self; [];
282 doCheck = false;
282 doCheck = false;
283 propagatedBuildInputs = with self; [];
283 propagatedBuildInputs = with self; [];
284 src = fetchurl {
284 src = fetchurl {
285 url = "https://pypi.python.org/packages/28/8d/33ccbff51053f59ae6c357310cac0e79246bbed1d345ecc6188b176d72c3/subprocess32-3.2.6.tar.gz";
285 url = "https://pypi.python.org/packages/28/8d/33ccbff51053f59ae6c357310cac0e79246bbed1d345ecc6188b176d72c3/subprocess32-3.2.6.tar.gz";
286 md5 = "754c5ab9f533e764f931136974b618f1";
286 md5 = "754c5ab9f533e764f931136974b618f1";
287 };
287 };
288 };
288 };
289 subvertpy = super.buildPythonPackage {
289 subvertpy = super.buildPythonPackage {
290 name = "subvertpy-0.9.3";
290 name = "subvertpy-0.9.3";
291 buildInputs = with self; [];
291 buildInputs = with self; [];
292 doCheck = false;
292 doCheck = false;
293 propagatedBuildInputs = with self; [];
293 propagatedBuildInputs = with self; [];
294 src = fetchurl {
294 src = fetchurl {
295 url = "https://github.com/jelmer/subvertpy/archive/subvertpy-0.9.3.tar.gz";
295 url = "https://github.com/jelmer/subvertpy/archive/subvertpy-0.9.3.tar.gz";
296 md5 = "7b745a47128050ea5a73efcd913ec1cf";
296 md5 = "7b745a47128050ea5a73efcd913ec1cf";
297 };
297 };
298 };
298 };
299 translationstring = super.buildPythonPackage {
299 translationstring = super.buildPythonPackage {
300 name = "translationstring-1.3";
300 name = "translationstring-1.3";
301 buildInputs = with self; [];
301 buildInputs = with self; [];
302 doCheck = false;
302 doCheck = false;
303 propagatedBuildInputs = with self; [];
303 propagatedBuildInputs = with self; [];
304 src = fetchurl {
304 src = fetchurl {
305 url = "https://pypi.python.org/packages/5e/eb/bee578cc150b44c653b63f5ebe258b5d0d812ddac12497e5f80fcad5d0b4/translationstring-1.3.tar.gz";
305 url = "https://pypi.python.org/packages/5e/eb/bee578cc150b44c653b63f5ebe258b5d0d812ddac12497e5f80fcad5d0b4/translationstring-1.3.tar.gz";
306 md5 = "a4b62e0f3c189c783a1685b3027f7c90";
306 md5 = "a4b62e0f3c189c783a1685b3027f7c90";
307 };
307 };
308 };
308 };
309 venusian = super.buildPythonPackage {
309 venusian = super.buildPythonPackage {
310 name = "venusian-1.0";
310 name = "venusian-1.0";
311 buildInputs = with self; [];
311 buildInputs = with self; [];
312 doCheck = false;
312 doCheck = false;
313 propagatedBuildInputs = with self; [];
313 propagatedBuildInputs = with self; [];
314 src = fetchurl {
314 src = fetchurl {
315 url = "https://pypi.python.org/packages/86/20/1948e0dfc4930ddde3da8c33612f6a5717c0b4bc28f591a5c5cf014dd390/venusian-1.0.tar.gz";
315 url = "https://pypi.python.org/packages/86/20/1948e0dfc4930ddde3da8c33612f6a5717c0b4bc28f591a5c5cf014dd390/venusian-1.0.tar.gz";
316 md5 = "dccf2eafb7113759d60c86faf5538756";
316 md5 = "dccf2eafb7113759d60c86faf5538756";
317 };
317 };
318 };
318 };
319 waitress = super.buildPythonPackage {
319 waitress = super.buildPythonPackage {
320 name = "waitress-0.8.9";
320 name = "waitress-0.8.9";
321 buildInputs = with self; [];
321 buildInputs = with self; [];
322 doCheck = false;
322 doCheck = false;
323 propagatedBuildInputs = with self; [setuptools];
323 propagatedBuildInputs = with self; [setuptools];
324 src = fetchurl {
324 src = fetchurl {
325 url = "https://pypi.python.org/packages/ee/65/fc9dee74a909a1187ca51e4f15ad9c4d35476e4ab5813f73421505c48053/waitress-0.8.9.tar.gz";
325 url = "https://pypi.python.org/packages/ee/65/fc9dee74a909a1187ca51e4f15ad9c4d35476e4ab5813f73421505c48053/waitress-0.8.9.tar.gz";
326 md5 = "da3f2e62b3676be5dd630703a68e2a04";
326 md5 = "da3f2e62b3676be5dd630703a68e2a04";
327 };
327 };
328 };
328 };
329 wheel = super.buildPythonPackage {
329 wheel = super.buildPythonPackage {
330 name = "wheel-0.29.0";
330 name = "wheel-0.29.0";
331 buildInputs = with self; [];
331 buildInputs = with self; [];
332 doCheck = false;
332 doCheck = false;
333 propagatedBuildInputs = with self; [];
333 propagatedBuildInputs = with self; [];
334 src = fetchurl {
334 src = fetchurl {
335 url = "https://pypi.python.org/packages/c9/1d/bd19e691fd4cfe908c76c429fe6e4436c9e83583c4414b54f6c85471954a/wheel-0.29.0.tar.gz";
335 url = "https://pypi.python.org/packages/c9/1d/bd19e691fd4cfe908c76c429fe6e4436c9e83583c4414b54f6c85471954a/wheel-0.29.0.tar.gz";
336 md5 = "555a67e4507cedee23a0deb9651e452f";
336 md5 = "555a67e4507cedee23a0deb9651e452f";
337 };
337 };
338 };
338 };
339 zope.deprecation = super.buildPythonPackage {
339 zope.deprecation = super.buildPythonPackage {
340 name = "zope.deprecation-4.1.1";
340 name = "zope.deprecation-4.1.1";
341 buildInputs = with self; [];
341 buildInputs = with self; [];
342 doCheck = false;
342 doCheck = false;
343 propagatedBuildInputs = with self; [setuptools];
343 propagatedBuildInputs = with self; [setuptools];
344 src = fetchurl {
344 src = fetchurl {
345 url = "https://pypi.python.org/packages/c5/c9/e760f131fcde817da6c186a3f4952b8f206b7eeb269bb6f0836c715c5f20/zope.deprecation-4.1.1.tar.gz";
345 url = "https://pypi.python.org/packages/c5/c9/e760f131fcde817da6c186a3f4952b8f206b7eeb269bb6f0836c715c5f20/zope.deprecation-4.1.1.tar.gz";
346 md5 = "ce261b9384066f7e13b63525778430cb";
346 md5 = "ce261b9384066f7e13b63525778430cb";
347 };
347 };
348 };
348 };
349 zope.interface = super.buildPythonPackage {
349 zope.interface = super.buildPythonPackage {
350 name = "zope.interface-4.1.3";
350 name = "zope.interface-4.1.3";
351 buildInputs = with self; [];
351 buildInputs = with self; [];
352 doCheck = false;
352 doCheck = false;
353 propagatedBuildInputs = with self; [setuptools];
353 propagatedBuildInputs = with self; [setuptools];
354 src = fetchurl {
354 src = fetchurl {
355 url = "https://pypi.python.org/packages/9d/81/2509ca3c6f59080123c1a8a97125eb48414022618cec0e64eb1313727bfe/zope.interface-4.1.3.tar.gz";
355 url = "https://pypi.python.org/packages/9d/81/2509ca3c6f59080123c1a8a97125eb48414022618cec0e64eb1313727bfe/zope.interface-4.1.3.tar.gz";
356 md5 = "9ae3d24c0c7415deb249dd1a132f0f79";
356 md5 = "9ae3d24c0c7415deb249dd1a132f0f79";
357 };
357 };
358 };
358 };
359
359
360 ### Test requirements
360 ### Test requirements
361
361
362
362
363 }
363 }
@@ -1,13 +1,15
1 { pkgs ? import <nixpkgs> {}
1 { pkgs ? import <nixpkgs> {}
2 , doCheck ? true
2 }:
3 }:
3
4
4 let
5 let
5
6
6 vcsserver = import ./default.nix {
7 vcsserver = import ./default.nix {
7 inherit
8 inherit
9 doCheck
8 pkgs;
10 pkgs;
9 };
11 };
10
12
11 in {
13 in {
12 build = vcsserver;
14 build = vcsserver;
13 }
15 }
@@ -1,34 +1,34
1 Beaker==1.7.0
1 Beaker==1.7.0
2 configobj==5.0.6
2 configobj==5.0.6
3 dulwich==0.12.0
3 dulwich==0.13.0
4 hgsubversion==1.8.6
4 hgsubversion==1.8.6
5 infrae.cache==1.0.1
5 infrae.cache==1.0.1
6 mercurial==3.8.3
6 mercurial==3.8.3
7 msgpack-python==0.4.6
7 msgpack-python==0.4.6
8 py==1.4.29
8 py==1.4.29
9 pyramid==1.6.1
9 pyramid==1.6.1
10 pyramid-jinja2==2.5
10 pyramid-jinja2==2.5
11 pyramid-mako==1.0.2
11 pyramid-mako==1.0.2
12 Pyro4==4.41
12 Pyro4==4.41
13 pytest==2.8.5
13 pytest==2.8.5
14 repoze.lru==0.6
14 repoze.lru==0.6
15 serpent==1.12
15 serpent==1.12
16 setuptools==20.8.1
16 setuptools==20.8.1
17 simplejson==3.7.2
17 simplejson==3.7.2
18 subprocess32==3.2.6
18 subprocess32==3.2.6
19 # TODO: johbo: This version is not in source on PyPI currently,
19 # TODO: johbo: This version is not in source on PyPI currently,
20 # change back once this or a future version is available
20 # change back once this or a future version is available
21 https://github.com/jelmer/subvertpy/archive/subvertpy-0.9.3.tar.gz#md5=7b745a47128050ea5a73efcd913ec1cf
21 https://github.com/jelmer/subvertpy/archive/subvertpy-0.9.3.tar.gz#md5=7b745a47128050ea5a73efcd913ec1cf
22 six==1.9.0
22 six==1.9.0
23 translationstring==1.3
23 translationstring==1.3
24 waitress==0.8.9
24 waitress==0.8.9
25 WebOb==1.3.1
25 WebOb==1.3.1
26 wheel==0.29.0
26 wheel==0.29.0
27 zope.deprecation==4.1.1
27 zope.deprecation==4.1.1
28 zope.interface==4.1.3
28 zope.interface==4.1.3
29 greenlet==0.4.7
29 greenlet==0.4.7
30 gunicorn==19.6.0
30 gunicorn==19.6.0
31
31
32 # Test related requirements
32 # Test related requirements
33 mock==1.0.1
33 mock==1.0.1
34 WebTest==1.4.3
34 WebTest==1.4.3
@@ -1,13 +1,18
1 { pkgs ? (import <nixpkgs> {})
1 { pkgs ? import <nixpkgs> {}
2 , doCheck ? false
2 }:
3 }:
3
4
4 let
5 let
5 vcsserver = import ./default.nix {inherit pkgs;};
6 vcsserver = import ./default.nix {
7 inherit
8 doCheck
9 pkgs;
10 };
6
11
7 in vcsserver.override (attrs: {
12 in vcsserver.override (attrs: {
8
13
9 # Avoid that we dump any sources into the store when entering the shell and
14 # Avoid that we dump any sources into the store when entering the shell and
10 # make development a little bit more convenient.
15 # make development a little bit more convenient.
11 src = null;
16 src = null;
12
17
13 })
18 })
@@ -1,1 +1,1
1 4.1.2 No newline at end of file
1 4.2.0 No newline at end of file
@@ -1,692 +1,700
1 # RhodeCode VCSServer provides access to different vcs backends via network.
1 # RhodeCode VCSServer provides access to different vcs backends via network.
2 # Copyright (C) 2014-2016 RodeCode GmbH
2 # Copyright (C) 2014-2016 RodeCode GmbH
3 #
3 #
4 # This program is free software; you can redistribute it and/or modify
4 # This program is free software; you can redistribute it and/or modify
5 # it under the terms of the GNU General Public License as published by
5 # it under the terms of the GNU General Public License as published by
6 # the Free Software Foundation; either version 3 of the License, or
6 # the Free Software Foundation; either version 3 of the License, or
7 # (at your option) any later version.
7 # (at your option) any later version.
8 #
8 #
9 # This program is distributed in the hope that it will be useful,
9 # This program is distributed in the hope that it will be useful,
10 # but WITHOUT ANY WARRANTY; without even the implied warranty of
10 # but WITHOUT ANY WARRANTY; without even the implied warranty of
11 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12 # GNU General Public License for more details.
12 # GNU General Public License for more details.
13 #
13 #
14 # You should have received a copy of the GNU General Public License
14 # You should have received a copy of the GNU General Public License
15 # along with this program; if not, write to the Free Software Foundation,
15 # along with this program; if not, write to the Free Software Foundation,
16 # Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
16 # Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
17
17
18 import io
18 import io
19 import logging