From dd97523efec6e1a12989cedef9c572bc29545c6f Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 20 Sep 2021 14:32:50 +0200 Subject: [PATCH 01/15] esphome: 2021.9.0 -> 2021.9.1 --- pkgs/tools/misc/esphome/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/esphome/default.nix b/pkgs/tools/misc/esphome/default.nix index 3a7cc24e6700..a4678e357008 100644 --- a/pkgs/tools/misc/esphome/default.nix +++ b/pkgs/tools/misc/esphome/default.nix @@ -16,13 +16,13 @@ let in with python.pkgs; buildPythonApplication rec { pname = "esphome"; - version = "2021.9.0"; + version = "2021.9.1"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "sha256-QYtScfw+VFYc5rljDf1W+vI8Rx2UJuQ51yBTBVhO7Ns="; + sha256 = "sha256-JWUGOvY34wZSBTZdpuApPjEfBtgPSFKiVk89TUK441I="; }; patches = [ From 776745cb4792fe48702c7d50eb92130067fc2a53 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 22 Sep 2021 03:02:38 +0000 Subject: [PATCH 02/15] python38Packages.cvxopt: 1.2.6 -> 1.2.7 --- pkgs/development/python-modules/cvxopt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/cvxopt/default.nix b/pkgs/development/python-modules/cvxopt/default.nix index d3cbc94f7153..70c29e1f30be 100644 --- a/pkgs/development/python-modules/cvxopt/default.nix +++ b/pkgs/development/python-modules/cvxopt/default.nix @@ -17,13 +17,13 @@ assert (!blas.isILP64) && (!lapack.isILP64); buildPythonPackage rec { pname = "cvxopt"; - version = "1.2.6"; + version = "1.2.7"; disabled = isPyPy; # hangs at [translation:info] src = fetchPypi { inherit pname version; - sha256 = "a4c433706fd0ad9d47e7f222773a7f7601766fb8e74b633524b3c3fce29aa73e"; + sha256 = "3f9db1f4d4e820aaea81d6fc21054c89dc6327c84f935dd5a1eda1af11e1d504"; }; buildInputs = [ blas lapack ]; From b1ff8d9eedd24d5a993d86c9f71e4151022a129b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 23 Sep 2021 10:54:30 +0200 Subject: [PATCH 03/15] python3Packages.sendgrid: 6.8.1 -> 6.8.2 --- pkgs/development/python-modules/sendgrid/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/sendgrid/default.nix b/pkgs/development/python-modules/sendgrid/default.nix index 5aabcc2d0f10..a9492c3e8fdf 100644 --- a/pkgs/development/python-modules/sendgrid/default.nix +++ b/pkgs/development/python-modules/sendgrid/default.nix @@ -11,13 +11,13 @@ buildPythonPackage rec { pname = "sendgrid"; - version = "6.8.1"; + version = "6.8.2"; src = fetchFromGitHub { owner = pname; repo = "sendgrid-python"; rev = version; - sha256 = "sha256-rK/GouOv5RMDsn5NrCEtIz5a9wO6YATlhsRuhFuHaXY="; + sha256 = "sha256-TaewVBWQ6D5TH1TGXlXVBnW7K4HS/cFxJ6bcMv2DB+c="; }; propagatedBuildInputs = [ From f197780161cc7c5f339cfbca3b71905727e64b24 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 23 Sep 2021 10:58:59 +0200 Subject: [PATCH 04/15] python3Packages.atenpdu: 0.3.1 -> 0.3.2 --- pkgs/development/python-modules/atenpdu/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/atenpdu/default.nix b/pkgs/development/python-modules/atenpdu/default.nix index c8307608204a..4a8c0ff0f31a 100644 --- a/pkgs/development/python-modules/atenpdu/default.nix +++ b/pkgs/development/python-modules/atenpdu/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "atenpdu"; - version = "0.3.1"; + version = "0.3.2"; src = fetchPypi { inherit pname version; - sha256 = "1np9p3d180c26p54nw33alb003lhx6fprr21h45dd8gqk3slm13c"; + sha256 = "sha256-hlbrjx6WKVJYaxrMT4fiRXlxKRcQU4AIQUVgA8mbWa8="; }; propagatedBuildInputs = [ pysnmp ]; From 2f04ac8561df0a8ace7b9bffebc99b5de3eb2c86 Mon Sep 17 00:00:00 2001 From: Sumner Evans Date: Thu, 23 Sep 2021 07:45:41 -0600 Subject: [PATCH 05/15] heisenbridge: 1.1.2 -> 1.2.0 See release notes https://github.com/hifi/heisenbridge/releases/tag/v1.2.0 Adds the mautrix-python dependency --- pkgs/servers/heisenbridge/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/heisenbridge/default.nix b/pkgs/servers/heisenbridge/default.nix index 620cf5209ee4..37b95cf8c942 100644 --- a/pkgs/servers/heisenbridge/default.nix +++ b/pkgs/servers/heisenbridge/default.nix @@ -2,18 +2,19 @@ python3Packages.buildPythonPackage rec { pname = "heisenbridge"; - version = "1.1.2"; + version = "1.2.0"; # Use the release tarball because it has the version set correctly using the # version.txt file. src = fetchurl { url = "https://github.com/hifi/heisenbridge/releases/download/v${version}/heisenbridge-${version}.tar.gz"; - sha256 = "sha256-hY0dB4QT9W18ubUytvJwRUWKpNQMpyYdSLbmu+c8BCo="; + sha256 = "sha256-xSqtgUlB7/4QWsq5+8YhxxfQyufpuscIIROJnlnFZn0="; }; propagatedBuildInputs = with python3Packages; [ aiohttp irc + mautrix pyyaml ]; From 889dba01cce5ea45a2bd733f671eee7cb6818cff Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 23 Sep 2021 19:46:48 +0000 Subject: [PATCH 06/15] python38Packages.pontos: 21.9.0 -> 21.9.1 --- pkgs/development/python-modules/pontos/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pontos/default.nix b/pkgs/development/python-modules/pontos/default.nix index f468354e7b18..1a67c4a2154d 100644 --- a/pkgs/development/python-modules/pontos/default.nix +++ b/pkgs/development/python-modules/pontos/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "pontos"; - version = "21.9.0"; + version = "21.9.1"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "greenbone"; repo = pname; rev = "v${version}"; - sha256 = "sha256-oNE15BGLKStIyMkuSyypZKFxa73Qsgnf+SMz/rq/gGg="; + sha256 = "1pgvpg5sjmd9p1i9lm39k4r5qsz158wfgwfa56rx0p8xqf00h1xp"; }; nativeBuildInputs = [ From 2169cfd85284126b61e89ef03468f5078a8acc79 Mon Sep 17 00:00:00 2001 From: figsoda Date: Thu, 23 Sep 2021 15:54:42 -0400 Subject: [PATCH 07/15] auto-cpufreq: fix version output --- pkgs/tools/system/auto-cpufreq/default.nix | 14 +++++-- .../auto-cpufreq/fix-version-output.patch | 37 +++++++++++++++++++ 2 files changed, 48 insertions(+), 3 deletions(-) create mode 100644 pkgs/tools/system/auto-cpufreq/fix-version-output.patch diff --git a/pkgs/tools/system/auto-cpufreq/default.nix b/pkgs/tools/system/auto-cpufreq/default.nix index 139cc295b87e..427fe12267ec 100644 --- a/pkgs/tools/system/auto-cpufreq/default.nix +++ b/pkgs/tools/system/auto-cpufreq/default.nix @@ -1,4 +1,4 @@ -{ lib, python3Packages, fetchFromGitHub }: +{ lib, python3Packages, fetchFromGitHub, substituteAll }: python3Packages.buildPythonPackage rec { pname = "auto-cpufreq"; @@ -16,8 +16,16 @@ python3Packages.buildPythonPackage rec { doCheck = false; pythonImportsCheck = [ "auto_cpufreq" ]; - # patch to prevent script copying and to disable install - patches = [ ./prevent-install-and-copy.patch ]; + patches = [ + # hardcodes version output + (substituteAll { + src = ./fix-version-output.patch; + inherit version; + }) + + # patch to prevent script copying and to disable install + ./prevent-install-and-copy.patch + ]; postInstall = '' # copy script manually diff --git a/pkgs/tools/system/auto-cpufreq/fix-version-output.patch b/pkgs/tools/system/auto-cpufreq/fix-version-output.patch new file mode 100644 index 000000000000..69293a4c3dc2 --- /dev/null +++ b/pkgs/tools/system/auto-cpufreq/fix-version-output.patch @@ -0,0 +1,37 @@ +--- a/auto_cpufreq/core.py ++++ b/auto_cpufreq/core.py +@@ -68,32 +68,8 @@ dist_name = distro.id() + + # display running version of auto-cpufreq + def app_version(): +- +- print("auto-cpufreq version:") +- +- # snap package +- if os.getenv("PKG_MARKER") == "SNAP": +- print(getoutput("echo Snap: $SNAP_VERSION")) +- # aur package +- elif dist_name in ["arch", "manjaro", "garuda"]: +- aur_pkg_check = call("pacman -Qs auto-cpufreq > /dev/null", shell=True) +- if aur_pkg_check == 1: +- print( +- "Git commit:", +- check_output(["git", "describe", "--always"]).strip().decode(), +- ) +- else: +- print(getoutput("pacman -Qi auto-cpufreq | grep Version")) +- else: +- # source code (auto-cpufreq-installer) +- try: +- print( +- "Git commit:", +- check_output(["git", "describe", "--always"]).strip().decode(), +- ) +- except Exception as e: +- print(repr(e)) +- pass ++ print("auto-cpufreq version: @version@") ++ print("Git commit: v@version@") + + + def app_res_use(): From bf2a71631fdeb5719492bfeaf9f0fca6170f2c2e Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 23 Sep 2021 22:09:25 +0200 Subject: [PATCH 08/15] python3Packages.kubernetes: fix build, refactor --- .../python-modules/kubernetes/default.nix | 72 ++++++++++++------- 1 file changed, 48 insertions(+), 24 deletions(-) diff --git a/pkgs/development/python-modules/kubernetes/default.nix b/pkgs/development/python-modules/kubernetes/default.nix index e90f72b0fd25..da3c36f6ce04 100644 --- a/pkgs/development/python-modules/kubernetes/default.nix +++ b/pkgs/development/python-modules/kubernetes/default.nix @@ -1,34 +1,58 @@ -{ lib, buildPythonPackage, fetchPypi, pythonAtLeast, - ipaddress, websocket-client, urllib3, pyyaml, requests_oauthlib, python-dateutil, google-auth, adal, - isort, pytest, coverage, mock, sphinx, autopep8, pep8, codecov, recommonmark, nose }: +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder + +# propgatedBuildInputs +, adal +, certifi +, google-auth +, python-dateutil +, pyyaml +, requests +, requests_oauthlib +, urllib3 +, websocket-client + +# tests +, pytestCheckHook +, mock +}: buildPythonPackage rec { pname = "kubernetes"; version = "18.20.0"; + format = "setuptools"; + disabled = pythonOlder "3.6"; - prePatch = '' - sed -e 's/sphinx>=1.2.1,!=1.3b1,<1.4 # BSD/sphinx/' -i test-requirements.txt - - # This is used to randomize tests, which is not reproducible. Drop it. - sed -e '/randomize/d' -i test-requirements.txt - '' - # This is a python2 and python3.2 only requiremet since it is a backport of a python-3.3 api. - + (if (pythonAtLeast "3.3") then '' - sed -e '/ipaddress/d' -i requirements.txt - '' else ""); - - doCheck = pythonAtLeast "3"; - checkPhase = '' - py.test --ignore=kubernetes/dynamic/test_client.py - ''; - - src = fetchPypi { - inherit pname version; - sha256 = "0c72d00e7883375bd39ae99758425f5e6cb86388417cf7cc84305c211b2192cf"; + src = fetchFromGitHub { + owner = "kubernetes-client"; + repo = "python"; + rev = "v${version}"; + sha256 = "1sawp62j7h0yksmg9jlv4ik9b9i1a1w9syywc9mv8x89wibf5ql1"; + fetchSubmodules = true; }; - checkInputs = [ isort coverage pytest mock sphinx autopep8 pep8 codecov recommonmark nose ]; - propagatedBuildInputs = [ ipaddress websocket-client urllib3 pyyaml requests_oauthlib python-dateutil google-auth adal ]; + propagatedBuildInputs = [ + adal + certifi + google-auth + python-dateutil + pyyaml + requests + requests_oauthlib + urllib3 + websocket-client + ]; + + pythonImportsCheck = [ + "kubernetes" + ]; + + checkInputs = [ + mock + pytestCheckHook + ]; meta = with lib; { description = "Kubernetes python client"; From c9dcfe33a8f008b11e0276e4f2d0649e172034cc Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 23 Sep 2021 22:35:43 +0200 Subject: [PATCH 09/15] python3Packages.openshift: relax kubernetes constraint and enable tests. --- .../python-modules/openshift/default.nix | 46 +++++++++++++------ 1 file changed, 32 insertions(+), 14 deletions(-) diff --git a/pkgs/development/python-modules/openshift/default.nix b/pkgs/development/python-modules/openshift/default.nix index cf604ea38181..78e0c53c9112 100644 --- a/pkgs/development/python-modules/openshift/default.nix +++ b/pkgs/development/python-modules/openshift/default.nix @@ -1,23 +1,33 @@ -{ - lib - , buildPythonPackage - , fetchPypi - , jinja2 - , kubernetes - , ruamel-yaml - , six - , python-string-utils +{ lib +, buildPythonPackage +, fetchFromGitHub +, jinja2 +, kubernetes +, ruamel-yaml +, six +, python-string-utils +, pytest-bdd +, pytestCheckHook }: buildPythonPackage rec { pname = "openshift"; version = "0.12.1"; - src = fetchPypi { - inherit pname version; - sha256 = "a38957684b17ad0e140a87226249bf26de7267db0c83a6d512b48be258052e1a"; + src = fetchFromGitHub { + owner = "openshift"; + repo = "openshift-restclient-python"; + rev = "v${version}"; + sha256 = "1di55xg3nl4dwrrfw314p4mfm6593kdi7ia517v1sm6x5p4hjl78"; }; + postPatch = '' + substituteInPlace requirements.txt \ + --replace "kubernetes ~= 12.0" "kubernetes" + + sed -i '/--cov/d' setup.cfg + ''; + propagatedBuildInputs = [ jinja2 kubernetes @@ -26,10 +36,18 @@ buildPythonPackage rec { six ]; - # tries to connect to the network - doCheck = false; pythonImportsCheck = ["openshift"]; + checkInputs = [ + pytest-bdd + pytestCheckHook + ]; + + disabledTestPaths = [ + # requires docker + "test/functional" + ]; + meta = with lib; { description = "Python client for the OpenShift API"; homepage = "https://github.com/openshift/openshift-restclient-python"; From f4db40591019666f0821e36ee3f9023ab122bcfa Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 20 Sep 2021 03:53:58 +0200 Subject: [PATCH 10/15] python3Packages.priority: fix build, refactor package --- .../python-modules/priority/deadline.patch | 39 ------------------- .../python-modules/priority/default.nix | 27 ++++++++----- 2 files changed, 17 insertions(+), 49 deletions(-) delete mode 100644 pkgs/development/python-modules/priority/deadline.patch diff --git a/pkgs/development/python-modules/priority/deadline.patch b/pkgs/development/python-modules/priority/deadline.patch deleted file mode 100644 index 174dbc2b199c..000000000000 --- a/pkgs/development/python-modules/priority/deadline.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 9d933c3c6535c1c63291e3d35f4ada9135d422df Mon Sep 17 00:00:00 2001 -From: Alyssa Ross -Date: Mon, 11 Mar 2019 02:08:43 +0000 -Subject: [PATCH] Allow test_period_of_repetition to be slow - -Recent versions of hypothesis default to a 200ms timeout, which wasn't -enough for my Thinkpad X220 to run this test. I've increased the timeout -for this single test to hopefully a reasonable amount for older -hardware. - -(cherry picked from commit 752beb3a32b59f54168816da531c9d2a387f9715) ---- - test/test_priority.py | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/test/test_priority.py b/test/test_priority.py -index c98a28d..013ce30 100644 ---- a/test/test_priority.py -+++ b/test/test_priority.py -@@ -12,7 +12,7 @@ import itertools - - import pytest - --from hypothesis import given -+from hypothesis import given, settings - from hypothesis.strategies import ( - integers, lists, tuples, sampled_from - ) -@@ -489,6 +489,7 @@ class TestPriorityTreeOutput(object): - fairness and equidistribution. - """ - @given(STREAMS_AND_WEIGHTS) -+ @settings(deadline=None) - def test_period_of_repetition(self, streams_and_weights): - """ - The period of repetition of a priority sequence is given by the sum of --- -2.19.2 - diff --git a/pkgs/development/python-modules/priority/default.nix b/pkgs/development/python-modules/priority/default.nix index 0f11347a74b8..16908e90c9e6 100644 --- a/pkgs/development/python-modules/priority/default.nix +++ b/pkgs/development/python-modules/priority/default.nix @@ -1,28 +1,35 @@ -{ lib, buildPythonPackage, fetchPypi, pytest, hypothesis }: +{ lib +, buildPythonPackage +, pythonOlder +, fetchPypi +, hypothesis +, pytestCheckHook +}: buildPythonPackage rec { pname = "priority"; version = "2.0.0"; + format = "setuptools"; + disabled = pythonOlder "3.6.1"; src = fetchPypi { inherit pname version; sha256 = "c965d54f1b8d0d0b19479db3924c7c36cf672dbf2aec92d43fbdaf4492ba18c0"; }; - patches = [ - # https://github.com/python-hyper/priority/pull/135 - ./deadline.patch + pythonImportsCheck = [ + "priority" ]; - checkInputs = [ pytest hypothesis ]; - checkPhase = '' - PYTHONPATH="src:$PYTHONPATH" pytest - ''; + checkInputs = [ + hypothesis + pytestCheckHook + ]; meta = with lib; { - homepage = "https://python-hyper.org/priority/"; description = "A pure-Python implementation of the HTTP/2 priority tree"; + homepage = "https://github.com/python-hyper/priority/"; license = licenses.mit; - maintainers = [ maintainers.qyliss ]; + maintainers = with maintainers; [ qyliss ]; }; } From 38d1ee33e9998ae5e2636fa558a4f770b7824069 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 18 Sep 2021 14:10:02 +0200 Subject: [PATCH 11/15] python3Packages.flask-migrate: fix build Test data was not part of the PyPi release. Closes: #138330 --- .../python-modules/flask-migrate/default.nix | 46 +++++++++++++++---- 1 file changed, 36 insertions(+), 10 deletions(-) diff --git a/pkgs/development/python-modules/flask-migrate/default.nix b/pkgs/development/python-modules/flask-migrate/default.nix index 010e79ecbf2c..9f70e129ae1a 100644 --- a/pkgs/development/python-modules/flask-migrate/default.nix +++ b/pkgs/development/python-modules/flask-migrate/default.nix @@ -1,25 +1,51 @@ -{ lib, buildPythonPackage, fetchPypi, isPy3k, glibcLocales, flask, flask_sqlalchemy, flask_script, alembic }: +{ lib +, buildPythonPackage +, fetchFromGitHub +, isPy27 +, alembic +, flask +, flask_script +, flask_sqlalchemy +, python +}: buildPythonPackage rec { pname = "Flask-Migrate"; version = "3.1.0"; + format = "setuptools"; + disabled = isPy27; - src = fetchPypi { - inherit pname version; - sha256 = "57d6060839e3a7f150eaab6fe4e726d9e3e7cffe2150fb223d73f92421c6d1d9"; + src = fetchFromGitHub { + owner = "miguelgrinberg"; + repo = pname; + rev = "v${version}"; + sha256 = "0zj7qpknvlhrh4fsp5sx4fwyx3sp41ynclka992zympm3xym9zyq"; }; - checkInputs = [ flask_script ] ++ lib.optional isPy3k glibcLocales; - propagatedBuildInputs = [ flask flask_sqlalchemy alembic ]; + propagatedBuildInputs = [ + alembic + flask + flask_sqlalchemy + ]; - # tests invoke the flask cli which uses click and therefore has py3k encoding troubles - preCheck = lib.optionalString isPy3k '' - export LANG="en_US.UTF-8" + pythonImportsCheck = [ + "flask_migrate" + ]; + + checkInputs = [ + flask_script + ]; + + checkPhase = '' + runHook preCheck + ${python.interpreter} -m unittest discover + runHook postCheck ''; meta = with lib; { description = "SQLAlchemy database migrations for Flask applications using Alembic"; - license = licenses.mit; homepage = "https://github.com/miguelgrinberg/Flask-Migrate"; + license = licenses.mit; + maintainers = with maintainers; [ ]; }; } From 924cbbd2fdbd3bdb0f4c79d34ff0933d60b08f66 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 18 Sep 2021 14:26:01 +0200 Subject: [PATCH 12/15] privacyidea: explicitly use fetchPypi in flask-migrate override The package moved to fetchFromGitHub, which does not support these kinds of overrides. --- pkgs/applications/misc/privacyidea/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/misc/privacyidea/default.nix b/pkgs/applications/misc/privacyidea/default.nix index 217ea6f5e6cc..b8e4ebf841cd 100644 --- a/pkgs/applications/misc/privacyidea/default.nix +++ b/pkgs/applications/misc/privacyidea/default.nix @@ -14,7 +14,8 @@ let }); flask_migrate = super.flask_migrate.overridePythonAttrs (oldAttrs: rec { version = "2.7.0"; - src = oldAttrs.src.override { + src = python3.pkgs.fetchPypi { + pname = "Flask-Migrate"; inherit version; sha256 = "ae2f05671588762dd83a21d8b18c51fe355e86783e24594995ff8d7380dffe38"; }; From 917fa7aeff1e708c8309086bffe68a69de2d3c67 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 23 Sep 2021 23:54:37 +0200 Subject: [PATCH 13/15] python3Packages.pontos: switch to poetry-core --- pkgs/development/python-modules/pontos/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pontos/default.nix b/pkgs/development/python-modules/pontos/default.nix index 1a67c4a2154d..1264e40f30d1 100644 --- a/pkgs/development/python-modules/pontos/default.nix +++ b/pkgs/development/python-modules/pontos/default.nix @@ -1,7 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub -, poetry +, poetry-core , pytestCheckHook , pythonOlder , colorful @@ -25,7 +25,7 @@ buildPythonPackage rec { }; nativeBuildInputs = [ - poetry + poetry-core ]; propagatedBuildInputs = [ From 7d9bcf3e877edad1b9e7a9c68e9c8970e1b2bf00 Mon Sep 17 00:00:00 2001 From: Olmo Kramer Date: Fri, 24 Sep 2021 00:12:53 +0200 Subject: [PATCH 14/15] vimPlugins.vim-argwrap: init at 2021-06-11 --- pkgs/misc/vim-plugins/generated.nix | 12 ++++++++++++ pkgs/misc/vim-plugins/vim-plugin-names | 1 + 2 files changed, 13 insertions(+) diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index f698bdd660bf..e5bce779e4e1 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -6448,6 +6448,18 @@ final: prev: meta.homepage = "https://github.com/ThePrimeagen/vim-apm/"; }; + vim-argwrap = buildVimPluginFrom2Nix { + pname = "vim-argwrap"; + version = "2021-06-11"; + src = fetchFromGitHub { + owner = "FooSoft"; + repo = "vim-argwrap"; + rev = "f1c1d2b0c763ed77f9b9f2515ffff99a72c6a757"; + sha256 = "03mnvb9sb1angzyyhm7d708yzb26bnrqv1x7dy67r1b6rflvv4wz"; + }; + meta.homepage = "https://github.com/FooSoft/vim-argwrap/"; + }; + vim-asterisk = buildVimPluginFrom2Nix { pname = "vim-asterisk"; version = "2020-02-03"; diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index 3f3008f3daea..9972ac76b5af 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -166,6 +166,7 @@ folke/tokyonight.nvim@main folke/trouble.nvim@main folke/twilight.nvim@main folke/which-key.nvim@main +FooSoft/vim-argwrap freitass/todo.txt-vim frigoeu/psc-ide-vim fruit-in/brainfuck-vim From 05cacac35c8f3778d157c8d5f3f8c1f253401f48 Mon Sep 17 00:00:00 2001 From: Olmo Kramer Date: Fri, 24 Sep 2021 00:15:47 +0200 Subject: [PATCH 15/15] vimPlugins.vim-qlist: init at 2019-07-18 --- pkgs/misc/vim-plugins/generated.nix | 12 ++++++++++++ pkgs/misc/vim-plugins/vim-plugin-names | 1 + 2 files changed, 13 insertions(+) diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index f698bdd660bf..98f88ba666f4 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -9139,6 +9139,18 @@ final: prev: meta.homepage = "https://github.com/romainl/vim-qf/"; }; + vim-qlist = buildVimPluginFrom2Nix { + pname = "vim-qlist"; + version = "2019-07-18"; + src = fetchFromGitHub { + owner = "romainl"; + repo = "vim-qlist"; + rev = "be8fba124bf13314435b1faab8f628436d4cffb1"; + sha256 = "0ska2mzx3hqqkq3fd09r0hlk2j8xc8mbbwfky31x3cmzsb9dksqw"; + }; + meta.homepage = "https://github.com/romainl/vim-qlist/"; + }; + vim-qml = buildVimPluginFrom2Nix { pname = "vim-qml"; version = "2020-11-03"; diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index 3f3008f3daea..e3799eb12e70 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -623,6 +623,7 @@ RobertAudi/securemodelines rodjek/vim-puppet romainl/vim-cool romainl/vim-qf +romainl/vim-qlist roman/golden-ratio romgrk/barbar.nvim romgrk/nvim-treesitter-context