pyrox.dev
Merge pull request #173090 from dotlambda/odoo-packageOverrides
odoo: use packageOverrides
authored by
Maciej Krüger
and committed by
GitHub
4e2d2e8e
6185626f
+66
-20
pkgs/applications/finance/odoo/default.nix
+66
-20
pkgs/applications/finance/odoo/default.nix
···
2
2
, lib
3
3
, fetchurl
4
4
, python3
5
-
, python3Packages
6
5
, nodePackages
7
6
, wkhtmltopdf
8
-
, callPackage
9
7
}:
10
8
11
-
with python3Packages;
12
-
13
9
let
14
-
werkzeug = python3Packages.callPackage ../../../development/python-modules/werkzeug/1.nix {};
15
-
in
16
-
17
-
buildPythonApplication rec {
10
+
python = python3.override {
11
+
packageOverrides = self: super: {
12
+
click = super.click.overridePythonAttrs (old: rec {
13
+
version = "7.1.2";
14
+
src = old.src.override {
15
+
inherit version;
16
+
sha256 = "d2b5255c7c6349bc1bd1e59e08cd12acbbd63ce649f2588755783aa94dfb6b1a";
17
+
};
18
+
});
19
+
flask = super.flask.overridePythonAttrs (old: rec {
20
+
version = "1.1.4";
21
+
src = old.src.override {
22
+
inherit version;
23
+
sha256 = "0fbeb6180d383a9186d0d6ed954e0042ad9f18e0e8de088b2b419d526927d196";
24
+
};
25
+
});
26
+
itsdangerous = super.itsdangerous.overridePythonAttrs (old: rec {
27
+
version = "1.1.0";
28
+
src = old.src.override {
29
+
inherit version;
30
+
sha256 = "321b033d07f2a4136d3ec762eac9f16a10ccd60f53c0c91af90217ace7ba1f19";
31
+
};
32
+
});
33
+
jinja2 = super.jinja2.overridePythonAttrs (old: rec {
34
+
version = "2.11.3";
35
+
src = old.src.override {
36
+
inherit version;
37
+
sha256 = "a6d58433de0ae800347cab1fa3043cebbabe8baa9d29e668f1c768cb87a333c6";
38
+
};
39
+
});
40
+
markupsafe = super.markupsafe.overridePythonAttrs (old: rec {
41
+
version = "2.0.1";
42
+
src = old.src.override {
43
+
inherit version;
44
+
sha256 = "594c67807fb16238b30c44bdf74f36c02cdf22d1c8cda91ef8a0ed8dabf5620a";
45
+
};
46
+
});
47
+
werkzeug = super.werkzeug.overridePythonAttrs (old: rec {
48
+
version = "1.0.1";
49
+
src = old.src.override {
50
+
inherit version;
51
+
sha256 = "6c80b1e5ad3665290ea39320b91e1be1e0d5f60652b964a3070216de83d2e47c";
52
+
};
53
+
checkInputs = old.checkInputs ++ (with self; [
54
+
requests
55
+
]);
56
+
disabledTests = old.disabledTests ++ [
57
+
# ResourceWarning: unclosed file
58
+
"test_basic"
59
+
"test_date_to_unix"
60
+
"test_easteregg"
61
+
"test_file_rfc2231_filename_continuations"
62
+
"test_find_terminator"
63
+
"test_save_to_pathlib_dst"
64
+
];
65
+
disabledTestPaths = old.disabledTestPaths ++ [
66
+
# ResourceWarning: unclosed file
67
+
"tests/test_http.py"
68
+
];
69
+
});
70
+
};
71
+
};
72
+
in python.pkgs.buildPythonApplication rec {
18
73
pname = "odoo";
19
74
20
75
major = "15";
···
23
78
24
79
version = "${major}.${minor}.${patch}";
25
80
81
+
format = "setuptools";
82
+
26
83
# latest release is at https://github.com/odoo/docker/blob/master/15.0/Dockerfile
27
84
src = fetchurl {
28
85
url = "https://nightly.odoo.com/${major}.${minor}/nightly/src/odoo_${version}.tar.gz";
···
30
87
hash = "sha256-mofV0mNCdyzJecp0XegZBR/5NzHjis9kbpsUA/KJbZg=";
31
88
};
32
89
33
-
nativeBuildInputs = [
34
-
setuptools
35
-
wheel
36
-
mock
37
-
];
38
-
39
-
buildInputs = [
40
-
wkhtmltopdf
41
-
nodePackages.rtlcss
42
-
];
43
-
44
90
# needs some investigation
45
91
doCheck = false;
46
92
47
93
makeWrapperArgs = [ "--prefix" "PATH" ":" "${lib.makeBinPath [ wkhtmltopdf nodePackages.rtlcss ]}" ];
48
94
49
-
propagatedBuildInputs = [
95
+
propagatedBuildInputs = with python.pkgs; [
50
96
Babel
51
97
chardet
52
98
decorator
+2
-1
pkgs/development/python-modules/flask-restful/default.nix
+2
-1
pkgs/development/python-modules/flask-restful/default.nix
···
10
10
, pythonOlder
11
11
, pytz
12
12
, six
13
+
, werkzeug
13
14
}:
14
15
15
16
buildPythonPackage rec {
···
25
26
hash = "sha256-zOxlC4NdSBkhOMhTKa4Dc15s7VjpstnCFG1shMBvpT4=";
26
27
};
27
28
28
-
patches = [
29
+
patches = lib.optionals (lib.versionAtLeast werkzeug.version "2.1.0") [
29
30
./werkzeug-2.1.0-compat.patch
30
31
];
31
32
-62
pkgs/development/python-modules/werkzeug/1.nix
-62
pkgs/development/python-modules/werkzeug/1.nix
···
1
-
{ lib, stdenv, buildPythonPackage, fetchPypi
2
-
, itsdangerous, hypothesis
3
-
, pytestCheckHook, requests
4
-
, pytest-timeout
5
-
, isPy3k
6
-
}:
7
-
8
-
buildPythonPackage rec {
9
-
pname = "Werkzeug";
10
-
version = "1.0.1";
11
-
12
-
src = fetchPypi {
13
-
inherit pname version;
14
-
sha256 = "6c80b1e5ad3665290ea39320b91e1be1e0d5f60652b964a3070216de83d2e47c";
15
-
};
16
-
17
-
propagatedBuildInputs = [ itsdangerous ];
18
-
checkInputs = [ pytestCheckHook requests hypothesis pytest-timeout ];
19
-
20
-
postPatch = ''
21
-
# ResourceWarning causes tests to fail
22
-
rm tests/test_routing.py
23
-
'';
24
-
25
-
disabledTests = [
26
-
"test_save_to_pathlib_dst"
27
-
"test_cookie_maxsize"
28
-
"test_cookie_samesite_attribute"
29
-
"test_cookie_samesite_invalid"
30
-
"test_range_parsing"
31
-
"test_content_range_parsing"
32
-
"test_http_date_lt_1000"
33
-
"test_best_match_works"
34
-
"test_date_to_unix"
35
-
"test_easteregg"
36
-
37
-
# Seems to be a problematic test-case:
38
-
#
39
-
# > warnings.warn(pytest.PytestUnraisableExceptionWarning(msg))
40
-
# E pytest.PytestUnraisableExceptionWarning: Exception ignored in: <_io.FileIO [closed]>
41
-
# E
42
-
# E Traceback (most recent call last):
43
-
# E File "/nix/store/cwv8aj4vsqvimzljw5dxsxy663vjgibj-python3.9-Werkzeug-1.0.1/lib/python3.9/site-packages/werkzeug/formparser.py", line 318, in parse_multipart_headers
44
-
# E return Headers(result)
45
-
# E ResourceWarning: unclosed file <_io.FileIO name=11 mode='rb+' closefd=True>
46
-
"test_basic_routing"
47
-
"test_merge_slashes_match"
48
-
"test_merge_slashes_build"
49
-
"TestMultiPart"
50
-
"TestHTTPUtility"
51
-
] ++ lib.optionals stdenv.isDarwin [
52
-
"test_get_machine_id"
53
-
];
54
-
55
-
meta = with lib; {
56
-
homepage = "https://palletsprojects.com/p/werkzeug/";
57
-
description = "A WSGI utility library for Python";
58
-
license = licenses.bsd3;
59
-
maintainers = [ ];
60
-
};
61
-
}
62
-