Show More
@@ -0,0 +1,13 b'' | |||||
|
1 | diff -rup Beaker-1.9.1-orig/beaker/ext/database.py Beaker-1.9.1/beaker/ext/database.py | |||
|
2 | --- Beaker-1.9.1-orig/beaker/ext/database.py 2018-05-22 18:22:34.802619619 +0200 | |||
|
3 | +++ Beaker-1.9.1/beaker/ext/database.py 2018-05-22 17:07:14.048335196 +0200 | |||
|
4 | @@ -91,7 +91,8 @@ class DatabaseNamespaceManager(OpenResou | |||
|
5 | sa.Column('created', types.DateTime, nullable=False), | |||
|
6 | sa.Column('data', types.PickleType, nullable=False), | |||
|
7 | sa.UniqueConstraint('namespace'), | |||
|
8 | - schema=schema_name if schema_name else meta.schema | |||
|
9 | + schema=schema_name if schema_name else meta.schema, | |||
|
10 | + extend_existing=True | |||
|
11 | ) | |||
|
12 | cache.create(checkfirst=True) | |||
|
13 | return cache |
@@ -1,60 +1,61 b'' | |||||
1 | # Overrides for the generated python-packages.nix |
|
1 | # Overrides for the generated python-packages.nix | |
2 | # |
|
2 | # | |
3 | # This function is intended to be used as an extension to the generated file |
|
3 | # This function is intended to be used as an extension to the generated file | |
4 | # python-packages.nix. The main objective is to add needed dependencies of C |
|
4 | # python-packages.nix. The main objective is to add needed dependencies of C | |
5 | # libraries and tweak the build instructions where needed. |
|
5 | # libraries and tweak the build instructions where needed. | |
6 |
|
6 | |||
7 | { pkgs, basePythonPackages }: |
|
7 | { pkgs, basePythonPackages }: | |
8 |
|
8 | |||
9 | let |
|
9 | let | |
10 | sed = "sed -i"; |
|
10 | sed = "sed -i"; | |
11 | in |
|
11 | in | |
12 |
|
12 | |||
13 | self: super: { |
|
13 | self: super: { | |
14 |
|
14 | |||
15 | beaker = super.beaker.override (attrs: { |
|
15 | beaker = super.beaker.override (attrs: { | |
16 | patches = [ |
|
16 | patches = [ | |
17 | ./patch-beaker-lock-func-debug.diff |
|
17 | ./patch-beaker-lock-func-debug.diff | |
|
18 | ./patch-beaker-metadata-reuse.diff | |||
18 | ]; |
|
19 | ]; | |
19 | }); |
|
20 | }); | |
20 |
|
21 | |||
21 | subvertpy = super.subvertpy.override (attrs: { |
|
22 | subvertpy = super.subvertpy.override (attrs: { | |
22 | # TODO: johbo: Remove the "or" once we drop 16.03 support |
|
23 | # TODO: johbo: Remove the "or" once we drop 16.03 support | |
23 | SVN_PREFIX = "${pkgs.subversion.dev or pkgs.subversion}"; |
|
24 | SVN_PREFIX = "${pkgs.subversion.dev or pkgs.subversion}"; | |
24 | propagatedBuildInputs = attrs.propagatedBuildInputs ++ [ |
|
25 | propagatedBuildInputs = attrs.propagatedBuildInputs ++ [ | |
25 | pkgs.aprutil |
|
26 | pkgs.aprutil | |
26 | pkgs.subversion |
|
27 | pkgs.subversion | |
27 | ]; |
|
28 | ]; | |
28 | preBuild = pkgs.lib.optionalString pkgs.stdenv.isDarwin '' |
|
29 | preBuild = pkgs.lib.optionalString pkgs.stdenv.isDarwin '' | |
29 | ${sed} -e "s/'gcc'/'clang'/" setup.py |
|
30 | ${sed} -e "s/'gcc'/'clang'/" setup.py | |
30 | ''; |
|
31 | ''; | |
31 | }); |
|
32 | }); | |
32 |
|
33 | |||
33 | hgsubversion = super.hgsubversion.override (attrs: { |
|
34 | hgsubversion = super.hgsubversion.override (attrs: { | |
34 | propagatedBuildInputs = attrs.propagatedBuildInputs ++ [ |
|
35 | propagatedBuildInputs = attrs.propagatedBuildInputs ++ [ | |
35 | pkgs.sqlite |
|
36 | pkgs.sqlite | |
36 | basePythonPackages.sqlite3 |
|
37 | basePythonPackages.sqlite3 | |
37 | ]; |
|
38 | ]; | |
38 | }); |
|
39 | }); | |
39 |
|
40 | |||
40 | mercurial = super.mercurial.override (attrs: { |
|
41 | mercurial = super.mercurial.override (attrs: { | |
41 | propagatedBuildInputs = attrs.propagatedBuildInputs ++ [ |
|
42 | propagatedBuildInputs = attrs.propagatedBuildInputs ++ [ | |
42 | self.python.modules.curses |
|
43 | self.python.modules.curses | |
43 | ] ++ pkgs.lib.optional pkgs.stdenv.isDarwin |
|
44 | ] ++ pkgs.lib.optional pkgs.stdenv.isDarwin | |
44 | pkgs.darwin.apple_sdk.frameworks.ApplicationServices; |
|
45 | pkgs.darwin.apple_sdk.frameworks.ApplicationServices; | |
45 | }); |
|
46 | }); | |
46 |
|
47 | |||
47 | pyramid = super.pyramid.override (attrs: { |
|
48 | pyramid = super.pyramid.override (attrs: { | |
48 | postFixup = '' |
|
49 | postFixup = '' | |
49 | wrapPythonPrograms |
|
50 | wrapPythonPrograms | |
50 | # TODO: johbo: "wrapPython" adds this magic line which |
|
51 | # TODO: johbo: "wrapPython" adds this magic line which | |
51 | # confuses pserve. |
|
52 | # confuses pserve. | |
52 | ${sed} '/import sys; sys.argv/d' $out/bin/.pserve-wrapped |
|
53 | ${sed} '/import sys; sys.argv/d' $out/bin/.pserve-wrapped | |
53 | ''; |
|
54 | ''; | |
54 | }); |
|
55 | }); | |
55 |
|
56 | |||
56 | # Avoid that setuptools is replaced, this leads to trouble |
|
57 | # Avoid that setuptools is replaced, this leads to trouble | |
57 | # with buildPythonPackage. |
|
58 | # with buildPythonPackage. | |
58 | setuptools = basePythonPackages.setuptools; |
|
59 | setuptools = basePythonPackages.setuptools; | |
59 |
|
60 | |||
60 | } |
|
61 | } |
General Comments 0
You need to be logged in to leave comments.
Login now