From 23ee7693587b2aac2b633012290f2bc400fdc8b3 Mon Sep 17 00:00:00 2001 From: Dennis Gosnell Date: Thu, 2 Mar 2023 10:07:06 +0900 Subject: [PATCH 01/94] buildFHSUserEnv: add version arg This lets you set the version for the derivation produced from `buildFHSUserEnvChroot` and `buildFHSUserEnvBubblewrap`. This can help to make it more clear to end-users to see the versions of the packages they are using. --- .../build-fhs-userenv-bubblewrap/default.nix | 8 +++++++- pkgs/build-support/build-fhs-userenv/default.nix | 12 ++++++++---- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/pkgs/build-support/build-fhs-userenv-bubblewrap/default.nix b/pkgs/build-support/build-fhs-userenv-bubblewrap/default.nix index 048233d728c4..d62e4d2a96f8 100644 --- a/pkgs/build-support/build-fhs-userenv-bubblewrap/default.nix +++ b/pkgs/build-support/build-fhs-userenv-bubblewrap/default.nix @@ -2,6 +2,7 @@ args @ { name +, version ? null , runScript ? "bash" , extraInstallCommands ? "" , meta ? {} @@ -24,6 +25,7 @@ let env = buildFHSEnv (removeAttrs args [ "runScript" "extraInstallCommands" "meta" "passthru" "extraBwrapArgs" "dieWithParent" "unshareUser" "unshareCgroup" "unshareUts" "unshareNet" "unsharePid" "unshareIpc" + "version" ]); etcBindFlags = let @@ -192,7 +194,11 @@ let bin = writeShellScriptBin name (bwrapCmd { initArgs = ''"$@"''; }); -in runCommandLocal name { + versionStr = lib.optionalString (! isNull version) ("-" + version); + + nameAndVersion = name + versionStr; + +in runCommandLocal nameAndVersion { inherit meta; passthru = passthru // { diff --git a/pkgs/build-support/build-fhs-userenv/default.nix b/pkgs/build-support/build-fhs-userenv/default.nix index e7db6a75297d..ab890387e6d2 100644 --- a/pkgs/build-support/build-fhs-userenv/default.nix +++ b/pkgs/build-support/build-fhs-userenv/default.nix @@ -1,11 +1,11 @@ -{ callPackage, runCommandLocal, writeScript, stdenv, coreutils }: +{ lib, callPackage, runCommandLocal, writeScript, stdenv, coreutils }: let buildFHSEnv = callPackage ./env.nix { }; in -args@{ name, runScript ? "bash", extraInstallCommands ? "", meta ? {}, passthru ? {}, ... }: +args@{ name, version ? null, runScript ? "bash", extraInstallCommands ? "", meta ? {}, passthru ? {}, ... }: let - env = buildFHSEnv (removeAttrs args [ "runScript" "extraInstallCommands" "meta" "passthru" ]); + env = buildFHSEnv (removeAttrs args [ "version" "runScript" "extraInstallCommands" "meta" "passthru" ]); chrootenv = callPackage ./chrootenv {}; @@ -23,7 +23,11 @@ let exec ${run} "$@" ''; -in runCommandLocal name { + versionStr = lib.optionalString (! isNull version) ("-" + version); + + nameAndVersion = name + versionStr; + +in runCommandLocal nameAndVersion { inherit meta; passthru = passthru // { From 81d23b8d3a022b5a74c9944a96e916c7f156382d Mon Sep 17 00:00:00 2001 From: Dennis Gosnell Date: Fri, 3 Mar 2023 09:04:17 +0900 Subject: [PATCH 02/94] buildFHSUserEnv: rewrite not isNull check Co-authored-by: Atemu --- pkgs/build-support/build-fhs-userenv-bubblewrap/default.nix | 2 +- pkgs/build-support/build-fhs-userenv/default.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/build-support/build-fhs-userenv-bubblewrap/default.nix b/pkgs/build-support/build-fhs-userenv-bubblewrap/default.nix index d62e4d2a96f8..4604b92313f5 100644 --- a/pkgs/build-support/build-fhs-userenv-bubblewrap/default.nix +++ b/pkgs/build-support/build-fhs-userenv-bubblewrap/default.nix @@ -194,7 +194,7 @@ let bin = writeShellScriptBin name (bwrapCmd { initArgs = ''"$@"''; }); - versionStr = lib.optionalString (! isNull version) ("-" + version); + versionStr = lib.optionalString (version != null) ("-" + version); nameAndVersion = name + versionStr; diff --git a/pkgs/build-support/build-fhs-userenv/default.nix b/pkgs/build-support/build-fhs-userenv/default.nix index ab890387e6d2..6f0adfb4e08c 100644 --- a/pkgs/build-support/build-fhs-userenv/default.nix +++ b/pkgs/build-support/build-fhs-userenv/default.nix @@ -23,7 +23,7 @@ let exec ${run} "$@" ''; - versionStr = lib.optionalString (! isNull version) ("-" + version); + versionStr = lib.optionalString (version != null) ("-" + version); nameAndVersion = name + versionStr; From 2ef27ee3499f8c20173ac405e57e93313af8a9ed Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 18 Mar 2023 11:46:00 +0100 Subject: [PATCH 03/94] python310Packages.soxr: 0.3.3 -> 0.3.4 https://github.com/dofuuz/python-soxr/compare/refs/tags/v0.3.3...v0.3.4 --- pkgs/development/python-modules/soxr/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/soxr/default.nix b/pkgs/development/python-modules/soxr/default.nix index e84dd51d702c..1113083266a2 100644 --- a/pkgs/development/python-modules/soxr/default.nix +++ b/pkgs/development/python-modules/soxr/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "soxr"; - version = "0.3.3"; + version = "0.3.4"; format = "pyproject"; src = fetchFromGitHub { @@ -26,7 +26,7 @@ buildPythonPackage rec { repo = "python-soxr"; rev = "refs/tags/v${version}"; fetchSubmodules = true; - hash = "sha256-g8YS5YgK1uK1kKtR/wn8x5DAUVY/hYmuMIgjgJAC8pM="; + hash = "sha256-/NFGzOF1X9c0yccgtVNUO+1aIWoNdJqP/OKcNj+uKpk="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; From c1e8756b56ce725f9c7c4cfa203bd4cee8c3594b Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 18 Mar 2023 13:25:12 +0100 Subject: [PATCH 04/94] python310Packages.chex: Propagate cloudpickle --- pkgs/development/python-modules/chex/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/chex/default.nix b/pkgs/development/python-modules/chex/default.nix index 588ca836ad8f..b93d3baddcc4 100644 --- a/pkgs/development/python-modules/chex/default.nix +++ b/pkgs/development/python-modules/chex/default.nix @@ -1,5 +1,6 @@ { absl-py , buildPythonPackage +, cloudpickle , dm-tree , fetchFromGitHub , jax @@ -24,6 +25,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ absl-py + cloudpickle dm-tree jax numpy From fae831109185e5a2d0d78f1c7c62b36185b0657e Mon Sep 17 00:00:00 2001 From: Arjan Schrijver Date: Wed, 8 Mar 2023 22:06:51 +0100 Subject: [PATCH 05/94] qtile: fix pulsevolume widget --- pkgs/applications/window-managers/qtile/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/applications/window-managers/qtile/default.nix b/pkgs/applications/window-managers/qtile/default.nix index 1279397cccc2..71c7a63671c6 100644 --- a/pkgs/applications/window-managers/qtile/default.nix +++ b/pkgs/applications/window-managers/qtile/default.nix @@ -11,6 +11,7 @@ , wayland , wlroots , xcbutilcursor +, pulseaudio }: let @@ -60,6 +61,7 @@ let pywayland pywlroots xkbcommon + pulseaudio ]; buildInputs = [ From edc62383e460f56f1050d65d20d578b8dca631b2 Mon Sep 17 00:00:00 2001 From: Arjan Schrijver Date: Mon, 13 Mar 2023 16:19:06 +0100 Subject: [PATCH 06/94] qtile: add myself as maintainer --- pkgs/applications/window-managers/qtile/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/window-managers/qtile/default.nix b/pkgs/applications/window-managers/qtile/default.nix index 71c7a63671c6..bfe88ed694c3 100644 --- a/pkgs/applications/window-managers/qtile/default.nix +++ b/pkgs/applications/window-managers/qtile/default.nix @@ -83,7 +83,7 @@ let license = licenses.mit; description = "A small, flexible, scriptable tiling window manager written in Python"; platforms = platforms.linux; - maintainers = with maintainers; [ kamilchm ]; + maintainers = with maintainers; [ kamilchm arjan-s ]; }; }; in From 1addf91b0b24b8c8556bf5c484a7382f6fd4a6e8 Mon Sep 17 00:00:00 2001 From: Arjan Schrijver Date: Mon, 13 Mar 2023 16:22:18 +0100 Subject: [PATCH 07/94] qtile: add more options and expose unwrapped package --- .../services/x11/window-managers/qtile.nix | 46 +++++- .../window-managers/qtile/default.nix | 147 ++++++++---------- .../window-managers/qtile/wrapper.nix | 9 ++ .../python-modules/qtile-extras/default.nix | 4 +- pkgs/top-level/all-packages.nix | 3 +- 5 files changed, 124 insertions(+), 85 deletions(-) create mode 100644 pkgs/applications/window-managers/qtile/wrapper.nix diff --git a/nixos/modules/services/x11/window-managers/qtile.nix b/nixos/modules/services/x11/window-managers/qtile.nix index fc27566d49ee..cc24522970f3 100644 --- a/nixos/modules/services/x11/window-managers/qtile.nix +++ b/nixos/modules/services/x11/window-managers/qtile.nix @@ -1,23 +1,63 @@ -{ config, lib, pkgs, ... }: +{ config, pkgs, lib, ... }: with lib; let cfg = config.services.xserver.windowManager.qtile; + pyEnv = pkgs.python3.withPackages (p: [ (cfg.package.unwrapped or cfg.package) ] ++ (cfg.extraPackages p)); in { options.services.xserver.windowManager.qtile = { enable = mkEnableOption (lib.mdDoc "qtile"); - package = mkPackageOptionMD pkgs "qtile" { }; + package = mkPackageOptionMD pkgs "qtile-unwrapped" { }; + + configFile = mkOption { + type = with types; nullOr path; + default = null; + example = literalExpression "./your_config.py"; + description = lib.mdDoc '' + Path to the qtile configuration file. + If null, $XDG_CONFIG_HOME/qtile/config.py will be used. + ''; + }; + + backend = mkOption { + type = types.enum [ "x11" "wayland" ]; + default = "x11"; + description = lib.mdDoc '' + Backend to use in qtile: + or . + ''; + }; + + extraPackages = mkOption { + type = types.functionTo (types.listOf types.package); + default = _: []; + defaultText = literalExpression '' + python3Packages: with python3Packages; []; + ''; + description = lib.mdDoc '' + Extra Python packages available to Qtile. + An example would be to include `python3Packages.qtile-extras` + for additional unoffical widgets. + ''; + example = literalExpression '' + python3Packages: with python3Packages; [ + qtile-extras + ]; + ''; + }; }; config = mkIf cfg.enable { services.xserver.windowManager.session = [{ name = "qtile"; start = '' - ${cfg.package}/bin/qtile start & + ${pyEnv}/bin/qtile start -b ${cfg.backend} \ + ${optionalString (cfg.configFile != null) + "--config \"${cfg.configFile}\""} & waitPID=$! ''; }]; diff --git a/pkgs/applications/window-managers/qtile/default.nix b/pkgs/applications/window-managers/qtile/default.nix index bfe88ed694c3..173dc919c74e 100644 --- a/pkgs/applications/window-managers/qtile/default.nix +++ b/pkgs/applications/window-managers/qtile/default.nix @@ -14,85 +14,74 @@ , pulseaudio }: -let - unwrapped = python3Packages.buildPythonPackage rec { - pname = "qtile"; - version = "0.22.1"; +python3Packages.buildPythonPackage rec { + pname = "qtile"; + version = "0.22.1"; - src = fetchFromGitHub { - owner = "qtile"; - repo = "qtile"; - rev = "v${version}"; - hash = "sha256-HOyExVKOqZ4OeNM1/AiXQeiUV+EbSJLEjWEibm07ff8="; - }; - - patches = [ - ./fix-restart.patch # https://github.com/NixOS/nixpkgs/issues/139568 - ]; - - postPatch = '' - substituteInPlace libqtile/pangocffi.py \ - --replace libgobject-2.0.so.0 ${glib.out}/lib/libgobject-2.0.so.0 \ - --replace libpangocairo-1.0.so.0 ${pango.out}/lib/libpangocairo-1.0.so.0 \ - --replace libpango-1.0.so.0 ${pango.out}/lib/libpango-1.0.so.0 - substituteInPlace libqtile/backend/x11/xcursors.py \ - --replace libxcb-cursor.so.0 ${xcbutilcursor.out}/lib/libxcb-cursor.so.0 - ''; - - SETUPTOOLS_SCM_PRETEND_VERSION = version; - - nativeBuildInputs = [ - pkg-config - ] ++ (with python3Packages; [ - setuptools-scm - ]); - - propagatedBuildInputs = with python3Packages; [ - xcffib - (cairocffi.override { withXcffib = true; }) - setuptools - python-dateutil - dbus-python - dbus-next - mpd2 - psutil - pyxdg - pygobject3 - pywayland - pywlroots - xkbcommon - pulseaudio - ]; - - buildInputs = [ - libinput - wayland - wlroots - libxkbcommon - ]; - - # for `qtile check`, needs `stubtest` and `mypy` commands - makeWrapperArgs = [ - "--suffix PATH : ${lib.makeBinPath [ mypy ]}" - ]; - - doCheck = false; # Requires X server #TODO this can be worked out with the existing NixOS testing infrastructure. - - meta = with lib; { - homepage = "http://www.qtile.org/"; - license = licenses.mit; - description = "A small, flexible, scriptable tiling window manager written in Python"; - platforms = platforms.linux; - maintainers = with maintainers; [ kamilchm arjan-s ]; - }; + src = fetchFromGitHub { + owner = "qtile"; + repo = "qtile"; + rev = "v${version}"; + hash = "sha256-HOyExVKOqZ4OeNM1/AiXQeiUV+EbSJLEjWEibm07ff8="; }; -in -(python3.withPackages (_: [ unwrapped ])).overrideAttrs (_: { - # otherwise will be exported as "env", this restores `nix search` behavior - name = "${unwrapped.pname}-${unwrapped.version}"; - # export underlying qtile package - passthru = { inherit unwrapped; }; - # restore original qtile attrs - inherit (unwrapped) pname version meta; -}) + patches = [ + ./fix-restart.patch # https://github.com/NixOS/nixpkgs/issues/139568 + ]; + + postPatch = '' + substituteInPlace libqtile/pangocffi.py \ + --replace libgobject-2.0.so.0 ${glib.out}/lib/libgobject-2.0.so.0 \ + --replace libpangocairo-1.0.so.0 ${pango.out}/lib/libpangocairo-1.0.so.0 \ + --replace libpango-1.0.so.0 ${pango.out}/lib/libpango-1.0.so.0 + substituteInPlace libqtile/backend/x11/xcursors.py \ + --replace libxcb-cursor.so.0 ${xcbutilcursor.out}/lib/libxcb-cursor.so.0 + ''; + + SETUPTOOLS_SCM_PRETEND_VERSION = version; + + nativeBuildInputs = [ + pkg-config + ] ++ (with python3Packages; [ + setuptools-scm + ]); + + propagatedBuildInputs = with python3Packages; [ + xcffib + (cairocffi.override { withXcffib = true; }) + setuptools + python-dateutil + dbus-python + dbus-next + mpd2 + psutil + pyxdg + pygobject3 + pywayland + pywlroots + xkbcommon + pulseaudio + ]; + + buildInputs = [ + libinput + wayland + wlroots + libxkbcommon + ]; + + # for `qtile check`, needs `stubtest` and `mypy` commands + makeWrapperArgs = [ + "--suffix PATH : ${lib.makeBinPath [ mypy ]}" + ]; + + doCheck = false; # Requires X server #TODO this can be worked out with the existing NixOS testing infrastructure. + + meta = with lib; { + homepage = "http://www.qtile.org/"; + license = licenses.mit; + description = "A small, flexible, scriptable tiling window manager written in Python"; + platforms = platforms.linux; + maintainers = with maintainers; [ kamilchm arjan-s ]; + }; +} diff --git a/pkgs/applications/window-managers/qtile/wrapper.nix b/pkgs/applications/window-managers/qtile/wrapper.nix new file mode 100644 index 000000000000..8cb5596a8446 --- /dev/null +++ b/pkgs/applications/window-managers/qtile/wrapper.nix @@ -0,0 +1,9 @@ +{ python3, qtile-unwrapped }: +(python3.withPackages (_: [ qtile-unwrapped ])).overrideAttrs (_: { + # otherwise will be exported as "env", this restores `nix search` behavior + name = "${qtile-unwrapped.pname}-${qtile-unwrapped.version}"; + # export underlying qtile package + passthru = { unwrapped = qtile-unwrapped; }; + # restore original qtile attrs + inherit (qtile-unwrapped) pname version meta; +}) diff --git a/pkgs/development/python-modules/qtile-extras/default.nix b/pkgs/development/python-modules/qtile-extras/default.nix index 76962bb49671..3ba8f9487d58 100644 --- a/pkgs/development/python-modules/qtile-extras/default.nix +++ b/pkgs/development/python-modules/qtile-extras/default.nix @@ -6,7 +6,7 @@ , xorgserver , pulseaudio , pytest-asyncio -, qtile +, qtile-unwrapped , keyring , requests , stravalib @@ -34,7 +34,7 @@ buildPythonPackage rec { ]; checkInputs = [ pytest-asyncio - qtile.unwrapped + qtile-unwrapped pulseaudio keyring requests diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c33c8bba2220..38369eeacfe6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -34077,7 +34077,8 @@ with pkgs; qpdfview = libsForQt5.callPackage ../applications/office/qpdfview { }; - qtile = callPackage ../applications/window-managers/qtile { }; + qtile-unwrapped = callPackage ../applications/window-managers/qtile { }; + qtile = callPackage ../applications/window-managers/qtile/wrapper.nix { }; vimgolf = callPackage ../games/vimgolf { }; From 1907fe8d2558649df796ab40553b23aad2a7f911 Mon Sep 17 00:00:00 2001 From: Nicolas Benes Date: Mon, 20 Mar 2023 15:23:51 +0100 Subject: [PATCH 08/94] tor-browser-bundle-bin: 12.0.3 -> 12.0.4 https://blog.torproject.org/new-release-tor-browser-1204/ --- .../networking/browsers/tor-browser-bundle-bin/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix index f89fdf417704..1f10800a71c5 100644 --- a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix +++ b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix @@ -87,7 +87,7 @@ let fteLibPath = lib.makeLibraryPath [ stdenv.cc.cc gmp ]; # Upstream source - version = "12.0.3"; + version = "12.0.4"; lang = "ALL"; @@ -99,7 +99,7 @@ let "https://tor.eff.org/dist/torbrowser/${version}/tor-browser-linux64-${version}_${lang}.tar.xz" "https://tor.calyxinstitute.org/dist/torbrowser/${version}/tor-browser-linux64-${version}_${lang}.tar.xz" ]; - hash = "sha256-bOGY/RdwD6O7QIuOiBw7OVnZfpumGGso6hwMJJwN2g0="; + hash = "sha256-VT0bD4v8SBq0emFYsxELreY4o+u+FQfyBEnSMzmRd7Y="; }; i686-linux = fetchurl { @@ -109,7 +109,7 @@ let "https://tor.eff.org/dist/torbrowser/${version}/tor-browser-linux32-${version}_${lang}.tar.xz" "https://tor.calyxinstitute.org/dist/torbrowser/${version}/tor-browser-linux32-${version}_${lang}.tar.xz" ]; - hash = "sha256-t1tnEZtiRig2r8GNJpqT+J0XoxCLMyUsI9tX6aa0lYk="; + hash = "sha256-mi8btxI6de5iQ8HzNpvuFdJHjzi03zZJT65dsWEiDHA="; }; }; in From ef9c99a035aea4b828324abe686210460a8cfd9e Mon Sep 17 00:00:00 2001 From: Luflosi Date: Wed, 22 Mar 2023 16:26:51 +0100 Subject: [PATCH 09/94] nixos/kubo: add QUICv1 and WebTransport to Addresses.Swarm list According to https://github.com/ipfs/kubo/blob/v0.18.0/docs/config.md#addressesswarm, the default list of swarm multiaddrs includes QUICv1 and WebTransport since v0.18.0. More information can be found in the release notes at https://github.com/ipfs/kubo/releases/tag/v0.18.0. --- nixos/modules/services/network-filesystems/kubo.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/nixos/modules/services/network-filesystems/kubo.nix b/nixos/modules/services/network-filesystems/kubo.nix index 4d423c905986..0cb0e126d4c5 100644 --- a/nixos/modules/services/network-filesystems/kubo.nix +++ b/nixos/modules/services/network-filesystems/kubo.nix @@ -171,7 +171,11 @@ in "/ip4/0.0.0.0/tcp/4001" "/ip6/::/tcp/4001" "/ip4/0.0.0.0/udp/4001/quic" + "/ip4/0.0.0.0/udp/4001/quic-v1" + "/ip4/0.0.0.0/udp/4001/quic-v1/webtransport" "/ip6/::/udp/4001/quic" + "/ip6/::/udp/4001/quic-v1" + "/ip6/::/udp/4001/quic-v1/webtransport" ]; description = lib.mdDoc "Where Kubo listens for incoming p2p connections"; }; From 2235dd4616b3e228e9811ebc6892c08b6a97f500 Mon Sep 17 00:00:00 2001 From: Luflosi Date: Wed, 22 Mar 2023 16:42:47 +0100 Subject: [PATCH 10/94] kubo: 0.18.1 -> 0.19.0 https://github.com/ipfs/kubo/releases/tag/v0.19.0 --- pkgs/applications/networking/kubo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/kubo/default.nix b/pkgs/applications/networking/kubo/default.nix index d3debb243a44..9e6e87aca07f 100644 --- a/pkgs/applications/networking/kubo/default.nix +++ b/pkgs/applications/networking/kubo/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "kubo"; - version = "0.18.1"; # When updating, also check if the repo version changed and adjust repoVersion below + version = "0.19.0"; # When updating, also check if the repo version changed and adjust repoVersion below rev = "v${version}"; passthru.repoVersion = "13"; # Also update kubo-migrator when changing the repo version @@ -10,7 +10,7 @@ buildGoModule rec { # Kubo makes changes to it's source tarball that don't match the git source. src = fetchurl { url = "https://github.com/ipfs/kubo/releases/download/${rev}/kubo-source.tar.gz"; - hash = "sha256-xAOx4QOdD5MfFLqKTQRGMOnTZt14H523/quOLY5gBMk="; + hash = "sha256-PAxWijTAGOJKRDIKaulNPr/4uOJkm+vqNWAY7AjhFUw="; }; # tarball contains multiple files/directories From e8c9c38ddedfa7361fb85d19e236a0b2d108f51d Mon Sep 17 00:00:00 2001 From: Izorkin Date: Mon, 19 Dec 2022 14:12:39 +0300 Subject: [PATCH 11/94] wsdd: add man --- pkgs/servers/wsdd/default.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/wsdd/default.nix b/pkgs/servers/wsdd/default.nix index a0a8421a7c2b..9c6df7fedce4 100644 --- a/pkgs/servers/wsdd/default.nix +++ b/pkgs/servers/wsdd/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, makeWrapper, nixosTests, python3 }: +{ lib, stdenv, fetchFromGitHub, installShellFiles, makeWrapper, nixosTests, python3 }: stdenv.mkDerivation rec { pname = "wsdd"; @@ -11,7 +11,9 @@ stdenv.mkDerivation rec { sha256 = "sha256-9cwzkF2mg6yOIsurLMXTLoEIOsKbPIWMicpWBQ0XVhE="; }; - nativeBuildInputs = [ makeWrapper ]; + outputs = [ "out" "man" ]; + + nativeBuildInputs = [ installShellFiles makeWrapper ]; buildInputs = [ python3 ]; @@ -22,7 +24,8 @@ stdenv.mkDerivation rec { ]; installPhase = '' - install -Dm0755 src/wsdd.py $out/bin/wsdd + install -Dm0555 src/wsdd.py $out/bin/wsdd + installManPage man/wsdd.1 wrapProgram $out/bin/wsdd --prefix PYTHONPATH : "$PYTHONPATH" ''; From 376345c705ab9dfaf68cfcba68648d9c1aa71b4b Mon Sep 17 00:00:00 2001 From: Izorkin Date: Fri, 24 Mar 2023 19:00:56 +0300 Subject: [PATCH 12/94] wsdd: 0.7.0 -> 0.7.1 --- pkgs/servers/wsdd/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/wsdd/default.nix b/pkgs/servers/wsdd/default.nix index 9c6df7fedce4..8e1f61dc5dd3 100644 --- a/pkgs/servers/wsdd/default.nix +++ b/pkgs/servers/wsdd/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "wsdd"; - version = "0.7.0"; + version = "0.7.1"; src = fetchFromGitHub { owner = "christgau"; repo = pname; rev = "v${version}"; - sha256 = "sha256-9cwzkF2mg6yOIsurLMXTLoEIOsKbPIWMicpWBQ0XVhE="; + hash = "sha256-xfZVGi3OxuRI+Zh6L3Ru4J4j5BB1EAN3fllRCVA/c5o="; }; outputs = [ "out" "man" ]; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { installPhase = '' install -Dm0555 src/wsdd.py $out/bin/wsdd - installManPage man/wsdd.1 + installManPage man/wsdd.8 wrapProgram $out/bin/wsdd --prefix PYTHONPATH : "$PYTHONPATH" ''; From cb619a09e024e7d16523422091d7027826f9678b Mon Sep 17 00:00:00 2001 From: ckie Date: Sat, 18 Mar 2023 19:27:34 +0200 Subject: [PATCH 13/94] pythonPackages.pyrr: 0.10.3 -> unstable-2022-07-22 It stopped building on python39Packages.pyrr, which is needed for pkgs.friture to work, due to some other old dependencies. There are no new releases on PyPI. Tested build of friture, python39Packages.pyrr and python3Packages.pyrr on x86_64-linux: all three previously failed builds work. --- pkgs/development/python-modules/pyrr/default.nix | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/pyrr/default.nix b/pkgs/development/python-modules/pyrr/default.nix index cb1da5238681..4f7eb6623195 100644 --- a/pkgs/development/python-modules/pyrr/default.nix +++ b/pkgs/development/python-modules/pyrr/default.nix @@ -1,21 +1,22 @@ { lib , buildPythonPackage -, fetchPypi +, fetchFromGitHub , setuptools , multipledispatch , numpy }: buildPythonPackage rec { - version = "0.10.3"; pname = "pyrr"; + version = "unstable-2022-07-22"; - src = fetchPypi { - inherit pname version; - sha256 = "3c0f7b20326e71f706a610d58f2190fff73af01eef60c19cb188b186f0ec7e1d"; + src = fetchFromGitHub { + owner = "adamlwgriffiths"; + repo = "Pyrr"; + rev = "f6c8698c48a75f3fb7ad0d47d0ce80a04f87ba2f"; + hash = "sha256-u9O52MQskZRzw0rBH6uPdXdikWLJe7wyBZGNKIFA4BA="; }; - buildInputs = [ setuptools ]; propagatedBuildInputs = [ multipledispatch numpy ]; meta = with lib; { From 07b7e7950206791b4fc5c74a804fccbb07b5e959 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 24 Mar 2023 22:58:11 +0000 Subject: [PATCH 14/94] viceroy: 0.4.0 -> 0.4.1 --- pkgs/development/tools/viceroy/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/viceroy/default.nix b/pkgs/development/tools/viceroy/default.nix index 67fe882f6997..734b2559dc04 100644 --- a/pkgs/development/tools/viceroy/default.nix +++ b/pkgs/development/tools/viceroy/default.nix @@ -2,18 +2,18 @@ rustPlatform.buildRustPackage rec { pname = "viceroy"; - version = "0.4.0"; + version = "0.4.1"; src = fetchFromGitHub { owner = "fastly"; repo = pname; rev = "v${version}"; - hash = "sha256-6D+P7fQBhLYuAw9bIVgEU4Zi18kBLUn/4jr1E8cFugU="; + hash = "sha256-Q/FLvZqmih3StVmLvEmJ5tY7Lz3dqFPUEn9HNubLNMY="; }; buildInputs = lib.optional stdenv.isDarwin Security; - cargoHash = "sha256-URBtmMR61K1/LtIt3Q3tfQ4viZPvoiumR2LudcpYk6s="; + cargoHash = "sha256-SCaP6JtLztIO9Od75i4GkMPbLqpf52sAZVPHG86VcX0="; cargoTestFlags = [ "--package viceroy-lib" From d60cc03705f4aeb956285b79fe088b153bdd3875 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 24 Mar 2023 23:09:36 +0000 Subject: [PATCH 15/94] twilio-cli: 5.4.2 -> 5.5.0 --- pkgs/development/tools/twilio-cli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/twilio-cli/default.nix b/pkgs/development/tools/twilio-cli/default.nix index 0842a07049c5..e1671f6ed3de 100644 --- a/pkgs/development/tools/twilio-cli/default.nix +++ b/pkgs/development/tools/twilio-cli/default.nix @@ -2,11 +2,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "twilio-cli"; - version = "5.4.2"; + version = "5.5.0"; src = fetchzip { url = "https://twilio-cli-prod.s3.amazonaws.com/twilio-v${finalAttrs.version}/twilio-v${finalAttrs.version}.tar.gz"; - sha256 = "sha256-Zrn+4/zeqJXkKOSsbpPR2bO+ilApn8JUVAgqWydv/Is="; + sha256 = "sha256-ZY0AiT1hrxsBXnIkBcoB5d2s8Cc/N7qmVGjuYm2DvOM="; }; buildInputs = [ nodejs ]; From bb270775f2dc80e6fba3984d641415adbe58393b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 25 Mar 2023 01:00:12 +0000 Subject: [PATCH 16/94] cvc5: 1.0.4 -> 1.0.5 --- pkgs/applications/science/logic/cvc5/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/logic/cvc5/default.nix b/pkgs/applications/science/logic/cvc5/default.nix index f0cb044b3beb..23310163f279 100644 --- a/pkgs/applications/science/logic/cvc5/default.nix +++ b/pkgs/applications/science/logic/cvc5/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "cvc5"; - version = "1.0.4"; + version = "1.0.5"; src = fetchFromGitHub { owner = "cvc5"; repo = "cvc5"; rev = "cvc5-${version}"; - hash = "sha256-1yJZtPZ4nMg9Kn3jHpN8b5XeFZ8ZeVLrKYWh7Rp3/oQ="; + hash = "sha256-l+L59QLLrAEVkAZjhxICJpa+j+jr1k/7B61JlapXGRI="; }; nativeBuildInputs = [ pkg-config cmake flex ]; From 6e65c36d1bff6eca3005f123a34780267107783a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 25 Mar 2023 01:33:00 +0000 Subject: [PATCH 17/94] python310Packages.azure-mgmt-monitor: 5.0.1 -> 6.0.0 --- .../development/python-modules/azure-mgmt-monitor/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/azure-mgmt-monitor/default.nix b/pkgs/development/python-modules/azure-mgmt-monitor/default.nix index 20d72093dcd3..c68a73d98a33 100644 --- a/pkgs/development/python-modules/azure-mgmt-monitor/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-monitor/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "azure-mgmt-monitor"; - version = "5.0.1"; + version = "6.0.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; extension = "zip"; - hash = "sha256-U5OSFnOZV7/eXUEDU1TQBywrXjxwQ8qiEQJVFd3y57Q="; + hash = "sha256-Uhs+wz3sB5mOt1LGJCqzhMT5YWwwMnpmVi4WvXHBfZY="; }; propagatedBuildInputs = [ From 231ecef5a919284dacdaf1b57dfbe3ce8e4a045b Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 25 Mar 2023 04:20:00 +0000 Subject: [PATCH 18/94] twilio-cli: fix tests.version --- pkgs/development/tools/twilio-cli/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/development/tools/twilio-cli/default.nix b/pkgs/development/tools/twilio-cli/default.nix index e1671f6ed3de..f862215ba48d 100644 --- a/pkgs/development/tools/twilio-cli/default.nix +++ b/pkgs/development/tools/twilio-cli/default.nix @@ -21,9 +21,8 @@ stdenvNoCC.mkDerivation (finalAttrs: { runHook postInstall ''; - passthru.tests = testers.testVersion { + passthru.tests.version = testers.testVersion { package = finalAttrs.finalPackage; - command = "twilio version"; }; meta = with lib; { From 4d164b7d1c7a3490cc9e7d574572fb2bf5107f81 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 25 Mar 2023 04:20:00 +0000 Subject: [PATCH 19/94] python310Packages.myst-nb: fix build Relax dependency on myst-parser --- pkgs/development/python-modules/myst-nb/default.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/myst-nb/default.nix b/pkgs/development/python-modules/myst-nb/default.nix index 4beda44ad340..871c882e5572 100644 --- a/pkgs/development/python-modules/myst-nb/default.nix +++ b/pkgs/development/python-modules/myst-nb/default.nix @@ -14,6 +14,7 @@ , sphinx-togglebutton , typing-extensions , ipykernel +, pythonRelaxDepsHook }: buildPythonPackage rec { @@ -29,7 +30,10 @@ buildPythonPackage rec { hash = "sha256-FN9yXz4Ay17+9PhjvwwnNJDIxmLf7jntins3S/JWGTM="; }; - nativeBuildInputs = [ flit-core ]; + nativeBuildInputs = [ + flit-core + pythonRelaxDepsHook + ]; propagatedBuildInputs = [ importlib-metadata @@ -45,6 +49,10 @@ buildPythonPackage rec { ipykernel ]; + pythonRelaxDeps = [ + "myst-parser" + ]; + pythonImportsCheck = [ "myst_nb" ]; meta = with lib; { From d4f55d1005d782a8c174da2f2c084e55266f59d0 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 25 Mar 2023 04:20:00 +0000 Subject: [PATCH 20/94] twilio-cli: changelog url --- pkgs/development/tools/twilio-cli/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/twilio-cli/default.nix b/pkgs/development/tools/twilio-cli/default.nix index f862215ba48d..b4f5b5f1604d 100644 --- a/pkgs/development/tools/twilio-cli/default.nix +++ b/pkgs/development/tools/twilio-cli/default.nix @@ -28,7 +28,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { meta = with lib; { description = "Unleash the power of Twilio from your command prompt"; homepage = "https://github.com/twilio/twilio-cli"; - changelog = "https://github.com/twilio/twilio-cli/blob/${version}/CHANGES.md"; + changelog = "https://github.com/twilio/twilio-cli/blob/${finalAttrs.version}/CHANGES.md"; license = licenses.mit; maintainers = with maintainers; [ marsam ]; platforms = nodejs.meta.platforms; From 1c313584cc51607840d5e54d4a51bd0a266049f1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 25 Mar 2023 04:21:20 +0000 Subject: [PATCH 21/94] katana: 0.0.3 -> 1.0.0 --- pkgs/tools/security/katana/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/katana/default.nix b/pkgs/tools/security/katana/default.nix index bd5947b689f5..cd0a479869f3 100644 --- a/pkgs/tools/security/katana/default.nix +++ b/pkgs/tools/security/katana/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "katana"; - version = "0.0.3"; + version = "1.0.0"; src = fetchFromGitHub { owner = "projectdiscovery"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Ax99pmoxlyUGLN2OdIItTNTnO/fDquvNadNnNG6ElEk="; + sha256 = "sha256-OSvkQIpZEMav1dh3DDTqFxoFbc6sWOjhslqVJcUS104="; }; - vendorHash = "sha256-IJcMIJF2A5DfyBdcIXTbeX72Q/4SAVZ0U3UIQ2H0fEc="; + vendorHash = "sha256-u/3MMuq2Zab6k+vPQ0iKQf8k9zMV2aIgIsTee0VUQaI="; CGO_ENABLED = 0; From f7c66bf8eaf6b754b64acf68d405984aa28f72d4 Mon Sep 17 00:00:00 2001 From: l33 Date: Fri, 24 Mar 2023 22:34:40 -0700 Subject: [PATCH 22/94] xgalagapp: init at 0.9 --- pkgs/games/xgalaga++/default.nix | 37 ++++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 39 insertions(+) create mode 100644 pkgs/games/xgalaga++/default.nix diff --git a/pkgs/games/xgalaga++/default.nix b/pkgs/games/xgalaga++/default.nix new file mode 100644 index 000000000000..ba78e2864414 --- /dev/null +++ b/pkgs/games/xgalaga++/default.nix @@ -0,0 +1,37 @@ +{ lib +, stdenv +, fetchurl +, libX11 +, libXpm +}: + +stdenv.mkDerivation rec { + pname = "xgalaga++"; + version = "0.9"; + src = fetchurl { + url = "https://marc.mongenet.ch/OSS/XGalaga/xgalaga++_${version}.tar.gz"; + sha256 = "sha256-yNtLuYCMHLvQAVM7CDGPardrh3q27TE9l31qhUbMf8k="; + }; + + buildInputs = [ + libX11 + libXpm + ]; + + buildPhase = '' + make all HIGH_SCORES_FILE=.xgalaga++.scores + ''; + + installPhase = '' + mkdir -p $out/bin $out/share/man + mv xgalaga++ $out/bin + mv xgalaga++.6x $out/share/man + ''; + + meta = with lib; { + homepage = "https://marc.mongenet.ch/OSS/XGalaga/"; + description = "XGalaga++ is a classic single screen vertical shoot ’em up. It is inspired by XGalaga and reuses most of its sprites."; + license = licenses.gpl2Plus; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 83fd17549fa4..1451b26edef1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -35791,6 +35791,8 @@ with pkgs; xcowsay = callPackage ../games/xcowsay { }; + xgalagapp = callPackage ../games/xgalaga++ { }; + xjump = callPackage ../games/xjump { }; xmoto = callPackage ../games/xmoto { }; From dd557d36371e7b1d719f72ad25c825a517a4f484 Mon Sep 17 00:00:00 2001 From: Moritz 'e1mo' Fromm Date: Sat, 25 Mar 2023 12:36:28 +0100 Subject: [PATCH 23/94] ack: 3.6.0 -> 3.7.0 --- pkgs/top-level/perl-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index f7b557f092b2..02c8bd8d2485 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -92,11 +92,11 @@ let ack = buildPerlPackage rec { pname = "ack"; - version = "3.6.0"; + version = "3.7.0"; src = fetchurl { url = "mirror://cpan/authors/id/P/PE/PETDANCE/ack-v${version}.tar.gz"; - hash = "sha256-AxRNEHBknpL2obfSC9xTXiuxrCWNqr5ILpqoJ3tI8AU="; + hash = "sha256-6nyqFPdX3ggzEO0suimGYd3Mpd7gbsjxgEPqYlp53yA="; }; outputs = ["out" "man"]; From d752b1a8c5bc0e3e5ef8926d4765c9f22a5c067c Mon Sep 17 00:00:00 2001 From: Moritz 'e1mo' Fromm Date: Sat, 25 Mar 2023 12:57:27 +0100 Subject: [PATCH 24/94] alacritty: 0.11.0 -> 0.12.0 --- pkgs/applications/terminal-emulators/alacritty/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/terminal-emulators/alacritty/default.nix b/pkgs/applications/terminal-emulators/alacritty/default.nix index db5b58132f28..ae1bc591989d 100644 --- a/pkgs/applications/terminal-emulators/alacritty/default.nix +++ b/pkgs/applications/terminal-emulators/alacritty/default.nix @@ -49,16 +49,16 @@ let in rustPlatform.buildRustPackage rec { pname = "alacritty"; - version = "0.11.0"; + version = "0.12.0"; src = fetchFromGitHub { owner = "alacritty"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-2jNE0UdPXfOyAfPPVKhdBpuVVw4IpwWQ+RLQlJNnK0Y="; + hash = "sha256-2MiFsOZpAlDVC4h3m3HHlMr2ytL/z47vrTwUMoHdegI="; }; - cargoSha256 = "sha256-t6ckX0PYI8UHfXhGRpcX8ly3DzE9A6i9P6f3Ny3DBzw="; + cargoSha256 = "sha256-4liPfNJ2JGniz8Os4Np+XSXCJBHND13XLPWDy3Gc/F8="; auditable = true; # TODO: remove when this is the default From ddfbf234cede27e482894c7b202fd0d95393081f Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 25 Mar 2023 23:59:46 +0100 Subject: [PATCH 25/94] fizz: 2023.03.06.00 -> 2023.03.20.00 Diff: https://github.com/facebookincubator/fizz/compare/refs/tags/v2023.03.06.00...v2023.03.20.00 --- pkgs/development/libraries/fizz/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/fizz/default.nix b/pkgs/development/libraries/fizz/default.nix index c933dc35f218..4c44d690cfc7 100644 --- a/pkgs/development/libraries/fizz/default.nix +++ b/pkgs/development/libraries/fizz/default.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation rec { pname = "fizz"; - version = "2023.03.06.00"; + version = "2023.03.20.00"; src = fetchFromGitHub { owner = "facebookincubator"; repo = "fizz"; rev = "refs/tags/v${version}"; - hash = "sha256-zb3O5YHQc+1cPcL0K3FwhMfr+/KFQU7SDVT1bEITF6E="; + hash = "sha256-oBdTj7IPlmtF5rEgDVN/wwa0ZxkN6h2QMN3PQB0nCgQ="; }; nativeBuildInputs = [ cmake ]; From c6de147d1325d55ba2ed39ad557b85f4afd51d0a Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 26 Mar 2023 00:05:23 +0100 Subject: [PATCH 26/94] fizz: add changelog to meta --- pkgs/development/libraries/fizz/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/fizz/default.nix b/pkgs/development/libraries/fizz/default.nix index 4c44d690cfc7..bdf7a68ffbe3 100644 --- a/pkgs/development/libraries/fizz/default.nix +++ b/pkgs/development/libraries/fizz/default.nix @@ -58,6 +58,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "C++14 implementation of the TLS-1.3 standard"; homepage = "https://github.com/facebookincubator/fizz"; + changelog = "https://github.com/facebookincubator/fizz/releases/tag/v${version}"; license = licenses.bsd3; platforms = platforms.unix; maintainers = with maintainers; [ pierreis kylesferrazza ]; From c62b815bc4ae6937e13bfee4399e3af6aacd4b6d Mon Sep 17 00:00:00 2001 From: Bernardo Meurer Date: Sat, 25 Mar 2023 20:25:52 -0300 Subject: [PATCH 27/94] adw-gtk3: support all unix platforms --- pkgs/data/themes/adw-gtk3/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/data/themes/adw-gtk3/default.nix b/pkgs/data/themes/adw-gtk3/default.nix index 0685e5d5b6a0..25a6524dc0b3 100644 --- a/pkgs/data/themes/adw-gtk3/default.nix +++ b/pkgs/data/themes/adw-gtk3/default.nix @@ -37,7 +37,7 @@ stdenvNoCC.mkDerivation rec { description = "The theme from libadwaita ported to GTK-3"; homepage = "https://github.com/lassekongo83/adw-gtk3"; license = licenses.lgpl21Only; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = with maintainers; [ ciferkey ]; }; } From 11b3e643de14be40a6a8cf07281e77424acc734b Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Sun, 26 Mar 2023 10:53:36 +0800 Subject: [PATCH 28/94] xfce.xfce4-clipman-plugin: 1.6.2 -> 1.6.3 https://gitlab.xfce.org/panel-plugins/xfce4-clipman-plugin/-/compare/xfce4-clipman-plugin-1.6.2...xfce4-clipman-plugin-1.6.3 --- .../xfce/panel-plugins/xfce4-clipman-plugin/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-clipman-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-clipman-plugin/default.nix index 0fd84aaba748..f86ab85f9ad7 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-clipman-plugin/default.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-clipman-plugin/default.nix @@ -3,8 +3,8 @@ mkXfceDerivation { category = "panel-plugins"; pname = "xfce4-clipman-plugin"; - version = "1.6.2"; - sha256 = "sha256-RpFVJSq/DxyA5ne1h+Nr3xfL+DTzg1cTqIDVOPC/pF4="; + version = "1.6.3"; + sha256 = "sha256-tnpQRYLV48NxKsWDjVSmypx6X1bVbx2U5Q8kQaP0AW8="; buildInputs = [ libXtst libxfce4ui xfce4-panel xfconf ]; From 0ca43a611317b73f54e6436b27dd6930f85af5ca Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sun, 26 Mar 2023 04:20:00 +0000 Subject: [PATCH 29/94] rbw: 1.6.0 -> 1.7.0 --- pkgs/tools/security/rbw/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/rbw/default.nix b/pkgs/tools/security/rbw/default.nix index 50b1361eee80..7b6344d710c1 100644 --- a/pkgs/tools/security/rbw/default.nix +++ b/pkgs/tools/security/rbw/default.nix @@ -24,14 +24,14 @@ rustPlatform.buildRustPackage rec { pname = "rbw"; - version = "1.6.0"; + version = "1.7.0"; src = fetchzip { url = "https://git.tozt.net/rbw/snapshot/rbw-${version}.tar.gz"; - sha256 = "sha256-f8ckTYfmwHt3g3n/D2U275G1nn7uG+2W+DIi6YmsvjQ="; + sha256 = "sha256-8qNC6eB6RLrHAf2IFMLl6IHA0Akbn68eQF7P+Vo0nxU="; }; - cargoHash = "sha256-EVEl1hhaeYBXIMQTgl0tDIbhE3cUm8jiyDTeWtsNaq0="; + cargoHash = "sha256-2O3o4VAKDrkhbPeFWNFGLr8oIM1oaFlFkbTYv8tGMgM="; nativeBuildInputs = [ installShellFiles From c3966c2d35b14e4ed90723724f986183ba9c68ee Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 26 Mar 2023 04:44:09 +0000 Subject: [PATCH 30/94] freedv: 1.8.7 -> 1.8.8 --- pkgs/applications/radio/freedv/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/radio/freedv/default.nix b/pkgs/applications/radio/freedv/default.nix index 605a916c6b4d..2826035685a8 100644 --- a/pkgs/applications/radio/freedv/default.nix +++ b/pkgs/applications/radio/freedv/default.nix @@ -24,13 +24,13 @@ stdenv.mkDerivation rec { pname = "freedv"; - version = "1.8.7"; + version = "1.8.8"; src = fetchFromGitHub { owner = "drowe67"; repo = "freedv-gui"; rev = "v${version}"; - hash = "sha256-N9LZCf2YAhVgxnQWgCB9TqGNpUGP1ZqpLmbYIaQsn08="; + hash = "sha256-rXiNhk+6eeYF5w/8jSJaEaLEgRYngqTV/wLkMvg6qOQ="; }; postPatch = lib.optionalString stdenv.isDarwin '' From 1c41583945c03f0d5d2bf0919dc802c628754274 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Sun, 26 Mar 2023 14:38:36 +0800 Subject: [PATCH 31/94] vala-language-server: 0.48.5 -> 0.48.7 https://github.com/vala-lang/vala-language-server/compare/0.48.5...0.48.7 --- .../vala-language-server/default.nix | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/pkgs/development/tools/language-servers/vala-language-server/default.nix b/pkgs/development/tools/language-servers/vala-language-server/default.nix index 71fa107afc56..40710ad83da3 100644 --- a/pkgs/development/tools/language-servers/vala-language-server/default.nix +++ b/pkgs/development/tools/language-servers/vala-language-server/default.nix @@ -1,7 +1,6 @@ { stdenv , lib , fetchFromGitHub -, fetchpatch , nix-update-script , meson , ninja @@ -17,24 +16,15 @@ stdenv.mkDerivation rec { pname = "vala-language-server"; - version = "0.48.5"; + version = "0.48.7"; src = fetchFromGitHub { owner = "vala-lang"; repo = pname; rev = version; - sha256 = "sha256-gntGnz8uqGz2EGwWWyty/N1ImaUKAPtXVZcjgp73SQM="; + sha256 = "sha256-Vl5DjKBdpk03aPD+0xGoTwD9Slg1rREorqZGX5o10cY="; }; - patches = [ - # Fix regex for links in comments - # https://github.com/vala-lang/vala-language-server/pull/268 - (fetchpatch { - url = "https://github.com/vala-lang/vala-language-server/commit/b6193265d68b90755d57938c2ba1895841cf4b36.patch"; - sha256 = "sha256-nWG+xQAPDVBXamuKQymvn/FBHEP7Ta9p/vhYjxxBGzI="; - }) - ]; - passthru = { updateScript = nix-update-script { }; }; From 155af54567c48d09843b7816696fd496a3ddd6b0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 26 Mar 2023 08:34:17 +0000 Subject: [PATCH 32/94] gitmux: 0.9.1 -> 0.10.1 --- pkgs/applications/version-management/gitmux/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/gitmux/default.nix b/pkgs/applications/version-management/gitmux/default.nix index 2b25c5e52775..aab3add26d6c 100644 --- a/pkgs/applications/version-management/gitmux/default.nix +++ b/pkgs/applications/version-management/gitmux/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "gitmux"; - version = "0.9.1"; + version = "0.10.1"; src = fetchFromGitHub { owner = "arl"; repo = pname; rev = "v${version}"; - sha256 = "sha256-QbQykbZo8fMyCMd0MF7CGrPFECN0ehcTGGLeQXbnlxw="; + sha256 = "sha256-4QsmBhYIA2GpdEhyXsx2eyH7ObuGZTf2Hlsyd+Ntlj4="; }; vendorHash = "sha256-talZSkf8lQXwXKdkQliHFv2K+42BFtcg13oB5Szkff0="; From e664468e773316a10eaa36a1b9fd8c89cae014ef Mon Sep 17 00:00:00 2001 From: toastal Date: Sun, 26 Mar 2023 16:19:11 +0700 Subject: [PATCH 33/94] =?UTF-8?q?prosody:=200.12.1=20=E2=86=92=200.12.3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 0.12.1 Released: 2022-06-09 0.12.3 Released: 2023-02-21 --- pkgs/servers/xmpp/prosody/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/xmpp/prosody/default.nix b/pkgs/servers/xmpp/prosody/default.nix index 22884d6d70c1..cabe91300abe 100644 --- a/pkgs/servers/xmpp/prosody/default.nix +++ b/pkgs/servers/xmpp/prosody/default.nix @@ -22,7 +22,7 @@ let ); in stdenv.mkDerivation rec { - version = "0.12.1"; # also update communityModules + version = "0.12.3"; # also update communityModules pname = "prosody"; # The following community modules are necessary for the nixos module # prosody module to comply with XEP-0423 and provide a working @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { ]; src = fetchurl { url = "https://prosody.im/downloads/source/${pname}-${version}.tar.gz"; - sha256 = "sha256-p+y75B8BpCUYBVk6xtFdvGy3XZx6h2x2tFbPdP9LkOU="; + sha256 = "sha256-NdoNAx/0YECi1jjgBNQlXiSbYyP+YhLbnd12tAHbIQE="; }; # A note to all those merging automated updates: Please also update this @@ -42,8 +42,8 @@ stdenv.mkDerivation rec { # version. communityModules = fetchhg { url = "https://hg.prosody.im/prosody-modules"; - rev = "cce12a660b98"; - sha256 = "sha256-dFWS1EFd2wtFnnuU4xKPnBisIdKkgMAvBtsfAEbdLjE="; + rev = "3e30799deec2"; + sha256 = "sha256-oaWs2D5z1LtvhtZMlaZPLNoNNL/1TIZLZwFfC3vtRUo="; }; nativeBuildInputs = [ makeWrapper ]; From 8f1b37050f0c0bbbb73b96f9b5dcfc07c8dd060c Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 26 Mar 2023 11:54:21 +0200 Subject: [PATCH 34/94] qovery-cli: 0.53.1 -> 0.54.0 Diff: https://github.com/Qovery/qovery-cli/compare/v0.53.1...v0.54.0 Changelog: https://github.com/Qovery/qovery-cli/releases/tag/v0.54.0 --- pkgs/tools/admin/qovery-cli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/admin/qovery-cli/default.nix b/pkgs/tools/admin/qovery-cli/default.nix index cedb6133f13d..836c1068531e 100644 --- a/pkgs/tools/admin/qovery-cli/default.nix +++ b/pkgs/tools/admin/qovery-cli/default.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "qovery-cli"; - version = "0.53.1"; + version = "0.54.0"; src = fetchFromGitHub { owner = "Qovery"; repo = pname; rev = "v${version}"; - hash = "sha256-vxCDb4qiq7/19wvtWQRCzGxUz+FvWyeKSQIpsiUtwGs="; + hash = "sha256-XphLzYdZg+aSk7fgDz61ADxb+sgsck6TuZ1++PGu/dE="; }; vendorHash = "sha256-V7yPXSN+3H8NkD384MkvKbymNQ/O2Q9HoMO4M8mzVto="; From 53afe093767f53784c3da35cc3711778851b4835 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 26 Mar 2023 11:58:54 +0200 Subject: [PATCH 35/94] python310Packages.teslajsonpy: 3.7.5 -> 3.8.0 Diff: https://github.com/zabuldon/teslajsonpy/compare/refs/tags/v3.7.5...v3.8.0 Changelog: https://github.com/zabuldon/teslajsonpy/releases/tag/v3.8.0 --- pkgs/development/python-modules/teslajsonpy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/teslajsonpy/default.nix b/pkgs/development/python-modules/teslajsonpy/default.nix index fda171a9bd87..aa4f022562d2 100644 --- a/pkgs/development/python-modules/teslajsonpy/default.nix +++ b/pkgs/development/python-modules/teslajsonpy/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "teslajsonpy"; - version = "3.7.5"; + version = "3.8.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "zabuldon"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-MOFC8jMJsBernY1/aFobgBNsnt7MYjSUPVoum0e4hUg="; + hash = "sha256-JKKHLg99hl2XnqRfBCT0t9QyQEY1YEwBsKb3pB5CNRA="; }; nativeBuildInputs = [ From 9022b97ed5c935db7dbba4a8a7c30d750f69f5d3 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 26 Mar 2023 12:15:20 +0200 Subject: [PATCH 36/94] python310Packages.yalexs-ble: 2.1.4 -> 2.1.6 Diff: https://github.com/bdraco/yalexs-ble/compare/refs/tags/v2.1.4...v2.1.6 Changelog: https://github.com/bdraco/yalexs-ble/blob/v2.1.6/CHANGELOG.md --- pkgs/development/python-modules/yalexs-ble/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/yalexs-ble/default.nix b/pkgs/development/python-modules/yalexs-ble/default.nix index a83c06b13af2..510e75a25a3a 100644 --- a/pkgs/development/python-modules/yalexs-ble/default.nix +++ b/pkgs/development/python-modules/yalexs-ble/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "yalexs-ble"; - version = "2.1.4"; + version = "2.1.6"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "bdraco"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-FvZ0U8aZNnGehDMt3+LWLYKU/CSPpifWE7STZkA+0iA="; + hash = "sha256-RNoh7Uo7I5kMveX74Gt8r9Mse6qdYOqc/UKrEfuNm18="; }; nativeBuildInputs = [ From 6198b30952bb68899ba0f5ada3d2cbe3990177b0 Mon Sep 17 00:00:00 2001 From: rewine Date: Sun, 26 Mar 2023 19:02:30 +0800 Subject: [PATCH 37/94] srain: 1.5.0 -> 1.5.1 --- pkgs/applications/networking/irc/srain/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/irc/srain/default.nix b/pkgs/applications/networking/irc/srain/default.nix index d17fcb07a03b..2a9ac4b0cdab 100644 --- a/pkgs/applications/networking/irc/srain/default.nix +++ b/pkgs/applications/networking/irc/srain/default.nix @@ -20,13 +20,13 @@ stdenv.mkDerivation rec { pname = "srain"; - version = "1.5.0"; + version = "1.5.1"; src = fetchFromGitHub { owner = "SrainApp"; repo = "srain"; rev = version; - sha256 = "sha256-AJ02S5+A/n8kO6lic8EbPYqNDmHL/tKbXhIkHTrcXOM="; + sha256 = "sha256-PiLjlsYmgxXpvcqDkwS/6WmTEimMH8+OndUG2Hehdm0="; }; nativeBuildInputs = [ From 70a99e3b793c4908e95143e0913f8ef4fad830e4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 26 Mar 2023 11:24:38 +0000 Subject: [PATCH 38/94] fcitx5-gtk: 5.0.22 -> 5.0.23 --- pkgs/tools/inputmethods/fcitx5/fcitx5-gtk.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-gtk.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-gtk.nix index cd9f75cc8a1b..09a5362ae400 100644 --- a/pkgs/tools/inputmethods/fcitx5/fcitx5-gtk.nix +++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-gtk.nix @@ -26,13 +26,13 @@ stdenv.mkDerivation rec { pname = "fcitx5-gtk"; - version = "5.0.22"; + version = "5.0.23"; src = fetchFromGitHub { owner = "fcitx"; repo = pname; rev = version; - sha256 = "sha256-x7KPhXiKy+KQsukIYJWg3k2Wj8tXfUu9jkkwa8vM1WA="; + sha256 = "sha256-RMi2D9uqGmvyDIB7eRbr52aahCJ5u21jCyZ9hbCDdKY="; }; cmakeFlags = [ From 501da627577660f187caab5c1025a9938aa17a51 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 26 Mar 2023 12:10:15 +0000 Subject: [PATCH 39/94] sonixd: 0.15.4 -> 0.15.5 --- pkgs/applications/audio/sonixd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/sonixd/default.nix b/pkgs/applications/audio/sonixd/default.nix index 1ec2fa77393c..d13c398eabd8 100644 --- a/pkgs/applications/audio/sonixd/default.nix +++ b/pkgs/applications/audio/sonixd/default.nix @@ -5,10 +5,10 @@ let pname = "sonixd"; - version = "0.15.4"; + version = "0.15.5"; src = fetchurl { url = "https://github.com/jeffvli/sonixd/releases/download/v${version}/Sonixd-${version}-linux-x86_64.AppImage"; - sha256 = "sha256-n4n16S8ktPiVc0iyjVNNIyo9oEIBwGIuzj0xgm/ETeo="; + sha256 = "sha256-j8B+o/CJ5SsZPMNbugyP3T9Kb+xuxlVxH02loxlwwDg="; }; appimageContents = appimageTools.extractType2 { inherit pname version src; }; in From a2cb09e3047759070fc29c1abd70d3b8cc35ef91 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 26 Mar 2023 16:50:10 +0200 Subject: [PATCH 40/94] katana: add changelog to meta --- pkgs/tools/security/katana/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/katana/default.nix b/pkgs/tools/security/katana/default.nix index cd0a479869f3..0e248cfb2b25 100644 --- a/pkgs/tools/security/katana/default.nix +++ b/pkgs/tools/security/katana/default.nix @@ -10,8 +10,8 @@ buildGoModule rec { src = fetchFromGitHub { owner = "projectdiscovery"; repo = pname; - rev = "v${version}"; - sha256 = "sha256-OSvkQIpZEMav1dh3DDTqFxoFbc6sWOjhslqVJcUS104="; + rev = "refs/tags/v${version}"; + hash = "sha256-OSvkQIpZEMav1dh3DDTqFxoFbc6sWOjhslqVJcUS104="; }; vendorHash = "sha256-u/3MMuq2Zab6k+vPQ0iKQf8k9zMV2aIgIsTee0VUQaI="; @@ -23,6 +23,7 @@ buildGoModule rec { meta = with lib; { description = "A next-generation crawling and spidering framework"; homepage = "https://github.com/projectdiscovery/katana"; + changelog = "https://github.com/projectdiscovery/katana/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ dit7ya ]; }; From 877f8b10c20350ab88a3256ef519a2a708bc5e78 Mon Sep 17 00:00:00 2001 From: stepech <29132060+stepech@users.noreply.github.com> Date: Mon, 13 Mar 2023 19:48:51 +0100 Subject: [PATCH 41/94] burpsuite: 2023.1.2 -> 2023.2.4 https://portswigger.net/burp/releases/professional-community-2023-2-4 --- pkgs/tools/networking/burpsuite/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/burpsuite/default.nix b/pkgs/tools/networking/burpsuite/default.nix index 5d8ab54b1624..72591f74d87d 100644 --- a/pkgs/tools/networking/burpsuite/default.nix +++ b/pkgs/tools/networking/burpsuite/default.nix @@ -1,6 +1,6 @@ { lib, fetchurl, jdk, buildFHSUserEnv, unzip, makeDesktopItem }: let - version = "2023.1.2"; + version = "2023.2.4"; src = fetchurl { name = "burpsuite.jar"; @@ -8,7 +8,7 @@ let "https://portswigger.net/burp/releases/download?productId=100&version=${version}&type=Jar" "https://web.archive.org/web/https://portswigger.net/burp/releases/download?productId=100&version=${version}&type=Jar" ]; - sha256 = "620829b1a7bf9228e8671273d2f56f6dee4f16662712bcb4370923cb9d9a7540"; + sha256 = "4e9cd298a03af8684306ca2dfe52e630f032c1df7ca8baecbd329c792137052f"; }; name = "burpsuite-${version}"; From ef989867aeb6acd08dcd40c132d33f80ce088a3d Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 26 Mar 2023 17:02:26 +0200 Subject: [PATCH 42/94] exploitdb: 2023-03-25 -> 2023-03-26 Diff: https://gitlab.com/exploit-database/exploitdb/-/compare/refs/tags/2023-03-25...2023-03-26 --- pkgs/tools/security/exploitdb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/exploitdb/default.nix b/pkgs/tools/security/exploitdb/default.nix index b23e8ebe54a3..42bb124c4961 100644 --- a/pkgs/tools/security/exploitdb/default.nix +++ b/pkgs/tools/security/exploitdb/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "exploitdb"; - version = "2023-03-25"; + version = "2023-03-26"; src = fetchFromGitLab { owner = "exploit-database"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-pmhjSZMnTJn0MDKsCk799DrHBDqvUw8M9wxBx65W9pQ="; + hash = "sha256-oUoQNjg14rAs8BAxTOLtYHw9iTwEAsLymObog+GrQw8="; }; nativeBuildInputs = [ From 4bd4a8d462132e38417d2aaf9a1f98c2d1babd51 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 26 Mar 2023 17:10:02 +0200 Subject: [PATCH 43/94] python310Packages.lightwave2: 0.8.21 -> 0.8.22 --- pkgs/development/python-modules/lightwave2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/lightwave2/default.nix b/pkgs/development/python-modules/lightwave2/default.nix index 07f23d4312ed..3fa6b9b6732e 100644 --- a/pkgs/development/python-modules/lightwave2/default.nix +++ b/pkgs/development/python-modules/lightwave2/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "lightwave2"; - version = "0.8.21"; + version = "0.8.22"; format = "setuptools"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-Zgsgt78ll/5NVSca4lnxXYkiw5FE2WgcO10o/IZaHgQ="; + hash = "sha256-YrvRlSogw9YSuOvm4PfjrKGvgiBqdXAO9CKqGcBBH0g="; }; propagatedBuildInputs = [ From 169ea3800c8eb086439d95150aa50c2b43663e78 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 26 Mar 2023 17:25:05 +0200 Subject: [PATCH 44/94] python310Packages.zwave-me-ws: 0.3.1 -> 0.3.6 Diff: https://github.com/Z-Wave-Me/zwave-me-ws/compare/refs/tags/v0.3.1...v0.3.6 Changelog: https://github.com/Z-Wave-Me/zwave-me-ws/releases/tag/v0.3.6 --- .../python-modules/zwave-me-ws/default.nix | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/pkgs/development/python-modules/zwave-me-ws/default.nix b/pkgs/development/python-modules/zwave-me-ws/default.nix index f478bf1788a5..20f4379ddd6d 100644 --- a/pkgs/development/python-modules/zwave-me-ws/default.nix +++ b/pkgs/development/python-modules/zwave-me-ws/default.nix @@ -1,22 +1,15 @@ { lib -, aiohttp -, aresponses -, asynctest , buildPythonPackage , fetchFromGitHub , poetry-core -, pytest-aiohttp -, pytest-asyncio -, pytestCheckHook -, python-engineio -, python-socketio , pythonOlder +, requests , websocket-client }: buildPythonPackage rec { pname = "zwave-me-ws"; - version = "0.3.1"; + version = "0.3.6"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -25,7 +18,7 @@ buildPythonPackage rec { owner = "Z-Wave-Me"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-DfQh9wuYx/gCyW3ONk8wwDOgbp8Pifx3nwDgS5NZFhI="; + hash = "sha256-d/Y2rZArBywTQE1vsE/B5bEPb48kcEqhDP/xfxJBzJs="; }; nativeBuildInputs = [ @@ -33,6 +26,7 @@ buildPythonPackage rec { ]; propagatedBuildInputs = [ + requests websocket-client ]; From 230d506073fffd12051fc30c184fb5dd6f2a1864 Mon Sep 17 00:00:00 2001 From: stuebinm Date: Sun, 26 Mar 2023 17:25:12 +0200 Subject: [PATCH 45/94] netbox: workaround to allow python packageOverrides see https://github.com/NixOS/nixpkgs/issues/44426 ("Python's packageOverrides isn't composable") for why this is a useful thing to do. --- pkgs/servers/web-apps/netbox/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/web-apps/netbox/default.nix b/pkgs/servers/web-apps/netbox/default.nix index a30ceae72273..aeeb57fa3792 100644 --- a/pkgs/servers/web-apps/netbox/default.nix +++ b/pkgs/servers/web-apps/netbox/default.nix @@ -8,10 +8,10 @@ , plugins ? ps: [] }: let - py = python3.override { - packageOverrides = self: super: { + py = python3 // { + pkgs = python3.pkgs.overrideScope (self: super: { django = super.django_4; - }; + }); }; extraBuildInputs = plugins py.pkgs; From ea5208f0e5fdf1b0343a207847e27fb37b62af92 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 26 Mar 2023 17:36:19 +0200 Subject: [PATCH 46/94] python310Packages.zha-quirks: remove asynctest --- pkgs/development/python-modules/zha-quirks/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/development/python-modules/zha-quirks/default.nix b/pkgs/development/python-modules/zha-quirks/default.nix index 98b51b21f8a3..997548cc3caa 100644 --- a/pkgs/development/python-modules/zha-quirks/default.nix +++ b/pkgs/development/python-modules/zha-quirks/default.nix @@ -1,6 +1,5 @@ { lib , aiohttp -, asynctest , buildPythonPackage , fetchFromGitHub , pytestCheckHook @@ -28,7 +27,6 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ - asynctest pytestCheckHook ]; From 761552c4c30d714cec66422eaf032df025ddc6f9 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sun, 26 Mar 2023 15:07:24 +0200 Subject: [PATCH 47/94] prometheus-postgres-exporter: 0.11.1 -> 0.12.0 ChangeLog: https://github.com/prometheus-community/postgres_exporter/releases/tag/v0.12.0 --- pkgs/servers/monitoring/prometheus/postgres-exporter.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/monitoring/prometheus/postgres-exporter.nix b/pkgs/servers/monitoring/prometheus/postgres-exporter.nix index aeca7c90eb9a..528bd65e9161 100644 --- a/pkgs/servers/monitoring/prometheus/postgres-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/postgres-exporter.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "postgres_exporter"; - version = "0.11.1"; + version = "0.12.0"; src = fetchFromGitHub { owner = "prometheus-community"; repo = "postgres_exporter"; rev = "v${version}"; - sha256 = "sha256-Bi24tg/ukFLmSbhAY3gZqT7qc0xWwLlLQxGB6F+qiUQ="; + sha256 = "sha256-eY9/a+uFJJ8lT+0ZGa+ExjKf0V6JOqI3l1sZbfQEXOc="; }; - vendorSha256 = "sha256-ocapAJAQD84zISbTduAf3QyjaZ0UroNMdQig6IBNDpw="; + vendorSha256 = "sha256-sMWprCRUvF6voLM3GjTq9tId1GoCPac/RE6hXL+LBEE="; doCheck = true; From 83979742992859f01a78adc19ff47a4f1c4c6567 Mon Sep 17 00:00:00 2001 From: Sean Borg Date: Wed, 22 Feb 2023 19:12:44 +0000 Subject: [PATCH 48/94] hugin: add wrapGAppsHook Fixes no Gsettings error following https://github.com/NixOS/nixpkgs/issues/16285 --- pkgs/applications/graphics/hugin/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/graphics/hugin/default.nix b/pkgs/applications/graphics/hugin/default.nix index 204cfa387dd3..d5feb67f4b15 100644 --- a/pkgs/applications/graphics/hugin/default.nix +++ b/pkgs/applications/graphics/hugin/default.nix @@ -30,6 +30,7 @@ , perlPackages , sqlite , vigra +, wrapGAppsHook , wxGTK , zlib }: @@ -70,7 +71,7 @@ stdenv.mkDerivation rec { zlib ]; - nativeBuildInputs = [ cmake makeWrapper pkg-config ]; + nativeBuildInputs = [ cmake makeWrapper pkg-config wrapGAppsHook ]; # disable installation of the python scripting interface cmakeFlags = [ "-DBUILD_HSI:BOOl=OFF" ]; From c239772ef27312876e585f8610de52883886e2e2 Mon Sep 17 00:00:00 2001 From: figsoda Date: Sun, 26 Mar 2023 13:30:22 -0400 Subject: [PATCH 49/94] nerdfix: init at 0.1.0 --- pkgs/tools/text/nerdfix/default.nix | 26 ++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 28 insertions(+) create mode 100644 pkgs/tools/text/nerdfix/default.nix diff --git a/pkgs/tools/text/nerdfix/default.nix b/pkgs/tools/text/nerdfix/default.nix new file mode 100644 index 000000000000..2609ca84b763 --- /dev/null +++ b/pkgs/tools/text/nerdfix/default.nix @@ -0,0 +1,26 @@ +{ lib +, rustPlatform +, fetchFromGitHub +}: + +rustPlatform.buildRustPackage rec { + pname = "nerdfix"; + version = "0.1.0"; + + src = fetchFromGitHub { + owner = "loichyan"; + repo = "nerdfix"; + rev = "v${version}"; + hash = "sha256-p6SXdMniUoAUcX4xQYBJ0Yfs0N29wITO0d7GpxavQP0="; + }; + + cargoHash = "sha256-GMpl4Gw9sbS2WEbf435fipYTghmJ8VsayiWxH1PhxA0="; + + meta = with lib; { + description = "Nerdfix helps you to find/fix obsolete nerd font icons in your project"; + homepage = "https://github.com/loichyan/nerdfix"; + changelog = "https://github.com/loichyan/nerdfix/blob/${src.rev}/CHANGELOG.md"; + license = with licenses; [ asl20 mit ]; + maintainers = with maintainers; [ figsoda ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 489e3d50e00c..6177af7f1d68 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10128,6 +10128,8 @@ with pkgs; neofetch = callPackage ../tools/misc/neofetch { }; + nerdfix = callPackage ../tools/text/nerdfix { }; + nerdfonts = callPackage ../data/fonts/nerdfonts { }; netatalk = callPackage ../tools/filesystems/netatalk { }; From 5c7757b10b1347c23d141a5a0c5672a81f48fda7 Mon Sep 17 00:00:00 2001 From: figsoda Date: Sun, 26 Mar 2023 16:49:50 -0400 Subject: [PATCH 50/94] microbin: 1.1.0 -> 1.2.1, add figsoda as a maintainer Changelog: https://github.com/szabodanika/microbin/releases/tag/v1.2.1 --- pkgs/servers/microbin/default.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/servers/microbin/default.nix b/pkgs/servers/microbin/default.nix index 82e30b57c3c8..d1048d107e2e 100644 --- a/pkgs/servers/microbin/default.nix +++ b/pkgs/servers/microbin/default.nix @@ -5,20 +5,21 @@ rustPlatform.buildRustPackage rec { pname = "microbin"; - version = "1.1.0"; + version = "1.2.1"; - # GitHub sources do not have Cargo.lock + # The GitHub source is outdated src = fetchCrate { inherit pname version; - sha256 = "sha256-gfEO7Rrzc4KSnSXFrMmGLrTXuZIUCdumt2N429nHPi8="; + hash = "sha256-OLg0ejs9nanMNlY0lcnJ/RoRwefrXEaaROwx5aPx4u8="; }; - cargoSha256 = "sha256-k/5CG8bf5RuO6K9mEj6seqV6AuWMqatBRDaSS0guhi0="; + cargoHash = "sha256-XdHP0XruqtyLyGbLHielnmTAc3ZgeIyyZnknO+5k4Xo="; meta = with lib; { description = "A tiny, self-contained, configurable paste bin and URL shortener written in Rust"; homepage = "https://github.com/szabodanika/microbin"; + changelog = "https://github.com/szabodanika/microbin/releases/tag/v${version}"; license = licenses.bsd3; - maintainers = with maintainers; [ dit7ya ]; + maintainers = with maintainers; [ dit7ya figsoda ]; }; } From eb123f6e7c8860a30e9ef8ad88f4f3df264890ad Mon Sep 17 00:00:00 2001 From: figsoda Date: Sun, 26 Mar 2023 17:13:19 -0400 Subject: [PATCH 51/94] typst: 22-03-21-2 -> 23-03-21-2 --- pkgs/tools/typesetting/typst/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/typesetting/typst/default.nix b/pkgs/tools/typesetting/typst/default.nix index 783a2bf4eb51..0e4cdfcb9a30 100644 --- a/pkgs/tools/typesetting/typst/default.nix +++ b/pkgs/tools/typesetting/typst/default.nix @@ -7,12 +7,12 @@ rustPlatform.buildRustPackage rec { pname = "typst"; - version = "22-03-21-2"; + version = "23-03-21-2"; src = fetchFromGitHub { owner = "typst"; repo = "typst"; - rev = version; + rev = "v${version}"; hash = "sha256-bJPGs/Bd9nKYDrCCaFT+20+1wTN4YdkV8bGrtOCR4tM="; }; @@ -20,7 +20,7 @@ rustPlatform.buildRustPackage rec { lockFile = ./Cargo.lock; outputHashes = { "biblatex-0.6.3" = "sha256-TfH2tk7B61HHqpdGY48TdPKelp4+78x+8LRFobAg8QA="; - "comemo-macros-0.1.0" = "sha256-zg056kUc8sVLQ8vvT4uOuRJnyrCORsGYUvsjBJEkFPg="; + "comemo-0.1.0" = "sha256-zg056kUc8sVLQ8vvT4uOuRJnyrCORsGYUvsjBJEkFPg="; "hayagriva-0.1.1" = "sha256-HGQ+jNAnejxUBQNaqXPw57zfAC3qNXSWUVzDALZTXg0="; "iai-0.1.1" = "sha256-EdNzCPht5chg7uF9O8CtPWR/bzSYyfYIXNdLltqdlR0="; "lipsum-0.8.2" = "sha256-deIbpn4YM7/NeuJ5Co48ivJmxwrcsbLl6c3cP3JZxAQ="; From 82427c93fe40596a482a279d32529a5e2a8711c9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 26 Mar 2023 21:57:11 +0000 Subject: [PATCH 52/94] hip: 5.4.3 -> 5.4.4 --- pkgs/development/compilers/hip/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/compilers/hip/default.nix b/pkgs/development/compilers/hip/default.nix index 5aa423bbf84b..26fce1d8d490 100644 --- a/pkgs/development/compilers/hip/default.nix +++ b/pkgs/development/compilers/hip/default.nix @@ -49,7 +49,7 @@ let ]; in stdenv.mkDerivation (finalAttrs: { pname = "hip-${hipPlatform}"; - version = "5.4.3"; + version = "5.4.4"; outputs = [ "out" From 744cfdaf11096ae724e920107229d2ca59dafea8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 27 Mar 2023 00:20:39 +0200 Subject: [PATCH 53/94] yq-go: 4.32.2 -> 4.33.1 Diff: https://github.com/mikefarah/yq/compare/v4.32.2...v4.33.1 Changelog: https://github.com/mikefarah/yq/raw/v4.33.1/release_notes.txt --- pkgs/development/tools/yq-go/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/yq-go/default.nix b/pkgs/development/tools/yq-go/default.nix index e7a477dd11b9..24ef87503a31 100644 --- a/pkgs/development/tools/yq-go/default.nix +++ b/pkgs/development/tools/yq-go/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "yq-go"; - version = "4.32.2"; + version = "4.33.1"; src = fetchFromGitHub { owner = "mikefarah"; repo = "yq"; rev = "v${version}"; - hash = "sha256-gP5Ah/KVWtmEl1CUKge5XdsYwoAAdNabb10b0pdN0tk="; + hash = "sha256-Ur6Ro4i184kJKRBpF++crGOBpl9GDMdNrH4h/ftaGxo="; }; - vendorHash = "sha256-/7ah71isg0GB9PncNamMKaW2cW+EMN2BaPqP7gsLMmg="; + vendorHash = "sha256-o/Bn2YUXU+qKxRGFzIfhV9t1gVhfFOERAlTGHD5mxD0="; nativeBuildInputs = [ installShellFiles ]; From 40c8cebade44d2874453ed992a7ec2d50123a34d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sun, 26 Mar 2023 22:24:12 +0200 Subject: [PATCH 54/94] nixos/synapse: Fix incorrect module path after it was moved Fixes: 22f3d4e4dbc415c880dabca13fcc11d45e8d53ab ("nixos: move matrix services into their category") --- nixos/modules/services/matrix/synapse.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/matrix/synapse.nix b/nixos/modules/services/matrix/synapse.nix index aee275dab1ec..b6b51b21c796 100644 --- a/nixos/modules/services/matrix/synapse.nix +++ b/nixos/modules/services/matrix/synapse.nix @@ -60,7 +60,7 @@ in { '') (mkRemovedOptionModule [ "services" "matrix-synapse" "create_local_database" ] '' Database configuration must be done manually. An exemplary setup is demonstrated in - + '') (mkRemovedOptionModule [ "services" "matrix-synapse" "web_client" ] "") (mkRemovedOptionModule [ "services" "matrix-synapse" "room_invite_state_types" ] '' @@ -711,7 +711,7 @@ in { If you - try to deploy a fresh synapse, you need to configure the database yourself. An example - for this can be found in + for this can be found in - update your existing matrix-synapse instance, you simply need to add `services.postgresql.enable = true` to your configuration. From ba9c441efc98efa07ea52a1f017c943bb905f4f0 Mon Sep 17 00:00:00 2001 From: superherointj <5861043+superherointj@users.noreply.github.com> Date: Sun, 26 Mar 2023 20:05:11 -0300 Subject: [PATCH 55/94] vscode-extensions: nixpkgs-fmt format --- .../editors/vscode/extensions/default.nix | 72 ++++++++++--------- 1 file changed, 37 insertions(+), 35 deletions(-) diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index 1785d1c02927..bf975ce68eba 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -606,7 +606,7 @@ let downloadPage = "https://marketplace.visualstudio.com/items?itemName=christian-kohler.path-intellisense"; homepage = "https://github.com/ChristianKohler/PathIntellisense"; license = lib.licenses.mit; - maintainers = [ lib.maintainers.imgabe ]; + maintainers = [ lib.maintainers.imgabe ]; }; }; @@ -1045,7 +1045,7 @@ let downloadPage = "https://marketplace.visualstudio.com/items?itemName=esbenp.prettier-vscode"; homepage = "https://github.com/prettier/prettier-vscode"; license = lib.licenses.mit; - maintainers = [ lib.maintainers.datafoo ]; + maintainers = [ lib.maintainers.datafoo ]; }; }; @@ -1389,7 +1389,7 @@ let version = "2.2.2"; sha256 = "sha256-zWdIVdz+kZg7KZQ7LeBCB4aB9wg8dUbkWfzGlM0Fq7Q="; }; - meta ={ + meta = { license = lib.licenses.mit; }; }; @@ -1525,7 +1525,7 @@ let }; }; - jebbs.plantuml = callPackage ./jebbs.plantuml {}; + jebbs.plantuml = callPackage ./jebbs.plantuml { }; jellyedwards.gitsweep = buildVscodeMarketplaceExtension { mktplcRef = { @@ -1681,43 +1681,45 @@ let kamikillerto.vscode-colorize = buildVscodeMarketplaceExtension { mktplcRef = { - name = "vscode-colorize"; - publisher = "kamikillerto"; - version = "0.11.1"; - sha256 = "1h82b1jz86k2qznprng5066afinkrd7j3738a56idqr3vvvqnbsm"; + name = "vscode-colorize"; + publisher = "kamikillerto"; + version = "0.11.1"; + sha256 = "1h82b1jz86k2qznprng5066afinkrd7j3738a56idqr3vvvqnbsm"; }; meta = { license = lib.licenses.asl20; }; }; - kddejong.vscode-cfn-lint = let - inherit (python3Packages) cfn-lint; - in buildVscodeMarketplaceExtension { - mktplcRef = { - name = "vscode-cfn-lint"; - publisher = "kddejong"; - version = "0.21.0"; - sha256 = "sha256-IueXiN+077tiecAsVCzgYksWYTs00mZv6XJVMtRJ/PQ="; + kddejong.vscode-cfn-lint = + let + inherit (python3Packages) cfn-lint; + in + buildVscodeMarketplaceExtension { + mktplcRef = { + name = "vscode-cfn-lint"; + publisher = "kddejong"; + version = "0.21.0"; + sha256 = "sha256-IueXiN+077tiecAsVCzgYksWYTs00mZv6XJVMtRJ/PQ="; + }; + + nativeBuildInputs = [ jq moreutils ]; + + buildInputs = [ cfn-lint ]; + + postInstall = '' + cd "$out/$installPrefix" + jq '.contributes.configuration.properties."cfnLint.path".default = "${cfn-lint}/bin/cfn-lint"' package.json | sponge package.json + ''; + + meta = { + description = "CloudFormation Linter IDE integration, autocompletion, and documentation"; + homepage = "https://github.com/aws-cloudformation/cfn-lint-visual-studio-code"; + license = lib.licenses.asl20; + maintainers = [ lib.maintainers.wolfangaukang ]; + }; }; - nativeBuildInputs = [ jq moreutils ]; - - buildInputs = [ cfn-lint ]; - - postInstall = '' - cd "$out/$installPrefix" - jq '.contributes.configuration.properties."cfnLint.path".default = "${cfn-lint}/bin/cfn-lint"' package.json | sponge package.json - ''; - - meta = { - description = "CloudFormation Linter IDE integration, autocompletion, and documentation"; - homepage = "https://github.com/aws-cloudformation/cfn-lint-visual-studio-code"; - license = lib.licenses.asl20; - maintainers = [ lib.maintainers.wolfangaukang ]; - }; - }; - kubukoz.nickel-syntax = buildVscodeMarketplaceExtension { mktplcRef = { name = "nickel-syntax"; @@ -1934,7 +1936,7 @@ let }; }; - ms-ceintl = callPackage ./language-packs.nix {}; # non-English language packs + ms-ceintl = callPackage ./language-packs.nix { }; # non-English language packs ms-dotnettools.csharp = callPackage ./ms-dotnettools.csharp { }; @@ -2070,7 +2072,7 @@ let }; }; - ms-toolsai.jupyter = callPackage ./ms-toolsai.jupyter {}; + ms-toolsai.jupyter = callPackage ./ms-toolsai.jupyter { }; ms-toolsai.jupyter-keymap = buildVscodeMarketplaceExtension { mktplcRef = { From 83ae03de66e3b69ec9e34effd739d43c7971b496 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 27 Mar 2023 00:30:17 +0200 Subject: [PATCH 56/94] vimPlugins.nvim-treesitter: prefix version with 0.0.0+rev= This makes diffing two nixos systems less noisy, as no longer short commits starting with numbers are counted as versions and with letters as pname. --- .../vim/plugins/nvim-treesitter/generated.nix | 360 +++++++++--------- .../vim/plugins/nvim-treesitter/update.py | 2 +- 2 files changed, 181 insertions(+), 181 deletions(-) diff --git a/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix b/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix index 354c2a0fe7ee..52fb227ae5a7 100644 --- a/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix +++ b/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix @@ -5,7 +5,7 @@ { ada = buildGrammar { language = "ada"; - version = "42cc2eb"; + version = "0.0.0+rev=42cc2eb"; src = fetchFromGitHub { owner = "briot"; repo = "tree-sitter-ada"; @@ -16,7 +16,7 @@ }; agda = buildGrammar { language = "agda"; - version = "80ea622"; + version = "0.0.0+rev=80ea622"; src = fetchFromGitHub { owner = "AusCyberman"; repo = "tree-sitter-agda"; @@ -27,7 +27,7 @@ }; arduino = buildGrammar { language = "arduino"; - version = "257efff"; + version = "0.0.0+rev=257efff"; src = fetchFromGitHub { owner = "ObserverOfTime"; repo = "tree-sitter-arduino"; @@ -38,7 +38,7 @@ }; astro = buildGrammar { language = "astro"; - version = "a1f66bf"; + version = "0.0.0+rev=a1f66bf"; src = fetchFromGitHub { owner = "virchau13"; repo = "tree-sitter-astro"; @@ -49,7 +49,7 @@ }; awk = buildGrammar { language = "awk"; - version = "e559793"; + version = "0.0.0+rev=e559793"; src = fetchFromGitHub { owner = "Beaglefoot"; repo = "tree-sitter-awk"; @@ -60,7 +60,7 @@ }; bash = buildGrammar { language = "bash"; - version = "b338fa9"; + version = "0.0.0+rev=b338fa9"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-bash"; @@ -71,7 +71,7 @@ }; bass = buildGrammar { language = "bass"; - version = "27f110d"; + version = "0.0.0+rev=27f110d"; src = fetchFromGitHub { owner = "amaanq"; repo = "tree-sitter-bass"; @@ -82,7 +82,7 @@ }; beancount = buildGrammar { language = "beancount"; - version = "f3741a3"; + version = "0.0.0+rev=f3741a3"; src = fetchFromGitHub { owner = "polarmutex"; repo = "tree-sitter-beancount"; @@ -93,7 +93,7 @@ }; bibtex = buildGrammar { language = "bibtex"; - version = "ccfd77d"; + version = "0.0.0+rev=ccfd77d"; src = fetchFromGitHub { owner = "latex-lsp"; repo = "tree-sitter-bibtex"; @@ -104,7 +104,7 @@ }; bicep = buildGrammar { language = "bicep"; - version = "b94a098"; + version = "0.0.0+rev=b94a098"; src = fetchFromGitHub { owner = "amaanq"; repo = "tree-sitter-bicep"; @@ -115,7 +115,7 @@ }; blueprint = buildGrammar { language = "blueprint"; - version = "6ef91ca"; + version = "0.0.0+rev=6ef91ca"; src = fetchFromGitLab { owner = "gabmus"; repo = "tree-sitter-blueprint"; @@ -126,7 +126,7 @@ }; c = buildGrammar { language = "c"; - version = "f357890"; + version = "0.0.0+rev=f357890"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-c"; @@ -137,7 +137,7 @@ }; c_sharp = buildGrammar { language = "c_sharp"; - version = "fcacbeb"; + version = "0.0.0+rev=fcacbeb"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-c-sharp"; @@ -148,7 +148,7 @@ }; capnp = buildGrammar { language = "capnp"; - version = "fc6e2ad"; + version = "0.0.0+rev=fc6e2ad"; src = fetchFromGitHub { owner = "amaanq"; repo = "tree-sitter-capnp"; @@ -159,7 +159,7 @@ }; chatito = buildGrammar { language = "chatito"; - version = "3baf22e"; + version = "0.0.0+rev=3baf22e"; src = fetchFromGitHub { owner = "ObserverOfTime"; repo = "tree-sitter-chatito"; @@ -170,7 +170,7 @@ }; clojure = buildGrammar { language = "clojure"; - version = "421546c"; + version = "0.0.0+rev=421546c"; src = fetchFromGitHub { owner = "sogaiu"; repo = "tree-sitter-clojure"; @@ -181,7 +181,7 @@ }; cmake = buildGrammar { language = "cmake"; - version = "399605a"; + version = "0.0.0+rev=399605a"; src = fetchFromGitHub { owner = "uyha"; repo = "tree-sitter-cmake"; @@ -192,7 +192,7 @@ }; comment = buildGrammar { language = "comment"; - version = "a37ca37"; + version = "0.0.0+rev=a37ca37"; src = fetchFromGitHub { owner = "stsewd"; repo = "tree-sitter-comment"; @@ -203,7 +203,7 @@ }; commonlisp = buildGrammar { language = "commonlisp"; - version = "c7e8149"; + version = "0.0.0+rev=c7e8149"; src = fetchFromGitHub { owner = "theHamsta"; repo = "tree-sitter-commonlisp"; @@ -214,7 +214,7 @@ }; cooklang = buildGrammar { language = "cooklang"; - version = "5e11341"; + version = "0.0.0+rev=5e11341"; src = fetchFromGitHub { owner = "addcninblue"; repo = "tree-sitter-cooklang"; @@ -225,7 +225,7 @@ }; cpon = buildGrammar { language = "cpon"; - version = "eedb93b"; + version = "0.0.0+rev=eedb93b"; src = fetchFromGitHub { owner = "amaanq"; repo = "tree-sitter-cpon"; @@ -236,7 +236,7 @@ }; cpp = buildGrammar { language = "cpp"; - version = "03fa93d"; + version = "0.0.0+rev=03fa93d"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-cpp"; @@ -247,7 +247,7 @@ }; css = buildGrammar { language = "css"; - version = "769203d"; + version = "0.0.0+rev=769203d"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-css"; @@ -258,7 +258,7 @@ }; cuda = buildGrammar { language = "cuda"; - version = "91c3ca3"; + version = "0.0.0+rev=91c3ca3"; src = fetchFromGitHub { owner = "theHamsta"; repo = "tree-sitter-cuda"; @@ -269,7 +269,7 @@ }; cue = buildGrammar { language = "cue"; - version = "4ffcda8"; + version = "0.0.0+rev=4ffcda8"; src = fetchFromGitHub { owner = "eonpatapon"; repo = "tree-sitter-cue"; @@ -280,7 +280,7 @@ }; d = buildGrammar { language = "d"; - version = "c2fbf21"; + version = "0.0.0+rev=c2fbf21"; src = fetchFromGitHub { owner = "CyberShadow"; repo = "tree-sitter-d"; @@ -292,7 +292,7 @@ }; dart = buildGrammar { language = "dart"; - version = "53485a8"; + version = "0.0.0+rev=53485a8"; src = fetchFromGitHub { owner = "UserNobody14"; repo = "tree-sitter-dart"; @@ -303,7 +303,7 @@ }; devicetree = buildGrammar { language = "devicetree"; - version = "ea30a05"; + version = "0.0.0+rev=ea30a05"; src = fetchFromGitHub { owner = "joelspadin"; repo = "tree-sitter-devicetree"; @@ -314,7 +314,7 @@ }; dhall = buildGrammar { language = "dhall"; - version = "affb6ee"; + version = "0.0.0+rev=affb6ee"; src = fetchFromGitHub { owner = "jbellerb"; repo = "tree-sitter-dhall"; @@ -325,7 +325,7 @@ }; diff = buildGrammar { language = "diff"; - version = "f69bde8"; + version = "0.0.0+rev=f69bde8"; src = fetchFromGitHub { owner = "the-mikedavis"; repo = "tree-sitter-diff"; @@ -336,7 +336,7 @@ }; dockerfile = buildGrammar { language = "dockerfile"; - version = "8ee3a0f"; + version = "0.0.0+rev=8ee3a0f"; src = fetchFromGitHub { owner = "camdencheek"; repo = "tree-sitter-dockerfile"; @@ -347,7 +347,7 @@ }; dot = buildGrammar { language = "dot"; - version = "9ab8555"; + version = "0.0.0+rev=9ab8555"; src = fetchFromGitHub { owner = "rydesun"; repo = "tree-sitter-dot"; @@ -358,7 +358,7 @@ }; ebnf = buildGrammar { language = "ebnf"; - version = "8e635b0"; + version = "0.0.0+rev=8e635b0"; src = fetchFromGitHub { owner = "RubixDev"; repo = "ebnf"; @@ -370,7 +370,7 @@ }; eex = buildGrammar { language = "eex"; - version = "f742f2f"; + version = "0.0.0+rev=f742f2f"; src = fetchFromGitHub { owner = "connorlay"; repo = "tree-sitter-eex"; @@ -381,7 +381,7 @@ }; elixir = buildGrammar { language = "elixir"; - version = "869dff3"; + version = "0.0.0+rev=869dff3"; src = fetchFromGitHub { owner = "elixir-lang"; repo = "tree-sitter-elixir"; @@ -392,7 +392,7 @@ }; elm = buildGrammar { language = "elm"; - version = "28bb193"; + version = "0.0.0+rev=28bb193"; src = fetchFromGitHub { owner = "elm-tooling"; repo = "tree-sitter-elm"; @@ -403,7 +403,7 @@ }; elsa = buildGrammar { language = "elsa"; - version = "0a66b2b"; + version = "0.0.0+rev=0a66b2b"; src = fetchFromGitHub { owner = "glapa-grossklag"; repo = "tree-sitter-elsa"; @@ -414,7 +414,7 @@ }; elvish = buildGrammar { language = "elvish"; - version = "f32711e"; + version = "0.0.0+rev=f32711e"; src = fetchFromGitHub { owner = "ckafi"; repo = "tree-sitter-elvish"; @@ -425,7 +425,7 @@ }; embedded_template = buildGrammar { language = "embedded_template"; - version = "203f7bd"; + version = "0.0.0+rev=203f7bd"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-embedded-template"; @@ -436,7 +436,7 @@ }; erlang = buildGrammar { language = "erlang"; - version = "9fe5cdf"; + version = "0.0.0+rev=9fe5cdf"; src = fetchFromGitHub { owner = "WhatsApp"; repo = "tree-sitter-erlang"; @@ -447,7 +447,7 @@ }; fennel = buildGrammar { language = "fennel"; - version = "5171959"; + version = "0.0.0+rev=5171959"; src = fetchFromGitHub { owner = "travonted"; repo = "tree-sitter-fennel"; @@ -458,7 +458,7 @@ }; fish = buildGrammar { language = "fish"; - version = "f917690"; + version = "0.0.0+rev=f917690"; src = fetchFromGitHub { owner = "ram02z"; repo = "tree-sitter-fish"; @@ -469,7 +469,7 @@ }; foam = buildGrammar { language = "foam"; - version = "c238f4a"; + version = "0.0.0+rev=c238f4a"; src = fetchFromGitHub { owner = "FoamScience"; repo = "tree-sitter-foam"; @@ -480,7 +480,7 @@ }; fortran = buildGrammar { language = "fortran"; - version = "31552ac"; + version = "0.0.0+rev=31552ac"; src = fetchFromGitHub { owner = "stadelmanma"; repo = "tree-sitter-fortran"; @@ -491,7 +491,7 @@ }; fsh = buildGrammar { language = "fsh"; - version = "fa33477"; + version = "0.0.0+rev=fa33477"; src = fetchFromGitHub { owner = "mgramigna"; repo = "tree-sitter-fsh"; @@ -502,7 +502,7 @@ }; func = buildGrammar { language = "func"; - version = "f161cfe"; + version = "0.0.0+rev=f161cfe"; src = fetchFromGitHub { owner = "amaanq"; repo = "tree-sitter-func"; @@ -513,7 +513,7 @@ }; fusion = buildGrammar { language = "fusion"; - version = "19db2f4"; + version = "0.0.0+rev=19db2f4"; src = fetchFromGitLab { owner = "jirgn"; repo = "tree-sitter-fusion"; @@ -524,7 +524,7 @@ }; gdscript = buildGrammar { language = "gdscript"; - version = "a4b57cc"; + version = "0.0.0+rev=a4b57cc"; src = fetchFromGitHub { owner = "PrestonKnopp"; repo = "tree-sitter-gdscript"; @@ -535,7 +535,7 @@ }; git_config = buildGrammar { language = "git_config"; - version = "a01b498"; + version = "0.0.0+rev=a01b498"; src = fetchFromGitHub { owner = "the-mikedavis"; repo = "tree-sitter-git-config"; @@ -546,7 +546,7 @@ }; git_rebase = buildGrammar { language = "git_rebase"; - version = "d8a4207"; + version = "0.0.0+rev=d8a4207"; src = fetchFromGitHub { owner = "the-mikedavis"; repo = "tree-sitter-git-rebase"; @@ -557,7 +557,7 @@ }; gitattributes = buildGrammar { language = "gitattributes"; - version = "577a075"; + version = "0.0.0+rev=577a075"; src = fetchFromGitHub { owner = "ObserverOfTime"; repo = "tree-sitter-gitattributes"; @@ -568,7 +568,7 @@ }; gitcommit = buildGrammar { language = "gitcommit"; - version = "f71b93f"; + version = "0.0.0+rev=f71b93f"; src = fetchFromGitHub { owner = "gbprod"; repo = "tree-sitter-gitcommit"; @@ -579,7 +579,7 @@ }; gitignore = buildGrammar { language = "gitignore"; - version = "f4685bf"; + version = "0.0.0+rev=f4685bf"; src = fetchFromGitHub { owner = "shunsambongi"; repo = "tree-sitter-gitignore"; @@ -590,7 +590,7 @@ }; gleam = buildGrammar { language = "gleam"; - version = "ae79782"; + version = "0.0.0+rev=ae79782"; src = fetchFromGitHub { owner = "gleam-lang"; repo = "tree-sitter-gleam"; @@ -601,7 +601,7 @@ }; glimmer = buildGrammar { language = "glimmer"; - version = "bc1c685"; + version = "0.0.0+rev=bc1c685"; src = fetchFromGitHub { owner = "alexlafroscia"; repo = "tree-sitter-glimmer"; @@ -612,7 +612,7 @@ }; glsl = buildGrammar { language = "glsl"; - version = "e2c2214"; + version = "0.0.0+rev=e2c2214"; src = fetchFromGitHub { owner = "theHamsta"; repo = "tree-sitter-glsl"; @@ -623,7 +623,7 @@ }; go = buildGrammar { language = "go"; - version = "64457ea"; + version = "0.0.0+rev=64457ea"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-go"; @@ -634,7 +634,7 @@ }; godot_resource = buildGrammar { language = "godot_resource"; - version = "b6ef076"; + version = "0.0.0+rev=b6ef076"; src = fetchFromGitHub { owner = "PrestonKnopp"; repo = "tree-sitter-godot-resource"; @@ -645,7 +645,7 @@ }; gomod = buildGrammar { language = "gomod"; - version = "4a65743"; + version = "0.0.0+rev=4a65743"; src = fetchFromGitHub { owner = "camdencheek"; repo = "tree-sitter-go-mod"; @@ -656,7 +656,7 @@ }; gosum = buildGrammar { language = "gosum"; - version = "14da5c2"; + version = "0.0.0+rev=14da5c2"; src = fetchFromGitHub { owner = "amaanq"; repo = "tree-sitter-go-sum"; @@ -667,7 +667,7 @@ }; gowork = buildGrammar { language = "gowork"; - version = "949a8a4"; + version = "0.0.0+rev=949a8a4"; src = fetchFromGitHub { owner = "omertuc"; repo = "tree-sitter-go-work"; @@ -678,7 +678,7 @@ }; graphql = buildGrammar { language = "graphql"; - version = "5e66e96"; + version = "0.0.0+rev=5e66e96"; src = fetchFromGitHub { owner = "bkegley"; repo = "tree-sitter-graphql"; @@ -689,7 +689,7 @@ }; hack = buildGrammar { language = "hack"; - version = "b7bd692"; + version = "0.0.0+rev=b7bd692"; src = fetchFromGitHub { owner = "slackhq"; repo = "tree-sitter-hack"; @@ -700,7 +700,7 @@ }; hare = buildGrammar { language = "hare"; - version = "f0a9e62"; + version = "0.0.0+rev=f0a9e62"; src = fetchFromGitHub { owner = "amaanq"; repo = "tree-sitter-hare"; @@ -711,7 +711,7 @@ }; haskell = buildGrammar { language = "haskell"; - version = "fb3c19e"; + version = "0.0.0+rev=fb3c19e"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-haskell"; @@ -722,7 +722,7 @@ }; hcl = buildGrammar { language = "hcl"; - version = "0ff887f"; + version = "0.0.0+rev=0ff887f"; src = fetchFromGitHub { owner = "MichaHoffmann"; repo = "tree-sitter-hcl"; @@ -733,7 +733,7 @@ }; heex = buildGrammar { language = "heex"; - version = "2e1348c"; + version = "0.0.0+rev=2e1348c"; src = fetchFromGitHub { owner = "connorlay"; repo = "tree-sitter-heex"; @@ -744,7 +744,7 @@ }; help = buildGrammar { language = "help"; - version = "8f75ef3"; + version = "0.0.0+rev=8f75ef3"; src = fetchFromGitHub { owner = "neovim"; repo = "tree-sitter-vimdoc"; @@ -755,7 +755,7 @@ }; hjson = buildGrammar { language = "hjson"; - version = "02fa3b7"; + version = "0.0.0+rev=02fa3b7"; src = fetchFromGitHub { owner = "winston0410"; repo = "tree-sitter-hjson"; @@ -766,7 +766,7 @@ }; hlsl = buildGrammar { language = "hlsl"; - version = "306d485"; + version = "0.0.0+rev=306d485"; src = fetchFromGitHub { owner = "theHamsta"; repo = "tree-sitter-hlsl"; @@ -777,7 +777,7 @@ }; hocon = buildGrammar { language = "hocon"; - version = "c390f10"; + version = "0.0.0+rev=c390f10"; src = fetchFromGitHub { owner = "antosha417"; repo = "tree-sitter-hocon"; @@ -788,7 +788,7 @@ }; html = buildGrammar { language = "html"; - version = "29f53d8"; + version = "0.0.0+rev=29f53d8"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-html"; @@ -799,7 +799,7 @@ }; htmldjango = buildGrammar { language = "htmldjango"; - version = "b2dba02"; + version = "0.0.0+rev=b2dba02"; src = fetchFromGitHub { owner = "interdependence"; repo = "tree-sitter-htmldjango"; @@ -810,7 +810,7 @@ }; http = buildGrammar { language = "http"; - version = "2c6c445"; + version = "0.0.0+rev=2c6c445"; src = fetchFromGitHub { owner = "rest-nvim"; repo = "tree-sitter-http"; @@ -821,7 +821,7 @@ }; ini = buildGrammar { language = "ini"; - version = "1a0ce07"; + version = "0.0.0+rev=1a0ce07"; src = fetchFromGitHub { owner = "justinmk"; repo = "tree-sitter-ini"; @@ -832,7 +832,7 @@ }; java = buildGrammar { language = "java"; - version = "3c24aa9"; + version = "0.0.0+rev=3c24aa9"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-java"; @@ -843,7 +843,7 @@ }; javascript = buildGrammar { language = "javascript"; - version = "5720b24"; + version = "0.0.0+rev=5720b24"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-javascript"; @@ -854,7 +854,7 @@ }; jq = buildGrammar { language = "jq"; - version = "13990f5"; + version = "0.0.0+rev=13990f5"; src = fetchFromGitHub { owner = "flurie"; repo = "tree-sitter-jq"; @@ -865,7 +865,7 @@ }; jsdoc = buildGrammar { language = "jsdoc"; - version = "189a6a4"; + version = "0.0.0+rev=189a6a4"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-jsdoc"; @@ -876,7 +876,7 @@ }; json = buildGrammar { language = "json"; - version = "7307675"; + version = "0.0.0+rev=7307675"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-json"; @@ -887,7 +887,7 @@ }; json5 = buildGrammar { language = "json5"; - version = "5dd5cdc"; + version = "0.0.0+rev=5dd5cdc"; src = fetchFromGitHub { owner = "Joakker"; repo = "tree-sitter-json5"; @@ -898,7 +898,7 @@ }; jsonc = buildGrammar { language = "jsonc"; - version = "02b0165"; + version = "0.0.0+rev=02b0165"; src = fetchFromGitLab { owner = "WhyNotHugo"; repo = "tree-sitter-jsonc"; @@ -909,7 +909,7 @@ }; jsonnet = buildGrammar { language = "jsonnet"; - version = "fdc7757"; + version = "0.0.0+rev=fdc7757"; src = fetchFromGitHub { owner = "sourcegraph"; repo = "tree-sitter-jsonnet"; @@ -920,7 +920,7 @@ }; julia = buildGrammar { language = "julia"; - version = "e2f449e"; + version = "0.0.0+rev=e2f449e"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-julia"; @@ -931,7 +931,7 @@ }; kdl = buildGrammar { language = "kdl"; - version = "e36f054"; + version = "0.0.0+rev=e36f054"; src = fetchFromGitHub { owner = "amaanq"; repo = "tree-sitter-kdl"; @@ -942,7 +942,7 @@ }; kotlin = buildGrammar { language = "kotlin"; - version = "e463703"; + version = "0.0.0+rev=e463703"; src = fetchFromGitHub { owner = "fwcd"; repo = "tree-sitter-kotlin"; @@ -953,7 +953,7 @@ }; lalrpop = buildGrammar { language = "lalrpop"; - version = "7744b56"; + version = "0.0.0+rev=7744b56"; src = fetchFromGitHub { owner = "traxys"; repo = "tree-sitter-lalrpop"; @@ -964,7 +964,7 @@ }; latex = buildGrammar { language = "latex"; - version = "376f640"; + version = "0.0.0+rev=376f640"; src = fetchFromGitHub { owner = "latex-lsp"; repo = "tree-sitter-latex"; @@ -975,7 +975,7 @@ }; ledger = buildGrammar { language = "ledger"; - version = "f787ae6"; + version = "0.0.0+rev=f787ae6"; src = fetchFromGitHub { owner = "cbarrete"; repo = "tree-sitter-ledger"; @@ -986,7 +986,7 @@ }; llvm = buildGrammar { language = "llvm"; - version = "e9948ed"; + version = "0.0.0+rev=e9948ed"; src = fetchFromGitHub { owner = "benwilliamgraham"; repo = "tree-sitter-llvm"; @@ -997,7 +997,7 @@ }; lua = buildGrammar { language = "lua"; - version = "0fc8996"; + version = "0.0.0+rev=0fc8996"; src = fetchFromGitHub { owner = "MunifTanjim"; repo = "tree-sitter-lua"; @@ -1008,7 +1008,7 @@ }; luadoc = buildGrammar { language = "luadoc"; - version = "40a67ee"; + version = "0.0.0+rev=40a67ee"; src = fetchFromGitHub { owner = "amaanq"; repo = "tree-sitter-luadoc"; @@ -1019,7 +1019,7 @@ }; luap = buildGrammar { language = "luap"; - version = "bfb38d2"; + version = "0.0.0+rev=bfb38d2"; src = fetchFromGitHub { owner = "amaanq"; repo = "tree-sitter-luap"; @@ -1030,7 +1030,7 @@ }; m68k = buildGrammar { language = "m68k"; - version = "d097b12"; + version = "0.0.0+rev=d097b12"; src = fetchFromGitHub { owner = "grahambates"; repo = "tree-sitter-m68k"; @@ -1041,7 +1041,7 @@ }; make = buildGrammar { language = "make"; - version = "a4b9187"; + version = "0.0.0+rev=a4b9187"; src = fetchFromGitHub { owner = "alemuller"; repo = "tree-sitter-make"; @@ -1052,7 +1052,7 @@ }; markdown = buildGrammar { language = "markdown"; - version = "fa6bfd5"; + version = "0.0.0+rev=fa6bfd5"; src = fetchFromGitHub { owner = "MDeiml"; repo = "tree-sitter-markdown"; @@ -1064,7 +1064,7 @@ }; markdown_inline = buildGrammar { language = "markdown_inline"; - version = "fa6bfd5"; + version = "0.0.0+rev=fa6bfd5"; src = fetchFromGitHub { owner = "MDeiml"; repo = "tree-sitter-markdown"; @@ -1076,7 +1076,7 @@ }; matlab = buildGrammar { language = "matlab"; - version = "2d5d3d5"; + version = "0.0.0+rev=2d5d3d5"; src = fetchFromGitHub { owner = "mstanciu552"; repo = "tree-sitter-matlab"; @@ -1087,7 +1087,7 @@ }; menhir = buildGrammar { language = "menhir"; - version = "db7953a"; + version = "0.0.0+rev=db7953a"; src = fetchFromGitHub { owner = "Kerl13"; repo = "tree-sitter-menhir"; @@ -1098,7 +1098,7 @@ }; mermaid = buildGrammar { language = "mermaid"; - version = "d787c66"; + version = "0.0.0+rev=d787c66"; src = fetchFromGitHub { owner = "monaqa"; repo = "tree-sitter-mermaid"; @@ -1109,7 +1109,7 @@ }; meson = buildGrammar { language = "meson"; - version = "3d6dfbd"; + version = "0.0.0+rev=3d6dfbd"; src = fetchFromGitHub { owner = "Decodetalkers"; repo = "tree-sitter-meson"; @@ -1120,7 +1120,7 @@ }; mlir = buildGrammar { language = "mlir"; - version = "e2053f7"; + version = "0.0.0+rev=e2053f7"; src = fetchFromGitHub { owner = "artagnon"; repo = "tree-sitter-mlir"; @@ -1132,7 +1132,7 @@ }; nickel = buildGrammar { language = "nickel"; - version = "d6c7eeb"; + version = "0.0.0+rev=d6c7eeb"; src = fetchFromGitHub { owner = "nickel-lang"; repo = "tree-sitter-nickel"; @@ -1143,7 +1143,7 @@ }; ninja = buildGrammar { language = "ninja"; - version = "0a95cfd"; + version = "0.0.0+rev=0a95cfd"; src = fetchFromGitHub { owner = "alemuller"; repo = "tree-sitter-ninja"; @@ -1154,7 +1154,7 @@ }; nix = buildGrammar { language = "nix"; - version = "6b71a81"; + version = "0.0.0+rev=6b71a81"; src = fetchFromGitHub { owner = "cstrahan"; repo = "tree-sitter-nix"; @@ -1165,7 +1165,7 @@ }; norg = buildGrammar { language = "norg"; - version = "1a30509"; + version = "0.0.0+rev=1a30509"; src = fetchFromGitHub { owner = "nvim-neorg"; repo = "tree-sitter-norg"; @@ -1176,7 +1176,7 @@ }; ocaml = buildGrammar { language = "ocaml"; - version = "f1106bf"; + version = "0.0.0+rev=f1106bf"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-ocaml"; @@ -1188,7 +1188,7 @@ }; ocaml_interface = buildGrammar { language = "ocaml_interface"; - version = "f1106bf"; + version = "0.0.0+rev=f1106bf"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-ocaml"; @@ -1200,7 +1200,7 @@ }; ocamllex = buildGrammar { language = "ocamllex"; - version = "ac1d595"; + version = "0.0.0+rev=ac1d595"; src = fetchFromGitHub { owner = "atom-ocaml"; repo = "tree-sitter-ocamllex"; @@ -1212,7 +1212,7 @@ }; org = buildGrammar { language = "org"; - version = "081179c"; + version = "0.0.0+rev=081179c"; src = fetchFromGitHub { owner = "milisims"; repo = "tree-sitter-org"; @@ -1223,7 +1223,7 @@ }; pascal = buildGrammar { language = "pascal"; - version = "9e99540"; + version = "0.0.0+rev=9e99540"; src = fetchFromGitHub { owner = "Isopod"; repo = "tree-sitter-pascal"; @@ -1234,7 +1234,7 @@ }; passwd = buildGrammar { language = "passwd"; - version = "2023939"; + version = "0.0.0+rev=2023939"; src = fetchFromGitHub { owner = "ath3"; repo = "tree-sitter-passwd"; @@ -1245,7 +1245,7 @@ }; perl = buildGrammar { language = "perl"; - version = "ff1f0ac"; + version = "0.0.0+rev=ff1f0ac"; src = fetchFromGitHub { owner = "ganezdragon"; repo = "tree-sitter-perl"; @@ -1256,7 +1256,7 @@ }; php = buildGrammar { language = "php"; - version = "1a40581"; + version = "0.0.0+rev=1a40581"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-php"; @@ -1267,7 +1267,7 @@ }; phpdoc = buildGrammar { language = "phpdoc"; - version = "2f4d16c"; + version = "0.0.0+rev=2f4d16c"; src = fetchFromGitHub { owner = "claytonrcarter"; repo = "tree-sitter-phpdoc"; @@ -1278,7 +1278,7 @@ }; pioasm = buildGrammar { language = "pioasm"; - version = "924aada"; + version = "0.0.0+rev=924aada"; src = fetchFromGitHub { owner = "leo60228"; repo = "tree-sitter-pioasm"; @@ -1289,7 +1289,7 @@ }; po = buildGrammar { language = "po"; - version = "d6aed22"; + version = "0.0.0+rev=d6aed22"; src = fetchFromGitHub { owner = "erasin"; repo = "tree-sitter-po"; @@ -1300,7 +1300,7 @@ }; poe_filter = buildGrammar { language = "poe_filter"; - version = "80dc101"; + version = "0.0.0+rev=80dc101"; src = fetchFromGitHub { owner = "ObserverOfTime"; repo = "tree-sitter-poe-filter"; @@ -1311,7 +1311,7 @@ }; prisma = buildGrammar { language = "prisma"; - version = "eca2596"; + version = "0.0.0+rev=eca2596"; src = fetchFromGitHub { owner = "victorhqc"; repo = "tree-sitter-prisma"; @@ -1322,7 +1322,7 @@ }; proto = buildGrammar { language = "proto"; - version = "42d82fa"; + version = "0.0.0+rev=42d82fa"; src = fetchFromGitHub { owner = "mitchellh"; repo = "tree-sitter-proto"; @@ -1333,7 +1333,7 @@ }; prql = buildGrammar { language = "prql"; - version = "4045dcf"; + version = "0.0.0+rev=4045dcf"; src = fetchFromGitHub { owner = "PRQL"; repo = "tree-sitter-prql"; @@ -1344,7 +1344,7 @@ }; pug = buildGrammar { language = "pug"; - version = "884e225"; + version = "0.0.0+rev=884e225"; src = fetchFromGitHub { owner = "zealot128"; repo = "tree-sitter-pug"; @@ -1355,7 +1355,7 @@ }; python = buildGrammar { language = "python"; - version = "6282715"; + version = "0.0.0+rev=6282715"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-python"; @@ -1366,7 +1366,7 @@ }; ql = buildGrammar { language = "ql"; - version = "bd08702"; + version = "0.0.0+rev=bd08702"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-ql"; @@ -1377,7 +1377,7 @@ }; qmldir = buildGrammar { language = "qmldir"; - version = "6b2b5e4"; + version = "0.0.0+rev=6b2b5e4"; src = fetchFromGitHub { owner = "Decodetalkers"; repo = "tree-sitter-qmldir"; @@ -1388,7 +1388,7 @@ }; qmljs = buildGrammar { language = "qmljs"; - version = "35ead5b"; + version = "0.0.0+rev=35ead5b"; src = fetchFromGitHub { owner = "yuja"; repo = "tree-sitter-qmljs"; @@ -1399,7 +1399,7 @@ }; query = buildGrammar { language = "query"; - version = "e975044"; + version = "0.0.0+rev=e975044"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "tree-sitter-query"; @@ -1410,7 +1410,7 @@ }; r = buildGrammar { language = "r"; - version = "80efda5"; + version = "0.0.0+rev=80efda5"; src = fetchFromGitHub { owner = "r-lib"; repo = "tree-sitter-r"; @@ -1421,7 +1421,7 @@ }; racket = buildGrammar { language = "racket"; - version = "ed5369a"; + version = "0.0.0+rev=ed5369a"; src = fetchFromGitHub { owner = "6cdh"; repo = "tree-sitter-racket"; @@ -1432,7 +1432,7 @@ }; rasi = buildGrammar { language = "rasi"; - version = "371dac6"; + version = "0.0.0+rev=371dac6"; src = fetchFromGitHub { owner = "Fymyte"; repo = "tree-sitter-rasi"; @@ -1443,7 +1443,7 @@ }; regex = buildGrammar { language = "regex"; - version = "e1cfca3"; + version = "0.0.0+rev=e1cfca3"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-regex"; @@ -1454,7 +1454,7 @@ }; rego = buildGrammar { language = "rego"; - version = "b2667c9"; + version = "0.0.0+rev=b2667c9"; src = fetchFromGitHub { owner = "FallenAngel97"; repo = "tree-sitter-rego"; @@ -1465,7 +1465,7 @@ }; rnoweb = buildGrammar { language = "rnoweb"; - version = "502c112"; + version = "0.0.0+rev=502c112"; src = fetchFromGitHub { owner = "bamonroe"; repo = "tree-sitter-rnoweb"; @@ -1476,7 +1476,7 @@ }; ron = buildGrammar { language = "ron"; - version = "ce6086b"; + version = "0.0.0+rev=ce6086b"; src = fetchFromGitHub { owner = "amaanq"; repo = "tree-sitter-ron"; @@ -1487,7 +1487,7 @@ }; rst = buildGrammar { language = "rst"; - version = "25e6328"; + version = "0.0.0+rev=25e6328"; src = fetchFromGitHub { owner = "stsewd"; repo = "tree-sitter-rst"; @@ -1498,7 +1498,7 @@ }; ruby = buildGrammar { language = "ruby"; - version = "206c707"; + version = "0.0.0+rev=206c707"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-ruby"; @@ -1509,7 +1509,7 @@ }; rust = buildGrammar { language = "rust"; - version = "fbf9e50"; + version = "0.0.0+rev=fbf9e50"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-rust"; @@ -1520,7 +1520,7 @@ }; scala = buildGrammar { language = "scala"; - version = "7d348f5"; + version = "0.0.0+rev=7d348f5"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-scala"; @@ -1531,7 +1531,7 @@ }; scheme = buildGrammar { language = "scheme"; - version = "9a23ff3"; + version = "0.0.0+rev=9a23ff3"; src = fetchFromGitHub { owner = "6cdh"; repo = "tree-sitter-scheme"; @@ -1542,7 +1542,7 @@ }; scss = buildGrammar { language = "scss"; - version = "c478c68"; + version = "0.0.0+rev=c478c68"; src = fetchFromGitHub { owner = "serenadeai"; repo = "tree-sitter-scss"; @@ -1553,7 +1553,7 @@ }; slint = buildGrammar { language = "slint"; - version = "0754752"; + version = "0.0.0+rev=0754752"; src = fetchFromGitHub { owner = "jrmoulton"; repo = "tree-sitter-slint"; @@ -1564,7 +1564,7 @@ }; smali = buildGrammar { language = "smali"; - version = "a67a429"; + version = "0.0.0+rev=a67a429"; src = fetchFromSourcehut { owner = "~yotam"; repo = "tree-sitter-smali"; @@ -1575,7 +1575,7 @@ }; smithy = buildGrammar { language = "smithy"; - version = "cf8c7eb"; + version = "0.0.0+rev=cf8c7eb"; src = fetchFromGitHub { owner = "indoorvivants"; repo = "tree-sitter-smithy"; @@ -1586,7 +1586,7 @@ }; solidity = buildGrammar { language = "solidity"; - version = "1680203"; + version = "0.0.0+rev=1680203"; src = fetchFromGitHub { owner = "JoranHonig"; repo = "tree-sitter-solidity"; @@ -1597,7 +1597,7 @@ }; sparql = buildGrammar { language = "sparql"; - version = "05f949d"; + version = "0.0.0+rev=05f949d"; src = fetchFromGitHub { owner = "BonaBeavis"; repo = "tree-sitter-sparql"; @@ -1608,7 +1608,7 @@ }; sql = buildGrammar { language = "sql"; - version = "d2b64d8"; + version = "0.0.0+rev=d2b64d8"; src = fetchFromGitHub { owner = "derekstride"; repo = "tree-sitter-sql"; @@ -1619,7 +1619,7 @@ }; squirrel = buildGrammar { language = "squirrel"; - version = "3fefc6b"; + version = "0.0.0+rev=3fefc6b"; src = fetchFromGitHub { owner = "amaanq"; repo = "tree-sitter-squirrel"; @@ -1630,7 +1630,7 @@ }; starlark = buildGrammar { language = "starlark"; - version = "8ad93a7"; + version = "0.0.0+rev=8ad93a7"; src = fetchFromGitHub { owner = "amaanq"; repo = "tree-sitter-starlark"; @@ -1641,7 +1641,7 @@ }; supercollider = buildGrammar { language = "supercollider"; - version = "90c6d9f"; + version = "0.0.0+rev=90c6d9f"; src = fetchFromGitHub { owner = "madskjeldgaard"; repo = "tree-sitter-supercollider"; @@ -1652,7 +1652,7 @@ }; surface = buildGrammar { language = "surface"; - version = "f4586b3"; + version = "0.0.0+rev=f4586b3"; src = fetchFromGitHub { owner = "connorlay"; repo = "tree-sitter-surface"; @@ -1663,7 +1663,7 @@ }; svelte = buildGrammar { language = "svelte"; - version = "52e122a"; + version = "0.0.0+rev=52e122a"; src = fetchFromGitHub { owner = "Himujjal"; repo = "tree-sitter-svelte"; @@ -1674,7 +1674,7 @@ }; swift = buildGrammar { language = "swift"; - version = "4cf4bb6"; + version = "0.0.0+rev=4cf4bb6"; src = fetchFromGitHub { owner = "alex-pinkus"; repo = "tree-sitter-swift"; @@ -1686,7 +1686,7 @@ }; sxhkdrc = buildGrammar { language = "sxhkdrc"; - version = "440d5f9"; + version = "0.0.0+rev=440d5f9"; src = fetchFromGitHub { owner = "RaafatTurki"; repo = "tree-sitter-sxhkdrc"; @@ -1697,7 +1697,7 @@ }; t32 = buildGrammar { language = "t32"; - version = "f8106fc"; + version = "0.0.0+rev=f8106fc"; src = fetchFromGitea { domain = "codeberg.org"; owner = "xasc"; @@ -1709,7 +1709,7 @@ }; tablegen = buildGrammar { language = "tablegen"; - version = "e5e046e"; + version = "0.0.0+rev=e5e046e"; src = fetchFromGitHub { owner = "amaanq"; repo = "tree-sitter-tablegen"; @@ -1720,7 +1720,7 @@ }; teal = buildGrammar { language = "teal"; - version = "2158ecc"; + version = "0.0.0+rev=2158ecc"; src = fetchFromGitHub { owner = "euclidianAce"; repo = "tree-sitter-teal"; @@ -1732,7 +1732,7 @@ }; terraform = buildGrammar { language = "terraform"; - version = "0ff887f"; + version = "0.0.0+rev=0ff887f"; src = fetchFromGitHub { owner = "MichaHoffmann"; repo = "tree-sitter-hcl"; @@ -1744,7 +1744,7 @@ }; thrift = buildGrammar { language = "thrift"; - version = "d4deb1b"; + version = "0.0.0+rev=d4deb1b"; src = fetchFromGitHub { owner = "duskmoon314"; repo = "tree-sitter-thrift"; @@ -1755,7 +1755,7 @@ }; tiger = buildGrammar { language = "tiger"; - version = "a233ebe"; + version = "0.0.0+rev=a233ebe"; src = fetchFromGitHub { owner = "ambroisie"; repo = "tree-sitter-tiger"; @@ -1766,7 +1766,7 @@ }; tlaplus = buildGrammar { language = "tlaplus"; - version = "6d2ec89"; + version = "0.0.0+rev=6d2ec89"; src = fetchFromGitHub { owner = "tlaplus-community"; repo = "tree-sitter-tlaplus"; @@ -1777,7 +1777,7 @@ }; todotxt = buildGrammar { language = "todotxt"; - version = "0207f6a"; + version = "0.0.0+rev=0207f6a"; src = fetchFromGitHub { owner = "arnarg"; repo = "tree-sitter-todotxt"; @@ -1788,7 +1788,7 @@ }; toml = buildGrammar { language = "toml"; - version = "8bd2056"; + version = "0.0.0+rev=8bd2056"; src = fetchFromGitHub { owner = "ikatyang"; repo = "tree-sitter-toml"; @@ -1799,7 +1799,7 @@ }; tsx = buildGrammar { language = "tsx"; - version = "b66d19b"; + version = "0.0.0+rev=b66d19b"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-typescript"; @@ -1811,7 +1811,7 @@ }; turtle = buildGrammar { language = "turtle"; - version = "085437f"; + version = "0.0.0+rev=085437f"; src = fetchFromGitHub { owner = "BonaBeavis"; repo = "tree-sitter-turtle"; @@ -1822,7 +1822,7 @@ }; twig = buildGrammar { language = "twig"; - version = "2457993"; + version = "0.0.0+rev=2457993"; src = fetchFromGitHub { owner = "gbprod"; repo = "tree-sitter-twig"; @@ -1833,7 +1833,7 @@ }; typescript = buildGrammar { language = "typescript"; - version = "b66d19b"; + version = "0.0.0+rev=b66d19b"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-typescript"; @@ -1845,7 +1845,7 @@ }; ungrammar = buildGrammar { language = "ungrammar"; - version = "debd26f"; + version = "0.0.0+rev=debd26f"; src = fetchFromGitHub { owner = "Philipp-M"; repo = "tree-sitter-ungrammar"; @@ -1856,7 +1856,7 @@ }; uxntal = buildGrammar { language = "uxntal"; - version = "14e4760"; + version = "0.0.0+rev=14e4760"; src = fetchFromGitHub { owner = "amaanq"; repo = "tree-sitter-uxntal"; @@ -1867,7 +1867,7 @@ }; v = buildGrammar { language = "v"; - version = "66cf9d3"; + version = "0.0.0+rev=66cf9d3"; src = fetchFromGitHub { owner = "vlang"; repo = "vls"; @@ -1879,7 +1879,7 @@ }; vala = buildGrammar { language = "vala"; - version = "8f690bf"; + version = "0.0.0+rev=8f690bf"; src = fetchFromGitHub { owner = "vala-lang"; repo = "tree-sitter-vala"; @@ -1890,7 +1890,7 @@ }; verilog = buildGrammar { language = "verilog"; - version = "4457145"; + version = "0.0.0+rev=4457145"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-verilog"; @@ -1901,7 +1901,7 @@ }; vhs = buildGrammar { language = "vhs"; - version = "54fe7c0"; + version = "0.0.0+rev=54fe7c0"; src = fetchFromGitHub { owner = "charmbracelet"; repo = "tree-sitter-vhs"; @@ -1912,7 +1912,7 @@ }; vim = buildGrammar { language = "vim"; - version = "e39a7bb"; + version = "0.0.0+rev=e39a7bb"; src = fetchFromGitHub { owner = "vigoux"; repo = "tree-sitter-viml"; @@ -1923,7 +1923,7 @@ }; vue = buildGrammar { language = "vue"; - version = "91fe275"; + version = "0.0.0+rev=91fe275"; src = fetchFromGitHub { owner = "ikatyang"; repo = "tree-sitter-vue"; @@ -1934,7 +1934,7 @@ }; wgsl = buildGrammar { language = "wgsl"; - version = "40259f3"; + version = "0.0.0+rev=40259f3"; src = fetchFromGitHub { owner = "szebniok"; repo = "tree-sitter-wgsl"; @@ -1945,7 +1945,7 @@ }; wgsl_bevy = buildGrammar { language = "wgsl_bevy"; - version = "7cd38d6"; + version = "0.0.0+rev=7cd38d6"; src = fetchFromGitHub { owner = "theHamsta"; repo = "tree-sitter-wgsl-bevy"; @@ -1956,7 +1956,7 @@ }; yaml = buildGrammar { language = "yaml"; - version = "0e36bed"; + version = "0.0.0+rev=0e36bed"; src = fetchFromGitHub { owner = "ikatyang"; repo = "tree-sitter-yaml"; @@ -1967,7 +1967,7 @@ }; yang = buildGrammar { language = "yang"; - version = "2c0e6be"; + version = "0.0.0+rev=2c0e6be"; src = fetchFromGitHub { owner = "Hubro"; repo = "tree-sitter-yang"; @@ -1978,7 +1978,7 @@ }; yuck = buildGrammar { language = "yuck"; - version = "c348825"; + version = "0.0.0+rev=c348825"; src = fetchFromGitHub { owner = "Philipp-M"; repo = "tree-sitter-yuck"; @@ -1989,7 +1989,7 @@ }; zig = buildGrammar { language = "zig"; - version = "f3bc9ff"; + version = "0.0.0+rev=f3bc9ff"; src = fetchFromGitHub { owner = "maxxnino"; repo = "tree-sitter-zig"; diff --git a/pkgs/applications/editors/vim/plugins/nvim-treesitter/update.py b/pkgs/applications/editors/vim/plugins/nvim-treesitter/update.py index 380100978999..bbacc6959c25 100755 --- a/pkgs/applications/editors/vim/plugins/nvim-treesitter/update.py +++ b/pkgs/applications/editors/vim/plugins/nvim-treesitter/update.py @@ -35,7 +35,7 @@ def generate_grammar(item): generated = f""" {lang} = buildGrammar {{ language = "{lang}"; - version = "{rev[:7]}"; + version = "0.0.0+rev={rev[:7]}"; src = """ generated += subprocess.check_output(["nurl", url, rev, "--indent=4"], text=True) From 71d37d8535798cfec0311815bb34fc098e77855e Mon Sep 17 00:00:00 2001 From: Nicolas Benes Date: Sat, 25 Mar 2023 14:35:27 +0100 Subject: [PATCH 57/94] libnitrokey: init at 3.8 --- .../libraries/libnitrokey/default.nix | 41 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 43 insertions(+) create mode 100644 pkgs/development/libraries/libnitrokey/default.nix diff --git a/pkgs/development/libraries/libnitrokey/default.nix b/pkgs/development/libraries/libnitrokey/default.nix new file mode 100644 index 000000000000..2f06fe8eafba --- /dev/null +++ b/pkgs/development/libraries/libnitrokey/default.nix @@ -0,0 +1,41 @@ +{ lib +, stdenv +, fetchFromGitHub +, cmake +, pkg-config +, hidapi +, libusb1 +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "libnitrokey"; + version = "3.8"; + + src = fetchFromGitHub { + owner = "Nitrokey"; + repo = "libnitrokey"; + rev = "v${finalAttrs.version}"; + hash = "sha256-9ZMR1g04gNzslax6NpD6KykfUfjpKFIizaMMn06iJa0="; + }; + + nativeBuildInputs = [ + cmake + pkg-config + ]; + + cmakeFlags = [ + "-DADD_GIT_INFO=OFF" + "-DCMAKE_INSTALL_UDEVRULESDIR=etc/udev/rules.d" + ]; + + buildInputs = [ libusb1 ]; + + propagatedBuildInputs = [ hidapi ]; + + meta = with lib; { + description = "Communicate with Nitrokey devices in a clean and easy manner"; + homepage = "https://github.com/Nitrokey/libnitrokey"; + license = licenses.lgpl3; + maintainers = with maintainers; [ panicgh raitobezarius ]; + }; +}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 957ee76bcdde..dfaa75b3f089 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21594,6 +21594,8 @@ with pkgs; libnice = callPackage ../development/libraries/libnice { }; + libnitrokey = callPackage ../development/libraries/libnitrokey { }; + libnsl = callPackage ../development/libraries/libnsl { }; liboping = callPackage ../development/libraries/liboping { }; From 771d39638bc45280dadabdbf2734024b5843681e Mon Sep 17 00:00:00 2001 From: Nicolas Benes Date: Sat, 25 Mar 2023 18:13:33 +0100 Subject: [PATCH 58/94] nitrokey-udev-rules: replace with libnitrokey --- nixos/modules/hardware/nitrokey.nix | 2 +- .../security/nitrokey-app/udev-rules.nix | 20 ------------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 1 - 4 files changed, 2 insertions(+), 22 deletions(-) delete mode 100644 pkgs/tools/security/nitrokey-app/udev-rules.nix diff --git a/nixos/modules/hardware/nitrokey.nix b/nixos/modules/hardware/nitrokey.nix index fa9dd4d6d8f9..e2e88a8eade4 100644 --- a/nixos/modules/hardware/nitrokey.nix +++ b/nixos/modules/hardware/nitrokey.nix @@ -22,6 +22,6 @@ in }; config = mkIf cfg.enable { - services.udev.packages = [ pkgs.nitrokey-udev-rules ]; + services.udev.packages = [ pkgs.libnitrokey ]; }; } diff --git a/pkgs/tools/security/nitrokey-app/udev-rules.nix b/pkgs/tools/security/nitrokey-app/udev-rules.nix deleted file mode 100644 index 11dcd63d7761..000000000000 --- a/pkgs/tools/security/nitrokey-app/udev-rules.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ lib, stdenv, nitrokey-app }: - - -stdenv.mkDerivation { - name = "nitrokey-udev-rules-${lib.getVersion nitrokey-app}"; - - inherit (nitrokey-app) src; - - dontBuild = true; - - installPhase = '' - mkdir -p $out/etc/udev/rules.d - cp libnitrokey/data/41-nitrokey.rules $out/etc/udev/rules.d - ''; - - meta = { - description = "udev rules for Nitrokeys"; - inherit (nitrokey-app.meta) homepage license maintainers; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index ad5b2967052a..63d435cbe8c1 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1071,6 +1071,7 @@ mapAliases ({ nfsUtils = throw "'nfsUtils' has been renamed to/replaced by 'nfs-utils'"; # Converted to throw 2022-02-22 nginxUnstable = throw "'nginxUnstable' has been renamed to/replaced by 'nginxMainline'"; # Converted to throw 2022-02-22 nilfs_utils = throw "'nilfs_utils' has been renamed to/replaced by 'nilfs-utils'"; # Converted to throw 2022-02-22 + nitrokey-udev-rules = libnitrokey; # Added 2023-03-25 nix-direnv-flakes = nix-direnv; nix-review = nixpkgs-review; # Added 2019-12-22 nixFlakes = nixVersions.stable; # Added 2021-05-21 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index dfaa75b3f089..75ed2c967d64 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -39268,7 +39268,6 @@ with pkgs; pynitrokey = callPackage ../tools/security/pynitrokey { }; nitrokey-app = libsForQt5.callPackage ../tools/security/nitrokey-app { }; - nitrokey-udev-rules = callPackage ../tools/security/nitrokey-app/udev-rules.nix { }; fpm2 = callPackage ../tools/security/fpm2 { }; From 59cf5102f01f0f6aa368a9ba82202edca86a1845 Mon Sep 17 00:00:00 2001 From: guangtao Date: Sun, 26 Mar 2023 19:17:22 -0700 Subject: [PATCH 59/94] onlyoffice-bin: fix icon location --- pkgs/applications/office/onlyoffice-bin/default.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/applications/office/onlyoffice-bin/default.nix b/pkgs/applications/office/onlyoffice-bin/default.nix index e2dfb12c92f9..ba4a75ddfbaa 100644 --- a/pkgs/applications/office/onlyoffice-bin/default.nix +++ b/pkgs/applications/office/onlyoffice-bin/default.nix @@ -145,6 +145,13 @@ stdenv.mkDerivation rec { mv usr/share/* $out/share/ mv opt/onlyoffice/desktopeditors $out/share + for f in $out/share/desktopeditors/asc-de-*.png; do + size=$(basename "$f" ".png" | cut -d"-" -f3) + res="''${size}x''${size}" + mkdir -pv "$out/share/icons/hicolor/$res/apps" + ln -s "$f" "$out/share/icons/hicolor/$res/apps/onlyoffice-desktopeditors.png" + done; + substituteInPlace $out/bin/onlyoffice-desktopeditors \ --replace "/opt/onlyoffice/" "$out/share/" From ae3ac99d579b4d881813e7c94542123efec95d7e Mon Sep 17 00:00:00 2001 From: Abin Simon Date: Fri, 24 Mar 2023 10:22:09 +0530 Subject: [PATCH 60/94] exhaustive: init at 0.10.0 --- pkgs/development/tools/exhaustive/default.nix | 27 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 29 insertions(+) create mode 100644 pkgs/development/tools/exhaustive/default.nix diff --git a/pkgs/development/tools/exhaustive/default.nix b/pkgs/development/tools/exhaustive/default.nix new file mode 100644 index 000000000000..7445ae5236db --- /dev/null +++ b/pkgs/development/tools/exhaustive/default.nix @@ -0,0 +1,27 @@ +{ lib +, buildGoModule +, fetchFromGitHub +}: + +buildGoModule rec { + pname = "exhaustive"; + version = "0.10.0"; + + src = fetchFromGitHub { + owner = "nishanths"; + repo = "exhaustive"; + rev = "v${version}"; + hash = "sha256-vMoFIyZcAdObeQD5bGcQHlGpJv/a8yl/2HUVc8aDiIA="; + }; + + vendorHash = "sha256-i3Cgefe4krvH99N233IeEWkVt9AhdzROkJ5JBeTIaAs="; + + ldflags = [ "-s" "-w" ]; + + meta = with lib; { + description = "Check exhaustiveness of switch statements of enum-like constants in Go code"; + homepage = "https://github.com/nishanths/exhaustive"; + license = licenses.bsd2; + maintainers = with maintainers; [ meain ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b0692fe04581..c25aecea8160 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -24755,6 +24755,8 @@ with pkgs; ejabberd = callPackage ../servers/xmpp/ejabberd { erlang = erlang_24; }; + exhaustive = callPackage ../development/tools/exhaustive { }; + exhibitor = callPackage ../servers/exhibitor { }; hyp = callPackage ../servers/http/hyp { }; From 2799851afb30ac641bd33dfa0118d3bc5b033fad Mon Sep 17 00:00:00 2001 From: figsoda Date: Sun, 26 Mar 2023 23:11:43 -0400 Subject: [PATCH 61/94] rsonpath: init at 0.3.2 --- .../tools/misc/rsonpath/default.nix | 37 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 39 insertions(+) create mode 100644 pkgs/development/tools/misc/rsonpath/default.nix diff --git a/pkgs/development/tools/misc/rsonpath/default.nix b/pkgs/development/tools/misc/rsonpath/default.nix new file mode 100644 index 000000000000..8ff7bc02705a --- /dev/null +++ b/pkgs/development/tools/misc/rsonpath/default.nix @@ -0,0 +1,37 @@ +{ lib +, rustPlatform +, fetchFromGitHub +, withSimd ? true +, stdenv +}: + +rustPlatform.buildRustPackage rec { + pname = "rsonpath"; + version = "0.3.2"; + + src = fetchFromGitHub { + owner = "v0ldek"; + repo = "rsonpath"; + rev = "v${version}"; + hash = "sha256-ip8+Wy9rmTzFccmjYWb3Nk+gkq3g4e1ty/5+ldIOO10="; + }; + + cargoHash = "sha256-5V0H2FeHI1SByzLsviOR+qHwYhZGiNmMawCTYjk2P24="; + + buildNoDefaultFeatures = true; + buildFeatures = [ + "default-optimizations" + ] ++ lib.optionals withSimd [ + "simd" + ]; + + meta = with lib; { + description = "Blazing fast Rust JSONPath query engine"; + homepage = "https://github.com/v0ldek/rsonpath"; + changelog = "https://github.com/v0ldek/rsonpath/blob/${src.rev}/CHANGELOG.md"; + license = licenses.mit; + maintainers = with maintainers; [ figsoda ]; + # build fails on platforms without simd support, even when withSimd = false + broken = !stdenv.isx86_64; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 489e3d50e00c..1e958bae03a3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18731,6 +18731,8 @@ with pkgs; rsass = callPackage ../development/tools/misc/rsass { }; + rsonpath = callPackage ../development/tools/misc/rsonpath { }; + rufo = callPackage ../development/tools/rufo { }; samurai = callPackage ../development/tools/build-managers/samurai { }; From 822ae3e89125fb2f709a237435713b020b00ab37 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabi=C3=A1n=20Heredia=20Montiel?= Date: Sun, 26 Mar 2023 20:54:51 -0600 Subject: [PATCH 62/94] nvidia-vaapi-driver: add `-Wno-error` --- .../development/libraries/nvidia-vaapi-driver/default.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/development/libraries/nvidia-vaapi-driver/default.nix b/pkgs/development/libraries/nvidia-vaapi-driver/default.nix index 752c19fb2cf1..5e559af9357b 100644 --- a/pkgs/development/libraries/nvidia-vaapi-driver/default.nix +++ b/pkgs/development/libraries/nvidia-vaapi-driver/default.nix @@ -39,6 +39,14 @@ stdenv.mkDerivation rec { libva ]; + # Note: Attempt to remove on next release after 0.0.9 + # nixpkgs reference: https://github.com/NixOS/nixpkgs/pull/221978#issuecomment-1483892437 + # upstream: https://github.com/elFarto/nvidia-vaapi-driver/issues/188 + NIX_CFLAGS_COMPILE = [ + "-Wno-error=format=" + "-Wno-error=int-conversion" + ]; + postFixup = '' addOpenGLRunpath "$out/lib/dri/nvidia_drv_video.so" ''; From 9c7e5c7c532d88f194a96d7711c580b363e556b4 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Mon, 27 Mar 2023 00:41:00 -0400 Subject: [PATCH 63/94] python3Packages.pymoo: 0.6.0 -> 0.6.0.1 (#223332) --- pkgs/development/python-modules/pymoo/default.nix | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pymoo/default.nix b/pkgs/development/python-modules/pymoo/default.nix index 134319d0a89b..637bd4dc17b3 100644 --- a/pkgs/development/python-modules/pymoo/default.nix +++ b/pkgs/development/python-modules/pymoo/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub +, fetchpatch , pytestCheckHook , writeText , autograd @@ -19,13 +20,13 @@ buildPythonPackage rec { pname = "pymoo"; - version = "0.6.0"; + version = "0.6.0.1"; src = fetchFromGitHub { owner = "anyoptimization"; repo = "pymoo"; rev = version; - hash = "sha256-dzKr+u84XmPShWXFjH7V9KzwJPGZz3msGOe1S7FlGTQ="; + hash = "sha256-+qtW7hfSo266n1SRzAgHIu99W5Sl+NYbKOHXv/JI9IA="; }; pymoo_data = fetchFromGitHub { @@ -35,6 +36,14 @@ buildPythonPackage rec { hash = "sha256-iGWPepZw3kJzw5HKV09CvemVvkvFQ38GVP+BAryBSs0="; }; + patches = [ + # https://github.com/anyoptimization/pymoo/pull/407 + (fetchpatch { + url = "https://github.com/anyoptimization/pymoo/commit/be57ece64275469daece1e8ef12b2b6ee05362c9.diff"; + hash = "sha256-BLPrUqNbAsAecfYahESEJF6LD+kehUYmkTvl/nvyqII="; + }) + ]; + postPatch = '' substituteInPlace setup.py \ --replace "cma==3.2.2" "cma" \ From 3b8656349258ff70c03e1bde168a962059ef6297 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 27 Mar 2023 05:45:32 +0000 Subject: [PATCH 64/94] mpd-mpris: 0.3.1 -> 0.4.0 --- pkgs/tools/audio/mpd-mpris/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/audio/mpd-mpris/default.nix b/pkgs/tools/audio/mpd-mpris/default.nix index 71d823244fae..9992f118cad0 100644 --- a/pkgs/tools/audio/mpd-mpris/default.nix +++ b/pkgs/tools/audio/mpd-mpris/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "mpd-mpris"; - version = "0.3.1"; + version = "0.4.0"; src = fetchFromGitHub { owner = "natsukagami"; repo = pname; rev = "v${version}"; - sha256 = "sha256-eI7/E5rhNCZfURwGkfa0f+Yie1EU8zR9r+1eAqrlmVY="; + sha256 = "sha256-ryLqGH81Z+5GQ1ROHpCWmCHKSfS8g35b0wCmr8aokWk="; }; - vendorSha256 = "sha256-GmdD/4VYp3KeblNGgltFWHdOnK5qsBa2ygIYOBrH+b0="; + vendorHash = "sha256-GmdD/4VYp3KeblNGgltFWHdOnK5qsBa2ygIYOBrH+b0="; doCheck = false; From f70568dd6d3babc3749796acc9ec58c7fcabf71c Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 27 Mar 2023 09:01:58 +0200 Subject: [PATCH 65/94] qovery-cli: 0.54.0 -> 0.55.0 Diff: https://github.com/Qovery/qovery-cli/compare/v0.54.0...v0.55.0 Changelog: https://github.com/Qovery/qovery-cli/releases/tag/v0.55.0 --- pkgs/tools/admin/qovery-cli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/admin/qovery-cli/default.nix b/pkgs/tools/admin/qovery-cli/default.nix index 836c1068531e..50b83a6664b7 100644 --- a/pkgs/tools/admin/qovery-cli/default.nix +++ b/pkgs/tools/admin/qovery-cli/default.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "qovery-cli"; - version = "0.54.0"; + version = "0.55.0"; src = fetchFromGitHub { owner = "Qovery"; repo = pname; rev = "v${version}"; - hash = "sha256-XphLzYdZg+aSk7fgDz61ADxb+sgsck6TuZ1++PGu/dE="; + hash = "sha256-3MiKivewGl4J/yQJ+wLTwh8w6HO8XuX9/b6mwtbvW3o="; }; vendorHash = "sha256-V7yPXSN+3H8NkD384MkvKbymNQ/O2Q9HoMO4M8mzVto="; From 111ff168c9b0dbdd8624a85f5d11632fc2da8848 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 27 Mar 2023 09:03:01 +0200 Subject: [PATCH 66/94] amass: 3.22.1 -> 3.22.2 Diff: https://github.com/OWASP/Amass/compare/v3.22.1...v3.22.2 Changelog: https://github.com/OWASP/Amass/releases/tag/v3.22.2 --- pkgs/tools/networking/amass/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/amass/default.nix b/pkgs/tools/networking/amass/default.nix index 4666cdf97bd9..9311451a5259 100644 --- a/pkgs/tools/networking/amass/default.nix +++ b/pkgs/tools/networking/amass/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "amass"; - version = "3.22.1"; + version = "3.22.2"; src = fetchFromGitHub { owner = "OWASP"; repo = "Amass"; rev = "v${version}"; - hash = "sha256-hkYN28M2t8SXmIrSEQEWM5ndCx1xgpHThNg0UFzQqLU="; + hash = "sha256-q6neBDk/kcvAoih4urRTFmhH6N7Fh/hEJQtL//kqJiI="; }; vendorHash = "sha256-fZd++VsLcs3MzcM23zE3AVaDPXf+cuLdJp8hsCeEZ1Y="; From bb82199ebebf26c262712daaa90f2a3f53777d41 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 27 Mar 2023 09:04:15 +0200 Subject: [PATCH 67/94] python310Packages.yalexs-ble: 2.1.6 -> 2.1.10 Changelog: https://github.com/bdraco/yalexs-ble/blob/v2.1.10/CHANGELOG.md --- pkgs/development/python-modules/yalexs-ble/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/yalexs-ble/default.nix b/pkgs/development/python-modules/yalexs-ble/default.nix index 510e75a25a3a..b9bd837c169b 100644 --- a/pkgs/development/python-modules/yalexs-ble/default.nix +++ b/pkgs/development/python-modules/yalexs-ble/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "yalexs-ble"; - version = "2.1.6"; + version = "2.1.10"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "bdraco"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-RNoh7Uo7I5kMveX74Gt8r9Mse6qdYOqc/UKrEfuNm18="; + hash = "sha256-B1ncj/5Z+V+mXTW+bY7BXsKjwaH8SgZI6nDZn6Qc754="; }; nativeBuildInputs = [ From bc80e23d048ec46e224352e530b6a86ecd03d547 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 27 Mar 2023 09:04:32 +0200 Subject: [PATCH 68/94] python310Packages.pydeconz: 110 -> 111 Diff: https://github.com/Kane610/deconz/compare/refs/tags/v110...v111 Changelog: https://github.com/Kane610/deconz/releases/tag/v111 --- pkgs/development/python-modules/pydeconz/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pydeconz/default.nix b/pkgs/development/python-modules/pydeconz/default.nix index a0d41e0a56a8..7dbf0c8e6c6b 100644 --- a/pkgs/development/python-modules/pydeconz/default.nix +++ b/pkgs/development/python-modules/pydeconz/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "pydeconz"; - version = "110"; + version = "111"; format = "setuptools"; disabled = pythonOlder "3.9"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "Kane610"; repo = "deconz"; rev = "refs/tags/v${version}"; - hash = "sha256-2eHKFq+urzJS3K55O0hca0h4ElowJZD6nIkYkzyBFCM="; + hash = "sha256-QBun9VT42W9EMvNuLZoe6VnXKXAKEXstDKCU7LXEvNQ="; }; propagatedBuildInputs = [ From 7d7f8be0b776dd3f55fb16c2fa939fa2e1e25a68 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 27 Mar 2023 09:09:27 +0200 Subject: [PATCH 69/94] python310Packages.niapy: 2.0.4 -> 2.0.5 Diff: https://github.com/NiaOrg/NiaPy/compare/refs/tags/2.0.4...2.0.5 Changelog: https://github.com/NiaOrg/NiaPy/releases/tag/2.0.5 --- pkgs/development/python-modules/niapy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/niapy/default.nix b/pkgs/development/python-modules/niapy/default.nix index 59f8a881a5dd..b0748f64b805 100644 --- a/pkgs/development/python-modules/niapy/default.nix +++ b/pkgs/development/python-modules/niapy/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "niapy"; - version = "2.0.4"; + version = "2.0.5"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "NiaOrg"; repo = "NiaPy"; rev = "refs/tags/${version}"; - hash = "sha256-bZ9bONFntNx5tcm/gR/uPS5CqicJX281WsvSno8aVlY="; + hash = "sha256-qstTxUo4jZ8YKbEjtDtSZUvR67VNkBQJdXeERJPOMDw="; }; propagatedBuildInputs = [ From 1b6919037c1e5c7449901657a22a84fb9726b94e Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 27 Mar 2023 09:15:02 +0200 Subject: [PATCH 70/94] python310Packages.hahomematic: 2023.2.11 -> 2023.3.0 Diff: https://github.com/danielperna84/hahomematic/compare/refs/tags/2023.2.11...2023.3.0 Changelog: https://github.com/danielperna84/hahomematic/releases/tag/2023.3.0 --- pkgs/development/python-modules/hahomematic/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/hahomematic/default.nix b/pkgs/development/python-modules/hahomematic/default.nix index afcd8841d3bd..88fdc5465c54 100644 --- a/pkgs/development/python-modules/hahomematic/default.nix +++ b/pkgs/development/python-modules/hahomematic/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "hahomematic"; - version = "2023.2.11"; + version = "2023.3.0"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "danielperna84"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-Nrq7Bc9Lzdle8/rINp/GPy+DWANgMe7WCLP48gHohIo="; + hash = "sha256-ZclhJoJg80P0iysA0G7+gTg8S3qJaaAbHsr4v6DUGKQ="; }; nativeBuildInputs = [ From a188ce34366863de551a5721525a52a0aa38612a Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 27 Mar 2023 10:17:52 +0200 Subject: [PATCH 71/94] python310Packages.pyzerproc: remove asynctest --- pkgs/development/python-modules/pyzerproc/default.nix | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/pyzerproc/default.nix b/pkgs/development/python-modules/pyzerproc/default.nix index c14c12c9780c..d79ed3320814 100644 --- a/pkgs/development/python-modules/pyzerproc/default.nix +++ b/pkgs/development/python-modules/pyzerproc/default.nix @@ -1,5 +1,4 @@ { lib -, asynctest , bleak , click , buildPythonPackage @@ -15,12 +14,12 @@ buildPythonPackage rec { version = "0.4.11"; format = "setuptools"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "emlove"; repo = pname; - rev = version; + rev = "refs/tags/${version}"; hash = "sha256-FNiq/dbh5PMTxnKCKDSHEvllehAEUYvWZS+OyP3lSW8="; }; @@ -37,8 +36,6 @@ buildPythonPackage rec { pytest-asyncio pytest-mock pytestCheckHook - ] ++ lib.optionals (pythonOlder "3.8") [ - asynctest ]; pythonImportsCheck = [ From 147e04f2c892ba12f90ee5ece40832229f98cce9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20Madrid-Menc=C3=ADa?= Date: Mon, 27 Mar 2023 12:01:28 +0200 Subject: [PATCH 72/94] wezterm: 20230320-124340-559cb7b0 -> 20230326-111934-3666303c --- .../terminal-emulators/wezterm/Cargo.lock | 387 +++++++++--------- .../terminal-emulators/wezterm/default.nix | 6 +- 2 files changed, 203 insertions(+), 190 deletions(-) diff --git a/pkgs/applications/terminal-emulators/wezterm/Cargo.lock b/pkgs/applications/terminal-emulators/wezterm/Cargo.lock index 926d2f18ceee..eeec1102af35 100644 --- a/pkgs/applications/terminal-emulators/wezterm/Cargo.lock +++ b/pkgs/applications/terminal-emulators/wezterm/Cargo.lock @@ -78,9 +78,9 @@ checksum = "7de8ce5e0f9f8d88245311066a578d72b7af3e7088f32783804676302df237e4" [[package]] name = "arrayref" -version = "0.3.6" +version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4c527152e37cf757a3f78aae5a06fbeefdb07ccc535c980a3208ee3060dd544" +checksum = "6b4930d2cb77ce62f89ee5d5289b4ac049559b1c45539271f5ed4fdc7db34545" [[package]] name = "arrayvec" @@ -161,22 +161,22 @@ dependencies = [ [[package]] name = "async-io" -version = "1.12.0" +version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c374dda1ed3e7d8f0d9ba58715f924862c63eae6849c92d3a18e7fbde9e2794" +checksum = "0fc5b45d93ef0529756f812ca52e44c221b35341892d3dcc34132ac02f3dd2af" dependencies = [ "async-lock", "autocfg", + "cfg-if", "concurrent-queue", "futures-lite", - "libc", "log", "parking", "polling", + "rustix 0.37.3", "slab", "socket2 0.4.9", "waker-fn", - "windows-sys 0.42.0", ] [[package]] @@ -226,24 +226,24 @@ checksum = "0e97ce7de6cf12de5d7226c73f5ba9811622f4db3a5b91b55c53e987e5f91cba" dependencies = [ "proc-macro2", "quote", - "syn 2.0.2", + "syn 2.0.10", ] [[package]] name = "async-task" -version = "4.3.0" +version = "4.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a40729d2133846d9ed0ea60a8b9541bccddab49cd30f0715a1da672fe9a2524" +checksum = "ecc7ab41815b3c653ccd2978ec3255c81349336702dfdf62ee6f7069b12a3aae" [[package]] name = "async-trait" -version = "0.1.67" +version = "0.1.68" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86ea188f25f0255d8f92797797c97ebf5631fa88178beb1a46fdf5622c9a00e4" +checksum = "b9ccdd8f2a161be9bd5c023df56f1b2a0bd1d83872ae53b71a84a12c9bf6e842" dependencies = [ "proc-macro2", "quote", - "syn 2.0.2", + "syn 2.0.10", ] [[package]] @@ -364,12 +364,6 @@ version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" -[[package]] -name = "bitflags" -version = "2.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "487f1e0fcbe47deb8b0574e646def1c903389d95241dd1bbcc6ce4a715dfc0c1" - [[package]] name = "block" version = "0.1.6" @@ -457,13 +451,13 @@ dependencies = [ [[package]] name = "bytemuck_derive" -version = "1.4.0" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1aca418a974d83d40a0c1f0c5cba6ff4bc28d8df099109ca459a2118d40b6322" +checksum = "fdde5c9cd29ebd706ce1b35600920a33550e402fc998a2e53ad3b42c3c47a192" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.10", ] [[package]] @@ -543,24 +537,25 @@ version = "2.34.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a0610544180c38b88101fecf2dd634b174a62eef6946f84dfc6a7127512b381c" dependencies = [ - "bitflags 1.3.2", + "bitflags", "textwrap 0.11.0", "unicode-width", ] [[package]] name = "clap" -version = "4.1.11" +version = "4.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42dfd32784433290c51d92c438bb72ea5063797fc3cc9a21a8c4346bebbb2098" +checksum = "3c911b090850d79fc64fe9ea01e28e465f65e821e08813ced95bced72f7a8a9b" dependencies = [ - "bitflags 2.0.2", + "bitflags", "clap_derive", "clap_lex", "is-terminal", "once_cell", "strsim", "termcolor", + "terminal_size", ] [[package]] @@ -569,7 +564,7 @@ version = "4.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "37686beaba5ac9f3ab01ee3172f792fc6ffdd685bfb9e63cfef02c0571a4e8e1" dependencies = [ - "clap 4.1.11", + "clap 4.1.13", ] [[package]] @@ -578,21 +573,20 @@ version = "4.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2171bc6242ad7a1801422bff039574449b5bd832b715222e500714ce10f91a54" dependencies = [ - "clap 4.1.11", + "clap 4.1.13", "clap_complete", ] [[package]] name = "clap_derive" -version = "4.1.9" +version = "4.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fddf67631444a3a3e3e5ac51c36a5e01335302de677bd78759eaa90ab1f46644" +checksum = "9a932373bab67b984c790ddf2c9ca295d8e3af3b7ef92de5a5bacdccdee4b09b" dependencies = [ "heck", - "proc-macro-error", "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.10", ] [[package]] @@ -630,7 +624,7 @@ version = "0.20.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0c49e86fc36d5704151f5996b7b3795385f50ce09e3be0f47a0cfde869681cf8" dependencies = [ - "bitflags 1.3.2", + "bitflags", "block", "core-foundation 0.7.0", "core-graphics 0.19.2", @@ -738,7 +732,7 @@ name = "config" version = "0.1.0" dependencies = [ "anyhow", - "bitflags 1.3.2", + "bitflags", "colorgrad", "dirs-next", "enum-display-derive", @@ -806,7 +800,7 @@ version = "0.19.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b3889374e6ea6ab25dba90bb5d96202f61108058361f6dc72e8b03e6f8bbe923" dependencies = [ - "bitflags 1.3.2", + "bitflags", "core-foundation 0.7.0", "foreign-types", "libc", @@ -818,7 +812,7 @@ version = "0.22.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2581bbab3b8ffc6fcbd550bf46c355135d16e9ff2a6ea032ad6b9bf1d7efe4fb" dependencies = [ - "bitflags 1.3.2", + "bitflags", "core-foundation 0.9.3", "core-graphics-types", "foreign-types", @@ -831,7 +825,7 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3a68b68b3446082644c91ac778bf50cd4104bfb002b5a6a7c44cca5a2c70788b" dependencies = [ - "bitflags 1.3.2", + "bitflags", "core-foundation 0.9.3", "foreign-types", "libc", @@ -851,9 +845,9 @@ dependencies = [ [[package]] name = "cpufeatures" -version = "0.2.5" +version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28d997bd5e24a5928dd43e46dc529867e207907fe0b239c3477d924f7f2ca320" +checksum = "280a9f2d8b3a38871a3c8a46fb80db65e5e5ed97da80c4d08bf27fb63e35e181" dependencies = [ "libc", ] @@ -1041,7 +1035,7 @@ dependencies = [ "proc-macro2", "quote", "scratch", - "syn 2.0.2", + "syn 2.0.10", ] [[package]] @@ -1058,7 +1052,7 @@ checksum = "631569015d0d8d54e6c241733f944042623ab6df7bc3be7466874b05fcdb1c5f" dependencies = [ "proc-macro2", "quote", - "syn 2.0.2", + "syn 2.0.10", ] [[package]] @@ -1067,7 +1061,7 @@ version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d8f0de2f5a8e7bd4a9eec0e3c781992a4ce1724f68aec7d7a3715344de8b39da" dependencies = [ - "bitflags 1.3.2", + "bitflags", "libloading 0.7.4", "winapi", ] @@ -1390,6 +1384,17 @@ dependencies = [ "winapi", ] +[[package]] +name = "errno" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "50d6a0976c999d473fe89ad888d5a284e55366d9dc9038b1ba2aa15128c4afa0" +dependencies = [ + "errno-dragonfly", + "libc", + "windows-sys 0.45.0", +] + [[package]] name = "errno-dragonfly" version = "0.1.2" @@ -1402,9 +1407,9 @@ dependencies = [ [[package]] name = "euclid" -version = "0.22.7" +version = "0.22.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b52c2ef4a78da0ba68fbe1fd920627411096d2ac478f7f4c9f3a54ba6705bade" +checksum = "ff8b5875b64eb55f4b554f9d0e6413da078d96374974d8bb3bed5f02d55451ce" dependencies = [ "num-traits", ] @@ -1803,7 +1808,7 @@ version = "0.16.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ccf7f68c2995f392c49fffb4f95ae2c873297830eb25c6bc4c114ce8f4562acc" dependencies = [ - "bitflags 1.3.2", + "bitflags", "libc", "libgit2-sys", "log", @@ -1857,7 +1862,7 @@ version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "93e3af942408868f6934a7b85134a3230832b9977cf66125df2f9edcfce4ddcc" dependencies = [ - "bitflags 1.3.2", + "bitflags", "ignore", "walkdir", ] @@ -1897,7 +1902,7 @@ version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7fc59e5f710e310e76e6707f86c561dd646f69a8876da9131703b2f717de818d" dependencies = [ - "bitflags 1.3.2", + "bitflags", "gpu-alloc-types", ] @@ -1907,7 +1912,7 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "54804d0d6bc9d7f26db4eaec1ad10def69b599315f487d32c334a80d1efe67a5" dependencies = [ - "bitflags 1.3.2", + "bitflags", ] [[package]] @@ -1929,7 +1934,7 @@ version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0b0c02e1ba0bdb14e965058ca34e09c020f8e507a760df1121728e0aef68d57a" dependencies = [ - "bitflags 1.3.2", + "bitflags", "gpu-descriptor-types", "hashbrown 0.12.3", ] @@ -1940,7 +1945,7 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "363e3677e55ad168fef68cf9de3a4a310b53124c5e784c53a1d70e92d23f2126" dependencies = [ - "bitflags 1.3.2", + "bitflags", ] [[package]] @@ -2028,7 +2033,7 @@ version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "90601c6189668c7345fc53842cb3f3a3d872203d523be1b3cb44a36a3e62fb85" dependencies = [ - "bitflags 1.3.2", + "bitflags", "com-rs", "libc", "libloading 0.7.4", @@ -2047,7 +2052,7 @@ dependencies = [ "byteorder", "crossbeam-channel", "flate2", - "nom 7.1.3", + "nom", "num-traits", ] @@ -2202,16 +2207,16 @@ dependencies = [ [[package]] name = "iana-time-zone" -version = "0.1.53" +version = "0.1.54" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64c122667b287044802d6ce17ee2ddf13207ed924c712de9a66a5814d5b64765" +checksum = "0c17cc76786e99f8d2f055c11159e7f0091c42474dcc3189fbab96072e873e6d" dependencies = [ "android_system_properties", "core-foundation-sys 0.8.3", "iana-time-zone-haiku", "js-sys", "wasm-bindgen", - "winapi", + "windows 0.46.0", ] [[package]] @@ -2277,9 +2282,9 @@ dependencies = [ [[package]] name = "indexmap" -version = "1.9.2" +version = "1.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1885e79c1fc4b10f0e172c475f458b7f7b93061064d98c3293e98c5ba0c8b399" +checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" dependencies = [ "autocfg", "hashbrown 0.12.3", @@ -2292,7 +2297,7 @@ version = "0.9.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f8069d3ec154eb856955c1c0fbffefbf5f3c40a104ec912d4797314c1801abff" dependencies = [ - "bitflags 1.3.2", + "bitflags", "inotify-sys", "libc", ] @@ -2326,9 +2331,9 @@ dependencies = [ [[package]] name = "io-lifetimes" -version = "1.0.8" +version = "1.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0dd6da19f25979c7270e70fa95ab371ec3b701cd0eefc47667a09785b3c59155" +checksum = "09270fd4fa1111bc614ed2246c7ef56239a3063d5be0d1ec3b589c505d400aeb" dependencies = [ "hermit-abi 0.3.1", "libc", @@ -2358,7 +2363,7 @@ checksum = "8687c819457e979cc940d09cb16e42a1bf70aa6b60a549de6d3a62a0ee90c69e" dependencies = [ "hermit-abi 0.3.1", "io-lifetimes", - "rustix", + "rustix 0.36.11", "windows-sys 0.45.0", ] @@ -2412,6 +2417,7 @@ dependencies = [ "config", "luahelper", "serde_json", + "wezterm-dynamic", ] [[package]] @@ -2464,7 +2470,7 @@ version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8367585489f01bc55dd27404dcf56b95e6da061a256a666ab23be9ba96a2e587" dependencies = [ - "bitflags 1.3.2", + "bitflags", "libc", ] @@ -2588,18 +2594,19 @@ dependencies = [ [[package]] name = "libssh-rs" -version = "0.1.5" -source = "git+https://github.com/wez/libssh-rs.git#c48876e7027d3c21747a283be631177aad533eff" +version = "0.1.7" +source = "git+https://github.com/wez/libssh-rs.git#44a08196acd1a2277ec7ebce2a47618775f3c59c" dependencies = [ - "bitflags 1.3.2", + "bitflags", "libssh-rs-sys", + "openssl-sys", "thiserror", ] [[package]] name = "libssh-rs-sys" version = "0.1.3" -source = "git+https://github.com/wez/libssh-rs.git#c48876e7027d3c21747a283be631177aad533eff" +source = "git+https://github.com/wez/libssh-rs.git#44a08196acd1a2277ec7ebce2a47618775f3c59c" dependencies = [ "cc", "libz-sys", @@ -2672,6 +2679,12 @@ version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f051f77a7c8e6957c0696eac88f26b0117e54f52d3fc682ab19397a8812846a4" +[[package]] +name = "linux-raw-sys" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cd550e73688e6d578f0ac2119e32b797a327631a42f9433e59d02e139c8df60d" + [[package]] name = "lock_api" version = "0.4.9" @@ -2841,7 +2854,7 @@ version = "0.24.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "de11355d1f6781482d027a3b4d4de7825dcedb197bf573e0596d00008402d060" dependencies = [ - "bitflags 1.3.2", + "bitflags", "block", "core-graphics-types", "foreign-types", @@ -2874,9 +2887,9 @@ dependencies = [ [[package]] name = "mime" -version = "0.3.16" +version = "0.3.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a60c7ce501c71e03a9c9c0d35b861413ae925bd979cc7a4e30d060069aaac8d" +checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" [[package]] name = "minimal-lexical" @@ -2952,7 +2965,7 @@ dependencies = [ "async-trait", "base64 0.21.0", "bintree", - "bitflags 1.3.2", + "bitflags", "chrono", "config", "crossbeam", @@ -3018,7 +3031,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5eafe22a23b797c9bc227c6c896419b26b5bb88fa903417a3adaed08778850d5" dependencies = [ "bit-set", - "bitflags 1.3.2", + "bitflags", "codespan-reporting", "hexf-parse", "indexmap", @@ -3073,7 +3086,7 @@ version = "0.23.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8f3790c00a0150112de0f4cd161e3d7fc4b2d8a5542ffc35f099a2562aecb35c" dependencies = [ - "bitflags 1.3.2", + "bitflags", "cc", "cfg-if", "libc", @@ -3086,7 +3099,7 @@ version = "0.24.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fa52e972a9a719cecb6864fb88568781eb706bac2cd1d4f04a648542dbf78069" dependencies = [ - "bitflags 1.3.2", + "bitflags", "cfg-if", "libc", "memoffset 0.6.5", @@ -3099,7 +3112,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f346ff70e7dbfd675fe90590b92d59ef2de15a8779ae305ebcbfd3f0caf59be4" dependencies = [ "autocfg", - "bitflags 1.3.2", + "bitflags", "cfg-if", "libc", "memoffset 0.6.5", @@ -3112,7 +3125,7 @@ version = "0.26.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bfdda3d196821d6af13126e40375cdf7da646a96114af134d5f417a9a1dc8e1a" dependencies = [ - "bitflags 1.3.2", + "bitflags", "cfg-if", "libc", "memoffset 0.7.1", @@ -3126,16 +3139,6 @@ version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b93853da6d84c2e3c7d730d6473e8817692dd89be387eb01b94d7f108ecb5b8c" -[[package]] -name = "nom" -version = "5.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffb4262d26ed83a1c0a33a38fe2bb15797329c85770da05e6b828ddb782627af" -dependencies = [ - "memchr", - "version_check", -] - [[package]] name = "nom" version = "7.1.3" @@ -3164,7 +3167,7 @@ version = "5.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "58ea850aa68a06e48fdb069c0ec44d0d64c8dbffa49bf3b6f7f0a901fdea1ba9" dependencies = [ - "bitflags 1.3.2", + "bitflags", "crossbeam-channel", "filetime", "fsevent-sys", @@ -3365,7 +3368,7 @@ version = "0.10.38" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0c7ae222234c30df141154f159066c5093ff73b63204dcda7121eb082fc56a95" dependencies = [ - "bitflags 1.3.2", + "bitflags", "cfg-if", "foreign-types", "libc", @@ -3381,9 +3384,9 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] name = "openssl-src" -version = "300.0.12+3.0.8" +version = "300.0.13+3.0.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d974055736373bab35bdb25e578fd477e1e195611744c42373294ac8897068d" +checksum = "f00789a63ec8951fcda9adb0f2258582afdcfe1b2435e332d3a859896f814f0a" dependencies = [ "cc", ] @@ -3404,9 +3407,9 @@ dependencies = [ [[package]] name = "ordered-float" -version = "3.4.0" +version = "3.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d84eb1409416d254e4a9c8fa56cc24701755025b458f0fcd8e59e1f5f40c23bf" +checksum = "13a384337e997e6860ffbaa83708b2ef329fd8c54cb67a5f64d421e0f943254f" dependencies = [ "num-traits", "serde", @@ -3710,7 +3713,7 @@ version = "0.17.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5d708eaf860a19b19ce538740d2b4bdeeb8337fa53f7738455e706623ad5c638" dependencies = [ - "bitflags 1.3.2", + "bitflags", "crc32fast", "flate2", "miniz_oxide 0.6.2", @@ -3723,7 +3726,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7e1f879b2998099c2d69ab9605d145d5b661195627eccc680002c4918a7fb6fa" dependencies = [ "autocfg", - "bitflags 1.3.2", + "bitflags", "cfg-if", "concurrent-queue", "libc", @@ -3737,7 +3740,7 @@ name = "portable-pty" version = "0.8.1" dependencies = [ "anyhow", - "bitflags 1.3.2", + "bitflags", "downcast-rs", "filedescriptor", "futures", @@ -3763,9 +3766,9 @@ checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" [[package]] name = "predicates" -version = "3.0.1" +version = "3.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ba7d6ead3e3966038f68caa9fc1f860185d95a793180bbcfe0d0da47b3961ed" +checksum = "c575290b64d24745b6c57a12a31465f0a66f3a4799686a6921526a33b0797965" dependencies = [ "anstyle", "difflib", @@ -3802,35 +3805,11 @@ dependencies = [ "toml_edit", ] -[[package]] -name = "proc-macro-error" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" -dependencies = [ - "proc-macro-error-attr", - "proc-macro2", - "quote", - "syn 1.0.109", - "version_check", -] - -[[package]] -name = "proc-macro-error-attr" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" -dependencies = [ - "proc-macro2", - "quote", - "version_check", -] - [[package]] name = "proc-macro2" -version = "1.0.52" +version = "1.0.53" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d0e1ae9e836cc3beddd63db0df682593d7e2d3d891ae8c9083d2113e1744224" +checksum = "ba466839c78239c09faf015484e5cc04860f88242cff4d03eb038f04b4699b73" dependencies = [ "unicode-ident", ] @@ -3884,7 +3863,7 @@ version = "0.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2d9cc634bc78768157b5cbfe988ffcd1dcba95cd2b2f03a88316c08c6d00ed63" dependencies = [ - "bitflags 1.3.2", + "bitflags", "getopts", "memchr", "unicase", @@ -4006,7 +3985,7 @@ version = "10.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6c297679cb867470fa8c9f67dbba74a78d78e3e98d7cf2b08d6d71540f797332" dependencies = [ - "bitflags 1.3.2", + "bitflags", ] [[package]] @@ -4055,7 +4034,7 @@ version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" dependencies = [ - "bitflags 1.3.2", + "bitflags", ] [[package]] @@ -4071,9 +4050,9 @@ dependencies = [ [[package]] name = "regex" -version = "1.7.1" +version = "1.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48aaa5748ba571fb95cd2c85c09f629215d3a6ece942baa100950af03a34f733" +checksum = "8b1f693b24f6ac912f4893ef08244d70b6067480d2f1a46e950c9691e6749d1d" dependencies = [ "aho-corasick", "memchr", @@ -4088,9 +4067,9 @@ checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132" [[package]] name = "regex-syntax" -version = "0.6.28" +version = "0.6.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "456c603be3e8d448b072f410900c09faf164fbce2d480456f50eea6e25f9c848" +checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" [[package]] name = "renderdoc-sys" @@ -4100,9 +4079,9 @@ checksum = "f1382d1f0a252c4bf97dc20d979a2fdd05b024acd7c2ed0f7595d7817666a157" [[package]] name = "reqwest" -version = "0.11.14" +version = "0.11.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21eed90ec8570952d53b772ecf8f206aa1ec9a3d76b2521c56c42973f2d91ee9" +checksum = "0ba30cc2c0cd02af1222ed216ba659cdb2f879dfe3181852fe7c50b1d0005949" dependencies = [ "base64 0.21.0", "bytes", @@ -4206,7 +4185,7 @@ version = "0.27.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "85127183a999f7db96d1a976a309eebbfb6ea3b0b400ddd8340190129de6eb7a" dependencies = [ - "bitflags 1.3.2", + "bitflags", "fallible-iterator", "fallible-streaming-iterator", "hashlink", @@ -4217,9 +4196,9 @@ dependencies = [ [[package]] name = "rustc-demangle" -version = "0.1.21" +version = "0.1.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ef03e0a2b150c7a90d01faf6254c9c48a41e95fb2a8c2ac1c6f0d2b9aefc342" +checksum = "d4a36c42d1873f9a77c53bde094f9664d9891bc604a45b4798fd2c389ed12e5b" [[package]] name = "rustc-hash" @@ -4238,15 +4217,29 @@ dependencies = [ [[package]] name = "rustix" -version = "0.36.10" +version = "0.36.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2fe885c3a125aa45213b68cc1472a49880cb5923dc23f522ad2791b882228778" +checksum = "db4165c9963ab29e422d6c26fbc1d37f15bace6b2810221f9d925023480fcf0e" dependencies = [ - "bitflags 1.3.2", - "errno", + "bitflags", + "errno 0.2.8", "io-lifetimes", "libc", - "linux-raw-sys", + "linux-raw-sys 0.1.4", + "windows-sys 0.45.0", +] + +[[package]] +name = "rustix" +version = "0.37.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62b24138615de35e32031d041a09032ef3487a616d901ca4db224e7d557efae2" +dependencies = [ + "bitflags", + "errno 0.3.0", + "io-lifetimes", + "libc", + "linux-raw-sys 0.3.0", "windows-sys 0.45.0", ] @@ -4304,7 +4297,7 @@ version = "2.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a332be01508d814fed64bf28f798a146d73792121129962fdf335bb3c49a4254" dependencies = [ - "bitflags 1.3.2", + "bitflags", "core-foundation 0.9.3", "core-foundation-sys 0.8.3", "libc", @@ -4347,9 +4340,9 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.157" +version = "1.0.158" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "707de5fcf5df2b5788fca98dd7eab490bc2fd9b7ef1404defc462833b83f25ca" +checksum = "771d4d9c4163ee138805e12c710dd365e4f44be8be0503cb1bb9eb989425d9c9" dependencies = [ "serde_derive", ] @@ -4366,13 +4359,13 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.157" +version = "1.0.158" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78997f4555c22a7971214540c4a661291970619afd56de19f77e0de86296e1e5" +checksum = "e801c1712f48475582b7696ac71e0ca34ebb30e09338425384269d9717c62cad" dependencies = [ "proc-macro2", "quote", - "syn 2.0.2", + "syn 2.0.10", ] [[package]] @@ -4394,7 +4387,7 @@ checksum = "bcec881020c684085e55a25f7fd888954d56609ef363479dc5a1305eb0d40cab" dependencies = [ "proc-macro2", "quote", - "syn 2.0.2", + "syn 2.0.10", ] [[package]] @@ -4647,7 +4640,7 @@ version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f307c47d32d2715eb2e0ece5589057820e0e5e70d07c247d1063e844e107f454" dependencies = [ - "bitflags 1.3.2", + "bitflags", "dlib", "lazy_static", "log", @@ -4762,7 +4755,7 @@ version = "0.2.0+1.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "246bfa38fe3db3f1dfc8ca5a2cdeb7348c78be2112740cc0ec8ef18b6d94f830" dependencies = [ - "bitflags 1.3.2", + "bitflags", "num-traits", ] @@ -4794,7 +4787,7 @@ version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e7fe461910559f6d5604c3731d00d2aafc4a83d1665922e280f42f9a168d5455" dependencies = [ - "bitflags 1.3.2", + "bitflags", "libc", "libssh2-sys", "parking_lot 0.11.2", @@ -4833,7 +4826,7 @@ checksum = "9df65f20698aeed245efdde3628a6b559ea1239bbb871af1b6e3b58c413b2bd1" name = "strip-ansi-escapes" version = "0.1.0" dependencies = [ - "clap 4.1.11", + "clap 4.1.13", "termwiz", ] @@ -4862,9 +4855,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.2" +version = "2.0.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59d3276aee1fa0c33612917969b5172b5be2db051232a6e4826f1a1a9191b045" +checksum = "5aad1363ed6d37b84299588d62d3a7d95b5a5c2d9aad5c85609fda12afaa1f40" dependencies = [ "proc-macro2", "quote", @@ -4939,7 +4932,7 @@ dependencies = [ "cfg-if", "fastrand", "redox_syscall", - "rustix", + "rustix 0.36.11", "windows-sys 0.42.0", ] @@ -4963,14 +4956,24 @@ dependencies = [ ] [[package]] -name = "terminfo" -version = "0.7.5" +name = "terminal_size" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da31aef70da0f6352dbcb462683eb4dd2bfad01cf3fc96cf204547b9a839a585" +checksum = "4c9afddd2cec1c0909f06b00ef33f94ab2cc0578c4a610aa208ddfec8aa2b43a" +dependencies = [ + "rustix 0.36.11", + "windows-sys 0.45.0", +] + +[[package]] +name = "terminfo" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "666cd3a6681775d22b200409aad3b089c5b99fb11ecdd8a204d9d62f8148498f" dependencies = [ "dirs", "fnv", - "nom 5.1.2", + "nom", "phf 0.11.1", "phf_codegen", ] @@ -5001,11 +5004,11 @@ checksum = "3369f5ac52d5eb6ab48c6b4ffdc8efbcad6b89c765749064ba298f2c68a16a76" [[package]] name = "termwiz" -version = "0.21.0" +version = "0.22.0" dependencies = [ "anyhow", "base64 0.21.0", - "bitflags 1.3.2", + "bitflags", "cassowary", "criterion", "env_logger", @@ -5099,7 +5102,7 @@ checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f" dependencies = [ "proc-macro2", "quote", - "syn 2.0.2", + "syn 2.0.10", ] [[package]] @@ -5316,9 +5319,9 @@ dependencies = [ [[package]] name = "toml_edit" -version = "0.19.7" +version = "0.19.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc18466501acd8ac6a3f615dd29a3438f8ca6bb3b19537138b3106e575621274" +checksum = "239410c8609e8125456927e6707163a3b1fdb40561e4b803bc041f466ccfdc13" dependencies = [ "indexmap", "serde", @@ -5412,9 +5415,9 @@ dependencies = [ [[package]] name = "unicode-bidi" -version = "0.3.12" +version = "0.3.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d502c968c6a838ead8e69b2ee18ec708802f99db92a0d156705ec9ef801993b" +checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460" [[package]] name = "unicode-ident" @@ -5670,7 +5673,7 @@ version = "0.29.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3f3b068c05a039c9f755f881dc50f01732214f5685e379829759088967c46715" dependencies = [ - "bitflags 1.3.2", + "bitflags", "downcast-rs", "libc", "nix 0.24.3", @@ -5719,7 +5722,7 @@ version = "0.29.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b950621f9354b322ee817a23474e479b34be96c2e909c14f7bc0100e9a970bc6" dependencies = [ - "bitflags 1.3.2", + "bitflags", "wayland-client", "wayland-commons", "wayland-scanner", @@ -5768,7 +5771,7 @@ version = "0.1.0" dependencies = [ "anyhow", "chrono", - "clap 4.1.11", + "clap 4.1.13", "clap_complete", "clap_complete_fig", "codec", @@ -5942,11 +5945,11 @@ version = "0.1.0" dependencies = [ "anyhow", "benchmarking", - "bitflags 1.3.2", + "bitflags", "bytemuck", "cc", "chrono", - "clap 4.1.11", + "clap 4.1.13", "codec", "colorgrad", "config", @@ -6030,7 +6033,7 @@ name = "wezterm-gui-subcommands" version = "0.1.0" dependencies = [ "anyhow", - "clap 4.1.11", + "clap 4.1.13", "config", ] @@ -6038,7 +6041,7 @@ dependencies = [ name = "wezterm-input-types" version = "0.1.0" dependencies = [ - "bitflags 1.3.2", + "bitflags", "euclid", "lazy_static", "serde", @@ -6051,7 +6054,7 @@ version = "0.1.0" dependencies = [ "anyhow", "async_ossl", - "clap 4.1.11", + "clap 4.1.13", "config", "env-bootstrap", "libc", @@ -6062,6 +6065,7 @@ dependencies = [ "portable-pty", "promise", "umask", + "wezterm-blob-leases", "wezterm-gui-subcommands", "wezterm-mux-server-impl", "wezterm-term", @@ -6108,9 +6112,9 @@ dependencies = [ "assert_fs", "async_ossl", "base64 0.21.0", - "bitflags 1.3.2", + "bitflags", "camino", - "clap 4.1.11", + "clap 4.1.13", "dirs-next", "env_logger", "filedescriptor", @@ -6140,7 +6144,7 @@ name = "wezterm-term" version = "0.1.0" dependencies = [ "anyhow", - "bitflags 1.3.2", + "bitflags", "csscolorparser", "env_logger", "finl_unicode", @@ -6213,7 +6217,7 @@ checksum = "7131408d940e335792645a98f03639573b0480e9e2e7cddbbab74f7c6d9f3fff" dependencies = [ "arrayvec", "bit-vec", - "bitflags 1.3.2", + "bitflags", "codespan-reporting", "fxhash", "log", @@ -6230,15 +6234,15 @@ dependencies = [ [[package]] name = "wgpu-hal" -version = "0.15.3" +version = "0.15.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7762ae7fcc06943c1b5d4987ab0194e82aaba7767fbfb75d3458844c5b82cc45" +checksum = "bdcf61a283adc744bb5453dd88ea91f3f86d5ca6b027661c6c73c7734ae0288b" dependencies = [ "android_system_properties", "arrayvec", "ash", "bit-set", - "bitflags 1.3.2", + "bitflags", "block", "core-graphics-types", "d3d12", @@ -6276,7 +6280,7 @@ version = "0.15.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "32444e121b0bd00cb02c0de32fde457a9491bd44e03e7a5db6df9b1da2f6f110" dependencies = [ - "bitflags 1.3.2", + "bitflags", "js-sys", "web-sys", ] @@ -6337,7 +6341,7 @@ dependencies = [ "async-io", "async-task", "async-trait", - "bitflags 1.3.2", + "bitflags", "bytes", "cgl", "clipboard-win", @@ -6440,6 +6444,15 @@ dependencies = [ "windows-targets", ] +[[package]] +name = "windows" +version = "0.46.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cdacb41e6a96a052c6cb63a144f24900236121c6f63f4f8219fef5977ecb0c25" +dependencies = [ + "windows-targets", +] + [[package]] name = "windows-sys" version = "0.42.0" @@ -6553,9 +6566,9 @@ checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" [[package]] name = "winnow" -version = "0.3.6" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23d020b441f92996c80d94ae9166e8501e59c7bb56121189dc9eab3bd8216966" +checksum = "ae8970b36c66498d8ff1d66685dc86b91b29db0c7739899012f63a63814b4b28" dependencies = [ "memchr", ] @@ -6603,7 +6616,7 @@ version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0faeb4d7e2d54fff4a0584f61297e86b106914af2029778de7b427f72564d6c5" dependencies = [ - "bitflags 1.3.2", + "bitflags", "libc", "quick-xml 0.22.0", "x11", @@ -6614,7 +6627,7 @@ name = "xcb-imdkit" version = "0.2.0" source = "git+https://github.com/wez/xcb-imdkit-rs.git?branch=hangfix#c6859ab2b8a233ca5dda5e8e4f1634d34ce9c85c" dependencies = [ - "bitflags 1.3.2", + "bitflags", "cc", "lazy_static", "pkg-config", @@ -6627,7 +6640,7 @@ version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "463705a63313cd4301184381c5e8042f0a7e9b4bb63653f216311d4ae74690b7" dependencies = [ - "nom 7.1.3", + "nom", ] [[package]] @@ -6761,9 +6774,9 @@ dependencies = [ [[package]] name = "zune-inflate" -version = "0.2.51" +version = "0.2.52" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a01728b79fb9b7e28a8c11f715e1cd8dc2cda7416a007d66cac55cebb3a8ac6b" +checksum = "10ca8ee3897e213bf74d46641942575fb9b4bd9933cbce0b40eb320836da67e0" dependencies = [ "simd-adler32", ] diff --git a/pkgs/applications/terminal-emulators/wezterm/default.nix b/pkgs/applications/terminal-emulators/wezterm/default.nix index b4900c34b906..899c599c23f3 100644 --- a/pkgs/applications/terminal-emulators/wezterm/default.nix +++ b/pkgs/applications/terminal-emulators/wezterm/default.nix @@ -31,14 +31,14 @@ rustPlatform.buildRustPackage rec { pname = "wezterm"; - version = "20230320-124340-559cb7b0"; + version = "20230326-111934-3666303c"; src = fetchFromGitHub { owner = "wez"; repo = pname; rev = version; fetchSubmodules = true; - sha256 = "sha256-u9lOK4DV9NM3CUYjMTovCY4XF5Xxg4V+rQwIjioqTec="; + sha256 = "sha256-tgJUnQKVdLJKohda9oy9dwz53OiK4O0A9YlsI0o+meY="; }; postPatch = '' @@ -52,7 +52,7 @@ rustPlatform.buildRustPackage rec { lockFile = ./Cargo.lock; outputHashes = { "image-0.24.5" = "sha256-fTajVwm88OInqCPZerWcSAm1ga46ansQ3EzAmbT58Js="; - "libssh-rs-0.1.5" = "sha256-gxT9mZ+whotZhEoj783aQPlQPqQXd8gQL3zZglMYC1k="; + "libssh-rs-0.1.7" = "sha256-pLaWKk/iGy7FfoVafpPYzErnKudxeIWzssWv2Zlm58s="; "xcb-imdkit-0.2.0" = "sha256-QOT9HLlA26DVPUF4ViKH2ckexUsu45KZMdJwoUhW+hA="; }; }; From 9b60eef4bdcb63b0a51e260d6fec79ff53f9d67b Mon Sep 17 00:00:00 2001 From: 06kellyjac Date: Mon, 27 Mar 2023 12:00:07 +0100 Subject: [PATCH 73/94] authelia: move module under security and minor fixes Fixed test access to lib Added nixos test to passthru --- nixos/modules/module-list.nix | 2 +- nixos/modules/services/{web-servers => security}/authelia.nix | 0 nixos/tests/authelia.nix | 2 +- pkgs/servers/authelia/default.nix | 3 ++- 4 files changed, 4 insertions(+), 3 deletions(-) rename nixos/modules/services/{web-servers => security}/authelia.nix (100%) diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 23ffb81b6a4e..abd88d285a99 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -1063,6 +1063,7 @@ ./services/search/opensearch.nix ./services/search/qdrant.nix ./services/security/aesmd.nix + ./services/security/authelia.nix ./services/security/certmgr.nix ./services/security/cfssl.nix ./services/security/clamav.nix @@ -1210,7 +1211,6 @@ ./services/web-apps/zabbix.nix ./services/web-servers/agate.nix ./services/web-servers/apache-httpd/default.nix - ./services/web-servers/authelia.nix ./services/web-servers/caddy/default.nix ./services/web-servers/darkhttpd.nix ./services/web-servers/fcgiwrap.nix diff --git a/nixos/modules/services/web-servers/authelia.nix b/nixos/modules/services/security/authelia.nix similarity index 100% rename from nixos/modules/services/web-servers/authelia.nix rename to nixos/modules/services/security/authelia.nix diff --git a/nixos/tests/authelia.nix b/nixos/tests/authelia.nix index 7c239ebdd5af..679c65fea087 100644 --- a/nixos/tests/authelia.nix +++ b/nixos/tests/authelia.nix @@ -1,5 +1,5 @@ # Test Authelia as an auth server for Traefik as a reverse proxy of a local web service -import ./make-test-python.nix ({ pkgs, ... }: { +import ./make-test-python.nix ({ lib, ... }: { name = "authelia"; meta.maintainers = with lib.maintainers; [ jk ]; diff --git a/pkgs/servers/authelia/default.nix b/pkgs/servers/authelia/default.nix index 3e71fc776562..4a2ed9bd5729 100644 --- a/pkgs/servers/authelia/default.nix +++ b/pkgs/servers/authelia/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, buildGoModule, installShellFiles, callPackage }: +{ lib, fetchFromGitHub, buildGoModule, installShellFiles, callPackage, nixosTests }: let inherit (import ./sources.nix { inherit fetchFromGitHub; }) pname version src vendorHash; @@ -56,6 +56,7 @@ buildGoModule rec { # if overriding replace the postPatch to put your web UI output in internal/server/public_html inherit web; updateScript = ./update.sh; + tests = { inherit (nixosTests) authelia; }; }; meta = with lib; { From 8a2c93e5b80ae8e93115628dff4a423a2ca395b7 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Mon, 27 Mar 2023 13:39:07 +0200 Subject: [PATCH 74/94] xfsprogs: 6.1.1 -> 6.2.0 https://git.kernel.org/pub/scm/fs/xfs/xfsprogs-dev.git/tree/doc/CHANGES?id=a61d6360dd9a440a7d77d911d44eafd328eaa169#n1 --- pkgs/tools/filesystems/xfsprogs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/filesystems/xfsprogs/default.nix b/pkgs/tools/filesystems/xfsprogs/default.nix index c8f4b7d93116..f0cf68e8d8e4 100644 --- a/pkgs/tools/filesystems/xfsprogs/default.nix +++ b/pkgs/tools/filesystems/xfsprogs/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "xfsprogs"; - version = "6.1.1"; + version = "6.2.0"; src = fetchurl { url = "mirror://kernel/linux/utils/fs/xfs/xfsprogs/${pname}-${version}.tar.xz"; - hash = "sha256-BeihN4cNsdYYLfct2pirenEA3rN2lH6FS51ZyRTCx7s="; + hash = "sha256-1n3LpaKOCQS2CIa25fdSvHycOlxwlhU4VbWtyp24bFE="; }; outputs = [ "bin" "dev" "out" "doc" ]; From 5ad0e539169d07ddde4fae2409fe131889bfafd7 Mon Sep 17 00:00:00 2001 From: Nicolas Benes Date: Mon, 27 Mar 2023 14:00:00 +0200 Subject: [PATCH 75/94] cppcodec: init at 0.2 --- .../libraries/cppcodec/default.nix | 31 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 33 insertions(+) create mode 100644 pkgs/development/libraries/cppcodec/default.nix diff --git a/pkgs/development/libraries/cppcodec/default.nix b/pkgs/development/libraries/cppcodec/default.nix new file mode 100644 index 000000000000..d3ead22f6b13 --- /dev/null +++ b/pkgs/development/libraries/cppcodec/default.nix @@ -0,0 +1,31 @@ +{ lib +, stdenv +, fetchFromGitHub +, cmake +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "cppcodec"; + version = "0.2"; + + src = fetchFromGitHub { + owner = "tplgy"; + repo = finalAttrs.pname; + rev = "v${finalAttrs.version}"; + hash = "sha256-k4EACtDOSkTXezTeFtVdM1EVJjvGga/IQSrvDzhyaXw="; + }; + + nativeBuildInputs = [ cmake ]; + + meta = with lib; { + description = "Header-only C++11 library for encode/decode functions as in RFC 4648"; + longDescription = '' + Header-only C++11 library to encode/decode base64, base64url, base32, + base32hex and hex (a.k.a. base16) as specified in RFC 4648, plus + Crockford's base32. + ''; + homepage = "https://github.com/tplgy/cppcodec"; + license = licenses.mit; + maintainers = with maintainers; [ panicgh raitobezarius ]; + }; +}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 75ed2c967d64..d1677eb81243 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19603,6 +19603,8 @@ with pkgs; cppcms = callPackage ../development/libraries/cppcms { }; + cppcodec = callPackage ../development/libraries/cppcodec { }; + cppunit = callPackage ../development/libraries/cppunit { }; cpputest = callPackage ../development/libraries/cpputest { }; From 2645079477a9412bd25716b2605cadad294ed02a Mon Sep 17 00:00:00 2001 From: Nicolas Benes Date: Sat, 25 Mar 2023 16:43:39 +0100 Subject: [PATCH 76/94] nitrokey-app: use system libnitrokey and cppcodec Do not use the git submodule in nitrokey-app. --- pkgs/tools/security/nitrokey-app/default.nix | 35 ++++++++++++-------- 1 file changed, 22 insertions(+), 13 deletions(-) diff --git a/pkgs/tools/security/nitrokey-app/default.nix b/pkgs/tools/security/nitrokey-app/default.nix index acc82636f32f..502716d9e026 100644 --- a/pkgs/tools/security/nitrokey-app/default.nix +++ b/pkgs/tools/security/nitrokey-app/default.nix @@ -1,5 +1,13 @@ -{ lib, stdenv, bash-completion, cmake, fetchFromGitHub, hidapi, libusb1, pkg-config -, qtbase, qttranslations, qtsvg, wrapQtAppsHook }: +{ lib +, stdenv +, cmake +, fetchFromGitHub +, pkg-config +, qttranslations +, wrapQtAppsHook +, libnitrokey +, cppcodec +}: stdenv.mkDerivation rec { pname = "nitrokey-app"; @@ -9,24 +17,25 @@ stdenv.mkDerivation rec { owner = "Nitrokey"; repo = "nitrokey-app"; rev = "v${version}"; - sha256 = "1k0w921hfrya4q2r7bqn7kgmwvwb7c15k9ymlbnksmfc9yyjyfcv"; - fetchSubmodules = true; + hash = "sha256-c6EC5uuMna07xVHDRFq0UDwuSeopZTmZGZ9ZD5zaq8Y="; }; - buildInputs = [ - bash-completion - hidapi - libusb1 - qtbase - qttranslations - qtsvg - ]; nativeBuildInputs = [ cmake pkg-config wrapQtAppsHook + qttranslations + ]; + + cmakeFlags = [ + "-DADD_GIT_INFO=OFF" + "-DBASH_COMPLETION_PATH=share/bash-completion/completions" + ]; + + buildInputs = [ + libnitrokey + cppcodec ]; - cmakeFlags = [ "-DCMAKE_BUILD_TYPE=Release" ]; meta = with lib; { description = "Provides extra functionality for the Nitrokey Pro and Storage"; From bc3196013a3ffa4daa9b172063d0293a39bde295 Mon Sep 17 00:00:00 2001 From: figsoda Date: Mon, 27 Mar 2023 09:01:15 -0400 Subject: [PATCH 77/94] sccache: 0.4.0 -> 0.4.1 Diff: https://github.com/mozilla/sccache/compare/v0.4.0...v0.4.1 Changelog: https://github.com/mozilla/sccache/releases/tag/v0.4.1 --- pkgs/development/tools/misc/sccache/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/misc/sccache/default.nix b/pkgs/development/tools/misc/sccache/default.nix index b862cb121811..7c307c503fef 100644 --- a/pkgs/development/tools/misc/sccache/default.nix +++ b/pkgs/development/tools/misc/sccache/default.nix @@ -1,17 +1,17 @@ { lib, fetchFromGitHub, rustPlatform, pkg-config, openssl, stdenv, Security }: rustPlatform.buildRustPackage rec { - version = "0.4.0"; + version = "0.4.1"; pname = "sccache"; src = fetchFromGitHub { owner = "mozilla"; repo = "sccache"; rev = "v${version}"; - sha256 = "sha256-6ok8N5y/Wtz4t0414GHT7qc5D2ysw97oKASbKHPLXN8="; + sha256 = "sha256-omov7/o1ToWJBTsDXTp3FNLk7PuWGL3J6pNz6n47taU="; }; - cargoSha256 = "sha256-dxjVlbnewFdnO294L+9kQE8owlgyPaxepxtmC7V9nGk="; + cargoSha256 = "sha256-UkccHrs3q4MlIaK/lo+bPC9Jy/JCBjGzo8jgjZsvEIc="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ] ++ lib.optional stdenv.isDarwin Security; From e20cbb498d937fbcfdf0f2804bb396db26b8c4c4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 27 Mar 2023 13:20:29 +0000 Subject: [PATCH 78/94] texlab: 5.4.0 -> 5.4.1 --- pkgs/development/tools/misc/texlab/Cargo.lock | 2 +- pkgs/development/tools/misc/texlab/default.nix | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/misc/texlab/Cargo.lock b/pkgs/development/tools/misc/texlab/Cargo.lock index 59566d3b4994..7349b26f7d23 100644 --- a/pkgs/development/tools/misc/texlab/Cargo.lock +++ b/pkgs/development/tools/misc/texlab/Cargo.lock @@ -1593,7 +1593,7 @@ dependencies = [ [[package]] name = "texlab" -version = "5.4.0" +version = "5.4.1" dependencies = [ "anyhow", "assert_unordered", diff --git a/pkgs/development/tools/misc/texlab/default.nix b/pkgs/development/tools/misc/texlab/default.nix index 63f4ca45a942..2f47fb46ffa6 100644 --- a/pkgs/development/tools/misc/texlab/default.nix +++ b/pkgs/development/tools/misc/texlab/default.nix @@ -15,13 +15,13 @@ let in rustPlatform.buildRustPackage rec { pname = "texlab"; - version = "5.4.0"; + version = "5.4.1"; src = fetchFromGitHub { owner = "latex-lsp"; repo = "texlab"; rev = "refs/tags/v${version}"; - sha256 = "sha256-2P+aidfYkO8l9VjqTstXbksyGTQ3porJhrBYod9oCYQ="; + sha256 = "sha256-rTYcYq8SL404A/ke5Rb9QcCtwHKhs+84TQGNqRn11HM="; }; cargoLock = { From 6cbbc163798888916ec28e6a3ef75d58373739cb Mon Sep 17 00:00:00 2001 From: Carlos Alexandro Becker Date: Mon, 27 Mar 2023 10:45:15 -0300 Subject: [PATCH 79/94] tasktimer: add caarlos0 to maintainers list Signed-off-by: Carlos Alexandro Becker --- pkgs/applications/misc/tasktimer/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/misc/tasktimer/default.nix b/pkgs/applications/misc/tasktimer/default.nix index ca5d6227375e..34ba140331d1 100644 --- a/pkgs/applications/misc/tasktimer/default.nix +++ b/pkgs/applications/misc/tasktimer/default.nix @@ -21,7 +21,7 @@ buildGoModule rec { description = "Task Timer (tt) is a dead simple TUI task timer"; homepage = "https://github.com/caarlos0/tasktimer"; license = licenses.mit; - maintainers = with maintainers; [ abbe ]; + maintainers = with maintainers; [ abbe caarlos0 ]; mainProgram = "tt"; }; } From 403affdafec92e24078b4b8ce9e13f8b66f31022 Mon Sep 17 00:00:00 2001 From: Carlos Alexandro Becker Date: Mon, 27 Mar 2023 10:47:03 -0300 Subject: [PATCH 80/94] domain-exporter: add caarlos0 to maintainer list Signed-off-by: Carlos Alexandro Becker --- pkgs/servers/monitoring/prometheus/domain-exporter.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/monitoring/prometheus/domain-exporter.nix b/pkgs/servers/monitoring/prometheus/domain-exporter.nix index fc455b92ae89..6fffc192e27d 100644 --- a/pkgs/servers/monitoring/prometheus/domain-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/domain-exporter.nix @@ -29,6 +29,6 @@ buildGoModule rec { homepage = "https://github.com/caarlos0/domain_exporter"; description = "Exports the expiration time of your domains as prometheus metrics"; license = licenses.mit; - maintainers = with maintainers; [ mmilata prusnak peterhoeg ]; + maintainers = with maintainers; [ mmilata prusnak peterhoeg caarlos0 ]; }; } From bc805499d9aef332715154581f94ef24fa35f81c Mon Sep 17 00:00:00 2001 From: Carlos Alexandro Becker Date: Mon, 27 Mar 2023 10:48:31 -0300 Subject: [PATCH 81/94] timer: add caarlos0 to maintainers list I'm adding myself to the maintainers list of the software I maintain that is available here. Signed-off-by: Carlos Alexandro Becker --- pkgs/tools/misc/timer/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/misc/timer/default.nix b/pkgs/tools/misc/timer/default.nix index abfd48b83a8d..6332f6de64ec 100644 --- a/pkgs/tools/misc/timer/default.nix +++ b/pkgs/tools/misc/timer/default.nix @@ -23,6 +23,6 @@ buildGoModule rec { description = "A `sleep` with progress"; homepage = "https://github.com/caarlos0/timer"; license = licenses.mit; - maintainers = with maintainers; [ zowoq ]; + maintainers = with maintainers; [ zowoq caarlos0 ]; }; } From 93baaff43466512c424911fcad7a49ee695c560a Mon Sep 17 00:00:00 2001 From: Carlos Alexandro Becker Date: Mon, 27 Mar 2023 10:49:28 -0300 Subject: [PATCH 82/94] nfpm: add caarlos0 to maintainers list Signed-off-by: Carlos Alexandro Becker --- pkgs/tools/package-management/nfpm/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/package-management/nfpm/default.nix b/pkgs/tools/package-management/nfpm/default.nix index 6577334b228e..ef43b2b9de44 100644 --- a/pkgs/tools/package-management/nfpm/default.nix +++ b/pkgs/tools/package-management/nfpm/default.nix @@ -18,7 +18,7 @@ buildGoModule rec { meta = with lib; { description = "A simple deb and rpm packager written in Go"; homepage = "https://github.com/goreleaser/nfpm"; - maintainers = with maintainers; [ marsam techknowlogick ]; + maintainers = with maintainers; [ marsam techknowlogick caarlos0 ]; license = with licenses; [ mit ]; }; } From 4478019214283d60518162c70ecf8e337520e18b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 25 Mar 2023 06:42:41 +0000 Subject: [PATCH 83/94] urbit: 1.22 -> 2.0 --- pkgs/misc/urbit/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/misc/urbit/default.nix b/pkgs/misc/urbit/default.nix index 8ae4df6409d5..eba9faa6beee 100644 --- a/pkgs/misc/urbit/default.nix +++ b/pkgs/misc/urbit/default.nix @@ -10,15 +10,15 @@ let in stdenv.mkDerivation rec { pname = "urbit"; - version = "1.22"; + version = "2.0"; src = fetchzip { url = "https://github.com/urbit/vere/releases/download/vere-v${version}/${platform}.tgz"; sha256 = { - x86_64-linux = "sha256-wYXFromLV1BCiSWlzphtCSBOWacQ3yC7i2kxxH4y88Y="; - aarch64-linux = "sha256-t3waCv2hwkchWPlfx1bsKKB6imp7F6scRnZUQSwS6fI="; - x86_64-darwin = "sha256-x5Gr6z5ma+0AF7DEXJpqG+yg3ym+w2ULTqfpdLjfHGo="; - aarch64-darwin = "sha256-vvGZoN+Yi6FZDblhxwDzRneVtWaFFaOjyRG7017BzZI="; + x86_64-linux = "sha256-GqxgbJCLjXcXHT49fJL1IUJmh9oL4Lfokt7HqzshtWw="; + aarch64-linux = "sha256-3+S5EnyvTBKxkFbV7fg+qVDFLr25jMeDwb+MuqDJHMg="; + x86_64-darwin = "sha256-VO2dnNqbgyPKvZVMC0CG15JAaBelzcnkifmbZMS+38Y="; + aarch64-darwin = "sha256-RbpeIA5LYCUkhyLMo3dYvUe7uLyOD4Ey7qCvIg5JQAg="; }.${stdenv.hostPlatform.system} or (throw "unsupported system ${stdenv.hostPlatform.system}"); }; From a3983c8856895190bcfc5f6b59f2f279059de1a3 Mon Sep 17 00:00:00 2001 From: Yureka Date: Mon, 27 Mar 2023 18:08:55 +0200 Subject: [PATCH 84/94] gitlab: 15.9.3 -> 15.10.0 (#223367) https://about.gitlab.com/releases/2023/03/22/gitlab-15-10-released/ --- .../version-management/gitlab/data.json | 16 +- .../version-management/gitlab/gitaly/Gemfile | 4 +- .../gitlab/gitaly/Gemfile.lock | 14 +- .../gitlab/gitaly/default.nix | 6 +- .../gitlab/gitaly/gemset.nix | 16 +- .../gitlab/gitlab-pages/default.nix | 6 +- .../gitlab/gitlab-shell/default.nix | 6 +- .../gitlab/gitlab-workhorse/default.nix | 4 +- .../version-management/gitlab/rubyEnv/Gemfile | 55 +-- .../gitlab/rubyEnv/Gemfile.lock | 203 ++++++---- .../gitlab/rubyEnv/gemset.nix | 372 +++++++++++++----- 11 files changed, 458 insertions(+), 244 deletions(-) diff --git a/pkgs/applications/version-management/gitlab/data.json b/pkgs/applications/version-management/gitlab/data.json index 77d930b07122..5ef18a9ea192 100644 --- a/pkgs/applications/version-management/gitlab/data.json +++ b/pkgs/applications/version-management/gitlab/data.json @@ -1,14 +1,14 @@ { - "version": "15.9.3", - "repo_hash": "sha256-WYzhKknxx3NwCsXsQCPNQNdoya010YbVh9uTpcHgSl4=", - "yarn_hash": "0msrbzqz5hgyl0c6dcxyzi6qnf2k3fmg44d201pa578p08xb0lld", + "version": "15.10.0", + "repo_hash": "sha256-jpJd6CneCfw+Ia0CTlX5YcEMl+2Tmd2+zfw8L+hKYTk=", + "yarn_hash": "1il8dnjb7591ss6w14zibdihg3bylw866jjjclv1qm8cihp8k3y8", "owner": "gitlab-org", "repo": "gitlab", - "rev": "v15.9.3-ee", + "rev": "v15.10.0-ee", "passthru": { - "GITALY_SERVER_VERSION": "15.9.3", - "GITLAB_PAGES_VERSION": "15.9.3", - "GITLAB_SHELL_VERSION": "14.17.0", - "GITLAB_WORKHORSE_VERSION": "15.9.3" + "GITALY_SERVER_VERSION": "15.10.0", + "GITLAB_PAGES_VERSION": "15.10.0", + "GITLAB_SHELL_VERSION": "14.18.0", + "GITLAB_WORKHORSE_VERSION": "15.10.0" } } diff --git a/pkgs/applications/version-management/gitlab/gitaly/Gemfile b/pkgs/applications/version-management/gitlab/gitaly/Gemfile index 2b7fa73d910e..e5591cd5290b 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/Gemfile +++ b/pkgs/applications/version-management/gitlab/gitaly/Gemfile @@ -12,13 +12,13 @@ gem 'rbtrace', require: false gem 'gitaly', '~> 15.5.0' # Labkit provides observability functionality -gem 'gitlab-labkit', '~> 0.31' +gem 'gitlab-labkit', '~> 0.31', '>= 0.31.1' # Detects the open source license the repository includes # This version needs to be in sync with GitLab CE/EE gem 'licensee', '~> 9.15' -gem 'google-protobuf', '~> 3.21.12' +gem 'google-protobuf', '~> 3.22.2' gem 'nokogiri', '~> 1.14' # Rails is currently blocked on the upgrade to the new major version for Redis, diff --git a/pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock b/pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock index 93b568efe867..43665f1e2663 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock +++ b/pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock @@ -40,7 +40,7 @@ GEM ffi (1.15.5) gitaly (15.5.0) grpc (~> 1.0) - gitlab-labkit (0.31.0) + gitlab-labkit (0.31.1) actionpack (>= 5.0.0, < 8.0.0) activesupport (>= 5.0.0, < 8.0.0) grpc (>= 1.37) @@ -56,7 +56,7 @@ GEM with_env (= 1.1.0) xml-simple (~> 1.1.5) gitlab-markup (1.8.1) - google-protobuf (3.21.12) + google-protobuf (3.22.2) googleapis-common-protos-types (1.4.0) google-protobuf (~> 3.14) grpc (1.42.0) @@ -104,7 +104,7 @@ GEM method_source (~> 1.0) public_suffix (4.0.7) racc (1.6.2) - rack (2.2.6.2) + rack (2.2.6.3) rack-test (2.0.2) rack (>= 1.3) rails-dom-testing (2.0.3) @@ -167,7 +167,7 @@ GEM sentry-raven (3.1.2) faraday (>= 1.0) thor (1.1.0) - thrift (0.17.0) + thrift (0.18.1) tomlrb (2.0.1) tzinfo (2.0.5) concurrent-ruby (~> 1.0) @@ -187,10 +187,10 @@ DEPENDENCIES activesupport (~> 6.1.7.2) factory_bot gitaly (~> 15.5.0) - gitlab-labkit (~> 0.31) + gitlab-labkit (~> 0.31, >= 0.31.1) gitlab-license_finder gitlab-markup (~> 1.8.0) - google-protobuf (~> 3.21.12) + google-protobuf (~> 3.22.2) grpc (~> 1.42.0) licensee (~> 9.15) nokogiri (~> 1.14) @@ -204,4 +204,4 @@ DEPENDENCIES sentry-raven (~> 3.1) BUNDLED WITH - 2.4.6 + 2.4.8 diff --git a/pkgs/applications/version-management/gitlab/gitaly/default.nix b/pkgs/applications/version-management/gitlab/gitaly/default.nix index 38f56ff7727c..50a8bd4e2583 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/default.nix +++ b/pkgs/applications/version-management/gitlab/gitaly/default.nix @@ -11,7 +11,7 @@ let gemdir = ./.; }; - version = "15.9.3"; + version = "15.10.0"; package_version = "v${lib.versions.major version}"; gitaly_package = "gitlab.com/gitlab-org/gitaly/${package_version}"; @@ -22,10 +22,10 @@ let owner = "gitlab-org"; repo = "gitaly"; rev = "v${version}"; - sha256 = "sha256-WBg1fo8tG0tfrsu8QtIo0SY1ZbktVHfcTf77Ny29DSM="; + sha256 = "sha256-MHxpij4aT4sq7csWRAEr6NQ9PdFkEnrEPegVtBIXUNo="; }; - vendorSha256 = "sha256-IIvvI7CKLWB2W4fi/HLFtfZdovehxDmtQ8GUEw24fbY="; + vendorSha256 = "sha256-knuUyJGz5JvYyKeDQ66cMQQSh2YKkkDB54iCir1QpEY="; ldflags = [ "-X ${gitaly_package}/internal/version.version=${version}" "-X ${gitaly_package}/internal/version.moduleVersion=${version}" ]; diff --git a/pkgs/applications/version-management/gitlab/gitaly/gemset.nix b/pkgs/applications/version-management/gitlab/gitaly/gemset.nix index d31f4c3d7858..d95e022a3b70 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/gemset.nix +++ b/pkgs/applications/version-management/gitlab/gitaly/gemset.nix @@ -189,10 +189,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "07zd8r189qcqr3xp6dinlw94sylxbyn56nnas7k0aw6xvr74q12v"; + sha256 = "1yxz433p9gg8avl94wnb68fm89zaq02r179dkirx5db614vkjfiy"; type = "gem"; }; - version = "0.31.0"; + version = "0.31.1"; }; gitlab-license_finder = { dependencies = ["rubyzip" "thor" "tomlrb" "with_env" "xml-simple"]; @@ -220,10 +220,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1dcgkhjiaxha3yznyxxzm8a4n4jf61rk7kgbxy4sdkb865zbn2ab"; + sha256 = "1zqyy07ps6zh0gi9nppmnsngzv5nx1qjv726mzhv83sh90rc25nm"; type = "gem"; }; - version = "3.21.12"; + version = "3.22.2"; }; googleapis-common-protos-types = { dependencies = ["google-protobuf"]; @@ -470,10 +470,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0qvp6h2abmlsl4sqjsvac03cr2mxq6143gbx4kq52rpazp021qsb"; + sha256 = "17wg99w29hpiq9p4cmm8c6kdg4lcw0ll2c36qw7y50gy1cs4h5j2"; type = "gem"; }; - version = "2.2.6.2"; + version = "2.2.6.3"; }; rack-test = { dependencies = ["rack"]; @@ -746,10 +746,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "12p856z7inf47azpvh9qswsfx8035r5hbzlg2x5n8z2sjqzjkk80"; + sha256 = "1r3k8x3vfaa6wnz8mhpn10938bzmfj489zc18q73xpsb469v0nv9"; type = "gem"; }; - version = "0.17.0"; + version = "0.18.1"; }; tomlrb = { groups = ["default" "development" "omnibus" "test"]; diff --git a/pkgs/applications/version-management/gitlab/gitlab-pages/default.nix b/pkgs/applications/version-management/gitlab/gitlab-pages/default.nix index bdd8c4c43f6f..a0f14cc853c1 100644 --- a/pkgs/applications/version-management/gitlab/gitlab-pages/default.nix +++ b/pkgs/applications/version-management/gitlab/gitlab-pages/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "gitlab-pages"; - version = "15.7.3"; + version = "15.10.0"; src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitlab-pages"; rev = "v${version}"; - sha256 = "sha256-Aj6XQVIdulwx6mWivwYafR4yrWiNaDeyje3LFQzZPfU="; + sha256 = "sha256-LTUGWnZCqyLA5kNlCWMVGIOivfWVGb6GcAdO2tNW1/o="; }; - vendorHash = "sha256-mGcIN9gDCFfr1MvBdfR26LAbrAE2RNivhXP7fCNMyBQ="; + vendorHash = "sha256-s3HHoz9URACuVVhePQQFviTqlQU7vCLOjTJPBlus1Vo="; subPackages = [ "." ]; meta = with lib; { diff --git a/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix b/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix index cfc79c9f2656..d2d8a372e5c3 100644 --- a/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix +++ b/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix @@ -2,19 +2,19 @@ buildGoModule rec { pname = "gitlab-shell"; - version = "14.17.0"; + version = "14.18.0"; src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitlab-shell"; rev = "v${version}"; - sha256 = "sha256-GTy+1O6Z7i+L8SSSQpYnN6SRfqDutkJYrj66tpX4f5M="; + sha256 = "sha256-dMxWnv+YfoDy9rhuCx+JIxFyjHejttkkqkQ4owdI/4g="; }; buildInputs = [ ruby libkrb5 ]; patches = [ ./remove-hardcoded-locations.patch ]; - vendorSha256 = "sha256-mFGkT5lyQfcaGz503vgqx/kP5S0V2Ks5HDmjx+BxZzg="; + vendorSha256 = "sha256-zqZMZvYteOWTgDnlX8H1i8e/QTbAoTPD6ZNsHsCcLdM="; postInstall = '' cp -r "$NIX_BUILD_TOP/source"/bin/* $out/bin diff --git a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix index 25064f22f4b4..f48fea10d47a 100644 --- a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix +++ b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix @@ -5,7 +5,7 @@ in buildGoModule rec { pname = "gitlab-workhorse"; - version = "15.9.3"; + version = "15.10.0"; src = fetchFromGitLab { owner = data.owner; @@ -16,7 +16,7 @@ buildGoModule rec { sourceRoot = "source/workhorse"; - vendorSha256 = "sha256-wvoMBzRGp8RX2kHKKz3REDq8YLTsHbDayEMYi7hSzTE="; + vendorSha256 = "sha256-HG/QobU1LsFhbNF4lNq9tLwjcLD2l3TXnsJ+tjqc0Q8="; buildInputs = [ git ]; ldflags = [ "-X main.Version=${version}" ]; doCheck = false; diff --git a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile index ed0c5127f733..8cafe3b8909c 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile +++ b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile @@ -33,9 +33,6 @@ gem 'sprockets', '~> 3.7.0' gem 'view_component', '~> 2.74.1' -# Default values for AR models -gem 'default_value_for', '~> 3.4.0' - # Supported DBs gem 'pg', '~> 1.4.5' @@ -143,14 +140,12 @@ gem 'carrierwave', '~> 1.3' gem 'mini_magick', '~> 4.10.1' # for backups -gem 'fog-aws', '~> 3.15' +gem 'fog-aws', '~> 3.18' # Locked until fog-google resolves https://github.com/fog/fog-google/issues/421. # Also see config/initializers/fog_core_patch.rb. gem 'fog-core', '= 2.1.0' gem 'fog-google', '~> 1.19', require: 'fog/google' gem 'fog-local', '~> 0.8' -gem 'fog-openstack', '~> 1.0' -gem 'fog-rackspace', '~> 0.1.1' # NOTE: # the fog-aliyun gem since v0.4 pulls in aliyun-sdk transitively, which monkey-patches # the rest-client gem to drop the Content-Length header field for chunked transfers, @@ -182,7 +177,7 @@ gem 'seed-fu', '~> 2.3.7' gem 'elasticsearch-model', '~> 7.2' gem 'elasticsearch-rails', '~> 7.2', require: 'elasticsearch/rails/instrumentation' gem 'elasticsearch-api', '7.13.3' -gem 'aws-sdk-core', '~> 3.170.0' +gem 'aws-sdk-core', '~> 3.170.1' gem 'aws-sdk-cloudformation', '~> 1' gem 'aws-sdk-s3', '~> 1.119.1' gem 'faraday_middleware-aws-sigv4', '~>0.3.0' @@ -199,13 +194,13 @@ gem 'rdoc', '~> 6.3.2' gem 'org-ruby', '~> 0.9.12' gem 'creole', '~> 0.5.0' gem 'wikicloth', '0.8.1' -gem 'asciidoctor', '~> 2.0.17' +gem 'asciidoctor', '~> 2.0.18' gem 'asciidoctor-include-ext', '~> 0.4.0', require: false gem 'asciidoctor-plantuml', '~> 0.0.16' -gem 'asciidoctor-kroki', '~> 0.7.0', require: false -gem 'rouge', '~> 3.30.0' +gem 'asciidoctor-kroki', '~> 0.8.0', require: false +gem 'rouge', '~> 4.1.0' gem 'truncato', '~> 0.7.12' -gem 'nokogiri', '~> 1.14.1' +gem 'nokogiri', '~> 1.14.2' # Calendar rendering gem 'icalendar' @@ -292,7 +287,7 @@ gem 'asana', '~> 0.10.13' gem 'ruby-fogbugz', '~> 0.3.0' # Kubernetes integration -gem 'kubeclient', '~> 4.9.3', path: 'vendor/gems/kubeclient' +gem 'kubeclient', '~> 4.11.0' # Sanitize user input gem 'sanitize', '~> 6.0' @@ -310,7 +305,7 @@ gem 'licensee', '~> 9.15' gem 'charlock_holmes', '~> 0.7.7' # Detect mime content type from content -gem 'ruby-magic', '~> 0.5' +gem 'ruby-magic', '~> 0.6' # Faster blank gem 'fast_blank' @@ -348,7 +343,7 @@ gem 'pg_query', '~> 2.2', '>= 2.2.1' gem 'premailer-rails', '~> 1.10.3' -gem 'gitlab-labkit', '~> 0.30.1' +gem 'gitlab-labkit', '~> 0.31.1' gem 'thrift', '>= 0.16.0' # I18n @@ -363,17 +358,20 @@ gem 'batch-loader', '~> 2.0.1' # Perf bar gem 'peek', '~> 1.1' +# Google Cloud Profiler support +gem 'cloud_profiler_agent', '~> 0.0.0', path: 'vendor/gems/cloud_profiler_agent', require: false + # Snowplow events tracking gem 'snowplow-tracker', '~> 0.8.0' # Metrics gem 'webrick', '~> 1.6.1', require: false -gem 'prometheus-client-mmap', '~> 0.17', require: 'prometheus/client' +gem 'prometheus-client-mmap', '~> 0.19', require: 'prometheus/client' gem 'warning', '~> 1.3.0' group :development do - gem 'lefthook', '~> 1.2.9', require: false + gem 'lefthook', '~> 1.3.3', require: false gem 'rubocop' gem 'solargraph', '~> 0.47.2', require: false @@ -416,7 +414,7 @@ group :development, :test do gem 'bundler-audit', '~> 0.7.0.1', require: false # Benchmarking & profiling - gem 'benchmark-ips', '~> 2.3.0', require: false + gem 'benchmark-ips', '~> 2.11.0', require: false gem 'benchmark-memory', '~> 0.1', require: false gem 'knapsack', '~> 1.21.1' @@ -436,7 +434,7 @@ group :development, :test do end group :development, :test, :danger do - gem 'gitlab-dangerfiles', '~> 3.7.0', require: false + gem 'gitlab-dangerfiles', '~> 3.8.0', require: false end group :development, :test, :coverage do @@ -456,7 +454,7 @@ group :test do gem 'rspec-retry', '~> 0.6.1' gem 'rspec_profiling', '~> 0.0.6' gem 'rspec-benchmark', '~> 0.6.0' - gem 'rspec-parameterized', require: false + gem 'rspec-parameterized', '~> 1.0', require: false gem 'capybara', '~> 3.35.3' gem 'capybara-screenshot', '~> 1.0.22' @@ -472,6 +470,7 @@ group :test do gem 'test-prof', '~> 1.0.7' gem 'rspec_junit_formatter' gem 'guard-rspec' + gem 'axe-core-rspec' # Moved in `test` because https://gitlab.com/gitlab-org/gitlab/-/issues/217527 gem 'derailed_benchmarks', require: false @@ -486,7 +485,7 @@ gem 'gitlab-mail_room', '~> 0.0.9', require: 'mail_room' gem 'email_reply_trimmer', '~> 0.1' gem 'html2text' -gem 'stackprof', '~> 0.2.21', require: false +gem 'stackprof', '~> 0.2.23', require: false gem 'rbtrace', '~> 0.4', require: false gem 'memory_profiler', '~> 1.0', require: false gem 'activerecord-explain-analyze', '~> 0.1', require: false @@ -518,7 +517,7 @@ gem 'kas-grpc', '~> 0.0.2' gem 'grpc', '~> 1.42.0' -gem 'google-protobuf', '~> 3.21', '>= 3.21.12' +gem 'google-protobuf', '~> 3.22', '>= 3.22.2' gem 'toml-rb', '~> 2.2.0' @@ -566,7 +565,7 @@ gem 'oj-introspect', '~> 0.7' gem 'multi_json', '~> 1.14.1' gem 'yajl-ruby', '~> 1.4.3', require: 'yajl' -gem 'webauthn', '~> 2.3' +gem 'webauthn', '~> 3.0' # IPAddress utilities gem 'ipaddress', '~> 0.8.3' @@ -588,8 +587,18 @@ gem 'cvss-suite', '~> 3.0.1', require: 'cvss_suite' gem 'arr-pm', '~> 0.0.12' # Apple plist parsing -gem 'CFPropertyList' +gem 'CFPropertyList', '~> 3.0.0' gem 'app_store_connect' # For phone verification gem 'telesignenterprise', '~> 2.2' + +# Ruby 3 extracts net-protocol into a separate gem, while Ruby 2 has it built-in +# This condition installs the gem only for Ruby 3 to avoid warnings on Ruby 2 +# Can be removed when support for Ruby 2 is dropped +install_if -> { Gem::Version.new(RUBY_VERSION) >= Gem::Version.new("3.0.0") } do + # BufferedIO patch + gem 'net-protocol', '~> 0.1.3' +end + +gem 'duo_api', '~> 1.3' diff --git a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock index c988145616ea..1f1f566be37c 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock +++ b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock @@ -10,6 +10,15 @@ PATH bundler-checksum (0.1.0) bundler +PATH + remote: vendor/gems/cloud_profiler_agent + specs: + cloud_profiler_agent (0.0.1.pre) + google-cloud-profiler-v2 (~> 0.3) + google-protobuf (~> 3.13) + googleauth (>= 0.14) + stackprof (~> 0.2) + PATH remote: vendor/gems/devise-pbkdf2-encryptable specs: @@ -30,15 +39,6 @@ PATH diffy (~> 3.4) oj (~> 3.13.16) -PATH - remote: vendor/gems/kubeclient - specs: - kubeclient (4.9.4.pre.gitlab1) - http (>= 3.0, < 6.0) - jsonpath (~> 1.0) - recursive-open-struct (~> 1.1, >= 1.1.1) - rest-client (~> 2.0) - PATH remote: vendor/gems/mail-smtp_pool specs: @@ -184,10 +184,10 @@ GEM faraday_middleware (~> 1.0) faraday_middleware-multi_json (~> 0.0) oauth2 (>= 1.4, < 3) - asciidoctor (2.0.17) + asciidoctor (2.0.18) asciidoctor-include-ext (0.4.0) asciidoctor (>= 1.5.6, < 3.0.0) - asciidoctor-kroki (0.7.0) + asciidoctor-kroki (0.8.0) asciidoctor (~> 2.0) asciidoctor-plantuml (0.0.16) asciidoctor (>= 2.0.17, < 3.0.0) @@ -198,13 +198,13 @@ GEM autoprefixer-rails (10.2.5.1) execjs (> 0) awesome_print (1.9.2) - awrence (1.1.1) + awrence (1.2.1) aws-eventstream (1.2.0) - aws-partitions (1.703.0) + aws-partitions (1.730.0) aws-sdk-cloudformation (1.41.0) aws-sdk-core (~> 3, >= 3.99.0) aws-sigv4 (~> 1.1) - aws-sdk-core (3.170.0) + aws-sdk-core (3.170.1) aws-eventstream (~> 1, >= 1.0.2) aws-partitions (~> 1, >= 1.651.0) aws-sigv4 (~> 1.5) @@ -218,6 +218,17 @@ GEM aws-sigv4 (~> 1.4) aws-sigv4 (1.5.1) aws-eventstream (~> 1, >= 1.0.2) + axe-core-api (4.6.0) + dumb_delegator + virtus + axe-core-rspec (4.6.0) + axe-core-api + dumb_delegator + virtus + axiom-types (0.1.1) + descendants_tracker (~> 0.0.4) + ice_nine (~> 0.11.0) + thread_safe (~> 0.3, >= 0.3.1) azure-storage-blob (2.0.3) azure-storage-common (~> 2.0) nokogiri (~> 1, >= 1.10.8) @@ -232,7 +243,7 @@ GEM batch-loader (2.0.1) bcrypt (3.1.16) benchmark (0.2.0) - benchmark-ips (2.3.0) + benchmark-ips (2.11.0) benchmark-malloc (0.2.0) benchmark-memory (0.2.0) memory_profiler (~> 1) @@ -243,7 +254,8 @@ GEM erubi (>= 1.0.0) rack (>= 0.9.0) bindata (2.4.11) - binding_ninja (0.2.3) + binding_of_caller (1.0.0) + debug_inspector (>= 0.0.1) bootsnap (1.16.0) msgpack (~> 1.2) browser (5.3.1) @@ -292,15 +304,17 @@ GEM nap open4 (~> 1.3) coderay (1.1.3) + coercible (1.0.0) + descendants_tracker (~> 0.0.1) colored2 (3.1.2) commonmarker (0.23.6) concurrent-ruby (1.2.0) connection_pool (2.3.0) cork (0.3.0) colored2 (~> 3.1) - cose (1.0.0) + cose (1.3.0) cbor (~> 0.5.9) - openssl-signature_algorithm (~> 0.4.0) + openssl-signature_algorithm (~> 1.0) countries (4.0.1) i18n_data (~> 0.13.0) sixarm_ruby_unaccent (~> 1.1) @@ -310,7 +324,7 @@ GEM creole (0.5.0) crystalball (0.7.0) git - css_parser (1.12.0) + css_parser (1.14.0) addressable cvss-suite (3.0.1) danger (8.6.1) @@ -331,12 +345,11 @@ GEM gitlab (~> 4.2, >= 4.2.0) database_cleaner (1.7.0) dead_end (3.1.1) + debug_inspector (1.1.0) deckar01-task_list (2.3.2) html-pipeline declarative (0.0.20) declarative_policy (1.1.0) - default_value_for (3.4.0) - activerecord (>= 3.2.0, < 7.0) deprecation_toolkit (1.5.1) activesupport (>= 4.2) derailed_benchmarks (2.1.2) @@ -351,6 +364,8 @@ GEM rake (> 10, < 14) ruby-statistics (>= 2.1) thor (>= 0.19, < 2) + descendants_tracker (0.0.4) + thread_safe (~> 0.3, >= 0.3.1) device_detector (1.0.0) devise (4.8.1) bcrypt (~> 3.0) @@ -400,6 +415,8 @@ GEM dry-equalizer (~> 0.3) dry-inflector (~> 0.1, >= 0.1.2) dry-logic (~> 1.0, >= 1.0.2) + dumb_delegator (1.0.0) + duo_api (1.3.0) e2mmap (0.1.0) ecma-re-validator (0.3.0) regexp_parser (~> 2.0) @@ -502,7 +519,7 @@ GEM fog-json ipaddress (~> 0.8) xml-simple (~> 1.1) - fog-aws (3.15.0) + fog-aws (3.18.0) fog-core (~> 2.1) fog-json (~> 1.1) fog-xml (~> 0.1) @@ -528,15 +545,6 @@ GEM multi_json (~> 1.10) fog-local (0.8.0) fog-core (>= 1.27, < 3.0) - fog-openstack (1.0.8) - fog-core (~> 2.1) - fog-json (>= 1.0) - ipaddress (>= 0.8) - fog-rackspace (0.1.1) - fog-core (>= 1.35) - fog-json (>= 1.0) - fog-xml (>= 0.1) - ipaddress (>= 0.8) fog-xml (0.1.3) fog-core nokogiri (>= 1.5.11, < 2.0.0) @@ -548,6 +556,14 @@ GEM rspec-core (~> 3.0) ruby-progressbar (~> 1.4) fuzzyurl (0.9.0) + gapic-common (0.18.0) + faraday (>= 1.9, < 3.a) + faraday-retry (>= 1.0, < 3.a) + google-protobuf (~> 3.14) + googleapis-common-protos (>= 1.3.12, < 2.a) + googleapis-common-protos-types (>= 1.3.1, < 2.a) + googleauth (~> 1.0) + grpc (~> 1.36) gemoji (3.0.1) get_process_mem (0.2.7) ffi (~> 1.0) @@ -570,7 +586,7 @@ GEM terminal-table (>= 1.5.1) gitlab-chronic (0.10.5) numerizer (~> 0.2) - gitlab-dangerfiles (3.7.0) + gitlab-dangerfiles (3.8.0) danger (>= 8.4.5) danger-gitlab (>= 8.0.0) rake @@ -584,7 +600,7 @@ GEM fog-json (~> 1.2.0) mime-types ms_rest_azure (~> 0.12.0) - gitlab-labkit (0.30.1) + gitlab-labkit (0.31.1) actionpack (>= 5.0.0, < 8.0.0) activesupport (>= 5.0.0, < 8.0.0) grpc (>= 1.37) @@ -660,6 +676,9 @@ GEM google-cloud-env (1.6.0) faraday (>= 0.17.3, < 3.0) google-cloud-errors (1.3.0) + google-cloud-profiler-v2 (0.4.0) + gapic-common (>= 0.18.0, < 2.a) + google-cloud-errors (~> 1.0) google-cloud-storage (1.44.0) addressable (~> 2.8) digest-crc (~> 0.4) @@ -668,8 +687,12 @@ GEM google-cloud-core (~> 1.6) googleauth (>= 0.16.2, < 2.a) mini_mime (~> 1.0) - google-protobuf (3.21.12) - googleapis-common-protos-types (1.3.0) + google-protobuf (3.22.2) + googleapis-common-protos (1.4.0) + google-protobuf (~> 3.14) + googleapis-common-protos-types (~> 1.2) + grpc (~> 1.27) + googleapis-common-protos-types (1.5.0) google-protobuf (~> 3.14) googleauth (1.3.0) faraday (>= 0.17.3, < 3.a) @@ -770,7 +793,7 @@ GEM nokogiri (~> 1.6) htmlbeautifier (1.4.2) htmlentities (4.3.4) - http (5.1.0) + http (5.1.1) addressable (~> 2.8) http-cookie (~> 1.0) http-form_data (~> 2.2) @@ -789,6 +812,7 @@ GEM icalendar (2.8.0) ice_cube (~> 0.16) ice_cube (0.16.4) + ice_nine (0.11.2) imagen (0.1.8) parser (>= 2.5, != 2.5.1.1) invisible_captcha (2.0.0) @@ -843,9 +867,14 @@ GEM rexml kramdown-parser-gfm (1.1.0) kramdown (~> 2.0) + kubeclient (4.11.0) + http (>= 3.0, < 6.0) + jsonpath (~> 1.0) + recursive-open-struct (~> 1.1, >= 1.1.1) + rest-client (~> 2.0) launchy (2.5.0) addressable (~> 2.7) - lefthook (1.2.9) + lefthook (1.3.3) letter_opener (1.7.0) launchy (~> 2.2) letter_opener_web (2.0.0) @@ -945,13 +974,15 @@ GEM connection_pool (~> 2.2) net-ldap (0.17.1) net-ntp (2.1.3) + net-protocol (0.1.3) + timeout net-scp (3.0.0) net-ssh (>= 2.6.5, < 7.0.0) net-ssh (6.0.0) netrc (0.11.0) nio4r (2.5.8) no_proxy_fix (0.1.2) - nokogiri (1.14.1) + nokogiri (1.14.2) mini_portile2 (~> 2.8.0) racc (~> 1.4) notiffany (0.1.3) @@ -1041,7 +1072,8 @@ GEM webfinger (>= 1.0.1) openssl (2.2.2) ipaddr - openssl-signature_algorithm (0.4.0) + openssl-signature_algorithm (1.3.0) + openssl (> 2.0) opentracing (0.5.0) optimist (3.0.1) org-ruby (0.9.12) @@ -1097,7 +1129,7 @@ GEM coderay parser unparser - prometheus-client-mmap (0.17.0) + prometheus-client-mmap (0.19.1) pry (0.14.2) coderay (~> 1.1) method_source (~> 1.0) @@ -1223,7 +1255,7 @@ GEM rexml (3.2.5) rinku (2.0.0) rotp (6.2.0) - rouge (3.30.0) + rouge (4.1.0) rqrcode (0.7.0) chunky_png rqrcode-rails3 (0.1.7) @@ -1245,12 +1277,17 @@ GEM rspec-mocks (3.12.3) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.12.0) - rspec-parameterized (0.5.0) - binding_ninja (>= 0.2.3) + rspec-parameterized (1.0.0) + rspec-parameterized-core (< 2) + rspec-parameterized-table_syntax (< 2) + rspec-parameterized-core (1.0.0) parser proc_to_ast rspec (>= 2.13, < 4) unparser + rspec-parameterized-table_syntax (1.0.0) + binding_of_caller + rspec-parameterized-core (< 2) rspec-rails (6.0.1) actionpack (>= 6.1) activesupport (>= 6.1) @@ -1298,8 +1335,8 @@ GEM ruby-fogbugz (0.3.0) crack (~> 0.4) multipart-post (~> 2.0) - ruby-magic (0.5.4) - mini_portile2 (~> 2.6) + ruby-magic (0.6.0) + mini_portile2 (~> 2.8) ruby-progressbar (1.11.0) ruby-saml (1.13.0) nokogiri (>= 1.10.5) @@ -1335,7 +1372,6 @@ GEM addressable (>= 2.3.5) faraday (>= 0.17.3, < 3) sd_notify (0.1.1) - securecompare (1.0.0) seed-fu (2.3.7) activerecord (>= 3.1) activesupport (>= 3.1) @@ -1425,7 +1461,7 @@ GEM mini_portile2 (~> 2.8.0) ssh_data (1.3.0) ssrf_filter (1.0.8) - stackprof (0.2.21) + stackprof (0.2.23) state_machines (0.5.0) state_machines-activemodel (0.8.0) activemodel (>= 5.1) @@ -1463,18 +1499,21 @@ GEM faraday (~> 1.0) text (1.3.1) thor (1.2.1) + thread_safe (0.3.6) thrift (0.16.0) tilt (2.0.11) timeliness (0.3.10) + timeout (0.3.2) timfel-krb5-auth (0.8.3) tins (1.31.1) sync toml-rb (2.2.0) citrus (~> 3.0, > 3.0) tomlrb (1.3.0) - tpm-key_attestation (0.9.0) + tpm-key_attestation (0.12.0) bindata (~> 2.4) - openssl-signature_algorithm (~> 0.4.0) + openssl (> 2.0) + openssl-signature_algorithm (~> 1.0) trailblazer-option (0.1.2) train-core (3.4.9) addressable (~> 2.5) @@ -1488,10 +1527,10 @@ GEM nokogiri (>= 1.7.0, <= 2.0) tty-color (0.6.0) tty-cursor (0.7.1) - tty-markdown (0.7.1) + tty-markdown (0.7.2) kramdown (>= 1.16.2, < 3.0) pastel (~> 0.8) - rouge (~> 3.14) + rouge (>= 3.14, < 5.0) strings (~> 0.2.0) tty-color (~> 0.5) tty-screen (~> 0.8) @@ -1521,9 +1560,9 @@ GEM uniform_notifier (1.16.0) unleash (3.2.2) murmurhash3 (~> 0.1.6) - unparser (0.6.0) + unparser (0.6.7) diff-lcs (~> 1.3) - parser (>= 3.0.0) + parser (>= 3.2.0) uri_template (0.7.0) valid_email (0.1.3) activemodel @@ -1543,20 +1582,23 @@ GEM activesupport (>= 5.0.0, < 8.0) concurrent-ruby (~> 1.0) method_source (~> 1.0) + virtus (2.0.0) + axiom-types (~> 0.1) + coercible (~> 1.0) + descendants_tracker (~> 0.0, >= 0.0.3) vmstat (2.3.0) warden (1.2.9) rack (>= 2.0.9) warning (1.3.0) - webauthn (2.3.0) + webauthn (3.0.0) android_key_attestation (~> 0.3.0) awrence (~> 1.1) bindata (~> 2.4) cbor (~> 0.5.9) - cose (~> 1.0) - openssl (~> 2.0) + cose (~> 1.1) + openssl (>= 2.2) safety_net_attestation (~> 0.4.0) - securecompare (~> 1.0) - tpm-key_attestation (~> 0.9.0) + tpm-key_attestation (~> 0.12.0) webfinger (1.2.0) activesupport httpclient (>= 2.4) @@ -1587,7 +1629,7 @@ PLATFORMS ruby DEPENDENCIES - CFPropertyList + CFPropertyList (~> 3.0.0) RedCloth (~> 4.3.2) acme-client (~> 2.0) activerecord-explain-analyze (~> 0.1) @@ -1598,22 +1640,23 @@ DEPENDENCIES app_store_connect arr-pm (~> 0.0.12) asana (~> 0.10.13) - asciidoctor (~> 2.0.17) + asciidoctor (~> 2.0.18) asciidoctor-include-ext (~> 0.4.0) - asciidoctor-kroki (~> 0.7.0) + asciidoctor-kroki (~> 0.8.0) asciidoctor-plantuml (~> 0.0.16) atlassian-jwt (~> 0.2.0) attr_encrypted (~> 3.2.4)! autoprefixer-rails (= 10.2.5.1) awesome_print aws-sdk-cloudformation (~> 1) - aws-sdk-core (~> 3.170.0) + aws-sdk-core (~> 3.170.1) aws-sdk-s3 (~> 1.119.1) + axe-core-rspec babosa (~> 1.0.4) base32 (~> 0.3.0) batch-loader (~> 2.0.1) bcrypt (~> 3.1, >= 3.1.14) - benchmark-ips (~> 2.3.0) + benchmark-ips (~> 2.11.0) benchmark-memory (~> 0.1) better_errors (~> 2.9.1) bootsnap (~> 1.16.0) @@ -1625,6 +1668,7 @@ DEPENDENCIES capybara-screenshot (~> 1.0.22) carrierwave (~> 1.3) charlock_holmes (~> 0.7.7) + cloud_profiler_agent (~> 0.0.0)! commonmarker (~> 0.23.6) concurrent-ruby (~> 1.1) connection_pool (~> 2.0) @@ -1635,7 +1679,6 @@ DEPENDENCIES database_cleaner (~> 1.7.0) deckar01-task_list (= 2.3.2) declarative_policy (~> 1.1.0) - default_value_for (~> 3.4.0) deprecation_toolkit (~> 1.5.1) derailed_benchmarks device_detector @@ -1647,6 +1690,7 @@ DEPENDENCIES discordrb-webhooks (~> 3.4) doorkeeper (~> 5.5) doorkeeper-openid_connect (~> 1.8) + duo_api (~> 1.3) ed25519 (~> 1.3.0) elasticsearch-api (= 7.13.3) elasticsearch-model (~> 7.2) @@ -1663,12 +1707,10 @@ DEPENDENCIES flipper-active_record (~> 0.25.0) flipper-active_support_cache_store (~> 0.25.0) fog-aliyun (~> 0.4) - fog-aws (~> 3.15) + fog-aws (~> 3.18) fog-core (= 2.1.0) fog-google (~> 1.19) fog-local (~> 0.8) - fog-openstack (~> 1.0) - fog-rackspace (~> 0.1.1) fugit (~> 1.8.1) fuubar (~> 2.2.0) gettext (~> 3.3) @@ -1676,10 +1718,10 @@ DEPENDENCIES gettext_i18n_rails_js (~> 1.3) gitaly (~> 15.9.0.pre.rc3) gitlab-chronic (~> 0.10.5) - gitlab-dangerfiles (~> 3.7.0) + gitlab-dangerfiles (~> 3.8.0) gitlab-experiment (~> 0.7.1) gitlab-fog-azure-rm (~> 1.7.0) - gitlab-labkit (~> 0.30.1) + gitlab-labkit (~> 0.31.1) gitlab-license (~> 2.2.1) gitlab-mail_room (~> 0.0.9) gitlab-markup (~> 1.9.0) @@ -1699,7 +1741,7 @@ DEPENDENCIES google-apis-serviceusage_v1 (~> 0.28.0) google-apis-sqladmin_v1beta4 (~> 0.41.0) google-cloud-storage (~> 1.44.0) - google-protobuf (~> 3.21, >= 3.21.12) + google-protobuf (~> 3.22, >= 3.22.2) gpgme (~> 2.0.22) grape (~> 1.5.2) grape-entity (~> 0.10.0) @@ -1737,8 +1779,8 @@ DEPENDENCIES kas-grpc (~> 0.0.2) knapsack (~> 1.21.1) kramdown (~> 2.3.1) - kubeclient (~> 4.9.3)! - lefthook (~> 1.2.9) + kubeclient (~> 4.11.0) + lefthook (~> 1.3.3) letter_opener_web (~> 2.0.0) license_finder (~> 7.0) licensee (~> 9.15) @@ -1758,7 +1800,8 @@ DEPENDENCIES multi_json (~> 1.14.1) net-ldap (~> 0.17.1) net-ntp - nokogiri (~> 1.14.1) + net-protocol (~> 0.1.3) + nokogiri (~> 1.14.2) oauth2 (~> 2.0) octokit (~> 4.15) ohai (~> 16.10) @@ -1793,7 +1836,7 @@ DEPENDENCIES pg_query (~> 2.2, >= 2.2.1) png_quantizator (~> 0.2.1) premailer-rails (~> 1.10.3) - prometheus-client-mmap (~> 0.17) + prometheus-client-mmap (~> 0.19) pry-byebug pry-rails (~> 0.3.9) pry-shell (~> 0.6.1) @@ -1820,17 +1863,17 @@ DEPENDENCIES responders (~> 3.0) retriable (~> 3.1.2) rexml (~> 3.2.5) - rouge (~> 3.30.0) + rouge (~> 4.1.0) rqrcode-rails3 (~> 0.1.7) rspec-benchmark (~> 0.6.0) - rspec-parameterized + rspec-parameterized (~> 1.0) rspec-rails (~> 6.0.1) rspec-retry (~> 0.6.1) rspec_junit_formatter rspec_profiling (~> 0.0.6) rubocop ruby-fogbugz (~> 0.3.0) - ruby-magic (~> 0.5) + ruby-magic (~> 0.6) ruby-progressbar (~> 1.10) ruby-saml (~> 1.13.0) ruby_parser (~> 3.19) @@ -1863,7 +1906,7 @@ DEPENDENCIES sprite-factory (~> 1.7) sprockets (~> 3.7.0) ssh_data (~> 1.3) - stackprof (~> 0.2.21) + stackprof (~> 0.2.23) state_machines-activerecord (~> 0.8.0) sys-filesystem (~> 1.4.3) tanuki_emoji (~> 0.6) @@ -1886,11 +1929,11 @@ DEPENDENCIES view_component (~> 2.74.1) vmstat (~> 2.3.0) warning (~> 1.3.0) - webauthn (~> 2.3) + webauthn (~> 3.0) webmock (~> 3.9.1) webrick (~> 1.6.1) wikicloth (= 0.8.1) yajl-ruby (~> 1.4.3) BUNDLED WITH - 2.4.6 + 2.4.8 diff --git a/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix b/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix index 3e3e5d0d3282..fe75ce4a2a9c 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix +++ b/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix @@ -254,10 +254,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0g8gn3g6qy4bzjv1b14sj283kqynjgwq62bgq569jr4dkqwmwnzd"; + sha256 = "11z3vnd8vh3ny1vx69bjrbck5b2g8zsbj94npyadpn7fdp8y3ldv"; type = "gem"; }; - version = "2.0.17"; + version = "2.0.18"; }; asciidoctor-include-ext = { dependencies = ["asciidoctor"]; @@ -276,10 +276,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "08diy3wpmmaw9kabpr2wm908bgv71jj9l7z9fs6fj45fkkjf92jj"; + sha256 = "0dhsickf1i4cr1w3l9imbqizv67yx1iqh2dhj3lvvkk7j4s3yfz5"; type = "gem"; }; - version = "0.7.0"; + version = "0.8.0"; }; asciidoctor-plantuml = { dependencies = ["asciidoctor"]; @@ -359,10 +359,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "15zwdli370jfsj6jypv7vrqf4vv4ac4784faw7ar5v88fk4q9rcv"; + sha256 = "0gj8f8c54r9cabkm41s59sa1ca5wpbipw7gq3sfl87x9296227fx"; type = "gem"; }; - version = "1.1.1"; + version = "1.2.1"; }; aws-eventstream = { groups = ["default"]; @@ -379,10 +379,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0j579s8y4ppgcxvvsxwbmisplgbi6l09jc4v593y17vrnbfgqcix"; + sha256 = "0awhivg7pr6b06r1jw663q0g7sm3i08n9n8bvry0qjsc03kq9aij"; type = "gem"; }; - version = "1.703.0"; + version = "1.730.0"; }; aws-sdk-cloudformation = { dependencies = ["aws-sdk-core" "aws-sigv4"]; @@ -401,10 +401,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0zc4zhv2wq7s5p8c9iaplama1lpg2kwldg81j83c8w4xydf1wd2r"; + sha256 = "19myd6fkrxmhrp55g2dlnqw0mnz96qv3zpl3zc0cv44zcbmaffsm"; type = "gem"; }; - version = "3.170.0"; + version = "3.170.1"; }; aws-sdk-kms = { dependencies = ["aws-sdk-core" "aws-sigv4"]; @@ -439,6 +439,39 @@ src: }; version = "1.5.1"; }; + axe-core-api = { + dependencies = ["dumb_delegator" "virtus"]; + groups = ["default" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0qkcia7yg50j0ycmzqnl2dzzz9a35wlg5fk30g0qs41z6p1xw38v"; + type = "gem"; + }; + version = "4.6.0"; + }; + axe-core-rspec = { + dependencies = ["axe-core-api" "dumb_delegator" "virtus"]; + groups = ["test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0zvlrnxcyam2574gzn44r0ibz4h0s9j3vrp5lixi731qvp4mphhi"; + type = "gem"; + }; + version = "4.6.0"; + }; + axiom-types = { + dependencies = ["descendants_tracker" "ice_nine" "thread_safe"]; + groups = ["default" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "10q3k04pll041mkgy0m5fn2b1lazm6ly1drdbcczl5p57lzi3zy1"; + type = "gem"; + }; + version = "0.1.1"; + }; azure-storage-blob = { dependencies = ["azure-storage-common" "nokogiri"]; groups = ["default"]; @@ -526,10 +559,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0bh681m54qdsdyvpvflj1wpnj3ybspbpjkr4cnlrl4nk4yikli0j"; + sha256 = "1v3db77blqz3g4z8nskd3jhdviz5d6q2xxvzxvq5m2bk2228kahy"; type = "gem"; }; - version = "2.3.0"; + version = "2.11.0"; }; benchmark-malloc = { groups = ["default" "test"]; @@ -593,15 +626,16 @@ src: }; version = "2.4.11"; }; - binding_ninja = { - groups = ["default" "development" "test"]; + binding_of_caller = { + dependencies = ["debug_inspector"]; + groups = ["default" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "17fa3sv6p2fw9g8fxpwx1kjhhs28aw41akkba0hlgvk60055b1aa"; + sha256 = "078n2dkpgsivcf0pr50981w95nfc2bsrp3wpf9wnxz1qsp8jbb9s"; type = "gem"; }; - version = "0.2.3"; + version = "1.0.0"; }; bootsnap = { dependencies = ["msgpack"]; @@ -827,6 +861,16 @@ src: }; version = "0.9.2"; }; + cloud_profiler_agent = { + dependencies = ["google-cloud-profiler-v2" "google-protobuf" "googleauth" "stackprof"]; + groups = ["default"]; + platforms = []; + source = { + path = "${src}/vendor/gems/cloud_profiler_agent"; + type = "path"; + }; + version = "0.0.1.pre"; + }; coderay = { groups = ["default" "development" "test"]; platforms = [{ @@ -841,6 +885,17 @@ src: }; version = "1.1.3"; }; + coercible = { + dependencies = ["descendants_tracker"]; + groups = ["default" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1p5azydlsz0nkxmcq0i1gzmcfq02lgxc4as7wmf47j1c6ljav0ah"; + type = "gem"; + }; + version = "1.0.0"; + }; colored2 = { groups = ["default" "development"]; platforms = []; @@ -898,10 +953,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1h1vcirk1vpr992xmnwf5z77fpizjwn4xzq2vrrjhvdmjynvl3jj"; + sha256 = "00c6x4ha7qiaaf88qdbyf240mk146zz78rbm4qwyaxmwlmk7q933"; type = "gem"; }; - version = "1.0.0"; + version = "1.3.0"; }; countries = { dependencies = ["i18n_data" "sixarm_ruby_unaccent"]; @@ -962,10 +1017,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1107j3frhmcd95wcsz0rypchynnzhnjiyyxxcl6dlmr2lfy08z4b"; + sha256 = "04q1vin8slr3k8mp76qz0wqgap6f9kdsbryvgfq9fljhrm463kpj"; type = "gem"; }; - version = "1.12.0"; + version = "1.14.0"; }; cvss-suite = { groups = ["default"]; @@ -1019,6 +1074,16 @@ src: }; version = "3.1.1"; }; + debug_inspector = { + groups = ["default" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "01l678ng12rby6660pmwagmyg8nccvjfgs3487xna7ay378a59ga"; + type = "gem"; + }; + version = "1.1.0"; + }; deckar01-task_list = { dependencies = ["html-pipeline"]; groups = ["default"]; @@ -1050,17 +1115,6 @@ src: }; version = "1.1.0"; }; - default_value_for = { - dependencies = ["activerecord"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "03zln3mp8wa734jl7abd6gby08xq8j6n4y2phzxfsssscx8xrlim"; - type = "gem"; - }; - version = "3.4.0"; - }; deprecation_toolkit = { dependencies = ["activesupport"]; groups = ["development" "test"]; @@ -1083,6 +1137,17 @@ src: }; version = "2.1.2"; }; + descendants_tracker = { + dependencies = ["thread_safe"]; + groups = ["default" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "15q8g3fcqyb41qixn6cky0k3p86291y7xsh1jfd851dvrza1vi79"; + type = "gem"; + }; + version = "0.0.4"; + }; device_detector = { groups = ["default"]; platforms = []; @@ -1305,6 +1370,26 @@ src: }; version = "1.4.0"; }; + dumb_delegator = { + groups = ["default" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "151fdn7y0gqs7f6y3y7rn3frv0z359qrw9hb4s7avn6j2qc42ppz"; + type = "gem"; + }; + version = "1.0.0"; + }; + duo_api = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0xk1437b5vrjg8prk2khsva5rkx3apsj7c46n3yk5b8g34787jc7"; + type = "gem"; + }; + version = "1.3.0"; + }; e2mmap = { groups = ["default" "development"]; platforms = []; @@ -1845,10 +1930,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "130y73isnky4kgqwr1jhci3b51ld4i9r5a7132q6aq8cx8qjjx89"; + sha256 = "0127b2jx7lj82h96sm0rnmlgqzgiz5013m6z27vxnkmwrw78iigl"; type = "gem"; }; - version = "3.15.0"; + version = "3.18.0"; }; fog-core = { dependencies = ["builder" "excon" "formatador" "mime-types"]; @@ -1894,28 +1979,6 @@ src: }; version = "0.8.0"; }; - fog-openstack = { - dependencies = ["fog-core" "fog-json" "ipaddress"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "171xnsl6w0j7yi6sp26dcqahx4r4gb2cf359gmy11g5iwnsll5wg"; - type = "gem"; - }; - version = "1.0.8"; - }; - fog-rackspace = { - dependencies = ["fog-core" "fog-json" "fog-xml" "ipaddress"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0y2bli061g37l9p4w0ljqbmg830rp2qz6sf8b0ck4cnx68j7m32a"; - type = "gem"; - }; - version = "0.1.1"; - }; fog-xml = { dependencies = ["fog-core" "nokogiri"]; groups = ["default"]; @@ -1969,6 +2032,17 @@ src: }; version = "0.9.0"; }; + gapic-common = { + dependencies = ["faraday" "faraday-retry" "google-protobuf" "googleapis-common-protos" "googleapis-common-protos-types" "googleauth" "grpc"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1awn2k5b2sji74vr0xhg0v68h1y0msqpkwq5z8k31mp2ii9mmmbg"; + type = "gem"; + }; + version = "0.18.0"; + }; gemoji = { groups = ["default" "development" "test"]; platforms = []; @@ -2073,10 +2147,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0kg5nyp1lfqlksrh4dlnq8a4nhdbhhiwm4hif2smlmqcwr1bri9m"; + sha256 = "0zhsdnr3zbsym6j689d039hrd9if07jbircyl6ns4f5abwhc7w3y"; type = "gem"; }; - version = "3.7.0"; + version = "3.8.0"; }; gitlab-experiment = { dependencies = ["activesupport" "request_store"]; @@ -2106,10 +2180,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "04xi2b9wna2z7qw6cdlypfibp5wnf30xn80dlpbdz0sc063bvvdx"; + sha256 = "1yxz433p9gg8avl94wnb68fm89zaq02r179dkirx5db614vkjfiy"; type = "gem"; }; - version = "0.30.1"; + version = "0.31.1"; }; gitlab-license = { groups = ["default"]; @@ -2403,6 +2477,17 @@ src: }; version = "1.3.0"; }; + google-cloud-profiler-v2 = { + dependencies = ["gapic-common" "google-cloud-errors"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1qyknlvwji7vqhani490cacsrzlqfza10hv47him93yhfnqjmz2k"; + type = "gem"; + }; + version = "0.4.0"; + }; google-cloud-storage = { dependencies = ["addressable" "digest-crc" "google-apis-iamcredentials_v1" "google-apis-storage_v1" "google-cloud-core" "googleauth" "mini_mime"]; groups = ["default"]; @@ -2419,10 +2504,21 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1dcgkhjiaxha3yznyxxzm8a4n4jf61rk7kgbxy4sdkb865zbn2ab"; + sha256 = "1zqyy07ps6zh0gi9nppmnsngzv5nx1qjv726mzhv83sh90rc25nm"; type = "gem"; }; - version = "3.21.12"; + version = "3.22.2"; + }; + googleapis-common-protos = { + dependencies = ["google-protobuf" "googleapis-common-protos-types" "grpc"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "10p3kl9xdxl4xsijkj2l6qn525xchkbfhx3ch603ammibbxq08ys"; + type = "gem"; + }; + version = "1.4.0"; }; googleapis-common-protos-types = { dependencies = ["google-protobuf"]; @@ -2430,10 +2526,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0w860lqs5j6n58a8qn4wr16hp0qz7cq5h67dgma04gncjwqiyhf5"; + sha256 = "12w5bwaziz2iqb9dvgnskp2a7ifml6n4lyl9ypvnxj5bfrrwysap"; type = "gem"; }; - version = "1.3.0"; + version = "1.5.0"; }; googleauth = { dependencies = ["faraday" "jwt" "memoist" "multi_json" "os" "signet"]; @@ -2784,10 +2880,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0jn1y6sfxpfaq0hcblv8hhyxzam8n39kvypi07q2vxaimh6ly7mj"; + sha256 = "1bzb8p31kzv6q5p4z5xq88mnqk414rrw0y5rkhpnvpl29x5c3bpw"; type = "gem"; }; - version = "5.1.0"; + version = "5.1.1"; }; http-accept = { groups = ["default"]; @@ -2883,6 +2979,16 @@ src: }; version = "0.16.4"; }; + ice_nine = { + groups = ["default" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1nv35qg1rps9fsis28hz2cq2fx1i96795f91q4nmkm934xynll2x"; + type = "gem"; + }; + version = "0.11.2"; + }; imagen = { dependencies = ["parser"]; groups = ["coverage" "default" "development" "test"]; @@ -3133,10 +3239,11 @@ src: groups = ["default"]; platforms = []; source = { - path = "${src}/vendor/gems/kubeclient"; - type = "path"; + remotes = ["https://rubygems.org"]; + sha256 = "1k1zi27fnasqpinfxnajm81pyr11k2j510wacr53d37v97bzr1a9"; + type = "gem"; }; - version = "4.9.4.pre.gitlab1"; + version = "4.11.0"; }; launchy = { dependencies = ["addressable"]; @@ -3154,10 +3261,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "07bh4ns9b58nrjjsfx2r69ki56f7nclcczsravkj9ilgw1lagm0z"; + sha256 = "0pfwsag1zm990mk8sgagnzkanaf7c6k6dnwf32pnmbdbs2csfsc2"; type = "gem"; }; - version = "1.2.9"; + version = "1.3.3"; }; letter_opener = { dependencies = ["launchy"]; @@ -3652,6 +3759,17 @@ src: }; version = "2.1.3"; }; + net-protocol = { + dependencies = ["timeout"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "051cc82dl41a66c9sxv4lx4slqk7sz1v4iy0hdk6gpjyjszf4hxd"; + type = "gem"; + }; + version = "0.1.3"; + }; net-scp = { dependencies = ["net-ssh"]; groups = ["default"]; @@ -3709,10 +3827,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0qr6psd9qgv83pklpw7cpmshkcasnv8d777ksmvwsacwfvvkmnxj"; + sha256 = "1djq4rp4m967mn6sxmiw75vz24gfp0w602xv22kk1x3cmi5afrf7"; type = "gem"; }; - version = "1.14.1"; + version = "1.14.2"; }; notiffany = { dependencies = ["nenv" "shellany"]; @@ -4047,14 +4165,15 @@ src: version = "2.2.2"; }; openssl-signature_algorithm = { + dependencies = ["openssl"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "14d95jr5z6dgvpwf52p7ckjf3w3cihin2k6g9599711pfxdj4fp5"; + sha256 = "103yjl68wqhl5kxaciir5jdnyi7iv9yckishdr52s5knh9g0pd53"; type = "gem"; }; - version = "0.4.0"; + version = "1.3.0"; }; opentracing = { groups = ["default"]; @@ -4283,10 +4402,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "095gq9sr6pab1jzbvn3pjs7i1p5hnlasnhvq2xdfsvxjyw33fvbn"; + sha256 = "0zcw8yx7c2mmmcl3kq7nswansshcpxzqjbxf61xqfydbmhd5z2vi"; type = "gem"; }; - version = "0.17.0"; + version = "0.19.1"; }; pry = { dependencies = ["coderay" "method_source"]; @@ -4864,10 +4983,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1dnfkrk8xx2m8r3r9m2p5xcq57viznyc09k7r3i4jbm758i57lx3"; + sha256 = "046xwhfhi2krmbaqmg9vshf01vzld8smczx6dwppinv61ndc2vqg"; type = "gem"; }; - version = "3.30.0"; + version = "4.1.0"; }; rqrcode = { dependencies = ["chunky_png"]; @@ -4947,15 +5066,37 @@ src: version = "3.12.3"; }; rspec-parameterized = { - dependencies = ["binding_ninja" "parser" "proc_to_ast" "rspec" "unparser"]; + dependencies = ["rspec-parameterized-core" "rspec-parameterized-table_syntax"]; groups = ["test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0m142sp884z3k3xd42ngf0n8a83hvcihcj1n66qyxlgdnl3sqqzi"; + sha256 = "11mk52x34j957rqccxfqlsqjzg26dz04ipd1v4yx5yraqx1v01ww"; type = "gem"; }; - version = "0.5.0"; + version = "1.0.0"; + }; + rspec-parameterized-core = { + dependencies = ["parser" "proc_to_ast" "rspec" "unparser"]; + groups = ["default" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1hfc2q7g8f5s6kdh1chwlalvz3fvj57vlfpn18b23677hm4ljyr8"; + type = "gem"; + }; + version = "1.0.0"; + }; + rspec-parameterized-table_syntax = { + dependencies = ["binding_of_caller" "rspec-parameterized-core"]; + groups = ["default" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "134q0hki279np9dv7mgr85wspdrvhpj9lpvxr9kx6pcwzwg9bpyp"; + type = "gem"; + }; + version = "1.0.0"; }; rspec-rails = { dependencies = ["actionpack" "activesupport" "railties" "rspec-core" "rspec-expectations" "rspec-mocks" "rspec-support"]; @@ -5105,10 +5246,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1m91qhhh2sakmd6kznipmwwb3i2qlfx40fpnj4vsh40d2f2v25rc"; + sha256 = "00b15fd74bkrxfqbx1gg2nw78fs7lvmn8mf92bway8vxgf3kh8bv"; type = "gem"; }; - version = "0.5.4"; + version = "0.6.0"; }; ruby-progressbar = { groups = ["default" "development" "test"]; @@ -5299,16 +5440,6 @@ src: }; version = "0.1.1"; }; - securecompare = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0ay65wba4i7bvfqyvf5i4r48q6g70s5m724diz9gdvdavscna36b"; - type = "gem"; - }; - version = "1.0.0"; - }; seed-fu = { dependencies = ["activerecord" "activesupport"]; groups = ["default"]; @@ -5705,10 +5836,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1bpmrz2vw59gw556y5hsha3xlrvfv4qwck4wg2r39qf2bp2hcr1b"; + sha256 = "02r3a3ny27ljj19bzmxscw2vlmk7sw1p4ppbl2i69g17khi0p4sw"; type = "gem"; }; - version = "0.2.21"; + version = "0.2.23"; }; state_machines = { groups = ["default"]; @@ -5921,6 +6052,16 @@ src: }; version = "1.2.1"; }; + thread_safe = { + groups = ["default" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0nmhcgq6cgz44srylra07bmaw99f5271l0dpsvl5f75m44l0gmwy"; + type = "gem"; + }; + version = "0.3.6"; + }; thrift = { groups = ["default"]; platforms = []; @@ -5951,6 +6092,16 @@ src: }; version = "0.3.10"; }; + timeout = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1pfddf51n5fnj4f9ggwj3wbf23ynj0nbxlxqpz12y1gvl9g7d6r6"; + type = "gem"; + }; + version = "0.3.2"; + }; timfel-krb5-auth = { groups = ["default" "kerberos"]; platforms = []; @@ -5994,15 +6145,15 @@ src: version = "1.3.0"; }; tpm-key_attestation = { - dependencies = ["bindata" "openssl-signature_algorithm"]; + dependencies = ["bindata" "openssl" "openssl-signature_algorithm"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1kdqyanz211wmxjzfiz2wg17gj6p4431qvjr0i6sp3d6268sssg4"; + sha256 = "0v8y5dibsyskv1ncdgszhxwzq0gzmvb0zl7sgmx0xvsgy86dhcz1"; type = "gem"; }; - version = "0.9.0"; + version = "0.12.0"; }; trailblazer-option = { groups = ["default"]; @@ -6062,10 +6213,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "14nwxdh5yr2xlpgxjqmdgjlrj1h9ddpc1r00sp1jxp1sc7jsqbq6"; + sha256 = "04f599zn5rfndq4d9l0acllfpc041bzdkkz2h6x0dl18f2wivn0y"; type = "gem"; }; - version = "0.7.1"; + version = "0.7.2"; }; tty-prompt = { dependencies = ["pastel" "tty-reader"]; @@ -6220,10 +6371,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0246c6j1lbi6jgga3n2br1nyvnwzh1bz0r9yca5d4cihb100byja"; + sha256 = "1j6ym6cn43ry4lvcal7cv0n9g9awny7kcrn1crp7cwx2vwzffhmf"; type = "gem"; }; - version = "0.6.0"; + version = "0.6.7"; }; uri_template = { groups = ["default"]; @@ -6310,6 +6461,17 @@ src: }; version = "2.74.1"; }; + virtus = { + dependencies = ["axiom-types" "coercible" "descendants_tracker"]; + groups = ["default" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1hniwgbdsjxa71qy47n6av8faf8qpwbaapms41rhkk3zxgjdlhc8"; + type = "gem"; + }; + version = "2.0.0"; + }; vmstat = { groups = ["default"]; platforms = []; @@ -6342,15 +6504,15 @@ src: version = "1.3.0"; }; webauthn = { - dependencies = ["android_key_attestation" "awrence" "bindata" "cbor" "cose" "openssl" "safety_net_attestation" "securecompare" "tpm-key_attestation"]; + dependencies = ["android_key_attestation" "awrence" "bindata" "cbor" "cose" "openssl" "safety_net_attestation" "tpm-key_attestation"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "17nqmi6n4s3i6pmcd7myf7w49q9xd5xlcvz9vbqijlm4yicyxywn"; + sha256 = "1ri09bf640kkw4v6k2g90q2nw1mx2hsghhngaqgb7958q8id8xrz"; type = "gem"; }; - version = "2.3.0"; + version = "3.0.0"; }; webfinger = { dependencies = ["activesupport" "httpclient"]; From 64a4de856877a32e4f8f4863101e2cbbfdc6b62b Mon Sep 17 00:00:00 2001 From: Raito Bezarius Date: Fri, 24 Mar 2023 21:39:57 +0100 Subject: [PATCH 85/94] zfsUnstable: make it compatible again with 6.2.8 and potentially 6.3 Patched from https://github.com/openzfs/zfs/pull/14668 --- pkgs/os-specific/linux/zfs/default.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/os-specific/linux/zfs/default.nix b/pkgs/os-specific/linux/zfs/default.nix index 5e5ec6d79312..750586ff1b1d 100644 --- a/pkgs/os-specific/linux/zfs/default.nix +++ b/pkgs/os-specific/linux/zfs/default.nix @@ -256,5 +256,13 @@ in { sha256 = "sha256-CdPuyZMXFzANEdnsr/rB5ckkT8X5uziniY5vmRCKl1U="; isUnstable = true; + + # Necessary for 6.2.8+ and 6.3 compatibility, see https://github.com/openzfs/zfs/issues/14658 + extraPatches = [ + (fetchpatch { + url = "https://github.com/openzfs/zfs/pull/14668.patch"; + hash = "sha256-PR7hxxdjLkjszADdw0R0JRmBPfDlsXG6D+VfC7QzEhk="; + }) + ]; }; } From 56fa7ab066165a2eb6274a0ab423b518e3e115b4 Mon Sep 17 00:00:00 2001 From: Raito Bezarius Date: Mon, 27 Mar 2023 14:25:08 +0200 Subject: [PATCH 86/94] nixos/tests/zfs: add zfsUnstable test for systemd-stage 1 --- nixos/tests/zfs.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/nixos/tests/zfs.nix b/nixos/tests/zfs.nix index 3e55369daa06..bcb9d9bcfd60 100644 --- a/nixos/tests/zfs.nix +++ b/nixos/tests/zfs.nix @@ -12,6 +12,7 @@ let then pkgs.zfsUnstable.latestCompatibleLinuxPackages else pkgs.linuxPackages , enableUnstable ? false + , enableSystemdStage1 ? false , extraTest ? "" }: makeTest { @@ -36,6 +37,7 @@ let boot.kernelPackages = kernelPackage; boot.supportedFilesystems = [ "zfs" ]; boot.zfs.enableUnstable = enableUnstable; + boot.initrd.systemd.enable = enableSystemdStage1; environment.systemPackages = [ pkgs.parted ]; @@ -176,6 +178,11 @@ in { enableUnstable = true; }; + unstableWithSystemdStage1 = makeZfsTest "unstable" { + enableUnstable = true; + enableSystemdStage1 = true; + }; + installer = (import ./installer.nix { }).zfsroot; expand-partitions = makeTest { From c42fe31f1e442bc426e33cbb5dccfb2b7b0ac029 Mon Sep 17 00:00:00 2001 From: Nicolas Benes Date: Mon, 27 Mar 2023 18:44:59 +0200 Subject: [PATCH 87/94] nitrokey-app: add panicgh to maintainers --- pkgs/tools/security/nitrokey-app/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/security/nitrokey-app/default.nix b/pkgs/tools/security/nitrokey-app/default.nix index 502716d9e026..8f8991801f7c 100644 --- a/pkgs/tools/security/nitrokey-app/default.nix +++ b/pkgs/tools/security/nitrokey-app/default.nix @@ -46,6 +46,6 @@ stdenv.mkDerivation rec { ''; homepage = "https://github.com/Nitrokey/nitrokey-app"; license = licenses.gpl3; - maintainers = with maintainers; [ kaiha ]; + maintainers = with maintainers; [ kaiha panicgh ]; }; } From 7159363f5172a53286678ea84693570d3b35a9db Mon Sep 17 00:00:00 2001 From: Zhaofeng Li Date: Wed, 18 Jan 2023 22:16:47 -0700 Subject: [PATCH 88/94] linuxPackages.nvidia_x11_legacy340: Fix build on 6.1 This uses the patchset of a popular AUR package. --- pkgs/os-specific/linux/nvidia-x11/default.nix | 29 ++++++++++++++--- .../vm_operations_struct-fault.patch | 31 ------------------- 2 files changed, 25 insertions(+), 35 deletions(-) delete mode 100644 pkgs/os-specific/linux/nvidia-x11/vm_operations_struct-fault.patch diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix index 156bb150c5f7..55c18e869ffa 100644 --- a/pkgs/os-specific/linux/nvidia-x11/default.nix +++ b/pkgs/os-specific/linux/nvidia-x11/default.nix @@ -1,4 +1,4 @@ -{ lib, callPackage, fetchpatch, fetchurl, stdenv, pkgsi686Linux }: +{ lib, callPackage, fetchFromGitHub, fetchurl, fetchpatch, stdenv, pkgsi686Linux }: let generic = args: let @@ -98,7 +98,28 @@ rec { persistencedSha256 = "sha256-NuqUQbVt80gYTXgIcu0crAORfsj9BCRooyH3Gp1y1ns="; }; - legacy_340 = generic { + legacy_340 = let + # Source cooresponding to https://aur.archlinux.org/packages/nvidia-340xx-dkms + aurPatches = fetchFromGitHub { + owner = "archlinux-jerry"; + repo = "nvidia-340xx"; + rev = "fe2b38e66f2199777bcede6eb35c5df0210f15dc"; + hash = "sha256-hPFfzWGo2jF/DLm1OkP+BBnRY69N8kKUZ1EGkoHJlKA="; + }; + patchset = [ + "0001-kernel-5.7.patch" + "0002-kernel-5.8.patch" + "0003-kernel-5.9.patch" + "0004-kernel-5.10.patch" + "0005-kernel-5.11.patch" + "0006-kernel-5.14.patch" + "0007-kernel-5.15.patch" + "0008-kernel-5.16.patch" + "0009-kernel-5.17.patch" + "0010-kernel-5.18.patch" + "0011-kernel-6.0.patch" + ]; + in generic { version = "340.108"; sha256_32bit = "1jkwa1phf0x4sgw8pvr9d6krmmr3wkgwyygrxhdazwyr2bbalci0"; sha256_64bit = "06xp6c0sa7v1b82gf0pq0i5p0vdhmm3v964v0ypw36y0nzqx8wf6"; @@ -106,7 +127,7 @@ rec { persistencedSha256 = "1ax4xn3nmxg1y6immq933cqzw6cj04x93saiasdc0kjlv0pvvnkn"; useGLVND = false; - broken = kernel.kernelAtLeast "5.5"; - patches = [ ./vm_operations_struct-fault.patch ]; + broken = kernel.kernelAtLeast "6.2"; + patches = map (patch: "${aurPatches}/${patch}") patchset; }; } diff --git a/pkgs/os-specific/linux/nvidia-x11/vm_operations_struct-fault.patch b/pkgs/os-specific/linux/nvidia-x11/vm_operations_struct-fault.patch deleted file mode 100644 index 6ce5c1205e2d..000000000000 --- a/pkgs/os-specific/linux/nvidia-x11/vm_operations_struct-fault.patch +++ /dev/null @@ -1,31 +0,0 @@ -https://devtalk.nvidia.com/default/topic/1025051/fully-working-patches-2-of-them-for-nvidia-driver-340-104-compiler-installer-file-and-linux-kernels-4-13-amp-4-14/?offset=5 ---- a/kernel/uvm/nvidia_uvm_lite.c -+++ b/kernel/uvm/nvidia_uvm_lite.c -@@ -818,8 +818,15 @@ done: - } - - #if defined(NV_VM_OPERATIONS_STRUCT_HAS_FAULT) -+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0) - int _fault(struct vm_area_struct *vma, struct vm_fault *vmf) -+#else -+int _fault(struct vm_fault *vmf) -+#endif - { -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 11, 0) -+ struct vm_area_struct *vma = vmf->vma; -+#endif - #if defined(NV_VM_FAULT_HAS_ADDRESS) - unsigned long vaddr = vmf->address; - #else -@@ -866,7 +873,11 @@ static struct vm_operations_struct uvmlite_vma_ops = - // it's dealing with anonymous mapping (see handle_pte_fault). - // - #if defined(NV_VM_OPERATIONS_STRUCT_HAS_FAULT) -+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0) - int _sigbus_fault(struct vm_area_struct *vma, struct vm_fault *vmf) -+#else -+int _sigbus_fault(struct vm_fault *vmf) -+#endif - { - vmf->page = NULL; - return VM_FAULT_SIGBUS; From c29ca6704dfd562e22bc60ad3d650d753f4bb22f Mon Sep 17 00:00:00 2001 From: stuebinm Date: Mon, 27 Mar 2023 20:43:28 +0200 Subject: [PATCH 89/94] mattermost: add environmentFile option to allow declarative secrets This adds an option `services.mattermost.environmentFile`, intended to be useful especially when `services.mattermost.mutableConfig` is set to `false`. Since all mattermost configuration options can also be set by environment variables, this allows managing secret configuration values in a declarative manner without placing them in the nix store. --- nixos/modules/services/web-apps/mattermost.nix | 17 +++++++++++++++++ nixos/tests/mattermost.nix | 16 ++++++++++++++++ 2 files changed, 33 insertions(+) diff --git a/nixos/modules/services/web-apps/mattermost.nix b/nixos/modules/services/web-apps/mattermost.nix index 56a53198b3fb..db5122e79f00 100644 --- a/nixos/modules/services/web-apps/mattermost.nix +++ b/nixos/modules/services/web-apps/mattermost.nix @@ -184,6 +184,22 @@ in .tar.gz files. ''; }; + environmentFile = mkOption { + type = types.nullOr types.path; + default = null; + description = lib.mdDoc '' + Environment file (see {manpage}`systemd.exec(5)` + "EnvironmentFile=" section for the syntax) which sets config options + for mattermost (see [the mattermost documentation](https://docs.mattermost.com/configure/configuration-settings.html#environment-variables)). + + Settings defined in the environment file will overwrite settings + set via nix or via the {option}`services.mattermost.extraConfig` + option. + + Useful for setting config options without their value ending up in the + (world-readable) nix store, e.g. for a database password. + ''; + }; localDatabaseCreate = mkOption { type = types.bool; @@ -321,6 +337,7 @@ in Restart = "always"; RestartSec = "10"; LimitNOFILE = "49152"; + EnvironmentFile = cfg.environmentFile; }; unitConfig.JoinsNamespaceOf = mkIf cfg.localDatabaseCreate "postgresql.service"; }; diff --git a/nixos/tests/mattermost.nix b/nixos/tests/mattermost.nix index 49b418d9fff7..e11201f05357 100644 --- a/nixos/tests/mattermost.nix +++ b/nixos/tests/mattermost.nix @@ -50,6 +50,13 @@ in mutableConfig = false; extraConfig.SupportSettings.HelpLink = "https://search.nixos.org"; }; + environmentFile = makeMattermost { + mutableConfig = false; + extraConfig.SupportSettings.AboutLink = "https://example.org"; + environmentFile = pkgs.writeText "mattermost-env" '' + MM_SUPPORTSETTINGS_ABOUTLINK=https://nixos.org + ''; + }; }; testScript = let @@ -69,6 +76,7 @@ in rm -f $mattermostConfig echo "$newConfig" > "$mattermostConfig" ''; + in '' start_all() @@ -120,5 +128,13 @@ in # Our edits should be ignored on restart immutable.succeed("${expectConfig ''.AboutLink == "https://nixos.org" and .HelpLink == "https://search.nixos.org"''}") + + + ## Environment File node tests ## + environmentFile.wait_for_unit("mattermost.service") + environmentFile.wait_for_open_port(8065) + + # Settings in the environment file should override settings set otherwise + environmentFile.succeed("${expectConfig ''.AboutLink == "https://nixos.org"''}") ''; }) From 87d4e177760993d588d7a89aa9935c723945138c Mon Sep 17 00:00:00 2001 From: Lorenzo Manacorda Date: Mon, 27 Mar 2023 21:15:03 +0200 Subject: [PATCH 90/94] maintainers/team-list: add asymmetric to docs --- maintainers/team-list.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix index 173ad98263f9..55d6fa72ec9c 100644 --- a/maintainers/team-list.nix +++ b/maintainers/team-list.nix @@ -221,6 +221,7 @@ with lib.maintainers; { docs = { members = [ + asymmetric ryantm ]; scope = "Maintain nixpkgs/NixOS documentation and tools for building it."; From 9218f1a00cd3f54fac797095dbddc486683d820e Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Mon, 27 Mar 2023 22:12:35 +0200 Subject: [PATCH 91/94] Revert "buildLuaPackage: throw instead of marking as broken package" This reverts commit 0cd595cdb3b4f39ef5b903b64b45534ea9bc63ff. It's causing build failures for knot-resolver and others. Workaround for https://github.com/NixOS/nixpkgs/issues/223437 --- pkgs/development/interpreters/lua-5/build-lua-package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/interpreters/lua-5/build-lua-package.nix b/pkgs/development/interpreters/lua-5/build-lua-package.nix index e323d74a26bb..c86e71ad366b 100644 --- a/pkgs/development/interpreters/lua-5/build-lua-package.nix +++ b/pkgs/development/interpreters/lua-5/build-lua-package.nix @@ -213,8 +213,8 @@ let platforms = lua.meta.platforms; # add extra maintainer(s) to every package maintainers = (meta.maintainers or []) ++ [ ]; + broken = disabled; } // meta; })); in - assert (disabled -> throw "${pname} not supported for interpreter ${lua.executable}"); luarocksDrv From e6854e7d3aa342705b870d5ccf76e210a0eaeb65 Mon Sep 17 00:00:00 2001 From: Michael Lingelbach Date: Mon, 27 Mar 2023 13:15:58 -0700 Subject: [PATCH 92/94] garage: fix missing stateVersion and default pkg * stateVersion was not in scope, added config.system.systemVersion * garage_0_8_0 -> garage_0_8, the former does not exist --- nixos/modules/services/web-servers/garage.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/web-servers/garage.nix b/nixos/modules/services/web-servers/garage.nix index 2491c788d6c5..df8ed96f8d90 100644 --- a/nixos/modules/services/web-servers/garage.nix +++ b/nixos/modules/services/web-servers/garage.nix @@ -60,7 +60,7 @@ in package = mkOption { # TODO: when 23.05 is released and if Garage 0.9 is the default, put a stateVersion check. - default = if versionAtLeast stateVersion "23.05" then pkgs.garage_0_8_0 + default = if versionAtLeast config.system.stateVersion "23.05" then pkgs.garage_0_8 else pkgs.garage_0_7; defaultText = literalExpression "pkgs.garage_0_7"; type = types.package; From 2dd94107bc137e614ee0cd69a566dab3dfe11aef Mon Sep 17 00:00:00 2001 From: "\"Ilan Joselevich\"" <"personal@ilanjoselevich.com"> Date: Tue, 28 Mar 2023 01:01:49 +0300 Subject: [PATCH 93/94] vimPlugins: update --- .../editors/vim/plugins/generated.nix | 568 +++++++++--------- 1 file changed, 284 insertions(+), 284 deletions(-) diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index 86b6fa4bfe23..d062614d1d38 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -173,24 +173,24 @@ final: prev: LazyVim = buildVimPluginFrom2Nix { pname = "LazyVim"; - version = "2023-03-23"; + version = "2023-03-25"; src = fetchFromGitHub { owner = "LazyVim"; repo = "LazyVim"; - rev = "c4572fcec877053df89e7aba3bcd52a0ca5c7df7"; - sha256 = "0bbzmzkra9dj2a7j9lnss2fdl0h93r7n8cy5dfnlq80ynryfnsc5"; + rev = "f67f20184f0fe852881d925d387ce138754fa147"; + sha256 = "1f8iw4jrpyhb3nk9sz7hymdhl84bxxafjc0n7g2srhb2ggypnv46"; }; meta.homepage = "https://github.com/LazyVim/LazyVim/"; }; LeaderF = buildVimPluginFrom2Nix { pname = "LeaderF"; - version = "2023-03-20"; + version = "2023-03-24"; src = fetchFromGitHub { owner = "Yggdroot"; repo = "LeaderF"; - rev = "4b8f537dadf5f9abbdd1554584bec9c04843909c"; - sha256 = "0sb94hi4qph8wg9agkg5kvqzfjnqnk683y05r0waw69r4iarsfar"; + rev = "45911fd6b436976ae9e83eb0a1968d3b8e72276b"; + sha256 = "09rp8xc3w7kzpcvkxjjcd9535slj2v2grl2jw5s00n4qlkvrd6p2"; }; meta.homepage = "https://github.com/Yggdroot/LeaderF/"; }; @@ -305,12 +305,12 @@ final: prev: SchemaStore-nvim = buildVimPluginFrom2Nix { pname = "SchemaStore.nvim"; - version = "2023-03-16"; + version = "2023-03-27"; src = fetchFromGitHub { owner = "b0o"; repo = "SchemaStore.nvim"; - rev = "ac100fa691b10dd990ca0cdc31ebd054a5959b58"; - sha256 = "1j59vy5dypc5a1ymgd640lyqkq2gsicqapgmlssxz0g91r71n40z"; + rev = "15022828c25a97a05b510b131a37d5b1330ee073"; + sha256 = "07dwzcsmgws4scsmk91fvmwyb7b6ldafmbxmkk04cwi4zlky90a9"; }; meta.homepage = "https://github.com/b0o/SchemaStore.nvim/"; }; @@ -365,12 +365,12 @@ final: prev: SpaceVim = buildVimPluginFrom2Nix { pname = "SpaceVim"; - version = "2023-03-23"; + version = "2023-03-26"; src = fetchFromGitHub { owner = "SpaceVim"; repo = "SpaceVim"; - rev = "73a7242daa785fc66a887ab1864dc1c9432d7cbe"; - sha256 = "09zv4wjnb1gfwq718gavpb5s2cwf7a057h3g8d8gs5x3vrxs6sda"; + rev = "e6ac093930495509732042d23ba9b07591e61aa0"; + sha256 = "0lfzz2qsxj27hg1cdxb9yvh6ajns63dljc7a99m3vbhha7j71dmb"; }; meta.homepage = "https://github.com/SpaceVim/SpaceVim/"; }; @@ -486,12 +486,12 @@ final: prev: aerial-nvim = buildVimPluginFrom2Nix { pname = "aerial.nvim"; - version = "2023-03-18"; + version = "2023-03-26"; src = fetchFromGitHub { owner = "stevearc"; repo = "aerial.nvim"; - rev = "ab85d57942b3d7e1a2530af1a083b77f4ba33cba"; - sha256 = "1arywda3ai49x0wxbjkp4z7nfmqxfz3z5gcggwbwv6ddxkfd3ld5"; + rev = "8a59ed2dc9563833ee0277b5bfd2e06faf95c2ab"; + sha256 = "0bsigxpdflamw4sp5cx1g2kmxdg6hxv1knkn1d69idfadz0dfb82"; fetchSubmodules = true; }; meta.homepage = "https://github.com/stevearc/aerial.nvim/"; @@ -547,12 +547,12 @@ final: prev: ale = buildVimPluginFrom2Nix { pname = "ale"; - version = "2023-03-15"; + version = "2023-03-26"; src = fetchFromGitHub { owner = "dense-analysis"; repo = "ale"; - rev = "fbae1bc1937ce69fa80b4b32d178ce666fd5c07c"; - sha256 = "0a1pfslirdi04ag8fawclmk97nrzifgmja6p2hjqp9a47ikn8br2"; + rev = "7dbd3c96ac1eb3a1981e740423a31500108f6e25"; + sha256 = "1z906gmwar9v3xwcx1r7ry0k9mvqcfg0vkg1v978qslcakcyqpzh"; }; meta.homepage = "https://github.com/dense-analysis/ale/"; }; @@ -775,12 +775,12 @@ final: prev: autoclose-nvim = buildVimPluginFrom2Nix { pname = "autoclose.nvim"; - version = "2023-02-28"; + version = "2023-03-27"; src = fetchFromGitHub { owner = "m4xshen"; repo = "autoclose.nvim"; - rev = "8fb04cef34aff609fb84ab6dd753dc2d6babfad8"; - sha256 = "1bx5gxlsiav8ix8npc5vwm1lnhhvxvbri8qf2jwl0xc6f3p5dgx1"; + rev = "c4db42ffc0edbd244502be951c142df0c8a7e582"; + sha256 = "0kp3mkl3bl2l6ainfxs7snj78svqfhcxc7yflvfln8397y9b6647"; }; meta.homepage = "https://github.com/m4xshen/autoclose.nvim/"; }; @@ -1075,12 +1075,12 @@ final: prev: ccc-nvim = buildVimPluginFrom2Nix { pname = "ccc.nvim"; - version = "2023-03-21"; + version = "2023-03-25"; src = fetchFromGitHub { owner = "uga-rosa"; repo = "ccc.nvim"; - rev = "3d2020703c10385970032acda4f2efe0679458d1"; - sha256 = "09iakiv13q3gmyn21az5zz1jf34iw3n5hs2nr7zih956irkj2w03"; + rev = "e47e0bad487ed23b0121b675b77af40fa41ad7b6"; + sha256 = "0i6nwkqzjg24f4jik88wmybrz0kcakdwvrsdln1i0llaymr59vlx"; }; meta.homepage = "https://github.com/uga-rosa/ccc.nvim/"; }; @@ -1123,12 +1123,12 @@ final: prev: circles-nvim = buildVimPluginFrom2Nix { pname = "circles.nvim"; - version = "2023-03-21"; + version = "2023-03-25"; src = fetchFromGitHub { owner = "projekt0n"; repo = "circles.nvim"; - rev = "1e54101b36457baf33555380f1dac56db5d17e62"; - sha256 = "1vvd0c9mjiqpgd63b5vkkmnbg8a00yw8k02mk410r5hlzx1c3axx"; + rev = "425c8430771321b610ca068a7594668d7a7ea3d6"; + sha256 = "0si9cmpmh8jjiac3654v5avxyf9lsxdqmgv74h47blzwzn8dgrmn"; }; meta.homepage = "https://github.com/projekt0n/circles.nvim/"; }; @@ -1639,12 +1639,12 @@ final: prev: cmp-treesitter = buildVimPluginFrom2Nix { pname = "cmp-treesitter"; - version = "2022-10-28"; + version = "2023-03-26"; src = fetchFromGitHub { owner = "ray-x"; repo = "cmp-treesitter"; - rev = "b40178b780d547bcf131c684bc5fd41af17d05f2"; - sha256 = "076x4rfcvy81m28dpjaqcxrl3q9mhfz7qbwgkqsyndrasibsmlzr"; + rev = "c8e3a74b51597d69d240085a258636972ce98e15"; + sha256 = "0xb4bvh49z26cpi005q6ma0mv9mw49npcrayvd3c6pcdgr148p5p"; }; meta.homepage = "https://github.com/ray-x/cmp-treesitter/"; }; @@ -1963,12 +1963,12 @@ final: prev: compiler-explorer-nvim = buildVimPluginFrom2Nix { pname = "compiler-explorer.nvim"; - version = "2023-03-23"; + version = "2023-03-24"; src = fetchFromGitHub { owner = "krady21"; repo = "compiler-explorer.nvim"; - rev = "ddb8a72022139be35d02c747d5d009172c9d64ca"; - sha256 = "0z9ngh66g02ssxgh0403h9w1j9zmpamvap0lmy7gacy20w471g1i"; + rev = "5942e1bef90c8dd6030e1faacaa445cf2d10e70c"; + sha256 = "1mq5a06567j6xd1gcnbgbkiingb1kvpgw1jcfv5f4b3vvsibkzsz"; }; meta.homepage = "https://github.com/krady21/compiler-explorer.nvim/"; }; @@ -2047,12 +2047,12 @@ final: prev: conjure = buildVimPluginFrom2Nix { pname = "conjure"; - version = "2023-02-19"; + version = "2023-03-26"; src = fetchFromGitHub { owner = "Olical"; repo = "conjure"; - rev = "82cdd72049fc729854d69747be2673bc8ba8d97f"; - sha256 = "0qpc4fqjyq9kyb1rvwgp192v34fzmv5nacdsvc0pycyanbmh04hf"; + rev = "51936288d182a677fcb808e660081ad7e9ecd4ec"; + sha256 = "0j6amy2jc7jgxgsski4za5fhc4wgxh22lqz3k01ag40845gfndqb"; }; meta.homepage = "https://github.com/Olical/conjure/"; }; @@ -2119,24 +2119,24 @@ final: prev: coq-artifacts = buildVimPluginFrom2Nix { pname = "coq.artifacts"; - version = "2023-03-19"; + version = "2023-03-26"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "coq.artifacts"; - rev = "5084d1e7304c34cbd507b026dc557ef772b7bf86"; - sha256 = "0rqd7nnl561h4d82mjg6z2pplgiak2k9624jdqqvjihf2k756xih"; + rev = "073ffdc8504c4b5ff98c099002fb58adaf2f782e"; + sha256 = "1hyw840jfkrcrzv86j9sr5625yyw8mxkb44v1hmcg12ydsllyghh"; }; meta.homepage = "https://github.com/ms-jpq/coq.artifacts/"; }; coq-thirdparty = buildVimPluginFrom2Nix { pname = "coq.thirdparty"; - version = "2023-03-19"; + version = "2023-03-26"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "coq.thirdparty"; - rev = "f464963331327cbf588548f62bd8ad77331a1c26"; - sha256 = "0s5z599dx6sy7jpc7ssr84qcbxz06ss1n2581x7app2l816zzhlq"; + rev = "6b52ae60235525d6a00fc091de4598ac88a63ecc"; + sha256 = "08r1zhmpjzifb89v56k8v2w0xxylai353b2d73lsz4i8x4bvipii"; }; meta.homepage = "https://github.com/ms-jpq/coq.thirdparty/"; }; @@ -2155,12 +2155,12 @@ final: prev: coq_nvim = buildVimPluginFrom2Nix { pname = "coq_nvim"; - version = "2023-03-19"; + version = "2023-03-26"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "coq_nvim"; - rev = "2dec8c79eaf60755b32cd29ac0a6ddbb8290ff6a"; - sha256 = "11ig2dv4vy601nrkxr7rjsh9dy5qcwcbilh5f5a8k76q0vaz4wi7"; + rev = "8847707462e5d89a0043e7846439e180b9dfb04f"; + sha256 = "1nhfg0vazpszydbgvdls49gvnpr0l0lqxphzz9p12177wirw2a83"; }; meta.homepage = "https://github.com/ms-jpq/coq_nvim/"; }; @@ -2299,12 +2299,12 @@ final: prev: dashboard-nvim = buildVimPluginFrom2Nix { pname = "dashboard-nvim"; - version = "2023-03-23"; + version = "2023-03-27"; src = fetchFromGitHub { owner = "glepnir"; repo = "dashboard-nvim"; - rev = "cf924ac83fa218d30faf9fb47ac0b628b2706276"; - sha256 = "0lc876mwazx33vy4aq98k6gcrblc3kndg530gmc1lj89hlldsgvb"; + rev = "c6fc33da0a955ec91fee0fea4d06707542f00a5f"; + sha256 = "0z63p4l1rn5fzzwfc2j5v0cp8ms39zbmmnwwl2da6gqj9a85idki"; }; meta.homepage = "https://github.com/glepnir/dashboard-nvim/"; }; @@ -2673,12 +2673,12 @@ final: prev: dial-nvim = buildVimPluginFrom2Nix { pname = "dial.nvim"; - version = "2023-01-26"; + version = "2023-03-26"; src = fetchFromGitHub { owner = "monaqa"; repo = "dial.nvim"; - rev = "5020da900cc5dfd7067f181ee2ebd872ca7c84e8"; - sha256 = "0qxd2wn6q5v60ai222yjhzqkcb9v0dnlr4k2pvn9zqcwhj0qc2py"; + rev = "94c46495345c36988c307f3ec055afda248d4a37"; + sha256 = "0yxisgjr157s8wv3kg316pvd264fjjzpn0g6rmjvhgl9152iwfwn"; }; meta.homepage = "https://github.com/monaqa/dial.nvim/"; }; @@ -2963,12 +2963,12 @@ final: prev: fidget-nvim = buildVimPluginFrom2Nix { pname = "fidget.nvim"; - version = "2023-02-17"; + version = "2023-03-27"; src = fetchFromGitHub { owner = "j-hui"; repo = "fidget.nvim"; - rev = "688b4fec4517650e29c3e63cfbb6e498b3112ba1"; - sha256 = "16j8c13jyqr9f8lw8sxcvcv0p60qpa4apdcqcz3ll6r6pb1413vz"; + rev = "0ba1e16d07627532b6cae915cc992ecac249fb97"; + sha256 = "01rrjxlg4xjfs8la0cfcnf5z36s5fdxqzfs4mc0zdz1bn5z60qmf"; }; meta.homepage = "https://github.com/j-hui/fidget.nvim/"; }; @@ -3012,24 +3012,24 @@ final: prev: flatten-nvim = buildVimPluginFrom2Nix { pname = "flatten.nvim"; - version = "2023-03-23"; + version = "2023-03-26"; src = fetchFromGitHub { owner = "willothy"; repo = "flatten.nvim"; - rev = "a5e0679035a154b2c3eab376c5e51141e07c6910"; - sha256 = "05q4hyd9dgs6937pc2knwhk6419420ivcrjj4937zfrs6dcc7z9q"; + rev = "cbea79fef62ecc3048d9a2af38cc96acbbe85e37"; + sha256 = "1853hmkncw9dzk72arw8m0v0fj14hqcix6bdkalvm16xxxvvwlag"; }; meta.homepage = "https://github.com/willothy/flatten.nvim/"; }; flit-nvim = buildVimPluginFrom2Nix { pname = "flit.nvim"; - version = "2023-03-04"; + version = "2023-03-24"; src = fetchFromGitHub { owner = "ggandor"; repo = "flit.nvim"; - rev = "4c1739137acd3e7f03e2065a7be8a4dc41c7e461"; - sha256 = "0bvbdfs9gnncrsca5azb82cd7h3va1v6j6xa2sjn580maqmyyv4z"; + rev = "f60e4b3d49bb5a5e97cfffe66f2e671eb422078e"; + sha256 = "12s75i4y7yjby9bs6gfaxs9xwy6ahffccmac3snqllqm51q0ypd5"; }; meta.homepage = "https://github.com/ggandor/flit.nvim/"; }; @@ -3084,12 +3084,12 @@ final: prev: flutter-tools-nvim = buildVimPluginFrom2Nix { pname = "flutter-tools.nvim"; - version = "2023-03-16"; + version = "2023-03-27"; src = fetchFromGitHub { owner = "akinsho"; repo = "flutter-tools.nvim"; - rev = "727df22e2ae72a0482e5eb923e3d1c861a157a94"; - sha256 = "06s4svb8r4d9xi10sk9wf0zqa1qmrafj749kfayw705fig2an9v0"; + rev = "92e12ab64b2440f45f346eeeeb30c425e8a65f11"; + sha256 = "0gki5qiclacpf0ald463d1810l77hy75jlkcfyd3xxpczfq9acqm"; }; meta.homepage = "https://github.com/akinsho/flutter-tools.nvim/"; }; @@ -3120,12 +3120,12 @@ final: prev: friendly-snippets = buildVimPluginFrom2Nix { pname = "friendly-snippets"; - version = "2023-03-19"; + version = "2023-03-26"; src = fetchFromGitHub { owner = "rafamadriz"; repo = "friendly-snippets"; - rev = "25ddcd96540a2ce41d714bd7fea2e7f75fea8ead"; - sha256 = "1j98blydm49bzla95w082qy2hd61yb0476zawflipa8awf7ja6ac"; + rev = "8d91ba2dc2421a54981115f61b914974f938fa77"; + sha256 = "0j45scar2frdk3a31lsc536z5vyzwanpg3nn89awp9idzhyviwys"; }; meta.homepage = "https://github.com/rafamadriz/friendly-snippets/"; }; @@ -3228,12 +3228,12 @@ final: prev: fzf-lua = buildVimPluginFrom2Nix { pname = "fzf-lua"; - version = "2023-03-23"; + version = "2023-03-27"; src = fetchFromGitHub { owner = "ibhagwan"; repo = "fzf-lua"; - rev = "79a74aebab4cd5fca460c61dc47e5e1d7a54b01e"; - sha256 = "077ckb2lwg5lfjvin7rf76qmik0vy0f2aczkp789wl8yrn6isca6"; + rev = "d49f79fbdaf5247ce694637555e8cd503f6fc05f"; + sha256 = "13bf3xvx0mnz1wjah9qr3sllwkcmppjza8byfxc5a8pcbfwkyhmx"; }; meta.homepage = "https://github.com/ibhagwan/fzf-lua/"; }; @@ -3324,12 +3324,12 @@ final: prev: git-blame-nvim = buildVimPluginFrom2Nix { pname = "git-blame.nvim"; - version = "2023-02-24"; + version = "2023-03-26"; src = fetchFromGitHub { owner = "f-person"; repo = "git-blame.nvim"; - rev = "1ad47c6454a5a53d3f4ffdd4022e84f4a6e376cb"; - sha256 = "07119ndsavmhi3km0jkdfk3xw6rhainxdp8vhgqrg54286aqj1d3"; + rev = "8cb8dc053b7b24eac457395e3c535fdbcd95e97e"; + sha256 = "1mxpg3w9b5qizc277j3cr1fbdfzaxxr43gqnl1mah9sdr07s5djq"; }; meta.homepage = "https://github.com/f-person/git-blame.nvim/"; }; @@ -3432,12 +3432,12 @@ final: prev: glow-nvim = buildVimPluginFrom2Nix { pname = "glow.nvim"; - version = "2023-03-03"; + version = "2023-03-25"; src = fetchFromGitHub { owner = "ellisonleao"; repo = "glow.nvim"; - rev = "5a8ccfb1876b1b2e29ea32c63221be6df45870d1"; - sha256 = "0zgjwp7ijbgbg6m5m1nqkyxsvswkppp61ars4vrhlyd8zf2pd1bw"; + rev = "a3f24fdaa71d2c25a2b88026032b34f5b6a6e215"; + sha256 = "1awml5n7g045kpn16g3qrn9yrx5j7rwzwvfyaqqxgmwhp1rkkwwh"; }; meta.homepage = "https://github.com/ellisonleao/glow.nvim/"; }; @@ -3456,12 +3456,12 @@ final: prev: godbolt-nvim = buildVimPluginFrom2Nix { pname = "godbolt.nvim"; - version = "2023-01-02"; + version = "2023-03-24"; src = fetchFromGitHub { owner = "p00f"; repo = "godbolt.nvim"; - rev = "a55d794e9faebfc09896bff3e9efd1156527f300"; - sha256 = "0cfwm1acj3ahk7kcrjwz7fqm7dqr13bgzkzybpkm4gncfzz3srph"; + rev = "7e526ff6d04107161a732a6cba674d69bdc7e198"; + sha256 = "03l60x3mz3apma2hp7ls2vila19lfgdds9h3c4q35j4rb839mnfg"; }; meta.homepage = "https://github.com/p00f/godbolt.nvim/"; }; @@ -3576,12 +3576,12 @@ final: prev: gruvbox-nvim = buildVimPluginFrom2Nix { pname = "gruvbox.nvim"; - version = "2023-03-20"; + version = "2023-03-27"; src = fetchFromGitHub { owner = "ellisonleao"; repo = "gruvbox.nvim"; - rev = "488acf89979463d3ab77f8a5d35a11a2c809ac19"; - sha256 = "0m65ixwniz9vcnl8wz9gxqwdcf737m2jd4k3pgm7aphk7ks6b45m"; + rev = "2fc3ea0836aa91e50e5a98e232549a65de366d93"; + sha256 = "1zxg6q0w3i71lia3sm2n5kk56kcc56q05lcbv76y7i3wn7spwx9j"; }; meta.homepage = "https://github.com/ellisonleao/gruvbox.nvim/"; }; @@ -3647,12 +3647,12 @@ final: prev: haskell-tools-nvim = buildNeovimPluginFrom2Nix { pname = "haskell-tools.nvim"; - version = "2023-03-20"; + version = "2023-03-26"; src = fetchFromGitHub { owner = "MrcJkb"; repo = "haskell-tools.nvim"; - rev = "580587aac975b93d9d908f48f7c1df56fdef1c2d"; - sha256 = "1x8fy7ph6nbz84masqv5q5l61yq2w9hik6l90m35ig2r1jhkp2fx"; + rev = "d6efc37b999981e8744c63c551be039d6eceae50"; + sha256 = "1mmn47bk7lhaak2r68pzhhhsyjsd0y9lkprqq7l3jrdyj30iay0p"; }; meta.homepage = "https://github.com/MrcJkb/haskell-tools.nvim/"; }; @@ -3695,12 +3695,12 @@ final: prev: heirline-nvim = buildVimPluginFrom2Nix { pname = "heirline.nvim"; - version = "2023-03-22"; + version = "2023-03-26"; src = fetchFromGitHub { owner = "rebelot"; repo = "heirline.nvim"; - rev = "ab080c47581cdecb8a5b4ec79c5c19fecb5bcd2b"; - sha256 = "06r8naxqpc4ih8xdz03jckir06mgl12zr2h8f77dnclfwpl4jvq5"; + rev = "b55ad4af04d9c45dd8328fea65abb0b17274d6f0"; + sha256 = "1446cpaj6619lldlx83jlsjnqpg6czbybn3wi91vxnj922vskqs3"; }; meta.homepage = "https://github.com/rebelot/heirline.nvim/"; }; @@ -4139,12 +4139,12 @@ final: prev: kanagawa-nvim = buildVimPluginFrom2Nix { pname = "kanagawa.nvim"; - version = "2023-03-23"; + version = "2023-03-26"; src = fetchFromGitHub { owner = "rebelot"; repo = "kanagawa.nvim"; - rev = "0133b85255d476afda403f3e9cd0310fe5af3f57"; - sha256 = "183vlqr0cx822xxhf0yca46lbjynagnnwrczfjaa30vjv1cr3344"; + rev = "5c4037432f0ae2d0b75d3a7b7cfa3022d7054e4d"; + sha256 = "10mhniygcxidp8wgzd1chfcdwmhh84rqk7g1k2bz0jsjkc31hxlp"; }; meta.homepage = "https://github.com/rebelot/kanagawa.nvim/"; }; @@ -4235,12 +4235,12 @@ final: prev: lazy-nvim = buildVimPluginFrom2Nix { pname = "lazy.nvim"; - version = "2023-03-23"; + version = "2023-03-25"; src = fetchFromGitHub { owner = "folke"; repo = "lazy.nvim"; - rev = "a80422f21750fcbf0e90b26da877d4024d76f116"; - sha256 = "0cjw2aakslmaipyqfxn7ghr35sshlhcymhvdhgpyypd8crxs3ip0"; + rev = "57cce98dfdb2f2dd05a0567d89811e6d0505e13b"; + sha256 = "10ayiikd4sxm61rm2689cgbk2byh48si9h5pz5dbz2rwm40k5kig"; }; meta.homepage = "https://github.com/folke/lazy.nvim/"; }; @@ -4259,12 +4259,12 @@ final: prev: lean-nvim = buildVimPluginFrom2Nix { pname = "lean.nvim"; - version = "2023-03-13"; + version = "2023-03-25"; src = fetchFromGitHub { owner = "Julian"; repo = "lean.nvim"; - rev = "f87c54ded50ae46dcc4687f139a5debc1f977a7e"; - sha256 = "0iyi1hg2l6xsfngbxiwp8njzmqb8gdi4skyvqf3lg7vh4yy8f15k"; + rev = "157ca8a08ad13845cf67b440a595b55b25b9a459"; + sha256 = "1v6018a86la5rlfms0q02kq5pix233n1a9aispy08ws7aj4d45kj"; }; meta.homepage = "https://github.com/Julian/lean.nvim/"; }; @@ -4307,12 +4307,12 @@ final: prev: legendary-nvim = buildVimPluginFrom2Nix { pname = "legendary.nvim"; - version = "2023-03-20"; + version = "2023-03-27"; src = fetchFromGitHub { owner = "mrjones2014"; repo = "legendary.nvim"; - rev = "ee9e14955c9aa280e08b5600f7eb53e7c2578cd7"; - sha256 = "1lh6nfwb1q4690qqn6vfjimw3qmq9fz7fa3vi3kk55q4sdy0rw0h"; + rev = "6c86c7aac485870299b4481f317a5e306c2399de"; + sha256 = "0ma5nm64r4nla1g236rpz8a5rhj1i26b8f7ipa1fnbxndabja60r"; }; meta.homepage = "https://github.com/mrjones2014/legendary.nvim/"; }; @@ -4643,12 +4643,12 @@ final: prev: lsp-zero-nvim = buildVimPluginFrom2Nix { pname = "lsp-zero.nvim"; - version = "2023-03-23"; + version = "2023-03-26"; src = fetchFromGitHub { owner = "VonHeikemen"; repo = "lsp-zero.nvim"; - rev = "56ce3384695a982efaa8f6c1995255671757182c"; - sha256 = "0jlm7fwc7rl5ayqf00ix6ynzxsmnrd3g68mhkxy4qyaf746wnpy8"; + rev = "04c036594f1093576f0a80837e1c1eeedb67f49b"; + sha256 = "0d0nm0ifs18229jvc743dx1qvhqgbr7kawzaa3mr5v0dfz58502r"; }; meta.homepage = "https://github.com/VonHeikemen/lsp-zero.nvim/"; }; @@ -4750,12 +4750,12 @@ final: prev: luasnip = buildVimPluginFrom2Nix { pname = "luasnip"; - version = "2023-03-22"; + version = "2023-03-27"; src = fetchFromGitHub { owner = "l3mon4d3"; repo = "luasnip"; - rev = "025886915e7a1442019f467e0ae2847a7cf6bf1a"; - sha256 = "0wchv8a93xfyr3y22nvqcnqm5wis0j6vslcrbzzfyaza5adjvpmx"; + rev = "bc8ec05022743d3f08bda7a76c6bb5e9a9024581"; + sha256 = "1zc0amafr1g3gkrxn2mppda0qpb3444xpjldm94h05qh78qz2j70"; fetchSubmodules = true; }; meta.homepage = "https://github.com/l3mon4d3/luasnip/"; @@ -4775,12 +4775,12 @@ final: prev: lush-nvim = buildNeovimPluginFrom2Nix { pname = "lush.nvim"; - version = "2023-03-20"; + version = "2023-03-27"; src = fetchFromGitHub { owner = "rktjmp"; repo = "lush.nvim"; - rev = "a9eefbdc97d1b3f8f38d11700553d0fea2ad8f5b"; - sha256 = "1hawb671p66lfphmmksdagrpjrzri45wrmn1drc22bp9cib2vixy"; + rev = "e26df50e856e671ce79db99449e1b015d6608673"; + sha256 = "1y9r9b93d3xg8hnvdc1ymibl9x7cai2ddibxwmzsjaq7dv6zpilg"; }; meta.homepage = "https://github.com/rktjmp/lush.nvim/"; }; @@ -4847,12 +4847,12 @@ final: prev: mason-lspconfig-nvim = buildVimPluginFrom2Nix { pname = "mason-lspconfig.nvim"; - version = "2023-03-18"; + version = "2023-03-24"; src = fetchFromGitHub { owner = "williamboman"; repo = "mason-lspconfig.nvim"; - rev = "2b811031febe5f743e07305738181ff367e1e452"; - sha256 = "11b2rf3wb1mdkcsfkgikm8x2yryrdv659bh9yq8b2cic9g9p64a0"; + rev = "b64fdede85fd5e0b720ce722919e0a9b95ed6547"; + sha256 = "0an210nwcm0drgdgq6divxffsqhbxlv50ksnbip52j6avdj38vb4"; }; meta.homepage = "https://github.com/williamboman/mason-lspconfig.nvim/"; }; @@ -4871,12 +4871,12 @@ final: prev: mason-nvim = buildVimPluginFrom2Nix { pname = "mason.nvim"; - version = "2023-03-23"; + version = "2023-03-27"; src = fetchFromGitHub { owner = "williamboman"; repo = "mason.nvim"; - rev = "9f4e06029b1d8cd3bb4438f6b3de6d5c42d2d8d1"; - sha256 = "115b00q3m7jsmh2nvn5hk4zd95mxwl2bddvcdxg4vjxhgn8z3yx5"; + rev = "8829f9539f501ac99d6a556309a672478ca78e98"; + sha256 = "0iv490vcpylbw22axzk1jgs8lq5fmx9ysnwx21yqjqbjxxmi91wc"; }; meta.homepage = "https://github.com/williamboman/mason.nvim/"; }; @@ -4943,12 +4943,12 @@ final: prev: mini-nvim = buildVimPluginFrom2Nix { pname = "mini.nvim"; - version = "2023-03-21"; + version = "2023-03-25"; src = fetchFromGitHub { owner = "echasnovski"; repo = "mini.nvim"; - rev = "9f8b92998a9964e03535c2c7e0708958e23e261a"; - sha256 = "1c1wywn7hpagcwdp2vnrrlf60vvqs9rl0p5g3m94jcrs6yihbqib"; + rev = "229b12cb2375ceb8412fb7529de92d9e4ca28b62"; + sha256 = "17wg7lp0s4yv61wask9gnqzz0kbhb2s5p3k7kn6q8zb10cya2bqm"; }; meta.homepage = "https://github.com/echasnovski/mini.nvim/"; }; @@ -5303,12 +5303,12 @@ final: prev: neoconf-nvim = buildVimPluginFrom2Nix { pname = "neoconf.nvim"; - version = "2023-03-23"; + version = "2023-03-26"; src = fetchFromGitHub { owner = "folke"; repo = "neoconf.nvim"; - rev = "f28a0c750a40ceec22eb97dd8111ef2203ff7cc1"; - sha256 = "02hkr0l2d61c9gbp24xdi9az1snim1qkkkbf4wz7qfzhr0p6b3z8"; + rev = "55923798eb46c2d38bf111dc2bc285c13e286765"; + sha256 = "081v6kpa5hs2ixkvfclz16bj0zf27q4hq53azp656rb04wi7wfbj"; }; meta.homepage = "https://github.com/folke/neoconf.nvim/"; }; @@ -5327,12 +5327,12 @@ final: prev: neodev-nvim = buildVimPluginFrom2Nix { pname = "neodev.nvim"; - version = "2023-03-23"; + version = "2023-03-26"; src = fetchFromGitHub { owner = "folke"; repo = "neodev.nvim"; - rev = "e027abc6d2a9c1efead2f697da8df2c0ed66b8ff"; - sha256 = "1iw0l2g76wfd6j9jk6ixm0l5nq9kq4kd36hgj98a2ag87mjdgk4s"; + rev = "7330427f9f71ac5aaa2d1a4c22ccd3914434e289"; + sha256 = "03sa4dr28akq891f4pldlfxkwvwgvjxpy4sa9d9s76pkqijp4205"; }; meta.homepage = "https://github.com/folke/neodev.nvim/"; }; @@ -5351,12 +5351,12 @@ final: prev: neogen = buildVimPluginFrom2Nix { pname = "neogen"; - version = "2023-02-21"; + version = "2023-03-27"; src = fetchFromGitHub { owner = "danymat"; repo = "neogen"; - rev = "93d997dbddfe084e77ba4541c54a7b8bfd754fb1"; - sha256 = "1yqmpgjrlqkqvmmk0ib8bwkcn8z78sm21yl6xlbq4pa219zwdm1z"; + rev = "9c17225aac94bdbf93baf16e1b2d2c6dcffb0901"; + sha256 = "1plc0kb0pdyciwd4kwgcqqiqn4k0gzlp4p8s1578x1bjlf1cpwwk"; }; meta.homepage = "https://github.com/danymat/neogen/"; }; @@ -5423,12 +5423,12 @@ final: prev: neorg = buildVimPluginFrom2Nix { pname = "neorg"; - version = "2023-03-13"; + version = "2023-03-27"; src = fetchFromGitHub { owner = "nvim-neorg"; repo = "neorg"; - rev = "532548b9f444bd1ae6f2efd3edd842282cc79659"; - sha256 = "1c7i1bkzwh3swq702cl31pm2h8cwj6lh5bm8bwdaz64pz5pz9f61"; + rev = "c5f73ba1f09207716b81cae4151deec3df71491e"; + sha256 = "0jgam57smsvb013np703bsas1vmkpq8kpj1sxjapsj2qajiz712k"; }; meta.homepage = "https://github.com/nvim-neorg/neorg/"; }; @@ -5483,12 +5483,12 @@ final: prev: neotest = buildVimPluginFrom2Nix { pname = "neotest"; - version = "2023-03-13"; + version = "2023-03-25"; src = fetchFromGitHub { owner = "nvim-neotest"; repo = "neotest"; - rev = "bbbfa55d850f1aaa6707ea85fb5230ac866459c6"; - sha256 = "1ymij3src1jdsx4zfjz0hgyqq5zp2rp17lqpl3dbabibwd4k9cnp"; + rev = "9f35041605ae0371fd94f669fe67eb5bd1574518"; + sha256 = "1i86pbv8r4v2siy3n8lhsh4sy47ybp5d486naqc99w22p0p9mkmi"; }; meta.homepage = "https://github.com/nvim-neotest/neotest/"; }; @@ -5591,12 +5591,12 @@ final: prev: netman-nvim = buildVimPluginFrom2Nix { pname = "netman.nvim"; - version = "2023-03-03"; + version = "2023-03-23"; src = fetchFromGitHub { owner = "miversen33"; repo = "netman.nvim"; - rev = "1ef50efcbe88f8293e97946af37243a20873bb1c"; - sha256 = "16vc6ly4l9b9xkwkwb2j7q21kg26c7drdz97hgkbdzwfb66w2651"; + rev = "0992ecede84db9591c59ee2131f39443f4a44f3c"; + sha256 = "0nmm6yp1q99f7c26h0ymwd237vv7b9652ffaffbm2ym4ahcmg8xr"; }; meta.homepage = "https://github.com/miversen33/netman.nvim/"; }; @@ -5639,12 +5639,12 @@ final: prev: nightfox-nvim = buildVimPluginFrom2Nix { pname = "nightfox.nvim"; - version = "2023-03-23"; + version = "2023-03-26"; src = fetchFromGitHub { owner = "EdenEast"; repo = "nightfox.nvim"; - rev = "9b6e3a470ac12fb2ce3de2162bb80bd0b47736f6"; - sha256 = "1l1qfj8pbw1icd4795ly0m1iyam80m5pr0ixg0hw0v4vga2vjvg3"; + rev = "4b73c9d0995eb1a43e284534b97a543ca21c5c77"; + sha256 = "0ndriv1ka82n8j9969h54c7zqpjzax6r52iqfvz282wmnch5kxhl"; }; meta.homepage = "https://github.com/EdenEast/nightfox.nvim/"; }; @@ -5675,12 +5675,12 @@ final: prev: nlsp-settings-nvim = buildVimPluginFrom2Nix { pname = "nlsp-settings.nvim"; - version = "2023-03-23"; + version = "2023-03-25"; src = fetchFromGitHub { owner = "tamago324"; repo = "nlsp-settings.nvim"; - rev = "bfd61997f62b52aa9fe5ec59590956d1bb7fe605"; - sha256 = "13h1vk99rdzsibfzpw96pc2k3zlrih5q6ggw813b7sbfdca82lkw"; + rev = "1986267f7c56c99f860394bb7242ae33b41b5904"; + sha256 = "0kxkqx6pwrb001hs2gyxck8b7yqivvj0ida3ghn7v770i5n1xb5z"; }; meta.homepage = "https://github.com/tamago324/nlsp-settings.nvim/"; }; @@ -5711,36 +5711,36 @@ final: prev: no-neck-pain-nvim = buildVimPluginFrom2Nix { pname = "no-neck-pain.nvim"; - version = "2023-03-19"; + version = "2023-03-26"; src = fetchFromGitHub { owner = "shortcuts"; repo = "no-neck-pain.nvim"; - rev = "d9be19ad02edb98fc7f47f407415bf1285c43811"; - sha256 = "06vanvv99x5kk9rx3gljaa58hak2chsz6rbi758igp04mwpkabjg"; + rev = "33db10e593edc7d720c0f5c0320899bd1dd014e1"; + sha256 = "1c7izqhr8x9rhwij9g6nqs1lvhnga6mpf1mfcpiid96s2ygvrbk2"; }; meta.homepage = "https://github.com/shortcuts/no-neck-pain.nvim/"; }; noice-nvim = buildVimPluginFrom2Nix { pname = "noice.nvim"; - version = "2023-03-23"; + version = "2023-03-26"; src = fetchFromGitHub { owner = "folke"; repo = "noice.nvim"; - rev = "f8b1a72a7bce56d9e9ed054708dc855d57dec085"; - sha256 = "1dci8aqlny9saq8w1rjwpdknz3cpk4rqmiijdav26djdb85ghwb1"; + rev = "1da4edfba3e9278e98fc9723d7235d9ab3889744"; + sha256 = "18y314k7da239w05rkxz6nqjljjx24mx9kx5020bkkx80q1z57yk"; }; meta.homepage = "https://github.com/folke/noice.nvim/"; }; nord-nvim = buildVimPluginFrom2Nix { pname = "nord.nvim"; - version = "2023-03-12"; + version = "2023-03-26"; src = fetchFromGitHub { owner = "shaunsingh"; repo = "nord.nvim"; - rev = "be318c83a233cb877ba08faa15380a54241272b1"; - sha256 = "1wk40p9sh6i7gljixnrx57ik8fw57dh8kzmf53kqigafxayzj0sa"; + rev = "fab04b2dd4b64f4b1763b9250a8824d0b5194b8f"; + sha256 = "01zbahh1q332lcksd7dmkw109i7x5xan9w9z3n13bwwpn01knf6h"; }; meta.homepage = "https://github.com/shaunsingh/nord.nvim/"; }; @@ -5843,12 +5843,12 @@ final: prev: nvim-autopairs = buildVimPluginFrom2Nix { pname = "nvim-autopairs"; - version = "2023-03-07"; + version = "2023-03-26"; src = fetchFromGitHub { owner = "windwp"; repo = "nvim-autopairs"; - rev = "e755f366721bc9e189ddecd39554559045ac0a18"; - sha256 = "07r9h19q3800r93ac4qawyl745mppp3035j9xffmx2igj5zvjmk5"; + rev = "0fd6519d44eac3a6736aafdb3fe9da916c3701d4"; + sha256 = "0ds77blb357mamxsjhhp8cj6mrnpvzmk3p0w1cy3wdikmbng940v"; }; meta.homepage = "https://github.com/windwp/nvim-autopairs/"; }; @@ -5939,12 +5939,12 @@ final: prev: nvim-cokeline = buildVimPluginFrom2Nix { pname = "nvim-cokeline"; - version = "2023-03-22"; + version = "2023-03-27"; src = fetchFromGitHub { owner = "willothy"; repo = "nvim-cokeline"; - rev = "29ff4654b106ca08cdb649120d8f296fb00723f4"; - sha256 = "02kbvp689m8fbhhf759zngg2wyy2awws55hp905nzq4vzk8sxp82"; + rev = "852fd38a29bb213c559ad61da4188ac523ecc72a"; + sha256 = "1gv81h103aq90vb3ijis53wyl4d7w7r2x59n9gnn1kdk6xxc1dgz"; }; meta.homepage = "https://github.com/willothy/nvim-cokeline/"; }; @@ -6023,12 +6023,12 @@ final: prev: nvim-dap = buildVimPluginFrom2Nix { pname = "nvim-dap"; - version = "2023-03-18"; + version = "2023-03-24"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-dap"; - rev = "7e81998e31277c7a33b6c34423640900c5c2c776"; - sha256 = "0alv7kcdrvr82awh834yy7nxf7dnfwqhmpi6q23b32h76h5gm740"; + rev = "7389e85233e3483b31b6a1c4ba69cda77336b7a8"; + sha256 = "09jfi1phzq9pak10hyvxkgrq6vq1ly1zdblpy5l173fj9n2qxwip"; }; meta.homepage = "https://github.com/mfussenegger/nvim-dap/"; }; @@ -6047,12 +6047,12 @@ final: prev: nvim-dap-python = buildVimPluginFrom2Nix { pname = "nvim-dap-python"; - version = "2023-02-17"; + version = "2023-03-24"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-dap-python"; - rev = "65ccab83fb3d0b29ead6c765c1c52a1ed49592e8"; - sha256 = "1ald7spnfqbyiqz4kgp21wxwqm3zr53d4ajxls0rsy6mkqq6b2jl"; + rev = "af5e04c6eae97498258f84c61e1b22be6660763b"; + sha256 = "0wvmsv3ivjy8q0ym4yd6jwqajf5mzr5czp9iin11sk2lfk554y1m"; }; meta.homepage = "https://github.com/mfussenegger/nvim-dap-python/"; }; @@ -6143,24 +6143,24 @@ final: prev: nvim-highlight-colors = buildVimPluginFrom2Nix { pname = "nvim-highlight-colors"; - version = "2023-03-07"; + version = "2023-03-26"; src = fetchFromGitHub { owner = "brenoprata10"; repo = "nvim-highlight-colors"; - rev = "ce11467796389a4e5838c22384f94c624121796b"; - sha256 = "1pyhjazxl1ijg1m8gvaw92lslh61052yk12plnqyl8mlla3a9zb2"; + rev = "14670d94c7813bfe929ed2ca2d3875f4f468173e"; + sha256 = "0igiam19m1kw9ir41zkpfq78n67yypwvmmw2j3p04qnbwj0x3nxb"; }; meta.homepage = "https://github.com/brenoprata10/nvim-highlight-colors/"; }; nvim-highlite = buildVimPluginFrom2Nix { pname = "nvim-highlite"; - version = "2023-03-20"; + version = "2023-03-26"; src = fetchFromGitHub { owner = "Iron-E"; repo = "nvim-highlite"; - rev = "26a272937f1f3ff5c38d67662c5d7cc76148a4a5"; - sha256 = "07w1bygcs3myfarp2zpm21clyc0abmrglpwqkdj0z4azd4wa1cqz"; + rev = "7cbf594b65d79a802d9cbe30eed1dbfce6e6a17f"; + sha256 = "1dxnhkmzr7xqz1gpr3v7p8855ml9qk6j50v19y9ica7pcj5i1mzh"; }; meta.homepage = "https://github.com/Iron-E/nvim-highlite/"; }; @@ -6275,12 +6275,12 @@ final: prev: nvim-lspconfig = buildVimPluginFrom2Nix { pname = "nvim-lspconfig"; - version = "2023-03-23"; + version = "2023-03-26"; src = fetchFromGitHub { owner = "neovim"; repo = "nvim-lspconfig"; - rev = "c6105c449683b944b5d2138fcf82f18c657249e9"; - sha256 = "08rkj9yfygkn7map3wgg0ggvh3i8yb5kpqid1q3a02c810xppn7w"; + rev = "c5505c70571b094663745167d40388edd40f6450"; + sha256 = "1nmnd1gbawa67n27sgbgipaiaxy8dqsgdk6vzc6wpjs4sgx32fd8"; }; meta.homepage = "https://github.com/neovim/nvim-lspconfig/"; }; @@ -6347,12 +6347,12 @@ final: prev: nvim-navic = buildVimPluginFrom2Nix { pname = "nvim-navic"; - version = "2023-03-21"; + version = "2023-03-27"; src = fetchFromGitHub { owner = "smiteshp"; repo = "nvim-navic"; - rev = "ca34afcd15c7f6dd0836fc4fca2e37024bfa5019"; - sha256 = "05nlb1880zaghcags6b751h89k9x3aw7hiapvigip877lpch0nfs"; + rev = "35731604fb5adab5fe939975879d22994aa8b575"; + sha256 = "0lz8w2870b3p3m6dixzxlnj2z1z0xia44hbgf5gdq8rld53i44y2"; }; meta.homepage = "https://github.com/smiteshp/nvim-navic/"; }; @@ -6491,24 +6491,24 @@ final: prev: nvim-spectre = buildVimPluginFrom2Nix { pname = "nvim-spectre"; - version = "2023-03-20"; + version = "2023-03-25"; src = fetchFromGitHub { owner = "nvim-pack"; repo = "nvim-spectre"; - rev = "2d7d23c1122bb2589880236e932d373933b07937"; - sha256 = "0wjnq69ygnsqn1nh31gy4rqv3k9mxk787aknai5w47iclq0rdjhb"; + rev = "8fd64743b6390ab151a607fa91d0d74087a80ba6"; + sha256 = "0hygvazda2kxrrnw9f0xf6mvnkigfzf57n5m7kbbgf6kpf65w7y5"; }; meta.homepage = "https://github.com/nvim-pack/nvim-spectre/"; }; nvim-surround = buildVimPluginFrom2Nix { pname = "nvim-surround"; - version = "2023-03-21"; + version = "2023-03-27"; src = fetchFromGitHub { owner = "kylechui"; repo = "nvim-surround"; - rev = "056f69ed494198ff6ea0070cfc66997cfe0a6c8b"; - sha256 = "0nkfb13jrhczw2y3wd5qr183l50wy8jk0chkiw66x4388gqnz9lm"; + rev = "b7acf822a62ddc743e8129061c0d2adb32a6b810"; + sha256 = "13pyag877n1cnrck49350q0x66766mcb9wd9ymvs72xqhj526g7b"; }; meta.homepage = "https://github.com/kylechui/nvim-surround/"; }; @@ -6539,36 +6539,36 @@ final: prev: nvim-tree-lua = buildVimPluginFrom2Nix { pname = "nvim-tree.lua"; - version = "2023-03-21"; + version = "2023-03-26"; src = fetchFromGitHub { owner = "nvim-tree"; repo = "nvim-tree.lua"; - rev = "aa9971768a08caa4f10f94ab84e48d2ceb30b1c0"; - sha256 = "1yq7a1baf85vhzycnys13jl3chhlixfa5gcqm97pzh3rz5y6g8ys"; + rev = "a38f9a55a4b55b0aa18af7abfde2c17a30959bdf"; + sha256 = "09qrsx5al87xab9mc0b3v0rvf1q1wqa4v5s4gy78f3slxpxbybv0"; }; meta.homepage = "https://github.com/nvim-tree/nvim-tree.lua/"; }; nvim-treesitter = buildVimPluginFrom2Nix { pname = "nvim-treesitter"; - version = "2023-03-22"; + version = "2023-03-27"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter"; - rev = "87cf2abeb6077ac19a1249d0b06f223aa398a0a0"; - sha256 = "1zq55kfjaf3gsm3l4xv210fzzidg2bk6r6bk551y7jgvf6j6fapm"; + rev = "63e4a3a40a494e76ef7613f127b31919eebd47d1"; + sha256 = "1alx79n5ari1nnvgnxwq4h3yiwiaj1s914h18yqsr13q5jl1mzrz"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/"; }; nvim-treesitter-context = buildVimPluginFrom2Nix { pname = "nvim-treesitter-context"; - version = "2023-03-20"; + version = "2023-03-25"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter-context"; - rev = "88d1627285f7477883516ef60521601862dae7a1"; - sha256 = "1kdda1jsa9zxbz6bgjxlzbx97f0dqxvl9k8lkcg5wx2nsmdyn4i0"; + rev = "fc7db280562455590c4592499542d6d5061dbe4b"; + sha256 = "1ig8ii9mzb002l7qy56acvchhwdqcjd4x1rqqv79glj2b6zc24c8"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter-context/"; }; @@ -6599,12 +6599,12 @@ final: prev: nvim-treesitter-textobjects = buildVimPluginFrom2Nix { pname = "nvim-treesitter-textobjects"; - version = "2023-03-19"; + version = "2023-03-27"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter-textobjects"; - rev = "582cbb5a4cb50f6161cac8cc01f55aeaff6d836a"; - sha256 = "11dm8vyxsy1b7c93f8gx5n6x4qf86b821myqaa09k1g761skrsvz"; + rev = "b55fe6175f0001347a433c9df358c8cbf8a4e90f"; + sha256 = "1kip55hxkg6lgbqj37hx5fsph5j4c69r7n6c7ypqynhn7qg6flqx"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter-textobjects/"; }; @@ -6647,11 +6647,11 @@ final: prev: nvim-ts-rainbow2 = buildVimPluginFrom2Nix { pname = "nvim-ts-rainbow2"; - version = "2023-03-19"; + version = "2023-03-27"; src = fetchgit { url = "https://gitlab.com/HiPhish/nvim-ts-rainbow2"; - rev = "742049ef6716f59c7202644a026d8dc09fc60c52"; - sha256 = "1d5p5w3vsz9pajdz4j2wmfv5nkv4bdhp084h5lhh58z0vcj62z1m"; + rev = "51d835d411df45b14b9531789eff0c590cabf018"; + sha256 = "0c8cy8bcmbn7lrr7ld9l5iss4k6hccn4m1mp25zx3blmwz0xi01d"; }; meta.homepage = "https://gitlab.com/HiPhish/nvim-ts-rainbow2"; }; @@ -6766,12 +6766,12 @@ final: prev: oil-nvim = buildVimPluginFrom2Nix { pname = "oil.nvim"; - version = "2023-03-20"; + version = "2023-03-24"; src = fetchFromGitHub { owner = "stevearc"; repo = "oil.nvim"; - rev = "4b05ebdf202bf61ce240f40558822fe5564d02ea"; - sha256 = "0caafnxg0apz14fj4ppv8pba2633dlv9fa8bzfqznsavx3w1xwhj"; + rev = "931453fc09085c09537295c991c66637869e97e1"; + sha256 = "0fjsckcbrqvz1g1cnixyjn6idwd0g7bjp75k0mnn7vx13kiflchb"; fetchSubmodules = true; }; meta.homepage = "https://github.com/stevearc/oil.nvim/"; @@ -6827,12 +6827,12 @@ final: prev: onedarkpro-nvim = buildVimPluginFrom2Nix { pname = "onedarkpro.nvim"; - version = "2023-03-17"; + version = "2023-03-26"; src = fetchFromGitHub { owner = "olimorris"; repo = "onedarkpro.nvim"; - rev = "a43138792c23e3f56399666049dd57afb61706ae"; - sha256 = "1zi2bbnp3zjvfral8wwq79c7syr5jlmkcrkf715kxs4h0zbmpb6m"; + rev = "6f9dcb258537d077f6037d3b7a55f6b36f15b1ec"; + sha256 = "1b28zw48yfv6541lf9zrb8n8rfsn3dcwglwbcjbk6w3bl0h9739l"; }; meta.homepage = "https://github.com/olimorris/onedarkpro.nvim/"; }; @@ -6899,12 +6899,12 @@ final: prev: orgmode = buildVimPluginFrom2Nix { pname = "orgmode"; - version = "2023-03-17"; + version = "2023-03-24"; src = fetchFromGitHub { owner = "nvim-orgmode"; repo = "orgmode"; - rev = "1323b7c20b2fb4d70fd1cd5f85fa5d0fa7ae30e9"; - sha256 = "15vvmn8ypwbkdh9cl5vwpqck2f5dqslya9sm8ywpd6kxkn64740b"; + rev = "aa084b56b6a4898fda11e6e39ccc6636e213f2e2"; + sha256 = "1z5xip6d0kzvdp99kih77w78qc0hrr4gx1if751pdzdysy63sdfj"; }; meta.homepage = "https://github.com/nvim-orgmode/orgmode/"; }; @@ -7718,24 +7718,24 @@ final: prev: slimv = buildVimPluginFrom2Nix { pname = "slimv"; - version = "2023-02-19"; + version = "2023-03-26"; src = fetchFromGitHub { owner = "kovisoft"; repo = "slimv"; - rev = "48f21d04dc7f9732d04ffec101dfcf17b7f515cb"; - sha256 = "01dkvxkh3xpv45cbc4sylw5a1dsipd3841x88cc32nrarafsmgfn"; + rev = "1a7028ff1eac9c043936659324d644d60353bdfa"; + sha256 = "0lfcngn50xz4vxs3sw175fjrwdvacghfhm9qr9x8rn24cflc6afi"; }; meta.homepage = "https://github.com/kovisoft/slimv/"; }; smart-splits-nvim = buildVimPluginFrom2Nix { pname = "smart-splits.nvim"; - version = "2023-03-02"; + version = "2023-03-24"; src = fetchFromGitHub { owner = "mrjones2014"; repo = "smart-splits.nvim"; - rev = "52b521618511b3a874255c8a717ace7155fd5f21"; - sha256 = "1nhyrwwf05q9dvc8r4dwpcb8ira1rz2wicnq260splh9hv1wqly3"; + rev = "3d4239b83fe8e68af4193e584094fbe633f30636"; + sha256 = "0zil0ydcy2x2wn9w2wr1mqasrss21qh7k5vdiap9z71x61mz7llq"; }; meta.homepage = "https://github.com/mrjones2014/smart-splits.nvim/"; }; @@ -7971,12 +7971,12 @@ final: prev: ssr-nvim = buildVimPluginFrom2Nix { pname = "ssr.nvim"; - version = "2023-02-21"; + version = "2023-03-27"; src = fetchFromGitHub { owner = "cshuaimin"; repo = "ssr.nvim"; - rev = "97a9e1e319eec2d7e9731be4c6ac9638a1a2d79d"; - sha256 = "1fzrp7jdlgw5f27m3jwvsq0knaf5zlhh5b72if493xaajibil0bx"; + rev = "a30674d07b220304ed81f1f46a8f1de36ce74c38"; + sha256 = "1z0kwd335pad6np8kr2njyrh2m97f1n6mh2pabl7axhcisvhvhrd"; }; meta.homepage = "https://github.com/cshuaimin/ssr.nvim/"; }; @@ -8357,12 +8357,12 @@ final: prev: telescope-file-browser-nvim = buildVimPluginFrom2Nix { pname = "telescope-file-browser.nvim"; - version = "2023-03-22"; + version = "2023-03-27"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope-file-browser.nvim"; - rev = "24389d847f931e3822c5babdd308d20e2e8c638f"; - sha256 = "1dgd1ipmi17wjpslv7ilqjjjfg9sw2s4ig15simh92h3ipr3bpv3"; + rev = "15caac96190f5ad8b016c0228a510026b88a576d"; + sha256 = "0wybn1777y9728bff6y9nmz8akfk35iwmaw88ilfzkzll3clifid"; }; meta.homepage = "https://github.com/nvim-telescope/telescope-file-browser.nvim/"; }; @@ -8526,12 +8526,12 @@ final: prev: telescope-undo-nvim = buildVimPluginFrom2Nix { pname = "telescope-undo.nvim"; - version = "2023-02-16"; + version = "2023-03-26"; src = fetchFromGitHub { owner = "debugloop"; repo = "telescope-undo.nvim"; - rev = "03ff45fab0c4adad4d252e25b5b194e22caf5b4f"; - sha256 = "1mik7qwz16bgbfpr5lcsrgkrjwifk1zanzmsdbj416kxhsz90fx7"; + rev = "231b5ebb4328d2768c830c9a8d1b9c696116848d"; + sha256 = "1qvn1yamhv6gvbxgmin1yi3rqnmx1611gslrddhsfjkzc246pyzz"; }; meta.homepage = "https://github.com/debugloop/telescope-undo.nvim/"; }; @@ -8682,12 +8682,12 @@ final: prev: text-case-nvim = buildVimPluginFrom2Nix { pname = "text-case.nvim"; - version = "2022-10-08"; + version = "2023-03-25"; src = fetchFromGitHub { owner = "johmsalas"; repo = "text-case.nvim"; - rev = "2cbe6b6653b46d2ec23bb2ba808b5c1fc78e9382"; - sha256 = "1fwrvsl4rdsrljb8y6g4zpv5vvlz8hxakcyz6f7zr4xxnr5rlb3c"; + rev = "43e85e883da911685ac329234b8f1298b75ab8fe"; + sha256 = "0f52ksvlll6wzqw1lvd6raqxqhngbzi1ncbkj4kjif2yidgg3fyx"; }; meta.homepage = "https://github.com/johmsalas/text-case.nvim/"; }; @@ -8778,12 +8778,12 @@ final: prev: todo-comments-nvim = buildVimPluginFrom2Nix { pname = "todo-comments.nvim"; - version = "2023-03-19"; + version = "2023-03-26"; src = fetchFromGitHub { owner = "folke"; repo = "todo-comments.nvim"; - rev = "14e2cd9a6e5e67483a03660f08471ca9a981c4a5"; - sha256 = "1mk0adblrfjhhrngc3zvrp2f348cdvj4nx7mmpjv8vq7vpvr5b4h"; + rev = "0874bda6848ff6f3da3ffdf4bd8297a5c951c5d4"; + sha256 = "101lqk11s8kkcfwcrzaanab1qpbbl1q7rbnbz04y2h444zlxkfv3"; }; meta.homepage = "https://github.com/folke/todo-comments.nvim/"; }; @@ -8815,12 +8815,12 @@ final: prev: toggleterm-nvim = buildVimPluginFrom2Nix { pname = "toggleterm.nvim"; - version = "2023-03-16"; + version = "2023-03-25"; src = fetchFromGitHub { owner = "akinsho"; repo = "toggleterm.nvim"; - rev = "9a595ba699837c4333c4296634feed320f084df2"; - sha256 = "154qnxarrmylnyclw4kyapi6hc98rfjymajf0a8i2ars9qkwnqzi"; + rev = "ed6c92d6708e5208360347f2281de99602061dc8"; + sha256 = "0pqh3c4w14299zhrh1zwvfgapyi86xjc0ppq5bl1c85h3pif50v3"; }; meta.homepage = "https://github.com/akinsho/toggleterm.nvim/"; }; @@ -8863,12 +8863,12 @@ final: prev: treesj = buildVimPluginFrom2Nix { pname = "treesj"; - version = "2023-03-16"; + version = "2023-03-24"; src = fetchFromGitHub { owner = "Wansmer"; repo = "treesj"; - rev = "90248883bdb2d559ff4ba7f0148eb0145d3f0908"; - sha256 = "0nmh68wl10xy4ckma66657p37firg30747bxhnyw2r36mx3i1vps"; + rev = "29aac56d24bf9870f2ea337817c5542b56e21f16"; + sha256 = "11b8inbldx2cnpwhr4ag4y736q40nm3k0ff4grsndyi7h8yb4c8b"; }; meta.homepage = "https://github.com/Wansmer/treesj/"; }; @@ -8899,12 +8899,12 @@ final: prev: trouble-nvim = buildVimPluginFrom2Nix { pname = "trouble.nvim"; - version = "2023-03-19"; + version = "2023-03-26"; src = fetchFromGitHub { owner = "folke"; repo = "trouble.nvim"; - rev = "7915277a259fdff5d46c6f1d2e100df2ec384d3b"; - sha256 = "10ssqf1pn9375br9lp2c3kgax3i0207vhs8wdpdwps3v0b0cj0vx"; + rev = "2ae7237c2917d661f458443c9a88680f8ca2d7b2"; + sha256 = "086w4yk5vnm03q1rkxjg0n6pg8hq5abzbz8g3ynds558q9yg03xv"; }; meta.homepage = "https://github.com/folke/trouble.nvim/"; }; @@ -9007,12 +9007,12 @@ final: prev: unison = buildVimPluginFrom2Nix { pname = "unison"; - version = "2023-03-21"; + version = "2023-03-27"; src = fetchFromGitHub { owner = "unisonweb"; repo = "unison"; - rev = "437864dcde91e29b186bed09c72944019dddf10d"; - sha256 = "1hxxan9g035xm6rh6rz9wxrxqfy8qfwp95mi179fxi71xbj2j77m"; + rev = "b35f5cd02f0d9e4923dd1ca19d0543d8c0dc1517"; + sha256 = "0k6l5fxbigglm6zh9kp4xanl2hpg8ql1g343vci3zf4hik0180sl"; }; meta.homepage = "https://github.com/unisonweb/unison/"; }; @@ -9187,12 +9187,12 @@ final: prev: vim-abolish = buildVimPluginFrom2Nix { pname = "vim-abolish"; - version = "2023-02-25"; + version = "2023-03-27"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-abolish"; - rev = "880a562ff9176773897930b5a26a496f68e5a985"; - sha256 = "0id4l89cbwkfkhxj90n8mc6vmqkgig5w21l3brvvfzc8hsrs15a6"; + rev = "8fe5966961fc047f7f93b4158a418e54d1c205ff"; + sha256 = "1gxk8zl55ijdqb4p90dnwid2wpmsjnzx770x0hpcx3024n519ya3"; }; meta.homepage = "https://github.com/tpope/vim-abolish/"; }; @@ -9895,12 +9895,12 @@ final: prev: vim-code-dark = buildVimPluginFrom2Nix { pname = "vim-code-dark"; - version = "2023-02-08"; + version = "2023-03-26"; src = fetchFromGitHub { owner = "tomasiser"; repo = "vim-code-dark"; - rev = "080b38a0fd14d14e21cf85fc26b18415303c3c5e"; - sha256 = "10734wy3j3ffkrc5ifm04kh4vk0axpl1isxdryak1ai90wxr3xhz"; + rev = "7bf26b5432ca93309d08037b27fa9459e64a460c"; + sha256 = "0izvr4x6lx05p97xk03bhmnjna1nhy4vbx18x5z05a96idwh0lpi"; }; meta.homepage = "https://github.com/tomasiser/vim-code-dark/"; }; @@ -10495,12 +10495,12 @@ final: prev: vim-fireplace = buildVimPluginFrom2Nix { pname = "vim-fireplace"; - version = "2023-01-06"; + version = "2023-03-26"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-fireplace"; - rev = "614622790b9dbe2d5a47b435b01accddf17be3e6"; - sha256 = "1v9xk5gapbl8s5lb5j3kc87a865hidj2cx164kvw80rjbwx4knnq"; + rev = "f2be859ea48a761fd25a07efa037514f84abdf30"; + sha256 = "16rl00c3w7gsjqdk7irgd6cfvf75ws2ni4cnnr8c1bbadxiy1a34"; }; meta.homepage = "https://github.com/tpope/vim-fireplace/"; }; @@ -10627,12 +10627,12 @@ final: prev: vim-fugitive = buildVimPluginFrom2Nix { pname = "vim-fugitive"; - version = "2023-03-23"; + version = "2023-03-25"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-fugitive"; - rev = "309c68117eca3a95349093012e5886a184c1812d"; - sha256 = "1inslzavlygwx5s5nzqnw663y36d9wszi4lfaz16b3jf60xx1907"; + rev = "9acbad1335ee6f30a8497733dcb2373c4550c8a2"; + sha256 = "0s5cvglw2yalp3bqakn02j3fs1vgb90pd4269663ah8yvv4kkgr2"; }; meta.homepage = "https://github.com/tpope/vim-fugitive/"; }; @@ -10699,12 +10699,12 @@ final: prev: vim-git = buildVimPluginFrom2Nix { pname = "vim-git"; - version = "2022-06-19"; + version = "2023-03-26"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-git"; - rev = "5143bea9ed17bc32163dbe3ca706344d79507b9d"; - sha256 = "02vk8lgl6zswg6bdg1qy4qrh47bwflil601z8i33yjx5q2qrq0ra"; + rev = "105fd5559bd9df3f1204ecdcac2a587614e1a4be"; + sha256 = "1bgczw9i0p76cabkdfb1x11kmq59qaih1nz3q9hmqjd3964x92q0"; }; meta.homepage = "https://github.com/tpope/vim-git/"; }; @@ -10771,12 +10771,12 @@ final: prev: vim-go = buildVimPluginFrom2Nix { pname = "vim-go"; - version = "2023-03-05"; + version = "2023-03-27"; src = fetchFromGitHub { owner = "fatih"; repo = "vim-go"; - rev = "23cc4bca2f586c8c2f7d2cb78bbbfec4b7361763"; - sha256 = "0hi17i24wrcj0lbs8c7p8m92bzhxp4f531c0612z5iqjxadsi66v"; + rev = "735e807eb01ce30d42dde0c03ae3614d9e2d8206"; + sha256 = "0xfkn375n7r7kdvb5pvp6cjdbqflmv38c2l2mdfcpcjs4dw9hva2"; }; meta.homepage = "https://github.com/fatih/vim-go/"; }; @@ -11493,12 +11493,12 @@ final: prev: vim-lsc = buildVimPluginFrom2Nix { pname = "vim-lsc"; - version = "2022-04-30"; + version = "2023-03-25"; src = fetchFromGitHub { owner = "natebosch"; repo = "vim-lsc"; - rev = "39ec72353c2170db2caf797072800c513647e9c5"; - sha256 = "18ljb8j8rs77643v8gprpqzfac492ljc49mn4g8b1bdkbji4cnqx"; + rev = "6e098b385f91ec0893449130eda2a96c89e369a1"; + sha256 = "0i7xnf5n67mr2d45ap1y157jmj11rxc2qdpxk0qy2nahfgac7669"; }; meta.homepage = "https://github.com/natebosch/vim-lsc/"; }; @@ -11614,12 +11614,12 @@ final: prev: vim-matchup = buildVimPluginFrom2Nix { pname = "vim-matchup"; - version = "2023-03-16"; + version = "2023-03-25"; src = fetchFromGitHub { owner = "andymass"; repo = "vim-matchup"; - rev = "f69d1ac5bd3c4e6ad349f64317000cc9a4a895cf"; - sha256 = "10i9h942c9inmd2wcd3y7mmb8yn1bwc9dg5swrfl1iif6k4cmj34"; + rev = "156367e4cbd123bc9a70eeabeaa16f7cf9239e12"; + sha256 = "19jh4s9fv40q9vy1lykh0zv5qv225zs48wgskd7b0xq0gh2c9vcz"; }; meta.homepage = "https://github.com/andymass/vim-matchup/"; }; @@ -12996,12 +12996,12 @@ final: prev: pname = "vim-substrata"; version = "2021-03-23"; src = fetchFromGitHub { - owner = "arzg"; + owner = "lunacookies"; repo = "vim-substrata"; rev = "f7b71f31d2ffa91715964b14b41ad4009d4d97f6"; sha256 = "1cpmyr63xjx5nm5h619xwryjaljq1kdf3msdrdr082ljci2830z2"; }; - meta.homepage = "https://github.com/arzg/vim-substrata/"; + meta.homepage = "https://github.com/lunacookies/vim-substrata/"; }; vim-subversive = buildVimPluginFrom2Nix { @@ -13307,12 +13307,12 @@ final: prev: vim-tpipeline = buildVimPluginFrom2Nix { pname = "vim-tpipeline"; - version = "2023-03-17"; + version = "2023-03-27"; src = fetchFromGitHub { owner = "vimpostor"; repo = "vim-tpipeline"; - rev = "bde36fce7165f6b414afab6a0723133730f0f27d"; - sha256 = "1w473xm8a6qfmpwy2cmw9mivpsa5mjw2hz3696ym29n6hkgxbmb0"; + rev = "77bd3e8ec5688cf3d03eb77e34e312913e206b5d"; + sha256 = "0arg3ipfh248cdq1g4kba6nr7cp8fhz6j7pwrb555l8jggabg6a3"; }; meta.homepage = "https://github.com/vimpostor/vim-tpipeline/"; }; @@ -13860,12 +13860,12 @@ final: prev: vimtex = buildVimPluginFrom2Nix { pname = "vimtex"; - version = "2023-03-23"; + version = "2023-03-26"; src = fetchFromGitHub { owner = "lervag"; repo = "vimtex"; - rev = "5a6e46e2b8a96e79d5cab98e50a9b9109715d940"; - sha256 = "0ah361mg1qlpkx6vwaj7x8a2ja717njinq2ax4fhcr8z34h4q0ra"; + rev = "e57b589a8ef3c67e3edfc0492bfee8b196eafefd"; + sha256 = "02461iv1g2ifa8ywbmfs18h7ns31lv8l7dgzsc4pij5klch2mvk6"; }; meta.homepage = "https://github.com/lervag/vimtex/"; }; @@ -13968,12 +13968,12 @@ final: prev: which-key-nvim = buildVimPluginFrom2Nix { pname = "which-key.nvim"; - version = "2023-03-21"; + version = "2023-03-26"; src = fetchFromGitHub { owner = "folke"; repo = "which-key.nvim"; - rev = "87b1459b3e0be0340da2183fc4ec8a00b2960678"; - sha256 = "0y1jypz17rap62hrbqm6207rjmv3gcj8i7c6na0jfd34nh82pmi0"; + rev = "4b73390eec680b4c061ea175eb32c0ff3412271d"; + sha256 = "0c8f765hm0j9k5j3xcnmmzrj3ajrc9v3gw94rc6sil5p0va997a7"; }; meta.homepage = "https://github.com/folke/which-key.nvim/"; }; @@ -14112,12 +14112,12 @@ final: prev: yats-vim = buildVimPluginFrom2Nix { pname = "yats.vim"; - version = "2022-08-26"; + version = "2023-03-27"; src = fetchFromGitHub { owner = "HerringtonDarkholme"; repo = "yats.vim"; - rev = "4bf3879055847e675335f1c3050bd2dd11700c7e"; - sha256 = "1i7iavcqxrn6khrx3nqqf2d0q1b7hggjz86s53yjs69xn31bqsxa"; + rev = "1be1f3afc06108d210a7725217f9a1e50f93808f"; + sha256 = "089yfiz3k8gbsamydaihvzh1sy3vajklvm74853xyrfy3y21nw4h"; fetchSubmodules = true; }; meta.homepage = "https://github.com/HerringtonDarkholme/yats.vim/"; @@ -14245,12 +14245,12 @@ final: prev: catppuccin-nvim = buildVimPluginFrom2Nix { pname = "catppuccin-nvim"; - version = "2023-03-23"; + version = "2023-03-27"; src = fetchFromGitHub { owner = "catppuccin"; repo = "nvim"; - rev = "eb4e73bfc5c364e86f08fbc8680e975a56638b1b"; - sha256 = "1xf22v477v073hppsw40iik6rx6354n7zmir6wp2yy41hkl6mlvf"; + rev = "73587f9c454da81679202f1668c30fea6cdafd5e"; + sha256 = "0775rqp1367rivqxilpqmrjh5k900j3idid2lg7h5h2q4h8yicaj"; }; meta.homepage = "https://github.com/catppuccin/nvim/"; }; @@ -14269,12 +14269,12 @@ final: prev: chad = buildVimPluginFrom2Nix { pname = "chad"; - version = "2023-03-19"; + version = "2023-03-26"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "chadtree"; - rev = "773fb772e43b10d407133079e5ef2c69bda3ed8b"; - sha256 = "08vyzhwxqg10qw7w8qfp5n6dznd3zn0c01n5yx7nw8863acilm4d"; + rev = "38a86b349902b7afd0589200b98a7459b32d6c1a"; + sha256 = "0jcsqm0q7qpqraf7rh5hlwi5fp5yxkslz3qhk434q6qvjibs00xz"; }; meta.homepage = "https://github.com/ms-jpq/chadtree/"; }; @@ -14317,12 +14317,12 @@ final: prev: lspsaga-nvim-original = buildVimPluginFrom2Nix { pname = "lspsaga-nvim-original"; - version = "2023-03-22"; + version = "2023-03-27"; src = fetchFromGitHub { owner = "glepnir"; repo = "lspsaga.nvim"; - rev = "04617d1f5b1cfbdd2a99d9765ef04fc6ae415622"; - sha256 = "1jgf7sm0755a1vcbfm1wxmkv6alrbpyfzrrfbi3100hh4c9khxg6"; + rev = "3ae79a1bd03d3ab90f965f0276051d09791d34cf"; + sha256 = "14958479sr01jsqh76rrzlbmj5dk05z94qc3z3v6a4rrf9l013pv"; }; meta.homepage = "https://github.com/glepnir/lspsaga.nvim/"; }; From 110564e99d4712f6b41449baa9b9dbce26239d55 Mon Sep 17 00:00:00 2001 From: "\"Ilan Joselevich\"" <"personal@ilanjoselevich.com"> Date: Tue, 28 Mar 2023 01:02:41 +0300 Subject: [PATCH 94/94] vimPlugins.nvim-treesitter: update grammars --- .../vim/plugins/nvim-treesitter/generated.nix | 94 ++++++++++++------- 1 file changed, 58 insertions(+), 36 deletions(-) diff --git a/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix b/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix index 52fb227ae5a7..abbd84464916 100644 --- a/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix +++ b/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix @@ -27,12 +27,12 @@ }; arduino = buildGrammar { language = "arduino"; - version = "0.0.0+rev=257efff"; + version = "0.0.0+rev=833b53d"; src = fetchFromGitHub { owner = "ObserverOfTime"; repo = "tree-sitter-arduino"; - rev = "257efffa387da3283a37816b71dedfecf4af5222"; - hash = "sha256-Yc3oFzOMyQwW2URyEzSIe6wBNAu9J2vPFIXk43sVUv8="; + rev = "833b53df97143bc46e014608dee9f64f78d7473c"; + hash = "sha256-M3mAZ5CORunUEIxy4+yQ8qTSbpmEgEmHgTB98niTbXo="; }; meta.homepage = "https://github.com/ObserverOfTime/tree-sitter-arduino"; }; @@ -49,12 +49,12 @@ }; awk = buildGrammar { language = "awk"; - version = "0.0.0+rev=e559793"; + version = "0.0.0+rev=b8e81f6"; src = fetchFromGitHub { owner = "Beaglefoot"; repo = "tree-sitter-awk"; - rev = "e559793754c60c2cdf00cbb0409842d75f0a41dc"; - hash = "sha256-qLY8lpeP0jKqhNxoSLwBTOfulK79/0KOjgq/rKWUBSA="; + rev = "b8e81f62109e65adca1ab51ab9d414411db5a37f"; + hash = "sha256-3fCaV/MxqOP9g6Ma/eTAerKL+HVweDjihgeUR6h4wY0="; }; meta.homepage = "https://github.com/Beaglefoot/tree-sitter-awk"; }; @@ -236,12 +236,12 @@ }; cpp = buildGrammar { language = "cpp"; - version = "0.0.0+rev=03fa93d"; + version = "0.0.0+rev=0b6d0eb"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-cpp"; - rev = "03fa93db133d6048a77d4de154a7b17ea8b9d076"; - hash = "sha256-0KYGEgAWmKFialuCy2zTfadDYezaftRRWjnr7sua9/c="; + rev = "0b6d0eb9abdf7cea31961cd903eeed5bbd0aae74"; + hash = "sha256-rsxRiZCrsEB/ixAP4YmxFtnCoDQrLAp75c74DFR0/nk="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-cpp"; }; @@ -258,12 +258,12 @@ }; cuda = buildGrammar { language = "cuda"; - version = "0.0.0+rev=91c3ca3"; + version = "0.0.0+rev=967e7d7"; src = fetchFromGitHub { owner = "theHamsta"; repo = "tree-sitter-cuda"; - rev = "91c3ca3e42326e0f7b83c82765940bbf7f91c847"; - hash = "sha256-0jDO8Wkqkn9ol4mfga/h/9yMMWkMF9Z/33rTxB8n1dg="; + rev = "967e7d74a1a04a680674199e12141963a8dd6336"; + hash = "sha256-3rkmxnf1YzshBUEOXBXj9Zpg9IHh2uS0QzdncOU99IQ="; }; meta.homepage = "https://github.com/theHamsta/tree-sitter-cuda"; }; @@ -456,6 +456,17 @@ }; meta.homepage = "https://github.com/travonted/tree-sitter-fennel"; }; + firrtl = buildGrammar { + language = "firrtl"; + version = "0.0.0+rev=58e9655"; + src = fetchFromGitHub { + owner = "amaanq"; + repo = "tree-sitter-firrtl"; + rev = "58e9655caa6b6d0ef8dc0e6bd3d8e060beb6b40d"; + hash = "sha256-yvfB5xFBeBP8iFXpeKeD86kCVdu/hxAEw7lQ7ghuKGY="; + }; + meta.homepage = "https://github.com/amaanq/tree-sitter-firrtl"; + }; fish = buildGrammar { language = "fish"; version = "0.0.0+rev=f917690"; @@ -601,12 +612,12 @@ }; glimmer = buildGrammar { language = "glimmer"; - version = "0.0.0+rev=bc1c685"; + version = "0.0.0+rev=16c3786"; src = fetchFromGitHub { owner = "alexlafroscia"; repo = "tree-sitter-glimmer"; - rev = "bc1c685aa6a7caf9e58c5746ab386a1e673eb9af"; - hash = "sha256-CDXyynCsnmOvOs1rs9e29tNHosywTvGM0UyWVtwMqZ8="; + rev = "16c3786e1a2c87a236c823d1a8859574778a3436"; + hash = "sha256-fLRA4Rm92hVezbAdMxmrXPb5ax6wNaaBYIo+U64nD+8="; }; meta.homepage = "https://github.com/alexlafroscia/tree-sitter-glimmer"; }; @@ -711,12 +722,12 @@ }; haskell = buildGrammar { language = "haskell"; - version = "0.0.0+rev=fb3c19e"; + version = "0.0.0+rev=98fc7f5"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-haskell"; - rev = "fb3c19e8e307acaf9336ab88330fd386ce731638"; - hash = "sha256-2nXKC7rQYbY2Sr0GVYETR83KYza1HKqpmjFkkgP80rI="; + rev = "98fc7f59049aeb713ab9b72a8ff25dcaaef81087"; + hash = "sha256-BDvzmFIGABtkWEUbi74o3vPLsiwNWsQDNura867vYpU="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-haskell"; }; @@ -766,12 +777,12 @@ }; hlsl = buildGrammar { language = "hlsl"; - version = "0.0.0+rev=306d485"; + version = "0.0.0+rev=fce5ea2"; src = fetchFromGitHub { owner = "theHamsta"; repo = "tree-sitter-hlsl"; - rev = "306d48516a6b3dbb18a184692e8edffa8403018f"; - hash = "sha256-PvraHZYbTF3FFIQoooRr1Lx4ZrBLzzxWd5YoqibBQfM="; + rev = "fce5ea2e842404ce1af13fffdcf0daa02240c3dd"; + hash = "sha256-7/HJPPLUwwnxgmNP0Vzm+nTJ1YfnUYbqMcOEZZj5uRA="; }; meta.homepage = "https://github.com/theHamsta/tree-sitter-hlsl"; }; @@ -942,12 +953,12 @@ }; kotlin = buildGrammar { language = "kotlin"; - version = "0.0.0+rev=e463703"; + version = "0.0.0+rev=826ef28"; src = fetchFromGitHub { owner = "fwcd"; repo = "tree-sitter-kotlin"; - rev = "e4637037a5fe6f25fe66c305669faa0855f35692"; - hash = "sha256-Xoj9RJqtyNtwag5tXRfu5iJpTnajRk1g7ClflBbFZyI="; + rev = "826ef28d605d0925a86a99022cd222c96f2d0952"; + hash = "sha256-7fDwzt9BXs1h+2D9APAG/ruA81ZyAL4LOElXLdz8wyE="; }; meta.homepage = "https://github.com/fwcd/tree-sitter-kotlin"; }; @@ -1008,12 +1019,12 @@ }; luadoc = buildGrammar { language = "luadoc"; - version = "0.0.0+rev=40a67ee"; + version = "0.0.0+rev=5c9572f"; src = fetchFromGitHub { owner = "amaanq"; repo = "tree-sitter-luadoc"; - rev = "40a67ee798eb3c989fffde0277ff6de740ebaf34"; - hash = "sha256-vhiUaZms4Je/TBTTepQiuddl0sKodrHcrBCauBPgu7Y="; + rev = "5c9572faf56d1fa0f7e0740c94de1c4f67c6af5e"; + hash = "sha256-90FXGhzTpPVVBPpAdAvfqdIOVCPKTUtRC0WWQyCR0Eg="; }; meta.homepage = "https://github.com/amaanq/tree-sitter-luadoc"; }; @@ -1245,12 +1256,12 @@ }; perl = buildGrammar { language = "perl"; - version = "0.0.0+rev=ff1f0ac"; + version = "0.0.0+rev=3d3a95e"; src = fetchFromGitHub { owner = "ganezdragon"; repo = "tree-sitter-perl"; - rev = "ff1f0ac0f1c678a23f68d0140e75a0da8e11b7b5"; - hash = "sha256-RFSDtd8iJJEX7dawMzaGwJUB4t/nr11hmG2EdTp11s4="; + rev = "3d3a95ee6645d7bcd993e77b252ffd33fd297c8e"; + hash = "sha256-YM4lxdcvkX2l4KkdktDSoNXaN2zCqAS4W0mXMh8GJOs="; }; meta.homepage = "https://github.com/ganezdragon/tree-sitter-perl"; }; @@ -1309,6 +1320,17 @@ }; meta.homepage = "https://github.com/ObserverOfTime/tree-sitter-poe-filter"; }; + pony = buildGrammar { + language = "pony"; + version = "0.0.0+rev=9c6a4d9"; + src = fetchFromGitHub { + owner = "amaanq"; + repo = "tree-sitter-pony"; + rev = "9c6a4d98dea80772dbd7967fe556652a220469e5"; + hash = "sha256-fgPnDU58qfZfRmBA2hBQt23TjJqiU6XobBYzRD7ZFz0="; + }; + meta.homepage = "https://github.com/amaanq/tree-sitter-pony"; + }; prisma = buildGrammar { language = "prisma"; version = "0.0.0+rev=eca2596"; @@ -1674,12 +1696,12 @@ }; swift = buildGrammar { language = "swift"; - version = "0.0.0+rev=4cf4bb6"; + version = "0.0.0+rev=8c8412a"; src = fetchFromGitHub { owner = "alex-pinkus"; repo = "tree-sitter-swift"; - rev = "4cf4bb67c27f5c5a75f634fe941c588660e69ab3"; - hash = "sha256-dRXkUFaWMkFe0qWtNs3fkhct1+JLIbF/Z0VQdR0bjV4="; + rev = "8c8412a54d97d6f96a4bf4ecb76cba4808952ed5"; + hash = "sha256-rt7pmmPuWn6eA8pYk4wRABmMql4jm0+4BtNwcRI2QRQ="; }; generate = true; meta.homepage = "https://github.com/alex-pinkus/tree-sitter-swift"; @@ -1867,12 +1889,12 @@ }; v = buildGrammar { language = "v"; - version = "0.0.0+rev=66cf9d3"; + version = "0.0.0+rev=1828a1e"; src = fetchFromGitHub { owner = "vlang"; repo = "vls"; - rev = "66cf9d3086fb5ecc827cb32c64c5d812ab17d2c6"; - hash = "sha256-/dNdUAmfG/HNMzeWi3PSSM9pwA60/zOjLi4NFXfn6YU="; + rev = "1828a1e6611703371039fdefba955018ac570105"; + hash = "sha256-8gOvJQnoBdPw8er8sDL5wfhKaoibCvfC7XlZbMbg9QU="; }; location = "tree_sitter_v"; meta.homepage = "https://github.com/vlang/vls";