From 218c8509c6ce25945c2c253d15e9542033d4de44 Mon Sep 17 00:00:00 2001 From: Enno Lohmeier Date: Thu, 25 Jun 2020 12:48:33 +0200 Subject: [PATCH 1/4] trytond: 4.8.4 -> 5.6.2 --- pkgs/applications/office/trytond/default.nix | 34 ++++++++++++-------- 1 file changed, 21 insertions(+), 13 deletions(-) diff --git a/pkgs/applications/office/trytond/default.nix b/pkgs/applications/office/trytond/default.nix index c45562a0c8d..15d5fa6748a 100644 --- a/pkgs/applications/office/trytond/default.nix +++ b/pkgs/applications/office/trytond/default.nix @@ -1,40 +1,48 @@ -{ stdenv, python2Packages -, withPostgresql ? true }: +{ stdenv +, python3Packages +, withPostgresql ? true +}: with stdenv.lib; -python2Packages.buildPythonApplication rec { +python3Packages.buildPythonApplication rec { pname = "trytond"; - version = "4.8.4"; - src = python2Packages.fetchPypi { + version = "5.6.2"; + src = python3Packages.fetchPypi { inherit pname version; - sha256 = "1935045b1b4674de602b4279a9cfd0a14431624a28ccb490234cffecb81fbca7"; + sha256 = "0mlfl34zmmqrwip39mvhkk0h6dsljqwff2mk1ldahm253d4vzflp"; }; # Tells the tests which database to use DB_NAME = ":memory:"; - buildInputs = with python2Packages; [ + buildInputs = with python3Packages; [ mock ]; - propagatedBuildInputs = with python2Packages; ([ - dateutil + propagatedBuildInputs = with python3Packages; [ lxml + relatorio + genshi + dateutil polib python-sql - relatorio werkzeug wrapt - ipaddress + passlib # extra dependencies bcrypt pydot python-Levenshtein simplejson - cdecimal html2text - ] ++ stdenv.lib.optional withPostgresql psycopg2); + ] ++ stdenv.lib.optional withPostgresql psycopg2; + + # If unset, trytond will try to mkdir /homeless-shelter + preCheck = '' + export HOME=$(mktemp -d) + ''; + meta = { description = "The server of the Tryton application platform"; longDescription = '' From 63bcf4f4ecd5c75765ef9818d3b2e77d8b0df35c Mon Sep 17 00:00:00 2001 From: Enno Lohmeier Date: Fri, 26 Jun 2020 12:24:42 +0200 Subject: [PATCH 2/4] trytond: convert to python package --- .../python-modules}/trytond/default.nix | 27 +++++++++++++++---- pkgs/top-level/all-packages.nix | 2 +- pkgs/top-level/python-packages.nix | 2 ++ 3 files changed, 25 insertions(+), 6 deletions(-) rename pkgs/{applications/office => development/python-modules}/trytond/default.nix (79%) diff --git a/pkgs/applications/office/trytond/default.nix b/pkgs/development/python-modules/trytond/default.nix similarity index 79% rename from pkgs/applications/office/trytond/default.nix rename to pkgs/development/python-modules/trytond/default.nix index 15d5fa6748a..4b8afbddb37 100644 --- a/pkgs/applications/office/trytond/default.nix +++ b/pkgs/development/python-modules/trytond/default.nix @@ -1,14 +1,31 @@ { stdenv -, python3Packages +, buildPythonApplication +, fetchPypi +, mock +, lxml +, relatorio +, genshi +, dateutil +, polib +, python-sql +, werkzeug +, wrapt +, passlib +, bcrypt +, pydot +, python-Levenshtein +, simplejson +, html2text +, psycopg2 , withPostgresql ? true }: with stdenv.lib; -python3Packages.buildPythonApplication rec { +buildPythonApplication rec { pname = "trytond"; version = "5.6.2"; - src = python3Packages.fetchPypi { + src = fetchPypi { inherit pname version; sha256 = "0mlfl34zmmqrwip39mvhkk0h6dsljqwff2mk1ldahm253d4vzflp"; }; @@ -16,10 +33,10 @@ python3Packages.buildPythonApplication rec { # Tells the tests which database to use DB_NAME = ":memory:"; - buildInputs = with python3Packages; [ + buildInputs = [ mock ]; - propagatedBuildInputs = with python3Packages; [ + propagatedBuildInputs = [ lxml relatorio genshi diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 14aed9d373b..8ca9361eb11 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7193,7 +7193,7 @@ in tryton = callPackage ../applications/office/tryton { }; - trytond = callPackage ../applications/office/trytond { }; + trytond = with python3Packages; toPythonApplication trytond; omapd = callPackage ../tools/security/omapd { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 0a3cbae305c..4293d8e0eae 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6056,6 +6056,8 @@ in { tqdm = callPackage ../development/python-modules/tqdm { }; + trytond = callPackage ../development/python-modules/trytond { }; + smmap = callPackage ../development/python-modules/smmap { }; smmap2 = throw "smmap2 has been deprecated, use smmap instead."; # added 2020-03-14 From 0ec0fd373b0589f450b426a484d123b08748a7bc Mon Sep 17 00:00:00 2001 From: Enno Lohmeier Date: Thu, 25 Jun 2020 12:48:52 +0200 Subject: [PATCH 3/4] sentry-sdk: add missing dependencies --- pkgs/development/python-modules/sentry-sdk/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/sentry-sdk/default.nix b/pkgs/development/python-modules/sentry-sdk/default.nix index ef2680bc4c6..9d2a533ecb6 100644 --- a/pkgs/development/python-modules/sentry-sdk/default.nix +++ b/pkgs/development/python-modules/sentry-sdk/default.nix @@ -17,6 +17,8 @@ , stdenv , tornado , urllib3 +, trytond +, werkzeug }: buildPythonPackage rec { @@ -28,10 +30,10 @@ buildPythonPackage rec { sha256 = "0e5e947d0f7a969314aa23669a94a9712be5a688ff069ff7b9fc36c66adc160c"; }; - checkInputs = [ django flask tornado bottle rq falcon sqlalchemy ] + checkInputs = [ django flask tornado bottle rq falcon sqlalchemy werkzeug ] ++ stdenv.lib.optionals isPy3k [ celery pyramid sanic aiohttp ]; - propagatedBuildInputs = [ urllib3 certifi ]; + propagatedBuildInputs = [ urllib3 certifi trytond ]; meta = with stdenv.lib; { homepage = "https://github.com/getsentry/sentry-python"; From 4afa2702af1de94fbb86f0997962e0be44aa7757 Mon Sep 17 00:00:00 2001 From: Enno Lohmeier Date: Wed, 24 Jun 2020 18:04:53 +0200 Subject: [PATCH 4/4] octoprint: freeze dependencies --- pkgs/applications/misc/octoprint/default.nix | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/misc/octoprint/default.nix b/pkgs/applications/misc/octoprint/default.nix index 7d613f37675..793ea927a01 100644 --- a/pkgs/applications/misc/octoprint/default.nix +++ b/pkgs/applications/misc/octoprint/default.nix @@ -16,11 +16,17 @@ let py = python3.override { self = py; packageOverrides = lib.foldr lib.composeExtensions (self: super: { }) ([ - (mkOverride "flask" "0.12.5" "fac2b9d443e49f7e7358a444a3db5950bdd0324674d92ba67f8f1f15f876b14f") - (mkOverride "flaskbabel" "0.12.2" "11jwp8vvq1gnm31qh6ihy2h393hy18yn9yjp569g60r0wj1x2sii") - (mkOverride "tornado" "4.5.3" "02jzd23l4r6fswmwxaica9ldlyc2p6q8dk6dyff7j58fmdzf853d") - (mkOverride "psutil" "5.6.7" "ffad8eb2ac614518bbe3c0b8eb9dffdb3a8d2e3a7d5da51c5b974fb723a5c5aa") - (mkOverride "watchdog" "0.9.0" "07cnvvlpif7a6cg4rav39zq8fxa5pfqawchr46433pij0y6napwn") + (mkOverride "flask" "0.12.5" "fac2b9d443e49f7e7358a444a3db5950bdd0324674d92ba67f8f1f15f876b14f") + (mkOverride "flask_assets" "0.12" "0ivqsihk994rxw58vdgzrx4d77d7lpzjm4qxb38hjdgvi5xm4cb0") + (mkOverride "flaskbabel" "0.12.2" "11jwp8vvq1gnm31qh6ihy2h393hy18yn9yjp569g60r0wj1x2sii") + (mkOverride "flask_login" "0.4.1" "1v2j8zd558xfmgn3rfbw0xz4vizjcnk8kqw52q4f4d9ygfnc25f8") + (mkOverride "markdown" "3.1.1" "2e50876bcdd74517e7b71f3e7a76102050edec255b3983403f1a63e7c8a41e7a") + (mkOverride "tornado" "4.5.3" "02jzd23l4r6fswmwxaica9ldlyc2p6q8dk6dyff7j58fmdzf853d") + (mkOverride "psutil" "5.6.7" "ffad8eb2ac614518bbe3c0b8eb9dffdb3a8d2e3a7d5da51c5b974fb723a5c5aa") + (mkOverride "watchdog" "0.9.0" "07cnvvlpif7a6cg4rav39zq8fxa5pfqawchr46433pij0y6napwn") + (mkOverride "werkzeug" "0.16.1" "010zmhyfbp4d56c1rgalwi188imjlkv9g7rm25jrvify6xnqalxk") + (mkOverride "websocket_client" "0.56.0" "0fpxjyr74klnyis3yf6m54askl0h5dchxcwbfjsq92xng0455m8z") + (mkOverride "wrapt" "1.11.2" "1q81762dgsgrd12f8qc39zk8s5wll3m5xc32jdmlf6cls4gh4njn") # Octoprint holds back jinja2 to 2.8.1 due to breaking changes. # This old version does not have updated test config for pytest 4,