Merge pull request #223179 from SuperSandro2000/odoo

odoo: 20220506 -> 20230317

authored by Jörg Thalheim and committed by GitHub 953d8c5b e3eeeeca

+37 -60
+36 -59
pkgs/applications/finance/odoo/default.nix
··· 1 1 { stdenv 2 2 , lib 3 + , fetchFromGitHub 3 4 , fetchurl 4 - , python39 5 + , python310 5 6 , nodePackages 6 7 , wkhtmltopdf 7 8 , nixosTests 8 9 }: 9 10 10 11 let 11 - python = python39.override { 12 + python = python310.override { 12 13 packageOverrides = self: super: { 13 - click = super.click.overridePythonAttrs (old: rec { 14 - version = "7.1.2"; 15 - src = old.src.override { 16 - inherit version; 17 - sha256 = "d2b5255c7c6349bc1bd1e59e08cd12acbbd63ce649f2588755783aa94dfb6b1a"; 14 + pypdf2 = super.pypdf2.overridePythonAttrs (old: rec { 15 + version = "1.28.6"; 16 + format = "setuptools"; 17 + 18 + src = fetchFromGitHub { 19 + owner = "py-pdf"; 20 + repo = "pypdf"; 21 + rev = version; 22 + fetchSubmodules = true; 23 + hash = "sha256-WnRbsy/PJcotZqY9mJPLadrYqkXykOVifLIbDyNf4s4="; 18 24 }; 25 + 26 + nativeBuildInputs = []; 27 + 28 + nativeCheckInputs = with self; [ pytestCheckHook pillow ]; 19 29 }); 20 30 flask = super.flask.overridePythonAttrs (old: rec { 21 - version = "1.1.4"; 22 - src = old.src.override { 23 - inherit version; 24 - sha256 = "0fbeb6180d383a9186d0d6ed954e0042ad9f18e0e8de088b2b419d526927d196"; 25 - }; 26 - }); 27 - itsdangerous = super.itsdangerous.overridePythonAttrs (old: rec { 28 - version = "1.1.0"; 29 - src = old.src.override { 30 - inherit version; 31 - sha256 = "321b033d07f2a4136d3ec762eac9f16a10ccd60f53c0c91af90217ace7ba1f19"; 32 - }; 33 - }); 34 - jinja2 = super.jinja2.overridePythonAttrs (old: rec { 35 - version = "2.11.3"; 31 + version = "2.1.3"; 36 32 src = old.src.override { 37 33 inherit version; 38 - sha256 = "a6d58433de0ae800347cab1fa3043cebbabe8baa9d29e668f1c768cb87a333c6"; 39 - }; 40 - }); 41 - markupsafe = super.markupsafe.overridePythonAttrs (old: rec { 42 - version = "2.0.1"; 43 - src = old.src.override { 44 - inherit version; 45 - sha256 = "594c67807fb16238b30c44bdf74f36c02cdf22d1c8cda91ef8a0ed8dabf5620a"; 34 + hash = "sha256-FZcuUBffBXXD1sCQuhaLbbkCWeYgrI1+qBOjlrrVtss="; 46 35 }; 47 36 }); 48 37 werkzeug = super.werkzeug.overridePythonAttrs (old: rec { 49 - version = "1.0.1"; 38 + version = "2.1.2"; 50 39 src = old.src.override { 51 40 inherit version; 52 - sha256 = "6c80b1e5ad3665290ea39320b91e1be1e0d5f60652b964a3070216de83d2e47c"; 41 + hash = "sha256-HOCOgJPtZ9Y41jh5/Rujc1gX96gN42dNKT9ZhPJftuY="; 53 42 }; 54 - nativeCheckInputs = old.nativeCheckInputs ++ (with self; [ 55 - requests 56 - ]); 57 - disabledTests = old.disabledTests ++ [ 58 - # ResourceWarning: unclosed file 59 - "test_basic" 60 - "test_date_to_unix" 61 - "test_easteregg" 62 - "test_file_rfc2231_filename_continuations" 63 - "test_find_terminator" 64 - "test_save_to_pathlib_dst" 65 - ]; 66 - disabledTestPaths = old.disabledTestPaths ++ [ 67 - # ResourceWarning: unclosed file 68 - "tests/test_http.py" 69 - ]; 70 43 }); 71 44 }; 72 45 }; 46 + 47 + odoo_version = "15.0"; 48 + odoo_release = "20230317"; 73 49 in python.pkgs.buildPythonApplication rec { 74 50 pname = "odoo"; 75 - 76 - odoo_version = "15.0"; 77 - odoo_release = "20220506"; 78 - 79 51 version = "${odoo_version}.${odoo_release}"; 80 52 81 53 format = "setuptools"; ··· 84 56 src = fetchurl { 85 57 url = "https://nightly.odoo.com/${odoo_version}/nightly/src/odoo_${version}.tar.gz"; 86 58 name = "${pname}-${version}"; 87 - sha256 = "0mwlmfz5nhvg483ldrmlrjhwaf284c0c0pxf0fb0sfx2dnjjj3ib"; # odoo 59 + hash = "sha256-nJEFPtZhq7DLLDCL9xt0RV75d/a45o6hBKsUlQAWh1U="; # odoo 88 60 }; 89 61 62 + unpackPhase = '' 63 + tar xfz $src 64 + cd odoo* 65 + ''; 66 + 90 67 # needs some investigation 91 68 doCheck = false; 92 69 93 - makeWrapperArgs = [ "--prefix" "PATH" ":" "${lib.makeBinPath [ wkhtmltopdf nodePackages.rtlcss ]}" ]; 70 + makeWrapperArgs = [ 71 + "--prefix" "PATH" ":" "${lib.makeBinPath [ wkhtmltopdf nodePackages.rtlcss ]}" 72 + ]; 94 73 95 74 propagatedBuildInputs = with python.pkgs; [ 96 75 babel ··· 101 80 freezegun 102 81 gevent 103 82 greenlet 104 - html2text 105 83 idna 106 84 jinja2 107 85 libsass ··· 127 105 qrcode 128 106 reportlab 129 107 requests 108 + setuptools 130 109 vobject 131 110 werkzeug 132 111 xlrd ··· 135 114 zeep 136 115 ]; 137 116 138 - unpackPhase = '' 139 - tar xfz $src 140 - cd odoo* 141 - ''; 117 + # takes 5+ minutes and there are not files to strip 118 + dontStrip = true; 142 119 143 120 passthru = { 144 121 updateScript = ./update.sh;
+1 -1
pkgs/applications/finance/odoo/update.sh
··· 22 22 23 23 cd "$(dirname "${BASH_SOURCE[0]}")" 24 24 25 - sed -ri "s| sha256.+ # odoo| sha256 = \"$(nix-prefetch-url --type sha256 "https://nightly.odoo.com/${VERSION}/nightly/src/odoo_${latestVersion}.tar.gz")\"; # odoo|g" default.nix 25 + sed -ri "s| hash.+ # odoo| hash = \"$(nix-prefetch-url --type sha256 "https://nightly.odoo.com/${VERSION}/nightly/src/odoo_${latestVersion}.tar.gz")\"; # odoo|g" default.nix 26 26 sed -ri "s| odoo_version.+| odoo_version = \"$VERSION\";|" default.nix 27 27 sed -ri "s| odoo_release.+| odoo_release = \"$RELEASE\";|" default.nix