From 2aec372cdcd4d73b94863611fea70e0884270fdc Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Wed, 7 Sep 2022 04:50:26 +1000 Subject: [PATCH 1/7] go_1_18: 1.18.5 -> 1.18.6 (cherry picked from commit 08837acea8e5d655b5720d7c882d9172b2b28f14) --- pkgs/development/compilers/go/1.18.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/go/1.18.nix b/pkgs/development/compilers/go/1.18.nix index d36cbc5e3c29..36b7791a2bc9 100644 --- a/pkgs/development/compilers/go/1.18.nix +++ b/pkgs/development/compilers/go/1.18.nix @@ -60,11 +60,11 @@ in stdenv.mkDerivation rec { pname = "go"; - version = "1.18.5"; + version = "1.18.6"; src = fetchurl { url = "https://go.dev/dl/go${version}.src.tar.gz"; - sha256 = "sha256-mSDTMGoaxTbN0seW1ss8VLxVnCJvw8w5wy8eC9f1DSo="; + sha256 = "sha256-p/HVBCQ1XavOZtERKxyuQ5tu5eTxXtum8QTApLFz6JU="; }; strictDeps = true; From 5d5223aee9914da32cf75e9e8cc3f4447b7ac6ec Mon Sep 17 00:00:00 2001 From: Yorick van Pelt Date: Tue, 19 Jul 2022 17:16:46 +0200 Subject: [PATCH 2/7] python3Packages.nose: fix cross-compiling (cherry picked from commit 27ff1af1cbf21eb4e24f6d4ac3598bb3c986ba45) --- pkgs/development/python-modules/nose/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/nose/default.nix b/pkgs/development/python-modules/nose/default.nix index 31fd824ee3da..961de55f5dad 100644 --- a/pkgs/development/python-modules/nose/default.nix +++ b/pkgs/development/python-modules/nose/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { preBuild = lib.optionalString ((python.isPy3k or false) && (python.pname != "pypy3")) '' - 2to3 -wn nose functional_tests unit_tests + ${python.pythonForBuild}/bin/2to3 -wn nose functional_tests unit_tests ''; propagatedBuildInputs = [ coverage ]; From 12b6f0d99c53ea8ffc7f95cc5895df11533b9a38 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 16 Jul 2022 12:59:17 +0200 Subject: [PATCH 3/7] python3Packages.Mako: 1.2.0 -> 1.2.1 (cherry picked from commit 54bac49f21ddd505be1a4c8f888d7774ab202040) --- pkgs/development/python-modules/Mako/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/Mako/default.nix b/pkgs/development/python-modules/Mako/default.nix index a74f9988ad7a..8aa3f687dded 100644 --- a/pkgs/development/python-modules/Mako/default.nix +++ b/pkgs/development/python-modules/Mako/default.nix @@ -17,13 +17,13 @@ buildPythonPackage rec { pname = "Mako"; - version = "1.2.0"; + version = "1.2.1"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-mnx+kiuH2zaGIQz0nV12cDOkHUAQsoTnR2gskr3dizk="; + sha256 = "sha256-8FSl/0dDSS8aqezEcXLLM7QrnZk8/8wUbJ3hfnF7Awc="; }; propagatedBuildInputs = [ From 2d726a29b47f917f3c8979fd60baa72d26d4dee7 Mon Sep 17 00:00:00 2001 From: Jonas Heinrich Date: Tue, 26 Jul 2022 10:25:56 +0200 Subject: [PATCH 4/7] python310Packages.lingua: init at 4.15.0 (cherry picked from commit 7b7fe29819c714bb2209c971452506e78e1d1bbd) --- .../python-modules/lingua/default.nix | 35 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 37 insertions(+) create mode 100644 pkgs/development/python-modules/lingua/default.nix diff --git a/pkgs/development/python-modules/lingua/default.nix b/pkgs/development/python-modules/lingua/default.nix new file mode 100644 index 000000000000..f116df7e2fda --- /dev/null +++ b/pkgs/development/python-modules/lingua/default.nix @@ -0,0 +1,35 @@ +{ lib +, fetchPypi +, buildPythonPackage +, flit-core +, polib +, click }: + +buildPythonPackage rec { + pname = "lingua"; + version = "4.15.0"; + format = "pyproject"; + + src = fetchPypi { + inherit pname version; + sha256 = "sha256-DhqUZ0HbKIpANhrQT/OP4EvwgZg0uKu4TEtTX+2bpO8="; + }; + + nativeBuildInputs = [ + flit-core + ]; + + propagatedBuildInputs = [ + click + polib + ]; + + pythonImportsCheck = [ "lingua" ]; + + meta = with lib; { + description = "Translation toolset"; + homepage = "https://github.com/wichert/lingua"; + license = licenses.bsd3; + maintainers = with maintainers; [ np ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index de0a92c240d4..a6401d46d40a 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4941,6 +4941,8 @@ in { line_profiler = callPackage ../development/python-modules/line_profiler { }; + lingua = callPackage ../development/python-modules/lingua { }; + linkify-it-py = callPackage ../development/python-modules/linkify-it-py { }; linode-api = callPackage ../development/python-modules/linode-api { }; From 8385cf30660c1eadfe7eea51073650777722bc54 Mon Sep 17 00:00:00 2001 From: Jonas Heinrich Date: Tue, 26 Jul 2022 10:19:38 +0200 Subject: [PATCH 5/7] python310Packages.Mako: Add missing check dependency (cherry picked from commit 2a4169019ec45317aee802abaf69a0e7251a2b28) --- pkgs/development/python-modules/Mako/default.nix | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/Mako/default.nix b/pkgs/development/python-modules/Mako/default.nix index 8aa3f687dded..694f3138c928 100644 --- a/pkgs/development/python-modules/Mako/default.nix +++ b/pkgs/development/python-modules/Mako/default.nix @@ -13,6 +13,8 @@ # tests , mock , pytestCheckHook +, lingua +, chameleon }: buildPythonPackage rec { @@ -37,8 +39,10 @@ buildPythonPackage rec { }; checkInputs = [ - pytestCheckHook + chameleon + lingua mock + pytestCheckHook ] ++ passthru.optional-dependencies.babel; disabledTests = lib.optionals isPyPy [ @@ -51,11 +55,6 @@ buildPythonPackage rec { "test_bytestring_passthru" ]; - disabledTestPaths = [ - # lingua dependency is not packaged - "test/ext/test_linguaplugin.py" - ]; - meta = with lib; { description = "Super-fast templating language"; homepage = "https://www.makotemplates.org/"; From 34c6af02c99deb544c614e9f63ef933448d601d5 Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Fri, 9 Sep 2022 21:27:09 +0100 Subject: [PATCH 6/7] python3Packages.Mako: 1.2.1 -> 1.2.2 (cherry picked from commit 520042472c5b150838adceff26be93076f214552) --- pkgs/development/python-modules/Mako/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/Mako/default.nix b/pkgs/development/python-modules/Mako/default.nix index 694f3138c928..9118f5a6fcf3 100644 --- a/pkgs/development/python-modules/Mako/default.nix +++ b/pkgs/development/python-modules/Mako/default.nix @@ -19,13 +19,13 @@ buildPythonPackage rec { pname = "Mako"; - version = "1.2.1"; + version = "1.2.2"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-8FSl/0dDSS8aqezEcXLLM7QrnZk8/8wUbJ3hfnF7Awc="; + sha256 = "sha256-NySGmzY7pjCicqX4n2jAcDUhN7j9F1dlABe34G/aFj8="; }; propagatedBuildInputs = [ From 9241e888d533db0caf42c0a2f16a64d9723cb7dc Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Sat, 3 Sep 2022 12:32:49 +0100 Subject: [PATCH 7/7] inetutils: add patch for CVE-2022-39028 (cherry picked from commit 72d2cd3208e8e293f7addb115f001405f6aee74c) --- pkgs/tools/networking/inetutils/default.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/networking/inetutils/default.nix b/pkgs/tools/networking/inetutils/default.nix index f5c9ff00d924..864b055fc8e9 100644 --- a/pkgs/tools/networking/inetutils/default.nix +++ b/pkgs/tools/networking/inetutils/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchurl, ncurses, perl, help2man -, apparmorRulesFromClosure +, apparmorRulesFromClosure, fetchpatch }: stdenv.mkDerivation rec { @@ -16,6 +16,11 @@ stdenv.mkDerivation rec { patches = [ # https://git.congatec.com/yocto/meta-openembedded/commit/3402bfac6b595c622e4590a8ff5eaaa854e2a2a3 ./inetutils-1_9-PATH_PROCNET_DEV.patch + (fetchpatch { + name = "CVE-2022-39028.patch"; + url = "https://sources.debian.org/data/main/i/inetutils/2%3A2.3-5/debian/patches/inetutils-telnetd-EC_EL_null_deref.patch"; + sha256 = "sha256-NYNDbEk3q3EhQdJaR12JBbnjJIRRpOcKLBF/EJJPiGU="; + }) ]; nativeBuildInputs = [ help2man perl /* for `whois' */ ];