From d6fe39ecc251362aaa969abf2304b4bdde712b09 Mon Sep 17 00:00:00 2001 From: Dzmitry Malyshau Date: Wed, 17 Nov 2021 08:43:55 -0500 Subject: [PATCH 01/62] maintainers: add kvark --- maintainers/maintainer-list.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 41018c41728b..6b284ce4291e 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -6344,6 +6344,13 @@ githubId = 449813; name = "Roman Kuznetsov"; }; + kvark = { + name = "Dzmitry Malyshau"; + email = "kvark@fastmail.com"; + matrix = "@kvark:matrix.org"; + github = "kvark"; + githubId = 107301; + }; kwohlfahrt = { email = "kai.wohlfahrt@gmail.com"; github = "kwohlfahrt"; From 634d44ab55add35de6b12fb8d2b8288c40d50560 Mon Sep 17 00:00:00 2001 From: Dzmitry Malyshau Date: Wed, 17 Nov 2021 12:28:27 -0500 Subject: [PATCH 02/62] python3Packages.python-hglib: init at 2.6.1 This is required for glean-sdk python module. It uses 2.6.1 specifically. We'd need to relax the requirement and update it to 2.6.2 later. --- .../python-modules/python-hglib/default.nix | 29 +++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 pkgs/development/python-modules/python-hglib/default.nix diff --git a/pkgs/development/python-modules/python-hglib/default.nix b/pkgs/development/python-modules/python-hglib/default.nix new file mode 100644 index 000000000000..cf0cf42124ab --- /dev/null +++ b/pkgs/development/python-modules/python-hglib/default.nix @@ -0,0 +1,29 @@ +{ lib +, python3Packages +}: + +python3Packages.buildPythonPackage rec { + pname = "python-hglib"; + # https://bugzilla.mozilla.org/show_bug.cgi?id=1741686 + version = "2.6.1"; + + src = python3Packages.fetchPypi { + inherit pname version; + sha256 = "sha256-fB+gy00zLdbshAmwR4fOukYj6X+zeGVvfKsLmWxso7I="; + }; + + buildInputs = [ + ]; + + # attempts to create a temporary `HGTMP` folder + doCheck = false; + + pythonImportsCheck = [ "hglib" ]; + + meta = with lib; { + description = "Library with a fast, convenient interface to Mercurial. It uses Mercurial’s command server for communication with hg."; + homepage = "https://www.mercurial-scm.org/wiki/PythonHglibs"; + license = licenses.mit; + maintainers = [ maintainers.kvark ]; + }; +} From 313f74cd73924b4b7dfc6f519cbc3f4db7c6c13b Mon Sep 17 00:00:00 2001 From: Dzmitry Malyshau Date: Wed, 17 Nov 2021 12:29:43 -0500 Subject: [PATCH 03/62] python3Packages.glean-parser: init at 4.3.1 Needed as a dependency of glean-sdk, which is needed for moz-phab. --- .../python-modules/glean-parser/default.nix | 49 +++++++++++++++++++ 1 file changed, 49 insertions(+) create mode 100644 pkgs/development/python-modules/glean-parser/default.nix diff --git a/pkgs/development/python-modules/glean-parser/default.nix b/pkgs/development/python-modules/glean-parser/default.nix new file mode 100644 index 000000000000..4b631a45ded0 --- /dev/null +++ b/pkgs/development/python-modules/glean-parser/default.nix @@ -0,0 +1,49 @@ +{ lib +, pkgs +, python3Packages +, setuptools-scm +}: + +python3Packages.buildPythonPackage rec { + pname = "glean_parser"; + version = "4.3.1"; + + disabled = python3Packages.pythonOlder "3.6"; + + src = python3Packages.fetchPypi { + inherit pname version; + sha256 = "sha256-wZSro1pX/50TlSfFMh71JlmXlJlONVutTDFL06tkw+s="; + }; + + propagatedBuildInputs = with python3Packages; [ + appdirs + click + diskcache + jinja2 + jsonschema + pytest + pytest-runner + pyyaml + yamllint + ]; + nativeBuildInputs = [ + setuptools-scm + ]; + + checkInputs = [ + python3Packages.pytestCheckHook + ]; + disabledTests = [ + # https://bugzilla.mozilla.org/show_bug.cgi?id=1741668 + "test_validate_ping" + ]; + + pythonImportsCheck = [ "glean_parser" ]; + + meta = with lib; { + description = "Tools for parsing the metadata for Mozilla's glean telemetry SDK"; + homepage = "https://github.com/mozilla/glean_parser"; + license = licenses.mpl20; + maintainers = [ maintainers.kvark ]; + }; +} From a811dea815a5494928c46851cc149f91133b0721 Mon Sep 17 00:00:00 2001 From: Dzmitry Malyshau Date: Wed, 17 Nov 2021 12:30:27 -0500 Subject: [PATCH 04/62] python3Packages.glean-sdk: init at 42.2.0 Needed for moz-phab. --- .../python-modules/glean-sdk/default.nix | 42 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 6 +++ 2 files changed, 48 insertions(+) create mode 100644 pkgs/development/python-modules/glean-sdk/default.nix diff --git a/pkgs/development/python-modules/glean-sdk/default.nix b/pkgs/development/python-modules/glean-sdk/default.nix new file mode 100644 index 000000000000..926bf01308d5 --- /dev/null +++ b/pkgs/development/python-modules/glean-sdk/default.nix @@ -0,0 +1,42 @@ +{ lib +, pkgs +, python3Packages +, rustPlatform +, setuptools-rust +}: + +python3Packages.buildPythonPackage rec { + pname = "glean-sdk"; + version = "42.2.0"; + + src = python3Packages.fetchPypi { + inherit pname version; + sha256 = "sha256-X2p6KQnEB6ZHdCHGFVEoEMiI+0R2vfGqel+jFKTcx74="; + }; + + cargoDeps = rustPlatform.fetchCargoTarball { + inherit src; + name = "${pname}-${version}"; + sha256 = "sha256-/+rKGPYTLovgjTGL2F/pWzlUy1tY207yuJz3Xdhm1hg="; + }; + + nativeBuildInputs = [ + pkgs.rustc + pkgs.cargo + setuptools-rust + rustPlatform.cargoSetupHook + ]; + propagatedBuildInputs = with python3Packages; [ + cffi + glean-parser + ]; + + pythonImportsCheck = [ "glean" ]; + + meta = with lib; { + description = "Modern cross-platform telemetry client libraries and are a part of the Glean project"; + homepage = "https://mozilla.github.io/glean/book/index.html"; + license = licenses.mpl20; + maintainers = [ maintainers.kvark ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 87b06b9eb148..6e733af61eed 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3126,6 +3126,10 @@ in { glcontext = callPackage ../development/python-modules/glcontext { }; + glean-parser = callPackage ../development/python-modules/glean-parser { }; + + glean-sdk = callPackage ../development/python-modules/glean-sdk { }; + glfw = callPackage ../development/python-modules/glfw { }; glob2 = callPackage ../development/python-modules/glob2 { }; @@ -7533,6 +7537,8 @@ in { python-gvm = callPackage ../development/python-modules/python-gvm { }; + python-hglib = callPackage ../development/python-modules/python-hglib { }; + python-hosts = callPackage ../development/python-modules/python-hosts { }; python-hpilo = callPackage ../development/python-modules/python-hpilo { }; From 51324da2e02964d9ed2fe24413d138f57abde1fb Mon Sep 17 00:00:00 2001 From: Dzmitry Malyshau Date: Wed, 17 Nov 2021 12:30:53 -0500 Subject: [PATCH 05/62] moz-phab: init at 0.1.99 The official Mozilla tool for code submissions. Needed to do anything useful on NixOS with Mozilla code. --- pkgs/applications/misc/moz-phab/default.nix | 38 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 40 insertions(+) create mode 100644 pkgs/applications/misc/moz-phab/default.nix diff --git a/pkgs/applications/misc/moz-phab/default.nix b/pkgs/applications/misc/moz-phab/default.nix new file mode 100644 index 000000000000..217bbe537083 --- /dev/null +++ b/pkgs/applications/misc/moz-phab/default.nix @@ -0,0 +1,38 @@ +{ lib, python3Packages, pkgs }: + +python3Packages.buildPythonApplication rec { + pname = "MozPhab"; + version = "0.1.99"; + + src = python3Packages.fetchPypi { + inherit pname version; + sha256 = "sha256-uKoMMSp5AIvB1qTRYAh7n1+2dDLneFbssfkfTTshfcs="; + }; + + propagatedBuildInputs = with python3Packages; [ + distro + glean-sdk + python-hglib + sentry-sdk + setuptools + ]; + buildInputs = [ + pkgs.mercurial + ]; + + # https://bugzilla.mozilla.org/show_bug.cgi?id=1741683 + doCheck = false; + + meta = with lib; { + description = "Phabricator CLI from Mozilla to support submission of a series of commits"; + longDescription = '' + moz-phab is a custom command-line tool, which communicates to + Phabricator’s API, providing several conveniences, including support for + submitting series of commits. + ''; + homepage = "https://moz-conduit.readthedocs.io/en/latest/phabricator-user.html"; + license = licenses.mpl20; + maintainers = [ maintainers.kvark ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 94c1272776df..184f3696834e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7047,6 +7047,8 @@ with pkgs; motion = callPackage ../applications/video/motion { }; + moz-phab = callPackage ../applications/misc/moz-phab { }; + mtail = callPackage ../servers/monitoring/mtail { }; multitail = callPackage ../tools/misc/multitail { }; From 34db5494488846b12fda5ddf0aa52edf3c9d2aae Mon Sep 17 00:00:00 2001 From: Dzmitry Malyshau Date: Thu, 18 Nov 2021 09:37:48 -0500 Subject: [PATCH 06/62] python3Packages.glean-sdk: apply patch for process environments --- .../python-modules/glean-sdk/default.nix | 7 +++++++ .../python-modules/glean-sdk/pr-1542.patch | 20 +++++++++++++++++++ 2 files changed, 27 insertions(+) create mode 100644 pkgs/development/python-modules/glean-sdk/pr-1542.patch diff --git a/pkgs/development/python-modules/glean-sdk/default.nix b/pkgs/development/python-modules/glean-sdk/default.nix index 926bf01308d5..551efd480124 100644 --- a/pkgs/development/python-modules/glean-sdk/default.nix +++ b/pkgs/development/python-modules/glean-sdk/default.nix @@ -3,6 +3,7 @@ , python3Packages , rustPlatform , setuptools-rust +, fetchpatch }: python3Packages.buildPythonPackage rec { @@ -14,6 +15,12 @@ python3Packages.buildPythonPackage rec { sha256 = "sha256-X2p6KQnEB6ZHdCHGFVEoEMiI+0R2vfGqel+jFKTcx74="; }; + patches = [ + # Fix the environment for spawned process + # https://github.com/mozilla/glean/pull/1542 + ./pr-1542.patch + ]; + cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; diff --git a/pkgs/development/python-modules/glean-sdk/pr-1542.patch b/pkgs/development/python-modules/glean-sdk/pr-1542.patch new file mode 100644 index 000000000000..f9a7b2723eba --- /dev/null +++ b/pkgs/development/python-modules/glean-sdk/pr-1542.patch @@ -0,0 +1,20 @@ +diff --git a/glean-core/python/glean/_process_dispatcher.py b/glean-core/python/glean/_process_dispatcher.py +index 33a8b12796..a39b54a917 100644 +--- a/glean-core/python/glean/_process_dispatcher.py ++++ b/glean-core/python/glean/_process_dispatcher.py +@@ -120,8 +120,14 @@ def dispatch(cls, func, args) -> Union[_SyncWorkWrapper, subprocess.Popen]: + Path(".coveragerc").absolute() + ) + ++ # Explicitly pass the contents of `sys.path` as `PYTHONPATH` to the ++ # subprocess so that there aren't any module search path ++ # differences. ++ python_path = ":".join(sys.path)[1:] ++ + p = subprocess.Popen( +- [sys.executable, _process_dispatcher_helper.__file__, payload] ++ [sys.executable, _process_dispatcher_helper.__file__, payload], ++ env={"PYTHONPATH": python_path}, + ) + + cls._last_process = p From ca7a71747d195affa8217401e26f8f81dbf02691 Mon Sep 17 00:00:00 2001 From: Dzmitry Malyshau Date: Fri, 19 Nov 2021 10:25:21 -0500 Subject: [PATCH 07/62] moz-phab: enable tests, remove pkgs dependency --- pkgs/applications/misc/moz-phab/D131618.diff | 13 ++++++++ pkgs/applications/misc/moz-phab/default.nix | 33 ++++++++++++++----- .../python-modules/glean-parser/default.nix | 30 ++++++++++++----- .../python-modules/glean-sdk/default.nix | 20 ++++++----- .../python-modules/python-hglib/default.nix | 23 +++++++------ pkgs/top-level/all-packages.nix | 2 +- 6 files changed, 85 insertions(+), 36 deletions(-) create mode 100644 pkgs/applications/misc/moz-phab/D131618.diff diff --git a/pkgs/applications/misc/moz-phab/D131618.diff b/pkgs/applications/misc/moz-phab/D131618.diff new file mode 100644 index 000000000000..6d415242f465 --- /dev/null +++ b/pkgs/applications/misc/moz-phab/D131618.diff @@ -0,0 +1,13 @@ +diff --git a/setup.py b/setup.py +--- a/setup.py ++++ b/setup.py +@@ -15,7 +15,7 @@ + install_requires=[ + "distro", + "glean-sdk>=36.0.0", +- "python-hglib==2.6.1", ++ "python-hglib>=2.6.2", + "sentry-sdk>=0.14.3", + "setuptools", + ], + diff --git a/pkgs/applications/misc/moz-phab/default.nix b/pkgs/applications/misc/moz-phab/default.nix index 217bbe537083..3ed14b69d612 100644 --- a/pkgs/applications/misc/moz-phab/default.nix +++ b/pkgs/applications/misc/moz-phab/default.nix @@ -1,27 +1,44 @@ -{ lib, python3Packages, pkgs }: +{ lib +, buildPythonApplication +, fetchPypi +, mercurial +# build inputs +, distro +, glean-sdk +, python-hglib +, sentry-sdk +, setuptools +}: -python3Packages.buildPythonApplication rec { +buildPythonApplication rec { pname = "MozPhab"; version = "0.1.99"; - src = python3Packages.fetchPypi { + src = fetchPypi { inherit pname version; sha256 = "sha256-uKoMMSp5AIvB1qTRYAh7n1+2dDLneFbssfkfTTshfcs="; }; - propagatedBuildInputs = with python3Packages; [ + patches = [ + # Relax python-hglib requirement + # https://phabricator.services.mozilla.com/D131618 + ./D131618.diff + ]; + + propagatedBuildInputs = [ distro glean-sdk python-hglib sentry-sdk setuptools ]; - buildInputs = [ - pkgs.mercurial + checkInputs = [ + mercurial ]; - # https://bugzilla.mozilla.org/show_bug.cgi?id=1741683 - doCheck = false; + preCheck = '' + export HOME=$(mktemp -d) + ''; meta = with lib; { description = "Phabricator CLI from Mozilla to support submission of a series of commits"; diff --git a/pkgs/development/python-modules/glean-parser/default.nix b/pkgs/development/python-modules/glean-parser/default.nix index 4b631a45ded0..a9b475971490 100644 --- a/pkgs/development/python-modules/glean-parser/default.nix +++ b/pkgs/development/python-modules/glean-parser/default.nix @@ -1,28 +1,38 @@ { lib -, pkgs -, python3Packages +, buildPythonPackage +, fetchPypi +, pytestCheckHook +, pytest +, pytest-runner +, pythonOlder , setuptools-scm +# build inputs +, appdirs +, click +, diskcache +, jinja2 +, jsonschema +, pyyaml +, yamllint }: -python3Packages.buildPythonPackage rec { +buildPythonPackage rec { pname = "glean_parser"; version = "4.3.1"; - disabled = python3Packages.pythonOlder "3.6"; + disabled = pythonOlder "3.6"; - src = python3Packages.fetchPypi { + src = fetchPypi { inherit pname version; sha256 = "sha256-wZSro1pX/50TlSfFMh71JlmXlJlONVutTDFL06tkw+s="; }; - propagatedBuildInputs = with python3Packages; [ + propagatedBuildInputs = [ appdirs click diskcache jinja2 jsonschema - pytest - pytest-runner pyyaml yamllint ]; @@ -31,7 +41,9 @@ python3Packages.buildPythonPackage rec { ]; checkInputs = [ - python3Packages.pytestCheckHook + pytestCheckHook + pytest + pytest-runner ]; disabledTests = [ # https://bugzilla.mozilla.org/show_bug.cgi?id=1741668 diff --git a/pkgs/development/python-modules/glean-sdk/default.nix b/pkgs/development/python-modules/glean-sdk/default.nix index 551efd480124..ac9d4b5c7784 100644 --- a/pkgs/development/python-modules/glean-sdk/default.nix +++ b/pkgs/development/python-modules/glean-sdk/default.nix @@ -1,16 +1,20 @@ { lib -, pkgs -, python3Packages +, buildPythonPackage +, fetchPypi , rustPlatform +, rustc +, cargo , setuptools-rust -, fetchpatch +# build inputs +, cffi +, glean-parser }: -python3Packages.buildPythonPackage rec { +buildPythonPackage rec { pname = "glean-sdk"; version = "42.2.0"; - src = python3Packages.fetchPypi { + src = fetchPypi { inherit pname version; sha256 = "sha256-X2p6KQnEB6ZHdCHGFVEoEMiI+0R2vfGqel+jFKTcx74="; }; @@ -28,12 +32,12 @@ python3Packages.buildPythonPackage rec { }; nativeBuildInputs = [ - pkgs.rustc - pkgs.cargo + rustc + cargo setuptools-rust rustPlatform.cargoSetupHook ]; - propagatedBuildInputs = with python3Packages; [ + propagatedBuildInputs = [ cffi glean-parser ]; diff --git a/pkgs/development/python-modules/python-hglib/default.nix b/pkgs/development/python-modules/python-hglib/default.nix index cf0cf42124ab..9d667dcba853 100644 --- a/pkgs/development/python-modules/python-hglib/default.nix +++ b/pkgs/development/python-modules/python-hglib/default.nix @@ -1,22 +1,25 @@ { lib -, python3Packages +, buildPythonPackage +, fetchPypi +, mercurial +, nose }: -python3Packages.buildPythonPackage rec { +buildPythonPackage rec { pname = "python-hglib"; - # https://bugzilla.mozilla.org/show_bug.cgi?id=1741686 - version = "2.6.1"; + version = "2.6.2"; - src = python3Packages.fetchPypi { + src = fetchPypi { inherit pname version; - sha256 = "sha256-fB+gy00zLdbshAmwR4fOukYj6X+zeGVvfKsLmWxso7I="; + sha256 = "sha256-sYvR7VPJDuV9VxTWata7crZOkw1K7KmDCJLAi7KNpgg="; }; - buildInputs = [ - ]; + checkInputs = [ mercurial nose ]; - # attempts to create a temporary `HGTMP` folder - doCheck = false; + preCheck = '' + export HGTMP=$(mktemp -d) + export HGUSER=test + ''; pythonImportsCheck = [ "hglib" ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 184f3696834e..1e5e961327e4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7047,7 +7047,7 @@ with pkgs; motion = callPackage ../applications/video/motion { }; - moz-phab = callPackage ../applications/misc/moz-phab { }; + moz-phab = python3Packages.callPackage ../applications/misc/moz-phab { }; mtail = callPackage ../servers/monitoring/mtail { }; From 836ba699decfea81318f5219830182884312b812 Mon Sep 17 00:00:00 2001 From: Dzmitry Malyshau Date: Fri, 19 Nov 2021 12:25:50 -0500 Subject: [PATCH 08/62] moz-phab: rename patch files --- pkgs/applications/misc/moz-phab/default.nix | 9 +++++---- .../moz-phab/{D131618.diff => relax-hglib-version.diff} | 0 pkgs/development/python-modules/glean-parser/default.nix | 2 -- pkgs/development/python-modules/glean-sdk/default.nix | 2 +- ...-1542.patch => fix-spawned-process-environment.patch} | 0 5 files changed, 6 insertions(+), 7 deletions(-) rename pkgs/applications/misc/moz-phab/{D131618.diff => relax-hglib-version.diff} (100%) rename pkgs/development/python-modules/glean-sdk/{pr-1542.patch => fix-spawned-process-environment.patch} (100%) diff --git a/pkgs/applications/misc/moz-phab/default.nix b/pkgs/applications/misc/moz-phab/default.nix index 3ed14b69d612..9666f974957a 100644 --- a/pkgs/applications/misc/moz-phab/default.nix +++ b/pkgs/applications/misc/moz-phab/default.nix @@ -11,18 +11,19 @@ }: buildPythonApplication rec { - pname = "MozPhab"; + pname = "moz-phab"; version = "0.1.99"; src = fetchPypi { - inherit pname version; + pname = "MozPhab"; + inherit version; sha256 = "sha256-uKoMMSp5AIvB1qTRYAh7n1+2dDLneFbssfkfTTshfcs="; }; patches = [ # Relax python-hglib requirement # https://phabricator.services.mozilla.com/D131618 - ./D131618.diff + ./relax-hglib-version.diff ]; propagatedBuildInputs = [ @@ -50,6 +51,6 @@ buildPythonApplication rec { homepage = "https://moz-conduit.readthedocs.io/en/latest/phabricator-user.html"; license = licenses.mpl20; maintainers = [ maintainers.kvark ]; - platforms = platforms.all; + platforms = platforms.unix; }; } diff --git a/pkgs/applications/misc/moz-phab/D131618.diff b/pkgs/applications/misc/moz-phab/relax-hglib-version.diff similarity index 100% rename from pkgs/applications/misc/moz-phab/D131618.diff rename to pkgs/applications/misc/moz-phab/relax-hglib-version.diff diff --git a/pkgs/development/python-modules/glean-parser/default.nix b/pkgs/development/python-modules/glean-parser/default.nix index a9b475971490..feca6979b429 100644 --- a/pkgs/development/python-modules/glean-parser/default.nix +++ b/pkgs/development/python-modules/glean-parser/default.nix @@ -2,7 +2,6 @@ , buildPythonPackage , fetchPypi , pytestCheckHook -, pytest , pytest-runner , pythonOlder , setuptools-scm @@ -42,7 +41,6 @@ buildPythonPackage rec { checkInputs = [ pytestCheckHook - pytest pytest-runner ]; disabledTests = [ diff --git a/pkgs/development/python-modules/glean-sdk/default.nix b/pkgs/development/python-modules/glean-sdk/default.nix index ac9d4b5c7784..e729d927cdae 100644 --- a/pkgs/development/python-modules/glean-sdk/default.nix +++ b/pkgs/development/python-modules/glean-sdk/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { patches = [ # Fix the environment for spawned process # https://github.com/mozilla/glean/pull/1542 - ./pr-1542.patch + ./fix-spawned-process-environment.patch ]; cargoDeps = rustPlatform.fetchCargoTarball { diff --git a/pkgs/development/python-modules/glean-sdk/pr-1542.patch b/pkgs/development/python-modules/glean-sdk/fix-spawned-process-environment.patch similarity index 100% rename from pkgs/development/python-modules/glean-sdk/pr-1542.patch rename to pkgs/development/python-modules/glean-sdk/fix-spawned-process-environment.patch From a5f19b5fa81bd689bde5dbe0d579be6261ede7dd Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Fri, 19 Nov 2021 01:18:35 +0300 Subject: [PATCH 09/62] dico: fix cross-compilation --- pkgs/servers/dico/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/servers/dico/default.nix b/pkgs/servers/dico/default.nix index 13f69fcf4a35..0275046aa252 100644 --- a/pkgs/servers/dico/default.nix +++ b/pkgs/servers/dico/default.nix @@ -12,8 +12,12 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; + nativeBuildInputs = [ groff ]; + buildInputs = - [ libtool gettext zlib readline gsasl guile python3 pcre libffi groff ]; + [ libtool gettext zlib readline gsasl guile python3 pcre libffi ]; + + strictDeps = true; doCheck = true; From d820154199fca7630c488742fef7119456b14d50 Mon Sep 17 00:00:00 2001 From: Ivar Scholten Date: Wed, 17 Nov 2021 19:25:17 +0100 Subject: [PATCH 10/62] python-language-server: 2021-05-20 -> 2021-09-08, use buildDotnetModule --- .../python-language-server/create_deps.sh | 38 - .../python-language-server/default.nix | 102 +- .../python-language-server/deps.nix | 1350 ++--------------- .../python-language-server/format-deps.sh | 40 - .../python-language-server/manual_deps.txt | 2 - .../process_lockfile.py | 37 - .../python-language-server/updater.sh | 41 + pkgs/top-level/all-packages.nix | 4 +- 8 files changed, 180 insertions(+), 1434 deletions(-) delete mode 100755 pkgs/development/dotnet-modules/python-language-server/create_deps.sh delete mode 100755 pkgs/development/dotnet-modules/python-language-server/format-deps.sh delete mode 100644 pkgs/development/dotnet-modules/python-language-server/manual_deps.txt delete mode 100755 pkgs/development/dotnet-modules/python-language-server/process_lockfile.py create mode 100755 pkgs/development/dotnet-modules/python-language-server/updater.sh diff --git a/pkgs/development/dotnet-modules/python-language-server/create_deps.sh b/pkgs/development/dotnet-modules/python-language-server/create_deps.sh deleted file mode 100755 index 37f0585d1fef..000000000000 --- a/pkgs/development/dotnet-modules/python-language-server/create_deps.sh +++ /dev/null @@ -1,38 +0,0 @@ -#! /usr/bin/env nix-shell -#! nix-shell -p python3 dotnet-sdk_3 -i bash - -# Run this script to generate deps.nix -# ./create_deps.sh /path/to/microsoft/python/language/server/source/checkout - -set -euo pipefail - -SCRIPTDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )" - -if [ -d "$1" ]; then - CHECKOUT_PATH="$1" -else - echo "First argument must be a directory, the path to the Microsoft Python Language Server source checkout" - exit 1 -fi - -# Generate lockfiles in source checkout -cd "$CHECKOUT_PATH/src" -dotnet nuget locals all --clear -dotnet restore -v normal --no-cache PLS.sln --use-lock-file -r linux-x64 - -# Use the lockfiles to make a file with two columns: name and version number -# for all possible package dependencies -cd "$SCRIPTDIR" -echo "" > all_versions.txt -for lockfile in $(find "$CHECKOUT_PATH" -name packages.lock.json); do - echo "Processing lockfile $lockfile" - python ./process_lockfile.py "$lockfile" >> all_versions.txt -done -# Add extra manually added packages -cat ./manual_deps.txt >> all_versions.txt -cat all_versions.txt | sed '/^$/d' | sort | uniq > tmp -mv tmp all_versions.txt - -# Retrieve sha256 hashes for each dependency and format fetchNuGet calls into deps.nix -./format-deps.sh all_versions.txt > deps.nix -rm all_versions.txt diff --git a/pkgs/development/dotnet-modules/python-language-server/default.nix b/pkgs/development/dotnet-modules/python-language-server/default.nix index 0af98bbfc07a..420475806a0e 100644 --- a/pkgs/development/dotnet-modules/python-language-server/default.nix +++ b/pkgs/development/dotnet-modules/python-language-server/default.nix @@ -1,105 +1,39 @@ -{ lib, stdenv +{ lib +, stdenv , fetchFromGitHub -, fetchurl -, makeWrapper -, dotnet-sdk_3 +, buildDotnetModule +, dotnetCorePackages +, autoPatchelfHook , openssl , icu -, patchelf -, Nuget }: -let deps = import ./deps.nix { inherit fetchurl; }; - version = "2021-05-20"; - - # Build the nuget source needed for the later build all by itself - # since it's a time-consuming step that only depends on ./deps.nix. - # This makes it easier to experiment with the main build. - nugetSource = stdenv.mkDerivation { - pname = "python-language-server-nuget-deps"; - inherit version; - - dontUnpack = true; - - nativeBuildInputs = [ Nuget ]; - - buildPhase = '' - export HOME=$(mktemp -d) - - mkdir -p $out/lib - - # disable default-source so nuget does not try to download from online-repo - nuget sources Disable -Name "nuget.org" - # add all dependencies to the source - for package in ${toString deps}; do - nuget add $package -Source $out/lib - done - ''; - - dontInstall = true; - }; - -in - -stdenv.mkDerivation { +buildDotnetModule rec { pname = "python-language-server"; - inherit version; + version = "2021-09-08"; src = fetchFromGitHub { owner = "microsoft"; repo = "python-language-server"; - rev = "86825796eae15d4d46919bc6e32f1197196ba1b3"; - sha256 = "sha256-izDE7Oil9g47Jf3eHPtW5coNixF71t9i0oYSuelakCo="; + rev = "26ea18997f45f7d7bc5a3c5a9efc723a8dbb02fa"; + sha256 = "1m8pf9k20wy4fzv27v3bswvc8s01ag6ka2qm9nn6bgq0s0lq78mh"; }; - buildInputs = [dotnet-sdk_3 openssl icu]; + projectFile = "src/LanguageServer/Impl/Microsoft.Python.LanguageServer.csproj"; + nugetDeps = ./deps.nix; - nativeBuildInputs = [ - Nuget - makeWrapper - patchelf - ]; + dotnet-sdk = dotnetCorePackages.sdk_3_1; + dotnet-runtime = dotnetCorePackages.runtime_3_1; - buildPhase = '' - runHook preBuild - - mkdir home - export HOME=$(mktemp -d) - export DOTNET_CLI_TELEMETRY_OPTOUT=1 - export DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1 - - pushd src - nuget sources Disable -Name "nuget.org" - dotnet restore --source ${nugetSource}/lib -r linux-x64 - popd - - pushd src/LanguageServer/Impl - dotnet publish --no-restore -c Release -r linux-x64 - popd - - runHook postBuild - ''; - - installPhase = '' - runHook preInstall - - mkdir -p $out - cp -r output/bin/Release/linux-x64/publish $out/lib - - mkdir $out/bin - makeWrapper $out/lib/Microsoft.Python.LanguageServer $out/bin/python-language-server - - runHook postInstall - ''; + nativeBuildInputs = [ autoPatchelfHook ]; + buildInputs = [ stdenv.cc.cc.lib ]; + runtimeDeps = [ openssl icu ]; postFixup = '' - patchelf --set-rpath ${icu}/lib $out/lib/System.Globalization.Native.so - patchelf --set-rpath ${openssl.out}/lib $out/lib/System.Security.Cryptography.Native.OpenSsl.so + mv $out/bin/Microsoft.Python.LanguageServer $out/bin/python-language-server ''; - # If we don't disable stripping, the executable fails to start with an error about being unable - # to find some of the packaged DLLs. - dontStrip = true; + passthru.updateScript = ./updater.sh; meta = with lib; { description = "Microsoft Language Server for Python"; diff --git a/pkgs/development/dotnet-modules/python-language-server/deps.nix b/pkgs/development/dotnet-modules/python-language-server/deps.nix index 7a15a5f384fd..b88f6c8bf5b7 100644 --- a/pkgs/development/dotnet-modules/python-language-server/deps.nix +++ b/pkgs/development/dotnet-modules/python-language-server/deps.nix @@ -1,1231 +1,121 @@ -# This file is autogenerated. -# To regenerate, run "create_deps.sh $PATH_TO_LANGUAGE_SERVER_CHECKOUT" - -{ fetchurl }: let - - fetchNuGet = { name, version, sha256 }: fetchurl { - inherit sha256; - url = "https://www.nuget.org/api/v2/package/${name}/${version}"; - }; - -in [ - - (fetchNuGet { - name = "Ben.Demystifier"; - version = "0.1.6"; - sha256 = "03rk7imb2k3iass507rkr9chdnyk4h8ppyf20cdz3c2m3v1a5k9n"; - }) - - (fetchNuGet { - name = "Castle.Core"; - version = "4.4.0"; - sha256 = "0rpcbmyhckvlvp6vbzpj03c1gqz56ixc6f15vgmxmyf1g40c24pf"; - }) - - (fetchNuGet { - name = "FluentAssertions"; - version = "5.9.0"; - sha256 = "11mpnl6aar2yn7l6b1k4m3rdnl82ydmqbsja4rn84dhz1qdzfp8x"; - }) - - (fetchNuGet { - name = "MessagePack"; - version = "2.1.90"; - sha256 = "1j5wjl7aq7nn5ga3j6zaaivdf2wlfyd7w66ak0i7krgrmv26lb8i"; - }) - - (fetchNuGet { - name = "MessagePack.Annotations"; - version = "2.1.90"; - sha256 = "08sghhwbz8h7ji9lg0klhwcyndxg6v11pq9jac975sb38samnm11"; - }) - - (fetchNuGet { - name = "MicroBuild.Core"; - version = "0.3.0"; - sha256 = "190d755l60j3l5m1661wj19gj9w6ngza56q3vkijkkmbbabdmqln"; - }) - - (fetchNuGet { - name = "Microsoft.AspNetCore.App.Runtime.linux-x64"; - version = "3.1.21"; - sha256 = "056g9nv8a7n8zdbgzmyzmn3pbg52yq2kv5d1rcp7h6plwzgpiwql"; - }) - - (fetchNuGet { - name = "Microsoft.Bcl.AsyncInterfaces"; - version = "1.0.0"; - sha256 = "00dx5armvkqjxvkldz3invdlck9nj7w21dlsr2aqp1rqbyrbsbbh"; - }) - - (fetchNuGet { - name = "Microsoft.CodeCoverage"; - version = "16.7.1"; - sha256 = "1farw63445cdyciplfs6l9j1gayxw16rkzmrwsiswfyjhqz70xd4"; - }) - - (fetchNuGet { - name = "Microsoft.CSharp"; - version = "4.0.1"; - sha256 = "0zxc0apx1gcx361jlq8smc9pfdgmyjh6hpka8dypc9w23nlsh6yj"; - }) - - (fetchNuGet { - name = "Microsoft.Extensions.FileSystemGlobbing"; - version = "3.1.8"; - sha256 = "1v2lr0vbssqayzgxvdwb54jmvz7mvlih4l9h7i71gm3c62nlbq8y"; - }) - - (fetchNuGet { - name = "Microsoft.NetCore.App.Runtime.linux-x64"; - version = "3.1.21"; - sha256 = "13692wqcww0w6x4nhyxpxwprdg6mx9xmlvv38m6fvp6g0m27r43v"; - }) - - (fetchNuGet { - name = "Microsoft.NETCore.Platforms"; - version = "1.1.0"; - sha256 = "08vh1r12g6ykjygq5d3vq09zylgb84l63k49jc4v8faw9g93iqqm"; - }) - - (fetchNuGet { - name = "Microsoft.NETCore.Platforms"; - version = "1.1.1"; - sha256 = "164wycgng4mi9zqi2pnsf1pq6gccbqvw6ib916mqizgjmd8f44pj"; - }) - - (fetchNuGet { - name = "Microsoft.NETCore.Platforms"; - version = "3.0.0"; - sha256 = "1bk8r4r3ihmi6322jmcag14jmw11mjqys202azqjzglcx59pxh51"; - }) - - (fetchNuGet { - name = "Microsoft.NETCore.Platforms"; - version = "3.1.0"; - sha256 = "1gc1x8f95wk8yhgznkwsg80adk1lc65v9n5rx4yaa4bc5dva0z3j"; - }) - - (fetchNuGet { - name = "Microsoft.NETCore.Targets"; - version = "1.1.0"; - sha256 = "193xwf33fbm0ni3idxzbr5fdq3i2dlfgihsac9jj7whj0gd902nh"; - }) - - (fetchNuGet { - name = "Microsoft.NET.Test.Sdk"; - version = "16.7.1"; - sha256 = "0yqxipj74ax2n76w9ccydppx78ym8m5fda88qnvj4670qjvl0kf8"; - }) - - (fetchNuGet { - name = "Microsoft.TestPlatform.ObjectModel"; - version = "16.7.1"; - sha256 = "0s9dyh99gzdpk1i5v468i2r9m6i3jrr41r394pwdwiajsz99kay0"; - }) - - (fetchNuGet { - name = "Microsoft.TestPlatform.TestHost"; - version = "16.7.1"; - sha256 = "1xik06rxn9ps83in0zn9vcl2ibv3acmdqvrx07qq89lxj1sgqlhs"; - }) - - (fetchNuGet { - name = "Microsoft.VisualStudio.Threading"; - version = "16.5.132"; - sha256 = "05lngndl6hg4v3vk9l1n1g2lbfjb7jnr5dnkjld9wx3vamdfcfxw"; - }) - - (fetchNuGet { - name = "Microsoft.VisualStudio.Threading"; - version = "16.6.13"; - sha256 = "0qbvcwy7njz5zpqgfqdf41gf9xqcz64z4rkfjf6bi4zynpkv6n1l"; - }) - - (fetchNuGet { - name = "Microsoft.VisualStudio.Threading.Analyzers"; - version = "16.6.13"; - sha256 = "09nqkjnarwj0chb6xrzscq98mpgi86n2a3mfdd3y695kviq99s18"; - }) - - (fetchNuGet { - name = "Microsoft.VisualStudio.Validation"; - version = "15.5.31"; - sha256 = "1ah99rn922qa0sd2k3h64m324f2r32pw8cn4cfihgvwx4qdrpmgw"; - }) - - (fetchNuGet { - name = "Microsoft.Win32.Primitives"; - version = "4.3.0"; - sha256 = "0j0c1wj4ndj21zsgivsc24whiya605603kxrbiw6wkfdync464wq"; - }) - - (fetchNuGet { - name = "Microsoft.Win32.Registry"; - version = "4.6.0"; - sha256 = "0i4y782yrqqyx85pg597m20gm0v126w0j9ddk5z7xb3crx4z9f2s"; - }) - - (fetchNuGet { - name = "Microsoft.Win32.Registry"; - version = "4.7.0"; - sha256 = "0bx21jjbs7l5ydyw4p6cn07chryxpmchq2nl5pirzz4l3b0q4dgs"; - }) - - (fetchNuGet { - name = "MSTest.TestAdapter"; - version = "2.1.2"; - sha256 = "1390nyc0sf5c4j75cq58bzqjcw77sp2lmpllmm5sp8ysi0fjyfs5"; - }) - - (fetchNuGet { - name = "MSTest.TestFramework"; - version = "2.1.2"; - sha256 = "1617q2accpa8fwy9n1snmjxyx2fz3phks62mdi45cl65kdin0x4z"; - }) - - (fetchNuGet { - name = "Nerdbank.Streams"; - version = "2.5.76"; - sha256 = "017h8m1zrm247alhlz4vqsz580b8b88s50cyxb939hmc2nn0qlfv"; - }) - - (fetchNuGet { - name = "NETStandard.Library"; - version = "1.6.1"; - sha256 = "1z70wvsx2d847a2cjfii7b83pjfs34q05gb037fdjikv5kbagml8"; - }) - - (fetchNuGet { - name = "NETStandard.Library"; - version = "2.0.3"; - sha256 = "1fn9fxppfcg4jgypp2pmrpr6awl3qz1xmnri0cygpkwvyx27df1y"; - }) - - (fetchNuGet { - name = "Newtonsoft.Json"; - version = "12.0.2"; - sha256 = "0w2fbji1smd2y7x25qqibf1qrznmv4s6s0jvrbvr6alb7mfyqvh5"; - }) - - (fetchNuGet { - name = "Newtonsoft.Json"; - version = "12.0.3"; - sha256 = "17dzl305d835mzign8r15vkmav2hq8l6g7942dfjpnzr17wwl89x"; - }) - - (fetchNuGet { - name = "NewtonSoft.Json"; - version = "12.0.3"; - sha256 = "17dzl305d835mzign8r15vkmav2hq8l6g7942dfjpnzr17wwl89x"; - }) - - (fetchNuGet { - name = "Newtonsoft.Json"; - version = "9.0.1"; - sha256 = "0mcy0i7pnfpqm4pcaiyzzji4g0c8i3a5gjz28rrr28110np8304r"; - }) - - (fetchNuGet { - name = "NSubstitute"; - version = "4.2.2"; - sha256 = "1zi1z5i61c2nq8p3jwbkca28yaannrvv6g6q5mmz1775apmfyh79"; - }) - - (fetchNuGet { - name = "NuGet.Frameworks"; - version = "5.0.0"; - sha256 = "18ijvmj13cwjdrrm52c8fpq021531zaz4mj4b4zapxaqzzxf2qjr"; - }) - - (fetchNuGet { - name = "runtime.any.System.Collections"; - version = "4.3.0"; - sha256 = "0bv5qgm6vr47ynxqbnkc7i797fdi8gbjjxii173syrx14nmrkwg0"; - }) - - (fetchNuGet { - name = "runtime.any.System.Diagnostics.Tools"; - version = "4.3.0"; - sha256 = "1wl76vk12zhdh66vmagni66h5xbhgqq7zkdpgw21jhxhvlbcl8pk"; - }) - - (fetchNuGet { - name = "runtime.any.System.Diagnostics.Tracing"; - version = "4.3.0"; - sha256 = "00j6nv2xgmd3bi347k00m7wr542wjlig53rmj28pmw7ddcn97jbn"; - }) - - (fetchNuGet { - name = "runtime.any.System.Globalization"; - version = "4.3.0"; - sha256 = "1daqf33hssad94lamzg01y49xwndy2q97i2lrb7mgn28656qia1x"; - }) - - (fetchNuGet { - name = "runtime.any.System.Globalization.Calendars"; - version = "4.3.0"; - sha256 = "1ghhhk5psqxcg6w88sxkqrc35bxcz27zbqm2y5p5298pv3v7g201"; - }) - - (fetchNuGet { - name = "runtime.any.System.IO"; - version = "4.3.0"; - sha256 = "0l8xz8zn46w4d10bcn3l4yyn4vhb3lrj2zw8llvz7jk14k4zps5x"; - }) - - (fetchNuGet { - name = "runtime.any.System.Reflection"; - version = "4.3.0"; - sha256 = "02c9h3y35pylc0zfq3wcsvc5nqci95nrkq0mszifc0sjx7xrzkly"; - }) - - (fetchNuGet { - name = "runtime.any.System.Reflection.Extensions"; - version = "4.3.0"; - sha256 = "0zyri97dfc5vyaz9ba65hjj1zbcrzaffhsdlpxc9bh09wy22fq33"; - }) - - (fetchNuGet { - name = "runtime.any.System.Reflection.Primitives"; - version = "4.3.0"; - sha256 = "0x1mm8c6iy8rlxm8w9vqw7gb7s1ljadrn049fmf70cyh42vdfhrf"; - }) - - (fetchNuGet { - name = "runtime.any.System.Resources.ResourceManager"; - version = "4.3.0"; - sha256 = "03kickal0iiby82wa5flar18kyv82s9s6d4xhk5h4bi5kfcyfjzl"; - }) - - (fetchNuGet { - name = "runtime.any.System.Runtime"; - version = "4.3.0"; - sha256 = "1cqh1sv3h5j7ixyb7axxbdkqx6cxy00p4np4j91kpm492rf4s25b"; - }) - - (fetchNuGet { - name = "runtime.any.System.Runtime.Handles"; - version = "4.3.0"; - sha256 = "0bh5bi25nk9w9xi8z23ws45q5yia6k7dg3i4axhfqlnj145l011x"; - }) - - (fetchNuGet { - name = "runtime.any.System.Runtime.InteropServices"; - version = "4.3.0"; - sha256 = "0c3g3g3jmhlhw4klrc86ka9fjbl7i59ds1fadsb2l8nqf8z3kb19"; - }) - - (fetchNuGet { - name = "runtime.any.System.Text.Encoding"; - version = "4.3.0"; - sha256 = "0aqqi1v4wx51h51mk956y783wzags13wa7mgqyclacmsmpv02ps3"; - }) - - (fetchNuGet { - name = "runtime.any.System.Text.Encoding.Extensions"; - version = "4.3.0"; - sha256 = "0lqhgqi0i8194ryqq6v2gqx0fb86db2gqknbm0aq31wb378j7ip8"; - }) - - (fetchNuGet { - name = "runtime.any.System.Threading.Tasks"; - version = "4.3.0"; - sha256 = "03mnvkhskbzxddz4hm113zsch1jyzh2cs450dk3rgfjp8crlw1va"; - }) - - (fetchNuGet { - name = "runtime.any.System.Threading.Timer"; - version = "4.3.0"; - sha256 = "0aw4phrhwqz9m61r79vyfl5la64bjxj8l34qnrcwb28v49fg2086"; - }) - - (fetchNuGet { - name = "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl"; - version = "4.3.0"; - sha256 = "16rnxzpk5dpbbl1x354yrlsbvwylrq456xzpsha1n9y3glnhyx9d"; - }) - - (fetchNuGet { - name = "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl"; - version = "4.3.2"; - sha256 = "0rwpqngkqiapqc5c2cpkj7idhngrgss5qpnqg0yh40mbyflcxf8i"; - }) - - (fetchNuGet { - name = "runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl"; - version = "4.3.0"; - sha256 = "0hkg03sgm2wyq8nqk6dbm9jh5vcq57ry42lkqdmfklrw89lsmr59"; - }) - - (fetchNuGet { - name = "runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl"; - version = "4.3.2"; - sha256 = "1n06gxwlinhs0w7s8a94r1q3lwqzvynxwd3mp10ws9bg6gck8n4r"; - }) - - (fetchNuGet { - name = "runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl"; - version = "4.3.0"; - sha256 = "0c2p354hjx58xhhz7wv6div8xpi90sc6ibdm40qin21bvi7ymcaa"; - }) - - (fetchNuGet { - name = "runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl"; - version = "4.3.2"; - sha256 = "0404wqrc7f2yc0wxv71y3nnybvqx8v4j9d47hlscxy759a525mc3"; - }) - - (fetchNuGet { - name = "runtime.native.System"; - version = "4.3.0"; - sha256 = "15hgf6zaq9b8br2wi1i3x0zvmk410nlmsmva9p0bbg73v6hml5k4"; - }) - - (fetchNuGet { - name = "runtime.native.System.IO.Compression"; - version = "4.3.0"; - sha256 = "1vvivbqsk6y4hzcid27pqpm5bsi6sc50hvqwbcx8aap5ifrxfs8d"; - }) - - (fetchNuGet { - name = "runtime.native.System.Net.Http"; - version = "4.3.0"; - sha256 = "1n6rgz5132lcibbch1qlf0g9jk60r0kqv087hxc0lisy50zpm7kk"; - }) - - (fetchNuGet { - name = "runtime.native.System.Security.Cryptography.Apple"; - version = "4.3.0"; - sha256 = "1b61p6gw1m02cc1ry996fl49liiwky6181dzr873g9ds92zl326q"; - }) - - (fetchNuGet { - name = "runtime.native.System.Security.Cryptography.OpenSsl"; - version = "4.3.0"; - sha256 = "18pzfdlwsg2nb1jjjjzyb5qlgy6xjxzmhnfaijq5s2jw3cm3ab97"; - }) - - (fetchNuGet { - name = "runtime.native.System.Security.Cryptography.OpenSsl"; - version = "4.3.2"; - sha256 = "0zy5r25jppz48i2bkg8b9lfig24xixg6nm3xyr1379zdnqnpm8f6"; - }) - - (fetchNuGet { - name = "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl"; - version = "4.3.0"; - sha256 = "0qyynf9nz5i7pc26cwhgi8j62ps27sqmf78ijcfgzab50z9g8ay3"; - }) - - (fetchNuGet { - name = "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl"; - version = "4.3.2"; - sha256 = "096ch4n4s8k82xga80lfmpimpzahd2ip1mgwdqgar0ywbbl6x438"; - }) - - (fetchNuGet { - name = "runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl"; - version = "4.3.0"; - sha256 = "1klrs545awhayryma6l7g2pvnp9xy4z0r1i40r80zb45q3i9nbyf"; - }) - - (fetchNuGet { - name = "runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl"; - version = "4.3.2"; - sha256 = "1dm8fifl7rf1gy7lnwln78ch4rw54g0pl5g1c189vawavll7p6rj"; - }) - - (fetchNuGet { - name = "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.Apple"; - version = "4.3.0"; - sha256 = "10yc8jdrwgcl44b4g93f1ds76b176bajd3zqi2faf5rvh1vy9smi"; - }) - - (fetchNuGet { - name = "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; - version = "4.3.0"; - sha256 = "0zcxjv5pckplvkg0r6mw3asggm7aqzbdjimhvsasb0cgm59x09l3"; - }) - - (fetchNuGet { - name = "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; - version = "4.3.2"; - sha256 = "1m9z1k9kzva9n9kwinqxl97x2vgl79qhqjlv17k9s2ymcyv2bwr6"; - }) - - (fetchNuGet { - name = "runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl"; - version = "4.3.0"; - sha256 = "0vhynn79ih7hw7cwjazn87rm9z9fj0rvxgzlab36jybgcpcgphsn"; - }) - - (fetchNuGet { - name = "runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl"; - version = "4.3.2"; - sha256 = "1cpx56mcfxz7cpn57wvj18sjisvzq8b5vd9rw16ihd2i6mcp3wa1"; - }) - - (fetchNuGet { - name = "runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; - version = "4.3.0"; - sha256 = "160p68l2c7cqmyqjwxydcvgw7lvl1cr0znkw8fp24d1by9mqc8p3"; - }) - - (fetchNuGet { - name = "runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; - version = "4.3.2"; - sha256 = "15gsm1a8jdmgmf8j5v1slfz8ks124nfdhk2vxs2rw3asrxalg8hi"; - }) - - (fetchNuGet { - name = "runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; - version = "4.3.0"; - sha256 = "15zrc8fgd8zx28hdghcj5f5i34wf3l6bq5177075m2bc2j34jrqy"; - }) - - (fetchNuGet { - name = "runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; - version = "4.3.2"; - sha256 = "0q0n5q1r1wnqmr5i5idsrd9ywl33k0js4pngkwq9p368mbxp8x1w"; - }) - - (fetchNuGet { - name = "runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; - version = "4.3.0"; - sha256 = "1p4dgxax6p7rlgj4q73k73rslcnz4wdcv8q2flg1s8ygwcm58ld5"; - }) - - (fetchNuGet { - name = "runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; - version = "4.3.2"; - sha256 = "1x0g58pbpjrmj2x2qw17rdwwnrcl0wvim2hdwz48lixvwvp22n9c"; - }) - - (fetchNuGet { - name = "runtime.unix.Microsoft.Win32.Primitives"; - version = "4.3.0"; - sha256 = "0y61k9zbxhdi0glg154v30kkq7f8646nif8lnnxbvkjpakggd5id"; - }) - - (fetchNuGet { - name = "runtime.unix.System.Console"; - version = "4.3.0"; - sha256 = "1pfpkvc6x2if8zbdzg9rnc5fx51yllprl8zkm5npni2k50lisy80"; - }) - - (fetchNuGet { - name = "runtime.unix.System.Diagnostics.Debug"; - version = "4.3.0"; - sha256 = "1lps7fbnw34bnh3lm31gs5c0g0dh7548wfmb8zz62v0zqz71msj5"; - }) - - (fetchNuGet { - name = "runtime.unix.System.IO.FileSystem"; - version = "4.3.0"; - sha256 = "14nbkhvs7sji5r1saj2x8daz82rnf9kx28d3v2qss34qbr32dzix"; - }) - - (fetchNuGet { - name = "runtime.unix.System.Net.Primitives"; - version = "4.3.0"; - sha256 = "0bdnglg59pzx9394sy4ic66kmxhqp8q8bvmykdxcbs5mm0ipwwm4"; - }) - - (fetchNuGet { - name = "runtime.unix.System.Net.Sockets"; - version = "4.3.0"; - sha256 = "03npdxzy8gfv035bv1b9rz7c7hv0rxl5904wjz51if491mw0xy12"; - }) - - (fetchNuGet { - name = "runtime.unix.System.Private.Uri"; - version = "4.3.0"; - sha256 = "1jx02q6kiwlvfksq1q9qr17fj78y5v6mwsszav4qcz9z25d5g6vk"; - }) - - (fetchNuGet { - name = "runtime.unix.System.Runtime.Extensions"; - version = "4.3.0"; - sha256 = "0pnxxmm8whx38dp6yvwgmh22smknxmqs5n513fc7m4wxvs1bvi4p"; - }) - - (fetchNuGet { - name = "StreamJsonRpc"; - version = "2.5.46"; - sha256 = "0rsgxfxcfgbx1w2jhllx1cwnbj9vra6034gv4kgzahh0v5vn8shf"; - }) - - (fetchNuGet { - name = "System.AppContext"; - version = "4.3.0"; - sha256 = "1649qvy3dar900z3g817h17nl8jp4ka5vcfmsr05kh0fshn7j3ya"; - }) - - (fetchNuGet { - name = "System.Buffers"; - version = "4.3.0"; - sha256 = "0fgns20ispwrfqll4q1zc1waqcmylb3zc50ys9x8zlwxh9pmd9jy"; - }) - - (fetchNuGet { - name = "System.Buffers"; - version = "4.5.0"; - sha256 = "1ywfqn4md6g3iilpxjn5dsr0f5lx6z0yvhqp4pgjcamygg73cz2c"; - }) - - (fetchNuGet { - name = "System.Collections"; - version = "4.0.11"; - sha256 = "1ga40f5lrwldiyw6vy67d0sg7jd7ww6kgwbksm19wrvq9hr0bsm6"; - }) - - (fetchNuGet { - name = "System.Collections"; - version = "4.3.0"; - sha256 = "19r4y64dqyrq6k4706dnyhhw7fs24kpp3awak7whzss39dakpxk9"; - }) - - (fetchNuGet { - name = "System.Collections.Concurrent"; - version = "4.3.0"; - sha256 = "0wi10md9aq33jrkh2c24wr2n9hrpyamsdhsxdcnf43b7y86kkii8"; - }) - - (fetchNuGet { - name = "System.Collections.Immutable"; - version = "1.5.0"; - sha256 = "1d5gjn5afnrf461jlxzawcvihz195gayqpcfbv6dd7pxa9ialn06"; - }) - - (fetchNuGet { - name = "System.Collections.NonGeneric"; - version = "4.3.0"; - sha256 = "07q3k0hf3mrcjzwj8fwk6gv3n51cb513w4mgkfxzm3i37sc9kz7k"; - }) - - (fetchNuGet { - name = "System.Collections.Specialized"; - version = "4.3.0"; - sha256 = "1sdwkma4f6j85m3dpb53v9vcgd0zyc9jb33f8g63byvijcj39n20"; - }) - - (fetchNuGet { - name = "System.ComponentModel"; - version = "4.3.0"; - sha256 = "0986b10ww3nshy30x9sjyzm0jx339dkjxjj3401r3q0f6fx2wkcb"; - }) - - (fetchNuGet { - name = "System.ComponentModel.Primitives"; - version = "4.3.0"; - sha256 = "1svfmcmgs0w0z9xdw2f2ps05rdxmkxxhf0l17xk9l1l8xfahkqr0"; - }) - - (fetchNuGet { - name = "System.ComponentModel.TypeConverter"; - version = "4.3.0"; - sha256 = "17ng0p7v3nbrg3kycz10aqrrlw4lz9hzhws09pfh8gkwicyy481x"; - }) - - (fetchNuGet { - name = "System.Configuration.ConfigurationManager"; - version = "4.4.0"; - sha256 = "1hjgmz47v5229cbzd2pwz2h0dkq78lb2wp9grx8qr72pb5i0dk7v"; - }) - - (fetchNuGet { - name = "System.Console"; - version = "4.3.0"; - sha256 = "1flr7a9x920mr5cjsqmsy9wgnv3lvd0h1g521pdr1lkb2qycy7ay"; - }) - - (fetchNuGet { - name = "System.Diagnostics.Debug"; - version = "4.0.11"; - sha256 = "0gmjghrqmlgzxivd2xl50ncbglb7ljzb66rlx8ws6dv8jm0d5siz"; - }) - - (fetchNuGet { - name = "System.Diagnostics.Debug"; - version = "4.3.0"; - sha256 = "00yjlf19wjydyr6cfviaph3vsjzg3d5nvnya26i2fvfg53sknh3y"; - }) - - (fetchNuGet { - name = "System.Diagnostics.DiagnosticSource"; - version = "4.3.0"; - sha256 = "0z6m3pbiy0qw6rn3n209rrzf9x1k4002zh90vwcrsym09ipm2liq"; - }) - - (fetchNuGet { - name = "System.Diagnostics.TextWriterTraceListener"; - version = "4.3.0"; - sha256 = "09db74f36wkwg30f7v7zhz1yhkyrnl5v6bdwljq1jdfgzcfch7c3"; - }) - - (fetchNuGet { - name = "System.Diagnostics.Tools"; - version = "4.3.0"; - sha256 = "0in3pic3s2ddyibi8cvgl102zmvp9r9mchh82ns9f0ms4basylw1"; - }) - - (fetchNuGet { - name = "System.Diagnostics.TraceSource"; - version = "4.3.0"; - sha256 = "1kyw4d7dpjczhw6634nrmg7yyyzq72k75x38y0l0nwhigdlp1766"; - }) - - (fetchNuGet { - name = "System.Diagnostics.Tracing"; - version = "4.3.0"; - sha256 = "1m3bx6c2s958qligl67q7grkwfz3w53hpy7nc97mh6f7j5k168c4"; - }) - - (fetchNuGet { - name = "System.Dynamic.Runtime"; - version = "4.0.11"; - sha256 = "1pla2dx8gkidf7xkciig6nifdsb494axjvzvann8g2lp3dbqasm9"; - }) - - (fetchNuGet { - name = "System.Dynamic.Runtime"; - version = "4.3.0"; - sha256 = "1d951hrvrpndk7insiag80qxjbf2y0y39y8h5hnq9612ws661glk"; - }) - - (fetchNuGet { - name = "System.Globalization"; - version = "4.0.11"; - sha256 = "070c5jbas2v7smm660zaf1gh0489xanjqymkvafcs4f8cdrs1d5d"; - }) - - (fetchNuGet { - name = "System.Globalization"; - version = "4.3.0"; - sha256 = "1cp68vv683n6ic2zqh2s1fn4c2sd87g5hpp6l4d4nj4536jz98ki"; - }) - - (fetchNuGet { - name = "System.Globalization.Calendars"; - version = "4.3.0"; - sha256 = "1xwl230bkakzzkrggy1l1lxmm3xlhk4bq2pkv790j5lm8g887lxq"; - }) - - (fetchNuGet { - name = "System.Globalization.Extensions"; - version = "4.3.0"; - sha256 = "02a5zfxavhv3jd437bsncbhd2fp1zv4gxzakp1an9l6kdq1mcqls"; - }) - - (fetchNuGet { - name = "System.IO"; - version = "4.1.0"; - sha256 = "1g0yb8p11vfd0kbkyzlfsbsp5z44lwsvyc0h3dpw6vqnbi035ajp"; - }) - - (fetchNuGet { - name = "System.IO"; - version = "4.3.0"; - sha256 = "05l9qdrzhm4s5dixmx68kxwif4l99ll5gqmh7rqgw554fx0agv5f"; - }) - - (fetchNuGet { - name = "System.IO.Compression"; - version = "4.3.0"; - sha256 = "084zc82yi6yllgda0zkgl2ys48sypiswbiwrv7irb3r0ai1fp4vz"; - }) - - (fetchNuGet { - name = "System.IO.Compression.ZipFile"; - version = "4.3.0"; - sha256 = "1yxy5pq4dnsm9hlkg9ysh5f6bf3fahqqb6p8668ndy5c0lk7w2ar"; - }) - - (fetchNuGet { - name = "System.IO.FileSystem"; - version = "4.3.0"; - sha256 = "0z2dfrbra9i6y16mm9v1v6k47f0fm617vlb7s5iybjjsz6g1ilmw"; - }) - - (fetchNuGet { - name = "System.IO.FileSystem.Primitives"; - version = "4.3.0"; - sha256 = "0j6ndgglcf4brg2lz4wzsh1av1gh8xrzdsn9f0yznskhqn1xzj9c"; - }) - - (fetchNuGet { - name = "System.IO.Pipelines"; - version = "4.7.0"; - sha256 = "1cx6bl2bhzp30ahy2csnwbphmlwwp840j56wgab105xc32la0mg4"; - }) - - (fetchNuGet { - name = "System.Linq"; - version = "4.1.0"; - sha256 = "1ppg83svb39hj4hpp5k7kcryzrf3sfnm08vxd5sm2drrijsla2k5"; - }) - - (fetchNuGet { - name = "System.Linq"; - version = "4.3.0"; - sha256 = "1w0gmba695rbr80l1k2h4mrwzbzsyfl2z4klmpbsvsg5pm4a56s7"; - }) - - (fetchNuGet { - name = "System.Linq.Expressions"; - version = "4.1.0"; - sha256 = "1gpdxl6ip06cnab7n3zlcg6mqp7kknf73s8wjinzi4p0apw82fpg"; - }) - - (fetchNuGet { - name = "System.Linq.Expressions"; - version = "4.3.0"; - sha256 = "0ky2nrcvh70rqq88m9a5yqabsl4fyd17bpr63iy2mbivjs2nyypv"; - }) - - (fetchNuGet { - name = "System.Memory"; - version = "4.5.3"; - sha256 = "0naqahm3wljxb5a911d37mwjqjdxv9l0b49p5dmfyijvni2ppy8a"; - }) - - (fetchNuGet { - name = "System.Net.Http"; - version = "4.3.0"; - sha256 = "1i4gc757xqrzflbk7kc5ksn20kwwfjhw9w7pgdkn19y3cgnl302j"; - }) - - (fetchNuGet { - name = "System.Net.Http"; - version = "4.3.4"; - sha256 = "0kdp31b8819v88l719j6my0yas6myv9d1viql3qz5577mv819jhl"; - }) - - (fetchNuGet { - name = "System.Net.NameResolution"; - version = "4.3.0"; - sha256 = "15r75pwc0rm3vvwsn8rvm2krf929mjfwliv0mpicjnii24470rkq"; - }) - - (fetchNuGet { - name = "System.Net.Primitives"; - version = "4.3.0"; - sha256 = "0c87k50rmdgmxx7df2khd9qj7q35j9rzdmm2572cc55dygmdk3ii"; - }) - - (fetchNuGet { - name = "System.Net.Sockets"; - version = "4.3.0"; - sha256 = "1ssa65k6chcgi6mfmzrznvqaxk8jp0gvl77xhf1hbzakjnpxspla"; - }) - - (fetchNuGet { - name = "System.Net.WebSockets"; - version = "4.3.0"; - sha256 = "1gfj800078kggcgl0xyl00a6y5k4wwh2k2qm69rjy22wbmq7fy4p"; - }) - - (fetchNuGet { - name = "System.ObjectModel"; - version = "4.0.12"; - sha256 = "1sybkfi60a4588xn34nd9a58png36i0xr4y4v4kqpg8wlvy5krrj"; - }) - - (fetchNuGet { - name = "System.ObjectModel"; - version = "4.3.0"; - sha256 = "191p63zy5rpqx7dnrb3h7prvgixmk168fhvvkkvhlazncf8r3nc2"; - }) - - (fetchNuGet { - name = "System.Private.Uri"; - version = "4.3.0"; - sha256 = "04r1lkdnsznin0fj4ya1zikxiqr0h6r6a1ww2dsm60gqhdrf0mvx"; - }) - - (fetchNuGet { - name = "System.Reflection"; - version = "4.1.0"; - sha256 = "1js89429pfw79mxvbzp8p3q93il6rdff332hddhzi5wqglc4gml9"; - }) - - (fetchNuGet { - name = "System.Reflection"; - version = "4.3.0"; - sha256 = "0xl55k0mw8cd8ra6dxzh974nxif58s3k1rjv1vbd7gjbjr39j11m"; - }) - - (fetchNuGet { - name = "System.Reflection.Emit"; - version = "4.0.1"; - sha256 = "0ydqcsvh6smi41gyaakglnv252625hf29f7kywy2c70nhii2ylqp"; - }) - - (fetchNuGet { - name = "System.Reflection.Emit"; - version = "4.3.0"; - sha256 = "11f8y3qfysfcrscjpjym9msk7lsfxkk4fmz9qq95kn3jd0769f74"; - }) - - (fetchNuGet { - name = "System.Reflection.Emit"; - version = "4.6.0"; - sha256 = "18h375q5bn9h7swxnk4krrxym1dxmi9bm26p89xps9ygrj4q6zqw"; - }) - - (fetchNuGet { - name = "System.Reflection.Emit.ILGeneration"; - version = "4.0.1"; - sha256 = "1pcd2ig6bg144y10w7yxgc9d22r7c7ww7qn1frdfwgxr24j9wvv0"; - }) - - (fetchNuGet { - name = "System.Reflection.Emit.ILGeneration"; - version = "4.3.0"; - sha256 = "0w1n67glpv8241vnpz1kl14sy7zlnw414aqwj4hcx5nd86f6994q"; - }) - - (fetchNuGet { - name = "System.Reflection.Emit.Lightweight"; - version = "4.3.0"; - sha256 = "0ql7lcakycrvzgi9kxz1b3lljd990az1x6c4jsiwcacrvimpib5c"; - }) - - (fetchNuGet { - name = "System.Reflection.Emit.Lightweight"; - version = "4.6.0"; - sha256 = "0hry2k6b7kicg4zxnq0hhn0ys52711pxy7l9v5sp7gvp9cicwpgp"; - }) - - (fetchNuGet { - name = "System.Reflection.Extensions"; - version = "4.0.1"; - sha256 = "0m7wqwq0zqq9gbpiqvgk3sr92cbrw7cp3xn53xvw7zj6rz6fdirn"; - }) - - (fetchNuGet { - name = "System.Reflection.Extensions"; - version = "4.3.0"; - sha256 = "02bly8bdc98gs22lqsfx9xicblszr2yan7v2mmw3g7hy6miq5hwq"; - }) - - (fetchNuGet { - name = "System.Reflection.Metadata"; - version = "1.6.0"; - sha256 = "1wdbavrrkajy7qbdblpbpbalbdl48q3h34cchz24gvdgyrlf15r4"; - }) - - (fetchNuGet { - name = "System.Reflection.Primitives"; - version = "4.0.1"; - sha256 = "1bangaabhsl4k9fg8khn83wm6yial8ik1sza7401621jc6jrym28"; - }) - - (fetchNuGet { - name = "System.Reflection.Primitives"; - version = "4.3.0"; - sha256 = "04xqa33bld78yv5r93a8n76shvc8wwcdgr1qvvjh959g3rc31276"; - }) - - (fetchNuGet { - name = "System.Reflection.TypeExtensions"; - version = "4.1.0"; - sha256 = "1bjli8a7sc7jlxqgcagl9nh8axzfl11f4ld3rjqsyxc516iijij7"; - }) - - (fetchNuGet { - name = "System.Reflection.TypeExtensions"; - version = "4.3.0"; - sha256 = "0y2ssg08d817p0vdag98vn238gyrrynjdj4181hdg780sif3ykp1"; - }) - - (fetchNuGet { - name = "System.Resources.ResourceManager"; - version = "4.0.1"; - sha256 = "0b4i7mncaf8cnai85jv3wnw6hps140cxz8vylv2bik6wyzgvz7bi"; - }) - - (fetchNuGet { - name = "System.Resources.ResourceManager"; - version = "4.3.0"; - sha256 = "0sjqlzsryb0mg4y4xzf35xi523s4is4hz9q4qgdvlvgivl7qxn49"; - }) - - (fetchNuGet { - name = "System.Runtime"; - version = "4.1.0"; - sha256 = "02hdkgk13rvsd6r9yafbwzss8kr55wnj8d5c7xjnp8gqrwc8sn0m"; - }) - - (fetchNuGet { - name = "System.Runtime"; - version = "4.3.0"; - sha256 = "066ixvgbf2c929kgknshcxqj6539ax7b9m570cp8n179cpfkapz7"; - }) - - (fetchNuGet { - name = "System.Runtime.CompilerServices.Unsafe"; - version = "4.5.2"; - sha256 = "1vz4275fjij8inf31np78hw50al8nqkngk04p3xv5n4fcmf1grgi"; - }) - - (fetchNuGet { - name = "System.Runtime.CompilerServices.Unsafe"; - version = "4.6.0"; - sha256 = "0xmzi2gpbmgyfr75p24rqqsba3cmrqgmcv45lsqp5amgrdwd0f0m"; - }) - - (fetchNuGet { - name = "System.Runtime.Extensions"; - version = "4.1.0"; - sha256 = "0rw4rm4vsm3h3szxp9iijc3ksyviwsv6f63dng3vhqyg4vjdkc2z"; - }) - - (fetchNuGet { - name = "System.Runtime.Extensions"; - version = "4.3.0"; - sha256 = "1ykp3dnhwvm48nap8q23893hagf665k0kn3cbgsqpwzbijdcgc60"; - }) - - (fetchNuGet { - name = "System.Runtime.Handles"; - version = "4.3.0"; - sha256 = "0sw2gfj2xr7sw9qjn0j3l9yw07x73lcs97p8xfc9w1x9h5g5m7i8"; - }) - - (fetchNuGet { - name = "System.Runtime.InteropServices"; - version = "4.1.0"; - sha256 = "01kxqppx3dr3b6b286xafqilv4s2n0gqvfgzfd4z943ga9i81is1"; - }) - - (fetchNuGet { - name = "System.Runtime.InteropServices"; - version = "4.3.0"; - sha256 = "00hywrn4g7hva1b2qri2s6rabzwgxnbpw9zfxmz28z09cpwwgh7j"; - }) - - (fetchNuGet { - name = "System.Runtime.InteropServices.RuntimeInformation"; - version = "4.3.0"; - sha256 = "0q18r1sh4vn7bvqgd6dmqlw5v28flbpj349mkdish2vjyvmnb2ii"; - }) - - (fetchNuGet { - name = "System.Runtime.Numerics"; - version = "4.3.0"; - sha256 = "19rav39sr5dky7afygh309qamqqmi9kcwvz3i0c5700v0c5cg61z"; - }) - - (fetchNuGet { - name = "System.Runtime.Serialization.Primitives"; - version = "4.1.1"; - sha256 = "042rfjixknlr6r10vx2pgf56yming8lkjikamg3g4v29ikk78h7k"; - }) - - (fetchNuGet { - name = "System.Security.AccessControl"; - version = "4.6.0"; - sha256 = "1wl1dyghi0qhpap1vgfhg2ybdyyhy9vc2a7dpm1xb30vfgmlkjmf"; - }) - - (fetchNuGet { - name = "System.Security.AccessControl"; - version = "4.7.0"; - sha256 = "0n0k0w44flkd8j0xw7g3g3vhw7dijfm51f75xkm1qxnbh4y45mpz"; - }) - - (fetchNuGet { - name = "System.Security.Cryptography.Algorithms"; - version = "4.3.0"; - sha256 = "03sq183pfl5kp7gkvq77myv7kbpdnq3y0xj7vi4q1kaw54sny0ml"; - }) - - (fetchNuGet { - name = "System.Security.Cryptography.Cng"; - version = "4.3.0"; - sha256 = "1k468aswafdgf56ab6yrn7649kfqx2wm9aslywjam1hdmk5yypmv"; - }) - - (fetchNuGet { - name = "System.Security.Cryptography.Csp"; - version = "4.3.0"; - sha256 = "1x5wcrddf2s3hb8j78cry7yalca4lb5vfnkrysagbn6r9x6xvrx1"; - }) - - (fetchNuGet { - name = "System.Security.Cryptography.Encoding"; - version = "4.3.0"; - sha256 = "1jr6w70igqn07k5zs1ph6xja97hxnb3mqbspdrff6cvssgrixs32"; - }) - - (fetchNuGet { - name = "System.Security.Cryptography.OpenSsl"; - version = "4.3.0"; - sha256 = "0givpvvj8yc7gv4lhb6s1prq6p2c4147204a0wib89inqzd87gqc"; - }) - - (fetchNuGet { - name = "System.Security.Cryptography.Primitives"; - version = "4.3.0"; - sha256 = "0pyzncsv48zwly3lw4f2dayqswcfvdwq2nz0dgwmi7fj3pn64wby"; - }) - - (fetchNuGet { - name = "System.Security.Cryptography.ProtectedData"; - version = "4.4.0"; - sha256 = "1q8ljvqhasyynp94a1d7jknk946m20lkwy2c3wa8zw2pc517fbj6"; - }) - - (fetchNuGet { - name = "System.Security.Cryptography.X509Certificates"; - version = "4.3.0"; - sha256 = "0valjcz5wksbvijylxijjxb1mp38mdhv03r533vnx1q3ikzdav9h"; - }) - - (fetchNuGet { - name = "System.Security.Principal.Windows"; - version = "4.3.0"; - sha256 = "00a0a7c40i3v4cb20s2cmh9csb5jv2l0frvnlzyfxh848xalpdwr"; - }) - - (fetchNuGet { - name = "System.Security.Principal.Windows"; - version = "4.6.0"; - sha256 = "1jmfzfz1n8hp63s5lja5xxpzkinbp6g59l3km9h8avjiisdrg5wm"; - }) - - (fetchNuGet { - name = "System.Security.Principal.Windows"; - version = "4.7.0"; - sha256 = "1a56ls5a9sr3ya0nr086sdpa9qv0abv31dd6fp27maqa9zclqq5d"; - }) - - (fetchNuGet { - name = "System.Text.Encoding"; - version = "4.0.11"; - sha256 = "1dyqv0hijg265dwxg6l7aiv74102d6xjiwplh2ar1ly6xfaa4iiw"; - }) - - (fetchNuGet { - name = "System.Text.Encoding"; - version = "4.3.0"; - sha256 = "1f04lkir4iladpp51sdgmis9dj4y8v08cka0mbmsy0frc9a4gjqr"; - }) - - (fetchNuGet { - name = "System.Text.Encoding.Extensions"; - version = "4.0.11"; - sha256 = "08nsfrpiwsg9x5ml4xyl3zyvjfdi4mvbqf93kjdh11j4fwkznizs"; - }) - - (fetchNuGet { - name = "System.Text.Encoding.Extensions"; - version = "4.3.0"; - sha256 = "11q1y8hh5hrp5a3kw25cb6l00v5l5dvirkz8jr3sq00h1xgcgrxy"; - }) - - (fetchNuGet { - name = "System.Text.RegularExpressions"; - version = "4.1.0"; - sha256 = "1mw7vfkkyd04yn2fbhm38msk7dz2xwvib14ygjsb8dq2lcvr18y7"; - }) - - (fetchNuGet { - name = "System.Text.RegularExpressions"; - version = "4.3.0"; - sha256 = "1bgq51k7fwld0njylfn7qc5fmwrk2137gdq7djqdsw347paa9c2l"; - }) - - (fetchNuGet { - name = "System.Threading"; - version = "4.0.11"; - sha256 = "19x946h926bzvbsgj28csn46gak2crv2skpwsx80hbgazmkgb1ls"; - }) - - (fetchNuGet { - name = "System.Threading"; - version = "4.3.0"; - sha256 = "0rw9wfamvhayp5zh3j7p1yfmx9b5khbf4q50d8k5rk993rskfd34"; - }) - - (fetchNuGet { - name = "System.Threading.Tasks"; - version = "4.0.11"; - sha256 = "0nr1r41rak82qfa5m0lhk9mp0k93bvfd7bbd9sdzwx9mb36g28p5"; - }) - - (fetchNuGet { - name = "System.Threading.Tasks"; - version = "4.3.0"; - sha256 = "134z3v9abw3a6jsw17xl3f6hqjpak5l682k2vz39spj4kmydg6k7"; - }) - - (fetchNuGet { - name = "System.Threading.Tasks.Dataflow"; - version = "4.9.0"; - sha256 = "1g6s9pjg4z8iy98df60y9a01imdqy59zd767vz74rrng78jl2dk5"; - }) - - (fetchNuGet { - name = "System.Threading.Tasks.Extensions"; - version = "4.3.0"; - sha256 = "1xxcx2xh8jin360yjwm4x4cf5y3a2bwpn2ygkfkwkicz7zk50s2z"; - }) - - (fetchNuGet { - name = "System.Threading.Tasks.Extensions"; - version = "4.5.3"; - sha256 = "0g7r6hm572ax8v28axrdxz1gnsblg6kszq17g51pj14a5rn2af7i"; - }) - - (fetchNuGet { - name = "System.Threading.ThreadPool"; - version = "4.3.0"; - sha256 = "027s1f4sbx0y1xqw2irqn6x161lzj8qwvnh2gn78ciiczdv10vf1"; - }) - - (fetchNuGet { - name = "System.Threading.Timer"; - version = "4.3.0"; - sha256 = "1nx773nsx6z5whv8kaa1wjh037id2f1cxhb69pvgv12hd2b6qs56"; - }) - - (fetchNuGet { - name = "System.ValueTuple"; - version = "4.5.0"; - sha256 = "00k8ja51d0f9wrq4vv5z2jhq8hy31kac2rg0rv06prylcybzl8cy"; - }) - - (fetchNuGet { - name = "System.Xml.ReaderWriter"; - version = "4.0.11"; - sha256 = "0c6ky1jk5ada9m94wcadih98l6k1fvf6vi7vhn1msjixaha419l5"; - }) - - (fetchNuGet { - name = "System.Xml.ReaderWriter"; - version = "4.3.0"; - sha256 = "0c47yllxifzmh8gq6rq6l36zzvw4kjvlszkqa9wq3fr59n0hl3s1"; - }) - - (fetchNuGet { - name = "System.Xml.XDocument"; - version = "4.0.11"; - sha256 = "0n4lvpqzy9kc7qy1a4acwwd7b7pnvygv895az5640idl2y9zbz18"; - }) - - (fetchNuGet { - name = "System.Xml.XDocument"; - version = "4.3.0"; - sha256 = "08h8fm4l77n0nd4i4fk2386y809bfbwqb7ih9d7564ifcxr5ssxd"; - }) - - (fetchNuGet { - name = "System.Xml.XmlDocument"; - version = "4.3.0"; - sha256 = "0bmz1l06dihx52jxjr22dyv5mxv6pj4852lx68grjm7bivhrbfwi"; - }) - +{ fetchNuGet }: [ + (fetchNuGet { name = "MessagePack"; version = "2.1.90"; sha256 = "1j5wjl7aq7nn5ga3j6zaaivdf2wlfyd7w66ak0i7krgrmv26lb8i"; }) + (fetchNuGet { name = "MessagePack.Annotations"; version = "2.1.90"; sha256 = "08sghhwbz8h7ji9lg0klhwcyndxg6v11pq9jac975sb38samnm11"; }) + (fetchNuGet { name = "MicroBuild.Core"; version = "0.3.0"; sha256 = "190d755l60j3l5m1661wj19gj9w6ngza56q3vkijkkmbbabdmqln"; }) + (fetchNuGet { name = "Microsoft.AspNetCore.App.Runtime.linux-x64"; version = "3.1.21"; sha256 = "056g9nv8a7n8zdbgzmyzmn3pbg52yq2kv5d1rcp7h6plwzgpiwql"; }) + (fetchNuGet { name = "Microsoft.AspNetCore.App.Runtime.osx-x64"; version = "3.1.21"; sha256 = "0akdzi35497v8yxr3a9q1g26cnx9vxnwv81kwxi293jklwnx8gsr"; }) + (fetchNuGet { name = "Microsoft.AspNetCore.App.Runtime.win-x64"; version = "3.1.21"; sha256 = "16kya6xvi7k42sr8bxgpbz9116dj7g3i18ylpvji9qngdx41891v"; }) + (fetchNuGet { name = "Microsoft.AspNetCore.App.Runtime.win-x86"; version = "3.1.21"; sha256 = "0rd3w3i6fzwhi71jcr8i0mchgfgpp1a0qhancg4dxsva032as4s6"; }) + (fetchNuGet { name = "Microsoft.Bcl.AsyncInterfaces"; version = "1.0.0"; sha256 = "00dx5armvkqjxvkldz3invdlck9nj7w21dlsr2aqp1rqbyrbsbbh"; }) + (fetchNuGet { name = "Microsoft.Extensions.FileSystemGlobbing"; version = "3.1.8"; sha256 = "1v2lr0vbssqayzgxvdwb54jmvz7mvlih4l9h7i71gm3c62nlbq8y"; }) + (fetchNuGet { name = "Microsoft.NETCore.App.Host.osx-x64"; version = "3.1.21"; sha256 = "1s5g9gk0hvs268q2zpc32m0my2m2ivlmsmza86797a9vkxr6pzw6"; }) + (fetchNuGet { name = "Microsoft.NETCore.App.Host.win-x64"; version = "3.1.21"; sha256 = "0dl4yakfmdkx6xr18f09cdnl11b4fyp23jg3msr8a25zqdqvcr29"; }) + (fetchNuGet { name = "Microsoft.NETCore.App.Host.win-x86"; version = "3.1.21"; sha256 = "1l5wh5c9bgnzph07cd72q08mr87lsczwl0vy0rzrsi7xpzryvw7l"; }) + (fetchNuGet { name = "Microsoft.NETCore.App.Runtime.linux-x64"; version = "3.1.21"; sha256 = "13692wqcww0w6x4nhyxpxwprdg6mx9xmlvv38m6fvp6g0m27r43v"; }) + (fetchNuGet { name = "Microsoft.NETCore.App.Runtime.osx-x64"; version = "3.1.21"; sha256 = "1p7fpcmx4m2374zjfh53i3mv4lkr8xrkz5lnawv95s7j005m07pc"; }) + (fetchNuGet { name = "Microsoft.NETCore.App.Runtime.win-x64"; version = "3.1.21"; sha256 = "02zgxzf8l607mh17900n7msga0yfcnqgd70rj1rlwj23plifykx1"; }) + (fetchNuGet { name = "Microsoft.NETCore.App.Runtime.win-x86"; version = "3.1.21"; sha256 = "1gsrajdhlyndwb0s1c03cbm7wh1yfiwpk075nrlfvicbc4m7h347"; }) + (fetchNuGet { name = "Microsoft.NETCore.Platforms"; version = "1.1.0"; sha256 = "08vh1r12g6ykjygq5d3vq09zylgb84l63k49jc4v8faw9g93iqqm"; }) + (fetchNuGet { name = "Microsoft.NETCore.Platforms"; version = "1.1.1"; sha256 = "164wycgng4mi9zqi2pnsf1pq6gccbqvw6ib916mqizgjmd8f44pj"; }) + (fetchNuGet { name = "Microsoft.NETCore.Platforms"; version = "3.0.0"; sha256 = "1bk8r4r3ihmi6322jmcag14jmw11mjqys202azqjzglcx59pxh51"; }) + (fetchNuGet { name = "Microsoft.NETCore.Targets"; version = "1.1.0"; sha256 = "193xwf33fbm0ni3idxzbr5fdq3i2dlfgihsac9jj7whj0gd902nh"; }) + (fetchNuGet { name = "Microsoft.VisualStudio.Threading"; version = "16.6.13"; sha256 = "0qbvcwy7njz5zpqgfqdf41gf9xqcz64z4rkfjf6bi4zynpkv6n1l"; }) + (fetchNuGet { name = "Microsoft.VisualStudio.Threading.Analyzers"; version = "16.6.13"; sha256 = "09nqkjnarwj0chb6xrzscq98mpgi86n2a3mfdd3y695kviq99s18"; }) + (fetchNuGet { name = "Microsoft.VisualStudio.Validation"; version = "15.5.31"; sha256 = "1ah99rn922qa0sd2k3h64m324f2r32pw8cn4cfihgvwx4qdrpmgw"; }) + (fetchNuGet { name = "Microsoft.Win32.Primitives"; version = "4.3.0"; sha256 = "0j0c1wj4ndj21zsgivsc24whiya605603kxrbiw6wkfdync464wq"; }) + (fetchNuGet { name = "Microsoft.Win32.Registry"; version = "4.6.0"; sha256 = "0i4y782yrqqyx85pg597m20gm0v126w0j9ddk5z7xb3crx4z9f2s"; }) + (fetchNuGet { name = "Nerdbank.Streams"; version = "2.5.76"; sha256 = "017h8m1zrm247alhlz4vqsz580b8b88s50cyxb939hmc2nn0qlfv"; }) + (fetchNuGet { name = "NETStandard.Library"; version = "2.0.3"; sha256 = "1fn9fxppfcg4jgypp2pmrpr6awl3qz1xmnri0cygpkwvyx27df1y"; }) + (fetchNuGet { name = "Newtonsoft.Json"; version = "12.0.3"; sha256 = "17dzl305d835mzign8r15vkmav2hq8l6g7942dfjpnzr17wwl89x"; }) + (fetchNuGet { name = "runtime.any.System.Collections"; version = "4.3.0"; sha256 = "0bv5qgm6vr47ynxqbnkc7i797fdi8gbjjxii173syrx14nmrkwg0"; }) + (fetchNuGet { name = "runtime.any.System.Diagnostics.Tracing"; version = "4.3.0"; sha256 = "00j6nv2xgmd3bi347k00m7wr542wjlig53rmj28pmw7ddcn97jbn"; }) + (fetchNuGet { name = "runtime.any.System.Globalization"; version = "4.3.0"; sha256 = "1daqf33hssad94lamzg01y49xwndy2q97i2lrb7mgn28656qia1x"; }) + (fetchNuGet { name = "runtime.any.System.Globalization.Calendars"; version = "4.3.0"; sha256 = "1ghhhk5psqxcg6w88sxkqrc35bxcz27zbqm2y5p5298pv3v7g201"; }) + (fetchNuGet { name = "runtime.any.System.IO"; version = "4.3.0"; sha256 = "0l8xz8zn46w4d10bcn3l4yyn4vhb3lrj2zw8llvz7jk14k4zps5x"; }) + (fetchNuGet { name = "runtime.any.System.Reflection"; version = "4.3.0"; sha256 = "02c9h3y35pylc0zfq3wcsvc5nqci95nrkq0mszifc0sjx7xrzkly"; }) + (fetchNuGet { name = "runtime.any.System.Reflection.Primitives"; version = "4.3.0"; sha256 = "0x1mm8c6iy8rlxm8w9vqw7gb7s1ljadrn049fmf70cyh42vdfhrf"; }) + (fetchNuGet { name = "runtime.any.System.Resources.ResourceManager"; version = "4.3.0"; sha256 = "03kickal0iiby82wa5flar18kyv82s9s6d4xhk5h4bi5kfcyfjzl"; }) + (fetchNuGet { name = "runtime.any.System.Runtime"; version = "4.3.0"; sha256 = "1cqh1sv3h5j7ixyb7axxbdkqx6cxy00p4np4j91kpm492rf4s25b"; }) + (fetchNuGet { name = "runtime.any.System.Runtime.Handles"; version = "4.3.0"; sha256 = "0bh5bi25nk9w9xi8z23ws45q5yia6k7dg3i4axhfqlnj145l011x"; }) + (fetchNuGet { name = "runtime.any.System.Runtime.InteropServices"; version = "4.3.0"; sha256 = "0c3g3g3jmhlhw4klrc86ka9fjbl7i59ds1fadsb2l8nqf8z3kb19"; }) + (fetchNuGet { name = "runtime.any.System.Text.Encoding"; version = "4.3.0"; sha256 = "0aqqi1v4wx51h51mk956y783wzags13wa7mgqyclacmsmpv02ps3"; }) + (fetchNuGet { name = "runtime.any.System.Text.Encoding.Extensions"; version = "4.3.0"; sha256 = "0lqhgqi0i8194ryqq6v2gqx0fb86db2gqknbm0aq31wb378j7ip8"; }) + (fetchNuGet { name = "runtime.any.System.Threading.Tasks"; version = "4.3.0"; sha256 = "03mnvkhskbzxddz4hm113zsch1jyzh2cs450dk3rgfjp8crlw1va"; }) + (fetchNuGet { name = "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.2"; sha256 = "0rwpqngkqiapqc5c2cpkj7idhngrgss5qpnqg0yh40mbyflcxf8i"; }) + (fetchNuGet { name = "runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.2"; sha256 = "1n06gxwlinhs0w7s8a94r1q3lwqzvynxwd3mp10ws9bg6gck8n4r"; }) + (fetchNuGet { name = "runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.2"; sha256 = "0404wqrc7f2yc0wxv71y3nnybvqx8v4j9d47hlscxy759a525mc3"; }) + (fetchNuGet { name = "runtime.native.System"; version = "4.3.0"; sha256 = "15hgf6zaq9b8br2wi1i3x0zvmk410nlmsmva9p0bbg73v6hml5k4"; }) + (fetchNuGet { name = "runtime.native.System.Net.Http"; version = "4.3.0"; sha256 = "1n6rgz5132lcibbch1qlf0g9jk60r0kqv087hxc0lisy50zpm7kk"; }) + (fetchNuGet { name = "runtime.native.System.Security.Cryptography.Apple"; version = "4.3.0"; sha256 = "1b61p6gw1m02cc1ry996fl49liiwky6181dzr873g9ds92zl326q"; }) + (fetchNuGet { name = "runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.2"; sha256 = "0zy5r25jppz48i2bkg8b9lfig24xixg6nm3xyr1379zdnqnpm8f6"; }) + (fetchNuGet { name = "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.2"; sha256 = "096ch4n4s8k82xga80lfmpimpzahd2ip1mgwdqgar0ywbbl6x438"; }) + (fetchNuGet { name = "runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.2"; sha256 = "1dm8fifl7rf1gy7lnwln78ch4rw54g0pl5g1c189vawavll7p6rj"; }) + (fetchNuGet { name = "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.Apple"; version = "4.3.0"; sha256 = "10yc8jdrwgcl44b4g93f1ds76b176bajd3zqi2faf5rvh1vy9smi"; }) + (fetchNuGet { name = "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.2"; sha256 = "1m9z1k9kzva9n9kwinqxl97x2vgl79qhqjlv17k9s2ymcyv2bwr6"; }) + (fetchNuGet { name = "runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.2"; sha256 = "1cpx56mcfxz7cpn57wvj18sjisvzq8b5vd9rw16ihd2i6mcp3wa1"; }) + (fetchNuGet { name = "runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.2"; sha256 = "15gsm1a8jdmgmf8j5v1slfz8ks124nfdhk2vxs2rw3asrxalg8hi"; }) + (fetchNuGet { name = "runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.2"; sha256 = "0q0n5q1r1wnqmr5i5idsrd9ywl33k0js4pngkwq9p368mbxp8x1w"; }) + (fetchNuGet { name = "runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.2"; sha256 = "1x0g58pbpjrmj2x2qw17rdwwnrcl0wvim2hdwz48lixvwvp22n9c"; }) + (fetchNuGet { name = "runtime.unix.Microsoft.Win32.Primitives"; version = "4.3.0"; sha256 = "0y61k9zbxhdi0glg154v30kkq7f8646nif8lnnxbvkjpakggd5id"; }) + (fetchNuGet { name = "runtime.unix.System.Diagnostics.Debug"; version = "4.3.0"; sha256 = "1lps7fbnw34bnh3lm31gs5c0g0dh7548wfmb8zz62v0zqz71msj5"; }) + (fetchNuGet { name = "runtime.unix.System.IO.FileSystem"; version = "4.3.0"; sha256 = "14nbkhvs7sji5r1saj2x8daz82rnf9kx28d3v2qss34qbr32dzix"; }) + (fetchNuGet { name = "runtime.unix.System.Net.Primitives"; version = "4.3.0"; sha256 = "0bdnglg59pzx9394sy4ic66kmxhqp8q8bvmykdxcbs5mm0ipwwm4"; }) + (fetchNuGet { name = "runtime.unix.System.Private.Uri"; version = "4.3.0"; sha256 = "1jx02q6kiwlvfksq1q9qr17fj78y5v6mwsszav4qcz9z25d5g6vk"; }) + (fetchNuGet { name = "runtime.unix.System.Runtime.Extensions"; version = "4.3.0"; sha256 = "0pnxxmm8whx38dp6yvwgmh22smknxmqs5n513fc7m4wxvs1bvi4p"; }) + (fetchNuGet { name = "runtime.win.Microsoft.Win32.Primitives"; version = "4.3.0"; sha256 = "0k1h8nnp1s0p8rjwgjyj1387cc1yycv0k22igxc963lqdzrx2z36"; }) + (fetchNuGet { name = "runtime.win.System.Diagnostics.Debug"; version = "4.3.0"; sha256 = "16fbn4bcynad1ygdq0yk1wmckvs8jvrrf104xa5dc2hlc8y3x58f"; }) + (fetchNuGet { name = "runtime.win.System.IO.FileSystem"; version = "4.3.0"; sha256 = "1c01nklbxywszsbfaxc76hsz7gdxac3jkphrywfkdsi3v4bwd6g8"; }) + (fetchNuGet { name = "runtime.win.System.Net.Primitives"; version = "4.3.0"; sha256 = "1dixh195bi7473n17hspll6i562gghdz9m4jk8d4kzi1mlzjk9cf"; }) + (fetchNuGet { name = "runtime.win.System.Runtime.Extensions"; version = "4.3.0"; sha256 = "1700famsxndccfbcdz9q14qb20p49lax67mqwpgy4gx3vja1yczr"; }) + (fetchNuGet { name = "StreamJsonRpc"; version = "2.5.46"; sha256 = "0rsgxfxcfgbx1w2jhllx1cwnbj9vra6034gv4kgzahh0v5vn8shf"; }) + (fetchNuGet { name = "System.Buffers"; version = "4.3.0"; sha256 = "0fgns20ispwrfqll4q1zc1waqcmylb3zc50ys9x8zlwxh9pmd9jy"; }) + (fetchNuGet { name = "System.Buffers"; version = "4.5.0"; sha256 = "1ywfqn4md6g3iilpxjn5dsr0f5lx6z0yvhqp4pgjcamygg73cz2c"; }) + (fetchNuGet { name = "System.Collections"; version = "4.3.0"; sha256 = "19r4y64dqyrq6k4706dnyhhw7fs24kpp3awak7whzss39dakpxk9"; }) + (fetchNuGet { name = "System.Collections.Concurrent"; version = "4.3.0"; sha256 = "0wi10md9aq33jrkh2c24wr2n9hrpyamsdhsxdcnf43b7y86kkii8"; }) + (fetchNuGet { name = "System.Collections.Immutable"; version = "1.5.0"; sha256 = "1d5gjn5afnrf461jlxzawcvihz195gayqpcfbv6dd7pxa9ialn06"; }) + (fetchNuGet { name = "System.Diagnostics.Debug"; version = "4.3.0"; sha256 = "00yjlf19wjydyr6cfviaph3vsjzg3d5nvnya26i2fvfg53sknh3y"; }) + (fetchNuGet { name = "System.Diagnostics.DiagnosticSource"; version = "4.3.0"; sha256 = "0z6m3pbiy0qw6rn3n209rrzf9x1k4002zh90vwcrsym09ipm2liq"; }) + (fetchNuGet { name = "System.Diagnostics.Tracing"; version = "4.3.0"; sha256 = "1m3bx6c2s958qligl67q7grkwfz3w53hpy7nc97mh6f7j5k168c4"; }) + (fetchNuGet { name = "System.Globalization"; version = "4.3.0"; sha256 = "1cp68vv683n6ic2zqh2s1fn4c2sd87g5hpp6l4d4nj4536jz98ki"; }) + (fetchNuGet { name = "System.Globalization.Calendars"; version = "4.3.0"; sha256 = "1xwl230bkakzzkrggy1l1lxmm3xlhk4bq2pkv790j5lm8g887lxq"; }) + (fetchNuGet { name = "System.Globalization.Extensions"; version = "4.3.0"; sha256 = "02a5zfxavhv3jd437bsncbhd2fp1zv4gxzakp1an9l6kdq1mcqls"; }) + (fetchNuGet { name = "System.IO"; version = "4.3.0"; sha256 = "05l9qdrzhm4s5dixmx68kxwif4l99ll5gqmh7rqgw554fx0agv5f"; }) + (fetchNuGet { name = "System.IO.FileSystem"; version = "4.3.0"; sha256 = "0z2dfrbra9i6y16mm9v1v6k47f0fm617vlb7s5iybjjsz6g1ilmw"; }) + (fetchNuGet { name = "System.IO.FileSystem.Primitives"; version = "4.3.0"; sha256 = "0j6ndgglcf4brg2lz4wzsh1av1gh8xrzdsn9f0yznskhqn1xzj9c"; }) + (fetchNuGet { name = "System.IO.Pipelines"; version = "4.7.0"; sha256 = "1cx6bl2bhzp30ahy2csnwbphmlwwp840j56wgab105xc32la0mg4"; }) + (fetchNuGet { name = "System.Linq"; version = "4.3.0"; sha256 = "1w0gmba695rbr80l1k2h4mrwzbzsyfl2z4klmpbsvsg5pm4a56s7"; }) + (fetchNuGet { name = "System.Memory"; version = "4.5.3"; sha256 = "0naqahm3wljxb5a911d37mwjqjdxv9l0b49p5dmfyijvni2ppy8a"; }) + (fetchNuGet { name = "System.Net.Http"; version = "4.3.4"; sha256 = "0kdp31b8819v88l719j6my0yas6myv9d1viql3qz5577mv819jhl"; }) + (fetchNuGet { name = "System.Net.Primitives"; version = "4.3.0"; sha256 = "0c87k50rmdgmxx7df2khd9qj7q35j9rzdmm2572cc55dygmdk3ii"; }) + (fetchNuGet { name = "System.Net.WebSockets"; version = "4.3.0"; sha256 = "1gfj800078kggcgl0xyl00a6y5k4wwh2k2qm69rjy22wbmq7fy4p"; }) + (fetchNuGet { name = "System.Private.Uri"; version = "4.3.0"; sha256 = "04r1lkdnsznin0fj4ya1zikxiqr0h6r6a1ww2dsm60gqhdrf0mvx"; }) + (fetchNuGet { name = "System.Reflection"; version = "4.3.0"; sha256 = "0xl55k0mw8cd8ra6dxzh974nxif58s3k1rjv1vbd7gjbjr39j11m"; }) + (fetchNuGet { name = "System.Reflection.Emit"; version = "4.6.0"; sha256 = "18h375q5bn9h7swxnk4krrxym1dxmi9bm26p89xps9ygrj4q6zqw"; }) + (fetchNuGet { name = "System.Reflection.Emit.Lightweight"; version = "4.6.0"; sha256 = "0hry2k6b7kicg4zxnq0hhn0ys52711pxy7l9v5sp7gvp9cicwpgp"; }) + (fetchNuGet { name = "System.Reflection.Primitives"; version = "4.3.0"; sha256 = "04xqa33bld78yv5r93a8n76shvc8wwcdgr1qvvjh959g3rc31276"; }) + (fetchNuGet { name = "System.Resources.ResourceManager"; version = "4.3.0"; sha256 = "0sjqlzsryb0mg4y4xzf35xi523s4is4hz9q4qgdvlvgivl7qxn49"; }) + (fetchNuGet { name = "System.Runtime"; version = "4.3.0"; sha256 = "066ixvgbf2c929kgknshcxqj6539ax7b9m570cp8n179cpfkapz7"; }) + (fetchNuGet { name = "System.Runtime.CompilerServices.Unsafe"; version = "4.5.2"; sha256 = "1vz4275fjij8inf31np78hw50al8nqkngk04p3xv5n4fcmf1grgi"; }) + (fetchNuGet { name = "System.Runtime.CompilerServices.Unsafe"; version = "4.6.0"; sha256 = "0xmzi2gpbmgyfr75p24rqqsba3cmrqgmcv45lsqp5amgrdwd0f0m"; }) + (fetchNuGet { name = "System.Runtime.Extensions"; version = "4.3.0"; sha256 = "1ykp3dnhwvm48nap8q23893hagf665k0kn3cbgsqpwzbijdcgc60"; }) + (fetchNuGet { name = "System.Runtime.Handles"; version = "4.3.0"; sha256 = "0sw2gfj2xr7sw9qjn0j3l9yw07x73lcs97p8xfc9w1x9h5g5m7i8"; }) + (fetchNuGet { name = "System.Runtime.InteropServices"; version = "4.3.0"; sha256 = "00hywrn4g7hva1b2qri2s6rabzwgxnbpw9zfxmz28z09cpwwgh7j"; }) + (fetchNuGet { name = "System.Runtime.Numerics"; version = "4.3.0"; sha256 = "19rav39sr5dky7afygh309qamqqmi9kcwvz3i0c5700v0c5cg61z"; }) + (fetchNuGet { name = "System.Security.AccessControl"; version = "4.6.0"; sha256 = "1wl1dyghi0qhpap1vgfhg2ybdyyhy9vc2a7dpm1xb30vfgmlkjmf"; }) + (fetchNuGet { name = "System.Security.Cryptography.Algorithms"; version = "4.3.0"; sha256 = "03sq183pfl5kp7gkvq77myv7kbpdnq3y0xj7vi4q1kaw54sny0ml"; }) + (fetchNuGet { name = "System.Security.Cryptography.Cng"; version = "4.3.0"; sha256 = "1k468aswafdgf56ab6yrn7649kfqx2wm9aslywjam1hdmk5yypmv"; }) + (fetchNuGet { name = "System.Security.Cryptography.Csp"; version = "4.3.0"; sha256 = "1x5wcrddf2s3hb8j78cry7yalca4lb5vfnkrysagbn6r9x6xvrx1"; }) + (fetchNuGet { name = "System.Security.Cryptography.Encoding"; version = "4.3.0"; sha256 = "1jr6w70igqn07k5zs1ph6xja97hxnb3mqbspdrff6cvssgrixs32"; }) + (fetchNuGet { name = "System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0givpvvj8yc7gv4lhb6s1prq6p2c4147204a0wib89inqzd87gqc"; }) + (fetchNuGet { name = "System.Security.Cryptography.Primitives"; version = "4.3.0"; sha256 = "0pyzncsv48zwly3lw4f2dayqswcfvdwq2nz0dgwmi7fj3pn64wby"; }) + (fetchNuGet { name = "System.Security.Cryptography.X509Certificates"; version = "4.3.0"; sha256 = "0valjcz5wksbvijylxijjxb1mp38mdhv03r533vnx1q3ikzdav9h"; }) + (fetchNuGet { name = "System.Security.Principal.Windows"; version = "4.6.0"; sha256 = "1jmfzfz1n8hp63s5lja5xxpzkinbp6g59l3km9h8avjiisdrg5wm"; }) + (fetchNuGet { name = "System.Text.Encoding"; version = "4.3.0"; sha256 = "1f04lkir4iladpp51sdgmis9dj4y8v08cka0mbmsy0frc9a4gjqr"; }) + (fetchNuGet { name = "System.Text.Encoding.Extensions"; version = "4.3.0"; sha256 = "11q1y8hh5hrp5a3kw25cb6l00v5l5dvirkz8jr3sq00h1xgcgrxy"; }) + (fetchNuGet { name = "System.Threading"; version = "4.3.0"; sha256 = "0rw9wfamvhayp5zh3j7p1yfmx9b5khbf4q50d8k5rk993rskfd34"; }) + (fetchNuGet { name = "System.Threading.Overlapped"; version = "4.3.0"; sha256 = "1nahikhqh9nk756dh8p011j36rlcp1bzz3vwi2b4m1l2s3vz8idm"; }) + (fetchNuGet { name = "System.Threading.Tasks"; version = "4.3.0"; sha256 = "134z3v9abw3a6jsw17xl3f6hqjpak5l682k2vz39spj4kmydg6k7"; }) + (fetchNuGet { name = "System.Threading.Tasks.Dataflow"; version = "4.9.0"; sha256 = "1g6s9pjg4z8iy98df60y9a01imdqy59zd767vz74rrng78jl2dk5"; }) + (fetchNuGet { name = "System.Threading.Tasks.Extensions"; version = "4.5.3"; sha256 = "0g7r6hm572ax8v28axrdxz1gnsblg6kszq17g51pj14a5rn2af7i"; }) + (fetchNuGet { name = "System.ValueTuple"; version = "4.5.0"; sha256 = "00k8ja51d0f9wrq4vv5z2jhq8hy31kac2rg0rv06prylcybzl8cy"; }) ] diff --git a/pkgs/development/dotnet-modules/python-language-server/format-deps.sh b/pkgs/development/dotnet-modules/python-language-server/format-deps.sh deleted file mode 100755 index c2115edb18ac..000000000000 --- a/pkgs/development/dotnet-modules/python-language-server/format-deps.sh +++ /dev/null @@ -1,40 +0,0 @@ -#! /usr/bin/env nix-shell -#! nix-shell -p gawk nix -i bash - -# Retrieve sha256 hashes for each dependency in and format fetchNuGet calls -echo "" > deps.nix -urlbase="https://www.nuget.org/api/v2/package" -cat << EOL -# This file is autogenerated. -# To regenerate, run "create_deps.sh \$PATH_TO_LANGUAGE_SERVER_CHECKOUT" - -{ fetchurl }: let - - fetchNuGet = { name, version, sha256 }: fetchurl { - inherit sha256; - url = "$urlbase/\${name}/\${version}"; - }; - -in [ -EOL -IFS='' -while read line; do - name=$(echo $line | awk '{print $1}') - version=$(echo $line | awk '{print $2}') - sha256=$(nix-prefetch-url "$urlbase/$name/$version" 2>/dev/null) - - if [ -n "$sha256" ]; then - cat << EOL - - (fetchNuGet { - name = "$name"; - version = "$version"; - sha256 = "$sha256"; - }) -EOL - fi -done < $1 -cat << EOL - -] -EOL diff --git a/pkgs/development/dotnet-modules/python-language-server/manual_deps.txt b/pkgs/development/dotnet-modules/python-language-server/manual_deps.txt deleted file mode 100644 index 35afa4da80ae..000000000000 --- a/pkgs/development/dotnet-modules/python-language-server/manual_deps.txt +++ /dev/null @@ -1,2 +0,0 @@ -Microsoft.AspNetCore.App.Runtime.linux-x64 3.1.21 -Microsoft.NetCore.App.Runtime.linux-x64 3.1.21 diff --git a/pkgs/development/dotnet-modules/python-language-server/process_lockfile.py b/pkgs/development/dotnet-modules/python-language-server/process_lockfile.py deleted file mode 100755 index d67bdf048c8a..000000000000 --- a/pkgs/development/dotnet-modules/python-language-server/process_lockfile.py +++ /dev/null @@ -1,37 +0,0 @@ -#!/usr/bin/python - -import json -import sys - - -def process_section(name, section): - packages = set() - - if "resolved" in section: - packages.add((name, section["resolved"])) - - if "dependencies" in section: - for name in section["dependencies"]: - packages.add((name, section["dependencies"][name])) - - return packages - - -def main(): - with open(sys.argv[1], 'r') as f: - tree = json.loads(f.read()) - - packages = set() - - topDependencies = tree["dependencies"] - - for area in topDependencies: - for name in topDependencies[area]: - packages = packages.union(process_section(name, topDependencies[area][name])) - - for (name, version) in packages: - print("%s %s" % (name, version)) - - -if __name__ == "__main__": - main() diff --git a/pkgs/development/dotnet-modules/python-language-server/updater.sh b/pkgs/development/dotnet-modules/python-language-server/updater.sh new file mode 100755 index 000000000000..3e82ad842132 --- /dev/null +++ b/pkgs/development/dotnet-modules/python-language-server/updater.sh @@ -0,0 +1,41 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p gnused jq common-updater-scripts nuget-to-nix dotnet-sdk_3 nix-prefetch-git +set -eo pipefail +cd "$(dirname "${BASH_SOURCE[0]}")" + +deps_file="$(realpath ./deps.nix)" + +nix-prefetch-git https://github.com/microsoft/python-language-server --quiet > repo_info +new_version="$(jq -r ".date" < repo_info | cut -d"T" -f1)" +new_hash="$(jq -r ".sha256" < repo_info)" +new_rev="$(jq -r ".rev" < repo_info)" +rm repo_info + +old_rev="$(sed -nE 's/\s*rev = "(.*)".*/\1/p' ./default.nix)" + +if [[ $new_rev == $old_rev ]]; then + echo "Already up to date!" + exit 0 +fi + +pushd ../../../.. + +update-source-version python-language-server "$new_version" "$new_hash" --rev="$new_rev" +store_src="$(nix-build -A python-language-server.src --no-out-link)" +src="$(mktemp -d /tmp/pylang-server-src.XXX)" +cp -rT "$store_src" "$src" +chmod -R +w "$src" + +pushd "$src" + +export DOTNET_NOLOGO=1 +export DOTNET_CLI_TELEMETRY_OPTOUT=1 + +mkdir ./nuget_pkgs +dotnet restore src/LanguageServer/Impl/Microsoft.Python.LanguageServer.csproj --packages ./nuget_pkgs + +nuget-to-nix ./nuget_pkgs > "$deps_file" + +trap '' + rm -r "$src" +'' EXIT diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4c6b850e8f57..3bc53a63e064 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14846,9 +14846,7 @@ with pkgs; mdl = callPackage ../development/tools/misc/mdl { }; - python-language-server = callPackage ../development/dotnet-modules/python-language-server { - inherit (dotnetPackages) Nuget; - }; + python-language-server = callPackage ../development/dotnet-modules/python-language-server { }; minify = callPackage ../development/web/minify { }; From fb2b2f8ab27f872d088b25e25056d7f5e71b3907 Mon Sep 17 00:00:00 2001 From: Cody Hiar Date: Wed, 17 Nov 2021 09:08:42 -0700 Subject: [PATCH 11/62] mani: init at 0.10.0 --- pkgs/development/tools/mani/default.nix | 45 +++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 47 insertions(+) create mode 100644 pkgs/development/tools/mani/default.nix diff --git a/pkgs/development/tools/mani/default.nix b/pkgs/development/tools/mani/default.nix new file mode 100644 index 000000000000..8cfebb34861e --- /dev/null +++ b/pkgs/development/tools/mani/default.nix @@ -0,0 +1,45 @@ +{ buildGoModule, fetchFromGitHub, lib, installShellFiles, git, makeWrapper}: + +buildGoModule rec { + pname = "mani"; + version = "0.10.0"; + + src = fetchFromGitHub { + owner = "alajmo"; + repo = "mani"; + rev = "v${version}"; + sha256 = "sha256-9rcgPeYFHdIN73K0zGPEHqFFLFkVYkNYRXJ+0/Zo4zI="; + }; + + vendorSha256 = "sha256-ZivzDfjx2djzS0Xm3GISK3zpB5fUUMgy2o4Ti1Z9wMM="; + + nativeBuildInputs = [ installShellFiles makeWrapper ]; + + postInstall = '' + installShellCompletion --cmd mani \ + --bash <($out/bin/mani completion bash) \ + --fish <($out/bin/mani completion fish) \ + --zsh <($out/bin/mani completion zsh) + + wrapProgram $out/bin/mani \ + --prefix PATH : ${lib.makeBinPath [ git ]} + ''; + + # Skip tests + # The repo's test folder has a README.md with detailed information. I don't + # know how to wrap the dependencies for these integration tests so skip for now. + doCheck = false; + + meta = with lib; { + description = "CLI tool to help you manage multiple repositories"; + longDescription = '' + mani is a CLI tool that helps you manage multiple repositories. It's useful + when you are working with microservices, multi-project systems, many + libraries or just a bunch of repositories and want a central place for + pulling all repositories and running commands over them. + ''; + homepage = "https://manicli.com/"; + changelog = "https://github.com/alajmo/mani/releases/tag/v${version}"; + license = licenses.mit; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 551cb4e01572..00080918ab0d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6904,6 +6904,8 @@ with pkgs; makebootfat = callPackage ../tools/misc/makebootfat { }; + mani = callPackage ../development/tools/mani { }; + mapcache = callPackage ../servers/mapcache { }; mapserver = callPackage ../servers/mapserver { }; From 218f14351463ed26809479410600f2ef136d05b4 Mon Sep 17 00:00:00 2001 From: Francesco Gazzetta Date: Sun, 21 Nov 2021 12:26:56 +0100 Subject: [PATCH 12/62] vengi-tools: init at 0.0.14 --- .../graphics/vengi-tools/default.nix | 117 ++++++++++++++++++ .../vengi-tools/test-voxconvert-roundtrip.nix | 15 +++ pkgs/top-level/all-packages.nix | 4 + 3 files changed, 136 insertions(+) create mode 100644 pkgs/applications/graphics/vengi-tools/default.nix create mode 100644 pkgs/applications/graphics/vengi-tools/test-voxconvert-roundtrip.nix diff --git a/pkgs/applications/graphics/vengi-tools/default.nix b/pkgs/applications/graphics/vengi-tools/default.nix new file mode 100644 index 000000000000..3ddbea105b53 --- /dev/null +++ b/pkgs/applications/graphics/vengi-tools/default.nix @@ -0,0 +1,117 @@ +{ lib +, stdenv +, fetchFromGitHub +, fetchurl + +, cmake +, pkg-config +, ninja +, python3 +, makeWrapper + +, glm +, lua5_4 +, SDL2 +, SDL2_mixer +, enet +, libuv +, libuuid +, wayland-protocols +, Carbon +# optionals +, opencl-headers +, OpenCL + +, callPackage +}: + +# cmake 3.21 inserts invalid `ldd` and `-Wl,--no-as-needed` calls, apparently +# related to +# https://cmake.org/cmake/help/v3.21/prop_tgt/LINK_WHAT_YOU_USE.html +let cmake3_22 = cmake.overrideAttrs (old: { + version = "3.22.0"; + src = fetchurl { + url = "https://cmake.org/files/v3.22/cmake-3.22.0.tar.gz"; + sha256 = "sha256-mYx7o0d40t/bPfimlUaeJLEeK/oh++QbNho/ReHJNF4="; + }; +}); + +in stdenv.mkDerivation rec { + pname = "vengi-tools"; + version = "0.0.14"; + + src = fetchFromGitHub { + owner = "mgerhardy"; + repo = "engine"; + rev = "v${version}"; + sha256 = "sha256-v82hKskTSwM0NDgLVHpHZNRQW6tWug4pPIt91MrUwUo="; + }; + + nativeBuildInputs = [ + cmake3_22 + pkg-config + ninja + python3 + makeWrapper + ]; + + buildInputs = [ + glm + lua5_4 + SDL2 + SDL2_mixer + enet + libuv + libuuid + # Only needed for the game + #postgresql + #libpqxx + #mosquitto + ] ++ lib.optional stdenv.isLinux wayland-protocols + ++ lib.optionals stdenv.isDarwin [ Carbon OpenCL ] + ++ lib.optional (!stdenv.isDarwin) opencl-headers; + + cmakeFlags = [ + # Disable tests due to a problem in linking gtest: + # ld: /build/vengi-tests-core.LDHlV1.ltrans0.ltrans.o: in function `main': + # :(.text.startup+0x3f): undefined reference to `testing::InitGoogleMock(int*, char**)' + "-DUNITTESTS=OFF" + "-DVISUALTESTS=OFF" + # We're only interested in the generic tools + "-DGAMES=OFF" + "-DMAPVIEW=OFF" + "-DAIDEBUG=OFF" + ]; + + # Set the data directory for each executable. We cannot set it at build time + # with the PKGDATADIR cmake variable because each executable needs a specific + # one. + # This is not needed on darwin, since on that platform data files are saved + # in *.app/Contents/Resources/ too, and are picked up automatically. + postInstall = lib.optionalString (!stdenv.isDarwin) '' + for prog in $out/bin/*; do + wrapProgram "$prog" \ + --set CORE_PATH $out/share/$(basename "$prog")/ + done + ''; + + passthru.tests = { + voxconvert-roundtrip = callPackage ./test-voxconvert-roundtrip.nix {}; + }; + + meta = with lib; { + description = "Tools from the vengi voxel engine, including a thumbnailer, a converter, and the VoxEdit voxel editor"; + longDescription = '' + Tools from the vengi C++ voxel game engine. It includes a voxel editor + with character animation support and loading/saving into a lot of voxel + volume formats. There are other tools like e.g. a thumbnailer for your + filemanager and a command line tool to convert between several voxel + formats. + ''; + homepage = "https://mgerhardy.github.io/engine/"; + downloadPage = "https://github.com/mgerhardy/engine/releases"; + license = [ licenses.mit licenses.cc-by-sa-30 ]; + maintainers = with maintainers; [ fgaz ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/applications/graphics/vengi-tools/test-voxconvert-roundtrip.nix b/pkgs/applications/graphics/vengi-tools/test-voxconvert-roundtrip.nix new file mode 100644 index 000000000000..27b0305615a8 --- /dev/null +++ b/pkgs/applications/graphics/vengi-tools/test-voxconvert-roundtrip.nix @@ -0,0 +1,15 @@ +{ stdenv +, vengi-tools +}: + +stdenv.mkDerivation { + name = "vengi-tools-test-voxconvert-roundtrip"; + meta.timeout = 10; + buildCommand = '' + ${vengi-tools}/bin/vengi-voxconvert ${vengi-tools}/share/vengi-voxedit/chr_knight.qb chr_knight.vox + ${vengi-tools}/bin/vengi-voxconvert chr_knight.vox chr_knight.qb + ${vengi-tools}/bin/vengi-voxconvert chr_knight.qb chr_knight1.vox + diff chr_knight.vox chr_knight1.vox + touch $out + ''; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 60762177c3e9..4c698e6587d0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -28750,6 +28750,10 @@ with pkgs; vdpauinfo = callPackage ../tools/X11/vdpauinfo { }; + vengi-tools = callPackage ../applications/graphics/vengi-tools { + inherit (darwin.apple_sdk.frameworks) Carbon OpenCL; + }; + verbiste = callPackage ../applications/misc/verbiste { inherit (gnome2) libgnomeui; }; From 324e9f686ec39ba5d4a760d957509c52039cec27 Mon Sep 17 00:00:00 2001 From: Francesco Gazzetta Date: Sun, 21 Nov 2021 18:09:17 +0100 Subject: [PATCH 13/62] nixosTests.vengi-tools: init --- nixos/tests/all-tests.nix | 1 + nixos/tests/vengi-tools.nix | 29 +++++++++++++++++++ .../graphics/vengi-tools/default.nix | 2 ++ 3 files changed, 32 insertions(+) create mode 100644 nixos/tests/vengi-tools.nix diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index b8219416dc42..ab107dfdcff7 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -486,6 +486,7 @@ in vault-postgresql = handleTest ./vault-postgresql.nix {}; vaultwarden = handleTest ./vaultwarden.nix {}; vector = handleTest ./vector.nix {}; + vengi-tools = handleTest ./vengi-tools.nix {}; victoriametrics = handleTest ./victoriametrics.nix {}; vikunja = handleTest ./vikunja.nix {}; virtualbox = handleTestOn ["x86_64-linux"] ./virtualbox.nix {}; diff --git a/nixos/tests/vengi-tools.nix b/nixos/tests/vengi-tools.nix new file mode 100644 index 000000000000..6b90542887d5 --- /dev/null +++ b/nixos/tests/vengi-tools.nix @@ -0,0 +1,29 @@ +import ./make-test-python.nix ({ pkgs, ... }: { + name = "vengi-tools"; + meta = with pkgs.lib.maintainers; { + maintainers = [ fgaz ]; + }; + + machine = { config, pkgs, ... }: { + imports = [ + ./common/x11.nix + ]; + + services.xserver.enable = true; + environment.systemPackages = [ pkgs.vengi-tools ]; + }; + + enableOCR = true; + + testScript = + '' + machine.wait_for_x() + machine.execute("vengi-voxedit >&2 &") + machine.wait_for_window("voxedit") + # OCR on voxedit's window is very expensive, so we avoid wasting a try + # by letting the window load fully first + machine.sleep(15) + machine.wait_for_text("Palette") + machine.screenshot("screen") + ''; +}) diff --git a/pkgs/applications/graphics/vengi-tools/default.nix b/pkgs/applications/graphics/vengi-tools/default.nix index 3ddbea105b53..00b3d80adf04 100644 --- a/pkgs/applications/graphics/vengi-tools/default.nix +++ b/pkgs/applications/graphics/vengi-tools/default.nix @@ -23,6 +23,7 @@ , OpenCL , callPackage +, nixosTests }: # cmake 3.21 inserts invalid `ldd` and `-Wl,--no-as-needed` calls, apparently @@ -97,6 +98,7 @@ in stdenv.mkDerivation rec { passthru.tests = { voxconvert-roundtrip = callPackage ./test-voxconvert-roundtrip.nix {}; + run-voxedit = nixosTests.vengi-tools; }; meta = with lib; { From 539811a4d3c680c21a4d493e79048c5aea8fb8bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabi=C3=A1n=20Heredia=20Montiel?= Date: Tue, 23 Nov 2021 10:59:51 -0600 Subject: [PATCH 14/62] nixos/gdm: enable nvidiaWayland by default --- nixos/modules/services/x11/display-managers/gdm.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/nixos/modules/services/x11/display-managers/gdm.nix b/nixos/modules/services/x11/display-managers/gdm.nix index e036c684c886..6f0d645725e9 100644 --- a/nixos/modules/services/x11/display-managers/gdm.nix +++ b/nixos/modules/services/x11/display-managers/gdm.nix @@ -83,14 +83,14 @@ in default = true; description = '' Allow GDM to run on Wayland instead of Xserver. - Note to enable Wayland with Nvidia you need to - enable the . + Note to enable Wayland with Nvidia the + must not be disabled. ''; }; nvidiaWayland = mkOption { type = types.bool; - default = false; + default = true; description = '' Whether to allow wayland to be used with the proprietary NVidia graphics driver. From 0c0f340c22b504ceba6e646c68b9abae5e716eca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Wed, 24 Nov 2021 13:45:39 +0100 Subject: [PATCH 15/62] xorg.xf86videomach64: drop the ancient driver It doesn't seems worth keeping it alive. Broken by commit 0649fcdf2. (I hope I did this right without regenerating.) --- pkgs/servers/x11/xorg/default.nix | 15 --------------- pkgs/servers/x11/xorg/tarballs.list | 1 - 2 files changed, 16 deletions(-) diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 47d2985a0258..085048ae68dc 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -2274,21 +2274,6 @@ lib.makeScope newScope (self: with self; { meta.platforms = lib.platforms.unix; }) {}; - # THIS IS A GENERATED FILE. DO NOT EDIT! - xf86videomach64 = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libdrm, libpciaccess, xorgserver }: stdenv.mkDerivation { - pname = "xf86-video-mach64"; - version = "6.9.6"; - builder = ./builder.sh; - src = fetchurl { - url = "mirror://xorg/individual/driver/xf86-video-mach64-6.9.6.tar.bz2"; - sha256 = "171wg8r6py1l138s58rlapin3rlpwsg9spmvhc7l68mm3g3hf1vs"; - }; - hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ xorgproto libdrm libpciaccess xorgserver ]; - meta.platforms = lib.platforms.unix; - }) {}; - # THIS IS A GENERATED FILE. DO NOT EDIT! xf86videomga = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libdrm, libpciaccess, xorgserver }: stdenv.mkDerivation { pname = "xf86-video-mga"; diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list index cc41317bf0f8..75503b3a7395 100644 --- a/pkgs/servers/x11/xorg/tarballs.list +++ b/pkgs/servers/x11/xorg/tarballs.list @@ -101,7 +101,6 @@ mirror://xorg/individual/driver/xf86-video-glint-1.2.9.tar.bz2 mirror://xorg/individual/driver/xf86-video-i128-1.4.0.tar.bz2 mirror://xorg/individual/driver/xf86-video-i740-1.4.0.tar.bz2 mirror://xorg/individual/driver/xf86-video-intel-2.99.917.tar.bz2 -mirror://xorg/individual/driver/xf86-video-mach64-6.9.6.tar.bz2 mirror://xorg/individual/driver/xf86-video-mga-2.0.0.tar.bz2 mirror://xorg/individual/driver/xf86-video-neomagic-1.3.0.tar.bz2 mirror://xorg/individual/driver/xf86-video-newport-0.2.4.tar.bz2 From b56089454542ca92634ecdff6c4fe04f723f5f51 Mon Sep 17 00:00:00 2001 From: Zane van Iperen Date: Thu, 25 Nov 2021 21:48:37 +1000 Subject: [PATCH 16/62] jpsxdec: init at 1.05 --- ...psxdec-hackfix-build-with-newer-JDKs.patch | 43 ++++++++++ pkgs/tools/games/jpsxdec/default.nix | 84 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 + 3 files changed, 131 insertions(+) create mode 100644 pkgs/tools/games/jpsxdec/0001-jpsxdec-hackfix-build-with-newer-JDKs.patch create mode 100644 pkgs/tools/games/jpsxdec/default.nix diff --git a/pkgs/tools/games/jpsxdec/0001-jpsxdec-hackfix-build-with-newer-JDKs.patch b/pkgs/tools/games/jpsxdec/0001-jpsxdec-hackfix-build-with-newer-JDKs.patch new file mode 100644 index 000000000000..17899ef328f1 --- /dev/null +++ b/pkgs/tools/games/jpsxdec/0001-jpsxdec-hackfix-build-with-newer-JDKs.patch @@ -0,0 +1,43 @@ +From 52662c71f7b043f374d4062d07a28b59ef010cbe Mon Sep 17 00:00:00 2001 +From: Zane van Iperen +Date: Wed, 22 Sep 2021 18:41:36 +1000 +Subject: [PATCH] jpsxdec: hackfix build with newer JDKs + +--- + jpsxdec/build.xml | 6 ++---- + 1 file changed, 2 insertions(+), 4 deletions(-) + +diff --git a/jpsxdec/build.xml b/jpsxdec/build.xml +index 713941c..f5aa902 100644 +--- a/jpsxdec/build.xml ++++ b/jpsxdec/build.xml +@@ -43,8 +43,8 @@ + + + +- +- ++ ++ + + + +@@ -76,7 +76,6 @@ + + + +- + + + +@@ -109,7 +108,6 @@ + + + +- + + + +-- +2.31.1 + diff --git a/pkgs/tools/games/jpsxdec/default.nix b/pkgs/tools/games/jpsxdec/default.nix new file mode 100644 index 000000000000..2c18f29bbf33 --- /dev/null +++ b/pkgs/tools/games/jpsxdec/default.nix @@ -0,0 +1,84 @@ +{ stdenv +, lib +, fetchFromGitHub +, jdk +/* + * jPSXdec needs to be built with no later than JDK8, but + * should be run with the latest to get HiDPI fixes, etc. + */ +, jre ? jdk +, ant +, unoconv +, makeWrapper +, makeDesktopItem +}: +let + pname = "jpsxdec"; + version = "1.05"; + + description = "Cross-platform PlayStation 1 audio and video converter"; + + desktopItem = makeDesktopItem { + name = pname; + exec = pname; + icon = pname; + comment = description; + desktopName = "jPSXdec"; + categories = "AudioVideo;Utility;"; + }; +in +stdenv.mkDerivation rec { + inherit pname version; + + src = fetchFromGitHub { + owner = "m35"; + repo = pname; + rev = "v${version}"; + sha256 = "0wnfvvcyldf699b08lzlc0gshl7rn09a6q4i7jmr41izlcdszdbz"; + }; + + nativeBuildInputs = [ ant jdk unoconv makeWrapper ]; + buildInputs = [ jre ]; + + patches = [ + ./0001-jpsxdec-hackfix-build-with-newer-JDKs.patch + ]; + + buildPhase = '' + runHook preBuild + + cd jpsxdec + mkdir -p _ant/release/doc/ + unoconv -d document -f pdf -o _ant/release/doc/jPSXdec-manual.pdf doc/jPSXdec-manual.odt + + ant release + + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + + mkdir -p $out/{bin,share/pixmaps} + mv _ant/release $out/jpsxdec + + makeWrapper ${jre}/bin/java $out/bin/jpsxdec \ + --add-flags "-jar $out/jpsxdec/jpsxdec.jar" + + cp ${src}/jpsxdec/src/jpsxdec/gui/icon48.png $out/share/pixmaps/${pname}.png + ln -s ${desktopItem}/share/applications $out/share + + runHook postInstall + ''; + + meta = with lib; { + inherit description; + homepage = "https://jpsxdec.blogspot.com/"; + platforms = platforms.all; + license = { + url = "https://raw.githubusercontent.com/m35/jpsxdec/readme/.github/LICENSE.md"; + free = true; + }; + maintainers = with maintainers; [ zane ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7a9d7517defe..497ded888291 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -27511,6 +27511,10 @@ with pkgs; wxGTK = wxGTK30-gtk3; }; + jpsxdec = callPackage ../tools/games/jpsxdec { + jdk = openjdk8; + }; + pdfslicer = callPackage ../applications/misc/pdfslicer { }; pekwm = callPackage ../applications/window-managers/pekwm { }; From cbfec29e810db7d49221cd4e840df66c9fd9402d Mon Sep 17 00:00:00 2001 From: Dzmitry Malyshau Date: Thu, 25 Nov 2021 11:18:07 -0500 Subject: [PATCH 17/62] moz-phab: use substituteInPlace instead of a patch --- pkgs/applications/misc/moz-phab/default.nix | 11 ++++++----- .../misc/moz-phab/relax-hglib-version.diff | 13 ------------- 2 files changed, 6 insertions(+), 18 deletions(-) delete mode 100644 pkgs/applications/misc/moz-phab/relax-hglib-version.diff diff --git a/pkgs/applications/misc/moz-phab/default.nix b/pkgs/applications/misc/moz-phab/default.nix index 9666f974957a..886e06a382bd 100644 --- a/pkgs/applications/misc/moz-phab/default.nix +++ b/pkgs/applications/misc/moz-phab/default.nix @@ -20,11 +20,12 @@ buildPythonApplication rec { sha256 = "sha256-uKoMMSp5AIvB1qTRYAh7n1+2dDLneFbssfkfTTshfcs="; }; - patches = [ - # Relax python-hglib requirement - # https://phabricator.services.mozilla.com/D131618 - ./relax-hglib-version.diff - ]; + # Relax python-hglib requirement + # https://phabricator.services.mozilla.com/D131618 + postPatch = '' + substituteInPlace setup.py \ + --replace "==" ">=" + ''; propagatedBuildInputs = [ distro diff --git a/pkgs/applications/misc/moz-phab/relax-hglib-version.diff b/pkgs/applications/misc/moz-phab/relax-hglib-version.diff deleted file mode 100644 index 6d415242f465..000000000000 --- a/pkgs/applications/misc/moz-phab/relax-hglib-version.diff +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/setup.py b/setup.py ---- a/setup.py -+++ b/setup.py -@@ -15,7 +15,7 @@ - install_requires=[ - "distro", - "glean-sdk>=36.0.0", -- "python-hglib==2.6.1", -+ "python-hglib>=2.6.2", - "sentry-sdk>=0.14.3", - "setuptools", - ], - From 3b069a2ef810abb92db95f8ee1162b8fa6d7a9bd Mon Sep 17 00:00:00 2001 From: oxalica Date: Sun, 28 Feb 2021 00:33:10 +0800 Subject: [PATCH 18/62] bintools-wrapper: add dynamicLinker for riscv --- pkgs/build-support/bintools-wrapper/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/build-support/bintools-wrapper/default.nix b/pkgs/build-support/bintools-wrapper/default.nix index 53f367b9b84d..c2d67169c9ca 100644 --- a/pkgs/build-support/bintools-wrapper/default.nix +++ b/pkgs/build-support/bintools-wrapper/default.nix @@ -81,6 +81,8 @@ let else if targetPlatform.system == "aarch64-linux" then "${sharedLibraryLoader}/lib/ld-linux-aarch64.so.1" else if targetPlatform.system == "powerpc-linux" then "${sharedLibraryLoader}/lib/ld.so.1" else if targetPlatform.isMips then "${sharedLibraryLoader}/lib/ld.so.1" + # `ld-linux-riscv{32,64}-.so.1` + else if targetPlatform.isRiscV then "${sharedLibraryLoader}/lib/ld-linux-riscv*.so.1" else if targetPlatform.isDarwin then "/usr/lib/dyld" else if targetPlatform.isFreeBSD then "/libexec/ld-elf.so.1" else if lib.hasSuffix "pc-gnu" targetPlatform.config then "ld.so.1" From fc3ea54fb3d97865dc2bb173c3a5ea54eaf1ad13 Mon Sep 17 00:00:00 2001 From: oxalica Date: Fri, 5 Mar 2021 03:46:32 +0800 Subject: [PATCH 19/62] make-bootstrap-tools: produce libatomic on riscv platform --- pkgs/stdenv/linux/make-bootstrap-tools.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/stdenv/linux/make-bootstrap-tools.nix b/pkgs/stdenv/linux/make-bootstrap-tools.nix index 0eee6e692fd3..84b63e7b8fd0 100644 --- a/pkgs/stdenv/linux/make-bootstrap-tools.nix +++ b/pkgs/stdenv/linux/make-bootstrap-tools.nix @@ -160,6 +160,11 @@ in with pkgs; rec { # pkgs/stdenv/linux/default.nix for the details. cp -d ${isl_0_20.out}/lib/libisl*.so* $out/lib + '' + lib.optionalString (stdenv.hostPlatform.isRiscV) '' + # libatomic is required on RiscV platform for C/C++ atomics and pthread + # even though they may be translated into native instructions. + cp -d ${bootGCC.out}/lib/libatomic.a* $out/lib + '' + '' cp -d ${bzip2.out}/lib/libbz2.so* $out/lib From 8cf96b94264402e958908862991c281999483d3a Mon Sep 17 00:00:00 2001 From: oxalica Date: Wed, 31 Mar 2021 23:56:38 +0800 Subject: [PATCH 20/62] stdenv: patch autoconf script for riscv in stage 2 --- pkgs/stdenv/linux/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/stdenv/linux/default.nix b/pkgs/stdenv/linux/default.nix index d2c74f7722d3..b2b0dad82d82 100644 --- a/pkgs/stdenv/linux/default.nix +++ b/pkgs/stdenv/linux/default.nix @@ -279,6 +279,10 @@ in }; }; }; + + # `libtool` comes with obsolete config.sub/config.guess that don't recognize Risc-V. + extraNativeBuildInputs = + lib.optional (localSystem.isRiscV) prevStage.updateAutotoolsGnuConfigScriptsHook; }) From 0235225a3c1afbe92bd3dfc070242108b6c4af6e Mon Sep 17 00:00:00 2001 From: Tobias Happ Date: Thu, 4 Nov 2021 14:04:09 +0100 Subject: [PATCH 21/62] zsh-better-npm-completion: init at unstable-2019-11-19 --- .../zsh/zsh-better-npm-completion/default.nix | 25 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 27 insertions(+) create mode 100644 pkgs/shells/zsh/zsh-better-npm-completion/default.nix diff --git a/pkgs/shells/zsh/zsh-better-npm-completion/default.nix b/pkgs/shells/zsh/zsh-better-npm-completion/default.nix new file mode 100644 index 000000000000..983a772d6d57 --- /dev/null +++ b/pkgs/shells/zsh/zsh-better-npm-completion/default.nix @@ -0,0 +1,25 @@ +{ lib, stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { + name = "zsh-better-npm-completion"; + version = "unstable-2019-11-19"; + + src = fetchFromGitHub { + owner = "lukechilds"; + repo = "zsh-better-npm-completion"; + rev = "0a7cf042415324ec38a186fdcbc9af163f0d7e69"; + sha256 = "16z7k5n1rcl9i61lrm7i5dsqsmhvdp1y4y5ii6hv2xpp470addgy"; + }; + + installPhase = '' + install -Dm 0644 zsh-better-npm-completion.plugin.zsh $out/share/zsh-better-npm-completion + ''; + + meta = with lib; { + description = "Better completion for npm"; + homepage = "https://github.com/lukechilds/zsh-better-npm-completion"; + license = licenses.mit; + platforms = platforms.unix; + maintainers = [ maintainers.gerschtli ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6131804f4fd9..d52dd29bbda5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11011,6 +11011,8 @@ with pkgs; zsh-bd = callPackage ../shells/zsh/zsh-bd { }; + zsh-better-npm-completion = callPackage ../shells/zsh/zsh-better-npm-completion { }; + zsh-clipboard = callPackage ../shells/zsh/zsh-clipboard { }; zsh-git-prompt = callPackage ../shells/zsh/zsh-git-prompt { }; From daf2b0f91719368aed574fb476aaf83a0c116940 Mon Sep 17 00:00:00 2001 From: Kerstin Humm Date: Sat, 6 Nov 2021 00:59:59 +0100 Subject: [PATCH 22/62] mastodon.updateScript: use runCommand instead of mkDerivation --- pkgs/servers/mastodon/update.nix | 36 ++++++++++++++++++++------------ 1 file changed, 23 insertions(+), 13 deletions(-) diff --git a/pkgs/servers/mastodon/update.nix b/pkgs/servers/mastodon/update.nix index d7423b3e66c8..2e7df482530f 100644 --- a/pkgs/servers/mastodon/update.nix +++ b/pkgs/servers/mastodon/update.nix @@ -1,20 +1,30 @@ -{ pkgs, stdenv, lib, makeWrapper, yarn2nix, bundix, coreutils, - diffutils, nix-prefetch-github, gnused, jq }: -stdenv.mkDerivation rec { - name = "mastodon-update-script"; - installPhase = '' - mkdir -p $out/bin - cp ${./update.sh} $out/bin/update.sh - patchShebangs $out/bin/update.sh - wrapProgram $out/bin/update.sh --prefix PATH : ${lib.makeBinPath buildInputs} - ''; - +{ pkgs +, runCommand +, lib +, makeWrapper +, yarn2nix +, bundix +, coreutils +, diffutils +, nix-prefetch-github +, gnused +, jq +}: +let + binPath = lib.makeBinPath [ yarn2nix bundix coreutils diffutils nix-prefetch-github gnused jq ]; +in +runCommand "mastodon-update-script" +{ nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ yarn2nix bundix coreutils diffutils nix-prefetch-github gnused jq ]; meta = { maintainers = with lib.maintainers; [ happy-river ]; description = "Utility to generate Nix expressions for Mastodon's dependencies"; platforms = lib.platforms.unix; }; -} +} '' + mkdir -p $out/bin + cp ${./update.sh} $out/bin/update.sh + patchShebangs $out/bin/update.sh + wrapProgram $out/bin/update.sh --prefix PATH : ${binPath} +'' From e67685910d38948bf62e64142306778f20743d45 Mon Sep 17 00:00:00 2001 From: Kerstin Humm Date: Sat, 6 Nov 2021 01:00:29 +0100 Subject: [PATCH 23/62] mastodon: 3.4.1 -> 3.4.4 update.sh --ver v3.4.4 --patches ./resolutions.patch --- pkgs/servers/mastodon/package.json | 6 +++--- pkgs/servers/mastodon/source.nix | 4 ++-- pkgs/servers/mastodon/version.nix | 2 +- pkgs/servers/mastodon/version.patch | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/servers/mastodon/package.json b/pkgs/servers/mastodon/package.json index 7d5400079091..b81940521c82 100644 --- a/pkgs/servers/mastodon/package.json +++ b/pkgs/servers/mastodon/package.json @@ -1,6 +1,6 @@ { - "version": "3.4.1", - "name": "@tootsuite/mastodon", + "version": "3.4.4", + "name": "@mastodon/mastodon", "license": "AGPL-3.0-or-later", "engines": { "node": ">=12" @@ -19,7 +19,7 @@ }, "repository": { "type": "git", - "url": "https://github.com/tootsuite/mastodon.git" + "url": "https://github.com/mastodon/mastodon.git" }, "browserslist": [ "last 2 versions", diff --git a/pkgs/servers/mastodon/source.nix b/pkgs/servers/mastodon/source.nix index be64ff23150d..4b1cd55b5e9e 100644 --- a/pkgs/servers/mastodon/source.nix +++ b/pkgs/servers/mastodon/source.nix @@ -2,8 +2,8 @@ { fetchgit, applyPatches }: let src = fetchgit { url = "https://github.com/tootsuite/mastodon.git"; - rev = "v3.4.1"; - sha256 = "1pg3yh6gfzwrhzm35s6ydpny4fj117z2avi4rck5d7n20j8s2hf5"; + rev = "v3.4.4"; + sha256 = "0gi818ns7ws63g7izhcqq5b28kifzmvg0p278lq82h02ysg9grj3"; }; in applyPatches { inherit src; diff --git a/pkgs/servers/mastodon/version.nix b/pkgs/servers/mastodon/version.nix index 4ccfa7d8ebc6..852b6be5f4b3 100644 --- a/pkgs/servers/mastodon/version.nix +++ b/pkgs/servers/mastodon/version.nix @@ -1 +1 @@ -"3.4.1" +"3.4.4" diff --git a/pkgs/servers/mastodon/version.patch b/pkgs/servers/mastodon/version.patch index 08bc2f827a8b..2d8d60071650 100644 --- a/pkgs/servers/mastodon/version.patch +++ b/pkgs/servers/mastodon/version.patch @@ -3,7 +3,7 @@ diff -Naur --label a/package.json --label b/package.json a/package.json b/packag +++ b/package.json @@ -1,4 +1,5 @@ { -+ "version": "3.4.1", - "name": "@tootsuite/mastodon", ++ "version": "3.4.4", + "name": "@mastodon/mastodon", "license": "AGPL-3.0-or-later", "engines": { From b93e9efd75b0af6175349e32bcc83be09c28a18b Mon Sep 17 00:00:00 2001 From: Mrinal Purohit Date: Thu, 25 Nov 2021 13:42:12 +0530 Subject: [PATCH 24/62] safe: 1.5.1 -> 1.6.1 --- pkgs/tools/security/safe/default.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/tools/security/safe/default.nix b/pkgs/tools/security/safe/default.nix index 747528b0ac4e..6b5160e7e753 100644 --- a/pkgs/tools/security/safe/default.nix +++ b/pkgs/tools/security/safe/default.nix @@ -1,22 +1,22 @@ { lib -, buildGoPackage +, buildGoModule , fetchFromGitHub }: -with builtins; - -buildGoPackage rec { +buildGoModule rec { pname = "safe"; - version = "1.5.1"; + version = "1.6.1"; src = fetchFromGitHub { owner = "starkandwayne"; repo = "safe"; rev = "v${version}"; - sha256 = "12gzxrnyl890h79z9yx23m1wwgy8ahm74q4qwi8n2nh7ydq6mn2d"; + sha256 = "sha256-ankX4BeMvBEd0e01mQHfaPg4z1z+IZqELaSEJ5deF8Y="; }; - goPackagePath = "github.com/starkandwayne/safe"; + vendorSha256 = "sha256-7hX35FfFxfoiI/dSxWhZH8iJoRWa4slAJF0lULq8KL4="; + + subPackages = [ "." ]; ldflags = [ "-X main.Version=${version}" From 8147fb683c111f40da54d245c965517bd2885b43 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Fri, 26 Nov 2021 12:56:51 +0000 Subject: [PATCH 25/62] samtools: pull upstream fix for ncurses-6.3 Without the fix build on ncurses-6.3 fails as: bam_tview_curses.c:88:5: error: format not a string literal and no format arguments [-Werror=format-security] 88 | mvprintw(y,x,str); | ^~~~~~~~ --- .../applications/science/biology/samtools/default.nix | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/science/biology/samtools/default.nix b/pkgs/applications/science/biology/samtools/default.nix index 99210092a154..98b0394c35f1 100644 --- a/pkgs/applications/science/biology/samtools/default.nix +++ b/pkgs/applications/science/biology/samtools/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, zlib, htslib, perl, ncurses ? null }: +{ lib, stdenv, fetchurl, fetchpatch, zlib, htslib, perl, ncurses ? null }: stdenv.mkDerivation rec { pname = "samtools"; @@ -9,6 +9,15 @@ stdenv.mkDerivation rec { sha256 = "sha256-YWyi4FHMgAmh6cAc/Yx8r4twkW3f9m87dpFAeUZfjGA="; }; + patches = [ + # Pull upstream patch for ncurses-6.3 support + (fetchpatch { + name = "ncurses-6.3.patch"; + url = "https://github.com/samtools/samtools/commit/396ef20eb0854d6b223c3223b60bb7efe42301f7.patch"; + sha256 = "sha256-p0l9ymXK9nqL2w8EytbW+qeaI7dD86IQgIVxacBj838="; + }) + ]; + nativeBuildInputs = [ perl ]; buildInputs = [ zlib ncurses htslib ]; From 8b154985f37cb9148c08f9e410f3333ff214dd4a Mon Sep 17 00:00:00 2001 From: pennae Date: Sat, 27 Nov 2021 00:02:47 +0100 Subject: [PATCH 26/62] edk2: use llvmPackages_9.stdenv stdenv.cc being a list does not seem to be such a good thing. --- pkgs/development/compilers/edk2/default.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/development/compilers/edk2/default.nix b/pkgs/development/compilers/edk2/default.nix index b92a7b5d1910..e60d647f6d38 100644 --- a/pkgs/development/compilers/edk2/default.nix +++ b/pkgs/development/compilers/edk2/default.nix @@ -5,9 +5,7 @@ , libuuid , python3 , bc -, clang_9 , llvmPackages_9 -, overrideCC , lib }: @@ -24,7 +22,7 @@ else throw "Unsupported architecture"; buildStdenv = if stdenv.isDarwin then - overrideCC clangStdenv [ clang_9 llvmPackages_9.llvm llvmPackages_9.lld ] + llvmPackages_9.stdenv else stdenv; From dbda557c643b16b7646615d8e82e39bf607abe0c Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Sat, 27 Nov 2021 01:15:42 +0000 Subject: [PATCH 27/62] steamPackages.steam-runtime: 0.20210906.1 -> 0.20211102.0 --- pkgs/games/steam/runtime.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/steam/runtime.nix b/pkgs/games/steam/runtime.nix index fc38c2eab99f..8f2398255a41 100644 --- a/pkgs/games/steam/runtime.nix +++ b/pkgs/games/steam/runtime.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation rec { pname = "steam-runtime"; # from https://repo.steampowered.com/steamrt-images-scout/snapshots/latest-steam-client-general-availability/VERSION.txt - version = "0.20210906.1"; + version = "0.20211102.0"; src = fetchurl { url = "https://repo.steampowered.com/steamrt-images-scout/snapshots/${version}/steam-runtime.tar.xz"; - sha256 = "1dkynar5y4q0pi32ihdhl7r81v9jxsb7lhc91mqhy43f6462qz1h"; + sha256 = "sha256-/ve4oVxKQ4uTaTiTg8Qc0Kyb4GRJKGZ5SQVLIyeJSpI="; name = "scout-runtime-${version}.tar.gz"; }; From aab65a362ed0e902c6a3e662047d80336bce3b01 Mon Sep 17 00:00:00 2001 From: Kira Bruneau Date: Sat, 27 Nov 2021 02:56:28 +0000 Subject: [PATCH 28/62] =?UTF-8?q?krane:=202.3.2=20=E2=86=92=202.3.4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../networking/cluster/krane/Gemfile.lock | 6 ++++- .../networking/cluster/krane/gemset.nix | 26 ++++++++++++++++--- 2 files changed, 28 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/cluster/krane/Gemfile.lock b/pkgs/applications/networking/cluster/krane/Gemfile.lock index 23ff2202704b..c2ef3e4b2510 100644 --- a/pkgs/applications/networking/cluster/krane/Gemfile.lock +++ b/pkgs/applications/networking/cluster/krane/Gemfile.lock @@ -9,8 +9,10 @@ GEM zeitwerk (~> 2.3) addressable (2.8.0) public_suffix (>= 2.0.2, < 5.0) + cgi (0.3.1) colorize (0.8.1) concurrent-ruby (1.1.9) + date (3.2.2) domain_name (0.5.20190701) unf (>= 0.0.5, < 1.0.0) ejson (1.3.0) @@ -61,10 +63,12 @@ GEM multi_json to_regexp (~> 0.2.1) jwt (2.3.0) - krane (2.3.2) + krane (2.3.4) activesupport (>= 5.0) + cgi colorize (~> 0.8) concurrent-ruby (~> 1.1) + date ejson (~> 1.0) googleauth (~> 0.8) jsonpath (~> 0.9.6) diff --git a/pkgs/applications/networking/cluster/krane/gemset.nix b/pkgs/applications/networking/cluster/krane/gemset.nix index d66f0e4cb09a..43bbe528cb69 100644 --- a/pkgs/applications/networking/cluster/krane/gemset.nix +++ b/pkgs/applications/networking/cluster/krane/gemset.nix @@ -21,6 +21,16 @@ }; version = "2.8.0"; }; + cgi = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1vy8g58ns18x3dl566wg5rp4hymlx9584ddf75isdyig0yxjl0sn"; + type = "gem"; + }; + version = "0.3.1"; + }; colorize = { groups = ["default"]; platforms = []; @@ -41,6 +51,16 @@ }; version = "1.1.9"; }; + date = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0j1ghv5lqpn8jdvvci2fqvl30j4x31hhgzzc0mj54cga1sgh97n7"; + type = "gem"; + }; + version = "3.2.2"; + }; domain_name = { dependencies = ["unf"]; groups = ["default"]; @@ -271,15 +291,15 @@ version = "2.3.0"; }; krane = { - dependencies = ["activesupport" "colorize" "concurrent-ruby" "ejson" "googleauth" "jsonpath" "kubeclient" "oj" "statsd-instrument" "thor"]; + dependencies = ["activesupport" "cgi" "colorize" "concurrent-ruby" "date" "ejson" "googleauth" "jsonpath" "kubeclient" "oj" "statsd-instrument" "thor"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0x908645i92w012xglc07lb6k2irn1zpzwgn1n99h2x54qk1pz4v"; + sha256 = "07pij3z7kz7n0nvf8xwcaackck8wyjwldjva7215k2dm8csdzaih"; type = "gem"; }; - version = "2.3.2"; + version = "2.3.4"; }; kubeclient = { dependencies = ["http" "recursive-open-struct" "rest-client"]; From 76e515cb267c6de577d14aeab1c2efe7cb2d84a6 Mon Sep 17 00:00:00 2001 From: Artturin Date: Sat, 27 Nov 2021 04:39:48 +0200 Subject: [PATCH 29/62] grub2: switch to release tarball for the localization files --- pkgs/tools/misc/grub/2.0x.nix | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/pkgs/tools/misc/grub/2.0x.nix b/pkgs/tools/misc/grub/2.0x.nix index d9c4ceeca2c0..661d6be21042 100644 --- a/pkgs/tools/misc/grub/2.0x.nix +++ b/pkgs/tools/misc/grub/2.0x.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchgit, flex, bison, python3, autoconf, automake, gnulib, libtool +{ lib, stdenv, fetchurl, flex, bison, python3, autoreconfHook, gnulib, libtool , gettext, ncurses, libusb-compat-0_1, freetype, qemu, lvm2, unifont, pkg-config , buildPackages , fetchpatch @@ -51,10 +51,9 @@ stdenv.mkDerivation rec { pname = "grub"; inherit version; - src = fetchgit { - url = "git://git.savannah.gnu.org/grub.git"; - rev = "${pname}-${version}"; - sha256 = "1vkxr6b4p7h259vayjw8bfgqj57x68byy939y4bmyaz6g7fgrv0f"; + src = fetchurl { + url = "mirror://gnu/grub/grub-${version}.tar.xz"; + sha256 = "sha256-t56kSvkbk9F80/6Ava5u1DdwZ4qaWuGSzOqAPrtlfuE="; }; patches = [ @@ -75,7 +74,7 @@ stdenv.mkDerivation rec { ''; depsBuildBuild = [ buildPackages.stdenv.cc ]; - nativeBuildInputs = [ bison flex python3 pkg-config autoconf automake gettext freetype ]; + nativeBuildInputs = [ bison flex python3 pkg-config gettext freetype autoreconfHook ]; buildInputs = [ ncurses libusb-compat-0_1 freetype lvm2 fuse libtool ] ++ optional doCheck qemu ++ optional zfsSupport zfs; @@ -109,8 +108,6 @@ stdenv.mkDerivation rec { patchShebangs . - ./bootstrap --no-git --gnulib-srcdir=${gnulib} - substituteInPlace ./configure --replace '/usr/share/fonts/unifont' '${unifont}/share/fonts' ''; From 8191c8e226fc158e73358d4951b5f09471753a5a Mon Sep 17 00:00:00 2001 From: Artturin Date: Sat, 27 Nov 2021 06:19:49 +0200 Subject: [PATCH 30/62] grub2: fix buildPackage bash shebang --- pkgs/tools/misc/grub/2.0x.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/grub/2.0x.nix b/pkgs/tools/misc/grub/2.0x.nix index 661d6be21042..ea983d6f0437 100644 --- a/pkgs/tools/misc/grub/2.0x.nix +++ b/pkgs/tools/misc/grub/2.0x.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, flex, bison, python3, autoreconfHook, gnulib, libtool +{ lib, stdenv, fetchurl, flex, bison, python3, autoreconfHook, gnulib, libtool, bash , gettext, ncurses, libusb-compat-0_1, freetype, qemu, lvm2, unifont, pkg-config , buildPackages , fetchpatch @@ -75,7 +75,7 @@ stdenv.mkDerivation rec { depsBuildBuild = [ buildPackages.stdenv.cc ]; nativeBuildInputs = [ bison flex python3 pkg-config gettext freetype autoreconfHook ]; - buildInputs = [ ncurses libusb-compat-0_1 freetype lvm2 fuse libtool ] + buildInputs = [ ncurses libusb-compat-0_1 freetype lvm2 fuse libtool bash ] ++ optional doCheck qemu ++ optional zfsSupport zfs; @@ -141,6 +141,9 @@ stdenv.mkDerivation rec { postInstall = '' # Avoid a runtime reference to gcc sed -i $out/lib/grub/*/modinfo.sh -e "/grub_target_cppflags=/ s|'.*'|' '|" + # just adding bash to buildInputs wasn't enough to fix the shebang + substituteInPlace $out/lib/grub/*/modinfo.sh \ + --replace ${buildPackages.bash} "/usr/bin/bash" ''; passthru.tests = { From 19447850a2e0ce26141452bb46da1267cdd11269 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominik=20Xaver=20H=C3=B6rl?= Date: Sun, 21 Feb 2021 09:09:28 +0100 Subject: [PATCH 31/62] Revert "nixos/install-grub: normalize whitespace" This morally reverts commit 0e8d7f9b3dabef47226a63654d4bba08aa438972. It made the generated boot script hard to read. --- .../system/boot/loader/grub/install-grub.pl | 232 +++++++++--------- 1 file changed, 116 insertions(+), 116 deletions(-) diff --git a/nixos/modules/system/boot/loader/grub/install-grub.pl b/nixos/modules/system/boot/loader/grub/install-grub.pl index 4d8537d4c327..db6add8b05a0 100644 --- a/nixos/modules/system/boot/loader/grub/install-grub.pl +++ b/nixos/modules/system/boot/loader/grub/install-grub.pl @@ -103,10 +103,10 @@ if (stat($bootPath)->dev != stat("/nix/store")->dev) { # Discover information about the location of the bootPath struct(Fs => { - device => '$', - type => '$', - mount => '$', - }); + device => '$', + type => '$', + mount => '$', +}); sub PathInMount { my ($path, $mount) = @_; my @splitMount = split /\//, $mount; @@ -155,16 +155,16 @@ sub GetFs { return $bestFs; } struct (Grub => { - path => '$', - search => '$', - }); + path => '$', + search => '$', +}); my $driveid = 1; sub GrubFs { my ($dir) = @_; my $fs = GetFs($dir); my $path = substr($dir, length($fs->mount)); if (substr($path, 0, 1) ne "/") { - $path = "/$path"; + $path = "/$path"; } my $search = ""; @@ -254,8 +254,8 @@ if ($grubVersion == 1) { # $defaultEntry might be "saved", indicating that we want to use the last selected configuration as default. # Incidentally this is already the correct value for the grub 1 config to achieve this behaviour. $conf .= " - default $defaultEntry - timeout $timeout + default $defaultEntry + timeout $timeout "; if ($splashImage) { copy $splashImage, "$bootPath/background.xpm.gz" or die "cannot copy $splashImage to $bootPath: $!\n"; @@ -305,7 +305,7 @@ else { if ($copyKernels == 0) { $conf .= " - " . $grubStore->search; + " . $grubStore->search; } # FIXME: should use grub-mkconfig. my $defaultEntryText = $defaultEntry; @@ -313,55 +313,55 @@ else { $defaultEntryText = "\"\${saved_entry}\""; } $conf .= " - " . $grubBoot->search . " - if [ -s \$prefix/grubenv ]; then - load_env - fi - - # ‘grub-reboot’ sets a one-time saved entry, which we process here and - # then delete. - if [ \"\${next_entry}\" ]; then - set default=\"\${next_entry}\" - set next_entry= - save_env next_entry - set timeout=1 - set boot_once=true - else - set default=$defaultEntryText - set timeout=$timeout - fi - - function savedefault { - if [ -z \"\${boot_once}\"]; then - saved_entry=\"\${chosen}\" - save_env saved_entry + " . $grubBoot->search . " + if [ -s \$prefix/grubenv ]; then + load_env fi - } - # Setup the graphics stack for bios and efi systems - if [ \"\${grub_platform}\" = \"efi\" ]; then - insmod efi_gop - insmod efi_uga - else - insmod vbe - fi + # ‘grub-reboot’ sets a one-time saved entry, which we process here and + # then delete. + if [ \"\${next_entry}\" ]; then + set default=\"\${next_entry}\" + set next_entry= + save_env next_entry + set timeout=1 + set boot_once=true + else + set default=$defaultEntryText + set timeout=$timeout + fi + + function savedefault { + if [ -z \"\${boot_once}\"]; then + saved_entry=\"\${chosen}\" + save_env saved_entry + fi + } + + # Setup the graphics stack for bios and efi systems + if [ \"\${grub_platform}\" = \"efi\" ]; then + insmod efi_gop + insmod efi_uga + else + insmod vbe + fi "; if ($font) { copy $font, "$bootPath/converted-font.pf2" or die "cannot copy $font to $bootPath: $!\n"; $conf .= " - insmod font - if loadfont " . ($grubBoot->path eq "/" ? "" : $grubBoot->path) . "/converted-font.pf2; then - insmod gfxterm - if [ \"\${grub_platform}\" = \"efi\" ]; then - set gfxmode=$gfxmodeEfi - set gfxpayload=$gfxpayloadEfi - else - set gfxmode=$gfxmodeBios - set gfxpayload=$gfxpayloadBios - fi - terminal_output gfxterm - fi + insmod font + if loadfont " . ($grubBoot->path eq "/" ? "" : $grubBoot->path) . "/converted-font.pf2; then + insmod gfxterm + if [ \"\${grub_platform}\" = \"efi\" ]; then + set gfxmode=$gfxmodeEfi + set gfxpayload=$gfxpayloadEfi + else + set gfxmode=$gfxmodeBios + set gfxpayload=$gfxpayloadBios + fi + terminal_output gfxterm + fi "; } if ($splashImage) { @@ -371,21 +371,21 @@ else { if ($suffix eq ".jpg") { $suffix = ".jpeg"; } - if ($backgroundColor) { - $conf .= " - background_color '$backgroundColor' - "; - } + if ($backgroundColor) { + $conf .= " + background_color '$backgroundColor' + "; + } copy $splashImage, "$bootPath/background$suffix" or die "cannot copy $splashImage to $bootPath: $!\n"; $conf .= " - insmod " . substr($suffix, 1) . " - if background_image --mode '$splashMode' " . ($grubBoot->path eq "/" ? "" : $grubBoot->path) . "/background$suffix; then - set color_normal=white/black - set color_highlight=black/white - else - set menu_color_normal=cyan/blue - set menu_color_highlight=white/blue - fi + insmod " . substr($suffix, 1) . " + if background_image --mode '$splashMode' " . ($grubBoot->path eq "/" ? "" : $grubBoot->path) . "/background$suffix; then + set color_normal=white/black + set color_highlight=black/white + else + set menu_color_normal=cyan/blue + set menu_color_highlight=white/blue + fi "; } @@ -395,21 +395,21 @@ else { # Copy theme rcopy($theme, "$bootPath/theme") or die "cannot copy $theme to $bootPath\n"; $conf .= " - # Sets theme. - set theme=" . ($grubBoot->path eq "/" ? "" : $grubBoot->path) . "/theme/theme.txt - export theme - # Load theme fonts, if any - "; + # Sets theme. + set theme=" . ($grubBoot->path eq "/" ? "" : $grubBoot->path) . "/theme/theme.txt + export theme + # Load theme fonts, if any + "; - find( { wanted => sub { - if ($_ =~ /\.pf2$/i) { - $font = File::Spec->abs2rel($File::Find::name, $theme); - $conf .= " - loadfont " . ($grubBoot->path eq "/" ? "" : $grubBoot->path) . "/theme/$font - "; - } - }, no_chdir => 1 }, $theme ); - } + find( { wanted => sub { + if ($_ =~ /\.pf2$/i) { + $font = File::Spec->abs2rel($File::Find::name, $theme); + $conf .= " + loadfont " . ($grubBoot->path eq "/" ? "" : $grubBoot->path) . "/theme/$font + "; + } + }, no_chdir => 1 }, $theme ); + } } $conf .= "$extraConfig\n"; @@ -448,25 +448,25 @@ sub addEntry { # Include second initrd with secrets if (-e -x "$path/append-initrd-secrets") { - my $initrdName = basename($initrd); - my $initrdSecretsPath = "$bootPath/kernels/$initrdName-secrets"; + my $initrdName = basename($initrd); + my $initrdSecretsPath = "$bootPath/kernels/$initrdName-secrets"; - mkpath(dirname($initrdSecretsPath), 0, 0755); - my $oldUmask = umask; - # Make sure initrd is not world readable (won't work if /boot is FAT) - umask 0137; - my $initrdSecretsPathTemp = File::Temp::mktemp("$initrdSecretsPath.XXXXXXXX"); - system("$path/append-initrd-secrets", $initrdSecretsPathTemp) == 0 or die "failed to create initrd secrets: $!\n"; - # Check whether any secrets were actually added - if (-e $initrdSecretsPathTemp && ! -z _) { - rename $initrdSecretsPathTemp, $initrdSecretsPath or die "failed to move initrd secrets into place: $!\n"; - $copied{$initrdSecretsPath} = 1; - $initrd .= " " . ($grubBoot->path eq "/" ? "" : $grubBoot->path) . "/kernels/$initrdName-secrets"; - } else { - unlink $initrdSecretsPathTemp; - rmdir dirname($initrdSecretsPathTemp); - } - umask $oldUmask; + mkpath(dirname($initrdSecretsPath), 0, 0755); + my $oldUmask = umask; + # Make sure initrd is not world readable (won't work if /boot is FAT) + umask 0137; + my $initrdSecretsPathTemp = File::Temp::mktemp("$initrdSecretsPath.XXXXXXXX"); + system("$path/append-initrd-secrets", $initrdSecretsPathTemp) == 0 or die "failed to create initrd secrets: $!\n"; + # Check whether any secrets were actually added + if (-e $initrdSecretsPathTemp && ! -z _) { + rename $initrdSecretsPathTemp, $initrdSecretsPath or die "failed to move initrd secrets into place: $!\n"; + $copied{$initrdSecretsPath} = 1; + $initrd .= " " . ($grubBoot->path eq "/" ? "" : $grubBoot->path) . "/kernels/$initrdName-secrets"; + } else { + unlink $initrdSecretsPathTemp; + rmdir dirname($initrdSecretsPathTemp); + } + umask $oldUmask; } my $xen = -e "$path/xen.gz" ? copyToKernelsDir(Cwd::abs_path("$path/xen.gz")) : undef; @@ -474,8 +474,8 @@ sub addEntry { # FIXME: $confName my $kernelParams = - "init=" . Cwd::abs_path("$path/init") . " " . - readFile("$path/kernel-params"); + "init=" . Cwd::abs_path("$path/init") . " " . + readFile("$path/kernel-params"); my $xenParams = $xen && -e "$path/xen-params" ? readFile("$path/xen-params") : ""; if ($grubVersion == 1) { @@ -524,9 +524,9 @@ foreach my $link (@links) { my $date = strftime("%F", localtime(lstat($link)->mtime)); my $version = - -e "$link/nixos-version" - ? readFile("$link/nixos-version") - : basename((glob(dirname(Cwd::abs_path("$link/kernel")) . "/lib/modules/*"))[0]); + -e "$link/nixos-version" + ? readFile("$link/nixos-version") + : basename((glob(dirname(Cwd::abs_path("$link/kernel")) . "/lib/modules/*"))[0]); if ($cfgName) { $entryName = $cfgName; @@ -551,8 +551,8 @@ sub addProfile { sub nrFromGen { my ($x) = @_; $x =~ /\/\w+-(\d+)-link/; return $1; } my @links = sort - { nrFromGen($b) <=> nrFromGen($a) } - (glob "$profile-*-link"); + { nrFromGen($b) <=> nrFromGen($a) } + (glob "$profile-*-link"); my $curEntry = 0; foreach my $link (@links) { @@ -563,9 +563,9 @@ sub addProfile { } my $date = strftime("%F", localtime(lstat($link)->mtime)); my $version = - -e "$link/nixos-version" - ? readFile("$link/nixos-version") - : basename((glob(dirname(Cwd::abs_path("$link/kernel")) . "/lib/modules/*"))[0]); + -e "$link/nixos-version" + ? readFile("$link/nixos-version") + : basename((glob(dirname(Cwd::abs_path("$link/kernel")) . "/lib/modules/*"))[0]); addEntry("NixOS - Configuration " . nrFromGen($link) . " ($date - $version)", $link); } @@ -587,7 +587,7 @@ $extraPrepareConfig =~ s/\@bootPath\@/$bootPath/g; # Run extraPrepareConfig in sh if ($extraPrepareConfig ne "") { - system((get("shell"), "-c", $extraPrepareConfig)); + system((get("shell"), "-c", $extraPrepareConfig)); } # write the GRUB config. @@ -653,13 +653,13 @@ foreach my $fn (glob "$bootPath/kernels/*") { # struct(GrubState => { - name => '$', - version => '$', - efi => '$', - devices => '$', - efiMountPoint => '$', - extraGrubInstallArgs => '@', - }); + name => '$', + version => '$', + efi => '$', + devices => '$', + efiMountPoint => '$', + extraGrubInstallArgs => '@', +}); # If you add something to the state file, only add it to the end # because it is read line-by-line. sub readGrubState { From 0360e035207bc99db533eb2e10e15270d1cd6fbf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominik=20Xaver=20H=C3=B6rl?= Date: Sun, 21 Feb 2021 09:24:23 +0100 Subject: [PATCH 32/62] nixos/install-grub: fix whitespace This time hopefully without changing the generated boot script. --- .../system/boot/loader/grub/install-grub.pl | 70 +++++++++---------- 1 file changed, 35 insertions(+), 35 deletions(-) diff --git a/nixos/modules/system/boot/loader/grub/install-grub.pl b/nixos/modules/system/boot/loader/grub/install-grub.pl index db6add8b05a0..0c93b288fc65 100644 --- a/nixos/modules/system/boot/loader/grub/install-grub.pl +++ b/nixos/modules/system/boot/loader/grub/install-grub.pl @@ -164,7 +164,7 @@ sub GrubFs { my $fs = GetFs($dir); my $path = substr($dir, length($fs->mount)); if (substr($path, 0, 1) ne "/") { - $path = "/$path"; + $path = "/$path"; } my $search = ""; @@ -371,11 +371,11 @@ else { if ($suffix eq ".jpg") { $suffix = ".jpeg"; } - if ($backgroundColor) { - $conf .= " - background_color '$backgroundColor' - "; - } + if ($backgroundColor) { + $conf .= " + background_color '$backgroundColor' + "; + } copy $splashImage, "$bootPath/background$suffix" or die "cannot copy $splashImage to $bootPath: $!\n"; $conf .= " insmod " . substr($suffix, 1) . " @@ -399,17 +399,17 @@ else { set theme=" . ($grubBoot->path eq "/" ? "" : $grubBoot->path) . "/theme/theme.txt export theme # Load theme fonts, if any - "; + "; - find( { wanted => sub { - if ($_ =~ /\.pf2$/i) { - $font = File::Spec->abs2rel($File::Find::name, $theme); - $conf .= " - loadfont " . ($grubBoot->path eq "/" ? "" : $grubBoot->path) . "/theme/$font - "; - } - }, no_chdir => 1 }, $theme ); - } + find( { wanted => sub { + if ($_ =~ /\.pf2$/i) { + $font = File::Spec->abs2rel($File::Find::name, $theme); + $conf .= " + loadfont " . ($grubBoot->path eq "/" ? "" : $grubBoot->path) . "/theme/$font + "; + } + }, no_chdir => 1 }, $theme ); + } } $conf .= "$extraConfig\n"; @@ -448,25 +448,25 @@ sub addEntry { # Include second initrd with secrets if (-e -x "$path/append-initrd-secrets") { - my $initrdName = basename($initrd); - my $initrdSecretsPath = "$bootPath/kernels/$initrdName-secrets"; + my $initrdName = basename($initrd); + my $initrdSecretsPath = "$bootPath/kernels/$initrdName-secrets"; - mkpath(dirname($initrdSecretsPath), 0, 0755); - my $oldUmask = umask; - # Make sure initrd is not world readable (won't work if /boot is FAT) - umask 0137; - my $initrdSecretsPathTemp = File::Temp::mktemp("$initrdSecretsPath.XXXXXXXX"); - system("$path/append-initrd-secrets", $initrdSecretsPathTemp) == 0 or die "failed to create initrd secrets: $!\n"; - # Check whether any secrets were actually added - if (-e $initrdSecretsPathTemp && ! -z _) { - rename $initrdSecretsPathTemp, $initrdSecretsPath or die "failed to move initrd secrets into place: $!\n"; - $copied{$initrdSecretsPath} = 1; - $initrd .= " " . ($grubBoot->path eq "/" ? "" : $grubBoot->path) . "/kernels/$initrdName-secrets"; - } else { - unlink $initrdSecretsPathTemp; - rmdir dirname($initrdSecretsPathTemp); - } - umask $oldUmask; + mkpath(dirname($initrdSecretsPath), 0, 0755); + my $oldUmask = umask; + # Make sure initrd is not world readable (won't work if /boot is FAT) + umask 0137; + my $initrdSecretsPathTemp = File::Temp::mktemp("$initrdSecretsPath.XXXXXXXX"); + system("$path/append-initrd-secrets", $initrdSecretsPathTemp) == 0 or die "failed to create initrd secrets: $!\n"; + # Check whether any secrets were actually added + if (-e $initrdSecretsPathTemp && ! -z _) { + rename $initrdSecretsPathTemp, $initrdSecretsPath or die "failed to move initrd secrets into place: $!\n"; + $copied{$initrdSecretsPath} = 1; + $initrd .= " " . ($grubBoot->path eq "/" ? "" : $grubBoot->path) . "/kernels/$initrdName-secrets"; + } else { + unlink $initrdSecretsPathTemp; + rmdir dirname($initrdSecretsPathTemp); + } + umask $oldUmask; } my $xen = -e "$path/xen.gz" ? copyToKernelsDir(Cwd::abs_path("$path/xen.gz")) : undef; @@ -587,7 +587,7 @@ $extraPrepareConfig =~ s/\@bootPath\@/$bootPath/g; # Run extraPrepareConfig in sh if ($extraPrepareConfig ne "") { - system((get("shell"), "-c", $extraPrepareConfig)); + system((get("shell"), "-c", $extraPrepareConfig)); } # write the GRUB config. From 45e0ffb3ccf6733d6d57fe6906f59b333089359e Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Tue, 5 Oct 2021 00:09:21 +0100 Subject: [PATCH 33/62] python3Packages.libarchive-c: 3.1 -> 3.2 --- pkgs/development/python-modules/libarchive-c/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/libarchive-c/default.nix b/pkgs/development/python-modules/libarchive-c/default.nix index 92837ac77a10..13f61c6aa949 100644 --- a/pkgs/development/python-modules/libarchive-c/default.nix +++ b/pkgs/development/python-modules/libarchive-c/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "libarchive-c"; - version = "3.1"; + version = "3.2"; format = "setuptools"; src = fetchFromGitHub { owner = "Changaco"; repo = "python-${pname}"; rev = version; - sha256 = "1z4lqy9zlzymshzrcldsc9ipys2l7grqg4yff6ndl6dgbfb0g4jb"; + sha256 = "1kj3y9vnsc9m2hvnvgk5inawxfknz5drj3q51hqgcbq8p4dm8vli"; }; LC_ALL="en_US.UTF-8"; From 592218648c26454862920beb5e891be92ac728e8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aleksandar=20Topuzovi=C4=87?= Date: Sat, 27 Nov 2021 11:27:46 +0000 Subject: [PATCH 34/62] augustus: 3.0.1 -> 3.1.0 --- pkgs/games/augustus/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/augustus/default.nix b/pkgs/games/augustus/default.nix index 4693e290da6a..c6258ddb24d7 100644 --- a/pkgs/games/augustus/default.nix +++ b/pkgs/games/augustus/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "augustus"; - version = "3.0.1"; + version = "3.1.0"; src = fetchFromGitHub { owner = "Keriew"; repo = "augustus"; rev = "v${version}"; - sha256 = "03pmnwq6bahq854vh1vmv1vabb8cs0alca8f36id8dlz8bw95nik"; + sha256 = "1axm4x3ca5r08sv1b4q8y9c15mkwqd3rnc8k09a2fn3plbk2p2j4"; }; nativeBuildInputs = [ cmake ]; From 8e89d68448770c4b47621f15c961dfbb6488b403 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sat, 27 Nov 2021 12:27:36 +0000 Subject: [PATCH 35/62] gsl_1: enable parallel building Had to pull upstream fix that fixes parallel test runs. --- pkgs/development/libraries/gsl/gsl-1_16.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/development/libraries/gsl/gsl-1_16.nix b/pkgs/development/libraries/gsl/gsl-1_16.nix index d26651875756..4370314f6ec3 100644 --- a/pkgs/development/libraries/gsl/gsl-1_16.nix +++ b/pkgs/development/libraries/gsl/gsl-1_16.nix @@ -17,8 +17,15 @@ stdenv.mkDerivation rec { url = "https://git.savannah.gnu.org/cgit/gsl.git/patch/?id=9cc12d"; sha256 = "1bmrmihi28cly9g9pq54kkix2jy59y7cd7h5fw4v1c7h5rc2qvs8"; }) + + (fetchpatch { + name = "fix-parallel-test.patch"; + url = "https://git.savannah.gnu.org/cgit/gsl.git/patch/?id=12654373c3b60541230921aae81f93b484ec5eaf"; + sha256 = "1flzpbsfj7gjywv6v9qvm8wpdrkbpj7shryinfdpb40y7si9njdw"; + }) ]; + enableParallelBuilding = true; doCheck = true; meta = { From b3c9ba1d03b2207c2a45eea9c1996fbf11d4c9eb Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 28 Nov 2021 13:26:00 +0100 Subject: [PATCH 36/62] cloud-init: 21.2 -> 21.4 --- .../virtualization/cloud-init/default.nix | 53 +++++++++++-------- 1 file changed, 30 insertions(+), 23 deletions(-) diff --git a/pkgs/tools/virtualization/cloud-init/default.nix b/pkgs/tools/virtualization/cloud-init/default.nix index dd30969ed8bd..6bc070d2cbbf 100644 --- a/pkgs/tools/virtualization/cloud-init/default.nix +++ b/pkgs/tools/virtualization/cloud-init/default.nix @@ -1,36 +1,30 @@ { lib -, fetchFromGitHub , buildPythonApplication -, jinja2 -, oauthlib -, configobj -, pyyaml -, requests -, jsonschema -, jsonpatch -, httpretty -, dmidecode -, pytestCheckHook -, shadow , cloud-utils +, dmidecode +, fetchFromGitHub , openssh +, python3 +, shadow }: -buildPythonApplication rec { +python3.pkgs.buildPythonApplication rec { pname = "cloud-init"; - version = "21.2"; + version = "21.4"; namePrefix = ""; src = fetchFromGitHub { owner = "canonical"; repo = "cloud-init"; rev = version; - sha256 = "0vhjkgs49ixfa3kkj5s3v3gcxvypm3cdvfk6adrk2bx3wv2cbhvz"; + sha256 = "09413qz9y2csvhjb4krjnkfj97vlykx79j912p27jjcrg82f1nib"; }; patches = [ ./0001-add-nixos-support.patch ]; + prePatch = '' - substituteInPlace setup.py --replace /lib/systemd $out/lib/systemd + substituteInPlace setup.py \ + --replace /lib/systemd $out/lib/systemd ''; postInstall = '' @@ -40,17 +34,18 @@ buildPythonApplication rec { done ''; - propagatedBuildInputs = [ - jinja2 - oauthlib + propagatedBuildInputs = with python3.pkgs; [ configobj + jinja2 + jsonpatch + jsonschema + netifaces + oauthlib pyyaml requests - jsonschema - jsonpatch ]; - checkInputs = [ + checkInputs = with python3.pkgs; [ pytestCheckHook httpretty dmidecode @@ -78,6 +73,16 @@ buildPythonApplication rec { "TestInstallChefOmnibus" # https://github.com/canonical/cloud-init/pull/893 "TestGetPackageMirrorInfo" + # Disable failing VMware and PuppetAio tests + "test_get_data_iso9660_with_network_config" + "test_get_data_vmware_guestinfo_with_network_config" + "test_get_host_info" + "test_no_data_access_method" + "test_install_with_collection" + "test_install_with_custom_url" + "test_install_with_default_arguments" + "test_install_with_no_cleanup" + "test_install_with_version" ]; disabledTestPaths = [ @@ -99,7 +104,9 @@ buildPythonApplication rec { export TMPDIR=/tmp ''; - pythonImportsCheck = [ "cloudinit" ]; + pythonImportsCheck = [ + "cloudinit" + ]; meta = with lib; { homepage = "https://cloudinit.readthedocs.org"; From 722bfae4875783c086bbd102a63c16eb6f93ad33 Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Sun, 28 Nov 2021 15:26:40 +0000 Subject: [PATCH 37/62] libreoffice-fresh: 7.2.2.2 -> 7.2.3.2 --- .../office/libreoffice/src-fresh/download.nix | 34 +++++++++---------- .../office/libreoffice/src-fresh/primary.nix | 8 ++--- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/pkgs/applications/office/libreoffice/src-fresh/download.nix b/pkgs/applications/office/libreoffice/src-fresh/download.nix index e99ac0f66d6f..9fdff0766b6e 100644 --- a/pkgs/applications/office/libreoffice/src-fresh/download.nix +++ b/pkgs/applications/office/libreoffice/src-fresh/download.nix @@ -49,11 +49,11 @@ md5name = "beeca87be45ec87d241ddd0e1bad80c1-bsh-2.0b6-src.zip"; } { - name = "bzip2-1.0.6.tar.gz"; - url = "https://dev-www.libreoffice.org/src/00b516f4704d4a7cb50a1d97e6e8e15b-bzip2-1.0.6.tar.gz"; - sha256 = "a2848f34fcd5d6cf47def00461fcb528a0484d8edef8208d6d2e2909dc61d9cd"; - md5 = "00b516f4704d4a7cb50a1d97e6e8e15b"; - md5name = "00b516f4704d4a7cb50a1d97e6e8e15b-bzip2-1.0.6.tar.gz"; + name = "bzip2-1.0.8.tar.gz"; + url = "https://dev-www.libreoffice.org/src/bzip2-1.0.8.tar.gz"; + sha256 = "ab5a03176ee106d3f0fa90e381da478ddae405918153cca248e682cd0c4a2269"; + md5 = ""; + md5name = "ab5a03176ee106d3f0fa90e381da478ddae405918153cca248e682cd0c4a2269-bzip2-1.0.8.tar.gz"; } { name = "cairo-1.16.0.tar.xz"; @@ -112,11 +112,11 @@ md5name = "1f467e5bb703f12cbbb09d5cf67ecf4a-converttexttonumber-1-5-0.oxt"; } { - name = "curl-7.78.0.tar.xz"; - url = "https://dev-www.libreoffice.org/src/curl-7.78.0.tar.xz"; - sha256 = "be42766d5664a739c3974ee3dfbbcbe978a4ccb1fe628bb1d9b59ac79e445fb5"; + name = "curl-7.79.1.tar.xz"; + url = "https://dev-www.libreoffice.org/src/curl-7.79.1.tar.xz"; + sha256 = "0606f74b1182ab732a17c11613cbbaf7084f2e6cca432642d0e3ad7c224c3689"; md5 = ""; - md5name = "be42766d5664a739c3974ee3dfbbcbe978a4ccb1fe628bb1d9b59ac79e445fb5-curl-7.78.0.tar.xz"; + md5name = "0606f74b1182ab732a17c11613cbbaf7084f2e6cca432642d0e3ad7c224c3689-curl-7.79.1.tar.xz"; } { name = "libe-book-0.1.3.tar.xz"; @@ -665,11 +665,11 @@ md5name = "8249374c274932a21846fa7629c2aa9b-officeotron-0.7.4-master.jar"; } { - name = "openldap-2.4.45.tgz"; - url = "https://dev-www.libreoffice.org/src/openldap-2.4.45.tgz"; - sha256 = "cdd6cffdebcd95161a73305ec13fc7a78e9707b46ca9f84fb897cd5626df3824"; + name = "openldap-2.4.59.tgz"; + url = "https://dev-www.libreoffice.org/src/openldap-2.4.59.tgz"; + sha256 = "99f37d6747d88206c470067eda624d5e48c1011e943ec0ab217bae8712e22f34"; md5 = ""; - md5name = "cdd6cffdebcd95161a73305ec13fc7a78e9707b46ca9f84fb897cd5626df3824-openldap-2.4.45.tgz"; + md5name = "99f37d6747d88206c470067eda624d5e48c1011e943ec0ab217bae8712e22f34-openldap-2.4.59.tgz"; } { name = "openssl-1.1.1l.tar.gz"; @@ -728,11 +728,11 @@ md5name = "6e2fcef66ec8c44625f94292ccf8af9f1d918b410d5aa69c274ce67387967b30-poppler-data-0.4.10.tar.gz"; } { - name = "postgresql-13.1.tar.bz2"; - url = "https://dev-www.libreoffice.org/src/postgresql-13.1.tar.bz2"; - sha256 = "12345c83b89aa29808568977f5200d6da00f88a035517f925293355432ffe61f"; + name = "postgresql-13.5.tar.bz2"; + url = "https://dev-www.libreoffice.org/src/postgresql-13.5.tar.bz2"; + sha256 = "9b81067a55edbaabc418aacef457dd8477642827499560b00615a6ea6c13f6b3"; md5 = ""; - md5name = "12345c83b89aa29808568977f5200d6da00f88a035517f925293355432ffe61f-postgresql-13.1.tar.bz2"; + md5name = "9b81067a55edbaabc418aacef457dd8477642827499560b00615a6ea6c13f6b3-postgresql-13.5.tar.bz2"; } { name = "Python-3.8.10.tar.xz"; diff --git a/pkgs/applications/office/libreoffice/src-fresh/primary.nix b/pkgs/applications/office/libreoffice/src-fresh/primary.nix index d34cfd082d08..684383980bc4 100644 --- a/pkgs/applications/office/libreoffice/src-fresh/primary.nix +++ b/pkgs/applications/office/libreoffice/src-fresh/primary.nix @@ -8,7 +8,7 @@ rec { major = "7"; minor = "2"; - patch = "2"; + patch = "3"; tweak = "2"; subdir = "${major}.${minor}.${patch}"; @@ -17,13 +17,13 @@ rec { src = fetchurl { url = "https://download.documentfoundation.org/libreoffice/src/${subdir}/libreoffice-${version}.tar.xz"; - sha256 = "0w9bn3jhrhaj80qbbs8wp3q5yc0rrpwvqj3abgrllg4clk5c6fw1"; + sha256 = "sha256-VslzdJVtmMjvzW1YdxwJUMimQe2E/WTbZjgohMTDtFE="; }; # FIXME rename translations = fetchSrc { name = "translations"; - sha256 = "1rhwrax5fxgdvizv74npysam5i67669myysldiplqiah5np672lq"; + sha256 = "sha256-B/UVlPyzL7M3PpQwS63huRtti1VR+OaI2nd+T1IESOw="; }; # the "dictionaries" archive is not used for LO build because we already build hunspellDicts packages from @@ -31,6 +31,6 @@ rec { help = fetchSrc { name = "help"; - sha256 = "1hn56irlkk2ng7wzhiv8alpjcnf7xf95n3syzlbnmcj177kpg883"; + sha256 = "sha256-CH4URClK/lq0nqN6LHjAVcKjkADol5AX3WuyAl0srnk="; }; } From 387b85da72c12f94fb9d9558c1c834a4df6d6f57 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sun, 28 Nov 2021 15:52:04 +0000 Subject: [PATCH 38/62] liboping: pull pending upstream inclusion fix for ncurses-6.3 Without the fix build on ncurses-6.3 fails as: oping.c:1128:25: error: format not a string literal and no format arguments [-Werror=format-security] 1128 | mvwprintw (ctx->window, /* y = */ 3, /* x = */ x + 2, symbol); | ^~~~~~~~~ --- .../libraries/liboping/default.nix | 6 ++++++ .../libraries/liboping/ncurses-6.3.patch | 21 +++++++++++++++++++ 2 files changed, 27 insertions(+) create mode 100644 pkgs/development/libraries/liboping/ncurses-6.3.patch diff --git a/pkgs/development/libraries/liboping/default.nix b/pkgs/development/libraries/liboping/default.nix index 932133e01921..e730540cf12c 100644 --- a/pkgs/development/libraries/liboping/default.nix +++ b/pkgs/development/libraries/liboping/default.nix @@ -9,6 +9,12 @@ stdenv.mkDerivation rec { sha256 = "1n2wkmvw6n80ybdwkjq8ka43z2x8mvxq49byv61b52iyz69slf7b"; }; + patches = [ + # Add support for ncurses-6.3. A backport of patch pending upstream + # inclusion: https://github.com/octo/liboping/pull/61 + ./ncurses-6.3.patch + ]; + NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isGNU "-Wno-error=format-truncation"; diff --git a/pkgs/development/libraries/liboping/ncurses-6.3.patch b/pkgs/development/libraries/liboping/ncurses-6.3.patch new file mode 100644 index 000000000000..14d2be07fe38 --- /dev/null +++ b/pkgs/development/libraries/liboping/ncurses-6.3.patch @@ -0,0 +1,21 @@ +A backport of https://github.com/octo/liboping/pull/61 +--- a/src/oping.c ++++ b/src/oping.c +@@ -1125,7 +1125,7 @@ static int update_graph_prettyping (ping_context_t *ctx, /* {{{ */ + wattron (ctx->window, COLOR_PAIR(color)); + + if (has_utf8()) +- mvwprintw (ctx->window, /* y = */ 3, /* x = */ x + 2, symbol); ++ mvwprintw (ctx->window, /* y = */ 3, /* x = */ x + 2, "%s", symbol); + else + mvwaddch (ctx->window, /* y = */ 3, /* x = */ x + 2, symbolc); + +@@ -1222,7 +1222,7 @@ static int update_graph_histogram (ping_context_t *ctx) /* {{{ */ + if (counters[x] == 0) + mvwaddch (ctx->window, /* y = */ 3, /* x = */ x + 2, ' '); + else if (has_utf8 ()) +- mvwprintw (ctx->window, /* y = */ 3, /* x = */ x + 2, ++ mvwprintw (ctx->window, /* y = */ 3, /* x = */ x + 2, "%s", + hist_symbols_utf8[index]); + else + mvwaddch (ctx->window, /* y = */ 3, /* x = */ x + 2, From 54765edc0bc6e349d52d46e7d52ee98e02c161d1 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sun, 28 Nov 2021 16:14:46 +0000 Subject: [PATCH 39/62] libviper: fix build against ncurses-6.3 Without the change the build on upcoming `ncurses-6.3` fails as: w_decorate.c:45:17: error: format not a string literal and no format arguments [-Werror=format-security] 45 | mvwprintw(window,0,x,title); | ^~~~~~~~~ --- pkgs/development/libraries/libviper/default.nix | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libviper/default.nix b/pkgs/development/libraries/libviper/default.nix index e3b3674acc9f..993e260b7bd3 100644 --- a/pkgs/development/libraries/libviper/default.nix +++ b/pkgs/development/libraries/libviper/default.nix @@ -7,8 +7,18 @@ stdenv.mkDerivation rec { sha256 = "1jvm7wdgw6ixyhl0pcfr9lnr9g6sg6whyrs9ihjiz0agvqrgvxwc"; }; - patchPhase = '' + postPatch = '' sed -i -e s@/usr/local@$out@ -e /ldconfig/d -e '/cd vdk/d' Makefile + + # Fix pending upstream inclusion for ncurses-6.3 support: + # https://github.com/TragicWarrior/libviper/pull/16 + # Not applied as it due to unrelated code changes in context. + substituteInPlace viper_msgbox.c --replace \ + 'mvwprintw(window,height-3,tmp,prompt);' \ + 'mvwprintw(window,height-3,tmp,"%s",prompt);' + substituteInPlace w_decorate.c --replace \ + 'mvwprintw(window,0,x,title);' \ + 'mvwprintw(window,0,x,"%s",title);' ''; preInstall = '' From 3f3dd1d0c9072f3a32a4c4ff1fafdf4e3724b4ff Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sun, 28 Nov 2021 16:21:39 +0000 Subject: [PATCH 40/62] vwm: fix build against ncurses-6.3 Without the change the build on upcoming `ncurses-6.3` fails as: vwm_bkgd.c:71:63: error: format not a string literal and no format arguments [-Werror=format-security] 71 | mvwprintw(window,height-1,width-(strlen(version_str)),version_str); | ^~~~~~~~~~~ --- pkgs/applications/window-managers/vwm/default.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/window-managers/vwm/default.nix b/pkgs/applications/window-managers/vwm/default.nix index 7c47eb9c4d99..e1a8c8f3dd24 100644 --- a/pkgs/applications/window-managers/vwm/default.nix +++ b/pkgs/applications/window-managers/vwm/default.nix @@ -19,11 +19,16 @@ stdenv.mkDerivation rec { sha256 = "1r5wiqyfqwnyx7dfihixlnavbvg8rni36i4gq169aisjcg7laxaf"; }; - prePatch = '' + postPatch = '' sed -i -e s@/usr/local@$out@ \ -e s@/usr/lib@$out/lib@ \ -e 's@tic vwmterm@tic -o '$out/lib/terminfo' vwmterm@' \ -e /ldconfig/d Makefile modules/*/Makefile vwm.h + + # Fix ncurses-6.3 support: + substituteInPlace vwm_bkgd.c --replace \ + 'mvwprintw(window,height-1,width-(strlen(version_str)),version_str);' \ + 'mvwprintw(window,height-1,width-(strlen(version_str)),"%s", version_str);' ''; preInstall = '' From 1ca74a0074d166def72ccf810ca021b66aab2996 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 28 Nov 2021 07:54:20 -0800 Subject: [PATCH 41/62] libdeltachat: 1.67.0 -> 1.68.0 https://github.com/deltachat/deltachat-core-rust/blob/1.68.0/CHANGELOG.md --- pkgs/development/libraries/libdeltachat/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/libdeltachat/default.nix b/pkgs/development/libraries/libdeltachat/default.nix index 66769206b439..81d033f136d1 100644 --- a/pkgs/development/libraries/libdeltachat/default.nix +++ b/pkgs/development/libraries/libdeltachat/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "libdeltachat"; - version = "1.67.0"; + version = "1.68.0"; src = fetchFromGitHub { owner = "deltachat"; repo = "deltachat-core-rust"; rev = version; - hash = "sha256-zb/U3JmGRqni45BOqNd+UTJzQuODx6IBBbmZWFZmSY4="; + hash = "sha256-T49E9pGetJqO5qj014efioZtlHM9ZAxH9WzwVmk85XM="; }; patches = [ @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-2QGC7pCH8MWhDDVKrQ6b/EU9cuJWSZHgYSWaXYPYDiw="; + hash = "sha256-jAL8siaMonTMYE88kK7E6RQesPahCLr082dHJovmoo0="; }; nativeBuildInputs = [ From b86ff2299acdc0ddf7bbc2f35c33ff16de9f285f Mon Sep 17 00:00:00 2001 From: Ilan Joselevich Date: Sun, 28 Nov 2021 19:11:27 +0200 Subject: [PATCH 42/62] vimPlugins: update --- pkgs/misc/vim-plugins/generated.nix | 732 ++++++++++++++-------------- 1 file changed, 366 insertions(+), 366 deletions(-) diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index a877297d1b4e..5734ffcb2add 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -41,12 +41,12 @@ final: prev: aerial-nvim = buildVimPluginFrom2Nix { pname = "aerial.nvim"; - version = "2021-10-23"; + version = "2021-11-28"; src = fetchFromGitHub { owner = "stevearc"; repo = "aerial.nvim"; - rev = "0430d20508157d97fac4e14400b648346a7cba94"; - sha256 = "0viqw73iyqv2vzskrfj9mfajvk4hslsl8w707km11509mv473d7h"; + rev = "f92674de63d82accbed4f4a853925ec1d75e8cff"; + sha256 = "0njyhpn29z5s6xx25flk0pf53ifpdwznasdryi0bnri25pfv29hq"; }; meta.homepage = "https://github.com/stevearc/aerial.nvim/"; }; @@ -77,12 +77,12 @@ final: prev: ale = buildVimPluginFrom2Nix { pname = "ale"; - version = "2021-11-15"; + version = "2021-11-21"; src = fetchFromGitHub { owner = "dense-analysis"; repo = "ale"; - rev = "31dc6a61a07839ea906f6f0b80be713fb8cad1c7"; - sha256 = "1j8fzyxl3lgc5xwklllvk7cq0qh7hdjjvv9r93xzbmr74w82410v"; + rev = "de67f4743d9ffd1694d15b1b91fedfaa0a5cda70"; + sha256 = "1x4a9z7i30dx0l00f1yhfjmmszahq01411v075xkilli4d0mi8j4"; }; meta.homepage = "https://github.com/dense-analysis/ale/"; }; @@ -197,12 +197,12 @@ final: prev: aurora = buildVimPluginFrom2Nix { pname = "aurora"; - version = "2021-11-13"; + version = "2021-11-27"; src = fetchFromGitHub { owner = "ray-x"; repo = "aurora"; - rev = "639f60317e7ccaccb6b8b6681b40897308d466b8"; - sha256 = "0b4nsdkfmd8j0v74fd4yzyx1rm2l4a968g3s9vhckrn9wnyj7khf"; + rev = "d98ee14f18c7e117f8221aea83c51d713a080076"; + sha256 = "05azpx3q49j9c2qli0n15dby0xn88pfij36xfsnwy2wrbs5c2k0d"; }; meta.homepage = "https://github.com/ray-x/aurora/"; }; @@ -233,12 +233,12 @@ final: prev: auto-session = buildVimPluginFrom2Nix { pname = "auto-session"; - version = "2021-10-30"; + version = "2021-11-24"; src = fetchFromGitHub { owner = "rmagatti"; repo = "auto-session"; - rev = "5f2a9d7e45133be33a1dae3580089e257824a907"; - sha256 = "1gm6f9pnvv1kghxsm3082vxng81jg2srfnwczjik2m2m9bypdd4s"; + rev = "1b4b4b7a993aae6d6281bc98194675b97ce9e962"; + sha256 = "0axs3l0cr6c8226x897wlpvs9i61x6d7s8g4sidjzkdic62ch1s8"; }; meta.homepage = "https://github.com/rmagatti/auto-session/"; }; @@ -353,12 +353,12 @@ final: prev: blueballs-neovim = buildVimPluginFrom2Nix { pname = "blueballs-neovim"; - version = "2021-09-09"; + version = "2021-11-28"; src = fetchFromGitHub { owner = "blueballs-theme"; repo = "blueballs-neovim"; - rev = "e0d73d553f663a12539682d89130d71df2db9099"; - sha256 = "02x374wgbw3fmqlyrlxspf1n3ajik5y53g232r44y6093ly8wsw1"; + rev = "6201c1bf272bd3d8516a68579f5ead8ac5ab95b0"; + sha256 = "1k9fh5r64csp1xxr647s3rd67h1ay36y57afkp67xgv7mlk17cv5"; }; meta.homepage = "https://github.com/blueballs-theme/blueballs-neovim/"; }; @@ -473,12 +473,12 @@ final: prev: chadtree = buildVimPluginFrom2Nix { pname = "chadtree"; - version = "2021-11-17"; + version = "2021-11-28"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "chadtree"; - rev = "6202def5abfbc83acfbb86110753a03e00bc97bf"; - sha256 = "1gp0if044cqzpjfxrsn8kdk4siqm18bvdrngpqqar4rqgsx89kg1"; + rev = "f56b751e3b04b3146f90f892047fb63623eb6ca6"; + sha256 = "0lxz0xir8zy7p5bs5z6vf9nxy91n6pxjqvf5iql7yfhc9hhaasf4"; }; meta.homepage = "https://github.com/ms-jpq/chadtree/"; }; @@ -497,12 +497,12 @@ final: prev: cheatsheet-nvim = buildVimPluginFrom2Nix { pname = "cheatsheet.nvim"; - version = "2021-09-20"; + version = "2021-11-28"; src = fetchFromGitHub { owner = "sudormrfbin"; repo = "cheatsheet.nvim"; - rev = "3f0b718a030dd2c2757e053345de4f130f213514"; - sha256 = "0k1y57k14hgvjr7cq6likbwb2vdxmj6kiqbiqnk6arhnf8n614gi"; + rev = "ce869da3e3f1825c386f363498a082536f8466fa"; + sha256 = "16bypbi5haav3qs9g6fml4p0micdgd11l9k9ivp9258j3j9q57mn"; }; meta.homepage = "https://github.com/sudormrfbin/cheatsheet.nvim/"; }; @@ -581,12 +581,12 @@ final: prev: cmp-buffer = buildVimPluginFrom2Nix { pname = "cmp-buffer"; - version = "2021-11-15"; + version = "2021-11-22"; src = fetchFromGitHub { owner = "hrsh7th"; repo = "cmp-buffer"; - rev = "bfbc32a8aadbf3d21294aad45f069b7d204b34b1"; - sha256 = "11wmq4fh5nbyswcgmw17ihx7g4naqba06a55f1cxk913aqcqqnwx"; + rev = "a706dc69c49110038fe570e5c9c33d6d4f67015b"; + sha256 = "05sir021wgrkbv0lwpsy5x18q51bhagify83hcidwsckjzbsrm8m"; }; meta.homepage = "https://github.com/hrsh7th/cmp-buffer/"; }; @@ -605,12 +605,12 @@ final: prev: cmp-cmdline = buildVimPluginFrom2Nix { pname = "cmp-cmdline"; - version = "2021-11-08"; + version = "2021-11-22"; src = fetchFromGitHub { owner = "hrsh7th"; repo = "cmp-cmdline"; - rev = "0ca73c3a50b72c2ca168d8904b39aba34d0c4227"; - sha256 = "1777rv9mh3bar8lp5i4af7kip5j3s4ib8a83b67clga8pcdjla4d"; + rev = "e5aa12620b6cae9ba5ce27aed2c47a99b81f004f"; + sha256 = "03zjy4xwzm1898pabz0gzydc5zlcnsprkqlk0aavz0aw21mmywkh"; }; meta.homepage = "https://github.com/hrsh7th/cmp-cmdline/"; }; @@ -713,12 +713,12 @@ final: prev: cmp-path = buildVimPluginFrom2Nix { pname = "cmp-path"; - version = "2021-11-10"; + version = "2021-11-27"; src = fetchFromGitHub { owner = "hrsh7th"; repo = "cmp-path"; - rev = "98ded32b9c4d95aa95af70b9979b767f39073f0e"; - sha256 = "1axx401sikh9ylji3d6cmgn4xsrzzfmlc1akfv1q709chv0a6r2h"; + rev = "4fe14cf56288200614950fe57525ac6340f49d5a"; + sha256 = "1f48pnmwnr93frggpqd0m6vnpkj1frn3vnnp5ljwi86mlc4p4ag4"; }; meta.homepage = "https://github.com/hrsh7th/cmp-path/"; }; @@ -737,12 +737,12 @@ final: prev: cmp-tabnine = buildVimPluginFrom2Nix { pname = "cmp-tabnine"; - version = "2021-10-14"; + version = "2021-11-28"; src = fetchFromGitHub { owner = "tzachar"; repo = "cmp-tabnine"; - rev = "f788bb17e1de13b49e197b68edb501010b64e975"; - sha256 = "1c21y5vz9afzmx7l0ifv6gc2a6mfmsa8r0igxgyin0jj6ipk5kkl"; + rev = "d52a25de3417139d5b0e1624f15c60df0565c75f"; + sha256 = "1vx0zb41c39k7ba6slkic8w9f91l5070yzja6l14pyngq55h5mdw"; }; meta.homepage = "https://github.com/tzachar/cmp-tabnine/"; }; @@ -833,12 +833,12 @@ final: prev: coc-lua = buildVimPluginFrom2Nix { pname = "coc-lua"; - version = "2021-11-16"; + version = "2021-11-26"; src = fetchFromGitHub { owner = "josa42"; repo = "coc-lua"; - rev = "3a5366b11ca3c11a9e894755d365328ba36de227"; - sha256 = "0qv73ph2wgn0j7il508zb29k04r4n5q601fih2hp264zvyqkw6sf"; + rev = "86a840a6512b3cda14aefbbb2779df1ea0160d5a"; + sha256 = "0vc7rkqkq9wvrgjcaazxp39mvr95ark8c7q30agim28n4963w900"; }; meta.homepage = "https://github.com/josa42/coc-lua/"; }; @@ -942,24 +942,24 @@ final: prev: comment-nvim = buildVimPluginFrom2Nix { pname = "comment.nvim"; - version = "2021-11-05"; + version = "2021-11-24"; src = fetchFromGitHub { owner = "numtostr"; repo = "comment.nvim"; - rev = "620445b87a0d1640fac6991f9c3338af8dec1884"; - sha256 = "1mw6862njjfpl3h4kaq9vkl1gddi4bdah2kzrijgq0gykiqkjpks"; + rev = "a6e1c127fa7f19ec4e3edbffab1aacb2852b6db3"; + sha256 = "0ds0z93gdqc7v6ndgsc2jz5ac06s6vbf26p17cc4h4a6l0sgn9pw"; }; meta.homepage = "https://github.com/numtostr/comment.nvim/"; }; committia-vim = buildVimPluginFrom2Nix { pname = "committia.vim"; - version = "2020-08-27"; + version = "2021-11-24"; src = fetchFromGitHub { owner = "rhysd"; repo = "committia.vim"; - rev = "1d288281586d1e6b52646a4c412df3dd3a2fe231"; - sha256 = "11ik72qi7fvxkz7fnyisaa0xscy4pksq8l2pvclywzg3lcclhxp1"; + rev = "0b4df1a7f48ffbc23b009bd14d58ee1be541917c"; + sha256 = "1scz52n6y2qrqd74kcsgvjkmxd37wmgzx2wail4sz88h3cks8w39"; }; meta.homepage = "https://github.com/rhysd/committia.vim/"; }; @@ -1002,12 +1002,12 @@ final: prev: compe-tmux = buildVimPluginFrom2Nix { pname = "compe-tmux"; - version = "2021-10-30"; + version = "2021-11-25"; src = fetchFromGitHub { owner = "andersevenrud"; repo = "compe-tmux"; - rev = "ef911e2ee6f7d537ae5f5090c84112ce747c6eb5"; - sha256 = "1xqbhbcahgpwhm9zl8pxxv7qkicl68qd4acvm5d0k0xg1zg672rq"; + rev = "d7c6daa59a0d5940f85f110d8e59fdf9b0cef5d1"; + sha256 = "14j1fc1c43lpj24gflw1b594n601al8clkcpjpql7rl3dbmh3dc9"; }; meta.homepage = "https://github.com/andersevenrud/compe-tmux/"; }; @@ -1134,12 +1134,12 @@ final: prev: Coqtail = buildVimPluginFrom2Nix { pname = "Coqtail"; - version = "2021-11-15"; + version = "2021-11-22"; src = fetchFromGitHub { owner = "whonore"; repo = "Coqtail"; - rev = "f38e086135c5d9b69c9a5f70f82072419d952c29"; - sha256 = "01lf10b6b07s7ywrh16p5b52jj21hzv1vn216h9bnf4xdfz5pf9a"; + rev = "8fe30d125b7a6dfbff66714784f8996002a69fdf"; + sha256 = "0j3116w6vrw6rzcw86jm3j6hp4pxq4hp3bjsqa7gb57qn7ly356m"; }; meta.homepage = "https://github.com/whonore/Coqtail/"; }; @@ -1170,12 +1170,12 @@ final: prev: crates-nvim = buildVimPluginFrom2Nix { pname = "crates.nvim"; - version = "2021-11-13"; + version = "2021-11-28"; src = fetchFromGitHub { owner = "saecki"; repo = "crates.nvim"; - rev = "dea18a76bbe84d1eb80f9474cb33c8efd377c73d"; - sha256 = "0gc47ixbjb2zf9g0qr2jzq2cmnzgml1lvvv22zdsrk7j8n9kxxqb"; + rev = "b1de088782d8ad225728fcb79cfa889f8ff3edf9"; + sha256 = "1cjlf1yqdd1il0wjbhmgflqp761ybkpbaaw318564b8hvmxknwxk"; }; meta.homepage = "https://github.com/saecki/crates.nvim/"; }; @@ -1242,12 +1242,12 @@ final: prev: ctrlp-vim = buildVimPluginFrom2Nix { pname = "ctrlp.vim"; - version = "2021-11-16"; + version = "2021-11-24"; src = fetchFromGitHub { owner = "ctrlpvim"; repo = "ctrlp.vim"; - rev = "d9388d89745bb30c20ad0051c53d301cd054f47c"; - sha256 = "1lsr0y4q57k65qk5y17gnm8cfi7rg8r6h2h7cxkmgzn11d4p34c0"; + rev = "fff74986c5439015cf5cc69cf2c6390a40fdd79f"; + sha256 = "1f7dw1zgz5h8f6wdrdrrs46prcsj5hx8x1pvjkr4grjafismxcpd"; }; meta.homepage = "https://github.com/ctrlpvim/ctrlp.vim/"; }; @@ -1302,12 +1302,12 @@ final: prev: defx-nvim = buildVimPluginFrom2Nix { pname = "defx.nvim"; - version = "2021-10-26"; + version = "2021-11-20"; src = fetchFromGitHub { owner = "Shougo"; repo = "defx.nvim"; - rev = "2d7ddef50659f2b622e803f068a991656a66e6f8"; - sha256 = "18dzlg5lm6z4nmcx0p51687s8yx4ygxwlpcc24l6yd6lbr0z0xwr"; + rev = "01865ddf803b63efd03a4780a75b0a126329b1f0"; + sha256 = "09ri81nqc5ii05inz23y4xlwfmx8xx8f5d3sq9k98xjzwyc2aki4"; }; meta.homepage = "https://github.com/Shougo/defx.nvim/"; }; @@ -1640,12 +1640,12 @@ final: prev: diffview-nvim = buildVimPluginFrom2Nix { pname = "diffview.nvim"; - version = "2021-11-11"; + version = "2021-11-26"; src = fetchFromGitHub { owner = "sindrets"; repo = "diffview.nvim"; - rev = "a38306ddf893b95b55c6cd881605b3232c658e42"; - sha256 = "1c55zhxzf3zps7fzqs4vsd81z9la2x3blvjwh45abs93rnqik8nx"; + rev = "f92d27b22bd5bfa47903ac91de5077263ce816ea"; + sha256 = "03yawkbh6fxm9wf5nfj2wblcdwxjs4gjcqrp96k9xyjf58ggrlsi"; }; meta.homepage = "https://github.com/sindrets/diffview.nvim/"; }; @@ -1700,12 +1700,12 @@ final: prev: echodoc-vim = buildVimPluginFrom2Nix { pname = "echodoc.vim"; - version = "2021-10-08"; + version = "2021-11-26"; src = fetchFromGitHub { owner = "Shougo"; repo = "echodoc.vim"; - rev = "a5568996527e2bc563dcfae2bfc78a3760f40d55"; - sha256 = "13h37vkrbr3zq9l3d542z0rc8b9d6zxpp5r0cg89xa0q360y9l9w"; + rev = "42b7fb45c6a45e90410203d9c248b79bc46ea933"; + sha256 = "14as4q6dnc540in68039c1bbdn4ag86872pbra6h06s5rbhbgzky"; }; meta.homepage = "https://github.com/Shougo/echodoc.vim/"; }; @@ -1737,12 +1737,12 @@ final: prev: editorconfig-nvim = buildVimPluginFrom2Nix { pname = "editorconfig.nvim"; - version = "2021-11-02"; + version = "2021-11-24"; src = fetchFromGitHub { owner = "gpanders"; repo = "editorconfig.nvim"; - rev = "de419f22817fd93c7c09bf7d47838945761a2c9c"; - sha256 = "0k6qdqmh5irjz1lyyy49pgdwa4fz4yyq4fxfx60dacjf6g99d19s"; + rev = "8ed706abab55f41658c109781185905acc8284fc"; + sha256 = "162j0v2bkyxvb335pp40cdjvd1qghxdqs494dskdssxnj27y6c1s"; }; meta.homepage = "https://github.com/gpanders/editorconfig.nvim/"; }; @@ -1773,12 +1773,12 @@ final: prev: embark-vim = buildVimPluginFrom2Nix { pname = "embark-vim"; - version = "2021-07-24"; + version = "2021-11-21"; src = fetchFromGitHub { owner = "embark-theme"; repo = "vim"; - rev = "03029f4ec49cd0dd1d16eb9561742f5c9f794e71"; - sha256 = "14gnndh40h8qlymsb9lkycn4w7jv8f7kk0yjxi4wzjvycg7mrplx"; + rev = "aedd387afd0f15032ea68b5d806dac01aeb54e63"; + sha256 = "1dasnj07iqh0k6pkfyqi33wah9pnsngsfx6ny0r9sxc2vb35cbvn"; }; meta.homepage = "https://github.com/embark-theme/vim/"; }; @@ -1822,12 +1822,12 @@ final: prev: falcon = buildVimPluginFrom2Nix { pname = "falcon"; - version = "2021-11-03"; + version = "2021-11-27"; src = fetchFromGitHub { owner = "fenetikm"; repo = "falcon"; - rev = "7d08b7ceb9ac34f131b3125849476960876798b6"; - sha256 = "0p9w78w9q8l2428rh5p53hs6p0zia7ffmyll8kcll7qbixf1sp2s"; + rev = "6bb8a491493d82b493762e8adf12972b38ad0188"; + sha256 = "0l8jqrrdjm1b0dsbm5hk32ifa2a5wh1ddy4s07v0i5z5c4ldmcif"; }; meta.homepage = "https://github.com/fenetikm/falcon/"; }; @@ -2015,12 +2015,12 @@ final: prev: friendly-snippets = buildVimPluginFrom2Nix { pname = "friendly-snippets"; - version = "2021-11-12"; + version = "2021-11-26"; src = fetchFromGitHub { owner = "rafamadriz"; repo = "friendly-snippets"; - rev = "05bfa7681b8f11b664fab657001c2efb6f3ec85e"; - sha256 = "1133f32q4g990mmvdrbnjxggk8y96w0c5zlvh553cz9j626a4zks"; + rev = "0806607c4c49b6823cf4155cf0c30bc28934dea2"; + sha256 = "1wvny8ggbcfdzna24ry3p3ikql9m0wb54c589iny8lkncv272v72"; }; meta.homepage = "https://github.com/rafamadriz/friendly-snippets/"; }; @@ -2219,12 +2219,12 @@ final: prev: git-worktree-nvim = buildVimPluginFrom2Nix { pname = "git-worktree.nvim"; - version = "2021-11-09"; + version = "2021-11-24"; src = fetchFromGitHub { owner = "ThePrimeagen"; repo = "git-worktree.nvim"; - rev = "14d4be5f9db5c5cce7b4c1ee10c70d663c367373"; - sha256 = "11gzz2dc75b0sqkkxsiw9yramfwhcrv4vq39mxlzmxxzbzk11dv2"; + rev = "62d2be7e0bf5a594a547efa1ab962c930f448e2d"; + sha256 = "1k1bz9hvbqxankfr038fbmxrmjr1zcnn3j7mchzcj4pfx5x3ny3g"; }; meta.homepage = "https://github.com/ThePrimeagen/git-worktree.nvim/"; }; @@ -2255,12 +2255,12 @@ final: prev: gitsigns-nvim = buildVimPluginFrom2Nix { pname = "gitsigns.nvim"; - version = "2021-11-17"; + version = "2021-11-19"; src = fetchFromGitHub { owner = "lewis6991"; repo = "gitsigns.nvim"; - rev = "5e49bb09f324580519d1ef41cb03bcb07536a239"; - sha256 = "1zfwazv58y4r9cpalx522hnb9wics50m90n59yabmimb2iyp323z"; + rev = "95845ef39ce0a98f68cdfdcf7dd586c5e965acc7"; + sha256 = "0hzzwsc9y8z71d82j2sbhhl5vxp1xmd8ki0km746jcigfaaagdll"; }; meta.homepage = "https://github.com/lewis6991/gitsigns.nvim/"; }; @@ -2315,12 +2315,12 @@ final: prev: gotests-vim = buildVimPluginFrom2Nix { pname = "gotests-vim"; - version = "2019-04-10"; + version = "2021-11-25"; src = fetchFromGitHub { owner = "buoto"; repo = "gotests-vim"; - rev = "e0ad687be26875153ecd43d16db3b93a637394e4"; - sha256 = "01w981v7rya9fnxwdhlka4vfzlnw87pxmfcqmvxh3p96lmi71xjm"; + rev = "9adb78b15d0cbb72a3ffb9fbed28faa909b0817b"; + sha256 = "0lf05rfgw1dmidslbvw5qal45crnb8jfxsfbhbhffqa9da1fkspn"; }; meta.homepage = "https://github.com/buoto/gotests-vim/"; }; @@ -2339,12 +2339,12 @@ final: prev: goyo-vim = buildVimPluginFrom2Nix { pname = "goyo.vim"; - version = "2020-08-29"; + version = "2021-11-18"; src = fetchFromGitHub { owner = "junegunn"; repo = "goyo.vim"; - rev = "a865dec7ca7616dbbd69315ad1417b84d0c411f8"; - sha256 = "09mqmcz79dwcc5mv0p2wc84jc20ipa0vv2yckp4la4xh909ph4hm"; + rev = "a9c7283dce60ffcdec952384f6451ff42f8914f2"; + sha256 = "0ikp0hal6hqvkbzmd2vsp27rkhl9n5iv2nkzlsc3ahwihy6p6xn8"; }; meta.homepage = "https://github.com/junegunn/goyo.vim/"; }; @@ -2399,12 +2399,12 @@ final: prev: gruvbox-nvim = buildVimPluginFrom2Nix { pname = "gruvbox.nvim"; - version = "2021-11-12"; + version = "2021-11-22"; src = fetchFromGitHub { owner = "ellisonleao"; repo = "gruvbox.nvim"; - rev = "dc7c63320c523997610ced545007935c72d81942"; - sha256 = "16nvlli0vmqxdbcx2d8p2nsl0865444l1d3ji23z9cbz4i171rsw"; + rev = "c69b98d5defbe998627be2175e2ce7707fd73dc0"; + sha256 = "0wha77kmci0923qin5k6ximmfs8pf6viz22h5yl7abc3wi294vzb"; }; meta.homepage = "https://github.com/ellisonleao/gruvbox.nvim/"; }; @@ -2435,12 +2435,12 @@ final: prev: harpoon = buildVimPluginFrom2Nix { pname = "harpoon"; - version = "2021-11-09"; + version = "2021-11-24"; src = fetchFromGitHub { owner = "ThePrimeagen"; repo = "harpoon"; - rev = "57819752e62251f9488a95fea1690bb62547bd2a"; - sha256 = "0x5x6jmz31aclai0l2dplr0y16f97jb40cgvnrx8mr5gb0s5i7sc"; + rev = "0c0b37d06507ba8ee8411c675d6718182de18d5e"; + sha256 = "18nqyjg5cnsl4qc3ma5zgvyjmrk9aw6ra58gyll29b25n36d666y"; }; meta.homepage = "https://github.com/ThePrimeagen/harpoon/"; }; @@ -2519,12 +2519,12 @@ final: prev: hop-nvim = buildVimPluginFrom2Nix { pname = "hop.nvim"; - version = "2021-11-17"; + version = "2021-11-21"; src = fetchFromGitHub { owner = "phaazon"; repo = "hop.nvim"; - rev = "d2a9f2a6b0d075fc85ac346d3c03c4a3257bc805"; - sha256 = "1gpgln5bfvygpkqb1p2pawq1pw5rg9j5jwgl7wmal4fik9yixp0f"; + rev = "e3c9fc3ab1e1db6bfb4f19377c53d0e457e0e2e9"; + sha256 = "1za5cpvkdxm8n7y6ac0gzm5zq8ld4q7ay48bag4vd6kwr9140nd7"; }; meta.homepage = "https://github.com/phaazon/hop.nvim/"; }; @@ -2627,12 +2627,12 @@ final: prev: indent-blankline-nvim = buildVimPluginFrom2Nix { pname = "indent-blankline.nvim"; - version = "2021-11-12"; + version = "2021-11-20"; src = fetchFromGitHub { owner = "lukas-reineke"; repo = "indent-blankline.nvim"; - rev = "9f663d31d4ee0672f24cd5b26ca3863665048a25"; - sha256 = "1lzdi3pgw9hf8pkmh3y8w3lrl27kac18hq4ryk0mghqyb8saabzw"; + rev = "caf7f61e94525bbd97e32f118efd6c0722430616"; + sha256 = "1gdnw6scph18ihkiscyh51lbdaj5m6hlq5wggammpzi7pj2gqmar"; }; meta.homepage = "https://github.com/lukas-reineke/indent-blankline.nvim/"; }; @@ -2735,12 +2735,12 @@ final: prev: jedi-vim = buildVimPluginFrom2Nix { pname = "jedi-vim"; - version = "2021-06-22"; + version = "2021-11-17"; src = fetchFromGitHub { owner = "davidhalter"; repo = "jedi-vim"; - rev = "7ac81cb88059d3daaf2d654cbb5cd03d23a60d33"; - sha256 = "0ydgj222i0ilbb4nhv988r2yrfhq7m29c32nardb7mw79y9a08i7"; + rev = "030211555d5340e4a1acfa3a9368df85f34469d0"; + sha256 = "09fbq010bfzs193x7g1lyhl56hcpj9m1b1k9rhdwvfjpwn9kh4x6"; fetchSubmodules = true; }; meta.homepage = "https://github.com/davidhalter/jedi-vim/"; @@ -2904,36 +2904,36 @@ final: prev: lazygit-nvim = buildVimPluginFrom2Nix { pname = "lazygit.nvim"; - version = "2021-10-31"; + version = "2021-11-21"; src = fetchFromGitHub { owner = "kdheepak"; repo = "lazygit.nvim"; - rev = "bcd111df61abe90b133cb08ea577c02af44ca5ce"; - sha256 = "08sbigblq42kb5qhn5z4i856p7sj5i86hcqlqpm0fidxr8c6xsf9"; + rev = "497ef5578e15f6c79deef1cad71adedd1c80abd4"; + sha256 = "1slmx1c3v2l49vnv5kxivgygla2wa7dvl47wf0xxshlsz2gml7y7"; }; meta.homepage = "https://github.com/kdheepak/lazygit.nvim/"; }; LeaderF = buildVimPluginFrom2Nix { pname = "LeaderF"; - version = "2021-10-24"; + version = "2021-11-22"; src = fetchFromGitHub { owner = "Yggdroot"; repo = "LeaderF"; - rev = "48fbae95f5ba26affb490488eb606ff127ccb0da"; - sha256 = "0f2m2b8hwpyl74f6zl2n6x4d8yimi1pqy02alkwiwrm5y6x469sc"; + rev = "ac3618745d1a4184ef45213b42de372c8fbbc42d"; + sha256 = "0jzjfcswyix32fmk5mba8swrp0cv3jv1w553dkwgj0v8m1f4rk16"; }; meta.homepage = "https://github.com/Yggdroot/LeaderF/"; }; lean-nvim = buildVimPluginFrom2Nix { pname = "lean.nvim"; - version = "2021-11-17"; + version = "2021-11-25"; src = fetchFromGitHub { owner = "Julian"; repo = "lean.nvim"; - rev = "a74b5c09bee57c4c41a4fe7e4594416f92ea05aa"; - sha256 = "1zrzd0rahwzhyx46bfwz6gzwr513h3k5b1f5maf0qrc1jq2snd6g"; + rev = "5d23a7a83b1a8ccdbf1b27927172d5fdcbdf0dd5"; + sha256 = "0p6f8wwiniin1ah1ds2c5n9pq6qmy6hk0f10iil4bim5ng08yvwn"; }; meta.homepage = "https://github.com/Julian/lean.nvim/"; }; @@ -2976,12 +2976,12 @@ final: prev: lexima-vim = buildVimPluginFrom2Nix { pname = "lexima.vim"; - version = "2021-11-11"; + version = "2021-11-19"; src = fetchFromGitHub { owner = "cohama"; repo = "lexima.vim"; - rev = "99ece6758ec49b04de983873e4117a390121fbb8"; - sha256 = "00sjngkscry6ln9d94w9b2466d1y2prxivaxn8hqxpng1wyhhlay"; + rev = "8a1a0af09e494cbb9384f38874a6d1ccb9facf69"; + sha256 = "0sgjz30limqs2hafkqjglfxg0p4mf0bfqscjhk2n1xfrlj957hbg"; }; meta.homepage = "https://github.com/cohama/lexima.vim/"; }; @@ -3060,36 +3060,36 @@ final: prev: lightline-vim = buildVimPluginFrom2Nix { pname = "lightline.vim"; - version = "2021-05-30"; + version = "2021-11-21"; src = fetchFromGitHub { owner = "itchyny"; repo = "lightline.vim"; - rev = "b06d921023cf6536bcbee5754071d122296e8942"; - sha256 = "1dsqssxgbglq6al6di9grxl24rgwidgd6jrc8d4gk6v6ymgzckl8"; + rev = "a29b8331e1bb36b09bafa30c3aa77e89cdd832b2"; + sha256 = "0n3wrfcw6k95cmwg8jpxh0y9jy6y2bjgvszjgal9yha7y8gv6a9v"; }; meta.homepage = "https://github.com/itchyny/lightline.vim/"; }; lightspeed-nvim = buildVimPluginFrom2Nix { pname = "lightspeed.nvim"; - version = "2021-11-17"; + version = "2021-11-24"; src = fetchFromGitHub { owner = "ggandor"; repo = "lightspeed.nvim"; - rev = "d60ee2ef756e89f51ee3f41be2fbacfac965091f"; - sha256 = "0m610jvk7zx7lri33d3b2dr60w2xy8kzlssigiciynhzs0lg9pyg"; + rev = "153e6cb81b1360c67ec6c6138dc8df574264da5f"; + sha256 = "078654vq673qhf7g3qhhp8m8s81msj6g5ydgph9dgxmgdb81ld64"; }; meta.homepage = "https://github.com/ggandor/lightspeed.nvim/"; }; limelight-vim = buildVimPluginFrom2Nix { pname = "limelight.vim"; - version = "2020-10-13"; + version = "2021-11-18"; src = fetchFromGitHub { owner = "junegunn"; repo = "limelight.vim"; - rev = "4412a84d7fbfd01281bf23d801e95c45c1eacc09"; - sha256 = "1qab2pd1pyfrw0llxd5j11imzqxa3lnnfhr1w2fjn3yanbsxvlvd"; + rev = "eebac6c4fce06d3b849cccd213b7233d37ab037f"; + sha256 = "0nhiwmklkn4p8njw6l891yk5bnya1hyx4zg0a8d4yb2j734bmr2g"; }; meta.homepage = "https://github.com/junegunn/limelight.vim/"; }; @@ -3108,12 +3108,12 @@ final: prev: lir-nvim = buildVimPluginFrom2Nix { pname = "lir.nvim"; - version = "2021-11-03"; + version = "2021-11-25"; src = fetchFromGitHub { owner = "tamago324"; repo = "lir.nvim"; - rev = "e340f4ee25c74aaa6d67d84a5f48024a8f6422a0"; - sha256 = "08wbfpdirmdjnj7l7kd008iwcp466skflb3rr3rzqshmqfv7vqfk"; + rev = "4909d6081ff3e6177a149c2f1cfc85ce473a4b2c"; + sha256 = "1w6hpib3fdpvk3z023nrfj2scj0ivb5r89gi8c183gzc9kigy01v"; }; meta.homepage = "https://github.com/tamago324/lir.nvim/"; }; @@ -3180,12 +3180,12 @@ final: prev: lsp_signature-nvim = buildVimPluginFrom2Nix { pname = "lsp_signature.nvim"; - version = "2021-11-13"; + version = "2021-11-23"; src = fetchFromGitHub { owner = "ray-x"; repo = "lsp_signature.nvim"; - rev = "600111e6249bcc948e2b811ef09adf4ea84ebfc1"; - sha256 = "0w012936d42m2bs2g8mgg72wkf9mvx4w5m01qdh8daksi1wg86hy"; + rev = "c7b2b2e14b597c077804ae201f1ec9a7dac76ad0"; + sha256 = "0qasjnbgv0h80ix5zqpkdrrl6jbrbhginywrh9rcaa4z6sxg88fk"; }; meta.homepage = "https://github.com/ray-x/lsp_signature.nvim/"; }; @@ -3228,24 +3228,24 @@ final: prev: lualine-nvim = buildVimPluginFrom2Nix { pname = "lualine.nvim"; - version = "2021-11-16"; + version = "2021-11-28"; src = fetchFromGitHub { owner = "nvim-lualine"; repo = "lualine.nvim"; - rev = "7b608cb5731087b157bd509103b1d82d8984cba4"; - sha256 = "04nbfml4j2yr4imvdzany4r6amakiwazgfjgd4y2h3c78pnlrb41"; + rev = "1ae4f0aa74f0b34222c5ef3281b34602a76b2b00"; + sha256 = "0d2474dj95cdg5qk4cwygjlvzp9cn2xb6kq454bxvmmghjj72bsq"; }; meta.homepage = "https://github.com/nvim-lualine/lualine.nvim/"; }; luasnip = buildVimPluginFrom2Nix { pname = "luasnip"; - version = "2021-11-16"; + version = "2021-11-28"; src = fetchFromGitHub { owner = "l3mon4d3"; repo = "luasnip"; - rev = "6e10a30178240182781955ce062618c8d793a37b"; - sha256 = "0z1n838d8fvis88a603fzzmdh1iqm41svay8ypmkbm3wcjaafjyl"; + rev = "e63b58600f91681f744fc180ae13ce2800b5e29a"; + sha256 = "1sc7v2g1dfw5sls8iddi10w5ba2n7j24k77abarw7y6rwfmnzlrh"; }; meta.homepage = "https://github.com/l3mon4d3/luasnip/"; }; @@ -3300,12 +3300,12 @@ final: prev: marks-nvim = buildVimPluginFrom2Nix { pname = "marks.nvim"; - version = "2021-11-07"; + version = "2021-11-23"; src = fetchFromGitHub { owner = "chentau"; repo = "marks.nvim"; - rev = "f43e349601b439b4b07bec1d996cfd70d48d09fb"; - sha256 = "0xnrklam85yva82ncfbpymhs8wa0g9vcks4dzdpvnj8f21la1f3d"; + rev = "555e8265989aa13249e76fd229226fb74101f905"; + sha256 = "1m79bbdd9cnlc65bkr3qk8h717dhlr5mfvvrkwyh233rrz64mxl0"; }; meta.homepage = "https://github.com/chentau/marks.nvim/"; }; @@ -3360,12 +3360,12 @@ final: prev: minimap-vim = buildVimPluginFrom2Nix { pname = "minimap.vim"; - version = "2021-11-16"; + version = "2021-11-18"; src = fetchFromGitHub { owner = "wfxr"; repo = "minimap.vim"; - rev = "f699b8296c878a5d669f3a13a9d6f916f6276bef"; - sha256 = "1v4xhp82rw5f7zq8mfcj478p088qrcqbml1crhqi9v41gghwv9b5"; + rev = "35c0dd759938459d866aba1bdf0f1fc0b670ed61"; + sha256 = "1hs5x3a72cr9qz992zm6zjsg26pjzi4axchws160w9m3mgjs89fd"; }; meta.homepage = "https://github.com/wfxr/minimap.vim/"; }; @@ -3696,12 +3696,12 @@ final: prev: neogit = buildVimPluginFrom2Nix { pname = "neogit"; - version = "2021-11-09"; + version = "2021-11-24"; src = fetchFromGitHub { owner = "TimUntersberger"; repo = "neogit"; - rev = "807e4a795dc6c2383b281fc27bd1bc6c197d98cd"; - sha256 = "126kdn9dfvk0ggzh00439zwrq1jldnxvk0nsf7g371qkbbnc4qal"; + rev = "f5b7e32bf126cf3480d2a4fe1c0a2cd13d7f755a"; + sha256 = "1y0jsb84cgr3g52mkxvj7n8jvyi8bqrkj26mb33ipd4gf37d1ihd"; }; meta.homepage = "https://github.com/TimUntersberger/neogit/"; }; @@ -3756,12 +3756,12 @@ final: prev: neorg = buildVimPluginFrom2Nix { pname = "neorg"; - version = "2021-10-26"; + version = "2021-11-26"; src = fetchFromGitHub { owner = "nvim-neorg"; repo = "neorg"; - rev = "592fb0c9c220ca53238e6de7685c3151fe3a3085"; - sha256 = "1s1bwa2aq28gzn3jws0nv8wr45b5mhx2wz0pld10qxmvpm7l32js"; + rev = "447489ed256081a8b848afbc7f201b99647d6bce"; + sha256 = "12gl2gvab3rprjy8caqq2d66z9ysks54rkr22w1lyzzdmdj9qg2r"; }; meta.homepage = "https://github.com/nvim-neorg/neorg/"; }; @@ -3828,12 +3828,12 @@ final: prev: neovim-ayu = buildVimPluginFrom2Nix { pname = "neovim-ayu"; - version = "2021-10-13"; + version = "2021-11-23"; src = fetchFromGitHub { owner = "Shatur"; repo = "neovim-ayu"; - rev = "baf9ac7f20dbc225644ab4825f007bc65e944dce"; - sha256 = "0x0y78kps2p9skqykcrvlgbhmmm5x5c5kkwz1dfc0akzkdjy8505"; + rev = "3e4d6d427b6353dcf3569ba02abdcf4c6f532621"; + sha256 = "1gr0476ibsdp3n31xab3wkmfff09f1zgicyizjnbck7lbin1v3xi"; }; meta.homepage = "https://github.com/Shatur/neovim-ayu/"; }; @@ -3876,12 +3876,12 @@ final: prev: nerdcommenter = buildVimPluginFrom2Nix { pname = "nerdcommenter"; - version = "2021-09-02"; + version = "2021-11-27"; src = fetchFromGitHub { owner = "preservim"; repo = "nerdcommenter"; - rev = "a65465d321f2f8a74b2ffa540b9b87563f7e12e8"; - sha256 = "00ir65iv8jfbgzjmj7332fmydh0qhabbhx8zbvd3j6pgfxqpaafw"; + rev = "eddd535bdf8472db469b48ac8cf826871b340c4b"; + sha256 = "1ka2rqn7rby55aps3iblh1dcqxm7m7qx72mpkz6y2aaj8mkj0zyd"; }; meta.homepage = "https://github.com/preservim/nerdcommenter/"; }; @@ -4044,24 +4044,24 @@ final: prev: nui-nvim = buildVimPluginFrom2Nix { pname = "nui.nvim"; - version = "2021-11-11"; + version = "2021-11-27"; src = fetchFromGitHub { owner = "MunifTanjim"; repo = "nui.nvim"; - rev = "e940b57f30f6035df690fb24b1e5c93ae6aafcd6"; - sha256 = "0nvg3zsgqbk0gs978gzfkc57xn3wcn1mcsf6qrgc1xz4jxdd582m"; + rev = "a37e38b6801ccdbffb4b69507aa234b8d0509977"; + sha256 = "0v290zncw2p5ygisjy68r77kx175bbhz73bcbf0k8wg173y4hhsl"; }; meta.homepage = "https://github.com/MunifTanjim/nui.nvim/"; }; null-ls-nvim = buildVimPluginFrom2Nix { pname = "null-ls.nvim"; - version = "2021-11-17"; + version = "2021-11-26"; src = fetchFromGitHub { owner = "jose-elias-alvarez"; repo = "null-ls.nvim"; - rev = "e460ba050d074416a64ee7881b527fb87fbad981"; - sha256 = "1nksrmh5aj2h4r845vbz9lg7lxa8cr05p4gmcccagpmq9y0fk8fn"; + rev = "b07ce47f02c7b12ad65bfb4da215c6380228a959"; + sha256 = "0j9iawg8hv1aqd68k7n22hm6rs0ia862vxvkq3y10b0xiagcvfyr"; }; meta.homepage = "https://github.com/jose-elias-alvarez/null-ls.nvim/"; }; @@ -4104,12 +4104,12 @@ final: prev: nvim-autopairs = buildVimPluginFrom2Nix { pname = "nvim-autopairs"; - version = "2021-11-15"; + version = "2021-11-21"; src = fetchFromGitHub { owner = "windwp"; repo = "nvim-autopairs"; - rev = "1f18e79ee9b30fec25c3f32b1ed22c3290f07bb2"; - sha256 = "0sy5p93vqbnz01blgsk085xm791iga1yk65lp147axbib7b760kq"; + rev = "fba2503bd8cd0d8861054523aae39c4ac0680c07"; + sha256 = "19s5g4g0nvcj55if7h11g1k1gspx7lnxyd0hv7yq88xqxykls1ps"; }; meta.homepage = "https://github.com/windwp/nvim-autopairs/"; }; @@ -4128,12 +4128,12 @@ final: prev: nvim-bqf = buildVimPluginFrom2Nix { pname = "nvim-bqf"; - version = "2021-11-13"; + version = "2021-11-27"; src = fetchFromGitHub { owner = "kevinhwang91"; repo = "nvim-bqf"; - rev = "ee370769ea2d6da807533a4c2b8f55ef057d4477"; - sha256 = "1xxab1pwnvlhy9mgyyvck8w3acz7cmjpqpl2mdc3z6gagqbjjrll"; + rev = "d82e784a36160028b245576213100c888be503f0"; + sha256 = "1y0g2y9fbxy5bq1wp8g36irsjhhvkbkcj6nfmbiaichizsl5zmz8"; }; meta.homepage = "https://github.com/kevinhwang91/nvim-bqf/"; }; @@ -4164,12 +4164,12 @@ final: prev: nvim-cmp = buildVimPluginFrom2Nix { pname = "nvim-cmp"; - version = "2021-11-17"; + version = "2021-11-27"; src = fetchFromGitHub { owner = "hrsh7th"; repo = "nvim-cmp"; - rev = "27d4c21e8ff7a68e6abc930ff0e74a486c0026ad"; - sha256 = "0hp88j9r7l82nx4fbg42hmv2vcfd74f72v6aizj4zdmx3xnxnyb1"; + rev = "092fb66b6ddb4b12b9b542d105d7af40e4fbd9f2"; + sha256 = "0fa4y4zyrg6amsfjivs9zb9wlh1zlcjmh7va8mbghccmi72lpl92"; }; meta.homepage = "https://github.com/hrsh7th/nvim-cmp/"; }; @@ -4236,36 +4236,36 @@ final: prev: nvim-dap = buildVimPluginFrom2Nix { pname = "nvim-dap"; - version = "2021-11-12"; + version = "2021-11-20"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-dap"; - rev = "1a87456d280e8e308df7983650a5ea2b5a6bfb63"; - sha256 = "119cmq8bnm35l7vdlf83dkldk3jxdkdjsqw98b5hs437xrjwfhjr"; + rev = "4e8bb7ca12dc8ca6f7a500cbb4ecea185665c7f1"; + sha256 = "1y5plkzyqry8ihjz3ckz5a6dcgp57fccvq34yp3xxnq6imbsf23y"; }; meta.homepage = "https://github.com/mfussenegger/nvim-dap/"; }; nvim-dap-ui = buildVimPluginFrom2Nix { pname = "nvim-dap-ui"; - version = "2021-11-06"; + version = "2021-11-27"; src = fetchFromGitHub { owner = "rcarriga"; repo = "nvim-dap-ui"; - rev = "649e0fee4f0b8dc6305dd29065c7623c3dc6a032"; - sha256 = "110qf4gp3v6k9q2232hm2arz3c1jpb20s5vd69iqhq8nh3zvrl6a"; + rev = "052f3424daba36984f506de80532121b01e07ff5"; + sha256 = "076qrh2jskqfbpr31bmp9l3l855659p4j6yd4mmzm71xwv020049"; }; meta.homepage = "https://github.com/rcarriga/nvim-dap-ui/"; }; nvim-dap-virtual-text = buildVimPluginFrom2Nix { pname = "nvim-dap-virtual-text"; - version = "2021-11-02"; + version = "2021-11-27"; src = fetchFromGitHub { owner = "theHamsta"; repo = "nvim-dap-virtual-text"; - rev = "7ceb1a76a5049741cdd2d4d34963132737e1b5aa"; - sha256 = "0baa746w1v9g2q3mnpq32vv1jifwx3dc04z55kjiwrf8h0qzrg0p"; + rev = "ccfbf7bd8cb9983b1804f3ca9fab3ee5fd7462ec"; + sha256 = "0h1kmmq27jqph0ynx8pvnl4nvp3zi4md8dh8i7jcjslvwmpx2k0y"; }; meta.homepage = "https://github.com/theHamsta/nvim-dap-virtual-text/"; }; @@ -4284,12 +4284,12 @@ final: prev: nvim-gdb = buildVimPluginFrom2Nix { pname = "nvim-gdb"; - version = "2021-09-29"; + version = "2021-11-22"; src = fetchFromGitHub { owner = "sakhnik"; repo = "nvim-gdb"; - rev = "ea474ca50d8600357d4e364178ffc0b55db499ea"; - sha256 = "10g9n66jv9wjry57vzz4psdbddch75w1mn28a7zzlqps7k47amgp"; + rev = "f02059bbdb87dfbf88b284bd660ab40583fd16f9"; + sha256 = "1la3xwk3hwssi7a37mgm95nqpb3vs62jlbrl02nrm87b4vlc2bgd"; }; meta.homepage = "https://github.com/sakhnik/nvim-gdb/"; }; @@ -4308,24 +4308,24 @@ final: prev: nvim-highlite = buildVimPluginFrom2Nix { pname = "nvim-highlite"; - version = "2021-11-11"; + version = "2021-11-24"; src = fetchFromGitHub { owner = "Iron-E"; repo = "nvim-highlite"; - rev = "c0f6d68ea245fd2efb527fe1b7874c48084d8150"; - sha256 = "1nai09x1sc9wvz2m5j4rj6wjpdhwk88v4sapdmvb5pqvrqqylg60"; + rev = "b9bbef6204bbb143d45fd457a07f211cb38f9679"; + sha256 = "19r828px9ix31ai0ydxqi7ymp4cpabk23ligglnki4pc34bhw55q"; }; meta.homepage = "https://github.com/Iron-E/nvim-highlite/"; }; nvim-hlslens = buildVimPluginFrom2Nix { pname = "nvim-hlslens"; - version = "2021-11-03"; + version = "2021-11-22"; src = fetchFromGitHub { owner = "kevinhwang91"; repo = "nvim-hlslens"; - rev = "4eec69c189a170bb99825e70f39c321da7baf67f"; - sha256 = "0kwvwx2qvxgzfgzk9qp6ci0436qmcpkxxs0l2l8lyx9qghh5rbv4"; + rev = "8aa60ec837eb40689ff1f67e050bd8662202d5be"; + sha256 = "1vjjn1kh4gflp1r97ix7rs4frlk8w9z0k0vfyif0pzl24f8dsvxq"; }; meta.homepage = "https://github.com/kevinhwang91/nvim-hlslens/"; }; @@ -4344,12 +4344,12 @@ final: prev: nvim-jdtls = buildVimPluginFrom2Nix { pname = "nvim-jdtls"; - version = "2021-11-02"; + version = "2021-11-19"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-jdtls"; - rev = "aac715eedc278b437d6885c7171f8bdec6e1d6ea"; - sha256 = "1vr119w5vcid59rz4vspk3gszcv91aps0ig36ysirhnqmz1j29di"; + rev = "3fa992f33378fd811aed74c56e0affd33f42dae0"; + sha256 = "1hf21ayvq7cvlpm2gdrkd801vj09s0lv9vr5irfcdkxaxajvhqmz"; }; meta.homepage = "https://github.com/mfussenegger/nvim-jdtls/"; }; @@ -4368,36 +4368,36 @@ final: prev: nvim-lint = buildVimPluginFrom2Nix { pname = "nvim-lint"; - version = "2021-11-16"; + version = "2021-11-27"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-lint"; - rev = "c3c8a247fda421b0db1f2cbf50ab4340ba0ffc61"; - sha256 = "1sa3mqm65aspa91vavg1ng36w51jsb5kdjsra4bjjmggwbphdz8w"; + rev = "9e7c11b62b2cc4528527b690b330ae85e1ff72bf"; + sha256 = "0j9d1s923i6r3h0w0dki3wgbkcz83h0rdagnl939pzv2yl70phpr"; }; meta.homepage = "https://github.com/mfussenegger/nvim-lint/"; }; nvim-lsp-ts-utils = buildVimPluginFrom2Nix { pname = "nvim-lsp-ts-utils"; - version = "2021-11-16"; + version = "2021-11-21"; src = fetchFromGitHub { owner = "jose-elias-alvarez"; repo = "nvim-lsp-ts-utils"; - rev = "825630a5d28634fbb3663d1e605ff0a82b843d81"; - sha256 = "1zj7b0g3f9kqnpzqcvh0p9wg10y7kn5mq8vzcmwsyaiwqpdijgwv"; + rev = "6814f3b7b4661213a837746bb461bad80c2fe526"; + sha256 = "0g91j0w8yh70sp025f8y8d9mnmfm2h55xa86d6xzkzmw96jq5b96"; }; meta.homepage = "https://github.com/jose-elias-alvarez/nvim-lsp-ts-utils/"; }; nvim-lspconfig = buildVimPluginFrom2Nix { pname = "nvim-lspconfig"; - version = "2021-11-17"; + version = "2021-11-28"; src = fetchFromGitHub { owner = "neovim"; repo = "nvim-lspconfig"; - rev = "27d2c116fdea5614f422dcbcae63da01a1415fcf"; - sha256 = "10ip201ihd2jjs9mb0vafa7iqzxh0f0rs5s96rrpw4zaxzq49gkn"; + rev = "d9aa848da3905e0f8153e546d7b630d3d13e0435"; + sha256 = "16j5xk75vbi7gdw822dc1xr0a3wlr5b1fimm8d8h5naydx5fvpfc"; }; meta.homepage = "https://github.com/neovim/nvim-lspconfig/"; }; @@ -4428,12 +4428,12 @@ final: prev: nvim-notify = buildVimPluginFrom2Nix { pname = "nvim-notify"; - version = "2021-11-12"; + version = "2021-11-28"; src = fetchFromGitHub { owner = "rcarriga"; repo = "nvim-notify"; - rev = "54375b724637eb6f29085c582318ae1fd042e717"; - sha256 = "1zli6vpcyk8ving7x7lh5nwgkf020rh5dixxsmiq6p8xhgi7hg53"; + rev = "9ac4202ed3c5afa92498b83dd28dcde19576ab1f"; + sha256 = "0ic4vicm7a63h7gs4w4fz2fg4clkd4q1zag7kdklwg7qyrdnacn9"; }; meta.homepage = "https://github.com/rcarriga/nvim-notify/"; }; @@ -4464,12 +4464,12 @@ final: prev: nvim-solarized-lua = buildVimPluginFrom2Nix { pname = "nvim-solarized-lua"; - version = "2021-11-10"; + version = "2021-11-27"; src = fetchFromGitHub { owner = "ishan9299"; repo = "nvim-solarized-lua"; - rev = "05433b58825e13465b82430f2cc7b0414df2ba6c"; - sha256 = "1w2n8zj17dj87xfbacz9kgkcws2cihnfa3640s6393gli20782kq"; + rev = "b8e8bd97cdf4fda3c255820b15e62bcebf69c223"; + sha256 = "00f25pnyrak0pcif4dxnlvg0my3vphs0jb5sviw6nlb8rqg06045"; }; meta.homepage = "https://github.com/ishan9299/nvim-solarized-lua/"; }; @@ -4500,12 +4500,12 @@ final: prev: nvim-tree-lua = buildVimPluginFrom2Nix { pname = "nvim-tree.lua"; - version = "2021-10-31"; + version = "2021-11-28"; src = fetchFromGitHub { owner = "kyazdani42"; repo = "nvim-tree.lua"; - rev = "5d8453dfbd34ab00cb3e8ce39660f9a54cdd35f3"; - sha256 = "1r2qzajbraqv244kqd006f6rz586rdppi94wssvx8b03v56v8nb7"; + rev = "e842f088847c98da59e14eb543bde11c45c87ef7"; + sha256 = "0n5mcyidcrn4s674c12j050yh207x8yrm4g07iz324mh4cm6mzca"; }; meta.homepage = "https://github.com/kyazdani42/nvim-tree.lua/"; }; @@ -4560,48 +4560,48 @@ final: prev: nvim-treesitter-textobjects = buildVimPluginFrom2Nix { pname = "nvim-treesitter-textobjects"; - version = "2021-07-25"; + version = "2021-11-26"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter-textobjects"; - rev = "b100e6188c4b1e90af4066593e36a9f4ca7364b7"; - sha256 = "1npcs5dxylny79hbkk1cnp3xp2yh4s3s6j314721k2v5mhim3dw2"; + rev = "380561ee746eac6791d148c6de459f4d92b2fa33"; + sha256 = "08sy36gd3bdz3s69dxlck2a8952cn0gdvb3i3dppm0skjz8d353f"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter-textobjects/"; }; nvim-ts-context-commentstring = buildVimPluginFrom2Nix { pname = "nvim-ts-context-commentstring"; - version = "2021-11-09"; + version = "2021-11-20"; src = fetchFromGitHub { owner = "joosepalviste"; repo = "nvim-ts-context-commentstring"; - rev = "ce74852c36008b11dda451bfe6c2ed71c535152b"; - sha256 = "04hd5wg3f39sn4qc958fw9inmkaj18mkgvmwkxni4qnb2y8qs9pi"; + rev = "9f5e422e1030e7073e593ad32c5354aa0bcb0176"; + sha256 = "1a8507mxxpc22hqp34bcqxqbjj6y2i22y7nrbkajn249pviwbpam"; }; meta.homepage = "https://github.com/joosepalviste/nvim-ts-context-commentstring/"; }; nvim-ts-rainbow = buildVimPluginFrom2Nix { pname = "nvim-ts-rainbow"; - version = "2021-11-10"; + version = "2021-11-21"; src = fetchFromGitHub { owner = "p00f"; repo = "nvim-ts-rainbow"; - rev = "5cef624eb407449a313b63cdda66720e9860821f"; - sha256 = "0r39ahrk54smb9ngb4s11kxjncrsarclrdjvaazdi82260saxgb9"; + rev = "54ee09f540935c604c9a3d4aed83b7f5314f2caa"; + sha256 = "1q70przqvi71vyk9wspaamvv6kkh2pd9m1w4ngxkgcxbf9wm649k"; }; meta.homepage = "https://github.com/p00f/nvim-ts-rainbow/"; }; nvim-web-devicons = buildVimPluginFrom2Nix { pname = "nvim-web-devicons"; - version = "2021-11-12"; + version = "2021-11-21"; src = fetchFromGitHub { owner = "kyazdani42"; repo = "nvim-web-devicons"; - rev = "f936ff3e1f9d58ec0caf0bd398e9675b54fe292e"; - sha256 = "1vzrsr2m75nky1nz5hji7chqcc3d601bkx7raq88pjw4qa3s7b1r"; + rev = "8df4988ecf8599fc1f8f387bbf2eae790e4c5ffb"; + sha256 = "1b7q0s3z9lwf43dchwz49x431md8ld2af1chrc4rlss0wd3fbavb"; }; meta.homepage = "https://github.com/kyazdani42/nvim-web-devicons/"; }; @@ -4704,12 +4704,12 @@ final: prev: onedarkpro-nvim = buildVimPluginFrom2Nix { pname = "onedarkpro.nvim"; - version = "2021-11-16"; + version = "2021-11-25"; src = fetchFromGitHub { owner = "olimorris"; repo = "onedarkpro.nvim"; - rev = "fd4dd7a09bac975c94612ce3c8fa98a51bcce412"; - sha256 = "0drjpfvkk9mmp7v2v16vwc3halxbwkwc95n0x0cz47lp2q3b7kss"; + rev = "4ea622fb56fc0df026e12c768f761bb832bba02d"; + sha256 = "0684q3h3arzcm4m33gxskc96jc5g6y4kdqzzh75hxq0bilfdvy63"; }; meta.homepage = "https://github.com/olimorris/onedarkpro.nvim/"; }; @@ -4752,24 +4752,24 @@ final: prev: orgmode-nvim = buildVimPluginFrom2Nix { pname = "orgmode.nvim"; - version = "2021-11-14"; + version = "2021-11-28"; src = fetchFromGitHub { owner = "kristijanhusak"; repo = "orgmode.nvim"; - rev = "25e1fec55362124a8300108c88bd7127e09dad03"; - sha256 = "0yhdyiwbwwg7m57983pnlawjgzm40dg77jy8dk4gb2183ldk8srs"; + rev = "9cf968e5d5651c33cdc9de18ca7f02dc502502e7"; + sha256 = "1smkn83gxjs72i6zd8vfhqxkaanda4nwacgm3y0129z18q78p90m"; }; meta.homepage = "https://github.com/kristijanhusak/orgmode.nvim/"; }; package-info-nvim = buildVimPluginFrom2Nix { pname = "package-info.nvim"; - version = "2021-11-13"; + version = "2021-11-24"; src = fetchFromGitHub { owner = "vuki656"; repo = "package-info.nvim"; - rev = "8656a9305afe828b7b2664a571d309090043a0ac"; - sha256 = "0w5n1523d8la66d43w735lj57gmksj936kvlhwggmqyv64zw7jfz"; + rev = "0aa492654defa71134b67ce671fafdb7f6dbd866"; + sha256 = "14sa6p6kr61rfcqcpavama1z0312rsqmh1yr4c8z7cfv2shi1wb3"; }; meta.homepage = "https://github.com/vuki656/package-info.nvim/"; }; @@ -4921,12 +4921,12 @@ final: prev: popup-nvim = buildVimPluginFrom2Nix { pname = "popup.nvim"; - version = "2021-08-09"; + version = "2021-11-18"; src = fetchFromGitHub { owner = "nvim-lua"; repo = "popup.nvim"; - rev = "f91d80973f80025d4ed00380f2e06c669dfda49d"; - sha256 = "1pp1d6kbx8yn4cg2zs8rynvvpa8y89ryr8rial9csg26v2z22z95"; + rev = "b7404d35d5d3548a82149238289fa71f7f6de4ac"; + sha256 = "093r3cy02gfp7sphrag59n3fjhns7xdsam1ngiwhwlig3bzv7mbl"; }; meta.homepage = "https://github.com/nvim-lua/popup.nvim/"; }; @@ -5161,12 +5161,12 @@ final: prev: refactoring-nvim = buildVimPluginFrom2Nix { pname = "refactoring.nvim"; - version = "2021-11-17"; + version = "2021-11-27"; src = fetchFromGitHub { owner = "theprimeagen"; repo = "refactoring.nvim"; - rev = "9f730d6a87a63c7bd8cbc460882ca7e673da3cf1"; - sha256 = "1qqan1g34k11kjf9j50yfdzlgagjv3fm5yxlla9kxg2pz13b2jfc"; + rev = "fd1b6fe63e09b1915c22eb7047b3c3f6a492b31d"; + sha256 = "0drfp56pni183xwx9b6s68qfvafgqf92wlsnjqxnv1kpzbg3ygk7"; }; meta.homepage = "https://github.com/theprimeagen/refactoring.nvim/"; }; @@ -5329,12 +5329,12 @@ final: prev: SchemaStore-nvim = buildVimPluginFrom2Nix { pname = "SchemaStore.nvim"; - version = "2021-11-16"; + version = "2021-11-19"; src = fetchFromGitHub { owner = "b0o"; repo = "SchemaStore.nvim"; - rev = "fa321a8512c199e04e3361fa0679198e1176dc68"; - sha256 = "1ahsldfzqzwy83rhibyscr745s54571h6qmcmaz96rbv6k2wqyb5"; + rev = "a522e1d4affddefd824daefcfe42a7e2cab6626f"; + sha256 = "1h5q33b6bgmj9zf7fm5kbx95gp49jcn8af9rm5jn5bc0b3l7nzls"; }; meta.homepage = "https://github.com/b0o/SchemaStore.nvim/"; }; @@ -5401,12 +5401,12 @@ final: prev: seoul256-vim = buildVimPluginFrom2Nix { pname = "seoul256.vim"; - version = "2021-11-08"; + version = "2021-11-22"; src = fetchFromGitHub { owner = "junegunn"; repo = "seoul256.vim"; - rev = "538742074ec5cac2e84c383f02b85b368d35df9c"; - sha256 = "0pcgx5ng3snfvcspfi62qbsg5pd10y79r3j21cn1g5rr5ck7zl7a"; + rev = "57e545942fff2f796f26715bc0e937243dfa30c0"; + sha256 = "06k8fwi44836vsrcghn1s9wp6grrbddy8fjf60cr5nr29zr0h2gw"; }; meta.homepage = "https://github.com/junegunn/seoul256.vim/"; }; @@ -5703,12 +5703,12 @@ final: prev: stabilize-nvim = buildVimPluginFrom2Nix { pname = "stabilize.nvim"; - version = "2021-11-13"; + version = "2021-11-25"; src = fetchFromGitHub { owner = "luukvbaal"; repo = "stabilize.nvim"; - rev = "0026672d4b6fc922bd6f80df9a2858ce1e8cc0ed"; - sha256 = "0667yh9yprym7vakm83x174srb2x2ch9q97137qlj28acks3wnqh"; + rev = "9f4d09bde013ab062c4a4a6e32506c15936ae221"; + sha256 = "0rscybfd4scslrzbaf4zqdxhb8dwk6xrpyiq8vqzzg83w749wvvf"; }; meta.homepage = "https://github.com/luukvbaal/stabilize.nvim/"; }; @@ -5799,12 +5799,12 @@ final: prev: symbols-outline-nvim = buildVimPluginFrom2Nix { pname = "symbols-outline.nvim"; - version = "2021-10-21"; + version = "2021-11-25"; src = fetchFromGitHub { owner = "simrat39"; repo = "symbols-outline.nvim"; - rev = "552b67993ed959993279e0b0f8a1da9f3c5e6fc0"; - sha256 = "051505dmgcl3hgkmbaszz5l8m9j0fx4jwc2xffgkryxgqwsm4j8s"; + rev = "dcab987e431266c4ec9e2e0e81c1e62929c0bd44"; + sha256 = "0q1kfv0rhb36xcs0zf84s8w7smblwlj2mv0fj4qhy35v2p247jq7"; }; meta.homepage = "https://github.com/simrat39/symbols-outline.nvim/"; }; @@ -5896,24 +5896,24 @@ final: prev: tagalong-vim = buildVimPluginFrom2Nix { pname = "tagalong.vim"; - version = "2021-10-17"; + version = "2021-11-20"; src = fetchFromGitHub { owner = "AndrewRadev"; repo = "tagalong.vim"; - rev = "18c010e0f28fea012f537bc1abd468a063c36b9c"; - sha256 = "0qq1saqkk0cd09zppz469idzvl5d0aagq5gw908whz5dd72yl8al"; + rev = "e9f58f764bbbd7e8de61785c4c5ee523727f06a2"; + sha256 = "0lkkr42igsnfa5pr55q5a8kh1ggbl6ijig8ppcqs1pmhwwwyzkba"; }; meta.homepage = "https://github.com/AndrewRadev/tagalong.vim/"; }; tagbar = buildVimPluginFrom2Nix { pname = "tagbar"; - version = "2021-09-28"; + version = "2021-11-26"; src = fetchFromGitHub { owner = "preservim"; repo = "tagbar"; - rev = "b6669c7c9de542c53f2d19a806abb7610e9ef813"; - sha256 = "07nzjcp714g2jd9ys7md78yvxq2mz6s6yb06v1yxn5qfnlc7sjxk"; + rev = "dd2f46af80d614e3305847845c2a4a4b7447017c"; + sha256 = "0jqxzziy0nhx7py6yv41f31bnf6dv0vvz7h3x738lkch856mq6k0"; }; meta.homepage = "https://github.com/preservim/tagbar/"; }; @@ -6004,24 +6004,24 @@ final: prev: telescope-frecency-nvim = buildVimPluginFrom2Nix { pname = "telescope-frecency.nvim"; - version = "2021-10-04"; + version = "2021-11-23"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope-frecency.nvim"; - rev = "4c46d468595d28d92bf340256e6cbbc3748ae6f0"; - sha256 = "1kkmac237n0if5hssjxw1gwdwdrhaf4kppg5zrpaqgva5bgg5idj"; + rev = "ea44b316f4232e1e3bcff62d329b4b9c0e52be7c"; + sha256 = "1g9242z83yfc80prdlqx1s03hxpdcajgap5i372qigngha3bgwsq"; }; meta.homepage = "https://github.com/nvim-telescope/telescope-frecency.nvim/"; }; telescope-fzf-native-nvim = buildVimPluginFrom2Nix { pname = "telescope-fzf-native.nvim"; - version = "2021-09-15"; + version = "2021-11-24"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope-fzf-native.nvim"; - rev = "59e38e1661ffdd586cb7fc22ca0b5a05c7caf988"; - sha256 = "0ipdrzivz04921i1l81bc1xck5smi0c61isfj5g8zyl0mwa0dvrm"; + rev = "b8662b076175e75e6497c59f3e2799b879d7b954"; + sha256 = "0wj7ip9c17m4ij9sw5rq1bqy5hb367b32iz9b14pgg110cvfgpw1"; }; meta.homepage = "https://github.com/nvim-telescope/telescope-fzf-native.nvim/"; }; @@ -6053,12 +6053,12 @@ final: prev: telescope-project-nvim = buildVimPluginFrom2Nix { pname = "telescope-project.nvim"; - version = "2021-10-22"; + version = "2021-11-20"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope-project.nvim"; - rev = "50ae840e22659c68468bec1c9d3df4467255a512"; - sha256 = "0y014s942f0r0g5w01ib90fappz9wsjq509is8qrvq9zw7dlhk1z"; + rev = "ad33c9eb67de635ded67069af7552d5162497b1e"; + sha256 = "1m46h973wvr6bkb69msd9sj6413315qw2nndpr6rgk8vl2hd1vrr"; }; meta.homepage = "https://github.com/nvim-telescope/telescope-project.nvim/"; }; @@ -6089,12 +6089,12 @@ final: prev: telescope-nvim = buildVimPluginFrom2Nix { pname = "telescope.nvim"; - version = "2021-11-15"; + version = "2021-11-28"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope.nvim"; - rev = "9ac89ebf6755e9a3f4bae86625ec76106526e57b"; - sha256 = "0bljlg2hwa531rp53hwx1w06awksbhxl4lm672rn74sfaxqnzv87"; + rev = "ed4adba6d0083a14cabf5837f2511b2617a45593"; + sha256 = "1ippixq77irl2dslnf4if31v59ij6ycij0bbl6q1ghpvkqkryd81"; }; meta.homepage = "https://github.com/nvim-telescope/telescope.nvim/"; }; @@ -6234,12 +6234,12 @@ final: prev: toggleterm-nvim = buildVimPluginFrom2Nix { pname = "toggleterm.nvim"; - version = "2021-11-15"; + version = "2021-11-24"; src = fetchFromGitHub { owner = "akinsho"; repo = "toggleterm.nvim"; - rev = "ff168c8218b963cc7fc9d80b684d840488839bb5"; - sha256 = "09ap50nln9130h6px3x0df3vxlc09iyl419hnr8qf75qa58gbhmr"; + rev = "265bbff68fbb8b2a5fb011272ec469850254ec9f"; + sha256 = "0xqnnd4wbcyd0akx8bk3dw5cghlg3bf255qiq0p8mbmlc5rixyzq"; }; meta.homepage = "https://github.com/akinsho/toggleterm.nvim/"; }; @@ -6294,12 +6294,12 @@ final: prev: trouble-nvim = buildVimPluginFrom2Nix { pname = "trouble.nvim"; - version = "2021-10-22"; + version = "2021-11-24"; src = fetchFromGitHub { owner = "folke"; repo = "trouble.nvim"; - rev = "756f09de113a775ab16ba6d26c090616b40a999d"; - sha256 = "016aivnqq9lh33in5611phhl7h6sz9xqgmiaq5swk4pk7vyl4nqq"; + rev = "ce335ab551f2c3d26bbdbae36fdae916a451d832"; + sha256 = "19lva058znlnmj4nbcg9vr3qq05gy50x6vdvq37023n54m21gv78"; }; meta.homepage = "https://github.com/folke/trouble.nvim/"; }; @@ -6366,12 +6366,12 @@ final: prev: ultisnips = buildVimPluginFrom2Nix { pname = "ultisnips"; - version = "2021-08-26"; + version = "2021-11-23"; src = fetchFromGitHub { owner = "SirVer"; repo = "ultisnips"; - rev = "53e1921e3ef015ef658e540c0aa9c4835f9c18a6"; - sha256 = "1ayx52rc8gki3qj6j88ij1klasn6iggn035cgmp0vvspcsrs795c"; + rev = "2c83e40ce66814bf813457bb58ea96184ab9bb81"; + sha256 = "0bldpwjl7jbjdzz7ds9yyr351rdfh66z15dnbw12sicjac76qfin"; }; meta.homepage = "https://github.com/SirVer/ultisnips/"; }; @@ -6726,12 +6726,12 @@ final: prev: vim-airline = buildVimPluginFrom2Nix { pname = "vim-airline"; - version = "2021-11-12"; + version = "2021-11-26"; src = fetchFromGitHub { owner = "vim-airline"; repo = "vim-airline"; - rev = "4b96f58902a34abda87fd3105e9d47a08801a891"; - sha256 = "05fn2485098kml90n5wc0qla7wwjcrz0lkhkr9qgdv4bvc9g3hyn"; + rev = "841a3551965e729e9f1ccd1aca758bdc84af2abf"; + sha256 = "0ivbd25j80af1nrjw34p3qjdq5mnli1nsnv62a98js8k9mqlvy79"; }; meta.homepage = "https://github.com/vim-airline/vim-airline/"; }; @@ -7050,24 +7050,24 @@ final: prev: vim-clang-format = buildVimPluginFrom2Nix { pname = "vim-clang-format"; - version = "2021-11-11"; + version = "2021-11-27"; src = fetchFromGitHub { owner = "rhysd"; repo = "vim-clang-format"; - rev = "261d02c305f3ed361c39e3b9ca5d66b5b45df4c7"; - sha256 = "1lbfxb91s3951j3zhpmc7jj8xnsd2qcrd6d5xm35xarcsxwl5rvh"; + rev = "b8ca314c9d60add2b6d68fc857c6a528cc47a029"; + sha256 = "1c063230h2qksm3g1mz34w2vrj6i77p5yvagfb57barchcr731jl"; }; meta.homepage = "https://github.com/rhysd/vim-clang-format/"; }; vim-clap = buildVimPluginFrom2Nix { pname = "vim-clap"; - version = "2021-11-02"; + version = "2021-11-21"; src = fetchFromGitHub { owner = "liuchengxu"; repo = "vim-clap"; - rev = "72e1f7b1e35b6f79708e004367546701e646d64d"; - sha256 = "19zlfjwzalrm8i6ilgm7pidcji9qk1i1acsysl87d2h5gpqqd6v5"; + rev = "3a4cbf34b66581907d51e3682099428ab42f6f4d"; + sha256 = "1qizh5h6kgrlkszpxg0q6xnfl8a3ac8770pznnb8698145lhb8rh"; }; meta.homepage = "https://github.com/liuchengxu/vim-clap/"; }; @@ -7338,24 +7338,24 @@ final: prev: vim-dadbod-completion = buildVimPluginFrom2Nix { pname = "vim-dadbod-completion"; - version = "2021-09-02"; + version = "2021-11-20"; src = fetchFromGitHub { owner = "kristijanhusak"; repo = "vim-dadbod-completion"; - rev = "b791318764a58956e04d83ad7b89555bb089d8b0"; - sha256 = "18glwgjbkb1bdwg590qpyh975ax0l5llr88c7xmz6g9di20g61dd"; + rev = "44832073ea3bd38a79b2bb639485b0f0e6d63a30"; + sha256 = "0nz41b9r37lr19j2zbfj0j5992zwirbr3h11h94q7vrjk393kp3g"; }; meta.homepage = "https://github.com/kristijanhusak/vim-dadbod-completion/"; }; vim-dadbod-ui = buildVimPluginFrom2Nix { pname = "vim-dadbod-ui"; - version = "2021-08-27"; + version = "2021-11-20"; src = fetchFromGitHub { owner = "kristijanhusak"; repo = "vim-dadbod-ui"; - rev = "5f2bd8499f1627c1938300256e6d9abb1ae4856d"; - sha256 = "1a2icyz84lc54y4nq5amf3l51cc0f2yyzyqz5zx6m7dwb1r3nhpn"; + rev = "1b55f49028a0956bfe93ebb3d0833c2f5a5644ee"; + sha256 = "0wh0x9yid4b1lcak0fcsm7q8z1qh85pykmcsqkal7ylq1lib1m16"; }; meta.homepage = "https://github.com/kristijanhusak/vim-dadbod-ui/"; }; @@ -7458,12 +7458,12 @@ final: prev: vim-dispatch = buildVimPluginFrom2Nix { pname = "vim-dispatch"; - version = "2021-10-22"; + version = "2021-11-25"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-dispatch"; - rev = "a99a671aff87f77da9ac3461e589393b5ecfcd88"; - sha256 = "0jsl7as2xc9mq2za58r9bxxghicmp7g86hzmpy8w7h8a3m9wpgz5"; + rev = "9d8b2327bc7054fcc81fcdc6e8e94639a63f9b25"; + sha256 = "1hwcp6kz7hb0fawdb59ppg852zw2hjvmx9l9mh92b0zq72h7rq9w"; }; meta.homepage = "https://github.com/tpope/vim-dispatch/"; }; @@ -7650,12 +7650,12 @@ final: prev: vim-erlang-runtime = buildVimPluginFrom2Nix { pname = "vim-erlang-runtime"; - version = "2021-09-25"; + version = "2021-11-25"; src = fetchFromGitHub { owner = "vim-erlang"; repo = "vim-erlang-runtime"; - rev = "f62fa7eb5c17e8fbf93d7dcc5ff593dc534fd44b"; - sha256 = "0h4n6r8zpwqlh635nqig8bisc6djq2by51nilra90i524lxw8fz5"; + rev = "abb5ff4de17aa0add2afedaa478e06ede6ba2baf"; + sha256 = "1zspw3p00b31x97if1hmmgvxmv6yzky4q4y16qckwn838yjarlhn"; }; meta.homepage = "https://github.com/vim-erlang/vim-erlang-runtime/"; }; @@ -7734,12 +7734,12 @@ final: prev: vim-fireplace = buildVimPluginFrom2Nix { pname = "vim-fireplace"; - version = "2021-11-16"; + version = "2021-11-18"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-fireplace"; - rev = "18699186aad27dc92867527f5e3c2ad3ed51cb27"; - sha256 = "0681c6ica9xi7cvjzlhlwcvmdvq3109xx39c06d879n7yy6kjyqi"; + rev = "a6914f9b52b1d4cd261f91af045e30ef368f8095"; + sha256 = "0sb0a1yrs3hjpck76zk3s19l5ik63ivsvhj0r467ybbwk6s6d1an"; }; meta.homepage = "https://github.com/tpope/vim-fireplace/"; }; @@ -7794,12 +7794,12 @@ final: prev: vim-floaterm = buildVimPluginFrom2Nix { pname = "vim-floaterm"; - version = "2021-08-11"; + version = "2021-11-28"; src = fetchFromGitHub { owner = "voldikss"; repo = "vim-floaterm"; - rev = "9716765f2af3415ad1f9091a50c334649a74e4c5"; - sha256 = "1fclir7g02x8cpsyzf40l1igcw140h695g6mslyhhgjclm0rigpm"; + rev = "399cb86a15b7f3ef32ba40edda0ee00f2bdb842b"; + sha256 = "0yp1w8wbbkb2jvpw00q5sd622ns28ahi1j1v95blbb93cc6wvmvk"; }; meta.homepage = "https://github.com/voldikss/vim-floaterm/"; }; @@ -7818,12 +7818,12 @@ final: prev: vim-flutter = buildVimPluginFrom2Nix { pname = "vim-flutter"; - version = "2020-09-14"; + version = "2021-11-21"; src = fetchFromGitHub { owner = "thosakwe"; repo = "vim-flutter"; - rev = "5a6de53adcc72742138b666b305869999fc8066e"; - sha256 = "1zxa1gz47qpkcrzniax6q1bq9a953rypj1cfbcjb62h5ggx2rr5n"; + rev = "2292de52c6b2470638b628ed2f3b1332e077cd46"; + sha256 = "137wp2vhlsflnzkcdycn6cgdsclv9w67rkh7gbariqi8s45y9n6f"; }; meta.homepage = "https://github.com/thosakwe/vim-flutter/"; }; @@ -7866,12 +7866,12 @@ final: prev: vim-fugitive = buildVimPluginFrom2Nix { pname = "vim-fugitive"; - version = "2021-11-16"; + version = "2021-11-25"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-fugitive"; - rev = "2dfaf17f9e9b2c8961eddc8ea51098fef500d189"; - sha256 = "1y5ac8sag0lcdkq8k6rzn1cfcwyrn8fwmm3imsiq4b9883qjw2v2"; + rev = "5a24c2527584e4e61a706ad7ecb3514ac7031307"; + sha256 = "14lz15cmf5qg3xv1bp6r7zg7aalnkzzcb7z4hihg1k3sbp6m7a9a"; }; meta.homepage = "https://github.com/tpope/vim-fugitive/"; }; @@ -7890,12 +7890,12 @@ final: prev: vim-gh-line = buildVimPluginFrom2Nix { pname = "vim-gh-line"; - version = "2021-03-25"; + version = "2021-11-27"; src = fetchFromGitHub { owner = "ruanyl"; repo = "vim-gh-line"; - rev = "4ca32f57f5f95cd3436c3f9ee7657a9b9c0ca763"; - sha256 = "0pfw8jvmxwhdvjcfypiqk2jlk5plqbigjmykbqs1zvaznc2b7z5v"; + rev = "d2185b18883b911a21b684d4bb9d26f6a41b62f4"; + sha256 = "0wrgjd7l8cnam7nwqyh0m3np2452b18kz4lvnfv3hlsdsdx9xi17"; }; meta.homepage = "https://github.com/ruanyl/vim-gh-line/"; }; @@ -7938,12 +7938,12 @@ final: prev: vim-git = buildVimPluginFrom2Nix { pname = "vim-git"; - version = "2021-10-09"; + version = "2021-11-26"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-git"; - rev = "74063729aee801ee0cd4a968194ea61a36df091d"; - sha256 = "195x75y5108wx7s68k1a5wz03gzm63l33b62gmq9rrq77wagv1g1"; + rev = "ca5c6d07d23573c7ed0ef85d891c86d45545a6fc"; + sha256 = "18f1i10r8hqldl0d00p102niwn0pz7dfbnwx0hyhhjrv109pcjv3"; }; meta.homepage = "https://github.com/tpope/vim-git/"; }; @@ -8010,12 +8010,12 @@ final: prev: vim-go = buildVimPluginFrom2Nix { pname = "vim-go"; - version = "2021-11-08"; + version = "2021-11-25"; src = fetchFromGitHub { owner = "fatih"; repo = "vim-go"; - rev = "96b74acc8747d667247fd8d30eb15f6b44778f6f"; - sha256 = "1cd5kzjsylg5if1fqs7ll5s47jmmbhpw3dxn1k7cyf9wkkmy0di8"; + rev = "a319aaf6bf652dadb197807e4629ff5b1750a17b"; + sha256 = "14q32d2cxh55qg2v9ykwayaanh47zx8fd3pj952x9zrhijkx5g4q"; }; meta.homepage = "https://github.com/fatih/vim-go/"; }; @@ -8166,12 +8166,12 @@ final: prev: vim-helm = buildVimPluginFrom2Nix { pname = "vim-helm"; - version = "2020-01-02"; + version = "2021-11-26"; src = fetchFromGitHub { owner = "towolf"; repo = "vim-helm"; - rev = "2c2e2e936607ed93f8f75de2066d04feff0e8e81"; - sha256 = "1vlaqcxxsbys0ybk2x7ri1flyx412ak0dmanqg1cdig6xzhna2kc"; + rev = "b4710cda777c605c884a99d5abc1c2ef714e20a6"; + sha256 = "0xyljfbgqyjhvpw0dhkga86qprgc8n0p38ql6pnh8nfyq1xlzf4a"; }; meta.homepage = "https://github.com/towolf/vim-helm/"; }; @@ -8480,12 +8480,12 @@ final: prev: vim-jsdoc = buildVimPluginFrom2Nix { pname = "vim-jsdoc"; - version = "2021-10-25"; + version = "2021-11-20"; src = fetchFromGitHub { owner = "heavenshell"; repo = "vim-jsdoc"; - rev = "27af18abfe60990410a10ade1b61b8b6350913d9"; - sha256 = "0qc12dhp2kfjkmdcxajn0gy9z5vapylmnamd8lyhk2v8hkkzr8y4"; + rev = "71c98ed6eacb4f1c0b9e4950ef679eda6a651cdd"; + sha256 = "0jxcmriva73s0icllpbh6q6s2fw0ysjm7fk449kdd5fvd5y5ssq5"; }; meta.homepage = "https://github.com/heavenshell/vim-jsdoc/"; }; @@ -8540,12 +8540,12 @@ final: prev: vim-kitty-navigator = buildVimPluginFrom2Nix { pname = "vim-kitty-navigator"; - version = "2021-11-15"; + version = "2021-11-26"; src = fetchFromGitHub { owner = "knubie"; repo = "vim-kitty-navigator"; - rev = "e097580586e802352f225eed467fafa90f11223e"; - sha256 = "1lzgqaxw0y53r1qrcqx3fxb1fdqkswzkl8b6yk4xmdxig6kyhm46"; + rev = "443287463671020b461cec020ced52840723b95d"; + sha256 = "0a0jy6vk7cdb0hijrrnvliak0gbyl1hh1hljlrrhdvxmqmch0022"; }; meta.homepage = "https://github.com/knubie/vim-kitty-navigator/"; }; @@ -8841,12 +8841,12 @@ final: prev: vim-matchup = buildVimPluginFrom2Nix { pname = "vim-matchup"; - version = "2021-11-05"; + version = "2021-11-24"; src = fetchFromGitHub { owner = "andymass"; repo = "vim-matchup"; - rev = "50cadec5e6fbc3e3e30ef2057d169cbc61a6ae9c"; - sha256 = "1kz0i4sir8fa42m606bcspf0alkvwz91xi2z9a9c64r9b3ixdpmr"; + rev = "2c3227b3de50d248ad6c8900b3e12f1dd21994ac"; + sha256 = "129bqyg611swh9rhahvfybc9n0wdrgkknk0b2bx1zx634078n9x8"; }; meta.homepage = "https://github.com/andymass/vim-matchup/"; }; @@ -8865,12 +8865,12 @@ final: prev: vim-merginal = buildVimPluginFrom2Nix { pname = "vim-merginal"; - version = "2020-12-06"; + version = "2021-11-26"; src = fetchFromGitHub { owner = "idanarye"; repo = "vim-merginal"; - rev = "7e1446614cdfb3a8eca621e5006631af72cda0f8"; - sha256 = "133lddbwz63djr6pyg3dqy2pn795b48i3y4ps9ssyy6yjyi3pnrg"; + rev = "d47689faa5623e8f455c62a9a1016c92cf66c09e"; + sha256 = "0ili5kk0rg85dzn3z606c3p81lyq40rj97b4nzcc61x1s9k4l9z7"; }; meta.homepage = "https://github.com/idanarye/vim-merginal/"; }; @@ -9393,12 +9393,12 @@ final: prev: vim-polyglot = buildVimPluginFrom2Nix { pname = "vim-polyglot"; - version = "2021-09-10"; + version = "2021-11-21"; src = fetchFromGitHub { owner = "sheerun"; repo = "vim-polyglot"; - rev = "4d4aa5fe553a47ef5c5c6d0a97bb487fdfda2d5b"; - sha256 = "0xavwlgmr2z86kkj1xg5c6ly2agaaa6l6mzsjnbmc98r720z6q88"; + rev = "918610d427503c5c7b380eae4a954bd8cb427db5"; + sha256 = "0ly1wwm97x6a2v1x7da4bh8xrcksapb8xyyxih7kmvwk7xn3wrqr"; }; meta.homepage = "https://github.com/sheerun/vim-polyglot/"; }; @@ -9429,12 +9429,12 @@ final: prev: vim-prettier = buildVimPluginFrom2Nix { pname = "vim-prettier"; - version = "2021-06-29"; + version = "2021-11-24"; src = fetchFromGitHub { owner = "prettier"; repo = "vim-prettier"; - rev = "0e61e4a5b55d2740aa118db91a6671dcb11307e8"; - sha256 = "0d83lx6kfpsi3d4q9wz8zwsgdn0vn16psqyngml6wspjyibh6pnf"; + rev = "5e6cca21e12587c02e32a06bf423519eb1e9f1b2"; + sha256 = "0sf23h1d15sqcfx1zsscvvczw8bbc7pravfw72mfrf5n6xfiaqal"; }; meta.homepage = "https://github.com/prettier/vim-prettier/"; }; @@ -9633,12 +9633,12 @@ final: prev: vim-rails = buildVimPluginFrom2Nix { pname = "vim-rails"; - version = "2021-10-19"; + version = "2021-11-20"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-rails"; - rev = "a4595b48a83824e36c1ebe48b574aa8624632695"; - sha256 = "1czfv1v7vp2br8mpbb5zpi6rrzfrqr7mq5q4xa3n7b9lhdjw6r4i"; + rev = "582c4f6cf310b2b3044c366c726a90c0010fc45d"; + sha256 = "04cw3v1havjw9cak5hwnihg7mca265iy3i4cx3jw064yragzapb3"; }; meta.homepage = "https://github.com/tpope/vim-rails/"; }; @@ -9729,12 +9729,12 @@ final: prev: vim-ruby = buildVimPluginFrom2Nix { pname = "vim-ruby"; - version = "2021-11-03"; + version = "2021-11-22"; src = fetchFromGitHub { owner = "vim-ruby"; repo = "vim-ruby"; - rev = "ee99a4cdb6931a5409b17c8f0f397a5c5dd6a035"; - sha256 = "0gg57jrsm86fhhyrw44pzm5jmnpllqm9sv2j0ajjkyxbzhb9m18m"; + rev = "5bd142973816705364ce485b437f291687acc9ea"; + sha256 = "0b5a8658w8fgkyiy77rv4r3y3lylli21j69frpnzmncwj8lvncax"; }; meta.homepage = "https://github.com/vim-ruby/vim-ruby/"; }; @@ -9753,12 +9753,12 @@ final: prev: vim-sandwich = buildVimPluginFrom2Nix { pname = "vim-sandwich"; - version = "2021-09-11"; + version = "2021-11-28"; src = fetchFromGitHub { owner = "machakann"; repo = "vim-sandwich"; - rev = "4cd1ea8db6aa43af8e1996422e2010c49d3a5998"; - sha256 = "1nvjhx5y3rjy5lkm66hgrnsx8j7db7spvwy624qas1xhdqbadb6y"; + rev = "17eb132421e7e4915a2b9b67c1034ee4581fb13a"; + sha256 = "1cvm31iaqlmwvyrx3lb3gkky70zsn3h1b1z1vicr96sn0hqp903q"; }; meta.homepage = "https://github.com/machakann/vim-sandwich/"; }; @@ -10474,24 +10474,24 @@ final: prev: vim-twiggy = buildVimPluginFrom2Nix { pname = "vim-twiggy"; - version = "2021-09-16"; + version = "2021-11-24"; src = fetchFromGitHub { owner = "sodapopcan"; repo = "vim-twiggy"; - rev = "16287d2261be67872870899744fd04a6802a9b87"; - sha256 = "0cfqvq2was7jdhcixnlrzh9qdm2n2sv17l7a2sys8slzl04v2c61"; + rev = "25399d85fc07054c534c7808476e763849cdcb02"; + sha256 = "14cqyjvhabiw4izmdh69mj8qvb65cw5q28frl2hmdqf492r7h98z"; }; meta.homepage = "https://github.com/sodapopcan/vim-twiggy/"; }; vim-ultest = buildVimPluginFrom2Nix { pname = "vim-ultest"; - version = "2021-10-28"; + version = "2021-11-28"; src = fetchFromGitHub { owner = "rcarriga"; repo = "vim-ultest"; - rev = "97afe58821129e88d420ca318fd171cc54518263"; - sha256 = "123rv36b5i84yk50xl5400za8g1pfypb2c5k3yv0pn0s4n0fm1pb"; + rev = "30738e5101a3070e622c33c7ca2a026c5cf1a7ad"; + sha256 = "0lxv56668rbd104l0q8pzf2wlwffzvp2w4zxis790p2rivqaaasf"; }; meta.homepage = "https://github.com/rcarriga/vim-ultest/"; }; @@ -10582,12 +10582,12 @@ final: prev: vim-vsnip = buildVimPluginFrom2Nix { pname = "vim-vsnip"; - version = "2021-11-15"; + version = "2021-11-22"; src = fetchFromGitHub { owner = "hrsh7th"; repo = "vim-vsnip"; - rev = "60ee20318550f4a5b6f7a5a8b827540c2c386898"; - sha256 = "0gl34m17pxgyfbdqghhfcgxhbhxwvjc9r048sim1gf86wga4mq39"; + rev = "30449e9c19c73f64f4c87c29c426318f5519c314"; + sha256 = "038r81kms8d0hjz4gh5dsfrwlkxxvc93vmq5ipd57v0zcxyr9l5f"; }; meta.homepage = "https://github.com/hrsh7th/vim-vsnip/"; }; @@ -10654,12 +10654,12 @@ final: prev: vim-which-key = buildVimPluginFrom2Nix { pname = "vim-which-key"; - version = "2021-11-12"; + version = "2021-11-25"; src = fetchFromGitHub { owner = "liuchengxu"; repo = "vim-which-key"; - rev = "7e3819a91a7710ce561a9c11a22a82b9437a2533"; - sha256 = "0hx5ar663ai25jj7p44sl2nn2n0jj2iif5ybx5ic7cxz4qy477wn"; + rev = "165772f440bd26c4679eef8b8b493ab11fffc4ae"; + sha256 = "1jhc8x22qgpbwrbmaf02hbq98hxfibg3jqa3wrnyi1qiik0wxzrc"; }; meta.homepage = "https://github.com/liuchengxu/vim-which-key/"; }; @@ -10906,12 +10906,12 @@ final: prev: vimspector = buildVimPluginFrom2Nix { pname = "vimspector"; - version = "2021-11-17"; + version = "2021-11-24"; src = fetchFromGitHub { owner = "puremourning"; repo = "vimspector"; - rev = "d80485393139d15df237e856b8ef6675cfb88f6b"; - sha256 = "1cvj7k9xxg4hp0m6lxnqklrnj5dqp4pyx4w6x0p8wh81a94r0wvw"; + rev = "93ccc361334c4de1095a9a2b59d3a212d227e3e0"; + sha256 = "079pg4nabj6q7kkv3wv73998zvyhwsqfkn8c12y84h664l460265"; fetchSubmodules = true; }; meta.homepage = "https://github.com/puremourning/vimspector/"; @@ -10919,12 +10919,12 @@ final: prev: vimtex = buildVimPluginFrom2Nix { pname = "vimtex"; - version = "2021-11-16"; + version = "2021-11-24"; src = fetchFromGitHub { owner = "lervag"; repo = "vimtex"; - rev = "c3991f8a53dc8a193a23dba7645ce6b9b8d5038b"; - sha256 = "1zn094xjskqc0pjpjp21j18s9b01j5k0kpczcwf8nxi52bb8815v"; + rev = "d9e05f5e8010ce43670d19655058a6dc8cad300e"; + sha256 = "1a79qsyv7j269vlnm0b81x07p8c5dwxwyq7bqal3cm0ifsmy78w7"; }; meta.homepage = "https://github.com/lervag/vimtex/"; }; @@ -11160,12 +11160,12 @@ final: prev: YouCompleteMe = buildVimPluginFrom2Nix { pname = "YouCompleteMe"; - version = "2021-11-16"; + version = "2021-11-25"; src = fetchFromGitHub { owner = "ycm-core"; repo = "YouCompleteMe"; - rev = "e17fb2fc92c7c1bee6a429db0d3b432c811d0c8a"; - sha256 = "0l95wj6ghfip2l7bsdv8frhnd92wdni6a8fi1i356x1ls2fm6vvr"; + rev = "9ee19df6bdfbda8e0e5771e117537963a8471cb5"; + sha256 = "0lmxv6gvscpck6qsy773xq09qiq1yb72zk0slq9bi7jifj08xn16"; fetchSubmodules = true; }; meta.homepage = "https://github.com/ycm-core/YouCompleteMe/"; From 36857fb291114460a01f37b8153326fa26f7011d Mon Sep 17 00:00:00 2001 From: Ilan Joselevich Date: Sun, 28 Nov 2021 19:19:17 +0200 Subject: [PATCH 43/62] vimPlugins: resolve github repository redirects --- pkgs/misc/vim-plugins/deprecated.json | 4 ++++ pkgs/misc/vim-plugins/generated.nix | 10 +++++----- pkgs/misc/vim-plugins/vim-plugin-names | 2 +- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/pkgs/misc/vim-plugins/deprecated.json b/pkgs/misc/vim-plugins/deprecated.json index 0b637a90f1d8..b76cefa153b7 100644 --- a/pkgs/misc/vim-plugins/deprecated.json +++ b/pkgs/misc/vim-plugins/deprecated.json @@ -15,6 +15,10 @@ "date": "2021-08-22", "new": "toggleterm-nvim" }, + "orgmode-nvim": { + "date": "2021-11-28", + "new": "orgmode" + }, "sql-nvim": { "date": "2021-09-03", "new": "sqlite-lua" diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index 5734ffcb2add..a3cc3136dbf3 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -4750,16 +4750,16 @@ final: prev: meta.homepage = "https://github.com/tyru/open-browser.vim/"; }; - orgmode-nvim = buildVimPluginFrom2Nix { - pname = "orgmode.nvim"; + orgmode = buildVimPluginFrom2Nix { + pname = "orgmode"; version = "2021-11-28"; src = fetchFromGitHub { - owner = "kristijanhusak"; - repo = "orgmode.nvim"; + owner = "nvim-orgmode"; + repo = "orgmode"; rev = "9cf968e5d5651c33cdc9de18ca7f02dc502502e7"; sha256 = "1smkn83gxjs72i6zd8vfhqxkaanda4nwacgm3y0129z18q78p90m"; }; - meta.homepage = "https://github.com/kristijanhusak/orgmode.nvim/"; + meta.homepage = "https://github.com/nvim-orgmode/orgmode/"; }; package-info-nvim = buildVimPluginFrom2Nix { diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index b5a293df7cf6..e964a19cf41d 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -363,7 +363,6 @@ kovisoft/slimv kristijanhusak/defx-git kristijanhusak/defx-icons kristijanhusak/deoplete-phpactor -kristijanhusak/orgmode.nvim kristijanhusak/vim-carbon-now-sh kristijanhusak/vim-dadbod-completion kristijanhusak/vim-dadbod-ui @@ -546,6 +545,7 @@ nvim-lua/plenary.nvim nvim-lua/popup.nvim nvim-lualine/lualine.nvim nvim-neorg/neorg@main +nvim-orgmode/orgmode nvim-telescope/telescope-cheat.nvim nvim-telescope/telescope-dap.nvim nvim-telescope/telescope-frecency.nvim From 6d5f693e8844835f5f7d673d068169f807bcd51f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Sun, 28 Nov 2021 15:07:21 -0300 Subject: [PATCH 44/62] xfce.mousepad: 0.5.7 -> 0.5.8 --- pkgs/desktops/xfce/applications/mousepad/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/xfce/applications/mousepad/default.nix b/pkgs/desktops/xfce/applications/mousepad/default.nix index 1fdbe267c039..a7c57c3df2f5 100644 --- a/pkgs/desktops/xfce/applications/mousepad/default.nix +++ b/pkgs/desktops/xfce/applications/mousepad/default.nix @@ -3,10 +3,10 @@ mkXfceDerivation { category = "apps"; pname = "mousepad"; - version = "0.5.7"; + version = "0.5.8"; odd-unstable = false; - sha256 = "sha256-VLPzzM9dl+HAPI+Qn2QTjrKfRgngsExlPFRsdmsNcSM="; + sha256 = "sha256-Q5coRO2Swo0LpB+pzi+fxrwNyhcDbQXLuQtepPlCyxY="; nativeBuildInputs = [ gobject-introspection ]; From 30fb90c16b1d9ed80d6e1f9458cb377ab065ec97 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Sun, 28 Nov 2021 15:11:09 -0300 Subject: [PATCH 45/62] xfce.ristretto: 0.12.0 -> 0.12.1 --- pkgs/desktops/xfce/applications/ristretto/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/xfce/applications/ristretto/default.nix b/pkgs/desktops/xfce/applications/ristretto/default.nix index c8b8f162da5d..0dfb000c727b 100644 --- a/pkgs/desktops/xfce/applications/ristretto/default.nix +++ b/pkgs/desktops/xfce/applications/ristretto/default.nix @@ -4,9 +4,9 @@ mkXfceDerivation { category = "apps"; pname = "ristretto"; - version = "0.12.0"; + version = "0.12.1"; - sha256 = "sha256-vf9OczDHG6iAd10BgbwfFG7uHBn3JnNT6AB/WGk40C8="; + sha256 = "sha256-Kwtema8mydSPQadeaw/OTnGCHUNuJpvHbf7l4YtICYE="; buildInputs = [ glib gtk3 libexif libxfce4ui libxfce4util xfconf ]; From 25b1292db1f5da73680aed7a2a7a8a486b19eab2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Sun, 28 Nov 2021 15:24:52 -0300 Subject: [PATCH 46/62] xfce.xfce4-whiskermenu-plugin: 2.6.2 -> 2.7.0 --- .../xfce/panel-plugins/xfce4-whiskermenu-plugin/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-whiskermenu-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-whiskermenu-plugin/default.nix index be59429fe1bb..89f5f9ac38b4 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-whiskermenu-plugin/default.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-whiskermenu-plugin/default.nix @@ -3,10 +3,10 @@ mkXfceDerivation { category = "panel-plugins"; pname = "xfce4-whiskermenu-plugin"; - version = "2.6.2"; + version = "2.7.0"; rev-prefix = "v"; odd-unstable = false; - sha256 = "sha256-Tg6jK2yvODvNykTRePmHWu3safgyKAd3tCMWGXuMhPM="; + sha256 = "sha256-wrFp+YMFfi1UZKQGkHnojAh+l170xW56ls9UJZXmzOo="; nativeBuildInputs = [ cmake ]; From f14c69a5bc664db3d738fd0b0c0780251c3ad464 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 29 Nov 2021 08:57:52 +0100 Subject: [PATCH 47/62] checkov: 2.0.605 -> 2.0.606 --- pkgs/development/tools/analysis/checkov/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/analysis/checkov/default.nix b/pkgs/development/tools/analysis/checkov/default.nix index 636b5fcd427c..79300180948d 100644 --- a/pkgs/development/tools/analysis/checkov/default.nix +++ b/pkgs/development/tools/analysis/checkov/default.nix @@ -56,13 +56,13 @@ with py.pkgs; buildPythonApplication rec { pname = "checkov"; - version = "2.0.605"; + version = "2.0.606"; src = fetchFromGitHub { owner = "bridgecrewio"; repo = pname; rev = version; - sha256 = "sha256-3FSxk2T7JTDn73S+Wf1fJm3Qx4diP1Wf0hJAglBqlxM="; + sha256 = "sha256-2t/yYVhJVf5j+ya96zc3EY708ggU8BtsIIIh2ug9XF0="; }; nativeBuildInputs = with py.pkgs; [ From 680822a336b4ba77727548e08e6bd3a2df0f4eb1 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 29 Nov 2021 09:20:09 +0100 Subject: [PATCH 48/62] python3Packages.fakeredis: 1.6.1 -> 1.7.0 --- pkgs/development/python-modules/fakeredis/default.nix | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/fakeredis/default.nix b/pkgs/development/python-modules/fakeredis/default.nix index 919c5a1aebd9..eff55de1d90e 100644 --- a/pkgs/development/python-modules/fakeredis/default.nix +++ b/pkgs/development/python-modules/fakeredis/default.nix @@ -16,12 +16,14 @@ buildPythonPackage rec { pname = "fakeredis"; - version = "1.6.1"; + version = "1.7.0"; + format = "setuptools"; + disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "sha256-DQapOE+3nanyFkzpbjTrnU4upGIVBwgF6m/TwXRZC0c="; + sha256 = "sha256-yb0S5DAzbL0+GJ+uDpHrmZl7k+dtv91u1n+jUtxoTHE="; }; propagatedBuildInputs = [ @@ -45,7 +47,9 @@ buildPythonPackage rec { "test/test_aioredis2.py" ]; - pythonImportsCheck = [ "fakeredis" ]; + pythonImportsCheck = [ + "fakeredis" + ]; meta = with lib; { description = "Fake implementation of Redis API"; From cecf41f57156a6e613ff2d873bc55ff5d50a42fe Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 29 Nov 2021 09:30:43 +0100 Subject: [PATCH 49/62] python3Packages.autoit-ripper: 1.0.1 -> 1.1.0 --- .../python-modules/autoit-ripper/default.nix | 20 ++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/autoit-ripper/default.nix b/pkgs/development/python-modules/autoit-ripper/default.nix index 2276241d25e9..420322a32340 100644 --- a/pkgs/development/python-modules/autoit-ripper/default.nix +++ b/pkgs/development/python-modules/autoit-ripper/default.nix @@ -1,31 +1,37 @@ { lib , buildPythonPackage , fetchPypi -, lief +, pefile , pythonOlder }: buildPythonPackage rec { pname = "autoit-ripper"; - version = "1.0.1"; - disabled = pythonOlder "3.6"; + version = "1.1.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "0mbsrfa72n7y1vkm9jhwhn1z3k45jxrlgx58ia1l2bp6chnnn2zy"; + sha256 = "sha256-fluG/2XlUh3kPtYtSotrP02c7kdmem92Hy1R93SaTzk="; }; propagatedBuildInputs = [ - lief + pefile ]; postPatch = '' - substituteInPlace requirements.txt --replace "lief==0.10.1" "lief>=0.10.1" + substituteInPlace requirements.txt \ + --replace "pefile==2019.4.18" "pefile>=2019.4.18" ''; # Project has no tests doCheck = false; - pythonImportsCheck = [ "autoit_ripper" ]; + + pythonImportsCheck = [ + "autoit_ripper" + ]; meta = with lib; { description = "Python module to extract AutoIt scripts embedded in PE binaries"; From 6d3cfa53d6cd7d776a1b61c7a529ac8949c9d4e0 Mon Sep 17 00:00:00 2001 From: Shaun Sharples Date: Mon, 29 Nov 2021 12:28:00 +0200 Subject: [PATCH 50/62] vintagestory: 1.15.5 -> 1.15.10 --- pkgs/games/vintagestory/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/vintagestory/default.nix b/pkgs/games/vintagestory/default.nix index 721b8c921d24..d19611a08ffe 100644 --- a/pkgs/games/vintagestory/default.nix +++ b/pkgs/games/vintagestory/default.nix @@ -17,11 +17,11 @@ stdenv.mkDerivation rec { pname = "vintagestory"; - version = "1.15.5"; + version = "1.15.10"; src = fetchurl { url = "https://cdn.vintagestory.at/gamefiles/stable/vs_archive_${version}.tar.gz"; - sha256 = "sha256-38vLkH8B1yYC1I8P8uCsbC8CK8Btpfm9tNxgiuswsa8="; + sha256 = "sha256-aT6vndo/SSAqd4omyW4qWvGetkqEpgvapqaqDBrbTmo="; }; nativeBuildInputs = [ makeWrapper copyDesktopItems ]; From 6bd0a5beac9618aeb25124074c4bc197df3b8703 Mon Sep 17 00:00:00 2001 From: Dzmitry Malyshau Date: Mon, 29 Nov 2021 08:32:07 -0500 Subject: [PATCH 51/62] glean-parser: disable pytest-runner --- pkgs/development/python-modules/glean-parser/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/glean-parser/default.nix b/pkgs/development/python-modules/glean-parser/default.nix index feca6979b429..8a774e660751 100644 --- a/pkgs/development/python-modules/glean-parser/default.nix +++ b/pkgs/development/python-modules/glean-parser/default.nix @@ -2,7 +2,6 @@ , buildPythonPackage , fetchPypi , pytestCheckHook -, pytest-runner , pythonOlder , setuptools-scm # build inputs @@ -26,6 +25,10 @@ buildPythonPackage rec { sha256 = "sha256-wZSro1pX/50TlSfFMh71JlmXlJlONVutTDFL06tkw+s="; }; + postPatch = '' + substituteInPlace setup.py --replace "pytest-runner" "" + ''; + propagatedBuildInputs = [ appdirs click @@ -41,7 +44,6 @@ buildPythonPackage rec { checkInputs = [ pytestCheckHook - pytest-runner ]; disabledTests = [ # https://bugzilla.mozilla.org/show_bug.cgi?id=1741668 From 371082920f97f54f90d8e78fe12e0253ffb2e5bb Mon Sep 17 00:00:00 2001 From: Clemens Lutz Date: Mon, 29 Nov 2021 14:51:39 +0100 Subject: [PATCH 52/62] zoom-us: 5.8.4.210 -> 5.8.6.739 --- .../networking/instant-messengers/zoom-us/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix index 9b3ab777b053..9451dcd2d236 100644 --- a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix +++ b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix @@ -28,11 +28,11 @@ }: let - version = "5.8.4.210"; + version = "5.8.6.739"; srcs = { x86_64-linux = fetchurl { url = "https://zoom.us/client/${version}/zoom_x86_64.pkg.tar.xz"; - sha256 = "1qjr35wg1jk6a6c958s0hbgqqczq789iim77s02yqpy5kyjbnn1n"; + sha256 = "12gzdfxf6xy558smsfazvjj4g1rnaiw7l2lznzlh2qazyaq6f3mq"; }; }; From 03e4ad1709e48118498155c7f1ecc8473bd40b2c Mon Sep 17 00:00:00 2001 From: Michael Adler Date: Mon, 29 Nov 2021 14:52:00 +0100 Subject: [PATCH 53/62] sumneko-lua-language-server: 2.4.7 -> 2.5.1 --- .../development/tools/sumneko-lua-language-server/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/sumneko-lua-language-server/default.nix b/pkgs/development/tools/sumneko-lua-language-server/default.nix index 80071b1d0606..d8916ce3e9a8 100644 --- a/pkgs/development/tools/sumneko-lua-language-server/default.nix +++ b/pkgs/development/tools/sumneko-lua-language-server/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "sumneko-lua-language-server"; - version = "2.4.7"; + version = "2.5.1"; src = fetchFromGitHub { owner = "sumneko"; repo = "lua-language-server"; rev = version; - sha256 = "sha256-lO+FUuU7uihbRLI1X9qhOvgukRGfhDeSM/JdIqr96Fk="; + sha256 = "sha256-3iWD0kXbF8Rad7fQ36ppD5q8V8COacLrT+vasCkygDc="; fetchSubmodules = true; }; From 4d3ed16dd8182d647abb7735912bdf61088aa2b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabi=C3=A1n=20Heredia=20Montiel?= Date: Mon, 29 Nov 2021 09:11:53 -0600 Subject: [PATCH 54/62] =?UTF-8?q?fira-code:=205.2=20=E2=86=92=206?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/data/fonts/fira-code/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/fonts/fira-code/default.nix b/pkgs/data/fonts/fira-code/default.nix index d5c5d0e000a5..f69cd8990565 100644 --- a/pkgs/data/fonts/fira-code/default.nix +++ b/pkgs/data/fonts/fira-code/default.nix @@ -1,7 +1,7 @@ { lib, fetchzip }: let - version = "5.2"; + version = "6"; in fetchzip { name = "fira-code-${version}"; @@ -13,7 +13,7 @@ in fetchzip { unzip -j $downloadedFile '*-VF.ttf' -d $out/share/fonts/truetype ''; - sha256 = "1wbfjgvr9m5azl5w49y0hpqzgcraw6spd1wnxgxlzfx57x6gcw0k"; + sha256 = "h2Q63rT26SxXeZ76CRCcFg+NfDAc0IgYaYD2ok09Jh4="; meta = with lib; { homepage = "https://github.com/tonsky/FiraCode"; From dbd39c4d41fb8ef843e1a621dfa47c30e58a3061 Mon Sep 17 00:00:00 2001 From: 1000101 Date: Mon, 29 Nov 2021 18:57:46 +0100 Subject: [PATCH 55/62] pgbouncer: 1.16.0 -> 1.16.1 --- pkgs/servers/sql/pgbouncer/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sql/pgbouncer/default.nix b/pkgs/servers/sql/pgbouncer/default.nix index e91fa775ddbe..441b99c7bcd6 100644 --- a/pkgs/servers/sql/pgbouncer/default.nix +++ b/pkgs/servers/sql/pgbouncer/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "pgbouncer"; - version = "1.16.0"; + version = "1.16.1"; src = fetchurl { url = "https://pgbouncer.github.io/downloads/files/${version}/${pname}-${version}.tar.gz"; - sha256 = "0li66jk1v07bpfmmqzcqjn5vkhglfhwnbncc5bpalg5qidhr38x4"; + sha256 = "1z7p3ghpmbp5qv1bz9s186jn0hfnr300dc5p0hmh6vbnwklpfx08"; }; nativeBuildInputs = [ pkg-config ]; From 8ecf2d613aa3cf56821604df894dc2b90f4b128b Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Mon, 29 Nov 2021 20:31:34 +0100 Subject: [PATCH 56/62] symfony-cli: support more platforms (#147732) --- .../development/tools/symfony-cli/default.nix | 35 +++++++++++++++---- 1 file changed, 28 insertions(+), 7 deletions(-) diff --git a/pkgs/development/tools/symfony-cli/default.nix b/pkgs/development/tools/symfony-cli/default.nix index b2e8d5ba279b..2eed473bb25a 100644 --- a/pkgs/development/tools/symfony-cli/default.nix +++ b/pkgs/development/tools/symfony-cli/default.nix @@ -1,13 +1,34 @@ { stdenvNoCC, fetchurl, lib }: -stdenvNoCC.mkDerivation rec { - pname = "symfony-cli"; - version = "4.26.8"; +let + version = "4.26.9"; - src = fetchurl { - url = "https://github.com/symfony/cli/releases/download/v${version}/symfony_linux_amd64.gz"; - sha256 = "sha256-/9jsdl39TOkuNCB4G7orJH4qR4Spdt7VTsC1jelyLs0="; + srcs = { + x86_64-linux = fetchurl { + url = "https://github.com/symfony/cli/releases/download/v${version}/symfony_linux_amd64.gz"; + sha256 = "0ivqqrpzbpyzp60bv25scarmvisj401rp7h2s3cxa7d17prja91v"; + }; + + i686-linux = fetchurl { + url = "https://github.com/symfony/cli/releases/download/v${version}/symfony_linux_386.gz"; + sha256 = "0ag5w70bkvj9wgp4yzzy824shj907sa5l20sqcgivi3r5gy0p277"; + }; + + aarch64-linux = fetchurl { + url = "https://github.com/symfony/cli/releases/download/v${version}/symfony_linux_arm64.gz"; + sha256 = "00325xz7xl3bprj5zbg5yhn36jf4n37zlyag10m8zcmq8asa6k51"; + }; + + x86_64-darwin = fetchurl { + url = "https://github.com/symfony/cli/releases/download/v${version}/symfony_darwin_amd64.gz"; + sha256 = "00325xz7xl3bprj5zbg5yhn36jf4n37zlyag10m8zcmq8asa6k51"; + }; }; +in stdenvNoCC.mkDerivation rec { + inherit version; + pname = "symfony-cli"; + + src = srcs.${stdenvNoCC.hostPlatform.system} or (throw "Unsupported system: ${stdenvNoCC.hostPlatform.system}"); dontBuild = true; @@ -24,6 +45,6 @@ stdenvNoCC.mkDerivation rec { homepage = "https://symfony.com/download"; license = licenses.unfree; maintainers = with maintainers; [ drupol ]; - platforms = [ "x86_64-linux" ]; + platforms = [ "x86_64-linux" "aarch64-linux" "i686-linux" "x86_64-darwin" ]; }; } From 11313ae4112f884e5d70bc342d361726c69cf3e2 Mon Sep 17 00:00:00 2001 From: wucke13 Date: Mon, 29 Nov 2021 18:38:59 +0100 Subject: [PATCH 57/62] nwjs: 0.33.4 -> 0.54.1 The later versions depend on GLIBC_2.33, which is not yet available in the nixpkgs. Hence only the update to a newer but not the newest release. --- pkgs/development/tools/nwjs/default.nix | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/pkgs/development/tools/nwjs/default.nix b/pkgs/development/tools/nwjs/default.nix index a4a54717febe..f3ec2dabc923 100644 --- a/pkgs/development/tools/nwjs/default.nix +++ b/pkgs/development/tools/nwjs/default.nix @@ -1,7 +1,8 @@ { stdenv, lib, fetchurl, buildEnv, makeWrapper -, xorg, alsa-lib, dbus, glib, gtk3, atk, pango, freetype, fontconfig -, gdk-pixbuf, cairo, nss, nspr, gconf, expat, systemd, libcap +, xorg, alsa-lib, at-spi2-core, dbus, glib, gtk3, atk, pango, freetype +, fontconfig , gdk-pixbuf, cairo, mesa, nss, nspr, gconf, expat, systemd +, libcap, libdrm, libxkbcommon , libnotify , ffmpeg, libxcb, cups , sqlite, udev @@ -15,12 +16,13 @@ let nwEnv = buildEnv { name = "nwjs-env"; paths = [ - xorg.libX11 xorg.libXrender glib /*gtk2*/ gtk3 atk pango cairo gdk-pixbuf + xorg.libX11 xorg.libXrender glib gtk3 atk at-spi2-core pango cairo gdk-pixbuf freetype fontconfig xorg.libXcomposite alsa-lib xorg.libXdamage - xorg.libXext xorg.libXfixes nss nspr gconf expat dbus + xorg.libXext xorg.libXfixes mesa nss nspr gconf expat dbus xorg.libXtst xorg.libXi xorg.libXcursor xorg.libXrandr - xorg.libXScrnSaver cups - libcap libnotify + xorg.libXScrnSaver xorg.libxshmfence cups + libcap libdrm libnotify + libxkbcommon # libnw-specific (not chromium dependencies) ffmpeg libxcb # chromium runtime deps (dlopen’d) @@ -33,18 +35,18 @@ let in stdenv.mkDerivation rec { pname = "nwjs"; - version = "0.33.4"; + version = "0.54.1"; src = if sdk then fetchurl { url = "https://dl.nwjs.io/v${version}/nwjs-sdk-v${version}-linux-${bits}.tar.gz"; sha256 = if bits == "x64" then - "1hi6xispxvyb6krm5j11mv8509dwpw5ikpbkvq135gsk3gm29c9y" else - "00p4clbfinrj5gp2i84a263l3h00z8g7mnx61qwmr0z02kvswz9s"; + "sha256-1qeU4+EIki0M7yJPkRuzFwMdswfDOni5gltdmM6A/ds=" else + "sha256-wDEGePE9lrKa6OAzeiDLhVj992c0TJgiMHb8lJ4PF80="; } else fetchurl { url = "https://dl.nwjs.io/v${version}/nwjs-v${version}-linux-${bits}.tar.gz"; sha256 = if bits == "x64" then - "09zd6gja3l20xx03h2gawpmh9f8nxqjp8qdkds5nz9kbbckhkj52" else - "0nlpdz76k1p1pq4xygfr2an91m0d7p5fjyg2xhiggyy8b7sp4964"; + "sha256-TACEM06K2t6dDXRD44lSW7GRi77yzSW4BZJw8gT+fl4=" else + "sha256-yX9knqFV5VQTT3TJDmQoDgt17NqH8fLt+bLQAqKleTU="; }; # we have runtime deps like sqlite3 that should remain From 958ceefb3ed3ddb82c10818731747b901044bfac Mon Sep 17 00:00:00 2001 From: Ben Darwin Date: Mon, 29 Nov 2021 14:37:39 -0500 Subject: [PATCH 58/62] python3Packages.pydicom: add missing setuptools runtime dependency --- pkgs/development/python-modules/pydicom/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/pydicom/default.nix b/pkgs/development/python-modules/pydicom/default.nix index 539fb9b929d7..69d0a538de0b 100644 --- a/pkgs/development/python-modules/pydicom/default.nix +++ b/pkgs/development/python-modules/pydicom/default.nix @@ -2,11 +2,11 @@ , stdenv , buildPythonPackage , fetchFromGitHub -, isPy27 -, pytest-runner +, pythonOlder , pytestCheckHook , numpy , pillow +, setuptools }: let @@ -20,7 +20,7 @@ let sha256 = "sha256-iExy+mUs1uqs/u9N6btlqyP6/TvoPVsuOuzs56zZAS8="; }; - # Pydicom needs pydicom-data to run some tests. If these files are downloaded + # Pydicom needs pydicom-data to run some tests. If these files aren't downloaded # before the package creation, it'll try to download during the checkPhase. test_data = fetchFromGitHub { owner = "${pname}"; @@ -32,11 +32,11 @@ let in buildPythonPackage { inherit pname version src; - disabled = isPy27; + disabled = pythonOlder "3.6"; - propagatedBuildInputs = [ numpy pillow ]; + propagatedBuildInputs = [ numpy pillow setuptools ]; - checkInputs = [ pytest-runner pytestCheckHook ]; + checkInputs = [ pytestCheckHook ]; # Setting $HOME to prevent pytest to try to create a folder inside # /homeless-shelter which is read-only. From e8cc900eaec34c2b7399678f0cd47c1b0e36a6ef Mon Sep 17 00:00:00 2001 From: talyz Date: Fri, 26 Nov 2021 14:11:05 +0100 Subject: [PATCH 59/62] make-disk-image: Make additionalPaths work with Nix 2.4 The `nix` command is marked as experimental since 2.4, so an extra flag is required to unlock it. --- nixos/lib/make-disk-image.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/lib/make-disk-image.nix b/nixos/lib/make-disk-image.nix index 0a4a71fadc42..15302ae82414 100644 --- a/nixos/lib/make-disk-image.nix +++ b/nixos/lib/make-disk-image.nix @@ -281,7 +281,7 @@ let format' = format; in let --substituters "" ${optionalString (additionalPaths' != []) '' - nix copy --to $root --no-check-sigs ${concatStringsSep " " additionalPaths'} + nix --extra-experimental-features nix-command copy --to $root --no-check-sigs ${concatStringsSep " " additionalPaths'} ''} diskImage=nixos.raw From fa83ed462a9bb38939d2676403e5cdfa1438d193 Mon Sep 17 00:00:00 2001 From: Ben Darwin Date: Mon, 29 Nov 2021 15:39:23 -0500 Subject: [PATCH 60/62] python3Packages.nilearn: unbreak tests Only recurse into `nilearn/`, not e.g. `examples/`, which triggers (non-mocked) data downloads. --- pkgs/development/python-modules/nilearn/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/nilearn/default.nix b/pkgs/development/python-modules/nilearn/default.nix index 41f84dbb6679..c79ea52f558c 100644 --- a/pkgs/development/python-modules/nilearn/default.nix +++ b/pkgs/development/python-modules/nilearn/default.nix @@ -12,6 +12,7 @@ buildPythonPackage rec { checkInputs = [ pytestCheckHook ]; disabledTests = [ "test_clean_confounds" ]; # https://github.com/nilearn/nilearn/issues/2608 + pytestFlagsArray = [ "nilearn" ]; propagatedBuildInputs = [ joblib From 23188a5f00dfdc2ff17606fcc5b21531f9569fb2 Mon Sep 17 00:00:00 2001 From: Ryan Burns Date: Fri, 26 Nov 2021 13:45:37 -0800 Subject: [PATCH 61/62] python2Packages.jinja2: fix tests Fixes: ``` INTERNALERROR> _OptionError: unknown warning category: 'ResourceWarning' ``` --- pkgs/development/python-modules/jinja2/2.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/jinja2/2.nix b/pkgs/development/python-modules/jinja2/2.nix index 153aebcc818e..3cdf83a74db9 100644 --- a/pkgs/development/python-modules/jinja2/2.nix +++ b/pkgs/development/python-modules/jinja2/2.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { doCheck = !stdenv.is32bit || isPy3k; checkPhase = '' - pytest -v tests -W ignore::ResourceWarning -W ignore::DeprecationWarning + pytest -v tests -W ignore::DeprecationWarning ''; meta = with lib; { From 4db84ed126a16e226c5f1a3f13c7bee92fa0a3a4 Mon Sep 17 00:00:00 2001 From: Moritz Hedtke Date: Sat, 27 Nov 2021 20:35:29 +0100 Subject: [PATCH 62/62] .github/workflows/editorconfig.yml: Don't use GitHub API for PR diff. This caused ratelimits for large PRs (reformatting PRs) --- .github/workflows/editorconfig.yml | 35 ++++++++++++++---------------- 1 file changed, 16 insertions(+), 19 deletions(-) diff --git a/.github/workflows/editorconfig.yml b/.github/workflows/editorconfig.yml index 4cd3a1dfa8e8..7433d03eea7d 100644 --- a/.github/workflows/editorconfig.yml +++ b/.github/workflows/editorconfig.yml @@ -13,33 +13,30 @@ jobs: runs-on: ubuntu-latest if: github.repository_owner == 'NixOS' steps: - - name: Get list of changed files from PR - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - run: | - echo 'PR_DIFF<> $GITHUB_ENV - gh api \ - repos/NixOS/nixpkgs/pulls/${{github.event.number}}/files --paginate \ - | jq '.[] | select(.status != "removed") | .filename' \ - >> $GITHUB_ENV - echo 'EOF' >> $GITHUB_ENV - uses: actions/checkout@v2 - with: - # pull_request_target checks out the base branch by default - ref: refs/pull/${{ github.event.pull_request.number }}/merge - if: env.PR_DIFF - uses: cachix/install-nix-action@v16 - if: env.PR_DIFF with: # nixpkgs commit is pinned so that it doesn't break nix_path: nixpkgs=https://github.com/NixOS/nixpkgs/archive/f93ecc4f6bc60414d8b73dbdf615ceb6a2c604df.tar.gz - name: install editorconfig-checker run: nix-env -iA editorconfig-checker -f '' - if: env.PR_DIFF - - name: Checking EditorConfig - if: env.PR_DIFF + - name: Get list of changed files from PR run: | - echo "$PR_DIFF" | xargs editorconfig-checker -disable-indent-size + git fetch origin --depth 1 ${{ github.event.pull_request.head.sha }} + git checkout ${{ github.event.pull_request.head.sha }} + + git fetch origin --depth 1 ${{ github.event.pull_request.base.sha }} + git checkout ${{ github.event.pull_request.base.sha }} + + git fetch origin --depth 1 pull/${{ github.event.pull_request.number }}/merge + # check this out last as editorconfig should check this commit + git checkout FETCH_HEAD + + # everything except --diff-filter=D (deleted) + git diff --diff-filter=ACMRTUXB --name-only ${{ github.event.pull_request.base.sha }} ${{ github.event.pull_request.head.sha }} > $HOME/changed_files + - name: Checking EditorConfig + run: | + cat $HOME/changed_files | xargs -r editorconfig-checker -disable-indent-size - if: ${{ failure() }} run: | echo "::error :: Hey! It looks like your changes don't follow our editorconfig settings. Read https://editorconfig.org/#download to configure your editor so you never see this error again."