From bf730c8e2f53e3dcd40e6a19f105cd16594832e5 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 26 Nov 2021 22:41:30 +0100 Subject: [PATCH 01/11] tsung: use Python 3 --- .../applications/networking/tsung/default.nix | 29 ++++++++++++------- 1 file changed, 19 insertions(+), 10 deletions(-) diff --git a/pkgs/applications/networking/tsung/default.nix b/pkgs/applications/networking/tsung/default.nix index 346fd1752578..a811d7c73eda 100644 --- a/pkgs/applications/networking/tsung/default.nix +++ b/pkgs/applications/networking/tsung/default.nix @@ -1,25 +1,34 @@ -{ fetchurl, stdenv, lib, makeWrapper, - erlang, - python2, python2Packages, - perlPackages, - gnuplot }: +{ lib +, stdenv +, fetchurl +, makeWrapper +, erlang +, python3 +, python3Packages +, perlPackages +, gnuplot +}: stdenv.mkDerivation rec { pname = "tsung"; version = "1.7.0"; + src = fetchurl { url = "http://tsung.erlang-projects.org/dist/tsung-${version}.tar.gz"; sha256 = "6394445860ef34faedf8c46da95a3cb206bc17301145bc920151107ffa2ce52a"; }; - nativeBuildInputs = [ makeWrapper ]; + nativeBuildInputs = [ + makeWrapper + ]; + propagatedBuildInputs = [ erlang gnuplot perlPackages.perl perlPackages.TemplateToolkit - python2 - python2Packages.matplotlib + python3 + python3Packages.matplotlib ]; @@ -43,8 +52,8 @@ stdenv.mkDerivation rec { can currently be used to stress HTTP, WebDAV, SOAP, PostgreSQL, MySQL, AMQP, MQTT, LDAP and Jabber/XMPP servers. ''; - license = licenses.gpl2; - maintainers = [ maintainers.uskudnik ]; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ uskudnik ]; platforms = platforms.unix; }; } From e71b01a8fc34a2c3e3b67d354cb991c4ee9095cb Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 26 Nov 2021 23:14:41 +0100 Subject: [PATCH 02/11] python3Packages.py17track: relax async_timeout constraint --- .../python-modules/py17track/default.nix | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/py17track/default.nix b/pkgs/development/python-modules/py17track/default.nix index 2c7dc8e52eaf..89090258bd01 100644 --- a/pkgs/development/python-modules/py17track/default.nix +++ b/pkgs/development/python-modules/py17track/default.nix @@ -16,6 +16,7 @@ buildPythonPackage rec { pname = "py17track"; version = "3.3.0"; format = "pyproject"; + disabled = pythonOlder "3.6"; src = fetchFromGitHub { @@ -44,13 +45,18 @@ buildPythonPackage rec { postPatch = '' substituteInPlace pyproject.toml \ - --replace ">=19.3,<21.0" ">=19.3,<22.0" + --replace 'attrs = ">=19.3,<21.0"' 'attrs = ">=19.3,<22.0"' \ + --replace 'async-timeout = "^3.0.1"' 'async-timeout = ">=3.0.1,<5.0.0"' ''; - # Ignore the examples directory as the files are prefixed with test_ - disabledTestPaths = [ "examples/" ]; + disabledTestPaths = [ + # Ignore the examples directory as the files are prefixed with test_ + "examples/" + ]; - pythonImportsCheck = [ "py17track" ]; + pythonImportsCheck = [ + "py17track" + ]; meta = with lib; { description = "Python library to track package info from 17track.com"; From d08d54ced891825f0f42845c4d5bbffc3281f66a Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 26 Nov 2021 22:32:32 +0100 Subject: [PATCH 03/11] python3Packages.pep8-naming: add patch to fix tests --- .../python-modules/pep8-naming/default.nix | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/pkgs/development/python-modules/pep8-naming/default.nix b/pkgs/development/python-modules/pep8-naming/default.nix index 9bfdbe89aab6..ce2b89ddb4f4 100644 --- a/pkgs/development/python-modules/pep8-naming/default.nix +++ b/pkgs/development/python-modules/pep8-naming/default.nix @@ -1,5 +1,6 @@ { lib , fetchPypi +, fetchpatch , buildPythonPackage , flake8 , flake8-polyfill @@ -20,6 +21,16 @@ buildPythonPackage rec { flake8-polyfill ]; + patches = [ + # Add missing option to get passing tests, https://github.com/PyCQA/pep8-naming/pull/181 + (fetchpatch { + name = "add-missing-option.patch"; + url = "https://github.com/PyCQA/pep8-naming/commit/03b8f36f6a8bb8bc79dfa5a71ad9be2a0bf8bbf5.patch"; + sha256 = "1YTh84Yoj0MqFZoifM362563r1GuzaF+mMmdT/ckC7I="; + }) + ]; + + checkPhase = '' runHook preCheck ${python.interpreter} run_tests.py From 82e26e0974a5541d3592cc446ee2d300c0291791 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 26 Nov 2021 22:59:45 +0100 Subject: [PATCH 04/11] python3Packages.pylint-django: disable failing tests --- .../python-modules/pylint-django/default.nix | 41 +++++++++++-------- 1 file changed, 23 insertions(+), 18 deletions(-) diff --git a/pkgs/development/python-modules/pylint-django/default.nix b/pkgs/development/python-modules/pylint-django/default.nix index 701163bb3d0c..c93c8d4207fe 100644 --- a/pkgs/development/python-modules/pylint-django/default.nix +++ b/pkgs/development/python-modules/pylint-django/default.nix @@ -1,16 +1,12 @@ -{ buildPythonPackage +{ lib +, buildPythonPackage +, coverage +, django +, factory_boy , fetchFromGitHub , isPy3k -, lib - -# pythonPackages -, django , pylint-plugin-utils - -# pythonPackages for checkInputs -, coverage -, factory_boy -, pytest +, pytestCheckHook }: buildPythonPackage rec { @@ -30,17 +26,26 @@ buildPythonPackage rec { pylint-plugin-utils ]; - checkInputs = [ coverage factory_boy pytest ]; + checkInputs = [ + coverage + factory_boy + pytestCheckHook + ]; - # Check command taken from scripts/test.sh - # Skip test external_django_tables2_noerror_meta_class: - # requires an unpackaged django_tables2 - checkPhase = '' - python pylint_django/tests/test_func.py -v -k "not tables2" - ''; + disabledTests = [ + # Skip outdated tests and the one with a missing dependency (django_tables2) + "external_django_tables2_noerror_meta_class" + "external_factory_boy_noerror" + "func_noerror_foreign_key_attributes" + "func_noerror_foreign_key_key_cls_unbound" + ]; + + pythonImportsCheck = [ + "pylint_django" + ]; meta = with lib; { - description = "A Pylint plugin to analyze Django applications"; + description = "Pylint plugin to analyze Django applications"; homepage = "https://github.com/PyCQA/pylint-django"; license = licenses.gpl2Plus; maintainers = with maintainers; [ kamadorueda ]; From 8959f7b2110972fce5f5025517399f7297dad040 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 26 Nov 2021 23:26:00 +0100 Subject: [PATCH 05/11] python3Packages.flake8-polyfill: disable failing tests --- .../flake8-polyfill/default.nix | 37 +++++++++++++------ .../python-modules/pep8-naming/default.nix | 1 - 2 files changed, 26 insertions(+), 12 deletions(-) diff --git a/pkgs/development/python-modules/flake8-polyfill/default.nix b/pkgs/development/python-modules/flake8-polyfill/default.nix index 050a6d4f9c8a..60ee3558d1d4 100644 --- a/pkgs/development/python-modules/flake8-polyfill/default.nix +++ b/pkgs/development/python-modules/flake8-polyfill/default.nix @@ -1,6 +1,12 @@ -{ lib, fetchPypi, buildPythonPackage +{ lib +, buildPythonPackage +, fetchpatch +, fetchPypi , flake8 -, mock, pep8, pytest }: +, mock +, pep8 +, pytestCheckHook +}: buildPythonPackage rec { pname = "flake8-polyfill"; @@ -11,12 +17,6 @@ buildPythonPackage rec { sha256 = "1nlf1mkqw856vi6782qcglqhaacb23khk9wkcgn55npnjxshhjz4"; }; - postPatch = '' - # Failed: [pytest] section in setup.cfg files is no longer supported, change to [tool:pytest] instead. - substituteInPlace setup.cfg \ - --replace pytest 'tool:pytest' - ''; - propagatedBuildInputs = [ flake8 ]; @@ -24,13 +24,28 @@ buildPythonPackage rec { checkInputs = [ mock pep8 - pytest + pytestCheckHook ]; - checkPhase = '' - pytest tests + patches = [ + # Skip unnecessary tests on Flake8, https://github.com/PyCQA/pep8-naming/pull/181 + (fetchpatch { + name = "skip-tests.patch"; + url = "https://github.com/PyCQA/flake8-polyfill/commit/3cf414350e82ceb835ca2edbd5d5967d33e9ff35.patch"; + sha256 = "mElZafodq8dF3wLO/LOqwFb7eLMsPLlEjNSu5AWqets="; + }) + ]; + + postPatch = '' + # Failed: [pytest] section in setup.cfg files is no longer supported, change to [tool:pytest] instead. + substituteInPlace setup.cfg \ + --replace pytest 'tool:pytest' ''; + pythonImportsCheck = [ + "flake8_polyfill" + ]; + meta = with lib; { homepage = "https://gitlab.com/pycqa/flake8-polyfill"; description = "Polyfill package for Flake8 plugins"; diff --git a/pkgs/development/python-modules/pep8-naming/default.nix b/pkgs/development/python-modules/pep8-naming/default.nix index ce2b89ddb4f4..ee8535d089aa 100644 --- a/pkgs/development/python-modules/pep8-naming/default.nix +++ b/pkgs/development/python-modules/pep8-naming/default.nix @@ -30,7 +30,6 @@ buildPythonPackage rec { }) ]; - checkPhase = '' runHook preCheck ${python.interpreter} run_tests.py From ee74e6547d318cea196eefe497cf78fb6339ca8e Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Fri, 26 Nov 2021 23:37:07 +0000 Subject: [PATCH 06/11] electron_16: 16.0.1 -> 16.0.2 https://github.com/electron/electron/releases/tag/v16.0.2 --- pkgs/development/tools/electron/default.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/development/tools/electron/default.nix b/pkgs/development/tools/electron/default.nix index 96c45104bd20..9283cee17740 100644 --- a/pkgs/development/tools/electron/default.nix +++ b/pkgs/development/tools/electron/default.nix @@ -145,13 +145,13 @@ rec { headers = "0r1qxgkpcn03fd28zbz86ilhsqg0gzp9clbghr5w6gy5ak8y68hz"; }; - electron_16 = mkElectron "16.0.1" { - armv7l-linux = "9fe58dcc8838fc641e9fc6f2723ece6f12c29169340da3ab754e1afc57634314"; - aarch64-linux = "991369b7dee6cf9c146c48566153baf898b5ed73efaada2688d1699d69ba366c"; - x86_64-linux = "4063b6d05c9320fc53535a7d932e03f94ad0aae95432437bbf2f2f222b67c5a5"; - i686-linux = "68a817a999dcc996497c53e54f06199af0c2de278ff910c28845405d1b1828f0"; - x86_64-darwin = "7e28327d3efb013f19295e2491208491c66b117a167e9e56d141d0516d6d5587"; - aarch64-darwin = "f05684ca31d3d98746bca9ec05d425998d60af640958eeb55f464747ceb97bdf"; - headers = "0sk6h0jqfw2q9h05xdzivwfa6040r4racf82s8i5xkw5s13vsl6d"; + electron_16 = mkElectron "16.0.2" { + armv7l-linux = "bba43eb1e2718f04f6d91096cf22d4c49cbab0915f48b3b22b8f94f205eda2f0"; + aarch64-linux = "3a2ad9c508bfb8e1b2635a3af0a7495e1121bc7aea64a9b771322a60bb82e265"; + x86_64-linux = "2f96a5b773b790d968a6b2c1142f8d231587b775be113e7ee90d9a89bec8cd70"; + i686-linux = "4fd01951b3f57b69731f85d6eae6962257c3a70c37d74751a098bc00ea43085a"; + x86_64-darwin = "a3b9fd83dea4cfa959ddd72be4cbcb8d0503f4ab2741705561b62de8b5218895"; + aarch64-darwin = "3894d141b060d37f1248556525e96a9fc1d4afc237b740f5093bdcd5731972d1"; + headers = "0h1gzrd6rdd217q0im0g1hr3b037dmi4v6wk30kzb12597ww59n1"; }; } From 0dd351d423a56e796e2ed758364f112c39c896de Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Fri, 26 Nov 2021 23:48:25 +0000 Subject: [PATCH 07/11] trezor-suite: 21.10.2 -> 21.11.2 https://github.com/trezor/trezor-suite/releases/tag/v21.11.1 https://github.com/trezor/trezor-suite/releases/tag/v21.11.2 --- pkgs/applications/blockchains/trezor-suite/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/blockchains/trezor-suite/default.nix b/pkgs/applications/blockchains/trezor-suite/default.nix index 10418c418f6d..440fec3c44bf 100644 --- a/pkgs/applications/blockchains/trezor-suite/default.nix +++ b/pkgs/applications/blockchains/trezor-suite/default.nix @@ -8,7 +8,7 @@ let pname = "trezor-suite"; - version = "21.10.2"; + version = "21.11.2"; name = "${pname}-${version}"; suffix = { @@ -19,8 +19,8 @@ let src = fetchurl { url = "https://github.com/trezor/${pname}/releases/download/v${version}/Trezor-Suite-${version}-${suffix}.AppImage"; sha512 = { # curl -Lfs https://github.com/trezor/trezor-suite/releases/latest/download/latest-linux{-arm64,}.yml | grep ^sha512 | sed 's/: /-/' - aarch64-linux = "sha512-+qXN9cQk1u18ZzeMecPNfhkTTsw61iM/IJYksPJl9+zx2AKldv9tAFUnnmKZ65LabiaIXI+emN185SRRcaOndw=="; - x86_64-linux = "sha512-WpiG8VOEODqsQ1/jERiEEGwVqR0zbMqERGjOysEVYorA0p3xZyl7OSpWOSWaUjPBZpQtJIBdqhSXeoSRcvfJgg=="; + aarch64-linux = "sha512-QX5Ak2F1aD846BuGNcP1K/2c77Ut3LK3UiXsUPqiSBGZ9YRgdzROqdGjCVnTBBhxeCfGYQDhWmpuOpNbLr4eYg=="; + x86_64-linux = "sha512-ckMlZoLEq3aLzyhoWf2rRE3XxNQhqo6rUHF2NKoV08sXz+Zth2Lk+P3te1vwFQl+Efryl84RTwVGWKmloZ8k9A=="; }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); }; From 7944324d80d50bdfa7649598db6a06f0620cd9bb Mon Sep 17 00:00:00 2001 From: Chad Jablonski Date: Fri, 26 Nov 2021 23:19:39 -0500 Subject: [PATCH 08/11] programmer-calculator: 2.1 -> 2.2 --- .../science/math/programmer-calculator/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/math/programmer-calculator/default.nix b/pkgs/applications/science/math/programmer-calculator/default.nix index 0238e5333577..e9c7cb985cb9 100644 --- a/pkgs/applications/science/math/programmer-calculator/default.nix +++ b/pkgs/applications/science/math/programmer-calculator/default.nix @@ -2,13 +2,13 @@ gccStdenv.mkDerivation rec { pname = "programmer-calculator"; - version = "2.1"; + version = "2.2"; src = fetchFromGitHub { owner = "alt-romes"; repo = pname; rev = "v${version}"; - sha256 = "1vvpbj24ijl9ma0h669n9x0z1im3vqdf8zf2li0xf5h97b14gmv0"; + sha256 = "sha256-JQcYCYKdjdy8U2XMFzqTH9kAQ7CFv0r+sC1YfuAm7p8="; }; buildInputs = [ ncurses ]; From f104c1434bb9458da9b49c0c9a7066c8e3d967c3 Mon Sep 17 00:00:00 2001 From: Thomas Wu Date: Sat, 27 Nov 2021 14:49:46 +0800 Subject: [PATCH 09/11] tinyscheme: add aarch64-darwin to badplatforms Tinyscheme is not supported for aarch64-darwin --- pkgs/development/interpreters/tinyscheme/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/interpreters/tinyscheme/default.nix b/pkgs/development/interpreters/tinyscheme/default.nix index 3d4cfea465a6..0590062b3a4b 100644 --- a/pkgs/development/interpreters/tinyscheme/default.nix +++ b/pkgs/development/interpreters/tinyscheme/default.nix @@ -29,5 +29,6 @@ stdenv.mkDerivation rec { license = licenses.bsdOriginal; maintainers = [ maintainers.ebzzry ]; platforms = platforms.unix; + badPlatforms = [ "aarch64-darwin" ]; }; } From 7ae23b2ffc159bcc295c62ba89c89a1db94d39cc Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 27 Nov 2021 09:24:46 +0100 Subject: [PATCH 10/11] gdu: 5.10.1 -> 5.11.0 --- pkgs/tools/system/gdu/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/system/gdu/default.nix b/pkgs/tools/system/gdu/default.nix index d9c3bc3338f1..d5bcdb6f0806 100644 --- a/pkgs/tools/system/gdu/default.nix +++ b/pkgs/tools/system/gdu/default.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "gdu"; - version = "5.10.1"; + version = "5.11.0"; src = fetchFromGitHub { owner = "dundee"; repo = pname; rev = "v${version}"; - sha256 = "sha256-vBsjCSbgVo2kQJLB/ZyAG2F+80mVA3UF2RN+O0YQbhs="; + sha256 = "sha256-GOZms7kYAWQ0VBr8p3RjsQvKXN+lkP9ytHta/Fgln0c="; }; vendorSha256 = "0ls0pw1m6hy203cdkmp9847h2fmvc4hjkv5x2v6r7516cqbs25ac"; From 4982ca6e67ee2083589e5cafb45cb0efa173d955 Mon Sep 17 00:00:00 2001 From: Eduardo Quiros Date: Sat, 27 Nov 2021 04:01:03 -0600 Subject: [PATCH 11/11] tut: 0.0.36 -> 0.0.41 --- pkgs/applications/misc/tut/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/tut/default.nix b/pkgs/applications/misc/tut/default.nix index 0d0d1c394e2c..0a9c2d38fa4b 100644 --- a/pkgs/applications/misc/tut/default.nix +++ b/pkgs/applications/misc/tut/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "tut"; - version = "0.0.36"; + version = "0.0.41"; src = fetchFromGitHub { owner = "RasmusLindroth"; repo = pname; rev = version; - sha256 = "sha256-Ew/nrsJivq/3/vlZnR1gwhqzQQ9YmrW2LPD7qjmPH4A="; + sha256 = "sha256-13d3EE/rswcHRALUfL46qpKYJUDwGiou5kUz+nCC8VQ="; }; - vendorSha256 = "sha256-Q1H/Y2mDTr24JQMoTf8DL3cj5oF9lH0uaJD2g/0Yxko="; + vendorSha256 = "sha256-RtvzQvZIFdLo24U9IWcoL9qnf4/q/+1UCrb7dcRKEIE="; meta = with lib; { description = "A TUI for Mastodon with vim inspired keys";