From 16e96c45c6957e7f0dd29fdbb5b63fa3db76bcfb Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 9 Dec 2022 07:13:45 +0000 Subject: [PATCH 01/33] aws-c-http: 0.6.27 -> 0.6.28 --- pkgs/development/libraries/aws-c-http/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/aws-c-http/default.nix b/pkgs/development/libraries/aws-c-http/default.nix index 4f9a46820b08..a1da60f4aae0 100644 --- a/pkgs/development/libraries/aws-c-http/default.nix +++ b/pkgs/development/libraries/aws-c-http/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "aws-c-http"; - version = "0.6.27"; + version = "0.6.28"; src = fetchFromGitHub { owner = "awslabs"; repo = "aws-c-http"; rev = "v${version}"; - sha256 = "sha256-prDQemFMIt33fna44tAaKlnblO4t5UU0vS6qyJKgJxk="; + sha256 = "sha256-Yl6+66UHUAQweFh/ziftWQKElamN1Mc9mZCdtFhRKXc="; }; nativeBuildInputs = [ From 299a2ed8fcc72aa4baaee1a3af609b366ab05adc Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 12 Dec 2022 04:12:11 +0000 Subject: [PATCH 02/33] aws-c-s3: 0.2.0 -> 0.2.1 --- pkgs/development/libraries/aws-c-s3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/aws-c-s3/default.nix b/pkgs/development/libraries/aws-c-s3/default.nix index 19ad8053c19f..ccb0b9b35cfe 100644 --- a/pkgs/development/libraries/aws-c-s3/default.nix +++ b/pkgs/development/libraries/aws-c-s3/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "aws-c-s3"; - version = "0.2.0"; + version = "0.2.1"; src = fetchFromGitHub { owner = "awslabs"; repo = "aws-c-s3"; rev = "v${version}"; - sha256 = "sha256-tFweXB610Ua8+x05rg+rOqh9QPhXjpvvzGf8EVVIHks="; + sha256 = "sha256-PT6ivk6WsM27jaULJ5CBAojaO7rGxzs/cxv7aRf2nn8="; }; nativeBuildInputs = [ From 562c45418116e85ef8f1ef0be17c378607994df3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 12 Dec 2022 05:30:38 +0000 Subject: [PATCH 03/33] aws-checksums: 0.1.13 -> 0.1.14 --- pkgs/development/libraries/aws-checksums/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/aws-checksums/default.nix b/pkgs/development/libraries/aws-checksums/default.nix index d820b0c71930..bfbc163c1623 100644 --- a/pkgs/development/libraries/aws-checksums/default.nix +++ b/pkgs/development/libraries/aws-checksums/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "aws-checksums"; - version = "0.1.13"; + version = "0.1.14"; src = fetchFromGitHub { owner = "awslabs"; repo = pname; rev = "v${version}"; - sha256 = "sha256-pSUSJTbwKYF2GsJG8DhLxxsv1ssp+/1c2gMY4dXbdFQ="; + sha256 = "sha256-yoViXJuM9UQMcn8W0CcWkCXroBLXjAestr+oqWHi5hQ="; }; nativeBuildInputs = [ cmake ]; From 10afcc353001bd9b39a70c52e825f1e5adb0ab52 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 16 Dec 2022 20:54:25 +0000 Subject: [PATCH 04/33] aws-c-mqtt: 0.8.1 -> 0.8.2 --- pkgs/development/libraries/aws-c-mqtt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/aws-c-mqtt/default.nix b/pkgs/development/libraries/aws-c-mqtt/default.nix index f5fc821e4670..802421d25a91 100644 --- a/pkgs/development/libraries/aws-c-mqtt/default.nix +++ b/pkgs/development/libraries/aws-c-mqtt/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "aws-c-mqtt"; - version = "0.8.1"; + version = "0.8.2"; src = fetchFromGitHub { owner = "awslabs"; repo = "aws-c-mqtt"; rev = "v${version}"; - sha256 = "sha256-nmSNG5o2Ck80OG4ZGYIayVdnw3Z2fn1VkUIuI9RYfL8="; + sha256 = "sha256-C8Ge+dSW/n9dh3MyZt/uOya3ONsC6Ji+59yylL7h8kY="; }; nativeBuildInputs = [ From d93e341a2745b9738802a472fb40cfd617a3d1f2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 18 Dec 2022 00:50:40 +0000 Subject: [PATCH 05/33] s2n-tls: 1.3.30 -> 1.3.31 --- pkgs/development/libraries/s2n-tls/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/s2n-tls/default.nix b/pkgs/development/libraries/s2n-tls/default.nix index ada5a5faec7a..c0e0e34c5e39 100644 --- a/pkgs/development/libraries/s2n-tls/default.nix +++ b/pkgs/development/libraries/s2n-tls/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "s2n-tls"; - version = "1.3.30"; + version = "1.3.31"; src = fetchFromGitHub { owner = "aws"; repo = pname; rev = "v${version}"; - sha256 = "sha256-gDbQky2tNhtgdHmbMqnB6uIkJp2JhqyOMjPiW6EakK0="; + sha256 = "sha256-jdjy5Th73Sd/8NvivB2g9dVRDW3DEvUSYXZ1o2U6Y88="; }; nativeBuildInputs = [ cmake ]; From 0c21d777352f55c177f27f7e64683e0a7825142c Mon Sep 17 00:00:00 2001 From: Luflosi Date: Mon, 19 Dec 2022 19:03:31 +0100 Subject: [PATCH 06/33] python3Packages.imageio: 2.22.4 -> 2.23.0 https://github.com/imageio/imageio/releases/tag/v2.23.0 --- pkgs/development/python-modules/imageio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/imageio/default.nix b/pkgs/development/python-modules/imageio/default.nix index bac544fc35af..1437b28a06be 100644 --- a/pkgs/development/python-modules/imageio/default.nix +++ b/pkgs/development/python-modules/imageio/default.nix @@ -16,11 +16,11 @@ buildPythonPackage rec { pname = "imageio"; - version = "2.22.4"; + version = "2.23.0"; disabled = pythonOlder "3.7"; src = fetchPypi { - sha256 = "sha256-D64Cet3wK8icc6VswVethFV/i4uEqhm0y3Bv78otiP8="; + sha256 = "sha256-y2NXCXZeUnyUiQtPu2hw5ZIT/hgqHICG0WfrNiYHPL0="; inherit pname version; }; From b33b9122bc11a7b9c0b339bcabd0e287b2d4b7ff Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 23 Dec 2022 06:16:04 +0000 Subject: [PATCH 07/33] mmctl: 7.5.1 -> 7.5.2 --- pkgs/tools/misc/mmctl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/mmctl/default.nix b/pkgs/tools/misc/mmctl/default.nix index 459cc0d90a5d..a708e9e694eb 100644 --- a/pkgs/tools/misc/mmctl/default.nix +++ b/pkgs/tools/misc/mmctl/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "mmctl"; - version = "7.5.1"; + version = "7.5.2"; src = fetchFromGitHub { owner = "mattermost"; repo = "mmctl"; rev = "v${version}"; - sha256 = "sha256-pNO0FBL1NM4SoKPEjUETeQ/hwdhJj5XpUIXJJ0mfH5M="; + sha256 = "sha256-qBt7YL4u/gt7pPjqXLvjtTH6Dhr3udcqAD1/VjxyJPg="; }; vendorSha256 = null; From 518bede442e8be0fc668811d84c7a6df78e5f4ce Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Tue, 27 Dec 2022 21:17:22 +0000 Subject: [PATCH 08/33] xorg:xhost: 1.0.8 -> 1.0.9 Adds IPv6 support into command line. Changes: https://www.spinics.net/lists/xorg/msg60787.html --- pkgs/servers/x11/xorg/default.nix | 10 +++++----- pkgs/servers/x11/xorg/tarballs.list | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 179b50fb1ab7..59d66abf994b 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -3002,17 +3002,17 @@ self: with self; { }) {}; # THIS IS A GENERATED FILE. DO NOT EDIT! - xhost = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libXau, libXmu, xorgproto }: stdenv.mkDerivation { + xhost = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libXau, libXmu, xorgproto, gettext }: stdenv.mkDerivation { pname = "xhost"; - version = "1.0.8"; + version = "1.0.9"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/app/xhost-1.0.8.tar.bz2"; - sha256 = "15n3mnd4i5kh4z32qv11580qjgvnng0wry2y753ljrqkkrbkrp52"; + url = "mirror://xorg/individual/app/xhost-1.0.9.tar.xz"; + sha256 = "0ib66h78ykc4zki4arh8hkcsgk1mk8yyy0ay5sdb2d908qqvb1pa"; }; hardeningDisable = [ "bindnow" "relro" ]; strictDeps = true; - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = [ pkg-config gettext ]; buildInputs = [ libX11 libXau libXmu xorgproto ]; meta.platforms = lib.platforms.unix; }) {}; diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list index 3c496ec300b5..e6a9a3168897 100644 --- a/pkgs/servers/x11/xorg/tarballs.list +++ b/pkgs/servers/x11/xorg/tarballs.list @@ -43,7 +43,7 @@ mirror://xorg/individual/app/xfs-1.2.0.tar.bz2 mirror://xorg/individual/app/xfsinfo-1.0.6.tar.bz2 mirror://xorg/individual/app/xgamma-1.0.6.tar.bz2 mirror://xorg/individual/app/xgc-1.0.5.tar.bz2 -mirror://xorg/individual/app/xhost-1.0.8.tar.bz2 +mirror://xorg/individual/app/xhost-1.0.9.tar.xz mirror://xorg/individual/app/xinit-1.4.1.tar.bz2 mirror://xorg/individual/app/xinput-1.6.3.tar.bz2 mirror://xorg/individual/app/xkbcomp-1.4.5.tar.bz2 From d0b531b5743f60cfeae75d55b1dffd62e97c0714 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Fri, 30 Dec 2022 17:36:18 +0100 Subject: [PATCH 09/33] ArchiSteamFarm: build asf as single file, build plugins --- .../misc/ArchiSteamFarm/default.nix | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/pkgs/applications/misc/ArchiSteamFarm/default.nix b/pkgs/applications/misc/ArchiSteamFarm/default.nix index 7896604b0e9a..5704dbcb1d1c 100644 --- a/pkgs/applications/misc/ArchiSteamFarm/default.nix +++ b/pkgs/applications/misc/ArchiSteamFarm/default.nix @@ -1,4 +1,5 @@ { lib +, stdenv , buildDotnetModule , fetchFromGitHub , dotnetCorePackages @@ -27,11 +28,20 @@ buildDotnetModule rec { projectFile = "ArchiSteamFarm.sln"; executables = [ "ArchiSteamFarm" ]; + dotnetFlags = [ + "-p:PublishSingleFile=true" + "-p:PublishTrimmed=true" + ]; + selfContainedBuild = true; runtimeDeps = [ libkrb5 zlib openssl ]; doCheck = true; + preBuild = '' + export projectFile=(ArchiSteamFarm) + ''; + preInstall = '' # A mutable path, with this directory tree must be set. By default, this would point at the nix store causing errors. makeWrapperArgs+=( @@ -40,6 +50,15 @@ buildDotnetModule rec { ) ''; + postInstall = '' + buildPlugin() { + dotnet publish $1 -p:ContinuousIntegrationBuild=true -p:Deterministic=true \ + --output $out/lib/${pname}/plugins/$1 --configuration Release \ + -p:TargetLatestRuntimePatch=false -p:UseAppHost=false --no-restore + } + buildPlugin ArchiSteamFarm.OfficialPlugins.SteamTokenDumper + ''; + passthru = { updateScript = ./update.sh; ui = callPackage ./web-ui { }; From 27e22f63403d58c00c71c4e5e64541924c57a64f Mon Sep 17 00:00:00 2001 From: Morgan Jones Date: Fri, 30 Dec 2022 11:43:23 -0800 Subject: [PATCH 10/33] mattermost: 7.5.1 -> 7.5.2 --- pkgs/servers/mattermost/default.nix | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/mattermost/default.nix b/pkgs/servers/mattermost/default.nix index 1d5386e89e1a..01819e8e99f2 100644 --- a/pkgs/servers/mattermost/default.nix +++ b/pkgs/servers/mattermost/default.nix @@ -7,18 +7,18 @@ buildGoModule rec { pname = "mattermost"; - version = "7.5.1"; + version = "7.5.2"; src = fetchFromGitHub { owner = "mattermost"; repo = "mattermost-server"; rev = "v${version}"; - sha256 = "sha256-uaud5yCJTV3/+5eqHvIurxM1EPtetTWeFTjkPKYmFiA="; + sha256 = "sha256-Jm7bu/RoFp7h38Ygis3U2E7Hbbj4zmRPc4PacxxASsw="; }; webapp = fetchurl { url = "https://releases.mattermost.com/${version}/mattermost-${version}-linux-amd64.tar.gz"; - sha256 = "sha256-DdQjXo3n13qt62iFWhSWuTcEXJiHLGdkWn8ulqvzTI0="; + sha256 = "sha256-Zvzme6Og/LLsT4XyFDAQscNgO+jCwwzDDytYOo4qM0U="; }; vendorSha256 = "sha256-qZQXNVbJZDddVE+xk6F8XJCEg5dhhuXz68wcn2Uvmxk="; @@ -29,6 +29,11 @@ buildGoModule rec { "-s" "-w" "-X github.com/mattermost/mattermost-server/v6/model.Version=${version}" + "-X github.com/mattermost/mattermost-server/v6/model.BuildNumber=${version}-nixpkgs" + "-X github.com/mattermost/mattermost-server/v6/model.BuildDate=1970-01-01" + "-X github.com/mattermost/mattermost-server/v6/model.BuildHash=v${version}" + "-X github.com/mattermost/mattermost-server/v6/model.BuildHashEnterprise=v${version}" + "-X github.com/mattermost/mattermost-server/v6/model.BuildEnterpriseReady=false" ]; postInstall = '' From a017cc7980592157f17bf77902c8be13f30182ec Mon Sep 17 00:00:00 2001 From: figsoda Date: Fri, 30 Dec 2022 17:07:16 -0500 Subject: [PATCH 11/33] pods: 1.0.0-rc.3 -> 1.0.1 Diff: https://github.com/marhkb/pods/compare/v1.0.0-rc.3...v1.0.1 --- pkgs/applications/virtualization/pods/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/virtualization/pods/default.nix b/pkgs/applications/virtualization/pods/default.nix index 516fba43f4b3..4963949927b5 100644 --- a/pkgs/applications/virtualization/pods/default.nix +++ b/pkgs/applications/virtualization/pods/default.nix @@ -17,19 +17,19 @@ stdenv.mkDerivation rec { pname = "pods"; - version = "1.0.0-rc.3"; + version = "1.0.1"; src = fetchFromGitHub { owner = "marhkb"; repo = pname; rev = "v${version}"; - sha256 = "sha256-4dRwrB2M0GooRq3Hi2nmpbQm9RaLqrkZkEDTQpEd7bo="; + sha256 = "sha256-oa7A0RMF7kPQXydysGpzAICgGoIRLWUMRibXdiftYyk="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - sha256 = "sha256-wGO2qp8jKHEevQ5vMDxqMzvRr1QazclhZ98M3B29PqQ="; + sha256 = "sha256-RMxk7e/z+YneNWI/xsZDmXr7DqB7qHEY8HPvTCeSLjg="; }; nativeBuildInputs = [ From f8f42c1f05cb0f65486c30291c25bad4dd3d5f33 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Fri, 30 Dec 2022 21:08:48 +0100 Subject: [PATCH 12/33] ArchiSteamFarm: 5.3.2.4 -> 5.4.0.3, fix update script (again), little cleanups --- .../misc/ArchiSteamFarm/default.nix | 8 +- .../applications/misc/ArchiSteamFarm/deps.nix | 67 +-- .../misc/ArchiSteamFarm/update.sh | 8 +- .../misc/ArchiSteamFarm/web-ui/default.nix | 6 +- .../ArchiSteamFarm/web-ui/node-packages.nix | 450 +++++++++--------- .../misc/ArchiSteamFarm/web-ui/update.sh | 4 +- 6 files changed, 250 insertions(+), 293 deletions(-) diff --git a/pkgs/applications/misc/ArchiSteamFarm/default.nix b/pkgs/applications/misc/ArchiSteamFarm/default.nix index 5704dbcb1d1c..72ec75962615 100644 --- a/pkgs/applications/misc/ArchiSteamFarm/default.nix +++ b/pkgs/applications/misc/ArchiSteamFarm/default.nix @@ -13,16 +13,17 @@ buildDotnetModule rec { pname = "archisteamfarm"; # nixpkgs-update: no auto update - version = "5.3.2.4"; + version = "5.4.0.3"; src = fetchFromGitHub { owner = "justarchinet"; repo = pname; rev = version; - sha256 = "sha256-qjU5TcYkAFJVYTOCwePGOVR9hYKNtinzLt5P4aTs578="; + sha256 = "sha256-+S0nvgiMxSUQI/TzAMES6bAix1iudj1+EkOcXO+6igE="; }; - dotnet-runtime = dotnetCorePackages.aspnetcore_6_0; + dotnet-runtime = dotnetCorePackages.aspnetcore_7_0; + dotnet-sdk = dotnetCorePackages.sdk_7_0; nugetDeps = ./deps.nix; @@ -60,6 +61,7 @@ buildDotnetModule rec { ''; passthru = { + # nix-shell maintainers/scripts/update.nix --argstr package ArchiSteamFarm updateScript = ./update.sh; ui = callPackage ./web-ui { }; }; diff --git a/pkgs/applications/misc/ArchiSteamFarm/deps.nix b/pkgs/applications/misc/ArchiSteamFarm/deps.nix index 5a3c3271fee0..7841028bf3a8 100644 --- a/pkgs/applications/misc/ArchiSteamFarm/deps.nix +++ b/pkgs/applications/misc/ArchiSteamFarm/deps.nix @@ -56,13 +56,12 @@ (fetchNuGet { pname = "Humanizer.Core.zh-CN"; version = "2.14.1"; sha256 = "1k6nnawd016xpwgzdzy84z1lcv2vc1cygcksw19wbgd8dharyyk7"; }) (fetchNuGet { pname = "Humanizer.Core.zh-Hans"; version = "2.14.1"; sha256 = "0zn99311zfn602phxyskfjq9vly0w5712z6fly8r4q0h94qa8c85"; }) (fetchNuGet { pname = "Humanizer.Core.zh-Hant"; version = "2.14.1"; sha256 = "0qxjnbdj645l5sd6y3100yyrq1jy5misswg6xcch06x8jv7zaw1p"; }) - (fetchNuGet { pname = "JetBrains.Annotations"; version = "2022.1.0"; sha256 = "0lsqpssain0v9i3jhpi1c42r5s329y31cvqk5x7gqvy17f29y002"; }) + (fetchNuGet { pname = "JetBrains.Annotations"; version = "2022.3.1"; sha256 = "0lkhyyz25q82ygnxy26lwy5cl8fvkdc13pcn433xpjj8akzbmgd6"; }) (fetchNuGet { pname = "Markdig.Signed"; version = "0.30.4"; sha256 = "1bzc2vqpsq4mx6rw2rnk4hr14gqd5w8rf2h026gh7rqkwqd3r2dj"; }) (fetchNuGet { pname = "Microsoft.AspNetCore.JsonPatch"; version = "6.0.0-rc.1.21452.15"; sha256 = "0c3vnaag8gxlxij77n18m3hawpjkjjamsnq5kfjz5cvc7sfg3fwh"; }) (fetchNuGet { pname = "Microsoft.AspNetCore.Mvc.NewtonsoftJson"; version = "6.0.0-rc.1.21452.15"; sha256 = "1xyx358w4fqzxr9cy358agnm86rjijbnvikiqlngz2msgmldxi2z"; }) (fetchNuGet { pname = "Microsoft.Bcl.AsyncInterfaces"; version = "6.0.0"; sha256 = "15gqy2m14fdlvy1g59207h5kisznm355kbw010gy19vh47z8gpz3"; }) - (fetchNuGet { pname = "Microsoft.CodeCoverage"; version = "17.3.2"; sha256 = "1f05l2vm8inlwhk36lfbyszjlcnvdd2qw2832npaah0dldn6dz00"; }) - (fetchNuGet { pname = "Microsoft.CSharp"; version = "4.0.1"; sha256 = "0zxc0apx1gcx361jlq8smc9pfdgmyjh6hpka8dypc9w23nlsh6yj"; }) + (fetchNuGet { pname = "Microsoft.CodeCoverage"; version = "17.4.0"; sha256 = "17lm9gvz48ay8xxrjacxjsknnva8i939prg26z6fq3svgcy0nc30"; }) (fetchNuGet { pname = "Microsoft.CSharp"; version = "4.3.0"; sha256 = "0gw297dgkh0al1zxvgvncqs0j15lsna9l1wpqas4rflmys440xvb"; }) (fetchNuGet { pname = "Microsoft.CSharp"; version = "4.7.0"; sha256 = "0gd67zlw554j098kabg887b5a6pq9kzavpa3jjy5w53ccjzjfy8j"; }) (fetchNuGet { pname = "Microsoft.Extensions.ApiDescription.Server"; version = "6.0.5"; sha256 = "1pi2bm3cm0a7jzqzmfc2r7bpcdkmk3hhjfvb2c81j7wl7xdw3624"; }) @@ -73,15 +72,13 @@ (fetchNuGet { pname = "Microsoft.Extensions.Logging.Abstractions"; version = "6.0.0"; sha256 = "0b75fmins171zi6bfdcq1kcvyrirs8n91mknjnxy4c3ygi1rrnj0"; }) (fetchNuGet { pname = "Microsoft.Extensions.Options"; version = "6.0.0"; sha256 = "008pnk2p50i594ahz308v81a41mbjz9mwcarqhmrjpl2d20c868g"; }) (fetchNuGet { pname = "Microsoft.Extensions.Primitives"; version = "6.0.0"; sha256 = "1kjiw6s4yfz9gm7mx3wkhp06ghnbs95icj9hi505shz9rjrg42q2"; }) - (fetchNuGet { pname = "Microsoft.NET.Test.Sdk"; version = "17.3.2"; sha256 = "0pm06nxqi8aw04lciqy7iz8ln1qm5mx06cpwgqa2dfwvnjp7zxnm"; }) - (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.0.1"; sha256 = "01al6cfxp68dscl15z7rxfw9zvhm64dncsw09a1vmdkacsa2v6lr"; }) + (fetchNuGet { pname = "Microsoft.NET.Test.Sdk"; version = "17.4.0"; sha256 = "1l1q2zi2091ac2cbynpsj0c8vff074y4c3vcnm4q7js1wv08jwld"; }) (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.1.0"; sha256 = "08vh1r12g6ykjygq5d3vq09zylgb84l63k49jc4v8faw9g93iqqm"; }) (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "5.0.0"; sha256 = "0mwpwdflidzgzfx2dlpkvvnkgkr2ayaf0s80737h4wa35gaj11rc"; }) - (fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "1.0.1"; sha256 = "0ppdkwy6s9p7x9jix3v4402wb171cdiibq7js7i13nxpdky7074p"; }) (fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "1.1.0"; sha256 = "193xwf33fbm0ni3idxzbr5fdq3i2dlfgihsac9jj7whj0gd902nh"; }) (fetchNuGet { pname = "Microsoft.OpenApi"; version = "1.2.3"; sha256 = "07b19k89whj69j87afkz86gp9b3iybw8jqwvlgcn43m7fb2y99rr"; }) - (fetchNuGet { pname = "Microsoft.TestPlatform.ObjectModel"; version = "17.3.2"; sha256 = "0bs38r5kdw1xpbjbi5l82xbhfnfbzr5xhg5520lk05pg914d1ln1"; }) - (fetchNuGet { pname = "Microsoft.TestPlatform.TestHost"; version = "17.3.2"; sha256 = "089nmaxzvm5xcf20pm4iiavz2k6lwh69r51xlbqg0ry605mnl869"; }) + (fetchNuGet { pname = "Microsoft.TestPlatform.ObjectModel"; version = "17.4.0"; sha256 = "0dl81q9k7jaymxpg995nsicjz1b1cs481a12c4znxkpjkddqa82b"; }) + (fetchNuGet { pname = "Microsoft.TestPlatform.TestHost"; version = "17.4.0"; sha256 = "1ip6gadn54k59nrz2l3a62rrxh2ldni33v9vkxlgcjg99sj2dyy4"; }) (fetchNuGet { pname = "Microsoft.Win32.Primitives"; version = "4.3.0"; sha256 = "0j0c1wj4ndj21zsgivsc24whiya605603kxrbiw6wkfdync464wq"; }) (fetchNuGet { pname = "Microsoft.Win32.Registry"; version = "5.0.0"; sha256 = "102hvhq2gmlcbq8y2cb7hdr2dnmjzfp2k3asr1ycwrfacwyaak7n"; }) (fetchNuGet { pname = "MSTest.TestAdapter"; version = "2.2.10"; sha256 = "0w6c55n30w6imm0rjafl2sg0x8vf9852xmil9dzqb4h36cs7v6y6"; }) @@ -89,15 +86,15 @@ (fetchNuGet { pname = "NETStandard.Library"; version = "1.6.1"; sha256 = "1z70wvsx2d847a2cjfii7b83pjfs34q05gb037fdjikv5kbagml8"; }) (fetchNuGet { pname = "Newtonsoft.Json"; version = "10.0.3"; sha256 = "06vy67bkshclpz69kps4vgzc9h2cgg41c8vlqmdbwclfky7c4haq"; }) (fetchNuGet { pname = "Newtonsoft.Json"; version = "13.0.1"; sha256 = "0fijg0w6iwap8gvzyjnndds0q4b8anwxxvik7y8vgq97dram4srb"; }) - (fetchNuGet { pname = "Newtonsoft.Json"; version = "9.0.1"; sha256 = "0mcy0i7pnfpqm4pcaiyzzji4g0c8i3a5gjz28rrr28110np8304r"; }) + (fetchNuGet { pname = "Newtonsoft.Json"; version = "13.0.2"; sha256 = "1p9splg1min274dpz7xdfgzrwkyfd3xlkygwpr1xgjvvyjvs6b0i"; }) (fetchNuGet { pname = "Newtonsoft.Json.Bson"; version = "1.0.2"; sha256 = "0c27bhy9x3c2n26inq32kmp6drpm71n6mqnmcr19wrlcaihglj35"; }) (fetchNuGet { pname = "Nito.AsyncEx.Coordination"; version = "5.1.2"; sha256 = "0sxvmqnv8a94k3pq1w3lh1vgjb8l62h1qamxcjl3pkq634h2fwrl"; }) (fetchNuGet { pname = "Nito.AsyncEx.Tasks"; version = "5.1.2"; sha256 = "11wp47kc69sjdxrbg5pgx0wlffqlp0x5kr54ggnz2v19kmjz362v"; }) (fetchNuGet { pname = "Nito.Collections.Deque"; version = "1.1.1"; sha256 = "152564q3s0n5swfv5p5rx0ghn2sm0g2xsnbd7gv8vb9yfklv7yg8"; }) (fetchNuGet { pname = "Nito.Disposables"; version = "2.2.1"; sha256 = "1hx5k8497j34kxxgh060bvij0vfnraw90dmm3h9bmamcdi8wp80l"; }) - (fetchNuGet { pname = "NLog"; version = "5.0.5"; sha256 = "1lrdpq5xikmda2rkh1b9jrhvi5r0d7nqdh5dglng92a7mkq2g75j"; }) - (fetchNuGet { pname = "NLog.Extensions.Logging"; version = "5.1.0"; sha256 = "0iq4gmaknz6yzb3qzbhrqqyfphqszgj05klipym3gs98qka6n568"; }) - (fetchNuGet { pname = "NLog.Web.AspNetCore"; version = "5.1.5"; sha256 = "13mrmwfk26sn79zslr30wqkir0svg0njasc17px853sf78wqp9k0"; }) + (fetchNuGet { pname = "NLog"; version = "5.1.0"; sha256 = "0z6z405cy2knvg7c9fgg0bc9721ccc1ga23sh8d430a6lr3mznxr"; }) + (fetchNuGet { pname = "NLog.Extensions.Logging"; version = "5.2.0"; sha256 = "0bnyp44vnwbgiw8p0qab1zzmgxg66dsypbs3hv8415wb08b5vxvp"; }) + (fetchNuGet { pname = "NLog.Web.AspNetCore"; version = "5.2.0"; sha256 = "06dcv75g902x0q7swkmb58c5lb0rn3m7w178vs5dha3w9xy2nxkc"; }) (fetchNuGet { pname = "NuGet.Frameworks"; version = "5.11.0"; sha256 = "0wv26gq39hfqw9md32amr5771s73f5zn1z9vs4y77cgynxr73s4z"; }) (fetchNuGet { pname = "protobuf-net"; version = "3.0.101"; sha256 = "0594qckbc0lh61sw74ihaq4qmvf1lf133vfa88n443mh7lxm2fwf"; }) (fetchNuGet { pname = "protobuf-net.Core"; version = "3.0.101"; sha256 = "1kvn9rnm6f0jxs0s9scyyx2f2p8rk03qzc1f6ijv1g6xgkpxkq1m"; }) @@ -152,7 +149,6 @@ (fetchNuGet { pname = "System.AppContext"; version = "4.3.0"; sha256 = "1649qvy3dar900z3g817h17nl8jp4ka5vcfmsr05kh0fshn7j3ya"; }) (fetchNuGet { pname = "System.Buffers"; version = "4.3.0"; sha256 = "0fgns20ispwrfqll4q1zc1waqcmylb3zc50ys9x8zlwxh9pmd9jy"; }) (fetchNuGet { pname = "System.Buffers"; version = "4.5.1"; sha256 = "04kb1mdrlcixj9zh1xdi5as0k0qi8byr5mi3p3jcxx72qz93s2y3"; }) - (fetchNuGet { pname = "System.Collections"; version = "4.0.11"; sha256 = "1ga40f5lrwldiyw6vy67d0sg7jd7ww6kgwbksm19wrvq9hr0bsm6"; }) (fetchNuGet { pname = "System.Collections"; version = "4.3.0"; sha256 = "19r4y64dqyrq6k4706dnyhhw7fs24kpp3awak7whzss39dakpxk9"; }) (fetchNuGet { pname = "System.Collections.Concurrent"; version = "4.3.0"; sha256 = "0wi10md9aq33jrkh2c24wr2n9hrpyamsdhsxdcnf43b7y86kkii8"; }) (fetchNuGet { pname = "System.Collections.Immutable"; version = "1.7.1"; sha256 = "1nh4nlxfc7lbnbl86wwk1a3jwl6myz5j6hvgh5sp4krim9901hsq"; }) @@ -161,78 +157,55 @@ (fetchNuGet { pname = "System.ComponentModel"; version = "4.3.0"; sha256 = "0986b10ww3nshy30x9sjyzm0jx339dkjxjj3401r3q0f6fx2wkcb"; }) (fetchNuGet { pname = "System.ComponentModel.Primitives"; version = "4.3.0"; sha256 = "1svfmcmgs0w0z9xdw2f2ps05rdxmkxxhf0l17xk9l1l8xfahkqr0"; }) (fetchNuGet { pname = "System.ComponentModel.TypeConverter"; version = "4.3.0"; sha256 = "17ng0p7v3nbrg3kycz10aqrrlw4lz9hzhws09pfh8gkwicyy481x"; }) - (fetchNuGet { pname = "System.Composition"; version = "6.0.0"; sha256 = "1p7hysns39cc24af6dwd4m48bqjsrr3clvi4aws152mh2fgyg50z"; }) - (fetchNuGet { pname = "System.Composition.AttributedModel"; version = "6.0.0"; sha256 = "1mqrblb0l65hw39d0hnspqcv85didpn4wbiwhfgj4784wzqx2w6k"; }) - (fetchNuGet { pname = "System.Composition.Convention"; version = "6.0.0"; sha256 = "02km3yb94p1c4s7liyhkmda0g71zm1rc8ijsfmy4bnlkq15xjw3b"; }) - (fetchNuGet { pname = "System.Composition.Hosting"; version = "6.0.0"; sha256 = "0big5nk8c44rxp6cfykhk7rxvn2cgwa99w6c3v2a36adc3lj36ky"; }) - (fetchNuGet { pname = "System.Composition.Runtime"; version = "6.0.0"; sha256 = "0vq5ik63yii1784gsa2f2kx9w6xllmm8b8rk0arid1jqdj1nyrlw"; }) - (fetchNuGet { pname = "System.Composition.TypedParts"; version = "6.0.0"; sha256 = "0y9pq3y60nyrpfy51f576a0qjjdh61mcv8vnik32pm4bz56h9q72"; }) + (fetchNuGet { pname = "System.Composition"; version = "7.0.0"; sha256 = "1aii681g7a4gv8fvgd6hbnbbwi6lpzfcnl3k0k8hqx4m7fxp2f32"; }) + (fetchNuGet { pname = "System.Composition.AttributedModel"; version = "7.0.0"; sha256 = "1cxrp0sk5b2gihhkn503iz8fa99k860js2qyzjpsw9rn547pdkny"; }) + (fetchNuGet { pname = "System.Composition.Convention"; version = "7.0.0"; sha256 = "1nbyn42xys0kv247jf45r748av6fp8kp27f1582lfhnj2n8290rp"; }) + (fetchNuGet { pname = "System.Composition.Hosting"; version = "7.0.0"; sha256 = "0wqbjxgggskfn45ilvg86grqci3zx9xj34r5sradca4mqqc90n7f"; }) + (fetchNuGet { pname = "System.Composition.Runtime"; version = "7.0.0"; sha256 = "1p9xpqzx42s8cdizv6nh15hcjvl2km0rwby66nfkj4cb472l339s"; }) + (fetchNuGet { pname = "System.Composition.TypedParts"; version = "7.0.0"; sha256 = "0syz7y6wgnxxgjvfqgymn9mnaa5fjy1qp06qnsvh3agr9mvcv779"; }) (fetchNuGet { pname = "System.Console"; version = "4.3.0"; sha256 = "1flr7a9x920mr5cjsqmsy9wgnv3lvd0h1g521pdr1lkb2qycy7ay"; }) - (fetchNuGet { pname = "System.Diagnostics.Debug"; version = "4.0.11"; sha256 = "0gmjghrqmlgzxivd2xl50ncbglb7ljzb66rlx8ws6dv8jm0d5siz"; }) (fetchNuGet { pname = "System.Diagnostics.Debug"; version = "4.3.0"; sha256 = "00yjlf19wjydyr6cfviaph3vsjzg3d5nvnya26i2fvfg53sknh3y"; }) (fetchNuGet { pname = "System.Diagnostics.DiagnosticSource"; version = "4.3.0"; sha256 = "0z6m3pbiy0qw6rn3n209rrzf9x1k4002zh90vwcrsym09ipm2liq"; }) (fetchNuGet { pname = "System.Diagnostics.DiagnosticSource"; version = "6.0.0"; sha256 = "0rrihs9lnb1h6x4h0hn6kgfnh58qq7hx8qq99gh6fayx4dcnx3s5"; }) (fetchNuGet { pname = "System.Diagnostics.TextWriterTraceListener"; version = "4.3.0"; sha256 = "09db74f36wkwg30f7v7zhz1yhkyrnl5v6bdwljq1jdfgzcfch7c3"; }) - (fetchNuGet { pname = "System.Diagnostics.Tools"; version = "4.0.1"; sha256 = "19cknvg07yhakcvpxg3cxa0bwadplin6kyxd8mpjjpwnp56nl85x"; }) (fetchNuGet { pname = "System.Diagnostics.Tools"; version = "4.3.0"; sha256 = "0in3pic3s2ddyibi8cvgl102zmvp9r9mchh82ns9f0ms4basylw1"; }) (fetchNuGet { pname = "System.Diagnostics.TraceSource"; version = "4.3.0"; sha256 = "1kyw4d7dpjczhw6634nrmg7yyyzq72k75x38y0l0nwhigdlp1766"; }) (fetchNuGet { pname = "System.Diagnostics.Tracing"; version = "4.3.0"; sha256 = "1m3bx6c2s958qligl67q7grkwfz3w53hpy7nc97mh6f7j5k168c4"; }) - (fetchNuGet { pname = "System.Dynamic.Runtime"; version = "4.0.11"; sha256 = "1pla2dx8gkidf7xkciig6nifdsb494axjvzvann8g2lp3dbqasm9"; }) (fetchNuGet { pname = "System.Dynamic.Runtime"; version = "4.3.0"; sha256 = "1d951hrvrpndk7insiag80qxjbf2y0y39y8h5hnq9612ws661glk"; }) - (fetchNuGet { pname = "System.Globalization"; version = "4.0.11"; sha256 = "070c5jbas2v7smm660zaf1gh0489xanjqymkvafcs4f8cdrs1d5d"; }) (fetchNuGet { pname = "System.Globalization"; version = "4.3.0"; sha256 = "1cp68vv683n6ic2zqh2s1fn4c2sd87g5hpp6l4d4nj4536jz98ki"; }) (fetchNuGet { pname = "System.Globalization.Calendars"; version = "4.3.0"; sha256 = "1xwl230bkakzzkrggy1l1lxmm3xlhk4bq2pkv790j5lm8g887lxq"; }) (fetchNuGet { pname = "System.Globalization.Extensions"; version = "4.3.0"; sha256 = "02a5zfxavhv3jd437bsncbhd2fp1zv4gxzakp1an9l6kdq1mcqls"; }) - (fetchNuGet { pname = "System.IO"; version = "4.1.0"; sha256 = "1g0yb8p11vfd0kbkyzlfsbsp5z44lwsvyc0h3dpw6vqnbi035ajp"; }) (fetchNuGet { pname = "System.IO"; version = "4.3.0"; sha256 = "05l9qdrzhm4s5dixmx68kxwif4l99ll5gqmh7rqgw554fx0agv5f"; }) (fetchNuGet { pname = "System.IO.Compression"; version = "4.3.0"; sha256 = "084zc82yi6yllgda0zkgl2ys48sypiswbiwrv7irb3r0ai1fp4vz"; }) (fetchNuGet { pname = "System.IO.Compression.ZipFile"; version = "4.3.0"; sha256 = "1yxy5pq4dnsm9hlkg9ysh5f6bf3fahqqb6p8668ndy5c0lk7w2ar"; }) - (fetchNuGet { pname = "System.IO.FileSystem"; version = "4.0.1"; sha256 = "0kgfpw6w4djqra3w5crrg8xivbanh1w9dh3qapb28q060wb9flp1"; }) (fetchNuGet { pname = "System.IO.FileSystem"; version = "4.3.0"; sha256 = "0z2dfrbra9i6y16mm9v1v6k47f0fm617vlb7s5iybjjsz6g1ilmw"; }) - (fetchNuGet { pname = "System.IO.FileSystem.Primitives"; version = "4.0.1"; sha256 = "1s0mniajj3lvbyf7vfb5shp4ink5yibsx945k6lvxa96r8la1612"; }) (fetchNuGet { pname = "System.IO.FileSystem.Primitives"; version = "4.3.0"; sha256 = "0j6ndgglcf4brg2lz4wzsh1av1gh8xrzdsn9f0yznskhqn1xzj9c"; }) - (fetchNuGet { pname = "System.Linq"; version = "4.1.0"; sha256 = "1ppg83svb39hj4hpp5k7kcryzrf3sfnm08vxd5sm2drrijsla2k5"; }) (fetchNuGet { pname = "System.Linq"; version = "4.3.0"; sha256 = "1w0gmba695rbr80l1k2h4mrwzbzsyfl2z4klmpbsvsg5pm4a56s7"; }) (fetchNuGet { pname = "System.Linq.Async"; version = "6.0.1"; sha256 = "10ira8hmv0i54yp9ggrrdm1c06j538sijfjpn1kmnh9j2xk5yzmq"; }) - (fetchNuGet { pname = "System.Linq.Expressions"; version = "4.1.0"; sha256 = "1gpdxl6ip06cnab7n3zlcg6mqp7kknf73s8wjinzi4p0apw82fpg"; }) (fetchNuGet { pname = "System.Linq.Expressions"; version = "4.3.0"; sha256 = "0ky2nrcvh70rqq88m9a5yqabsl4fyd17bpr63iy2mbivjs2nyypv"; }) (fetchNuGet { pname = "System.Net.Http"; version = "4.3.0"; sha256 = "1i4gc757xqrzflbk7kc5ksn20kwwfjhw9w7pgdkn19y3cgnl302j"; }) (fetchNuGet { pname = "System.Net.NameResolution"; version = "4.3.0"; sha256 = "15r75pwc0rm3vvwsn8rvm2krf929mjfwliv0mpicjnii24470rkq"; }) (fetchNuGet { pname = "System.Net.Primitives"; version = "4.3.0"; sha256 = "0c87k50rmdgmxx7df2khd9qj7q35j9rzdmm2572cc55dygmdk3ii"; }) (fetchNuGet { pname = "System.Net.Sockets"; version = "4.3.0"; sha256 = "1ssa65k6chcgi6mfmzrznvqaxk8jp0gvl77xhf1hbzakjnpxspla"; }) - (fetchNuGet { pname = "System.ObjectModel"; version = "4.0.12"; sha256 = "1sybkfi60a4588xn34nd9a58png36i0xr4y4v4kqpg8wlvy5krrj"; }) (fetchNuGet { pname = "System.ObjectModel"; version = "4.3.0"; sha256 = "191p63zy5rpqx7dnrb3h7prvgixmk168fhvvkkvhlazncf8r3nc2"; }) (fetchNuGet { pname = "System.Private.Uri"; version = "4.3.0"; sha256 = "04r1lkdnsznin0fj4ya1zikxiqr0h6r6a1ww2dsm60gqhdrf0mvx"; }) - (fetchNuGet { pname = "System.Reflection"; version = "4.1.0"; sha256 = "1js89429pfw79mxvbzp8p3q93il6rdff332hddhzi5wqglc4gml9"; }) (fetchNuGet { pname = "System.Reflection"; version = "4.3.0"; sha256 = "0xl55k0mw8cd8ra6dxzh974nxif58s3k1rjv1vbd7gjbjr39j11m"; }) - (fetchNuGet { pname = "System.Reflection.Emit"; version = "4.0.1"; sha256 = "0ydqcsvh6smi41gyaakglnv252625hf29f7kywy2c70nhii2ylqp"; }) (fetchNuGet { pname = "System.Reflection.Emit"; version = "4.3.0"; sha256 = "11f8y3qfysfcrscjpjym9msk7lsfxkk4fmz9qq95kn3jd0769f74"; }) - (fetchNuGet { pname = "System.Reflection.Emit.ILGeneration"; version = "4.0.1"; sha256 = "1pcd2ig6bg144y10w7yxgc9d22r7c7ww7qn1frdfwgxr24j9wvv0"; }) (fetchNuGet { pname = "System.Reflection.Emit.ILGeneration"; version = "4.3.0"; sha256 = "0w1n67glpv8241vnpz1kl14sy7zlnw414aqwj4hcx5nd86f6994q"; }) - (fetchNuGet { pname = "System.Reflection.Emit.Lightweight"; version = "4.0.1"; sha256 = "1s4b043zdbx9k39lfhvsk68msv1nxbidhkq6nbm27q7sf8xcsnxr"; }) (fetchNuGet { pname = "System.Reflection.Emit.Lightweight"; version = "4.3.0"; sha256 = "0ql7lcakycrvzgi9kxz1b3lljd990az1x6c4jsiwcacrvimpib5c"; }) - (fetchNuGet { pname = "System.Reflection.Extensions"; version = "4.0.1"; sha256 = "0m7wqwq0zqq9gbpiqvgk3sr92cbrw7cp3xn53xvw7zj6rz6fdirn"; }) (fetchNuGet { pname = "System.Reflection.Extensions"; version = "4.3.0"; sha256 = "02bly8bdc98gs22lqsfx9xicblszr2yan7v2mmw3g7hy6miq5hwq"; }) (fetchNuGet { pname = "System.Reflection.Metadata"; version = "1.6.0"; sha256 = "1wdbavrrkajy7qbdblpbpbalbdl48q3h34cchz24gvdgyrlf15r4"; }) - (fetchNuGet { pname = "System.Reflection.Primitives"; version = "4.0.1"; sha256 = "1bangaabhsl4k9fg8khn83wm6yial8ik1sza7401621jc6jrym28"; }) (fetchNuGet { pname = "System.Reflection.Primitives"; version = "4.3.0"; sha256 = "04xqa33bld78yv5r93a8n76shvc8wwcdgr1qvvjh959g3rc31276"; }) - (fetchNuGet { pname = "System.Reflection.TypeExtensions"; version = "4.1.0"; sha256 = "1bjli8a7sc7jlxqgcagl9nh8axzfl11f4ld3rjqsyxc516iijij7"; }) (fetchNuGet { pname = "System.Reflection.TypeExtensions"; version = "4.3.0"; sha256 = "0y2ssg08d817p0vdag98vn238gyrrynjdj4181hdg780sif3ykp1"; }) - (fetchNuGet { pname = "System.Resources.ResourceManager"; version = "4.0.1"; sha256 = "0b4i7mncaf8cnai85jv3wnw6hps140cxz8vylv2bik6wyzgvz7bi"; }) (fetchNuGet { pname = "System.Resources.ResourceManager"; version = "4.3.0"; sha256 = "0sjqlzsryb0mg4y4xzf35xi523s4is4hz9q4qgdvlvgivl7qxn49"; }) - (fetchNuGet { pname = "System.Runtime"; version = "4.1.0"; sha256 = "02hdkgk13rvsd6r9yafbwzss8kr55wnj8d5c7xjnp8gqrwc8sn0m"; }) (fetchNuGet { pname = "System.Runtime"; version = "4.3.0"; sha256 = "066ixvgbf2c929kgknshcxqj6539ax7b9m570cp8n179cpfkapz7"; }) (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "6.0.0"; sha256 = "0qm741kh4rh57wky16sq4m0v05fxmkjjr87krycf5vp9f0zbahbc"; }) - (fetchNuGet { pname = "System.Runtime.Extensions"; version = "4.1.0"; sha256 = "0rw4rm4vsm3h3szxp9iijc3ksyviwsv6f63dng3vhqyg4vjdkc2z"; }) (fetchNuGet { pname = "System.Runtime.Extensions"; version = "4.3.0"; sha256 = "1ykp3dnhwvm48nap8q23893hagf665k0kn3cbgsqpwzbijdcgc60"; }) - (fetchNuGet { pname = "System.Runtime.Handles"; version = "4.0.1"; sha256 = "1g0zrdi5508v49pfm3iii2hn6nm00bgvfpjq1zxknfjrxxa20r4g"; }) (fetchNuGet { pname = "System.Runtime.Handles"; version = "4.3.0"; sha256 = "0sw2gfj2xr7sw9qjn0j3l9yw07x73lcs97p8xfc9w1x9h5g5m7i8"; }) - (fetchNuGet { pname = "System.Runtime.InteropServices"; version = "4.1.0"; sha256 = "01kxqppx3dr3b6b286xafqilv4s2n0gqvfgzfd4z943ga9i81is1"; }) (fetchNuGet { pname = "System.Runtime.InteropServices"; version = "4.3.0"; sha256 = "00hywrn4g7hva1b2qri2s6rabzwgxnbpw9zfxmz28z09cpwwgh7j"; }) (fetchNuGet { pname = "System.Runtime.InteropServices.RuntimeInformation"; version = "4.3.0"; sha256 = "0q18r1sh4vn7bvqgd6dmqlw5v28flbpj349mkdish2vjyvmnb2ii"; }) (fetchNuGet { pname = "System.Runtime.Numerics"; version = "4.3.0"; sha256 = "19rav39sr5dky7afygh309qamqqmi9kcwvz3i0c5700v0c5cg61z"; }) (fetchNuGet { pname = "System.Runtime.Serialization.Formatters"; version = "4.3.0"; sha256 = "114j35n8gcvn3sqv9ar36r1jjq0y1yws9r0yk8i6wm4aq7n9rs0m"; }) - (fetchNuGet { pname = "System.Runtime.Serialization.Primitives"; version = "4.1.1"; sha256 = "042rfjixknlr6r10vx2pgf56yming8lkjikamg3g4v29ikk78h7k"; }) (fetchNuGet { pname = "System.Runtime.Serialization.Primitives"; version = "4.3.0"; sha256 = "01vv2p8h4hsz217xxs0rixvb7f2xzbh6wv1gzbfykcbfrza6dvnf"; }) (fetchNuGet { pname = "System.Security.AccessControl"; version = "5.0.0"; sha256 = "17n3lrrl6vahkqmhlpn3w20afgz09n7i6rv0r3qypngwi7wqdr5r"; }) (fetchNuGet { pname = "System.Security.Claims"; version = "4.3.0"; sha256 = "0jvfn7j22l3mm28qjy3rcw287y9h65ha4m940waaxah07jnbzrhn"; }) @@ -242,29 +215,21 @@ (fetchNuGet { pname = "System.Security.Cryptography.Encoding"; version = "4.3.0"; sha256 = "1jr6w70igqn07k5zs1ph6xja97hxnb3mqbspdrff6cvssgrixs32"; }) (fetchNuGet { pname = "System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0givpvvj8yc7gv4lhb6s1prq6p2c4147204a0wib89inqzd87gqc"; }) (fetchNuGet { pname = "System.Security.Cryptography.Primitives"; version = "4.3.0"; sha256 = "0pyzncsv48zwly3lw4f2dayqswcfvdwq2nz0dgwmi7fj3pn64wby"; }) - (fetchNuGet { pname = "System.Security.Cryptography.ProtectedData"; version = "6.0.0"; sha256 = "05kd3a8w7658hjxq9vvszxip30a479fjmfq4bq1r95nrsvs4hbss"; }) + (fetchNuGet { pname = "System.Security.Cryptography.ProtectedData"; version = "7.0.0"; sha256 = "15s9s6hsj9bz0nzw41mxbqdjgjd71w2djqbv0aj413gfi9amybk9"; }) (fetchNuGet { pname = "System.Security.Cryptography.X509Certificates"; version = "4.3.0"; sha256 = "0valjcz5wksbvijylxijjxb1mp38mdhv03r533vnx1q3ikzdav9h"; }) (fetchNuGet { pname = "System.Security.Principal"; version = "4.3.0"; sha256 = "12cm2zws06z4lfc4dn31iqv7072zyi4m910d4r6wm8yx85arsfxf"; }) (fetchNuGet { pname = "System.Security.Principal.Windows"; version = "4.3.0"; sha256 = "00a0a7c40i3v4cb20s2cmh9csb5jv2l0frvnlzyfxh848xalpdwr"; }) (fetchNuGet { pname = "System.Security.Principal.Windows"; version = "5.0.0"; sha256 = "1mpk7xj76lxgz97a5yg93wi8lj0l8p157a5d50mmjy3gbz1904q8"; }) - (fetchNuGet { pname = "System.Text.Encoding"; version = "4.0.11"; sha256 = "1dyqv0hijg265dwxg6l7aiv74102d6xjiwplh2ar1ly6xfaa4iiw"; }) (fetchNuGet { pname = "System.Text.Encoding"; version = "4.3.0"; sha256 = "1f04lkir4iladpp51sdgmis9dj4y8v08cka0mbmsy0frc9a4gjqr"; }) (fetchNuGet { pname = "System.Text.Encoding.CodePages"; version = "6.0.0"; sha256 = "0gm2kiz2ndm9xyzxgi0jhazgwslcs427waxgfa30m7yqll1kcrww"; }) - (fetchNuGet { pname = "System.Text.Encoding.Extensions"; version = "4.0.11"; sha256 = "08nsfrpiwsg9x5ml4xyl3zyvjfdi4mvbqf93kjdh11j4fwkznizs"; }) (fetchNuGet { pname = "System.Text.Encoding.Extensions"; version = "4.3.0"; sha256 = "11q1y8hh5hrp5a3kw25cb6l00v5l5dvirkz8jr3sq00h1xgcgrxy"; }) - (fetchNuGet { pname = "System.Text.RegularExpressions"; version = "4.1.0"; sha256 = "1mw7vfkkyd04yn2fbhm38msk7dz2xwvib14ygjsb8dq2lcvr18y7"; }) (fetchNuGet { pname = "System.Text.RegularExpressions"; version = "4.3.0"; sha256 = "1bgq51k7fwld0njylfn7qc5fmwrk2137gdq7djqdsw347paa9c2l"; }) - (fetchNuGet { pname = "System.Threading"; version = "4.0.11"; sha256 = "19x946h926bzvbsgj28csn46gak2crv2skpwsx80hbgazmkgb1ls"; }) (fetchNuGet { pname = "System.Threading"; version = "4.3.0"; sha256 = "0rw9wfamvhayp5zh3j7p1yfmx9b5khbf4q50d8k5rk993rskfd34"; }) - (fetchNuGet { pname = "System.Threading.Tasks"; version = "4.0.11"; sha256 = "0nr1r41rak82qfa5m0lhk9mp0k93bvfd7bbd9sdzwx9mb36g28p5"; }) (fetchNuGet { pname = "System.Threading.Tasks"; version = "4.3.0"; sha256 = "134z3v9abw3a6jsw17xl3f6hqjpak5l682k2vz39spj4kmydg6k7"; }) - (fetchNuGet { pname = "System.Threading.Tasks.Extensions"; version = "4.0.0"; sha256 = "1cb51z062mvc2i8blpzmpn9d9mm4y307xrwi65di8ri18cz5r1zr"; }) (fetchNuGet { pname = "System.Threading.Tasks.Extensions"; version = "4.3.0"; sha256 = "1xxcx2xh8jin360yjwm4x4cf5y3a2bwpn2ygkfkwkicz7zk50s2z"; }) (fetchNuGet { pname = "System.Threading.ThreadPool"; version = "4.3.0"; sha256 = "027s1f4sbx0y1xqw2irqn6x161lzj8qwvnh2gn78ciiczdv10vf1"; }) (fetchNuGet { pname = "System.Threading.Timer"; version = "4.3.0"; sha256 = "1nx773nsx6z5whv8kaa1wjh037id2f1cxhb69pvgv12hd2b6qs56"; }) - (fetchNuGet { pname = "System.Xml.ReaderWriter"; version = "4.0.11"; sha256 = "0c6ky1jk5ada9m94wcadih98l6k1fvf6vi7vhn1msjixaha419l5"; }) (fetchNuGet { pname = "System.Xml.ReaderWriter"; version = "4.3.0"; sha256 = "0c47yllxifzmh8gq6rq6l36zzvw4kjvlszkqa9wq3fr59n0hl3s1"; }) - (fetchNuGet { pname = "System.Xml.XDocument"; version = "4.0.11"; sha256 = "0n4lvpqzy9kc7qy1a4acwwd7b7pnvygv895az5640idl2y9zbz18"; }) (fetchNuGet { pname = "System.Xml.XDocument"; version = "4.3.0"; sha256 = "08h8fm4l77n0nd4i4fk2386y809bfbwqb7ih9d7564ifcxr5ssxd"; }) (fetchNuGet { pname = "System.Xml.XmlDocument"; version = "4.3.0"; sha256 = "0bmz1l06dihx52jxjr22dyv5mxv6pj4852lx68grjm7bivhrbfwi"; }) (fetchNuGet { pname = "zxcvbn-core"; version = "7.0.92"; sha256 = "1pbi0n3za8zsnkbvq19njy4h4hy12a6rv4rknf4a2m1kdhxb3cgx"; }) diff --git a/pkgs/applications/misc/ArchiSteamFarm/update.sh b/pkgs/applications/misc/ArchiSteamFarm/update.sh index 7bc5c7c76f89..08a1a09d6e25 100755 --- a/pkgs/applications/misc/ArchiSteamFarm/update.sh +++ b/pkgs/applications/misc/ArchiSteamFarm/update.sh @@ -1,5 +1,5 @@ #!/usr/bin/env nix-shell -#!nix-shell -I nixpkgs=../../../.. -i bash -p curl gnused jq common-updater-scripts +#!nix-shell -I nixpkgs=./. -i bash -p curl gnused jq common-updater-scripts set -euo pipefail cd "$(dirname "${BASH_SOURCE[0]}")" @@ -16,7 +16,7 @@ if [[ "$new_version" == "$old_version" ]]; then fi asf_path=$PWD -cd ../../../.. +push ../../../.. if [[ "${1:-}" != "--deps-only" ]]; then update-source-version ArchiSteamFarm "$new_version" @@ -24,5 +24,5 @@ fi $(nix-build -A ArchiSteamFarm.fetch-deps --no-out-link) "$deps_file" -cd "$asf_path" -exec "$asf_path/web-ui/update.sh" +popd +"$asf_path/web-ui/update.sh" diff --git a/pkgs/applications/misc/ArchiSteamFarm/web-ui/default.nix b/pkgs/applications/misc/ArchiSteamFarm/web-ui/default.nix index 8130fd139172..f7990138ca13 100644 --- a/pkgs/applications/misc/ArchiSteamFarm/web-ui/default.nix +++ b/pkgs/applications/misc/ArchiSteamFarm/web-ui/default.nix @@ -1,4 +1,4 @@ -{ lib, pkgs, fetchFromGitHub, nodejs, stdenv, ArchiSteamFarm, ... }: +{ lib, pkgs, fetchFromGitHub, nodejs, nodePackages, stdenv, ArchiSteamFarm }: let nodePackages = import ./node-composition.nix { @@ -11,8 +11,8 @@ let repo = "ASF-ui"; # updated by the update script # this is always the commit that should be used with asf-ui from the latest asf version - rev = "5f9969bf17e4c6915418655b35fc6b790cd2da0b"; - sha256 = "03y4ahq958rxjnddwnc6h95drdpnvpy16adk434aak4l8hqr24sg"; + rev = "c348d6897324aac1d899a977f9c7d467ea934796"; + sha256 = "1nvglb1wahz20my29jhi3j7824d12pdqf0xfpymnganzfkpj9zjk"; }; in diff --git a/pkgs/applications/misc/ArchiSteamFarm/web-ui/node-packages.nix b/pkgs/applications/misc/ArchiSteamFarm/web-ui/node-packages.nix index 873b479a5994..ae30221f8720 100644 --- a/pkgs/applications/misc/ArchiSteamFarm/web-ui/node-packages.nix +++ b/pkgs/applications/misc/ArchiSteamFarm/web-ui/node-packages.nix @@ -22,22 +22,22 @@ let sha512 = "TDCmlK5eOvH+eH7cdAFlNXeVJqWIQ7gW9tY1GJIpUtFb6CmjVyq2VM3u71bOyR8CRihcCgMUYoDNyLXao3+70Q=="; }; }; - "@babel/compat-data-7.19.4" = { + "@babel/compat-data-7.20.1" = { name = "_at_babel_slash_compat-data"; packageName = "@babel/compat-data"; - version = "7.19.4"; + version = "7.20.1"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.19.4.tgz"; - sha512 = "CHIGpJcUQ5lU9KrPHTjBMhVwQG6CQjxfg36fGXl3qk/Gik1WwWachaXFuo0uCWJT/mStOKtcbFJCaVLihC1CMw=="; + url = "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.20.1.tgz"; + sha512 = "EWZ4mE2diW3QALKvDMiXnbZpRvlj+nayZ112nK93SnhqOtpdsbVD4W+2tEoT3YNBAG9RBR0ISY758ZkOgsn6pQ=="; }; }; - "@babel/core-7.19.6" = { + "@babel/core-7.20.5" = { name = "_at_babel_slash_core"; packageName = "@babel/core"; - version = "7.19.6"; + version = "7.20.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/core/-/core-7.19.6.tgz"; - sha512 = "D2Ue4KHpc6Ys2+AxpIx1BZ8+UegLLLE2p3KJEuJRKmokHOtl49jQ5ny1773KsGLZs8MQvBidAF6yWUJxRqtKtg=="; + url = "https://registry.npmjs.org/@babel/core/-/core-7.20.5.tgz"; + sha512 = "UdOWmk4pNWTm/4DlPUl/Pt4Gz4rcEMb7CY0Y3eJl5Yz1vI8ZJGmHWaVE55LoxRjdpx0z259GE9U5STA9atUinQ=="; }; }; "@babel/eslint-parser-7.19.1" = { @@ -49,13 +49,13 @@ let sha512 = "AqNf2QWt1rtu2/1rLswy6CDP7H9Oh3mMhk177Y67Rg8d7RD9WfOLLv8CGn6tisFvS2htm86yIe1yLF6I1UDaGQ=="; }; }; - "@babel/generator-7.19.6" = { + "@babel/generator-7.20.5" = { name = "_at_babel_slash_generator"; packageName = "@babel/generator"; - version = "7.19.6"; + version = "7.20.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/generator/-/generator-7.19.6.tgz"; - sha512 = "oHGRUQeoX1QrKeJIKVe0hwjGqNnVYsM5Nep5zo0uE0m42sLH+Fsd2pStJ5sRM1bNyTUUoz0pe2lTeMJrb/taTA=="; + url = "https://registry.npmjs.org/@babel/generator/-/generator-7.20.5.tgz"; + sha512 = "jl7JY2Ykn9S0yj4DQP82sYvPU+T3g0HFcWTqDLqiuA9tGRNIj9VfbtXGAYTTkyNEnQk1jkMGOdYka8aG/lulCA=="; }; }; "@babel/helper-annotate-as-pure-7.18.6" = { @@ -76,13 +76,13 @@ let sha512 = "KT10c1oWEpmrIRYnthbzHgoOf6B+Xd6a5yhdbNtdhtG7aO1or5HViuf1TQR36xY/QprXA5nvxO6nAjhJ4y38jw=="; }; }; - "@babel/helper-compilation-targets-7.19.3" = { + "@babel/helper-compilation-targets-7.20.0" = { name = "_at_babel_slash_helper-compilation-targets"; packageName = "@babel/helper-compilation-targets"; - version = "7.19.3"; + version = "7.20.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.19.3.tgz"; - sha512 = "65ESqLGyGmLvgR0mst5AdW1FkNlj9rQsCKduzEoEPhBCDFGXvz2jW6bXFG6i0/MrV2s7hhXjjb2yAzcPuQlLwg=="; + url = "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.20.0.tgz"; + sha512 = "0jp//vDGp9e8hZzBc6N/KwA5ZK3Wsm/pfm4CrY7vzegkVxc65SgSn6wYOnwHe9Js9HRQ1YTCKLGPzDtaS3RoLQ=="; }; }; "@babel/helper-create-class-features-plugin-7.18.6" = { @@ -166,13 +166,13 @@ let sha512 = "0NFvs3VkuSYbFi1x2Vd6tKrywq+z/cLeYC/RJNFrIX/30Bf5aiGYbtvGXolEktzJH8o5E5KJ3tT+nkxuuZFVlA=="; }; }; - "@babel/helper-module-transforms-7.19.6" = { + "@babel/helper-module-transforms-7.20.2" = { name = "_at_babel_slash_helper-module-transforms"; packageName = "@babel/helper-module-transforms"; - version = "7.19.6"; + version = "7.20.2"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.19.6.tgz"; - sha512 = "fCmcfQo/KYr/VXXDIyd3CBGZ6AFhPFy1TfSEJ+PilGVlQT6jcbqtHAM4C1EciRqMza7/TpOUZliuSH+U6HAhJw=="; + url = "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.20.2.tgz"; + sha512 = "zvBKyJXRbmK07XhMuujYoJ48B5yvvmM6+wcpv6Ivj4Yg6qO7NOZOSnvZN9CRl1zz1Z4cKf8YejmCMh8clOoOeA=="; }; }; "@babel/helper-optimise-call-expression-7.18.6" = { @@ -184,13 +184,13 @@ let sha512 = "HP59oD9/fEHQkdcbgFCnbmgH5vIQTJbxh2yf+CdM89/glUNnuzr87Q8GIjGEnOktTROemO0Pe0iPAYbqZuOUiA=="; }; }; - "@babel/helper-plugin-utils-7.19.0" = { + "@babel/helper-plugin-utils-7.20.2" = { name = "_at_babel_slash_helper-plugin-utils"; packageName = "@babel/helper-plugin-utils"; - version = "7.19.0"; + version = "7.20.2"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.19.0.tgz"; - sha512 = "40Ryx7I8mT+0gaNxm8JGTZFUITNqdLAgdg0hXzeVZxVD6nFsdhQvip6v8dqkRHzsz1VFpFAaOCHNn0vKBL7Czw=="; + url = "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.20.2.tgz"; + sha512 = "8RvlJG2mj4huQ4pZ+rU9lqKi9ZKiRmuvGuM2HlWmkmgOhbs6zEAw6IEiJ5cQqGbDzGZOhwuOQNtZMi/ENLjZoQ=="; }; }; "@babel/helper-remap-async-to-generator-7.18.9" = { @@ -202,22 +202,22 @@ let sha512 = "dI7q50YKd8BAv3VEfgg7PS7yD3Rtbi2J1XMXaalXO0W0164hYLnh8zpjRS0mte9MfVp/tltvr/cfdXPvJr1opA=="; }; }; - "@babel/helper-replace-supers-7.18.9" = { + "@babel/helper-replace-supers-7.19.1" = { name = "_at_babel_slash_helper-replace-supers"; packageName = "@babel/helper-replace-supers"; - version = "7.18.9"; + version = "7.19.1"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.18.9.tgz"; - sha512 = "dNsWibVI4lNT6HiuOIBr1oyxo40HvIVmbwPUm3XZ7wMh4k2WxrxTqZwSqw/eEmXDS9np0ey5M2bz9tBmO9c+YQ=="; + url = "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.19.1.tgz"; + sha512 = "T7ahH7wV0Hfs46SFh5Jz3s0B6+o8g3c+7TMxu7xKfmHikg7EAZ3I2Qk9LFhjxXq8sL7UkP5JflezNwoZa8WvWw=="; }; }; - "@babel/helper-simple-access-7.19.4" = { + "@babel/helper-simple-access-7.20.2" = { name = "_at_babel_slash_helper-simple-access"; packageName = "@babel/helper-simple-access"; - version = "7.19.4"; + version = "7.20.2"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.19.4.tgz"; - sha512 = "f9Xq6WqBFqaDfbCzn2w85hwklswz5qsKlh7f08w4Y9yhJHpnNC0QemtSkK5YyOY8kPGvyiwdzZksGUhnGdaUIg=="; + url = "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.20.2.tgz"; + sha512 = "+0woI/WPq59IrqDYbVGfshjT5Dmk/nnbdpcF8SnMhhXObpTq2KNBdLFRFrkVdbDOyUmHBCxzm5FHV1rACIkIbA=="; }; }; "@babel/helper-skip-transparent-expression-wrappers-7.18.9" = { @@ -274,13 +274,13 @@ let sha512 = "95NLBP59VWdfK2lyLKe6eTMq9xg+yWKzxzxbJ1wcYNi1Auz200+83fMDADjRxBvc2QQor5zja2yTQzXGhk2GtQ=="; }; }; - "@babel/helpers-7.19.4" = { + "@babel/helpers-7.20.6" = { name = "_at_babel_slash_helpers"; packageName = "@babel/helpers"; - version = "7.19.4"; + version = "7.20.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helpers/-/helpers-7.19.4.tgz"; - sha512 = "G+z3aOx2nfDHwX/kyVii5fJq+bgscg89/dJNWpYeKeBv3v9xX8EIabmx1k6u9LS04H7nROFVRVK+e3k0VHp+sw=="; + url = "https://registry.npmjs.org/@babel/helpers/-/helpers-7.20.6.tgz"; + sha512 = "Pf/OjgfgFRW5bApskEz5pvidpim7tEDPlFtKcNRXWmfHGn9IEI2W2flqRQXTFb7gIPTyK++N6rVHuwKut4XK6w=="; }; }; "@babel/highlight-7.18.6" = { @@ -292,13 +292,13 @@ let sha512 = "u7stbOuYjaPezCuLj29hNW1v64M2Md2qupEKP1fHc7WdOA3DgLh37suiSrZYY7haUB7iBeQZ9P1uiRF359do3g=="; }; }; - "@babel/parser-7.19.6" = { + "@babel/parser-7.20.5" = { name = "_at_babel_slash_parser"; packageName = "@babel/parser"; - version = "7.19.6"; + version = "7.20.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/parser/-/parser-7.19.6.tgz"; - sha512 = "h1IUp81s2JYJ3mRkdxJgs4UvmSsRvDrx5ICSJbPvtWYv5i1nTBGcBpnog+89rAFMwvvru6E5NUHdBe01UeSzYA=="; + url = "https://registry.npmjs.org/@babel/parser/-/parser-7.20.5.tgz"; + sha512 = "r27t/cy/m9uKLXQNWWebeCUHgnAZq0CpG1OwKRxzJMP1vpSU4bSIK2hq+/cp0bQxetkXx38n09rNu8jVkcK/zA=="; }; }; "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.18.6" = { @@ -319,13 +319,13 @@ let sha512 = "AHrP9jadvH7qlOj6PINbgSuphjQUAK7AOT7DPjBo9EHoLhQTnnK5u45e1Hd4DbSQEO9nqPWtQ89r+XEOWFScKg=="; }; }; - "@babel/plugin-proposal-async-generator-functions-7.19.1" = { + "@babel/plugin-proposal-async-generator-functions-7.20.1" = { name = "_at_babel_slash_plugin-proposal-async-generator-functions"; packageName = "@babel/plugin-proposal-async-generator-functions"; - version = "7.19.1"; + version = "7.20.1"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.19.1.tgz"; - sha512 = "0yu8vNATgLy4ivqMNBIwb1HebCelqN7YX8SL3FDXORv/RqT0zEEWUCH4GH44JsSrvCu6GqnAdR5EBFAPeNBB4Q=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.20.1.tgz"; + sha512 = "Gh5rchzSwE4kC+o/6T8waD0WHEQIsDmjltY8WnWRXHUdH8axZhuH86Ov9M72YhJfDrZseQwuuWaaIT/TmePp3g=="; }; }; "@babel/plugin-proposal-class-properties-7.18.6" = { @@ -400,13 +400,13 @@ let sha512 = "ozlZFogPqoLm8WBr5Z8UckIoE4YQ5KESVcNudyXOR8uqIkliTEgJ3RoketfG6pmzLdeZF0H/wjE9/cCEitBl7Q=="; }; }; - "@babel/plugin-proposal-object-rest-spread-7.19.4" = { + "@babel/plugin-proposal-object-rest-spread-7.20.2" = { name = "_at_babel_slash_plugin-proposal-object-rest-spread"; packageName = "@babel/plugin-proposal-object-rest-spread"; - version = "7.19.4"; + version = "7.20.2"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.19.4.tgz"; - sha512 = "wHmj6LDxVDnL+3WhXteUBaoM1aVILZODAUjg11kHqG4cOlfgMQGxw6aCgvrXrmaJR3Bn14oZhImyCPZzRpC93Q=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.20.2.tgz"; + sha512 = "Ks6uej9WFK+fvIMesSqbAto5dD8Dz4VuuFvGJFKgIGSkJuRGcrwGECPA1fDgQK3/DbExBJpEkTeYeB8geIFCSQ=="; }; }; "@babel/plugin-proposal-optional-catch-binding-7.18.6" = { @@ -499,13 +499,13 @@ let sha512 = "MXf5laXo6c1IbEbegDmzGPwGNTsHZmEy6QGznu5Sh2UCWvueywb2ee+CCE4zQiZstxU9BMoQO9i6zUFSY0Kj0Q=="; }; }; - "@babel/plugin-syntax-import-assertions-7.18.6" = { + "@babel/plugin-syntax-import-assertions-7.20.0" = { name = "_at_babel_slash_plugin-syntax-import-assertions"; packageName = "@babel/plugin-syntax-import-assertions"; - version = "7.18.6"; + version = "7.20.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-syntax-import-assertions/-/plugin-syntax-import-assertions-7.18.6.tgz"; - sha512 = "/DU3RXad9+bZwrgWJQKbr39gYbJpLJHezqEzRzi/BHRlJ9zsQb4CK2CA/5apllXNomwA1qHwzvHl+AdEmC5krQ=="; + url = "https://registry.npmjs.org/@babel/plugin-syntax-import-assertions/-/plugin-syntax-import-assertions-7.20.0.tgz"; + sha512 = "IUh1vakzNoWalR8ch/areW7qFopR2AEw03JlG7BbrDqmQ4X3q9uuipQwSGrUn7oGiemKjtSLDhNtQHzMHr1JdQ=="; }; }; "@babel/plugin-syntax-json-strings-7.8.3" = { @@ -616,22 +616,22 @@ let sha512 = "ExUcOqpPWnliRcPqves5HJcJOvHvIIWfuS4sroBUenPuMdmW+SMHDakmtS7qOo13sVppmUijqeTv7qqGsvURpQ=="; }; }; - "@babel/plugin-transform-block-scoping-7.19.4" = { + "@babel/plugin-transform-block-scoping-7.20.2" = { name = "_at_babel_slash_plugin-transform-block-scoping"; packageName = "@babel/plugin-transform-block-scoping"; - version = "7.19.4"; + version = "7.20.2"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.19.4.tgz"; - sha512 = "934S2VLLlt2hRJwPf4MczaOr4hYF0z+VKPwqTNxyKX7NthTiPfhuKFWQZHXRM0vh/wo/VyXB3s4bZUNA08l+tQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.20.2.tgz"; + sha512 = "y5V15+04ry69OV2wULmwhEA6jwSWXO1TwAtIwiPXcvHcoOQUqpyMVd2bDsQJMW8AurjulIyUV8kDqtjSwHy1uQ=="; }; }; - "@babel/plugin-transform-classes-7.19.0" = { + "@babel/plugin-transform-classes-7.20.2" = { name = "_at_babel_slash_plugin-transform-classes"; packageName = "@babel/plugin-transform-classes"; - version = "7.19.0"; + version = "7.20.2"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.19.0.tgz"; - sha512 = "YfeEE9kCjqTS9IitkgfJuxjcEtLUHMqa8yUJ6zdz8vR7hKuo6mOy2C05P0F1tdMmDCeuyidKnlrw/iTppHcr2A=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.20.2.tgz"; + sha512 = "9rbPp0lCVVoagvtEyQKSo5L8oo0nQS/iif+lwlAz29MccX2642vWDlSZK+2T2buxbopotId2ld7zZAzRfz9j1g=="; }; }; "@babel/plugin-transform-computed-properties-7.18.9" = { @@ -643,13 +643,13 @@ let sha512 = "+i0ZU1bCDymKakLxn5srGHrsAPRELC2WIbzwjLhHW9SIE1cPYkLCL0NlnXMZaM1vhfgA2+M7hySk42VBvrkBRw=="; }; }; - "@babel/plugin-transform-destructuring-7.19.4" = { + "@babel/plugin-transform-destructuring-7.20.2" = { name = "_at_babel_slash_plugin-transform-destructuring"; packageName = "@babel/plugin-transform-destructuring"; - version = "7.19.4"; + version = "7.20.2"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.19.4.tgz"; - sha512 = "t0j0Hgidqf0aM86dF8U+vXYReUgJnlv4bZLsyoPnwZNrGY+7/38o8YjaELrvHeVfTZao15kjR0PVv0nju2iduA=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.20.2.tgz"; + sha512 = "mENM+ZHrvEgxLTBXUiQ621rRXZes3KWUv6NdQlrnr1TkWVw+hUjQBZuP2X32qKlrlG2BzgR95gkuCRSkJl8vIw=="; }; }; "@babel/plugin-transform-dotall-regex-7.18.6" = { @@ -715,31 +715,31 @@ let sha512 = "qSF1ihLGO3q+/g48k85tUjD033C29TNTVB2paCwZPVmOsjn9pClvYYrM2VeJpBY2bcNkuny0YUyTNRyRxJ54KA=="; }; }; - "@babel/plugin-transform-modules-amd-7.18.6" = { + "@babel/plugin-transform-modules-amd-7.19.6" = { name = "_at_babel_slash_plugin-transform-modules-amd"; packageName = "@babel/plugin-transform-modules-amd"; - version = "7.18.6"; + version = "7.19.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.18.6.tgz"; - sha512 = "Pra5aXsmTsOnjM3IajS8rTaLCy++nGM4v3YR4esk5PCsyg9z8NA5oQLwxzMUtDBd8F+UmVza3VxoAaWCbzH1rg=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.19.6.tgz"; + sha512 = "uG3od2mXvAtIFQIh0xrpLH6r5fpSQN04gIVovl+ODLdUMANokxQLZnPBHcjmv3GxRjnqwLuHvppjjcelqUFZvg=="; }; }; - "@babel/plugin-transform-modules-commonjs-7.18.6" = { + "@babel/plugin-transform-modules-commonjs-7.19.6" = { name = "_at_babel_slash_plugin-transform-modules-commonjs"; packageName = "@babel/plugin-transform-modules-commonjs"; - version = "7.18.6"; + version = "7.19.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.18.6.tgz"; - sha512 = "Qfv2ZOWikpvmedXQJDSbxNqy7Xr/j2Y8/KfijM0iJyKkBTmWuvCA1yeH1yDM7NJhBW/2aXxeucLj6i80/LAJ/Q=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.19.6.tgz"; + sha512 = "8PIa1ym4XRTKuSsOUXqDG0YaOlEuTVvHMe5JCfgBMOtHvJKw/4NGovEGN33viISshG/rZNVrACiBmPQLvWN8xQ=="; }; }; - "@babel/plugin-transform-modules-systemjs-7.19.0" = { + "@babel/plugin-transform-modules-systemjs-7.19.6" = { name = "_at_babel_slash_plugin-transform-modules-systemjs"; packageName = "@babel/plugin-transform-modules-systemjs"; - version = "7.19.0"; + version = "7.19.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.19.0.tgz"; - sha512 = "x9aiR0WXAWmOWsqcsnrzGR+ieaTMVyGyffPVA7F8cXAGt/UxefYv6uSHZLkAFChN5M5Iy1+wjE+xJuPt22H39A=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.19.6.tgz"; + sha512 = "fqGLBepcc3kErfR9R3DnVpURmckXP7gj7bAlrTQyBxrigFqszZCkFkcoxzCp2v32XmwXLvbw+8Yq9/b+QqksjQ=="; }; }; "@babel/plugin-transform-modules-umd-7.18.6" = { @@ -778,13 +778,13 @@ let sha512 = "uvGz6zk+pZoS1aTZrOvrbj6Pp/kK2mp45t2B+bTDre2UgsZZ8EZLSJtUg7m/no0zOJUWgFONpB7Zv9W2tSaFlA=="; }; }; - "@babel/plugin-transform-parameters-7.18.8" = { + "@babel/plugin-transform-parameters-7.20.1" = { name = "_at_babel_slash_plugin-transform-parameters"; packageName = "@babel/plugin-transform-parameters"; - version = "7.18.8"; + version = "7.20.1"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.18.8.tgz"; - sha512 = "ivfbE3X2Ss+Fj8nnXvKJS6sjRG4gzwPMsP+taZC+ZzEGjAYlvENixmt1sZ5Ca6tWls+BlKSGKPJ6OOXvXCbkFg=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.20.1.tgz"; + sha512 = "nDvKLrAvl+kf6BOy1UJ3MGwzzfTMgppxwiD2Jb4LO3xjYyZq30oQzDNJbCQpMdG9+j2IXHoiMrw5Cm/L6ZoxXQ=="; }; }; "@babel/plugin-transform-property-literals-7.18.6" = { @@ -877,13 +877,13 @@ let sha512 = "gE7A6Lt7YLnNOL3Pb9BNeZvi+d8l7tcRrG4+pwJjK9hD2xX4mEvjlQW60G9EEmfXVYRPv9VRQcyegIVHCql/AA=="; }; }; - "@babel/preset-env-7.19.4" = { + "@babel/preset-env-7.20.2" = { name = "_at_babel_slash_preset-env"; packageName = "@babel/preset-env"; - version = "7.19.4"; + version = "7.20.2"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.19.4.tgz"; - sha512 = "5QVOTXUdqTCjQuh2GGtdd7YEhoRXBMVGROAtsBeLGIbIz3obCBIfRMT1I3ZKkMgNzwkyCkftDXSSkHxnfVf4qg=="; + url = "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.20.2.tgz"; + sha512 = "1G0efQEWR1EHkKvKHqbG+IN/QdgwfByUpM5V5QroDzGV2t3S/WXNQd693cHiHTlCFMpr9B6FkPFXDA2lQcKoDg=="; }; }; "@babel/preset-modules-0.1.5" = { @@ -913,22 +913,22 @@ let sha512 = "TI+rCtooWHr3QJ27kJxfjutghu44DLnasDMwpDqCXVTal9RLp3RSYNh4NdBrRP2cQAoG9A8juOQl6P6oZG4JxA=="; }; }; - "@babel/traverse-7.19.6" = { + "@babel/traverse-7.20.5" = { name = "_at_babel_slash_traverse"; packageName = "@babel/traverse"; - version = "7.19.6"; + version = "7.20.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.19.6.tgz"; - sha512 = "6l5HrUCzFM04mfbG09AagtYyR2P0B71B1wN7PfSPiksDPz2k5H9CBC1tcZpz2M8OxbKTPccByoOJ22rUKbpmQQ=="; + url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.20.5.tgz"; + sha512 = "WM5ZNN3JITQIq9tFZaw1ojLU3WgWdtkxnhM1AegMS+PvHjkM5IXjmYEGY7yukz5XS4sJyEf2VzWjI8uAavhxBQ=="; }; }; - "@babel/types-7.19.4" = { + "@babel/types-7.20.5" = { name = "_at_babel_slash_types"; packageName = "@babel/types"; - version = "7.19.4"; + version = "7.20.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/types/-/types-7.19.4.tgz"; - sha512 = "M5LK7nAeS6+9j7hAq+b3fQs+pNfUtTGq+yFFfHnauFA8zQtLRfmuipmsKDKKLuyG+wC8ABW43A153YNawNTEtw=="; + url = "https://registry.npmjs.org/@babel/types/-/types-7.20.5.tgz"; + sha512 = "c9fst/h2/dcF7H+MJKZ2T0KjEQ8hY/BNnDk/H3XY8C4Aw/eWQXWn/lWntHF9ooUBnGmEvbfGrTgLWc+um0YDUg=="; }; }; "@discoveryjs/json-ext-0.5.5" = { @@ -949,49 +949,49 @@ let sha512 = "uj3pT6Mg+3t39fvLrj8iuCIJ38zKO9FpGtJ4BBJebJhEwjoT+KLVNCcHT5QC9NGRIEi7fZ0ZR8YRb884auB4Lg=="; }; }; - "@fortawesome/fontawesome-common-types-6.2.0" = { + "@fortawesome/fontawesome-common-types-6.2.1" = { name = "_at_fortawesome_slash_fontawesome-common-types"; packageName = "@fortawesome/fontawesome-common-types"; - version = "6.2.0"; + version = "6.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/@fortawesome/fontawesome-common-types/-/fontawesome-common-types-6.2.0.tgz"; - sha512 = "rBevIsj2nclStJ7AxTdfsa3ovHb1H+qApwrxcTVo+NNdeJiB9V75hsKfrkG5AwNcRUNxrPPiScGYCNmLMoh8pg=="; + url = "https://registry.npmjs.org/@fortawesome/fontawesome-common-types/-/fontawesome-common-types-6.2.1.tgz"; + sha512 = "Sz07mnQrTekFWLz5BMjOzHl/+NooTdW8F8kDQxjWwbpOJcnoSg4vUDng8d/WR1wOxM0O+CY9Zw0nR054riNYtQ=="; }; }; - "@fortawesome/fontawesome-svg-core-6.2.0" = { + "@fortawesome/fontawesome-svg-core-6.2.1" = { name = "_at_fortawesome_slash_fontawesome-svg-core"; packageName = "@fortawesome/fontawesome-svg-core"; - version = "6.2.0"; + version = "6.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/@fortawesome/fontawesome-svg-core/-/fontawesome-svg-core-6.2.0.tgz"; - sha512 = "Cf2mAAeMWFMzpLC7Y9H1I4o3wEU+XovVJhTiNG8ZNgSQj53yl7OCJaS80K4YjrABWZzbAHVaoHE1dVJ27AAYXw=="; + url = "https://registry.npmjs.org/@fortawesome/fontawesome-svg-core/-/fontawesome-svg-core-6.2.1.tgz"; + sha512 = "HELwwbCz6C1XEcjzyT1Jugmz2NNklMrSPjZOWMlc+ZsHIVk+XOvOXLGGQtFBwSyqfJDNgRq4xBCwWOaZ/d9DEA=="; }; }; - "@fortawesome/free-brands-svg-icons-6.2.0" = { + "@fortawesome/free-brands-svg-icons-6.2.1" = { name = "_at_fortawesome_slash_free-brands-svg-icons"; packageName = "@fortawesome/free-brands-svg-icons"; - version = "6.2.0"; + version = "6.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/@fortawesome/free-brands-svg-icons/-/free-brands-svg-icons-6.2.0.tgz"; - sha512 = "fm1y4NyZ2qKYNmYhdMz9VAWRw1Et7PMHNunSw3W0SVAwKwv6o0qiJworLH3Y9SnmhHzAymXJwCX1op22FFvGiA=="; + url = "https://registry.npmjs.org/@fortawesome/free-brands-svg-icons/-/free-brands-svg-icons-6.2.1.tgz"; + sha512 = "L8l4MfdHPmZlJ72PvzdfwOwbwcCAL0vx48tJRnI6u1PJXh+j2f3yDoKyQgO3qjEsgD5Fr2tQV/cPP8F/k6aUig=="; }; }; - "@fortawesome/free-solid-svg-icons-6.2.0" = { + "@fortawesome/free-solid-svg-icons-6.2.1" = { name = "_at_fortawesome_slash_free-solid-svg-icons"; packageName = "@fortawesome/free-solid-svg-icons"; - version = "6.2.0"; + version = "6.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/@fortawesome/free-solid-svg-icons/-/free-solid-svg-icons-6.2.0.tgz"; - sha512 = "UjCILHIQ4I8cN46EiQn0CZL/h8AwCGgR//1c4R96Q5viSRwuKVo0NdQEc4bm+69ZwC0dUvjbDqAHF1RR5FA3XA=="; + url = "https://registry.npmjs.org/@fortawesome/free-solid-svg-icons/-/free-solid-svg-icons-6.2.1.tgz"; + sha512 = "oKuqrP5jbfEPJWTij4sM+/RvgX+RMFwx3QZCZcK9PrBDgxC35zuc7AOFsyMjMd/PIFPeB2JxyqDr5zs/DZFPPw=="; }; }; - "@fortawesome/vue-fontawesome-2.0.8" = { + "@fortawesome/vue-fontawesome-2.0.9" = { name = "_at_fortawesome_slash_vue-fontawesome"; packageName = "@fortawesome/vue-fontawesome"; - version = "2.0.8"; + version = "2.0.9"; src = fetchurl { - url = "https://registry.npmjs.org/@fortawesome/vue-fontawesome/-/vue-fontawesome-2.0.8.tgz"; - sha512 = "SRmP0q9Ox4zq8ydDR/hrH+23TVU1bdwYVnugLVaAIwklOHbf56gx6JUGlwES7zjuNYqzKgl8e39iYf6ph8qSQw=="; + url = "https://registry.npmjs.org/@fortawesome/vue-fontawesome/-/vue-fontawesome-2.0.9.tgz"; + sha512 = "tUmO92PFHbLOplitjHNBVGMJm6S57vp16tBXJVPKSI/6CfjrgLycqKxEpC6f7qsOqUdoXs5nIv4HLUfrOMHzuw=="; }; }; "@humanwhocodes/config-array-0.11.6" = { @@ -1336,13 +1336,13 @@ let sha512 = "6YOoWjruKj1uLf3INHH7D3qTXwFfEsg1kf3c0uDdSBJwfa/llkwIjrAGV7j7mVgGNbzTQ3HiHKKDXl6bJPD97w=="; }; }; - "@vue/compiler-sfc-2.7.13" = { + "@vue/compiler-sfc-2.7.14" = { name = "_at_vue_slash_compiler-sfc"; packageName = "@vue/compiler-sfc"; - version = "2.7.13"; + version = "2.7.14"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-2.7.13.tgz"; - sha512 = "zzu2rLRZlgIU+OT3Atbr7Y6PG+LW4wVQpPfNRrGDH3dM9PsrcVfa+1pKb8bW467bGM3aDOvAnsYLWVpYIv3GRg=="; + url = "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-2.7.14.tgz"; + sha512 = "aNmNHyLPsw+sVvlQFQ2/8sjNuLtK54TC6cuKnVzAY93ks4ZBrvwQSnkkIh7bsbNhum5hJBS00wSDipQ937f5DA=="; }; }; "@vue/component-compiler-utils-3.2.2" = { @@ -1777,22 +1777,13 @@ let sha512 = "t+yRIyySRTp/wua5xEr+z1q60QmLq8ABsS5O9Me1AsE5dfKqgnCFzwiCZZ/cGNd1lq4/7akDWMxdhVlucjmnOQ=="; }; }; - "babel-loader-8.2.5" = { + "babel-loader-8.3.0" = { name = "babel-loader"; packageName = "babel-loader"; - version = "8.2.5"; + version = "8.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/babel-loader/-/babel-loader-8.2.5.tgz"; - sha512 = "OSiFfH89LrEMiWd4pLNqGz4CwJDtbs2ZVc+iGu2HrkRfPxId9F2anQj38IxWpmRfsUY0aBZYi1EFcd3mhtRMLQ=="; - }; - }; - "babel-plugin-dynamic-import-node-2.3.3" = { - name = "babel-plugin-dynamic-import-node"; - packageName = "babel-plugin-dynamic-import-node"; - version = "2.3.3"; - src = fetchurl { - url = "https://registry.npmjs.org/babel-plugin-dynamic-import-node/-/babel-plugin-dynamic-import-node-2.3.3.tgz"; - sha512 = "jZVI+s9Zg3IqA/kdi0i6UDCybUI3aSBLnglhYbSSjKlV7yF1F/5LWv8MakQmvYpnbJDS6fcBL2KzHSxNCMtWSQ=="; + url = "https://registry.npmjs.org/babel-loader/-/babel-loader-8.3.0.tgz"; + sha512 = "H8SvsMF+m9t15HNLMipppzkC+Y2Yq+v3SonZyU70RBL/h1gxPkH08Ot8pEE9Z4Kd+czyWJClmFS8qzIP9OZ04Q=="; }; }; "babel-plugin-polyfill-corejs2-0.3.3" = { @@ -2254,13 +2245,13 @@ let sha1 = "e303a882b342cc3ee8ca513a79999734dab3ae2c"; }; }; - "copy-to-clipboard-3.3.2" = { + "copy-to-clipboard-3.3.3" = { name = "copy-to-clipboard"; packageName = "copy-to-clipboard"; - version = "3.3.2"; + version = "3.3.3"; src = fetchurl { - url = "https://registry.npmjs.org/copy-to-clipboard/-/copy-to-clipboard-3.3.2.tgz"; - sha512 = "Vme1Z6RUDzrb6xAI7EZlVZ5uvOk2F//GaxKUxajDqm9LhOVM1inxNAD2vy+UZDYsd0uyA9s7b3/FVZPSxqrCfg=="; + url = "https://registry.npmjs.org/copy-to-clipboard/-/copy-to-clipboard-3.3.3.tgz"; + sha512 = "2KV8NhB5JqC3ky0r9PMCAZKbUHSwtEo4CwCs0KXgruG43gX5PMqDEBbVU4OUzw2MuAWUfsuFmWvEKG5QRfSnJA=="; }; }; "copy-webpack-plugin-11.0.0" = { @@ -2299,13 +2290,13 @@ let sha512 = "iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w=="; }; }; - "css-loader-6.7.1" = { + "css-loader-6.7.2" = { name = "css-loader"; packageName = "css-loader"; - version = "6.7.1"; + version = "6.7.2"; src = fetchurl { - url = "https://registry.npmjs.org/css-loader/-/css-loader-6.7.1.tgz"; - sha512 = "yB5CNFa14MbPJcomwNh3wLThtkZgcNyI2bNMRt8iE5Z8Vwl7f8vQXFAzn2HDOJvtDq2NTZBUGMSUNNyrv3/+cw=="; + url = "https://registry.npmjs.org/css-loader/-/css-loader-6.7.2.tgz"; + sha512 = "oqGbbVcBJkm8QwmnNzrFrWTnudnRZC+1eXikLJl0n4ljcfotgRifpg2a1lKy8jTrc4/d9A/ap1GFq1jDKG7J+Q=="; }; }; "css-select-4.1.3" = { @@ -2713,13 +2704,13 @@ let sha512 = "TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA=="; }; }; - "eslint-8.26.0" = { + "eslint-8.28.0" = { name = "eslint"; packageName = "eslint"; - version = "8.26.0"; + version = "8.28.0"; src = fetchurl { - url = "https://registry.npmjs.org/eslint/-/eslint-8.26.0.tgz"; - sha512 = "kzJkpaw1Bfwheq4VXUezFriD1GxszX6dUekM7Z3aC2o4hju+tsR/XyTC3RcoSD7jmy9VkPU3+N6YjVU2e96Oyg=="; + url = "https://registry.npmjs.org/eslint/-/eslint-8.28.0.tgz"; + sha512 = "S27Di+EVyMxcHiwDrFzk8dJYAaD+/5SoWKxL1ri/71CRHsnJnRDPNt2Kzj24+MT9FDupf4aqqyqPrvI8MvQ4VQ=="; }; }; "eslint-config-airbnb-base-15.0.0" = { @@ -2758,13 +2749,13 @@ let sha512 = "hYfi3FXaM8WPLf4S1cikh/r4IxnO6zrhZbEGz2b660EJRbuxgpDS5gkCuYgGWg2xxh2rBuIr4Pvhve/7c31koA=="; }; }; - "eslint-plugin-vue-9.6.0" = { + "eslint-plugin-vue-9.8.0" = { name = "eslint-plugin-vue"; packageName = "eslint-plugin-vue"; - version = "9.6.0"; + version = "9.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/eslint-plugin-vue/-/eslint-plugin-vue-9.6.0.tgz"; - sha512 = "zzySkJgVbFCylnG2+9MDF7N+2Rjze2y0bF8GyUNpFOnT8mCMfqqtLDJkHBuYu9N/psW1A6DVbQhPkP92E+qakA=="; + url = "https://registry.npmjs.org/eslint-plugin-vue/-/eslint-plugin-vue-9.8.0.tgz"; + sha512 = "E/AXwcTzunyzM83C2QqDHxepMzvI2y6x+mmeYHbVDQlKFqmKYvRrhaVixEeeG27uI44p9oKDFiyCRw4XxgtfHA=="; }; }; "eslint-scope-5.1.1" = { @@ -3253,13 +3244,13 @@ let sha512 = "bpzcOlgDhMG070Av0Vy5Owklpv1I6+j96GhUI7Rh7IzDCKLzboflLrrfqMu8NquDbiR4EOQk7XzJwqVJxicxog=="; }; }; - "globals-13.17.0" = { + "globals-13.18.0" = { name = "globals"; packageName = "globals"; - version = "13.17.0"; + version = "13.18.0"; src = fetchurl { - url = "https://registry.npmjs.org/globals/-/globals-13.17.0.tgz"; - sha512 = "1C+6nQRb1GwGMKm2dH/E7enFAMxGTmGI7/dEdhy/DNelv85w9B72t3uc5frtMNXIbzrarJJ/lTCjcaZwbLJmyw=="; + url = "https://registry.npmjs.org/globals/-/globals-13.18.0.tgz"; + sha512 = "/mR4KI8Ps2spmoc0Ulu9L7agOF0du1CZNQ3dke8yItYlyKNmGrkONemBbd6V8UTc1Wgcqn21t3WYB7dbRmh6/A=="; }; }; "globby-13.1.1" = { @@ -4117,13 +4108,13 @@ let sha512 = "rP4F0h2RaWSvPEkD7BLDFQnvSf+nK+wr3ESUjNTyAGobqrijmW92zc+SO6d4p4B1wh7+B/Jg1mkQe5NYUEHtHQ=="; }; }; - "loader-utils-2.0.2" = { + "loader-utils-2.0.3" = { name = "loader-utils"; packageName = "loader-utils"; - version = "2.0.2"; + version = "2.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.2.tgz"; - sha512 = "TM57VeHptv569d/GKh6TAYdzKblwDNiumOdkFnejjD0XwTH87K90w3O7AiJRqdQoXygvi1VQTJTLGhJl7WqA7A=="; + url = "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.3.tgz"; + sha512 = "THWqIsn8QRnvLl0shHYVBN9syumU8pYWEHPTmkiVGd+7K5eFNVSY6AJhRvgGF70gg1Dz+l/k8WicvFCxdEs60A=="; }; }; "locate-path-2.0.0" = { @@ -4936,13 +4927,13 @@ let sha512 = "yioayjNbHn6z1/Bywyb2Y4s3yvDAeXGOyxqD+LnVOinq6Mdmd++SW2wUNVzavyyHxd6+DxzWGIuosg6P1Rj8uA=="; }; }; - "postcss-8.4.14" = { + "postcss-8.4.19" = { name = "postcss"; packageName = "postcss"; - version = "8.4.14"; + version = "8.4.19"; src = fetchurl { - url = "https://registry.npmjs.org/postcss/-/postcss-8.4.14.tgz"; - sha512 = "E398TUmfAYFPBSdzgeieK2Y1+1cpdxJx8yXbK/m57nRhKSmk1GB2tO4lbLBtlkfPQTDKfe4Xqv1ASWPpayPEig=="; + url = "https://registry.npmjs.org/postcss/-/postcss-8.4.19.tgz"; + sha512 = "h+pbPsyhlYj6N2ozBmHhHrs9DzGmbaarbLvWipMRO7RLS+v4onj26MPFXA5OBYFxyqYhUJK456SwDcY9H2/zsA=="; }; }; "postcss-modules-extract-imports-3.0.0" = { @@ -5359,22 +5350,22 @@ let sha512 = "YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="; }; }; - "sass-1.55.0" = { + "sass-1.56.1" = { name = "sass"; packageName = "sass"; - version = "1.55.0"; + version = "1.56.1"; src = fetchurl { - url = "https://registry.npmjs.org/sass/-/sass-1.55.0.tgz"; - sha512 = "Pk+PMy7OGLs9WaxZGJMn7S96dvlyVBwwtToX895WmCpAOr5YiJYEUJfiJidMuKb613z2xNWcXCHEuOvjZbqC6A=="; + url = "https://registry.npmjs.org/sass/-/sass-1.56.1.tgz"; + sha512 = "VpEyKpyBPCxE7qGDtOcdJ6fFbcpOM+Emu7uZLxVrkX8KVU/Dp5UF7WLvzqRuUhB6mqqQt1xffLoG+AndxTZrCQ=="; }; }; - "sass-loader-13.1.0" = { + "sass-loader-13.2.0" = { name = "sass-loader"; packageName = "sass-loader"; - version = "13.1.0"; + version = "13.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/sass-loader/-/sass-loader-13.1.0.tgz"; - sha512 = "tZS1RJQ2n2+QNyf3CCAo1H562WjL/5AM6Gi8YcPVVoNxQX8d19mx8E+8fRrMWsyc93ZL6Q8vZDSM0FHVTJaVnQ=="; + url = "https://registry.npmjs.org/sass-loader/-/sass-loader-13.2.0.tgz"; + sha512 = "JWEp48djQA4nbZxmgC02/Wh0eroSUutulROUusYJO9P9zltRbNN80JCBHqRGzjd4cmZCa/r88xgfkjGD0TXsHg=="; }; }; "schema-utils-2.7.1" = { @@ -5440,13 +5431,13 @@ let sha512 = "b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw=="; }; }; - "semver-7.3.7" = { + "semver-7.3.8" = { name = "semver"; packageName = "semver"; - version = "7.3.7"; + version = "7.3.8"; src = fetchurl { - url = "https://registry.npmjs.org/semver/-/semver-7.3.7.tgz"; - sha512 = "QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g=="; + url = "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz"; + sha512 = "NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A=="; }; }; "send-0.17.2" = { @@ -6025,13 +6016,13 @@ let sha1 = "2299f02c6ded30d4a5961b0b9f74524a18f634fc"; }; }; - "vue-2.7.13" = { + "vue-2.7.14" = { name = "vue"; packageName = "vue"; - version = "2.7.13"; + version = "2.7.14"; src = fetchurl { - url = "https://registry.npmjs.org/vue/-/vue-2.7.13.tgz"; - sha512 = "QnM6ULTNnPmn71eUO+4hdjfBIA3H0GLsBnchnI/kS678tjI45GOUZhXd0oP/gX9isikXz1PAzSnkPspp9EUNfQ=="; + url = "https://registry.npmjs.org/vue/-/vue-2.7.14.tgz"; + sha512 = "b2qkFyOM0kwqWFuQmgd4o+uHGU7T+2z3T+WQp8UBjADfEv2n4FEMffzBmCKNP0IGzOEEfYjvtcC62xaSKeQDrQ=="; }; }; "vue-eslint-parser-8.3.0" = { @@ -6061,13 +6052,13 @@ let sha512 = "BXq3jwIagosjgNVae6tkHzzIk6a8MHFtzAdwhnV5VlvPTFxDCvIttgSiHWjdGoTJvXtmRu5HacExfdarRcFhog=="; }; }; - "vue-loader-15.10.0" = { + "vue-loader-15.10.1" = { name = "vue-loader"; packageName = "vue-loader"; - version = "15.10.0"; + version = "15.10.1"; src = fetchurl { - url = "https://registry.npmjs.org/vue-loader/-/vue-loader-15.10.0.tgz"; - sha512 = "VU6tuO8eKajrFeBzMssFUP9SvakEeeSi1BxdTH5o3+1yUyrldp8IERkSdXlMI2t4kxF2sqYUDsQY+WJBxzBmZg=="; + url = "https://registry.npmjs.org/vue-loader/-/vue-loader-15.10.1.tgz"; + sha512 = "SaPHK1A01VrNthlix6h1hq4uJu7S/z0kdLUb6klubo738NeQoLbS6V9/d8Pv19tU0XdQKju3D1HSKuI8wJ5wMA=="; }; }; "vue-meta-2.4.0" = { @@ -6124,13 +6115,13 @@ let sha512 = "sFuh0xfbtpRlKfm39ss/ikqs9AbKCoXZBpHeVZ8Tx650o0k0q/YCM7FRvigtxpACezfq6af+a7JeqVTWvncqDg=="; }; }; - "vue-template-compiler-2.7.13" = { + "vue-template-compiler-2.7.14" = { name = "vue-template-compiler"; packageName = "vue-template-compiler"; - version = "2.7.13"; + version = "2.7.14"; src = fetchurl { - url = "https://registry.npmjs.org/vue-template-compiler/-/vue-template-compiler-2.7.13.tgz"; - sha512 = "jYM6TClwDS9YqP48gYrtAtaOhRKkbYmbzE+Q51gX5YDr777n7tNI/IZk4QV4l/PjQPNh/FVa/E92sh/RqKMrog=="; + url = "https://registry.npmjs.org/vue-template-compiler/-/vue-template-compiler-2.7.14.tgz"; + sha512 = "zyA5Y3ArvVG0NacJDkkzJuPQDF8RFeRlzV2vLeSnhSpieO6LK2OVbdLPi5MPPs09Ii+gMO8nY4S3iKQxBxDmWQ=="; }; }; "vue-template-es2015-compiler-1.9.1" = { @@ -6169,13 +6160,13 @@ let sha512 = "O84QOnr0icsbFGLS0O3bI5FswxzRr8/gHwWkDlQFskhSPryQXvrTMxjxGP4+iWYoauLoBvfDpkrOauZ+0iZpDA=="; }; }; - "webpack-5.74.0" = { + "webpack-5.75.0" = { name = "webpack"; packageName = "webpack"; - version = "5.74.0"; + version = "5.75.0"; src = fetchurl { - url = "https://registry.npmjs.org/webpack/-/webpack-5.74.0.tgz"; - sha512 = "A2InDwnhhGN4LYctJj6M1JEaGL7Luj6LOmyBHjcI8529cm5p6VXiTIW2sn6ffvEAKmveLzvu4jrihwXtPojlAA=="; + url = "https://registry.npmjs.org/webpack/-/webpack-5.75.0.tgz"; + sha512 = "piaIaoVJlqMsPtX/+3KTTO6jfvrSYgauFVdt8cr9LTHKmcq/AMd4mhzsiP7ZF/PGRNPGA8336jldh9l2Kt2ogQ=="; }; }; "webpack-bundle-analyzer-4.7.0" = { @@ -6367,8 +6358,8 @@ let dependencies = [ sources."@ampproject/remapping-2.1.1" sources."@babel/code-frame-7.18.6" - sources."@babel/compat-data-7.19.4" - (sources."@babel/core-7.19.6" // { + sources."@babel/compat-data-7.20.1" + (sources."@babel/core-7.20.5" // { dependencies = [ sources."debug-4.3.4" sources."json5-2.2.1" @@ -6382,10 +6373,10 @@ let sources."semver-6.3.0" ]; }) - sources."@babel/generator-7.19.6" + sources."@babel/generator-7.20.5" sources."@babel/helper-annotate-as-pure-7.18.6" sources."@babel/helper-builder-binary-assignment-operator-visitor-7.18.6" - (sources."@babel/helper-compilation-targets-7.19.3" // { + (sources."@babel/helper-compilation-targets-7.20.0" // { dependencies = [ sources."semver-6.3.0" ]; @@ -6405,24 +6396,24 @@ let sources."@babel/helper-hoist-variables-7.18.6" sources."@babel/helper-member-expression-to-functions-7.18.9" sources."@babel/helper-module-imports-7.18.6" - sources."@babel/helper-module-transforms-7.19.6" + sources."@babel/helper-module-transforms-7.20.2" sources."@babel/helper-optimise-call-expression-7.18.6" - sources."@babel/helper-plugin-utils-7.19.0" + sources."@babel/helper-plugin-utils-7.20.2" sources."@babel/helper-remap-async-to-generator-7.18.9" - sources."@babel/helper-replace-supers-7.18.9" - sources."@babel/helper-simple-access-7.19.4" + sources."@babel/helper-replace-supers-7.19.1" + sources."@babel/helper-simple-access-7.20.2" sources."@babel/helper-skip-transparent-expression-wrappers-7.18.9" sources."@babel/helper-split-export-declaration-7.18.6" sources."@babel/helper-string-parser-7.19.4" sources."@babel/helper-validator-identifier-7.19.1" sources."@babel/helper-validator-option-7.18.6" sources."@babel/helper-wrap-function-7.18.10" - sources."@babel/helpers-7.19.4" + sources."@babel/helpers-7.20.6" sources."@babel/highlight-7.18.6" - sources."@babel/parser-7.19.6" + sources."@babel/parser-7.20.5" sources."@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.18.6" sources."@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.18.9" - sources."@babel/plugin-proposal-async-generator-functions-7.19.1" + sources."@babel/plugin-proposal-async-generator-functions-7.20.1" sources."@babel/plugin-proposal-class-properties-7.18.6" sources."@babel/plugin-proposal-class-static-block-7.18.6" sources."@babel/plugin-proposal-dynamic-import-7.18.6" @@ -6431,7 +6422,7 @@ let sources."@babel/plugin-proposal-logical-assignment-operators-7.18.9" sources."@babel/plugin-proposal-nullish-coalescing-operator-7.18.6" sources."@babel/plugin-proposal-numeric-separator-7.18.6" - sources."@babel/plugin-proposal-object-rest-spread-7.19.4" + sources."@babel/plugin-proposal-object-rest-spread-7.20.2" sources."@babel/plugin-proposal-optional-catch-binding-7.18.6" sources."@babel/plugin-proposal-optional-chaining-7.18.9" sources."@babel/plugin-proposal-private-methods-7.18.6" @@ -6442,7 +6433,7 @@ let sources."@babel/plugin-syntax-class-static-block-7.14.5" sources."@babel/plugin-syntax-dynamic-import-7.8.3" sources."@babel/plugin-syntax-export-namespace-from-7.8.3" - sources."@babel/plugin-syntax-import-assertions-7.18.6" + sources."@babel/plugin-syntax-import-assertions-7.20.0" sources."@babel/plugin-syntax-json-strings-7.8.3" sources."@babel/plugin-syntax-logical-assignment-operators-7.10.4" sources."@babel/plugin-syntax-nullish-coalescing-operator-7.8.3" @@ -6455,10 +6446,10 @@ let sources."@babel/plugin-transform-arrow-functions-7.18.6" sources."@babel/plugin-transform-async-to-generator-7.18.6" sources."@babel/plugin-transform-block-scoped-functions-7.18.6" - sources."@babel/plugin-transform-block-scoping-7.19.4" - sources."@babel/plugin-transform-classes-7.19.0" + sources."@babel/plugin-transform-block-scoping-7.20.2" + sources."@babel/plugin-transform-classes-7.20.2" sources."@babel/plugin-transform-computed-properties-7.18.9" - sources."@babel/plugin-transform-destructuring-7.19.4" + sources."@babel/plugin-transform-destructuring-7.20.2" sources."@babel/plugin-transform-dotall-regex-7.18.6" sources."@babel/plugin-transform-duplicate-keys-7.18.9" sources."@babel/plugin-transform-exponentiation-operator-7.18.6" @@ -6466,14 +6457,14 @@ let sources."@babel/plugin-transform-function-name-7.18.9" sources."@babel/plugin-transform-literals-7.18.9" sources."@babel/plugin-transform-member-expression-literals-7.18.6" - sources."@babel/plugin-transform-modules-amd-7.18.6" - sources."@babel/plugin-transform-modules-commonjs-7.18.6" - sources."@babel/plugin-transform-modules-systemjs-7.19.0" + sources."@babel/plugin-transform-modules-amd-7.19.6" + sources."@babel/plugin-transform-modules-commonjs-7.19.6" + sources."@babel/plugin-transform-modules-systemjs-7.19.6" sources."@babel/plugin-transform-modules-umd-7.18.6" sources."@babel/plugin-transform-named-capturing-groups-regex-7.19.1" sources."@babel/plugin-transform-new-target-7.18.6" sources."@babel/plugin-transform-object-super-7.18.6" - sources."@babel/plugin-transform-parameters-7.18.8" + sources."@babel/plugin-transform-parameters-7.20.1" sources."@babel/plugin-transform-property-literals-7.18.6" sources."@babel/plugin-transform-regenerator-7.18.6" sources."@babel/plugin-transform-reserved-words-7.18.6" @@ -6484,7 +6475,7 @@ let sources."@babel/plugin-transform-typeof-symbol-7.18.9" sources."@babel/plugin-transform-unicode-escapes-7.18.10" sources."@babel/plugin-transform-unicode-regex-7.18.6" - (sources."@babel/preset-env-7.19.4" // { + (sources."@babel/preset-env-7.20.2" // { dependencies = [ sources."semver-6.3.0" ]; @@ -6492,13 +6483,13 @@ let sources."@babel/preset-modules-0.1.5" sources."@babel/runtime-7.14.6" sources."@babel/template-7.18.10" - (sources."@babel/traverse-7.19.6" // { + (sources."@babel/traverse-7.20.5" // { dependencies = [ sources."debug-4.3.3" sources."ms-2.1.2" ]; }) - sources."@babel/types-7.19.4" + sources."@babel/types-7.20.5" sources."@discoveryjs/json-ext-0.5.5" (sources."@eslint/eslintrc-1.3.3" // { dependencies = [ @@ -6507,11 +6498,11 @@ let sources."ms-2.1.2" ]; }) - sources."@fortawesome/fontawesome-common-types-6.2.0" - sources."@fortawesome/fontawesome-svg-core-6.2.0" - sources."@fortawesome/free-brands-svg-icons-6.2.0" - sources."@fortawesome/free-solid-svg-icons-6.2.0" - sources."@fortawesome/vue-fontawesome-2.0.8" + sources."@fortawesome/fontawesome-common-types-6.2.1" + sources."@fortawesome/fontawesome-svg-core-6.2.1" + sources."@fortawesome/free-brands-svg-icons-6.2.1" + sources."@fortawesome/free-solid-svg-icons-6.2.1" + sources."@fortawesome/vue-fontawesome-2.0.9" (sources."@humanwhocodes/config-array-0.11.6" // { dependencies = [ sources."debug-4.3.3" @@ -6555,7 +6546,7 @@ let sources."@types/serve-static-1.13.10" sources."@types/sockjs-0.3.33" sources."@types/ws-8.5.3" - sources."@vue/compiler-sfc-2.7.13" + sources."@vue/compiler-sfc-2.7.14" (sources."@vue/component-compiler-utils-3.2.2" // { dependencies = [ sources."picocolors-0.2.1" @@ -6619,14 +6610,13 @@ let }) sources."asynckit-0.4.0" sources."axios-0.27.2" - (sources."babel-loader-8.2.5" // { + (sources."babel-loader-8.3.0" // { dependencies = [ sources."json5-2.2.1" - sources."loader-utils-2.0.2" + sources."loader-utils-2.0.3" sources."schema-utils-2.7.1" ]; }) - sources."babel-plugin-dynamic-import-node-2.3.3" (sources."babel-plugin-polyfill-corejs2-0.3.3" // { dependencies = [ sources."semver-6.3.0" @@ -6688,7 +6678,7 @@ let sources."convert-source-map-1.8.0" sources."cookie-0.4.2" sources."cookie-signature-1.0.6" - sources."copy-to-clipboard-3.3.2" + sources."copy-to-clipboard-3.3.3" (sources."copy-webpack-plugin-11.0.0" // { dependencies = [ sources."ajv-8.11.0" @@ -6702,7 +6692,7 @@ let sources."core-js-compat-3.25.1" sources."core-util-is-1.0.3" sources."cross-spawn-7.0.3" - sources."css-loader-6.7.1" + sources."css-loader-6.7.2" sources."css-select-4.1.3" sources."css-what-5.1.0" sources."cssesc-3.0.0" @@ -6762,7 +6752,7 @@ let sources."escalade-3.1.1" sources."escape-html-1.0.3" sources."escape-string-regexp-1.0.5" - (sources."eslint-8.26.0" // { + (sources."eslint-8.28.0" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-4.1.2" @@ -6774,7 +6764,7 @@ let sources."estraverse-5.3.0" sources."find-up-5.0.0" sources."glob-parent-6.0.2" - sources."globals-13.17.0" + sources."globals-13.18.0" sources."has-flag-4.0.0" sources."is-path-inside-3.0.3" sources."locate-path-6.0.0" @@ -6807,7 +6797,7 @@ let sources."doctrine-2.1.0" ]; }) - (sources."eslint-plugin-vue-9.6.0" // { + (sources."eslint-plugin-vue-9.8.0" // { dependencies = [ sources."debug-4.3.4" sources."eslint-scope-7.1.1" @@ -7143,7 +7133,7 @@ let sources."pinkie-promise-2.0.1" sources."plurals-cldr-2.0.1" sources."popper.js-1.16.1" - sources."postcss-8.4.14" + sources."postcss-8.4.19" sources."postcss-modules-extract-imports-3.0.0" sources."postcss-modules-local-by-default-4.0.0" sources."postcss-modules-scope-3.0.0" @@ -7198,12 +7188,12 @@ let sources."run-parallel-1.2.0" sources."safe-buffer-5.1.2" sources."safer-buffer-2.1.2" - sources."sass-1.55.0" - sources."sass-loader-13.1.0" + sources."sass-1.56.1" + sources."sass-loader-13.2.0" sources."schema-utils-3.1.1" sources."select-hose-2.0.0" sources."selfsigned-2.1.1" - (sources."semver-7.3.7" // { + (sources."semver-7.3.8" // { dependencies = [ sources."lru-cache-6.0.0" sources."yallist-4.0.0" @@ -7313,7 +7303,7 @@ let sources."uuid-8.3.2" sources."v-tooltip-2.1.3" sources."vary-1.1.2" - sources."vue-2.7.13" + sources."vue-2.7.14" (sources."vue-eslint-parser-8.3.0" // { dependencies = [ sources."debug-4.3.3" @@ -7323,19 +7313,19 @@ let ]; }) sources."vue-hot-reload-api-2.3.4" - sources."vue-loader-15.10.0" + sources."vue-loader-15.10.1" sources."vue-meta-2.4.0" sources."vue-multiselect-2.1.6" sources."vue-resize-1.0.1" sources."vue-router-3.6.5" sources."vue-snotify-3.2.1" sources."vue-style-loader-4.1.3" - sources."vue-template-compiler-2.7.13" + sources."vue-template-compiler-2.7.14" sources."vue-template-es2015-compiler-1.9.1" sources."vuex-3.6.2" sources."watchpack-2.4.0" sources."wbuf-1.7.3" - sources."webpack-5.74.0" + sources."webpack-5.75.0" (sources."webpack-bundle-analyzer-4.7.0" // { dependencies = [ sources."ansi-styles-4.3.0" diff --git a/pkgs/applications/misc/ArchiSteamFarm/web-ui/update.sh b/pkgs/applications/misc/ArchiSteamFarm/web-ui/update.sh index 8a382ee25fb4..a0c296900e39 100755 --- a/pkgs/applications/misc/ArchiSteamFarm/web-ui/update.sh +++ b/pkgs/applications/misc/ArchiSteamFarm/web-ui/update.sh @@ -1,6 +1,6 @@ #!/usr/bin/env nix-shell -#! nix-shell -I nixpkgs=../../../../.. -i bash -p nodePackages.node2nix gnused jq curl -set -eoux pipefail +#! nix-shell -I nixpkgs=../../../.. -i bash -p nodePackages.node2nix gnused jq curl +set -eou pipefail cd "$(dirname "$0")" pushd ../../../../.. From 1b17afc853d46a9868653110a75591d2e24a0445 Mon Sep 17 00:00:00 2001 From: figsoda Date: Sat, 31 Dec 2022 15:57:54 -0500 Subject: [PATCH 13/33] star-history: 1.0.7 -> 1.0.8 --- pkgs/tools/misc/star-history/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/star-history/default.nix b/pkgs/tools/misc/star-history/default.nix index b10ce6a38cec..984adf51f5d2 100644 --- a/pkgs/tools/misc/star-history/default.nix +++ b/pkgs/tools/misc/star-history/default.nix @@ -9,14 +9,14 @@ rustPlatform.buildRustPackage rec { pname = "star-history"; - version = "1.0.7"; + version = "1.0.8"; src = fetchCrate { inherit pname version; - sha256 = "sha256-Cn05HX4GbHTwMwWxP3x0EtDEFqmn93eA+g4AXFFNNgE="; + sha256 = "sha256-ya2wUcO/2V/JHJ005p63j9Qu6oQehGYDhCYE7a5MBDA="; }; - cargoSha256 = "sha256-UnlTpuYoyvu3MK87zogwzmKhGJwIENws1Ak4VYnfTBI="; + cargoSha256 = "sha256-zmgOQNaodZrl/rsYOpv6nTu/IDaQYQ94jeUg3LOvvuA="; nativeBuildInputs = [ pkg-config ]; From fad9d559a3d2a5ed34a1cb841e3d4bc5f7081ae5 Mon Sep 17 00:00:00 2001 From: figsoda Date: Sat, 31 Dec 2022 20:07:08 -0500 Subject: [PATCH 14/33] nurl: 0.1.1 -> 0.2.1 Diff: https://github.com/nix-community/nurl/compare/v0.1.1...v0.2.1 Changelog: https://github.com/nix-community/nurl/blob/v0.2.1/CHANGELOG.md --- .../vim/plugins/nvim-treesitter/generated.nix | 8 +++++--- .../vim/plugins/nvim-treesitter/update.py | 7 ++++++- pkgs/tools/misc/nurl/default.nix | 16 ++++++++++++---- 3 files changed, 23 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix b/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix index ef31a552162c..74e519906d20 100644 --- a/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix +++ b/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix @@ -1,6 +1,6 @@ # generated by pkgs/applications/editors/vim/plugins/nvim-treesitter/update.py -{ buildGrammar, fetchFromGitHub, fetchFromGitLab, fetchFromSourcehut, fetchgit }: +{ buildGrammar, fetchFromBitbucket, fetchFromGitHub, fetchFromGitLab, fetchFromGitea, fetchFromGitiles, fetchFromRepoOrCz, fetchFromSourcehut, fetchgit }: { ada = buildGrammar { @@ -1371,8 +1371,10 @@ t32 = buildGrammar { language = "t32"; version = "f8106fc"; - source = fetchgit { - url = "https://codeberg.org/xasc/tree-sitter-t32"; + source = fetchFromGitea { + domain = "codeberg.org"; + owner = "xasc"; + repo = "tree-sitter-t32"; rev = "f8106fcf5a27f905b3d9d55d9cd3e910bea70c60"; hash = "sha256-hKddSekx67Yqm4+LqVaH8Sf1+73RlCnXE6th2FTHB34="; }; diff --git a/pkgs/applications/editors/vim/plugins/nvim-treesitter/update.py b/pkgs/applications/editors/vim/plugins/nvim-treesitter/update.py index 416a6d7f96a8..6b297cd59157 100755 --- a/pkgs/applications/editors/vim/plugins/nvim-treesitter/update.py +++ b/pkgs/applications/editors/vim/plugins/nvim-treesitter/update.py @@ -60,7 +60,12 @@ def generate_grammar(item): generated_file = """# generated by pkgs/applications/editors/vim/plugins/nvim-treesitter/update.py -{ buildGrammar, fetchFromGitHub, fetchFromGitLab, fetchFromSourcehut, fetchgit }: +{ buildGrammar""" + +for fetcher in subprocess.check_output(["nurl", "-L"], text=True).splitlines(): + generated_file += f", {fetcher}" + +generated_file += """ }: { """ diff --git a/pkgs/tools/misc/nurl/default.nix b/pkgs/tools/misc/nurl/default.nix index f52ecf18b8cf..bf8e75deb6e1 100644 --- a/pkgs/tools/misc/nurl/default.nix +++ b/pkgs/tools/misc/nurl/default.nix @@ -1,6 +1,7 @@ { lib , rustPlatform , fetchFromGitHub +, installShellFiles , makeWrapper , gitMinimal , mercurial @@ -9,24 +10,31 @@ rustPlatform.buildRustPackage rec { pname = "nurl"; - version = "0.1.1"; + version = "0.2.1"; src = fetchFromGitHub { owner = "nix-community"; repo = "nurl"; rev = "v${version}"; - hash = "sha256-dN53Xpb3zOVI6Xpi+RRFQPLIMP3+ATMXpYpFGgFpzPw="; + hash = "sha256-bL0HNoHHFH7ouw4gFl0QJCjAOCzHPnTS76OmrgQN3V4="; }; - cargoSha256 = "sha256-bdxHxLUeIPlRw7NKg0nTaDAkQam80eepqbuAmFVIMNs="; + cargoSha256 = "sha256-UfJeYAN1f/JvPpEKzlG2BzUulreDqv3NEnSoOb2TlM0="; - nativeBuildInputs = [ makeWrapper ]; + nativeBuildInputs = [ + installShellFiles + makeWrapper + ]; postInstall = '' wrapProgram $out/bin/nurl \ --prefix PATH : ${lib.makeBinPath [ gitMinimal mercurial nix ]} + installManPage artifacts/nurl.1 + installShellCompletion artifacts/nurl.{bash,fish} --zsh artifacts/_nurl ''; + GEN_ARTIFACTS = "artifacts"; + meta = with lib; { description = "Command-line tool to generate Nix fetcher calls from repository URLs"; homepage = "https://github.com/nix-community/nurl"; From 8c94b2899674790edf724fe2991b375aa94909e1 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Sun, 1 Jan 2023 11:59:36 +0100 Subject: [PATCH 15/33] ares: fix build on darwin --- pkgs/applications/emulators/bsnes/ares/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/applications/emulators/bsnes/ares/default.nix b/pkgs/applications/emulators/bsnes/ares/default.nix index 96fc5c76d2f9..36d2dfe1ff33 100644 --- a/pkgs/applications/emulators/bsnes/ares/default.nix +++ b/pkgs/applications/emulators/bsnes/ares/default.nix @@ -2,6 +2,7 @@ , stdenv , fetchFromGitHub , pkg-config +, which , wrapGAppsHook , libicns , SDL2 @@ -42,6 +43,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ pkg-config + which wrapGAppsHook ] ++ lib.optionals stdenv.isDarwin [ libicns @@ -72,6 +74,7 @@ stdenv.mkDerivation (finalAttrs: { "hiro=gtk3" ] ++ lib.optionals stdenv.isDarwin [ "hiro=cocoa" + "lto=false" "vulkan=false" ] ++ [ "local=false" From 3a68bc8b9e92f303691df830b371e3af2b2641b2 Mon Sep 17 00:00:00 2001 From: lom Date: Sun, 1 Jan 2023 11:36:38 -0500 Subject: [PATCH 16/33] wiki-tui: 0.6.0 -> 0.6.1 --- pkgs/misc/wiki-tui/default.nix | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/pkgs/misc/wiki-tui/default.nix b/pkgs/misc/wiki-tui/default.nix index ae249eb9292e..51952245f6a0 100644 --- a/pkgs/misc/wiki-tui/default.nix +++ b/pkgs/misc/wiki-tui/default.nix @@ -2,23 +2,20 @@ rustPlatform.buildRustPackage rec { pname = "wiki-tui"; - version = "0.6.0"; + version = "0.6.1"; src = fetchFromGitHub { owner = "Builditluc"; repo = pname; rev = "v${version}"; - sha256 = "sha256-sqkVi8w4QoktC1ZLUPHzfMUxIzCadcIj3dEYigz854U="; + sha256 = "sha256-WiyRBF3rWLpOZ8mxT89ImRL++Oq9+b88oSKjr4tzCGs="; }; buildInputs = [ ncurses openssl ] ++ lib.optional stdenv.isDarwin Security; nativeBuildInputs = [ pkg-config ]; - cargoSha256 = "sha256-xRj0bF5VymvFVB0tSBndWA+OHBIEY2/ovRIBdDoOHA4="; - - # Tests fail with this error: `found argument --test-threads which was not expected` - doCheck = false; + cargoSha256 = "sha256-R9xxIDqkU7FeulpD7PUM6aHgA67PVgqxHKYtdrjdaUo="; meta = with lib; { description = "A simple and easy to use Wikipedia Text User Interface"; From e6221703364a62dc078c439af179bd70445ede46 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 1 Jan 2023 18:34:59 +0100 Subject: [PATCH 17/33] wiki-tui: add changelog to meta --- pkgs/misc/wiki-tui/default.nix | 26 +++++++++++++++++++++----- 1 file changed, 21 insertions(+), 5 deletions(-) diff --git a/pkgs/misc/wiki-tui/default.nix b/pkgs/misc/wiki-tui/default.nix index 51952245f6a0..9131f66491d5 100644 --- a/pkgs/misc/wiki-tui/default.nix +++ b/pkgs/misc/wiki-tui/default.nix @@ -1,4 +1,12 @@ -{ lib, rustPlatform, fetchFromGitHub, ncurses, openssl, pkg-config, stdenv, Security, fetchpatch }: +{ lib +, stdenv +, rustPlatform +, fetchFromGitHub +, ncurses +, openssl +, pkg-config +, Security +}: rustPlatform.buildRustPackage rec { pname = "wiki-tui"; @@ -8,18 +16,26 @@ rustPlatform.buildRustPackage rec { owner = "Builditluc"; repo = pname; rev = "v${version}"; - sha256 = "sha256-WiyRBF3rWLpOZ8mxT89ImRL++Oq9+b88oSKjr4tzCGs="; + hash = "sha256-WiyRBF3rWLpOZ8mxT89ImRL++Oq9+b88oSKjr4tzCGs="; }; - buildInputs = [ ncurses openssl ] ++ lib.optional stdenv.isDarwin Security; + nativeBuildInputs = [ + pkg-config + ]; - nativeBuildInputs = [ pkg-config ]; + buildInputs = [ + ncurses + openssl + ] ++ lib.optional stdenv.isDarwin [ + Security + ]; - cargoSha256 = "sha256-R9xxIDqkU7FeulpD7PUM6aHgA67PVgqxHKYtdrjdaUo="; + cargoHash = "sha256-R9xxIDqkU7FeulpD7PUM6aHgA67PVgqxHKYtdrjdaUo="; meta = with lib; { description = "A simple and easy to use Wikipedia Text User Interface"; homepage = "https://github.com/builditluc/wiki-tui"; + changelog = "https://github.com/Builditluc/wiki-tui/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ lom builditluc ]; }; From 0e9fae2a3d7403e1f13aec610846b9d1d3f4928f Mon Sep 17 00:00:00 2001 From: figsoda Date: Sun, 1 Jan 2023 12:50:05 -0500 Subject: [PATCH 18/33] nil: 2022-12-01 -> 2023-01-01 Diff: https://github.com/oxalica/nil/compare/2022-12-01...2023-01-01 Changelog: https://github.com/oxalica/nil/releases/tag/2023-01-01 --- pkgs/development/tools/language-servers/nil/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/language-servers/nil/default.nix b/pkgs/development/tools/language-servers/nil/default.nix index 2f434436226c..22f1e98f1826 100644 --- a/pkgs/development/tools/language-servers/nil/default.nix +++ b/pkgs/development/tools/language-servers/nil/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "nil"; - version = "2022-12-01"; + version = "2023-01-01"; src = fetchFromGitHub { owner = "oxalica"; repo = pname; rev = version; - hash = "sha256-E/QGmoL7Q3GDR2/I5o2CAMHMcmPQEJAySke1s+nOaho="; + hash = "sha256-xpNlmGG7Qy0SPzXZ9sQ0i9Yo2hMaK+YsTEOTk10rs+k="; }; - cargoHash = "sha256-T3i86L6cF6uFbSs7xtKHGzB6XrE9jn2RZghxFzDleXU="; + cargoHash = "sha256-mwfM3hIEaHKa2oPVWzXpua+W2Oa5brvNRbRCcV0KapY="; CFG_DATE = version; CFG_REV = "release"; @@ -25,6 +25,7 @@ rustPlatform.buildRustPackage rec { meta = with lib; { description = "Yet another language server for Nix"; homepage = "https://github.com/oxalica/nil"; + changelog = "https://github.com/oxalica/nil/releases/tag/${version}"; license = with licenses; [ mit asl20 ]; maintainers = with maintainers; [ figsoda oxalica ]; }; From 2068a9fee3544412bd73d00a877588ce831600d2 Mon Sep 17 00:00:00 2001 From: Tomo <68489118+Tomodachi94@users.noreply.github.com> Date: Sun, 1 Jan 2023 10:30:23 -0800 Subject: [PATCH 19/33] vimPlugins: update --- .../editors/vim/plugins/generated.nix | 510 +++++++++--------- 1 file changed, 255 insertions(+), 255 deletions(-) diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index 2d5842b5eb41..4496e5b6e2fc 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -29,12 +29,12 @@ final: prev: ChatGPT-nvim = buildVimPluginFrom2Nix { pname = "ChatGPT.nvim"; - version = "2022-12-23"; + version = "2022-12-28"; src = fetchFromGitHub { owner = "jackMort"; repo = "ChatGPT.nvim"; - rev = "c1198dd914bfe7af1754c67beff441b0475e51ee"; - sha256 = "17nil4vnlvq6qmsgmbrn0ci48p2pfyv1wf2p31da2ld3hjp52wbm"; + rev = "6c7e326add8fbb8c6662d92dd6bd9e1eb15f7c5a"; + sha256 = "1lfq402h6z9y371yi11k2q19kii72xvfl540h2931w0hwdq6w5vj"; }; meta.homepage = "https://github.com/jackMort/ChatGPT.nvim/"; }; @@ -65,12 +65,12 @@ final: prev: Coqtail = buildVimPluginFrom2Nix { pname = "Coqtail"; - version = "2022-11-29"; + version = "2022-12-30"; src = fetchFromGitHub { owner = "whonore"; repo = "Coqtail"; - rev = "1704623395dbd6b42d999d378f14887aa6a8e704"; - sha256 = "0bkvrhpbisrn5bvpy7aknzr0b8c4hppszv82iiqmag9y380gkxqp"; + rev = "4ba9154caafe707c95d438681da4eb4774380024"; + sha256 = "11c39hjpn9i3d74wqnqczcx9bysgaj3wjkb8y86b312kpi4r2agh"; }; meta.homepage = "https://github.com/whonore/Coqtail/"; }; @@ -293,12 +293,12 @@ final: prev: SchemaStore-nvim = buildVimPluginFrom2Nix { pname = "SchemaStore.nvim"; - version = "2022-12-24"; + version = "2023-01-01"; src = fetchFromGitHub { owner = "b0o"; repo = "SchemaStore.nvim"; - rev = "ceebc0d0e5f6fe48c7739331e05c3843c07ade37"; - sha256 = "04zwi4k8ldqy02xkqwpdbicpr5mpnz1l6p4ykwhjvzyjsjl782i9"; + rev = "99cdee23ff1343da67c37b4dffb0821a8fdf82a6"; + sha256 = "0g6vwqhsnfdm0a80mvjx2285m8zj6m607b62gd7sajc3l10rfja7"; }; meta.homepage = "https://github.com/b0o/SchemaStore.nvim/"; }; @@ -353,12 +353,12 @@ final: prev: SpaceVim = buildVimPluginFrom2Nix { pname = "SpaceVim"; - version = "2022-11-29"; + version = "2022-12-28"; src = fetchFromGitHub { owner = "SpaceVim"; repo = "SpaceVim"; - rev = "3ac0fe27ccc0bebbcdc419de7654e06a41b7c803"; - sha256 = "17s5gfscg6bvaks7d7dgsaf04y6rall4hcicvi02im9iwm49srdh"; + rev = "9e80d9bbfad057cd8c056523ac18571083461ef0"; + sha256 = "0488ps030wvjpx99dxnw53867cd86pb073c5f5aynhyc5l0rlgwj"; }; meta.homepage = "https://github.com/SpaceVim/SpaceVim/"; }; @@ -498,12 +498,12 @@ final: prev: aerial-nvim = buildVimPluginFrom2Nix { pname = "aerial.nvim"; - version = "2022-12-15"; + version = "2022-12-30"; src = fetchFromGitHub { owner = "stevearc"; repo = "aerial.nvim"; - rev = "086e1904e51fc559673598afbc59842db7981501"; - sha256 = "05ihib3wxjgcvfzg8hldw005iirwglnfzhikf91g3x2yhznmp8g4"; + rev = "6050ff7130885913ea7a48f882fe3f94d46a23cf"; + sha256 = "0fzah8vfjszngp46f1l3qbiyclyr993mqyjz82d4cf0sa53q5hkw"; fetchSubmodules = true; }; meta.homepage = "https://github.com/stevearc/aerial.nvim/"; @@ -535,12 +535,12 @@ final: prev: ai-vim = buildVimPluginFrom2Nix { pname = "ai.vim"; - version = "2022-12-16"; + version = "2023-01-01"; src = fetchFromGitHub { owner = "aduros"; repo = "ai.vim"; - rev = "b5098a1d70be968444b6f3d9441443af3e357035"; - sha256 = "1hx4zilzc0vf62hiwk3qgyn12mjs8fw0wq1fw9g1v3k9v512z4fb"; + rev = "0b51fe22cc9bbf2c4af1907a2b94d5f243fae03b"; + sha256 = "11msn4374yklqg0sr6cm26mj6zbi4n6kc7mj64ldvr3hiwfsh9hy"; }; meta.homepage = "https://github.com/aduros/ai.vim/"; }; @@ -559,12 +559,12 @@ final: prev: ale = buildVimPluginFrom2Nix { pname = "ale"; - version = "2022-12-25"; + version = "2022-12-31"; src = fetchFromGitHub { owner = "dense-analysis"; repo = "ale"; - rev = "522b5d0433ba8c29f2f154f62184e34c2e5f301f"; - sha256 = "1h9xwjxnlkjrmhz1ixpshf7qhpl09ny8ynfbdcfzhzdm9aq8yra6"; + rev = "4872ce2ab430ddfcb123e45dab42778e5a188c63"; + sha256 = "1g8802nkcgflhzk106g9ly0h8rs53lqsli2qy449p2ivrapdw7bq"; }; meta.homepage = "https://github.com/dense-analysis/ale/"; }; @@ -823,24 +823,24 @@ final: prev: barbar-nvim = buildVimPluginFrom2Nix { pname = "barbar.nvim"; - version = "2022-12-16"; + version = "2022-12-31"; src = fetchFromGitHub { owner = "romgrk"; repo = "barbar.nvim"; - rev = "de30eb4b095c7f1ae51fbcc0d01e8671e80f6b0b"; - sha256 = "0f2p62xxmisc2dxc4anfqxl700vjs0lp2vghc4xfpv07zw6dcb5j"; + rev = "e773abf71973422dc8333bec9f7930674b3ab7bd"; + sha256 = "1rq3hixp11g67g5qhwaxpnfnblsrsfnww6ynf3k3p16k8nrxdsd5"; }; meta.homepage = "https://github.com/romgrk/barbar.nvim/"; }; barbecue-nvim = buildVimPluginFrom2Nix { pname = "barbecue.nvim"; - version = "2022-12-23"; + version = "2022-12-31"; src = fetchFromGitHub { owner = "utilyre"; repo = "barbecue.nvim"; - rev = "894bd7a132832bba4d09155567f9e8114d9cc8d4"; - sha256 = "1xabr17md3hwjs92rcaxqhm60hl3pfz0kzj3i966z6vqs9dfnzmb"; + rev = "95f145a9445df954918e3751dd51ba2446606a31"; + sha256 = "1vv4pp02znww3kmwn0y9j8xds6z83cfbv4mr1fcw8qj2k6f76h2r"; }; meta.homepage = "https://github.com/utilyre/barbecue.nvim/"; }; @@ -1567,12 +1567,12 @@ final: prev: cmp-tabnine = buildVimPluginFrom2Nix { pname = "cmp-tabnine"; - version = "2022-12-25"; + version = "2022-12-27"; src = fetchFromGitHub { owner = "tzachar"; repo = "cmp-tabnine"; - rev = "e9603484cb1937fb84ace447a8d5cb467f9aab45"; - sha256 = "0s73ys2dz0scf62zjkxb8lgyzh3x6am7w5z4pb1xq0h9gk5ip2ll"; + rev = "ee1341c53e7b82f55c6e83287828f652c2ac35e1"; + sha256 = "0x61dhbx1wvbnf1pjz1an3zhmp25xy07wshw8dw5yf46qi623l09"; }; meta.homepage = "https://github.com/tzachar/cmp-tabnine/"; }; @@ -1843,12 +1843,12 @@ final: prev: comment-nvim = buildVimPluginFrom2Nix { pname = "comment.nvim"; - version = "2022-12-25"; + version = "2022-12-30"; src = fetchFromGitHub { owner = "numtostr"; repo = "comment.nvim"; - rev = "45dc21a71ad1450606f5e98261badb28db59d74c"; - sha256 = "05278b42qwm77svl3k2a17vsdlmfjknlwkx01x80na9sciav07mz"; + rev = "7bb563ff2d811a63b207e9de63e3e9c0877cb6d5"; + sha256 = "0f2jsw3xydnc79mfmqsihwaayjf3xjbdvyi50sy06sm8jxp44d9x"; }; meta.homepage = "https://github.com/numtostr/comment.nvim/"; }; @@ -1915,12 +1915,12 @@ final: prev: compiler-explorer-nvim = buildVimPluginFrom2Nix { pname = "compiler-explorer.nvim"; - version = "2022-11-07"; + version = "2022-12-27"; src = fetchFromGitHub { owner = "krady21"; repo = "compiler-explorer.nvim"; - rev = "ab94958b819916a40770f9088db3a33336545dce"; - sha256 = "1pf26fw667rj5fzjrx3zkpz247i7y78wvrrl3b04jz581s4x5rrk"; + rev = "761db3a6f7398ebd472b220b5f4b2937bd0e1c82"; + sha256 = "09ndppr7vsv68775ink316a78ygr02rp10marmrv138wvsbx3ka5"; }; meta.homepage = "https://github.com/krady21/compiler-explorer.nvim/"; }; @@ -2239,12 +2239,12 @@ final: prev: dashboard-nvim = buildVimPluginFrom2Nix { pname = "dashboard-nvim"; - version = "2022-12-20"; + version = "2022-12-31"; src = fetchFromGitHub { owner = "glepnir"; repo = "dashboard-nvim"; - rev = "115b9f9cec10e31aff39c077bf5a4881bc840916"; - sha256 = "0xvwsk6sl2yikppmx962hvgziib3wyybp1z528zvrl7a4xrfwx9n"; + rev = "e517188dab55493fb9034b4d4f1a508ccacfcd45"; + sha256 = "1r51idix6yicy3ycm1f6sp0cjc7hklwrnipl8hkmcryny49zcdvf"; }; meta.homepage = "https://github.com/glepnir/dashboard-nvim/"; }; @@ -2625,12 +2625,12 @@ final: prev: diffview-nvim = buildVimPluginFrom2Nix { pname = "diffview.nvim"; - version = "2022-12-21"; + version = "2022-12-28"; src = fetchFromGitHub { owner = "sindrets"; repo = "diffview.nvim"; - rev = "3812e296d3977a24db62f7c18025755b40968d3a"; - sha256 = "0xqpbsv2pahdc4zxqwkv9r6n5vm3g0c60q3klg96k7cn737k8cyn"; + rev = "18f83302f71889b39403919b8be00d7244d1fcfc"; + sha256 = "0jz3q7gzz0ybnnpdw6sr1n1i9q3yys653xv3icphh40rr75whq72"; }; meta.homepage = "https://github.com/sindrets/diffview.nvim/"; }; @@ -2697,12 +2697,12 @@ final: prev: edge = buildVimPluginFrom2Nix { pname = "edge"; - version = "2022-12-23"; + version = "2022-12-31"; src = fetchFromGitHub { owner = "sainnhe"; repo = "edge"; - rev = "255b8a1e6c3c2a24afb625274dd61a08edcf2db6"; - sha256 = "0lp6fiyv4b289qn0835sznva59515vwih4xp0mbfnp6n5fv8c811"; + rev = "316a2d93c02332e17815d5540404465ae790f56a"; + sha256 = "04pgxik7qag82z61fzdxkl0j5hz7jlvm84adwfknx4sz7wjbs3gl"; }; meta.homepage = "https://github.com/sainnhe/edge/"; }; @@ -2988,12 +2988,12 @@ final: prev: flutter-tools-nvim = buildVimPluginFrom2Nix { pname = "flutter-tools.nvim"; - version = "2022-11-17"; + version = "2023-01-01"; src = fetchFromGitHub { owner = "akinsho"; repo = "flutter-tools.nvim"; - rev = "b666a057108c7655882cbc64217222228aad68da"; - sha256 = "0m2zmpcnv3zbjq83v0qfbqa7wvmhdscrsyfs9kr0yq3rfb7bmpzz"; + rev = "ae0be3cef35c0cb41d6c7f814a19b3402d50fd7a"; + sha256 = "0ynidizghmbrapcm2wrn6cjmn28gvzkxc1ia9s8nmh63574prfrv"; }; meta.homepage = "https://github.com/akinsho/flutter-tools.nvim/"; }; @@ -3096,12 +3096,12 @@ final: prev: fzf-checkout-vim = buildVimPluginFrom2Nix { pname = "fzf-checkout.vim"; - version = "2021-06-25"; + version = "2022-12-27"; src = fetchFromGitHub { owner = "stsewd"; repo = "fzf-checkout.vim"; - rev = "4d5ecae74460de8fed4f743f6bd53c4c31d32797"; - sha256 = "0mia7p2z8l3lrid0v8ml4i8y190gh4ll9898yyg4gcghhxp83zpm"; + rev = "00d953bbe2fba8d816f61bfe675070d4505f7a4f"; + sha256 = "0c5k4l2glvs23z6f9pynsxjdc8ascbgngvrqncbnsp0djs8wgasj"; }; meta.homepage = "https://github.com/stsewd/fzf-checkout.vim/"; }; @@ -3132,24 +3132,24 @@ final: prev: fzf-lua = buildVimPluginFrom2Nix { pname = "fzf-lua"; - version = "2022-12-21"; + version = "2022-12-31"; src = fetchFromGitHub { owner = "ibhagwan"; repo = "fzf-lua"; - rev = "5abf66f63bf08121dd4e917488b59ccb693eee12"; - sha256 = "0nf3gqvzsk4cda5r0afa979cxfsjq9smy4dyjpw2dhyxrm32a5cc"; + rev = "7bb05a75eb04d3b7b74df0698a146c62877fc456"; + sha256 = "17c7jajz6cbwwrw0gvddj643kls9bq70s3daha0ih95bkw5jcaha"; }; meta.homepage = "https://github.com/ibhagwan/fzf-lua/"; }; fzf-vim = buildVimPluginFrom2Nix { pname = "fzf.vim"; - version = "2022-12-24"; + version = "2022-12-31"; src = fetchFromGitHub { owner = "junegunn"; repo = "fzf.vim"; - rev = "fd7fab77b20fdf09180cabdd660d8c3b7fe7ca1a"; - sha256 = "1shljxj04vrifkrqk5mzldl5qwxf196h01bvxpa03kf20yl39wvd"; + rev = "0f03107bc94b31a9c7adcee6da8e5de7492e4b0b"; + sha256 = "1fql2wcmc7c6lh2vsbb199q4isjz8ghd5a5fhcyiay5fl9rwgzw9"; }; meta.homepage = "https://github.com/junegunn/fzf.vim/"; }; @@ -3372,12 +3372,12 @@ final: prev: goto-preview = buildVimPluginFrom2Nix { pname = "goto-preview"; - version = "2022-12-19"; + version = "2022-12-31"; src = fetchFromGitHub { owner = "rmagatti"; repo = "goto-preview"; - rev = "de58c6538f6625de52e40442337fda00e77d17b3"; - sha256 = "0a44hsww02m6dc7sfqq81wks5hy7yd12rcz9jl576ris4r960vp3"; + rev = "54a5e18f6a42b39021b7aef62aae4dda8680d666"; + sha256 = "1bbrjmywbdggl4l7mzg7fahp86qwr0gi4nw2b8arpj2cr8r9hy9f"; }; meta.homepage = "https://github.com/rmagatti/goto-preview/"; }; @@ -3444,12 +3444,12 @@ final: prev: gruvbox-material = buildVimPluginFrom2Nix { pname = "gruvbox-material"; - version = "2022-12-21"; + version = "2022-12-27"; src = fetchFromGitHub { owner = "sainnhe"; repo = "gruvbox-material"; - rev = "f4b9fd3b4795fe138aea93dd098112442108d277"; - sha256 = "13nphydsbp8vldjfffxc6l5x818lb3ciamiidf77nij50pi6dyx3"; + rev = "3ac46b45892fb4a641c1462947d3b1ad0b283981"; + sha256 = "08wrp6awi9b01sw7nayq9rsjqn9r6h4lxys2krmb57p7yc2j3da6"; }; meta.homepage = "https://github.com/sainnhe/gruvbox-material/"; }; @@ -3527,12 +3527,12 @@ final: prev: haskell-tools-nvim = buildVimPluginFrom2Nix { pname = "haskell-tools.nvim"; - version = "2022-12-25"; + version = "2023-01-01"; src = fetchFromGitHub { owner = "MrcJkb"; repo = "haskell-tools.nvim"; - rev = "7d771612036ffded31a80e34daa048e060566f9d"; - sha256 = "1rz9csy28bljyy5aad73iblqqa8f8kwsb9gklqpcfhzi628pp2bj"; + rev = "ad0f38f8c1a2cabc155ef9c7f6065578150edbe8"; + sha256 = "1p0iinpzfhsh79kcxihs8zrzdzragvg93i73z3y33k7nrbqhplk8"; }; meta.homepage = "https://github.com/MrcJkb/haskell-tools.nvim/"; }; @@ -3730,12 +3730,12 @@ final: prev: impatient-nvim = buildVimPluginFrom2Nix { pname = "impatient.nvim"; - version = "2022-12-15"; + version = "2022-12-28"; src = fetchFromGitHub { owner = "lewis6991"; repo = "impatient.nvim"; - rev = "9f7eed8133d62457f7ad2ca250eb9b837a4adeb7"; - sha256 = "0kzghqbidarjabmn1i0vwkz3jfnwpfzj36ild15y77l673acwdcj"; + rev = "c90e273f7b8c50a02f956c24ce4804a47f18162e"; + sha256 = "1cd1l55lax3938ym0kpwz0gpzmfi8rxq8rgl3l8vhq9frlaqyn53"; }; meta.homepage = "https://github.com/lewis6991/impatient.nvim/"; }; @@ -3898,12 +3898,12 @@ final: prev: jedi-vim = buildVimPluginFrom2Nix { pname = "jedi-vim"; - version = "2022-12-24"; + version = "2022-12-28"; src = fetchFromGitHub { owner = "davidhalter"; repo = "jedi-vim"; - rev = "e07338597639f08fc4ef0f1d55f401ce5da5ef9f"; - sha256 = "0qavd22pn2k42279cxpr5ayafw6f7cxlq32yixiik53zbx2zm9rd"; + rev = "be483a2dcb63e992b02c5a0faff5d555720246fc"; + sha256 = "0ir2n9prdi50lvxrc23ya6pzmdp6fw1rdlls41zh0qbah0681yc3"; fetchSubmodules = true; }; meta.homepage = "https://github.com/davidhalter/jedi-vim/"; @@ -3971,12 +3971,12 @@ final: prev: kanagawa-nvim = buildVimPluginFrom2Nix { pname = "kanagawa.nvim"; - version = "2022-11-23"; + version = "2022-12-29"; src = fetchFromGitHub { owner = "rebelot"; repo = "kanagawa.nvim"; - rev = "fb733c1043a462155b52cd97efd920f1dd72d33a"; - sha256 = "1spaavmjxfnm30ks0c46i95zck967xl00cnzyclf3l8k0mzmq6kk"; + rev = "c9fc16815fc9b195882e40c881fb590eda4e8ecf"; + sha256 = "0n1di8nw045qccq54ix3d6swprq0vaflqm94hk3bk4clwzi9b2sc"; }; meta.homepage = "https://github.com/rebelot/kanagawa.nvim/"; }; @@ -4007,12 +4007,12 @@ final: prev: kotlin-vim = buildVimPluginFrom2Nix { pname = "kotlin-vim"; - version = "2022-06-27"; + version = "2022-12-30"; src = fetchFromGitHub { owner = "udalov"; repo = "kotlin-vim"; - rev = "1261f851e5fb2192b3a5e1691650597c71dfce2f"; - sha256 = "0ly58dcxgwyfv5wdbi5i4g187zv6gw3bzxck0402jwadvxnq7x6d"; + rev = "53fe045906df8eeb07cb77b078fc93acda6c90b8"; + sha256 = "1fpfbjrh7k0g9bwji3r5snpjfwg0as937xy7k6hdsvrifkd2fb0j"; }; meta.homepage = "https://github.com/udalov/kotlin-vim/"; }; @@ -4067,12 +4067,12 @@ final: prev: lazy-nvim = buildVimPluginFrom2Nix { pname = "lazy.nvim"; - version = "2022-12-25"; + version = "2023-01-01"; src = fetchFromGitHub { owner = "folke"; repo = "lazy.nvim"; - rev = "6c5af82589f846a773ac2e8ed44f7479fb28a870"; - sha256 = "11256cyja2nc0lv2cdsl1s88l4s3vjx72f181hh1pzq2ml9z2b77"; + rev = "11eee43c7ee63a71b08009769437e8a10814a48c"; + sha256 = "1swinq9dv3iix3g34a0f4bkc2dkd4y6vl23r90lqccmnlfm6h72v"; }; meta.homepage = "https://github.com/folke/lazy.nvim/"; }; @@ -4127,24 +4127,24 @@ final: prev: leap-nvim = buildVimPluginFrom2Nix { pname = "leap.nvim"; - version = "2022-12-17"; + version = "2022-12-27"; src = fetchFromGitHub { owner = "ggandor"; repo = "leap.nvim"; - rev = "a5c9504290832e6bdbbb6265fd1ff02fc6485d20"; - sha256 = "1iz0h1nbsgyfmfdagpsg16drwqvclwciihky9ynr5kwxcsc60f88"; + rev = "e0145906c5f004b23eb6ec876fad55ffd3382ec9"; + sha256 = "1qb2rdkmrh3bw7wwkya5ndsn15s5j0hrpr6azknqqgkg8hkgcchc"; }; meta.homepage = "https://github.com/ggandor/leap.nvim/"; }; legendary-nvim = buildVimPluginFrom2Nix { pname = "legendary.nvim"; - version = "2022-12-22"; + version = "2022-12-27"; src = fetchFromGitHub { owner = "mrjones2014"; repo = "legendary.nvim"; - rev = "f53ef425b1b6cb9dc907a054755138345fd2fd57"; - sha256 = "1jyakdsn285l7mqxvr80sd4p175s17xd44pslqmgippwqbdgj8ns"; + rev = "756fd2220ebc7893f10b9957a2205e3cf55cdb37"; + sha256 = "1fl9ax8sz5jfyhzyddbhgw3maf2k4ifalwhng8iirlmsyaixfmaf"; }; meta.homepage = "https://github.com/mrjones2014/legendary.nvim/"; }; @@ -4558,12 +4558,12 @@ final: prev: lualine-nvim = buildVimPluginFrom2Nix { pname = "lualine.nvim"; - version = "2022-12-22"; + version = "2022-12-28"; src = fetchFromGitHub { owner = "nvim-lualine"; repo = "lualine.nvim"; - rev = "fffbcb829288c3ca366f17cdb8d46aefb5c1d6f3"; - sha256 = "08yz4p6y5pg8ak4dkpggsk89n6f6lv78rglh1q88zh5ymjbqs8mv"; + rev = "32a7382a75a52e8ad05f4cec7eeb8bbfbe80d461"; + sha256 = "1d83w3w9pxkdki6bp7wxphnm6473kpsv6fkj26qsxqzisqcsfvl2"; }; meta.homepage = "https://github.com/nvim-lualine/lualine.nvim/"; }; @@ -4691,12 +4691,12 @@ final: prev: mini-nvim = buildVimPluginFrom2Nix { pname = "mini.nvim"; - version = "2022-12-25"; + version = "2022-12-30"; src = fetchFromGitHub { owner = "echasnovski"; repo = "mini.nvim"; - rev = "37e48cc5467fc695730d975bf269b10cc90bd3a3"; - sha256 = "1zqajz99pp3nx60d95kgy3924af1daj81r81yzpj187a2s0vdy4c"; + rev = "06eddfd8d6341e6c4f53ec9ae109a376a566329d"; + sha256 = "19q7khrgkc2214gjn988dlviavpf7ry695h9x077a1ykkml5jxfm"; }; meta.homepage = "https://github.com/echasnovski/mini.nvim/"; }; @@ -5027,12 +5027,12 @@ final: prev: neo-tree-nvim = buildVimPluginFrom2Nix { pname = "neo-tree.nvim"; - version = "2022-12-17"; + version = "2022-12-26"; src = fetchFromGitHub { owner = "nvim-neo-tree"; repo = "neo-tree.nvim"; - rev = "73a90f6a736b51168ed05d89ed8872f75b98471c"; - sha256 = "0dpss9ydw3z8dkmjjagn799347svlw8yyp72h77z30k7awlcwqpx"; + rev = "3b41f0d17139bb156f1acd907608f63e0e307caf"; + sha256 = "1lvhkqvzrlw6fskbrpgy5mf110jjibc1r2g67pfi12ppcmxpzqry"; }; meta.homepage = "https://github.com/nvim-neo-tree/neo-tree.nvim/"; }; @@ -5051,12 +5051,12 @@ final: prev: neoconf-nvim = buildVimPluginFrom2Nix { pname = "neoconf.nvim"; - version = "2022-12-24"; + version = "2023-01-01"; src = fetchFromGitHub { owner = "folke"; repo = "neoconf.nvim"; - rev = "dd35a9b9172ae0f87eb407111dec754cf321002a"; - sha256 = "0ly5bx508iar3qgc6gx79hca9s47wd13d9pyr9h0xryqyrgsm027"; + rev = "02eef4955474c026ae425d8888b17e036d93c4c2"; + sha256 = "0w8dd3mzbhvfhyg7qdr97k4wsih81li6pzj19qp36220lzz6a3j7"; }; meta.homepage = "https://github.com/folke/neoconf.nvim/"; }; @@ -5075,12 +5075,12 @@ final: prev: neodev-nvim = buildVimPluginFrom2Nix { pname = "neodev.nvim"; - version = "2022-12-21"; + version = "2022-12-28"; src = fetchFromGitHub { owner = "folke"; repo = "neodev.nvim"; - rev = "c5f0a814abf89b5b1e3cfed95322813939bdc0c5"; - sha256 = "0aji887c2rmn9286jdx5wf1nj4gpyr0n1aar7rwx77k4va5fm06a"; + rev = "8e06acf88e0621badd9499cfcafbce5ca97dfe8e"; + sha256 = "1s09id5l0580ckrn7srkq8d2n0mg75dph3zknwb5wig3k11yajhz"; }; meta.homepage = "https://github.com/folke/neodev.nvim/"; }; @@ -5219,36 +5219,36 @@ final: prev: neotest = buildVimPluginFrom2Nix { pname = "neotest"; - version = "2022-12-15"; + version = "2022-12-31"; src = fetchFromGitHub { owner = "nvim-neotest"; repo = "neotest"; - rev = "de2f68fb13a05c361e0c096e167f7f79712f3a5c"; - sha256 = "1wxm69zpglm504jjcqg7v4bcqi1a81w0b4m0rvdv84yidi5nfm4c"; + rev = "414b43f99da0a827c3ce897161fc67c3bb6a5d83"; + sha256 = "14xjz0yav5idjm24b8l7zqlgralfhhbzgycaxybzlh9ndn7ldhni"; }; meta.homepage = "https://github.com/nvim-neotest/neotest/"; }; neotest-haskell = buildVimPluginFrom2Nix { pname = "neotest-haskell"; - version = "2022-11-23"; + version = "2022-12-28"; src = fetchFromGitHub { owner = "MrcJkb"; repo = "neotest-haskell"; - rev = "412f498d25592d57932baa938857ef542754191b"; - sha256 = "1ml10rfwm7icvvyc0zcfjnhfdnqashh94xv7yrjg4rrqfiph2zyd"; + rev = "7a3a6fcf2bde2a98b2d221bf54162eef2e09eb50"; + sha256 = "1i99x9d6kqd8qrvy3si2h4mk3d5akqjibs006wf7fp2gr7fivvkc"; }; meta.homepage = "https://github.com/MrcJkb/neotest-haskell/"; }; neovim-ayu = buildVimPluginFrom2Nix { pname = "neovim-ayu"; - version = "2022-11-19"; + version = "2023-01-01"; src = fetchFromGitHub { owner = "Shatur"; repo = "neovim-ayu"; - rev = "5af91fe1176e764f7706b11b43793f31635e9520"; - sha256 = "161s84kdw7xfh1sk6yalk4a0i3hpqza71lxas8v4rnrx00s2xwwn"; + rev = "5dd9db767538e62005bb028a88c08ff321248aa2"; + sha256 = "03s75winr4i9gdd9wm98g15x2h0w9iwpdrzg2xp771b43qvilxzv"; }; meta.homepage = "https://github.com/Shatur/neovim-ayu/"; }; @@ -5351,24 +5351,24 @@ final: prev: nginx-vim = buildVimPluginFrom2Nix { pname = "nginx.vim"; - version = "2022-12-01"; + version = "2022-12-31"; src = fetchFromGitHub { owner = "chr4"; repo = "nginx.vim"; - rev = "fdebcbfbefdf26f73cd31ec849df784075dbd21f"; - sha256 = "0zgr4zvhxl3myx9a8pypxbv3f6i7xygzdd4cfi80c4nm3j83j1hk"; + rev = "99694458062e4e1d138bd022b10432a05612a2db"; + sha256 = "1ih25dl3zzcp2245vrq3ypii76b3ri73ayv3w8qg7s73j1g1c6p5"; }; meta.homepage = "https://github.com/chr4/nginx.vim/"; }; nightfox-nvim = buildVimPluginFrom2Nix { pname = "nightfox.nvim"; - version = "2022-12-14"; + version = "2022-12-30"; src = fetchFromGitHub { owner = "EdenEast"; repo = "nightfox.nvim"; - rev = "9c3756ae21743c9634923cea788c4cca0eafccf2"; - sha256 = "1acb6n6j1fc3dafyvjfl4q5181szxidlq2yx3kqvj508g8r1fh5f"; + rev = "21e7e733e28b79b876e6bd514e6046a8da63ddae"; + sha256 = "0fwkr2y0q26x35wb0zyysqigrdq02axhsa8qaxlrw4c1p06vsgmj"; }; meta.homepage = "https://github.com/EdenEast/nightfox.nvim/"; }; @@ -5387,12 +5387,12 @@ final: prev: nlsp-settings-nvim = buildVimPluginFrom2Nix { pname = "nlsp-settings.nvim"; - version = "2022-12-23"; + version = "2023-01-01"; src = fetchFromGitHub { owner = "tamago324"; repo = "nlsp-settings.nvim"; - rev = "8f67460e1ae721b91a9439243af5e42d6f3930d6"; - sha256 = "1f8rpchb7gr2wzl1xy1ja74h052bc0cig05a8549l5f8kg3x0qip"; + rev = "e73d509e77d97324a1fe3cc0118a707cc28cf92b"; + sha256 = "0n6crpb6gvi5vyirypz7s4c38k80iah1203w5hvlx5qr0bjxw14c"; }; meta.homepage = "https://github.com/tamago324/nlsp-settings.nvim/"; }; @@ -5423,12 +5423,12 @@ final: prev: noice-nvim = buildVimPluginFrom2Nix { pname = "noice.nvim"; - version = "2022-12-21"; + version = "2023-01-01"; src = fetchFromGitHub { owner = "folke"; repo = "noice.nvim"; - rev = "585d24ec6e3fb4288414f864cfe2de7d025e8216"; - sha256 = "0z7d3nfr5vydk2pwjhl0zlw0ipnbqhbw02sbk6j7vrcw6l0aqd7f"; + rev = "256ec7318e227d4a0879f3776bfbe3955f5d2eef"; + sha256 = "1fqi4vw0q50prs2n0gxxw9kdg752hlamb4b0axkp8k067x3lpa2r"; }; meta.homepage = "https://github.com/folke/noice.nvim/"; }; @@ -5487,20 +5487,20 @@ final: prev: src = fetchFromGitHub { owner = "MunifTanjim"; repo = "nui.nvim"; - rev = "20385a698e8a5dd98ee7e63f16b700a10b921098"; - sha256 = "0widn891dgw3isg9axrgqc94yxb8s1mr5vxr5qfnf9rm2qk1hx71"; + rev = "4939282919885e1c83aff68ecb35b3cadf6015a9"; + sha256 = "1i4993fkg5h6mipn7507v5d6hlfqzl5bl2qqcbs6q2wb41f44hy6"; }; meta.homepage = "https://github.com/MunifTanjim/nui.nvim/"; }; null-ls-nvim = buildVimPluginFrom2Nix { pname = "null-ls.nvim"; - version = "2022-12-23"; + version = "2023-01-01"; src = fetchFromGitHub { owner = "jose-elias-alvarez"; repo = "null-ls.nvim"; - rev = "b26851b3e7ac1c0c85666f8a74e36aef2acb89c6"; - sha256 = "0djmqka2b9yikjr1pllb572lvws86769z9bzj7xj984x1v1xf7rz"; + rev = "d09d7d82cc26d63673cef85cb62895dd68aab6d8"; + sha256 = "1wvjn2q2b5g989hdki9gs9miww20kc8650li2k380g9x8x7sqkhz"; }; meta.homepage = "https://github.com/jose-elias-alvarez/null-ls.nvim/"; }; @@ -5567,12 +5567,12 @@ final: prev: nvim-biscuits = buildVimPluginFrom2Nix { pname = "nvim-biscuits"; - version = "2022-11-06"; + version = "2022-12-26"; src = fetchFromGitHub { owner = "code-biscuits"; repo = "nvim-biscuits"; - rev = "5cfee78603bd4795e0709b8947e7ffaa2007cb1d"; - sha256 = "0qmkki3bpnk9rv90vaxyr8qi5y1lrd65x7fvk3h8bcyqnz7hhk28"; + rev = "e58b47d7ff6bded07f30f51ca1fa4855a1a6dfb1"; + sha256 = "1as4c9ahmdvfnrsa3ih3dzz2pk8y00fyss1m61cs1q1l9j0cnc7j"; }; meta.homepage = "https://github.com/code-biscuits/nvim-biscuits/"; }; @@ -5615,12 +5615,12 @@ final: prev: nvim-cmp = buildNeovimPluginFrom2Nix { pname = "nvim-cmp"; - version = "2022-12-23"; + version = "2022-12-30"; src = fetchFromGitHub { owner = "hrsh7th"; repo = "nvim-cmp"; - rev = "d09b0c396aaa078cdfe78316ec06940971136e85"; - sha256 = "1vf1j10mibc3jdz3d1skw9gy14vg5fnpzzlgvfcd7fgh3gm6lj7h"; + rev = "c49ad26e894e137e401b1d294948c46327877eaf"; + sha256 = "18igmvp5ggyrll3mafggg6fj00a0m4g2cmixgj9z0iha5r37wyia"; }; meta.homepage = "https://github.com/hrsh7th/nvim-cmp/"; }; @@ -5723,24 +5723,24 @@ final: prev: nvim-dap = buildVimPluginFrom2Nix { pname = "nvim-dap"; - version = "2022-12-21"; + version = "2022-12-31"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-dap"; - rev = "6f2ea9e33b48a51849ec93c6c38148a5372018e4"; - sha256 = "0bjzqwvxn57n3rpx3sjk4cqdx876cgrbw744d86pzd1lrzdjixqm"; + rev = "69b7c684cd42e60b48875c580e616a70bccfdbe7"; + sha256 = "13sv9r9s3kh7m11kvdhr6zhnjh2qawi7vz1dz9v0bnigf8x6v9f4"; }; meta.homepage = "https://github.com/mfussenegger/nvim-dap/"; }; nvim-dap-go = buildVimPluginFrom2Nix { pname = "nvim-dap-go"; - version = "2022-12-24"; + version = "2022-12-30"; src = fetchFromGitHub { owner = "leoluz"; repo = "nvim-dap-go"; - rev = "8aa9e7ef317182b33fc3e04651041e8d367cc73a"; - sha256 = "0aifkj73vxr6s263g63bl269nbx6hvbk5sf0mq0m3y4z9ia8lf03"; + rev = "8f10f347b3332d1f783a209813bf9b61f517256f"; + sha256 = "0xw7n9v97rfqbabsb4lgr0vyajvbyapc46qr9q1qmh7byxjrcnhw"; }; meta.homepage = "https://github.com/leoluz/nvim-dap-go/"; }; @@ -5975,12 +5975,12 @@ final: prev: nvim-lspconfig = buildVimPluginFrom2Nix { pname = "nvim-lspconfig"; - version = "2022-12-25"; + version = "2022-12-31"; src = fetchFromGitHub { owner = "neovim"; repo = "nvim-lspconfig"; - rev = "212b99bc12a5416df8b2a610711ba399e2fc388a"; - sha256 = "1yyi3iq5aacgad32jsvhj6ap37sy9m5mnqlqi6rn9x9c91213y19"; + rev = "6b43ce561d97412cc512b569db6938e44529293e"; + sha256 = "04rv8pbn35lps03iqvfik10fb67f5lsrb2vv0mqwlxvzkm65m151"; }; meta.homepage = "https://github.com/neovim/nvim-lspconfig/"; }; @@ -6023,12 +6023,12 @@ final: prev: nvim-metals = buildVimPluginFrom2Nix { pname = "nvim-metals"; - version = "2022-12-09"; + version = "2022-12-29"; src = fetchFromGitHub { owner = "scalameta"; repo = "nvim-metals"; - rev = "d1c01907256dae7c9d55ba1fcfb8cf6b4f583325"; - sha256 = "0w7sya5pyfj9ad4295200j32ibsg5w9qx6icnlfv2fac03r4ir65"; + rev = "7fd10c569ed4eb9f7ec5355d7829ab124b4e6f99"; + sha256 = "1jc26mh63pq5jslzxjhbihywa0x4q4qmayc5qcq9davmghdsd5hf"; }; meta.homepage = "https://github.com/scalameta/nvim-metals/"; }; @@ -6119,12 +6119,12 @@ final: prev: nvim-scrollbar = buildVimPluginFrom2Nix { pname = "nvim-scrollbar"; - version = "2022-12-07"; + version = "2022-12-30"; src = fetchFromGitHub { owner = "petertriho"; repo = "nvim-scrollbar"; - rev = "f45aecbba9c402282dfc99721e0ad4c08710907c"; - sha256 = "0aga91mvkgm8l2nqk2ng8rcgn2a10f5z4xdk66p7afddc8xzk32p"; + rev = "89ac2e4ad5add610fc2d65493139c89c066b56a4"; + sha256 = "1dlg73shaaa8vwa3fdm4g568jj477cy9dc7xngyh1la7hb5l1hib"; }; meta.homepage = "https://github.com/petertriho/nvim-scrollbar/"; }; @@ -6143,12 +6143,12 @@ final: prev: nvim-snippy = buildVimPluginFrom2Nix { pname = "nvim-snippy"; - version = "2022-12-07"; + version = "2022-12-30"; src = fetchFromGitHub { owner = "dcampos"; repo = "nvim-snippy"; - rev = "47def62945611212a242657cc414dac91ca0453a"; - sha256 = "112h9rrfknqb2z0ph0x4fv3pplwrkp1sn1x2saw3bb8r7fjiqzr4"; + rev = "834820d5441e9c26de4bea4de95de5e117c058a5"; + sha256 = "0dn19br6jsd6xlgpxyv7wrxc12i9wrpx98z0bjv3q610w699jffc"; }; meta.homepage = "https://github.com/dcampos/nvim-snippy/"; }; @@ -6179,12 +6179,12 @@ final: prev: nvim-surround = buildVimPluginFrom2Nix { pname = "nvim-surround"; - version = "2022-12-25"; + version = "2022-12-30"; src = fetchFromGitHub { owner = "kylechui"; repo = "nvim-surround"; - rev = "6aafeeda19a98768d1c17ff6dde5548bc77a1a2d"; - sha256 = "0ci25qy82phrlm7lp9zaaiyvf17rk6yvczbiwf6b578r4c8jq87j"; + rev = "64e21061953102b19bbb22e824fbb96054782799"; + sha256 = "11m62i66gicv7spz6bcsxpdqshi19v0306bh69lcmbyawbwyli4a"; }; meta.homepage = "https://github.com/kylechui/nvim-surround/"; }; @@ -6215,24 +6215,24 @@ final: prev: nvim-tree-lua = buildVimPluginFrom2Nix { pname = "nvim-tree.lua"; - version = "2022-12-23"; + version = "2023-01-01"; src = fetchFromGitHub { owner = "nvim-tree"; repo = "nvim-tree.lua"; - rev = "9e4c39572f631bb60ee15cb9d46e1daa9927a45e"; - sha256 = "0fw8c8jzpw2vrfh1ac27jbs0kgh3f98pixbwxwak98iq6a03vv50"; + rev = "e322fbb80b0be5e885268c91ab29cbfe0143cd5b"; + sha256 = "1195sw9h1wk5p2x9xj3zqkm5a7sm6l8qq8jxhvrbq14xmw5594sm"; }; meta.homepage = "https://github.com/nvim-tree/nvim-tree.lua/"; }; nvim-treesitter = buildVimPluginFrom2Nix { pname = "nvim-treesitter"; - version = "2022-12-25"; + version = "2023-01-01"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter"; - rev = "a2d7e78b0714a0dc066416100b7398d3f0941c23"; - sha256 = "07mvh417zywnh5xhm2lkyhizs1gi2lwq0s6r0ad1cbxbjw6xfajd"; + rev = "3a621b9a8362fac358d828254485024986d6d81b"; + sha256 = "0dib32b4y325f4yfarw0ph74851lg56slq0vgf1rrq3v588szvdl"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/"; }; @@ -6275,12 +6275,12 @@ final: prev: nvim-treesitter-textobjects = buildVimPluginFrom2Nix { pname = "nvim-treesitter-textobjects"; - version = "2022-12-25"; + version = "2022-12-31"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter-textobjects"; - rev = "83a494a6f93675beff7bbd320c04c87433b1462f"; - sha256 = "0qhi73kmdr3rr9jvklrvl7a7p7fz4i21i5yg1v927f15aq1lglsi"; + rev = "d816761ec1ea4a605689bc5f4111088459cf74d4"; + sha256 = "0h60nhvwn81q83nvg5cj2j4jwglpa2wbvlyk1fy1l09zjrjpzm8x"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter-textobjects/"; }; @@ -6299,12 +6299,12 @@ final: prev: nvim-ts-context-commentstring = buildVimPluginFrom2Nix { pname = "nvim-ts-context-commentstring"; - version = "2022-10-29"; + version = "2022-12-30"; src = fetchFromGitHub { owner = "joosepalviste"; repo = "nvim-ts-context-commentstring"; - rev = "32d9627123321db65a4f158b72b757bcaef1a3f4"; - sha256 = "176dqn0kxdcsjfxh3nhlkiwh7nrj9792rzbmmrkgghjjw87zrd4p"; + rev = "4a42b30376c1bd625ab5016c2079631d531d797a"; + sha256 = "1gqinff1lpw9a3yc6l0mlvkq5khhgynmyid4h77nj5dr7llrq3ds"; }; meta.homepage = "https://github.com/joosepalviste/nvim-ts-context-commentstring/"; }; @@ -6467,12 +6467,12 @@ final: prev: onedarkpro-nvim = buildVimPluginFrom2Nix { pname = "onedarkpro.nvim"; - version = "2022-12-21"; + version = "2023-01-01"; src = fetchFromGitHub { owner = "olimorris"; repo = "onedarkpro.nvim"; - rev = "7a7641e27f922496b4bf8493acd9f2f8da7ff864"; - sha256 = "0b2cm9inkw3wps8snxb09v789gi37k04swb8nfm3swa487r0dgr3"; + rev = "e3369ba112e6d9dd0dc99bc006e76c33bf035522"; + sha256 = "0xpdnzqsr9m3hdf524lxiih083v3qrh7bksk0iaqdjhaj1fq9h8g"; }; meta.homepage = "https://github.com/olimorris/onedarkpro.nvim/"; }; @@ -6491,12 +6491,12 @@ final: prev: onenord-nvim = buildVimPluginFrom2Nix { pname = "onenord.nvim"; - version = "2022-12-24"; + version = "2023-01-01"; src = fetchFromGitHub { owner = "rmehri01"; repo = "onenord.nvim"; - rev = "3fca21ce5a849b0a5f4c97a2e6db8e61669cc617"; - sha256 = "15vhgjpqg97ll57ysakyq794cncigik6024z6k22ky1m19ybhjhr"; + rev = "a05302150878c0c5e8f349e479089da3d8e3b222"; + sha256 = "12vnlz1zdg9hbiza78ymkfzm26s1mp8cckcjyzr3494lv6ajx2af"; }; meta.homepage = "https://github.com/rmehri01/onenord.nvim/"; }; @@ -6659,12 +6659,12 @@ final: prev: playground = buildVimPluginFrom2Nix { pname = "playground"; - version = "2022-12-18"; + version = "2022-12-26"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "playground"; - rev = "3421bbbfec25a7c54ee041ffb9cb226b69b2b995"; - sha256 = "1zc9wwpb0565fw0g1mmhv2dkdlf57qvh7r133gcij9mp7jh87pgx"; + rev = "8a887bcf66017bd775a0fb19c9d8b7a4d6759c48"; + sha256 = "1c1y1abz04j11gz9731ibhga0grzmy86j626q0v7i3v9v4cr455q"; }; meta.homepage = "https://github.com/nvim-treesitter/playground/"; }; @@ -6941,7 +6941,7 @@ final: prev: src = fetchFromGitHub { owner = "ryvnf"; repo = "readline.vim"; - rev = "b5eff41db2803b6f5a264cc71867e8498e7318d1"; + rev = "1213ebcf558b4ee2e9df2c761cc01cc076fc764f"; sha256 = "03sn2rpadd746ax5ynidi8msp90phzb3a82w523q8b07kn32dgdw"; }; meta.homepage = "https://github.com/ryvnf/readline.vim/"; @@ -6985,12 +6985,12 @@ final: prev: rest-nvim = buildNeovimPluginFrom2Nix { pname = "rest.nvim"; - version = "2022-12-19"; + version = "2022-12-30"; src = fetchFromGitHub { owner = "rest-nvim"; repo = "rest.nvim"; - rev = "84e8208c17bbc9e3c092b860db85953ee2d60d17"; - sha256 = "0labx6k5padzc8j270v07gxx3v3vw8kf5xnh5dg6pywpx4lp728h"; + rev = "f94c795321b4ee77834db0300cf42f33d6605000"; + sha256 = "1ag55slzy1y2dnq3ql04jlmlmqkapdfy0vw2yhgnvlamhawxkbxf"; }; meta.homepage = "https://github.com/rest-nvim/rest.nvim/"; }; @@ -7491,12 +7491,12 @@ final: prev: ssr-nvim = buildVimPluginFrom2Nix { pname = "ssr.nvim"; - version = "2022-12-08"; + version = "2022-12-27"; src = fetchFromGitHub { owner = "cshuaimin"; repo = "ssr.nvim"; - rev = "ce2ba65370c3e6ca2e84e652c9adfccb8611458e"; - sha256 = "080xgvq8i01v2zz86nxwr1c2pi2mb5qjx6lymkygp0xjmv3p9b2v"; + rev = "e6a11a702483d26f767f937575d549ac73b2fea3"; + sha256 = "0f8674wisl5l7xwglk6zw956yd0s9ml20dwfvxmvslz0c1an8q0c"; }; meta.homepage = "https://github.com/cshuaimin/ssr.nvim/"; }; @@ -7708,12 +7708,12 @@ final: prev: tabnine-vim = buildVimPluginFrom2Nix { pname = "tabnine-vim"; - version = "2022-12-05"; + version = "2023-01-01"; src = fetchFromGitHub { owner = "codota"; repo = "tabnine-vim"; - rev = "35f1661297b4bf8b12324c8d29442b36a5ef64d2"; - sha256 = "1snrjrd0ri5d3kkdv81gvbsv6nccjxqh6zpwkzbz9nh7nhb7dmy2"; + rev = "9944f213fe47a7d2ff269cda334ba28c14a4df79"; + sha256 = "1s6636s0pah340fgi5lip9zpnbd08f06idcywis5w9jqqy234b37"; fetchSubmodules = true; }; meta.homepage = "https://github.com/codota/tabnine-vim/"; @@ -7877,24 +7877,24 @@ final: prev: telescope-file-browser-nvim = buildVimPluginFrom2Nix { pname = "telescope-file-browser.nvim"; - version = "2022-12-25"; + version = "2022-12-31"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope-file-browser.nvim"; - rev = "b8581d00afa02c6bb4c947348e3cee62db65b119"; - sha256 = "0bn1l3jkap292p399fyx848yyb34gb3am7ih0d6wxz93sjpgzsps"; + rev = "304508fb7bea78e3c0eeddd88c4837501e403ae8"; + sha256 = "0hyy1fwp06748qy7rs7gf27p7904xfrr53v1sbrmqhlxinlsyp0m"; }; meta.homepage = "https://github.com/nvim-telescope/telescope-file-browser.nvim/"; }; telescope-frecency-nvim = buildVimPluginFrom2Nix { pname = "telescope-frecency.nvim"; - version = "2022-11-06"; + version = "2022-12-28"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope-frecency.nvim"; - rev = "10771fdb7b4c4b59f2b5c1e8757b0379e1314659"; - sha256 = "0gdaa7bvxi5ppy3is3ac42fbcd7wgp91ircikm0j9sg9f39vjk1i"; + rev = "62cbd4e7f55fb6de2b8081087ce97026022ffcd2"; + sha256 = "1mmwag20ljszzy9x1vfgxly20pkiwciq7n7cv5d6d6d20xjr7v06"; }; meta.homepage = "https://github.com/nvim-telescope/telescope-frecency.nvim/"; }; @@ -8082,12 +8082,12 @@ final: prev: telescope-nvim = buildVimPluginFrom2Nix { pname = "telescope.nvim"; - version = "2022-12-21"; + version = "2022-12-28"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope.nvim"; - rev = "e960efa60e97df58e089b00270f09d60f27202c8"; - sha256 = "023g8dblp5bp4wa5955drfipwzjaarbxl5xa9pky1ax4pni3i1rw"; + rev = "a606bd10c79ec5989c76c49cc6f736e88b63f0da"; + sha256 = "07sv43k6nfg1irhybi7s361nz8ic795wd2wafi405sq5vnz4jz36"; }; meta.homepage = "https://github.com/nvim-telescope/telescope.nvim/"; }; @@ -8311,12 +8311,12 @@ final: prev: tokyonight-nvim = buildVimPluginFrom2Nix { pname = "tokyonight.nvim"; - version = "2022-12-20"; + version = "2022-12-30"; src = fetchFromGitHub { owner = "folke"; repo = "tokyonight.nvim"; - rev = "8b55a47165348dd1d811f9e1f867bb17bb35a360"; - sha256 = "0glhl3dm4ispxcy1x9g495by6xfdqmvlyhcywjx10kqmi192cwxs"; + rev = "42cccfe663f36b91792a350164f0695b44a031d9"; + sha256 = "12175j4awrv0qjvl1hmm2z3xqcgbihvs74vsmyrkamgfvsc7h2hy"; }; meta.homepage = "https://github.com/folke/tokyonight.nvim/"; }; @@ -8503,12 +8503,12 @@ final: prev: urlview-nvim = buildVimPluginFrom2Nix { pname = "urlview.nvim"; - version = "2022-12-21"; + version = "2022-12-30"; src = fetchFromGitHub { owner = "axieax"; repo = "urlview.nvim"; - rev = "9ebb11fff1548ae9406bba8a06d9caabf686ef9a"; - sha256 = "0yjqc4is8zaf2m04a2kh079jp2635nn8nbpkqak416hgigs1agfc"; + rev = "6a2f1ae05ba036ca1e9c505f4d58b9a188ef51bd"; + sha256 = "12rs0c7sx0j8k646ycvypc9vi9k9fx17pihd3fhvccwyjwk7iafi"; }; meta.homepage = "https://github.com/axieax/urlview.nvim/"; }; @@ -8911,12 +8911,12 @@ final: prev: vim-airline = buildVimPluginFrom2Nix { pname = "vim-airline"; - version = "2022-12-23"; + version = "2023-01-01"; src = fetchFromGitHub { owner = "vim-airline"; repo = "vim-airline"; - rev = "9e2d021fc6088a2027315d7e7ae8bafa94f16a7d"; - sha256 = "0qfpq71hmhgjcy2l056jm4l9gz9hypv0c1kcm1ainwyhq0bkwr77"; + rev = "785dbbe504f9fe00f6adc1cc2598fcc701cec224"; + sha256 = "105k0qnav9xpadjbnnxz5nq6zlp856kjndy1p8ic12brzsjr74dv"; }; meta.homepage = "https://github.com/vim-airline/vim-airline/"; }; @@ -9307,12 +9307,12 @@ final: prev: vim-clap = buildVimPluginFrom2Nix { pname = "vim-clap"; - version = "2022-12-23"; + version = "2022-12-26"; src = fetchFromGitHub { owner = "liuchengxu"; repo = "vim-clap"; - rev = "15ba008e15a05f90dfec0b4a59124fccb3e8ffc1"; - sha256 = "167kmgd8793nhan0hpwyvi1z0jzfgrvhgdzbf8clzswxg7wvq773"; + rev = "0a0ab5e3b35835805f71cb4649a4f456d8a470ca"; + sha256 = "10lqqmfmgv35cyp9l2ihwcbwb45pd0hv2lj5fskpmrx3fif0xx4f"; }; meta.homepage = "https://github.com/liuchengxu/vim-clap/"; }; @@ -9571,12 +9571,12 @@ final: prev: vim-dadbod = buildVimPluginFrom2Nix { pname = "vim-dadbod"; - version = "2022-12-13"; + version = "2022-12-27"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-dadbod"; - rev = "70f86045e3a70ccdc9b448a9fe66a550290adca3"; - sha256 = "053cy6vmsvjrhjrgmnhg1s2cvxap3dyfniy9r8phd56isvlqd2i1"; + rev = "a09e40664e9cd30cd2b3f8866b796598302070f6"; + sha256 = "0fhbb5yq6ll58gc2wyai7h4c889lfdmvhwzidw1gw529jpgwvc67"; }; meta.homepage = "https://github.com/tpope/vim-dadbod/"; }; @@ -9595,12 +9595,12 @@ final: prev: vim-dadbod-ui = buildVimPluginFrom2Nix { pname = "vim-dadbod-ui"; - version = "2022-10-12"; + version = "2022-12-27"; src = fetchFromGitHub { owner = "kristijanhusak"; repo = "vim-dadbod-ui"; - rev = "6a2b841d2f0b82386c637ce4e9954ae12c7eaee8"; - sha256 = "1s1kz89k8iklf8sbgy4p52h7y2x90141jwgzwhhhqlp7h9ar9mmw"; + rev = "ecf07480687a13fe1bd3899270a6c9c99de51f4b"; + sha256 = "0ahynkl4nilvkqqfhf625l5js33bjya6acqq1qn7cnhr0xhriyhd"; }; meta.homepage = "https://github.com/kristijanhusak/vim-dadbod-ui/"; }; @@ -10099,12 +10099,12 @@ final: prev: vim-fugitive = buildVimPluginFrom2Nix { pname = "vim-fugitive"; - version = "2022-12-02"; + version = "2022-12-30"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-fugitive"; - rev = "5b0b138483de17a8fd8dfcec0b491782c8fbf102"; - sha256 = "1nlr50kv90rafy85cr2k2n7pmr5mvmvqiza7qnk0rzlccdada6ry"; + rev = "99cdb88bc64063dc4656ae53496f06fb2a394cd4"; + sha256 = "0l1s4ngbn98aha8621i0s4l5vm0gzh112qkfcllmva4f2kkgb0xm"; }; meta.homepage = "https://github.com/tpope/vim-fugitive/"; }; @@ -10243,12 +10243,12 @@ final: prev: vim-go = buildVimPluginFrom2Nix { pname = "vim-go"; - version = "2022-12-18"; + version = "2022-12-31"; src = fetchFromGitHub { owner = "fatih"; repo = "vim-go"; - rev = "8c4db1c61432511a3aa55971dabb2171cbcba7b1"; - sha256 = "1qzri85vzz706h5wq8n0h7xi610vfm1cykwgrkwannwarj9khnx6"; + rev = "9b6c5a66a1305179e9b130a8074d05973ea57315"; + sha256 = "0iylyw30kk1i06693yi7nv0xjid28lkl4apx334q15aaiydzmlwz"; }; meta.homepage = "https://github.com/fatih/vim-go/"; }; @@ -10977,12 +10977,12 @@ final: prev: vim-lsp = buildVimPluginFrom2Nix { pname = "vim-lsp"; - version = "2022-12-21"; + version = "2022-12-28"; src = fetchFromGitHub { owner = "prabirshrestha"; repo = "vim-lsp"; - rev = "2cb7ef587cd2c79dd98a7cd3ff301cc415296629"; - sha256 = "10krhi7cq6ijlpascsjjxwg4abfqg3kis4p8cm0lwaj7sgk5h5sv"; + rev = "3f6e23f3d8e211736bc1fb1428215e03154ac1ac"; + sha256 = "1y3jhjrw6xiv05bvm2qqnhvca73x33jc6a1nx1fdfxjz3s3jjn3b"; }; meta.homepage = "https://github.com/prabirshrestha/vim-lsp/"; }; @@ -11926,12 +11926,12 @@ final: prev: vim-racket = buildVimPluginFrom2Nix { pname = "vim-racket"; - version = "2021-04-11"; + version = "2022-12-30"; src = fetchFromGitHub { owner = "wlangstroth"; repo = "vim-racket"; - rev = "32ad23165c96d05da7f3b9931d2889b7e39dcb86"; - sha256 = "1yyqx471p11vj6gya4yzkiy07vfwzpx10bf6s7dh2h7zp2nz10br"; + rev = "2c7ec0f35a2ad1ca00305e5d67837bc1f1d4b6cc"; + sha256 = "02cliv5798l5lgf082g48g6cimsphvdvysalj3x86q3273rf9dgv"; }; meta.homepage = "https://github.com/wlangstroth/vim-racket/"; }; @@ -12118,12 +12118,12 @@ final: prev: vim-sensible = buildVimPluginFrom2Nix { pname = "vim-sensible"; - version = "2022-12-03"; + version = "2022-12-30"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-sensible"; - rev = "1be4e4e5409caccddf5c2f1bbfa16519f4c93de0"; - sha256 = "1l2ax16r0bqxzdmgpz4rlx7zj0g4d8d696ibdzwmr0q6nbkpy4w5"; + rev = "dad453eb1b1dfb5d682b0834341239eb647768f9"; + sha256 = "0bjn7lr7bxifxrjfmkpdq8f41lwjwjbxqq30in92r7d7dv811yy8"; }; meta.homepage = "https://github.com/tpope/vim-sensible/"; }; @@ -12178,12 +12178,12 @@ final: prev: vim-signify = buildVimPluginFrom2Nix { pname = "vim-signify"; - version = "2022-09-26"; + version = "2022-12-28"; src = fetchFromGitHub { owner = "mhinz"; repo = "vim-signify"; - rev = "8bc268c79d4053c2f5ccaadcf0b666dd16ed3a58"; - sha256 = "0nc3c66vrbd18sf0krxn6llfz1v832f7xqbkrfacl9jbhsfch5hk"; + rev = "a05e63ba72411977f5087c27c1564c9287bfab66"; + sha256 = "1z435v9y7nkffwr2b7rnmjla21nfb3wvdnf6s32vw4h6n5wgj3bl"; }; meta.homepage = "https://github.com/mhinz/vim-signify/"; }; @@ -12959,12 +12959,12 @@ final: prev: vim-wakatime = buildVimPluginFrom2Nix { pname = "vim-wakatime"; - version = "2022-11-28"; + version = "2022-12-29"; src = fetchFromGitHub { owner = "wakatime"; repo = "vim-wakatime"; - rev = "8c7f33b43a56f89285de0da77ee6ec7e4af1f835"; - sha256 = "0mlhlgfr24xyzvg6qbxzbsyby3dmv973avw5qv5qablngi6kqi87"; + rev = "7d8ca4667f46e783388609ca7f04a65e4389338a"; + sha256 = "0a2gz61yrq85qapg9mnyfj55kmzhz4iaxibxzk78ac4nj43sv8vn"; }; meta.homepage = "https://github.com/wakatime/vim-wakatime/"; }; @@ -12983,12 +12983,12 @@ final: prev: vim-wayland-clipboard = buildVimPluginFrom2Nix { pname = "vim-wayland-clipboard"; - version = "2022-12-15"; + version = "2022-12-31"; src = fetchFromGitHub { owner = "jasonccox"; repo = "vim-wayland-clipboard"; - rev = "64e7a3cfd210e0ffe4b3d103b2662aec6b0e2407"; - sha256 = "1gbjh7r2n4w7lq3bvzziq01bmdi6cwa1s1hl25wbgpdj6kzrnda6"; + rev = "9b6def0924e716fb5314d52e062965b950b707f8"; + sha256 = "0j383bs1s2l8qxmym3zwby8nj8md8dsx7nk7xnspcrgah4g3j4mm"; }; meta.homepage = "https://github.com/jasonccox/vim-wayland-clipboard/"; }; @@ -13272,12 +13272,12 @@ final: prev: vimtex = buildVimPluginFrom2Nix { pname = "vimtex"; - version = "2022-12-18"; + version = "2022-12-26"; src = fetchFromGitHub { owner = "lervag"; repo = "vimtex"; - rev = "265cb5b8e23e125713e3d331d2c89383ca72cc09"; - sha256 = "1yy6ps0896zcsr55p7z9k4vbh2n78bq5mps3r13kv3y7aj9m394i"; + rev = "5e03d9052de30c8e4c2f4907600783112454028a"; + sha256 = "1nx79zr7w6iww5jzsy7id6rlrhdbrr2209hkq5pz2gblxfk8v447"; }; meta.homepage = "https://github.com/lervag/vimtex/"; }; @@ -13573,12 +13573,12 @@ final: prev: zenbones-nvim = buildVimPluginFrom2Nix { pname = "zenbones.nvim"; - version = "2022-10-22"; + version = "2022-12-31"; src = fetchFromGitHub { owner = "mcchrish"; repo = "zenbones.nvim"; - rev = "0f7e9eb1ef309098e69e5e317508e9a7af299d94"; - sha256 = "03439c2z4p286mqncgii6gyg2pz7kk9mdfqbbfyg14ycwmfn949a"; + rev = "9d865e070ada2b81a92ba8b3bf564b3fc71efc53"; + sha256 = "078j4d7hj5lpf19fryx8rwpyg6q6wkk9z7grkc08s8kyssigcs9w"; }; meta.homepage = "https://github.com/mcchrish/zenbones.nvim/"; }; @@ -13597,24 +13597,24 @@ final: prev: zephyr-nvim = buildVimPluginFrom2Nix { pname = "zephyr-nvim"; - version = "2022-10-17"; + version = "2022-12-31"; src = fetchFromGitHub { owner = "glepnir"; repo = "zephyr-nvim"; - rev = "e36e00155a2f2c30efcbd43d7f8b518a5aef4b25"; - sha256 = "0vwlvmhwk8qsp1zxszgkzriwkzx939s46smq30mpl0vjqgm7vjr7"; + rev = "7fd86b7164442d3b5ec2c81b2694d040e716b5cf"; + sha256 = "12ichp7jmawgf1clwpd2w22a2amqlv578lnb89ppzf9hjz5kcxnb"; }; meta.homepage = "https://github.com/glepnir/zephyr-nvim/"; }; zig-vim = buildVimPluginFrom2Nix { pname = "zig.vim"; - version = "2022-10-19"; + version = "2022-12-31"; src = fetchFromGitHub { owner = "ziglang"; repo = "zig.vim"; - rev = "c33e1e312fc0f9523d09d7ddb845ea5d52db41d0"; - sha256 = "17iwx87n8w2ksi9f8ravsa69ng7gzn0px0d5pd58n3lsdvhcsm59"; + rev = "c8caa9ab97334ca5af2d69900108bb4af20933c5"; + sha256 = "0mpzlxbf9dclgs4r9pffhc31hri09c78dk9lpij8fr089srgcp5i"; }; meta.homepage = "https://github.com/ziglang/zig.vim/"; }; @@ -13657,12 +13657,12 @@ final: prev: catppuccin-nvim = buildVimPluginFrom2Nix { pname = "catppuccin-nvim"; - version = "2022-12-16"; + version = "2022-12-28"; src = fetchFromGitHub { owner = "catppuccin"; repo = "nvim"; - rev = "55f43a952856bc0029e6cef066297c6cfab3451d"; - sha256 = "1y9k2hzykw7m227kihaf2cygbkirwqrha3m40k2807a66nrcjyk3"; + rev = "3020af75aae098a77737d91ee37c7147c8450d99"; + sha256 = "16spffav8zk9zgi4p4apjfmd04p5f19inlpgjj9cdyrk9ij65xh7"; }; meta.homepage = "https://github.com/catppuccin/nvim/"; }; @@ -13765,12 +13765,12 @@ final: prev: rose-pine = buildVimPluginFrom2Nix { pname = "rose-pine"; - version = "2022-12-03"; + version = "2022-12-27"; src = fetchFromGitHub { owner = "rose-pine"; repo = "neovim"; - rev = "7610f245821e98232e7ee8dcbf3364725807187d"; - sha256 = "1050yycxlinnj0fcpwvb18b6i1ahkm3mwc56qmkspj1glhk64cs9"; + rev = "1837586b7dbb7c34486e17bdb966a2e19cf63c3b"; + sha256 = "1vnr0bkqam3ky365slnd1x44di2qz56gdwjv90i58vwk3lzf3a05"; }; meta.homepage = "https://github.com/rose-pine/neovim/"; }; From 5f7e5ecac6073330775e63848066b7c59811a4b3 Mon Sep 17 00:00:00 2001 From: Tomo <68489118+Tomodachi94@users.noreply.github.com> Date: Sun, 1 Jan 2023 10:31:51 -0800 Subject: [PATCH 20/33] vimPlugins.mediawiki-vim: init at 2015-11-15 --- pkgs/applications/editors/vim/plugins/generated.nix | 12 ++++++++++++ .../editors/vim/plugins/vim-plugin-names | 1 + 2 files changed, 13 insertions(+) diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index 4496e5b6e2fc..bcffc8d95d11 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -4689,6 +4689,18 @@ final: prev: meta.homepage = "https://github.com/vim-scripts/mayansmoke/"; }; + mediawiki-vim = buildVimPluginFrom2Nix { + pname = "mediawiki.vim"; + version = "2015-11-15"; + src = fetchFromGitHub { + owner = "chikamichi"; + repo = "mediawiki.vim"; + rev = "26e5737264354be41cb11d16d48132779795e168"; + sha256 = "1laiiww2lhn0v1039n0mx97fyyj7wdzwi0ybwl1ysdik03nxl32f"; + }; + meta.homepage = "https://github.com/chikamichi/mediawiki.vim/"; + }; + mini-nvim = buildVimPluginFrom2Nix { pname = "mini.nvim"; version = "2022-12-30"; diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index 42db88668740..513a4cf06661 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -393,6 +393,7 @@ https://github.com/vim-scripts/matchit.zip/,, https://github.com/marko-cerovac/material.nvim/,, https://github.com/kaicataldo/material.vim/,HEAD, https://github.com/vim-scripts/mayansmoke/,, +https://github.com/chikamichi/mediawiki.vim/,HEAD, https://github.com/echasnovski/mini.nvim/,, https://github.com/wfxr/minimap.vim/,, https://github.com/jose-elias-alvarez/minsnip.nvim/,, From 40faf3f2d457bbec2ed0d1780b1542233b469875 Mon Sep 17 00:00:00 2001 From: figsoda Date: Sun, 1 Jan 2023 13:52:42 -0500 Subject: [PATCH 21/33] vimPlugins.nvim-treesitter: update grammars --- .../vim/plugins/nvim-treesitter/generated.nix | 71 ++++++++++++------- 1 file changed, 47 insertions(+), 24 deletions(-) diff --git a/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix b/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix index 67af5e9de1aa..6fc4df070531 100644 --- a/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix +++ b/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix @@ -38,12 +38,12 @@ }; astro = buildGrammar { language = "astro"; - version = "22697b0"; + version = "a1f66bf"; source = fetchFromGitHub { owner = "virchau13"; repo = "tree-sitter-astro"; - rev = "22697b0e2413464b7abaea9269c5e83a59e39a83"; - hash = "sha256-vp2VjkfBEYEUwUCjBlbVjPIB49QIikdFAITzzFLZX+U="; + rev = "a1f66bf72ed68b87f779bce9a52e5c6521fc867e"; + hash = "sha256-Q+nOJQAAHqvyH8PVckh38q0TJ6b9jjb/pZHC/U2Hs5Q="; }; meta.homepage = "https://github.com/virchau13/tree-sitter-astro"; }; @@ -758,12 +758,12 @@ }; julia = buildGrammar { language = "julia"; - version = "f254ff9"; + version = "1cd300b"; source = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-julia"; - rev = "f254ff9c52e994f629a60821662917d2c6c0e8eb"; - hash = "sha256-918mGh91hAl8hx4HoGOXr2BFoDtMz5yPkQRMDrkk1Mg="; + rev = "1cd300bda52e680872053cd55a228c1809cb0c3a"; + hash = "sha256-qdKC1yk2CQGQlVWI/0XHrsTF81rRFUlmKSNJ3RoZcdI="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-julia"; }; @@ -791,12 +791,12 @@ }; latex = buildGrammar { language = "latex"; - version = "1ec3941"; + version = "6b7ea83"; source = fetchFromGitHub { owner = "latex-lsp"; repo = "tree-sitter-latex"; - rev = "1ec3941b971dccfa36cb1cd6221a2e4a1cd3e250"; - hash = "sha256-m/6GWV797gaJnWVU07RvHjfAeRzGT9GZH3M9HkcjUq0="; + rev = "6b7ea839307670e6bda011f888717d3a882ecc09"; + hash = "sha256-fmMm6HM9ZCnTyDxKmouoKFPYWkbrM//gHwVEFsICzUs="; }; meta.homepage = "https://github.com/latex-lsp/tree-sitter-latex"; }; @@ -958,24 +958,24 @@ }; ocaml = buildGrammar { language = "ocaml"; - version = "de07323"; + version = "f1106bf"; source = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-ocaml"; - rev = "de07323343946c32759933cb3b7c78e821098cad"; - hash = "sha256-JhJSg6Ht3dy94hAP2yy0fg9U/IeYNGaHYoys/++yOwg="; + rev = "f1106bf834703f1f2f795da1a3b5f8f40174ffcc"; + hash = "sha256-5X2c2Deb8xNlp0LPQKFWIT3jwxKuuKdFlp9b3iA818Y="; }; location = "ocaml"; meta.homepage = "https://github.com/tree-sitter/tree-sitter-ocaml"; }; ocaml_interface = buildGrammar { language = "ocaml_interface"; - version = "de07323"; + version = "f1106bf"; source = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-ocaml"; - rev = "de07323343946c32759933cb3b7c78e821098cad"; - hash = "sha256-JhJSg6Ht3dy94hAP2yy0fg9U/IeYNGaHYoys/++yOwg="; + rev = "f1106bf834703f1f2f795da1a3b5f8f40174ffcc"; + hash = "sha256-5X2c2Deb8xNlp0LPQKFWIT3jwxKuuKdFlp9b3iA818Y="; }; location = "interface"; meta.homepage = "https://github.com/tree-sitter/tree-sitter-ocaml"; @@ -1115,12 +1115,12 @@ }; qmljs = buildGrammar { language = "qmljs"; - version = "0b2b25b"; + version = "ab75be9"; source = fetchFromGitHub { owner = "yuja"; repo = "tree-sitter-qmljs"; - rev = "0b2b25bcaa7d4925d5f0dda16f6a99c588a437f1"; - hash = "sha256-Hf8LfrN3YjN9hpGtTVmK3ZjJ/b/fsRCg9FG7hSSj/mk="; + rev = "ab75be9750e6f2f804638824d1790034286a830c"; + hash = "sha256-UP/+svGOSMlUOMmNMpXKtDDPY9ZIldjWF5sM+PMbE9M="; }; meta.homepage = "https://github.com/yuja/tree-sitter-qmljs"; }; @@ -1269,12 +1269,12 @@ }; slint = buildGrammar { language = "slint"; - version = "d422300"; + version = "0754752"; source = fetchFromGitHub { owner = "jrmoulton"; repo = "tree-sitter-slint"; - rev = "d422300f5d6ccce8f9a617dfed57aafb636fadb2"; - hash = "sha256-j6NBJaix0oOUKLAaeo+/1XdYatStqyaTyLKawq/nFvc="; + rev = "07547525cdf4627343dca5891f1743ae45e879bb"; + hash = "sha256-FB5uDzvJKBN3KH+g71kn2/SX8KIZdLv3OamX8f1NeVE="; }; meta.homepage = "https://github.com/jrmoulton/tree-sitter-slint"; }; @@ -1390,6 +1390,18 @@ generate = true; meta.homepage = "https://github.com/euclidianAce/tree-sitter-teal"; }; + terraform = buildGrammar { + language = "terraform"; + version = "0ff887f"; + source = fetchFromGitHub { + owner = "MichaHoffmann"; + repo = "tree-sitter-hcl"; + rev = "0ff887f2a60a147452d52db060de6b42f42f1441"; + hash = "sha256-L4B2qtGqrtyLHyUMx1p0t4aKncm72dUE+e19Fv5iqUA="; + }; + location = "dialects/terraform"; + meta.homepage = "https://github.com/MichaHoffmann/tree-sitter-hcl"; + }; tiger = buildGrammar { language = "tiger"; version = "a233ebe"; @@ -1403,12 +1415,12 @@ }; tlaplus = buildGrammar { language = "tlaplus"; - version = "27e6d23"; + version = "f2ad727"; source = fetchFromGitHub { owner = "tlaplus-community"; repo = "tree-sitter-tlaplus"; - rev = "27e6d238a5708b0490f43351f6e0baeaab4c9c1f"; - hash = "sha256-4RwHJN1N2DupVIYqWk2sioiiTtEKBmuLT+t+THr71os="; + rev = "f2ad7272d145598ff2d27fda15379d26aa33a7e1"; + hash = "sha256-lnl0q9vJiIoqU3Lo+uCIcMdMueXTQ/MVgZUCHvXeqhs="; }; meta.homepage = "https://github.com/tlaplus-community/tree-sitter-tlaplus"; }; @@ -1558,6 +1570,17 @@ }; meta.homepage = "https://github.com/szebniok/tree-sitter-wgsl"; }; + wgsl_bevy = buildGrammar { + language = "wgsl_bevy"; + version = "c81dc77"; + source = fetchFromGitHub { + owner = "theHamsta"; + repo = "tree-sitter-wgsl-bevy"; + rev = "c81dc770310795caea5e00996505deba024ec698"; + hash = "sha256-CNEZ8GKfcT5YOdlrqEFE8q2FF0Zs+GsWisd1DA6mnUk="; + }; + meta.homepage = "https://github.com/theHamsta/tree-sitter-wgsl-bevy"; + }; yaml = buildGrammar { language = "yaml"; version = "0e36bed"; From 1e6cf6f3dc967dbf1f20a5a7f3515dcaa316c22d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Thu, 29 Dec 2022 17:35:25 +0100 Subject: [PATCH 22/33] bcachefs-tools: add symlink for mount.bcachefs and fix runtime deps --- pkgs/tools/filesystems/bcachefs-tools/default.nix | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/filesystems/bcachefs-tools/default.nix b/pkgs/tools/filesystems/bcachefs-tools/default.nix index 4e52a1d9e567..a68166c8c275 100644 --- a/pkgs/tools/filesystems/bcachefs-tools/default.nix +++ b/pkgs/tools/filesystems/bcachefs-tools/default.nix @@ -13,9 +13,12 @@ , zstd , lz4 , python3Packages +, util-linux , udev , valgrind , nixosTests +, makeWrapper +, getopt , fuse3 , fuseSupport ? false }: @@ -39,7 +42,9 @@ stdenv.mkDerivation { "INITRAMFS_DIR=${placeholder "out"}/etc/initramfs-tools" ''; - nativeBuildInputs = [ pkg-config docutils python3Packages.python ]; + nativeBuildInputs = [ + pkg-config docutils python3Packages.python makeWrapper + ]; buildInputs = [ libuuid libscrypt libsodium keyutils liburcu zlib libaio @@ -54,6 +59,13 @@ stdenv.mkDerivation { rm tests/test_fuse.py ''; + # this symlink is needed for mount -t bcachefs to work + postFixup = '' + ln -s $out/bin/mount.bcachefs.sh $out/bin/mount.bcachefs + wrapProgram $out/bin/mount.bcachefs.sh \ + --prefix PATH : ${lib.makeBinPath [ getopt util-linux ]} + ''; + installFlags = [ "PREFIX=${placeholder "out"}" ]; passthru.tests = { From 655e07253340c2fcc2dbbd894f12362dc7950800 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Thu, 29 Dec 2022 23:17:27 +0100 Subject: [PATCH 23/33] nixos/bcachefs: fix boot with systemd enabled initrd --- nixos/modules/tasks/filesystems/bcachefs.nix | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/nixos/modules/tasks/filesystems/bcachefs.nix b/nixos/modules/tasks/filesystems/bcachefs.nix index ac41ba5f93a4..e3ad52a7b056 100644 --- a/nixos/modules/tasks/filesystems/bcachefs.nix +++ b/nixos/modules/tasks/filesystems/bcachefs.nix @@ -42,7 +42,11 @@ in { config = mkIf (elem "bcachefs" config.boot.supportedFilesystems) (mkMerge [ { - system.fsPackages = [ pkgs.bcachefs-tools ]; + # We do not want to include bachefs in the fsPackages for systemd-initrd + # because we provide the unwrapped version of mount.bcachefs + # through the extraBin option, which will make it available for use. + system.fsPackages = lib.optional (!config.boot.initrd.systemd.enable) pkgs.bcachefs-tools; + environment.systemPackages = lib.optional (config.boot.initrd.systemd.enable) pkgs.bcachefs-tools; # use kernel package with bcachefs support until it's in mainline boot.kernelPackages = pkgs.linuxPackages_testing_bcachefs; @@ -52,7 +56,14 @@ in # chacha20 and poly1305 are required only for decryption attempts boot.initrd.availableKernelModules = [ "bcachefs" "sha256" "chacha20" "poly1305" ]; - boot.initrd.extraUtilsCommands = '' + boot.initrd.systemd.extraBin = { + "bcachefs" = "${pkgs.bcachefs-tools}/bin/bcachefs"; + "mount.bcachefs" = pkgs.runCommand "mount.bcachefs" {} '' + cp -pdv ${pkgs.bcachefs-tools}/bin/.mount.bcachefs.sh-wrapped $out + ''; + }; + + boot.initrd.extraUtilsCommands = lib.mkIf (!config.boot.initrd.systemd.enable) '' copy_bin_and_libs ${pkgs.bcachefs-tools}/bin/bcachefs ''; boot.initrd.extraUtilsCommandsTest = '' From 5d986f42d96981402a1e23d31bbce4f11e9db3c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sun, 1 Jan 2023 19:06:58 +0100 Subject: [PATCH 24/33] bcachefs-tools: unstable-2022-09-28 -> unstable-2022-12-29 Diff: https://github.com/koverstreet/bcachefs-tools/compare/99caca2c70f312c4a2504a7e7a9c92a91426d885...42cf74fd1d0ef58927967e6236988e86cfc0d086 --- pkgs/tools/filesystems/bcachefs-tools/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/filesystems/bcachefs-tools/default.nix b/pkgs/tools/filesystems/bcachefs-tools/default.nix index a68166c8c275..30ffb2dd43f0 100644 --- a/pkgs/tools/filesystems/bcachefs-tools/default.nix +++ b/pkgs/tools/filesystems/bcachefs-tools/default.nix @@ -25,13 +25,13 @@ stdenv.mkDerivation { pname = "bcachefs-tools"; - version = "unstable-2022-09-28"; + version = "unstable-2022-12-29"; src = fetchFromGitHub { owner = "koverstreet"; repo = "bcachefs-tools"; - rev = "99caca2c70f312c4a2504a7e7a9c92a91426d885"; - sha256 = "sha256-9bFTBFkQq8SvhYa9K4+MH2zvKZviNaq0sFWoeGgch7g="; + rev = "42cf74fd1d0ef58927967e6236988e86cfc0d086"; + sha256 = "sha256-N/1heStwmB7CzE/ddTud/ywnMdhq8ZkLju+x0UL0yjY="; }; postPatch = '' From dda48a504471e79b25d65491e1dcbeaf8e5609f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sun, 1 Jan 2023 19:51:23 +0100 Subject: [PATCH 25/33] linux_testing_bcachefs: 2022-10-31 -> 2022-12-29 --- pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix | 7 ++++--- pkgs/top-level/linux-kernels.nix | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix b/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix index a80642334f3c..8a6d1a89dc87 100644 --- a/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix +++ b/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix @@ -1,9 +1,10 @@ { lib , fetchpatch , kernel -, commitDate ? "2022-10-31" -, currentCommit ? "77c27f28aa58e9d9037eb68c87d3283f68c371f7" -, diffHash ? "sha256-TUpI9z0ac3rjn2oT5Z7oQXevDKbGwTVjyigS5/aGwgQ=" +, commitDate ? "2022-12-29" +, currentCommit ? "8f064a4cb5c7cce289b83d7a459e6d8620188b37" +, diffHash ? "sha256-RnlM7uOSWhFHG1aj5BOjrfRtoZfbx+tqQw1V49nW5vw=" + , kernelPatches # must always be defined in bcachefs' all-packages.nix entry because it's also a top-level attribute supplied by callPackage , argsOverride ? {} , ... diff --git a/pkgs/top-level/linux-kernels.nix b/pkgs/top-level/linux-kernels.nix index d6c9bd3ceeae..c8791a4ba005 100644 --- a/pkgs/top-level/linux-kernels.nix +++ b/pkgs/top-level/linux-kernels.nix @@ -184,7 +184,7 @@ in { else testing; linux_testing_bcachefs = callPackage ../os-specific/linux/kernel/linux-testing-bcachefs.nix rec { - kernel = linux_6_0; + kernel = linux_6_1; kernelPatches = kernel.kernelPatches; }; From 13b0e42202fa3919d551e2e130098c2b14e4b745 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sun, 1 Jan 2023 19:52:05 +0100 Subject: [PATCH 26/33] nixos/tests/installer: disable zfs for bcachefs tests we are potentially testing very new kernels here, which are not supported by zfs yet. --- nixos/tests/installer.nix | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/nixos/tests/installer.nix b/nixos/tests/installer.nix index 398ad8de19cf..223aac491391 100644 --- a/nixos/tests/installer.nix +++ b/nixos/tests/installer.nix @@ -465,8 +465,12 @@ let ''; testSpecialisationConfig = true; }; - - + # disable zfs so we can support latest kernel if needed + no-zfs-module = { + nixpkgs.overlays = [(final: super: { + zfs = super.zfs.overrideAttrs(_: {meta.platforms = [];});} + )]; + }; in { # !!! `parted mkpart' seems to silently create overlapping partitions. @@ -714,6 +718,7 @@ in { bcachefsSimple = makeInstallerTest "bcachefs-simple" { extraInstallerConfig = { boot.supportedFilesystems = [ "bcachefs" ]; + imports = [ no-zfs-module ]; }; createPartitions = '' @@ -737,6 +742,10 @@ in { bcachefsEncrypted = makeInstallerTest "bcachefs-encrypted" { extraInstallerConfig = { boot.supportedFilesystems = [ "bcachefs" ]; + + # disable zfs so we can support latest kernel if needed + imports = [ no-zfs-module ]; + environment.systemPackages = with pkgs; [ keyutils ]; }; @@ -769,6 +778,9 @@ in { bcachefsMulti = makeInstallerTest "bcachefs-multi" { extraInstallerConfig = { boot.supportedFilesystems = [ "bcachefs" ]; + + # disable zfs so we can support latest kernel if needed + imports = [ no-zfs-module ]; }; createPartitions = '' From c8104628f4057f2b1842f6e31eaff2fe1d0eeda7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sun, 1 Jan 2023 19:53:11 +0100 Subject: [PATCH 27/33] nixos/tests/installer/bcachefs: use ocr to type in password --- nixos/tests/installer.nix | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/nixos/tests/installer.nix b/nixos/tests/installer.nix index 223aac491391..5f3f61632f07 100644 --- a/nixos/tests/installer.nix +++ b/nixos/tests/installer.nix @@ -749,10 +749,15 @@ in { environment.systemPackages = with pkgs; [ keyutils ]; }; - # We don't want to use the normal way of unlocking bcachefs defined in tasks/filesystems/bcachefs.nix. - # So, override initrd.postDeviceCommands completely and simply unlock with the predefined password. extraConfig = '' - boot.initrd.postDeviceCommands = lib.mkForce "echo password | bcachefs unlock /dev/vda3"; + boot.kernelParams = lib.mkAfter [ "console=tty0" ]; + ''; + + enableOCR = true; + preBootCommands = '' + machine.start() + machine.wait_for_text("enter passphrase for ") + machine.send_chars("password\n") ''; createPartitions = '' From 108b709361eea88dc90b319841b4350b1e0fded8 Mon Sep 17 00:00:00 2001 From: figsoda Date: Sun, 1 Jan 2023 14:30:17 -0500 Subject: [PATCH 28/33] nurl: 0.2.1 -> 0.2.2 Diff: https://github.com/nix-community/nurl/compare/v0.2.1...v0.2.2 Changelog: https://github.com/nix-community/nurl/blob/v0.2.2/CHANGELOG.md --- pkgs/tools/misc/nurl/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/nurl/default.nix b/pkgs/tools/misc/nurl/default.nix index bf8e75deb6e1..b3ba4ca3a6aa 100644 --- a/pkgs/tools/misc/nurl/default.nix +++ b/pkgs/tools/misc/nurl/default.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "nurl"; - version = "0.2.1"; + version = "0.2.2"; src = fetchFromGitHub { owner = "nix-community"; repo = "nurl"; rev = "v${version}"; - hash = "sha256-bL0HNoHHFH7ouw4gFl0QJCjAOCzHPnTS76OmrgQN3V4="; + hash = "sha256-hK3bHaMzpqz3W/iJpSPf4Iv6nrLpVLBIkAy5QxI+yrg="; }; - cargoSha256 = "sha256-UfJeYAN1f/JvPpEKzlG2BzUulreDqv3NEnSoOb2TlM0="; + cargoSha256 = "sha256-eHk9mBaHbKVp7lCmSmrHQoRMDFCmUJ+LN5TVa3LhNZ8="; nativeBuildInputs = [ installShellFiles From af62c860ec78e9c211f97ae6c48f7efb306402f0 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Sun, 25 Dec 2022 00:32:46 +0100 Subject: [PATCH 29/33] =?UTF-8?q?ocamlPackages.imagelib:=2020210511=20?= =?UTF-8?q?=E2=86=92=2020221222?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/ocaml-modules/imagelib/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/ocaml-modules/imagelib/default.nix b/pkgs/development/ocaml-modules/imagelib/default.nix index 101a0e28b94e..2733ef4cee0c 100644 --- a/pkgs/development/ocaml-modules/imagelib/default.nix +++ b/pkgs/development/ocaml-modules/imagelib/default.nix @@ -3,20 +3,20 @@ }: buildDunePackage rec { - minimumOCamlVersion = "4.07"; - version = "20210511"; + minimalOCamlVersion = "4.08"; + version = "20221222"; pname = "imagelib"; - useDune2 = true; + duneVersion = "3"; src = fetchurl { url = "https://github.com/rlepigre/ocaml-imagelib/releases/download/${version}/imagelib-${version}.tbz"; - sha256 = "1cb94ea3731dc994c205940c9434543ce3f2470cdcb2e93a3e02ed793e80d480"; + hash = "sha256-BQ2TVxGlpc6temteK84TKXpx0MtHZSykL/TjKN9xGP0="; }; propagatedBuildInputs = [ decompress stdlib-shims ]; - doCheck = lib.versionAtLeast ocaml.version "4.08"; + doCheck = true; checkInputs = [ alcotest ]; meta = { From 79010d72b95adac0969e3a084095d38ff4b4af76 Mon Sep 17 00:00:00 2001 From: Tomo <68489118+Tomodachi94@users.noreply.github.com> Date: Sun, 1 Jan 2023 12:06:50 -0800 Subject: [PATCH 30/33] vimPlugins: update --- .../editors/vim/plugins/generated.nix | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index bcffc8d95d11..edd4a90e5e06 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -823,12 +823,12 @@ final: prev: barbar-nvim = buildVimPluginFrom2Nix { pname = "barbar.nvim"; - version = "2022-12-31"; + version = "2023-01-01"; src = fetchFromGitHub { owner = "romgrk"; repo = "barbar.nvim"; - rev = "e773abf71973422dc8333bec9f7930674b3ab7bd"; - sha256 = "1rq3hixp11g67g5qhwaxpnfnblsrsfnww6ynf3k3p16k8nrxdsd5"; + rev = "bb2e5e4df5b643c4353e9d6de2d2e6e863f5e531"; + sha256 = "147vgf7cldq1f04glcp9md2f4y06p3l8jl5sk45np9b8kp5ysh2q"; }; meta.homepage = "https://github.com/romgrk/barbar.nvim/"; }; @@ -4071,8 +4071,8 @@ final: prev: src = fetchFromGitHub { owner = "folke"; repo = "lazy.nvim"; - rev = "11eee43c7ee63a71b08009769437e8a10814a48c"; - sha256 = "1swinq9dv3iix3g34a0f4bkc2dkd4y6vl23r90lqccmnlfm6h72v"; + rev = "3974a6cbe38f7958c2e4f41c6f0d9a6c001a723d"; + sha256 = "1idpzy1mnkgvpgiiirazpfpdm2xvv4zl7bbfsvmfqi6wc57c7vx6"; }; meta.homepage = "https://github.com/folke/lazy.nvim/"; }; @@ -6243,8 +6243,8 @@ final: prev: src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter"; - rev = "3a621b9a8362fac358d828254485024986d6d81b"; - sha256 = "0dib32b4y325f4yfarw0ph74851lg56slq0vgf1rrq3v588szvdl"; + rev = "b67822bf58b0fbf0c496ae21a177d02fa8388edf"; + sha256 = "01l1sl39pia8fa2b7ld0rdi76yjlrnh82rlxvgfqjivppq23k0zm"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/"; }; @@ -12238,12 +12238,12 @@ final: prev: vim-slime = buildVimPluginFrom2Nix { pname = "vim-slime"; - version = "2022-10-29"; + version = "2023-01-01"; src = fetchFromGitHub { owner = "jpalardy"; repo = "vim-slime"; - rev = "55e8604bda53f11cbce5d2b976bacb157de70297"; - sha256 = "19r7hx4xkw3b8fc81gp1sqc4xk3w2i55mpcbsrjr1mjyjwydjb84"; + rev = "c9eaebd1068443b4d92c952788e4c75d337c1125"; + sha256 = "0d8l1l8hmc6n78n8j20fwc7171615rbi139j1z2l7821f6dbggzk"; }; meta.homepage = "https://github.com/jpalardy/vim-slime/"; }; @@ -12755,12 +12755,12 @@ final: prev: vim-tpipeline = buildVimPluginFrom2Nix { pname = "vim-tpipeline"; - version = "2022-12-22"; + version = "2023-01-01"; src = fetchFromGitHub { owner = "vimpostor"; repo = "vim-tpipeline"; - rev = "b4aefd5a1e697ea68d50df2f7b222036a7251df8"; - sha256 = "147mv6zn5b8my8a8w7ddk1g1wzj0xsdssb265j19vs8ajijg7bcy"; + rev = "86f37afec5cefd75baaebf8900889dabb9789a2c"; + sha256 = "133vfipflvalyp373lmqza5p8dhh2qnnvlh5y2bsxh5abjk1jml1"; }; meta.homepage = "https://github.com/vimpostor/vim-tpipeline/"; }; From d6748dcee7e397c0f5ea2e8c1ffcac9078ea69df Mon Sep 17 00:00:00 2001 From: Tomo <68489118+Tomodachi94@users.noreply.github.com> Date: Sun, 1 Jan 2023 12:08:03 -0800 Subject: [PATCH 31/33] vimPlugins.vim-mediawiki-editor: init at 2022-10-29 --- pkgs/applications/editors/vim/plugins/generated.nix | 12 ++++++++++++ pkgs/applications/editors/vim/plugins/overrides.nix | 4 ++++ .../editors/vim/plugins/vim-plugin-names | 1 + 3 files changed, 17 insertions(+) diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index edd4a90e5e06..16af8d0a3e74 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -11108,6 +11108,18 @@ final: prev: meta.homepage = "https://github.com/andymass/vim-matchup/"; }; + vim-mediawiki-editor = buildVimPluginFrom2Nix { + pname = "vim-mediawiki-editor"; + version = "2022-10-29"; + src = fetchFromGitHub { + owner = "aquach"; + repo = "vim-mediawiki-editor"; + rev = "ba6a1139bdde0bdf2990f7110a42b304815f76b5"; + sha256 = "00d1vwf0say9vsrsvz710483ybbhwn5799k3qb4skna0vzjryayz"; + }; + meta.homepage = "https://github.com/aquach/vim-mediawiki-editor/"; + }; + vim-mergetool = buildVimPluginFrom2Nix { pname = "vim-mergetool"; version = "2019-06-22"; diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix index 140a3b317ce9..e94ac82659d7 100644 --- a/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/overrides.nix @@ -669,6 +669,10 @@ self: super: { dontBuild = true; }); + vim-mediawiki-editor = super.vim-mediawiki-editor.overrideAttrs (old: { + passthru.python3Dependencies = [ python3.pkgs.mwclient ]; + }); + nvim-spectre = super.nvim-spectre.overrideAttrs (old: { dependencies = with self; [ plenary-nvim ]; }); diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index 513a4cf06661..bf53350006c6 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -933,6 +933,7 @@ https://github.com/preservim/vim-markdown/,, https://github.com/euclio/vim-markdown-composer/,, https://github.com/mzlogin/vim-markdown-toc/,, https://github.com/andymass/vim-matchup/,, +https://github.com/aquach/vim-mediawiki-editor/,HEAD, https://github.com/samoshkin/vim-mergetool/,, https://github.com/idanarye/vim-merginal/,, https://github.com/david-a-wheeler/vim-metamath/,, From 89a9ff18f14970a8f4138fb6e7874e8a49d08840 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stanis=C5=82aw=20Pitucha?= Date: Tue, 27 Dec 2022 21:21:10 +1100 Subject: [PATCH 32/33] nanosaur,nanosaur2,otto-matic: cleanup cmake build Use the standard way of building cmake projects. This also removes the unnecessary build files from the output. --- pkgs/games/nanosaur/default.nix | 15 +++------------ pkgs/games/nanosaur2/default.nix | 15 +++------------ pkgs/games/otto-matic/default.nix | 17 +++++++++-------- 3 files changed, 15 insertions(+), 32 deletions(-) diff --git a/pkgs/games/nanosaur/default.nix b/pkgs/games/nanosaur/default.nix index c62fd3c5db72..32c2a0b9ecc9 100644 --- a/pkgs/games/nanosaur/default.nix +++ b/pkgs/games/nanosaur/default.nix @@ -20,21 +20,12 @@ stdenv.mkDerivation rec { SDL2 ]; - configurePhase = '' - runHook preConfigure - cmake -S . -B build -DCMAKE_BUILD_TYPE=Release - runHook postConfigure - ''; - - buildPhase = '' - runHook preBuild - cmake --build build - runHook postBuild - ''; + cmakeFlags = [ "-DCMAKE_BUILD_TYPE=Release" ]; installPhase = '' runHook preInstall - mv build $out + mkdir -p "$out/bin" + mv Nanosaur Data ReadMe.txt "$out/" makeWrapper $out/Nanosaur $out/bin/Nanosaur --chdir "$out" runHook postInstall ''; diff --git a/pkgs/games/nanosaur2/default.nix b/pkgs/games/nanosaur2/default.nix index da0e6dbe7293..e4e0919cd30c 100644 --- a/pkgs/games/nanosaur2/default.nix +++ b/pkgs/games/nanosaur2/default.nix @@ -20,21 +20,12 @@ stdenv.mkDerivation rec { SDL2 ]; - configurePhase = '' - runHook preConfigure - cmake -S . -B build -DCMAKE_BUILD_TYPE=Release - runHook postConfigure - ''; - - buildPhase = '' - runHook preBuild - cmake --build build - runHook postBuild - ''; + cmakeFlags = [ "-DCMAKE_BUILD_TYPE=Release" ]; installPhase = '' runHook preInstall - mv build $out + mkdir -p "$out/bin" + mv Nanosaur2 Data ReadMe.txt "$out/" makeWrapper $out/Nanosaur2 $out/bin/Nanosaur2 --chdir "$out" runHook postInstall ''; diff --git a/pkgs/games/otto-matic/default.nix b/pkgs/games/otto-matic/default.nix index 7523f2070e9a..17b63b263029 100644 --- a/pkgs/games/otto-matic/default.nix +++ b/pkgs/games/otto-matic/default.nix @@ -12,22 +12,23 @@ stdenv.mkDerivation rec { fetchSubmodules = true; }; - buildInputs = [ - SDL2 - ]; - nativeBuildInputs = [ cmake makeWrapper ]; + buildInputs = [ + SDL2 + ]; + + cmakeFlags = [ "-DCMAKE_BUILD_TYPE=Release" ]; + installPhase = '' runHook preInstall - mkdir -p $out/share/OttoMatic - mv Data $out/share/OttoMatic - install -Dm755 {.,$out/bin}/OttoMatic - wrapProgram $out/bin/OttoMatic --chdir "$out/share/OttoMatic" + mkdir -p "$out/bin" + mv OttoMatic Data ReadMe.txt "$out/" + makeWrapper $out/OttoMatic $out/bin/OttoMatic --chdir "$out" runHook postInstall ''; From f534a05aba33a533dfe6b071905d690a8aa707c3 Mon Sep 17 00:00:00 2001 From: "Berk D. Demir" Date: Tue, 27 Dec 2022 17:29:27 -0800 Subject: [PATCH 33/33] age: 1.0.0 -> 1.1.1 Worked with the upstream to change how test vectors were sourced, so we can run tests in a sandbox with no networking. --- pkgs/tools/security/age/default.nix | 29 +++++++++++++++++++++++++---- 1 file changed, 25 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/security/age/default.nix b/pkgs/tools/security/age/default.nix index 2e9d988500f1..588285973e47 100644 --- a/pkgs/tools/security/age/default.nix +++ b/pkgs/tools/security/age/default.nix @@ -1,17 +1,38 @@ -{ lib, buildGoModule, fetchFromGitHub, installShellFiles }: +{ lib, buildGoModule, fetchFromGitHub, fetchpatch, installShellFiles }: buildGoModule rec { pname = "age"; - version = "1.0.0"; - vendorSha256 = "sha256-Hdsd+epcLFLkeHzJ2CUu4ss1qOd0+lTjhfs9MhI5Weg="; + version = "1.1.1"; + vendorSha256 = "sha256-MumPdRTz840+hoisJ7ADgBhyK3n8P6URobbRJYDFkDY="; src = fetchFromGitHub { owner = "FiloSottile"; repo = "age"; rev = "v${version}"; - sha256 = "sha256-MfyW8Yv8swKqA7Hl45l5Zn4wZrQmE661eHsKIywy36U="; + sha256 = "sha256-LRxxJQLQkzoCNYGS/XBixVmYXoZ1mPHKvFicPGXYLcw="; }; + # Worked with the upstream to change the way test vectors were sourced from + # another repo at test run time, so we can run test without network access. + # https://github.com/FiloSottile/age/pull/476 + # + # Changes landed after v1.1.1, so we'll patch this one until next release. + patches = [ + # Revert "all: temporarily disable testscript tests" + (fetchpatch { + name = "0001-revert-temporarily-disabled-testscript-tests.patch"; + url = "https://github.com/FiloSottile/age/commit/5471e05672de168766f5f11453fd324c53c264e5.patch"; + sha256 = "sha256-F3oDhRWJqqcF9MDDWPeO9V/wUGXkmUXY87wgokUIoOk="; + }) + + # age: depend on c2sp.org/CCTV/age for TestVectors + (fetchpatch { + name = "0002-depend-on-c2sp_cctv_age__TestVectors.patch"; + url = "https://github.com/FiloSottile/age/commit/edf7388f7731b274b055dcab3ec4006cc4961b68.patch"; + sha256 = "sha256-CloCj/uF3cqTeCfRkV6TeYiovuDQXm1ZIklREWAot1E="; + }) + ]; + ldflags = [ "-s" "-w" "-X main.Version=${version}" ];