From 2530e9b106b4502372be28ffab07108fa472472d Mon Sep 17 00:00:00 2001 From: pacien Date: Tue, 22 Nov 2022 10:27:11 +0100 Subject: [PATCH 01/22] mercurial: 6.3.0 -> 6.3.1 This also disables a test failing with OpenSSL v3, and re-enables another test that has been fixed. Changelog: https://www.mercurial-scm.org/wiki/Release6.3 --- .../version-management/mercurial/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/version-management/mercurial/default.nix b/pkgs/applications/version-management/mercurial/default.nix index b3af90c2a38e..2bd780548114 100644 --- a/pkgs/applications/version-management/mercurial/default.nix +++ b/pkgs/applications/version-management/mercurial/default.nix @@ -21,11 +21,11 @@ let self = python3Packages.buildPythonApplication rec { pname = "mercurial${lib.optionalString fullBuild "-full"}"; - version = "6.3.0"; + version = "6.3.1"; src = fetchurl { url = "https://mercurial-scm.org/release/mercurial-${version}.tar.gz"; - sha256 = "sha256-iAOZtVSh3mQQFs5fNbiEDXXxjWh7mrHDWNrAWK1m5pg="; + sha256 = "sha256-bDmrhzKUjYnPEgh1HdfYXUBCqoIVOXdFG56xM2dYUHI="; }; format = "other"; @@ -35,7 +35,7 @@ let cargoDeps = if rustSupport then rustPlatform.fetchCargoTarball { inherit src; name = "mercurial-${version}"; - sha256 = "sha256-VfIZ1bV8bhjjBL4KNjToPuu8gg9TkChziH2rRKhdRXE="; + sha256 = "sha256-UZ/ZSZkAedrm3iUkaQu6zvfX4bhrYDlwR9L9ytf38ZY="; sourceRoot = "mercurial-${version}/rust"; } else null; cargoRoot = if rustSupport then "rust" else null; @@ -157,9 +157,9 @@ let # https://bz.mercurial-scm.org/show_bug.cgi?id=6727 test-patchbomb-tls.t - # Test broken with recent versions of git due to default policy change - # https://foss.heptapod.net/mercurial/mercurial-devel/-/merge_requests/302 - test-convert-git.t + # Test wanting TLS 1.0 and 1.1, not available with OpenSSL v3. + # https://bz.mercurial-scm.org/show_bug.cgi?id=6760 + test-https.t EOF export HGTEST_REAL_HG="${mercurial}/bin/hg" From 804a42b1da2b919492c00cf17bd4f7f7eaca7d6e Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 26 Nov 2022 17:04:31 +0100 Subject: [PATCH 02/22] python310Packages.pydeps: add changelog to meta --- pkgs/development/python-modules/pydeps/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/pydeps/default.nix b/pkgs/development/python-modules/pydeps/default.nix index 00f257be765e..88d2d521dfde 100644 --- a/pkgs/development/python-modules/pydeps/default.nix +++ b/pkgs/development/python-modules/pydeps/default.nix @@ -54,6 +54,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python module dependency visualization"; homepage = "https://github.com/thebjorn/pydeps"; + changelog = "https://github.com/thebjorn/pydeps/releases/tag/v${version}"; license = licenses.bsd2; maintainers = with maintainers; [ fab ]; }; From 1f10a3cd02f04fd6436cc7bb2df76c22b35f1aad Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 26 Nov 2022 17:05:24 +0100 Subject: [PATCH 03/22] python310Packages.pydeps: 1.10.24 -> 1.11.0 Changelog: https://github.com/thebjorn/pydeps/releases/tag/v1.11.0 --- pkgs/development/python-modules/pydeps/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pydeps/default.nix b/pkgs/development/python-modules/pydeps/default.nix index 88d2d521dfde..fa0ad7899ad8 100644 --- a/pkgs/development/python-modules/pydeps/default.nix +++ b/pkgs/development/python-modules/pydeps/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "pydeps"; - version = "1.10.24"; + version = "1.11.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "thebjorn"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-yDHIZk6+9K5hg4Q6pydd4NwnxSU1+u+dGUiUQph9ccY="; + hash = "sha256-XAx7B3v+7xYiW15nJgiL82YlNeBxW80M0Rq0LMMsWu0="; }; buildInputs = [ From 5c919060187996255e56212f2c8e737fead9eadb Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 26 Nov 2022 20:32:35 +0000 Subject: [PATCH 04/22] python310Packages.flake8-import-order: 0.18.1 -> 0.18.2 --- .../python-modules/flake8-import-order/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/flake8-import-order/default.nix b/pkgs/development/python-modules/flake8-import-order/default.nix index 25aa995f9122..be89c1fcab21 100644 --- a/pkgs/development/python-modules/flake8-import-order/default.nix +++ b/pkgs/development/python-modules/flake8-import-order/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "flake8-import-order"; - version = "0.18.1"; + version = "0.18.2"; src = fetchPypi { inherit pname version; - sha256 = "14kfvsagqc6lrplvf3x58ia6x744bk8fj91wmk0hcipa8naw73d2"; + sha256 = "sha256-4jlB+JLaPgwJ1xG6u7DHO8c1JC6bIWtyZhZ1ipINkA4="; }; propagatedBuildInputs = [ pycodestyle ] ++ lib.optional (!isPy3k) enum34; From 405d6cc4c952a374b11bea3b0aa19382a6204380 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 26 Nov 2022 22:09:57 +0000 Subject: [PATCH 05/22] python310Packages.geomet: 0.3.1 -> 1.0.0 --- pkgs/development/python-modules/geomet/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/geomet/default.nix b/pkgs/development/python-modules/geomet/default.nix index 9b90012695e0..b8ee1ea7e756 100644 --- a/pkgs/development/python-modules/geomet/default.nix +++ b/pkgs/development/python-modules/geomet/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "geomet"; - version = "0.3.1"; + version = "1.0.0"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "geomet"; repo = "geomet"; rev = "refs/tags/${version}"; - hash = "sha256-7QfvGQlg4nTr1rwTyvTNm6n/jFptLtpBKMjjQj6OXCQ="; + hash = "sha256-dN0d6wu5FqL/5FQrpQn+wlyEvp52pa5dkxLu3j3bxnw="; }; propagatedBuildInputs = [ From 8d4f1b71ed0f0569eae5bff9648ebbe8af47bb9d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 26 Nov 2022 22:27:33 +0000 Subject: [PATCH 06/22] python310Packages.globus-sdk: 3.14.0 -> 3.15.0 --- pkgs/development/python-modules/globus-sdk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/globus-sdk/default.nix b/pkgs/development/python-modules/globus-sdk/default.nix index addc372f8a7e..08a7679df45e 100644 --- a/pkgs/development/python-modules/globus-sdk/default.nix +++ b/pkgs/development/python-modules/globus-sdk/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "globus-sdk"; - version = "3.14.0"; + version = "3.15.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "globus"; repo = "globus-sdk-python"; rev = "refs/tags/${version}"; - hash = "sha256-lCqiBlyf0cUqsmSlCmt+jXTBGsXyCioZ232zd5rVqiA="; + hash = "sha256-g4QdVxZmlr4iVL0n/XG+dKm5CCjKO4oi5Xw+lgH+xv8="; }; propagatedBuildInputs = [ From b8ed02ec49205f8d1de620d1d2281fce3c9375fb Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 27 Nov 2022 00:15:21 +0000 Subject: [PATCH 07/22] oven-media-engine: 0.14.14 -> 0.14.16 --- pkgs/servers/misc/oven-media-engine/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/misc/oven-media-engine/default.nix b/pkgs/servers/misc/oven-media-engine/default.nix index 4e85ff5f736c..a74068fdb4b0 100644 --- a/pkgs/servers/misc/oven-media-engine/default.nix +++ b/pkgs/servers/misc/oven-media-engine/default.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation rec { pname = "oven-media-engine"; - version = "0.14.14"; + version = "0.14.16"; src = fetchFromGitHub { owner = "AirenSoft"; repo = "OvenMediaEngine"; rev = "v${version}"; - sha256 = "sha256-ur3CnkIOtGRJJKfYIrlJ6bqkO06C6unizCUb9Ea9nGI="; + sha256 = "sha256-c9DyjVQ/s0bWueTFrNNoknhZhirrdLSkV6qTOqKk6GQ="; }; sourceRoot = "source/src"; From 143d998c5080c5e477a97c7e1922afe0c2646331 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 27 Nov 2022 03:43:57 +0000 Subject: [PATCH 08/22] python310Packages.holidays: 0.17 -> 0.17.2 --- pkgs/development/python-modules/holidays/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/holidays/default.nix b/pkgs/development/python-modules/holidays/default.nix index 570c61d186f5..7f37eaa5072c 100644 --- a/pkgs/development/python-modules/holidays/default.nix +++ b/pkgs/development/python-modules/holidays/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "holidays"; - version = "0.17"; + version = "0.17.2"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-nxa2Dwe+KgPKqj1sqLDWau6JkLcgag0TlM4x+tK0JC4="; + hash = "sha256-EWBFNfZq2dj4TlHBcQKWDof8OBn4RESvaLHrh1aGZjA="; }; propagatedBuildInputs = [ From 039d874f0b93ad10e77995a340b2d3ee55497562 Mon Sep 17 00:00:00 2001 From: Aaron Jheng Date: Wed, 16 Nov 2022 12:57:06 +0000 Subject: [PATCH 09/22] perf-linux: tweak make flags to supress build warnings --- pkgs/os-specific/linux/kernel/perf/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/perf/default.nix b/pkgs/os-specific/linux/kernel/perf/default.nix index e4c8be02cbb0..ae028b980ce2 100644 --- a/pkgs/os-specific/linux/kernel/perf/default.nix +++ b/pkgs/os-specific/linux/kernel/perf/default.nix @@ -78,7 +78,10 @@ stdenv.mkDerivation { patchShebangs pmu-events/jevents.py ''; - makeFlags = [ "prefix=$(out)" "WERROR=0" ] ++ kernel.makeFlags; + makeFlags = [ "prefix=$(out)" "WERROR=0" "ASCIIDOC8=1" ] ++ kernel.makeFlags + ++ lib.optional (!withGtk) "NO_GTK2=1" + ++ lib.optional (!withZstd) "NO_LIBZSTD=1" + ++ lib.optional (!withLibcap) "NO_LIBCAP=1"; hardeningDisable = [ "format" ]; @@ -127,7 +130,7 @@ stdenv.mkDerivation { doCheck = false; # requires "sparse" - installFlags = [ "install" "install-man" "ASCIIDOC8=1" "prefix=$(out)" ]; + installTargets = [ "install" "install-man" ]; # TODO: Add completions based on perf-completion.sh postInstall = '' From dac7bf3553bc811d0b854f83e85e348fe8623550 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 27 Nov 2022 03:50:45 +0000 Subject: [PATCH 10/22] python310Packages.homematicip: 1.0.9 -> 1.0.10 --- pkgs/development/python-modules/homematicip/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/homematicip/default.nix b/pkgs/development/python-modules/homematicip/default.nix index aba7e19b69e0..8987c4a0e61f 100644 --- a/pkgs/development/python-modules/homematicip/default.nix +++ b/pkgs/development/python-modules/homematicip/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "homematicip"; - version = "1.0.9"; + version = "1.0.10"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "hahn-th"; repo = "homematicip-rest-api"; rev = "refs/tags/${version}"; - hash = "sha256-pQVSbR4MLbyHQRAoCFOMnOrhuAnGRMyiXm1szHvANuA="; + hash = "sha256-CnZHR5JyZm4T6Fm5VumZJujQvEdw59c7GSwcyO7EXXY="; }; propagatedBuildInputs = [ From 456c5a49fb0e9c993444fa90bc7a3f2b1a15e2d3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 27 Nov 2022 04:18:25 +0000 Subject: [PATCH 11/22] python310Packages.hvplot: 0.8.1 -> 0.8.2 --- pkgs/development/python-modules/hvplot/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/hvplot/default.nix b/pkgs/development/python-modules/hvplot/default.nix index 14d11af62e3b..ee8e913ec97c 100644 --- a/pkgs/development/python-modules/hvplot/default.nix +++ b/pkgs/development/python-modules/hvplot/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "hvplot"; - version = "0.8.1"; + version = "0.8.2"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-U93+BnQ8TVkk+x5ZdlW/oU6A/q9XpDi/0oRC02rHwrY="; + sha256 = "sha256-/q2zlawBoL5fyJFVRSRGwrnEEqmdY+rAKQgxOBY9XBs="; }; propagatedBuildInputs = [ From 486bdc8c5fd8e203ac28e2bc2abc3660fa756798 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 27 Nov 2022 08:05:00 +0100 Subject: [PATCH 12/22] python310Packages.homematicip: add changelog to meta --- pkgs/development/python-modules/homematicip/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/homematicip/default.nix b/pkgs/development/python-modules/homematicip/default.nix index 8987c4a0e61f..b0d8b8eca96b 100644 --- a/pkgs/development/python-modules/homematicip/default.nix +++ b/pkgs/development/python-modules/homematicip/default.nix @@ -86,6 +86,7 @@ buildPythonPackage rec { meta = with lib; { description = "Module for the homematicIP REST API"; homepage = "https://github.com/hahn-th/homematicip-rest-api"; + changelog = "https://github.com/hahn-th/homematicip-rest-api/releases/tag/${version}"; license = with licenses; [ gpl3Only ]; maintainers = with maintainers; [ fab ]; }; From d6b142e587033d77acc26fa2950a3255fa152d85 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 27 Nov 2022 08:05:39 +0100 Subject: [PATCH 13/22] python310Packages.homematicip: update disabled --- pkgs/development/python-modules/homematicip/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/homematicip/default.nix b/pkgs/development/python-modules/homematicip/default.nix index b0d8b8eca96b..1c8cd9417827 100644 --- a/pkgs/development/python-modules/homematicip/default.nix +++ b/pkgs/development/python-modules/homematicip/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { version = "1.0.10"; format = "setuptools"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "hahn-th"; From ea5f398131d14d11b8b8d602f262bfd7a8b1a947 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 27 Nov 2022 08:07:30 +0100 Subject: [PATCH 14/22] python310Packages.holidays: add changelog to meta --- pkgs/development/python-modules/holidays/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/holidays/default.nix b/pkgs/development/python-modules/holidays/default.nix index 7f37eaa5072c..c163ae26a9e7 100644 --- a/pkgs/development/python-modules/holidays/default.nix +++ b/pkgs/development/python-modules/holidays/default.nix @@ -39,6 +39,7 @@ buildPythonPackage rec { meta = with lib; { description = "Generate and work with holidays in Python"; homepage = "https://github.com/dr-prodigy/python-holidays"; + changelog = "https://github.com/dr-prodigy/python-holidays/releases/tag/v.${version}"; license = licenses.mit; maintainers = with maintainers; [ jluttine ]; }; From 44bdf18ff03657594b985479c56fc43e203c37ed Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 27 Nov 2022 08:09:56 +0100 Subject: [PATCH 15/22] python310Packages.globus-sdk: add changelog to meta --- pkgs/development/python-modules/globus-sdk/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/globus-sdk/default.nix b/pkgs/development/python-modules/globus-sdk/default.nix index 08a7679df45e..b8526212b752 100644 --- a/pkgs/development/python-modules/globus-sdk/default.nix +++ b/pkgs/development/python-modules/globus-sdk/default.nix @@ -56,6 +56,7 @@ buildPythonPackage rec { meta = with lib; { description = "Interface to Globus REST APIs, including the Transfer API and the Globus Auth API"; homepage = "https://github.com/globus/globus-sdk-python"; + changelog = "https://github.com/globus/globus-sdk-python/releases/tag/${version}"; license = licenses.asl20; maintainers = with maintainers; [ ixxie ]; }; From 91e5b08e071d7903d863e031c432c4485aca7c48 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 27 Nov 2022 08:11:53 +0100 Subject: [PATCH 16/22] python310Packages.hvplot: add changelog to meta --- pkgs/development/python-modules/hvplot/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/hvplot/default.nix b/pkgs/development/python-modules/hvplot/default.nix index ee8e913ec97c..16dcf7e54235 100644 --- a/pkgs/development/python-modules/hvplot/default.nix +++ b/pkgs/development/python-modules/hvplot/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-/q2zlawBoL5fyJFVRSRGwrnEEqmdY+rAKQgxOBY9XBs="; + hash = "sha256-/q2zlawBoL5fyJFVRSRGwrnEEqmdY+rAKQgxOBY9XBs="; }; propagatedBuildInputs = [ @@ -37,6 +37,7 @@ buildPythonPackage rec { meta = with lib; { description = "A high-level plotting API for the PyData ecosystem built on HoloViews"; homepage = "https://hvplot.pyviz.org"; + changelog = "https://github.com/holoviz/hvplot/releases/tag/v${version}"; license = licenses.bsd3; maintainers = with maintainers; [ costrouc ]; }; From fcb17f332dd1dad6b19d66dbbeab7f61da34116c Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 27 Nov 2022 08:18:56 +0100 Subject: [PATCH 17/22] python310Packages.geomet: add changelog to meta --- pkgs/development/python-modules/geomet/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/geomet/default.nix b/pkgs/development/python-modules/geomet/default.nix index b8ee1ea7e756..fb5f098f0d9f 100644 --- a/pkgs/development/python-modules/geomet/default.nix +++ b/pkgs/development/python-modules/geomet/default.nix @@ -32,6 +32,7 @@ buildPythonPackage rec { meta = with lib; { description = "Convert GeoJSON to WKT/WKB (Well-Known Text/Binary) and vice versa"; homepage = "https://github.com/geomet/geomet"; + changelog = "https://github.com/geomet/geomet/releases/tag/${version}"; license = licenses.asl20; maintainers = with maintainers; [ turion ris ]; }; From 0167b31088dd2d763cdb9986d3b70b8387daddb2 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 27 Nov 2022 08:26:07 +0100 Subject: [PATCH 18/22] python310Packages.flake8-import-order: add changelog to meta --- .../python-modules/flake8-import-order/default.nix | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/flake8-import-order/default.nix b/pkgs/development/python-modules/flake8-import-order/default.nix index be89c1fcab21..cf682c7e8768 100644 --- a/pkgs/development/python-modules/flake8-import-order/default.nix +++ b/pkgs/development/python-modules/flake8-import-order/default.nix @@ -1,4 +1,13 @@ -{ lib, buildPythonPackage, fetchPypi, isPy3k, enum34, pycodestyle, pytest, flake8, pylama }: +{ lib +, buildPythonPackage +, fetchPypi +, isPy3k +, enum34 +, pycodestyle +, pytest +, flake8 +, pylama +}: buildPythonPackage rec { pname = "flake8-import-order"; @@ -20,6 +29,8 @@ buildPythonPackage rec { meta = with lib; { description = "Flake8 and pylama plugin that checks the ordering of import statements"; homepage = "https://github.com/PyCQA/flake8-import-order"; + changelog = "https://github.com/PyCQA/flake8-import-order/blob/${version}/CHANGELOG.rst"; license = with licenses; [ lgpl3 mit ]; + maintainers = with maintainers; [ ]; }; } From 81b938da81e0480cbf37cce6cab5085603c79bf3 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 27 Nov 2022 08:33:21 +0100 Subject: [PATCH 19/22] python310Packages.flake8-import-order: switch to pytestCheckHook - add pythonImportsCheck - disable on unsupported Python releases --- .../flake8-import-order/default.nix | 29 ++++++++++++------- 1 file changed, 19 insertions(+), 10 deletions(-) diff --git a/pkgs/development/python-modules/flake8-import-order/default.nix b/pkgs/development/python-modules/flake8-import-order/default.nix index cf682c7e8768..53c388690140 100644 --- a/pkgs/development/python-modules/flake8-import-order/default.nix +++ b/pkgs/development/python-modules/flake8-import-order/default.nix @@ -1,30 +1,39 @@ { lib , buildPythonPackage , fetchPypi -, isPy3k -, enum34 -, pycodestyle -, pytest , flake8 +, pycodestyle , pylama +, pytestCheckHook +, pythonOlder }: buildPythonPackage rec { pname = "flake8-import-order"; version = "0.18.2"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-4jlB+JLaPgwJ1xG6u7DHO8c1JC6bIWtyZhZ1ipINkA4="; + hash = "sha256-4jlB+JLaPgwJ1xG6u7DHO8c1JC6bIWtyZhZ1ipINkA4="; }; - propagatedBuildInputs = [ pycodestyle ] ++ lib.optional (!isPy3k) enum34; + propagatedBuildInputs = [ + pycodestyle + ]; - checkInputs = [ pytest flake8 pycodestyle pylama ]; + checkInputs = [ + flake8 + pycodestyle + pylama + pytestCheckHook + ]; - checkPhase = '' - pytest --strict - ''; + pythonImportsCheck = [ + "flake8_import_order" + ]; meta = with lib; { description = "Flake8 and pylama plugin that checks the ordering of import statements"; From 0e3813f46eb12b1b5aaa061e571b57dcfb8d1da5 Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Thu, 24 Nov 2022 23:03:31 +0100 Subject: [PATCH 20/22] maestral-qt: set mainProgram and changelog meta attributes --- pkgs/applications/networking/maestral-qt/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/networking/maestral-qt/default.nix b/pkgs/applications/networking/maestral-qt/default.nix index 1be323decab4..62f44f6f134a 100644 --- a/pkgs/applications/networking/maestral-qt/default.nix +++ b/pkgs/applications/networking/maestral-qt/default.nix @@ -56,9 +56,11 @@ python3.pkgs.buildPythonApplication rec { meta = with lib; { description = "GUI front-end for maestral (an open-source Dropbox client) for Linux"; + homepage = "https://maestral.app"; + changelog = "https://github.com/samschott/maestral/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ peterhoeg sfrijters ]; platforms = platforms.linux; - homepage = "https://maestral.app"; + mainProgram = "maestral_qt"; }; } From 94d6c732d1d11df8916ef17406ae0827d29e94fa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sun, 27 Nov 2022 10:37:55 +0100 Subject: [PATCH 21/22] dockerTools: fixup evaluation without allowed aliases This is a regression from PR #172736 --- pkgs/build-support/docker/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/build-support/docker/default.nix b/pkgs/build-support/docker/default.nix index 9a0d01acaae8..c6ab4589aefa 100644 --- a/pkgs/build-support/docker/default.nix +++ b/pkgs/build-support/docker/default.nix @@ -19,7 +19,6 @@ , pigz , rsync , runCommand -, runCommandNoCC , runtimeShell , shadow , skopeo From 7b9642aeef8b5dd6a515c59704dbcf702775cdfc Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 27 Nov 2022 09:36:19 +0000 Subject: [PATCH 22/22] tagainijisho: 1.2.1 -> 1.2.2 --- pkgs/applications/office/tagainijisho/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/office/tagainijisho/default.nix b/pkgs/applications/office/tagainijisho/default.nix index 0c913cd7df20..7e171f7d702c 100644 --- a/pkgs/applications/office/tagainijisho/default.nix +++ b/pkgs/applications/office/tagainijisho/default.nix @@ -1,11 +1,11 @@ { lib, mkDerivation, fetchzip, qtbase, qttools, cmake, sqlite }: mkDerivation rec { pname = "tagainijisho"; - version = "1.2.1"; + version = "1.2.2"; src = fetchzip { url = "https://github.com/Gnurou/tagainijisho/releases/download/${version}/tagainijisho-${version}.tar.gz"; - hash = "sha256-NYmvkjGl+lgFh4PPWGxitupYJ2DOyCBAYlITGb3FMj8="; + hash = "sha256-CTDMoYGbVE4W0SDerW//aAdUVsySWFQycSy0I3a9+94="; }; nativeBuildInputs = [ cmake ];