From c73e6e892d6f968fa4ba6c40fff438edfabaf892 Mon Sep 17 00:00:00 2001 From: Ivan Trubach Date: Tue, 26 Sep 2023 00:10:13 +0300 Subject: [PATCH 01/97] pulumiPackages.pulumi-yandex-unofficial: init at 0.98.0 --- pkgs/tools/admin/pulumi-packages/base.nix | 8 +++--- pkgs/tools/admin/pulumi-packages/default.nix | 1 + .../pulumi-yandex-unofficial.nix | 27 +++++++++++++++++++ 3 files changed, 33 insertions(+), 3 deletions(-) create mode 100644 pkgs/tools/admin/pulumi-packages/pulumi-yandex-unofficial.nix diff --git a/pkgs/tools/admin/pulumi-packages/base.nix b/pkgs/tools/admin/pulumi-packages/base.nix index 001a247379bc..a0bb0c4e1840 100644 --- a/pkgs/tools/admin/pulumi-packages/base.nix +++ b/pkgs/tools/admin/pulumi-packages/base.nix @@ -10,9 +10,10 @@ let , vendorHash , cmd , extraLdflags + , env , ... }@args: buildGoModule (rec { - inherit pname src vendorHash version; + inherit pname src vendorHash version env; sourceRoot = "${src.name}/provider"; @@ -81,6 +82,7 @@ in , cmdGen , cmdRes , extraLdflags +, env ? { } , meta , fetchSubmodules ? false , ... @@ -92,14 +94,14 @@ let }; pulumi-gen = mkBasePackage rec { - inherit src version vendorHash extraLdflags; + inherit src version vendorHash extraLdflags env; cmd = cmdGen; pname = cmdGen; }; in mkBasePackage ({ - inherit meta src version vendorHash extraLdflags; + inherit meta src version vendorHash extraLdflags env; pname = repo; diff --git a/pkgs/tools/admin/pulumi-packages/default.nix b/pkgs/tools/admin/pulumi-packages/default.nix index 5aed6b171783..9e232a1f45bf 100644 --- a/pkgs/tools/admin/pulumi-packages/default.nix +++ b/pkgs/tools/admin/pulumi-packages/default.nix @@ -11,4 +11,5 @@ in pulumi-language-nodejs = callPackage ./pulumi-language-nodejs.nix { }; pulumi-language-python = callPackage ./pulumi-language-python.nix { }; pulumi-random = callPackage' ./pulumi-random.nix { }; + pulumi-yandex-unofficial = callPackage' ./pulumi-yandex-unofficial.nix { }; } diff --git a/pkgs/tools/admin/pulumi-packages/pulumi-yandex-unofficial.nix b/pkgs/tools/admin/pulumi-packages/pulumi-yandex-unofficial.nix new file mode 100644 index 000000000000..52079fbda066 --- /dev/null +++ b/pkgs/tools/admin/pulumi-packages/pulumi-yandex-unofficial.nix @@ -0,0 +1,27 @@ +{ lib +, mkPulumiPackage +}: +# Note that we are not using https://github.com/pulumi/pulumi-yandex because +# it has been archived in 2022. +mkPulumiPackage rec { + owner = "Regrau"; + repo = "pulumi-yandex"; + version = "0.98.0"; + rev = "v${version}"; + hash = "sha256-Olwl4JNrJUiJaGha7ZT0Qb0+6hRKxOOy06eKMJfYf0I="; + vendorHash = "sha256-8mu0msSq59f5GZNo7YIGuNTYealGyEL9kwk0jCcSO68="; + cmdGen = "pulumi-tfgen-yandex"; + cmdRes = "pulumi-resource-yandex"; + extraLdflags = [ + "-X github.com/regrau/${repo}/provider/pkg/version.Version=v${version}" + ]; + __darwinAllowLocalNetworking = true; + env.GOWORK = "off"; + meta = with lib; { + description = "Unofficial Yandex Cloud Resource Provider"; + homepage = "https://github.com/Regrau/pulumi-yandex"; + license = licenses.asl20; + maintainers = with maintainers; [ tie veehaitch trundle ]; + mainProgram = cmdRes; + }; +} From b173a5c7cd6fa21ec27b6f12de31c7cfa24e202c Mon Sep 17 00:00:00 2001 From: Anna Aurora Date: Tue, 27 Dec 2022 11:02:35 +0100 Subject: [PATCH 02/97] find-billy: init at 0.37.3 --- pkgs/games/find-billy/default.nix | 69 +++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 71 insertions(+) create mode 100644 pkgs/games/find-billy/default.nix diff --git a/pkgs/games/find-billy/default.nix b/pkgs/games/find-billy/default.nix new file mode 100644 index 000000000000..37f38a58041e --- /dev/null +++ b/pkgs/games/find-billy/default.nix @@ -0,0 +1,69 @@ +{ stdenv +, lib +, fetchFromGitea +, godot3-headless +, godot3-export-templates +, godot3 +, makeWrapper +, just +, inkscape +, imagemagick +}: + +stdenv.mkDerivation rec { + pname = "find-billy"; + version = "0.37.3"; + + src = fetchFromGitea { + domain = "codeberg.org"; + owner = "annaaurora"; + repo = "Find-Billy"; + rev = "v${version}"; + hash = "sha256-z1GR5W67LJb5z+u/qeFZreMK4B6PjB18coecLCYFHy8="; + }; + + strictDeps = true; + + nativeBuildInputs = [ godot3-headless makeWrapper just inkscape imagemagick ]; + + postPatch = '' + substituteInPlace export_presets.cfg --replace 'res://build/icons/usr/share/icons/hicolor' $out/share/icons/hicolor + substituteInPlace project.godot --replace 'res://build/icons/usr/share/icons/hicolor' $out/share/icons/hicolor + + substituteInPlace justfile --replace '{{build_icons_dir}}/usr' $out + ''; + + buildPhase = '' + runHook preBuild + + # Cannot create file `/homeless-shelter/.config/godot/projects/...` + export HOME=$TMPDIR + # Link the export-templates to the expected location. The `--export` option expects the templates in the home directory. + mkdir -p $HOME/.local/share/godot + ln -s ${godot3-export-templates}/share/godot/templates $HOME/.local/share/godot + + mkdir -p $out/share/find-billy + godot3-headless --export-pack 'Linux/X11' $out/share/${pname}/${pname}.pck + makeWrapper ${godot3}/bin/godot3 $out/bin/${pname} \ + --add-flags "--main-pack" \ + --add-flags "$out/share/${pname}/${pname}.pck" + + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + + just build-icons + install -D ${pname}.desktop -t $out/share/applications + + runHook postInstall + ''; + + meta = with lib; { + description = "A 2 dimensional Pixel Art Jump & Run"; + homepage = "https://codeberg.org/annaaurora/Find-Billy"; + license = licenses.gpl3Plus; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 26f01082edd5..ef5e5ee5b4f9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1049,6 +1049,8 @@ with pkgs; prefetch-yarn-deps fetchYarnDeps; + find-billy = callPackage ../games/find-billy { }; + find-cursor = callPackage ../tools/X11/find-cursor { }; flare-floss = callPackage ../tools/security/flare-floss { }; From 9d5e1917bff2508f6530182864948d0651281d5c Mon Sep 17 00:00:00 2001 From: Pavel Sobolev Date: Tue, 26 Sep 2023 11:23:19 +0300 Subject: [PATCH 03/97] python3Packages.pyqtdarktheme: init at 2.1.0 --- ...ument-to-the-proxy-style-initializer.patch | 25 +++++++ .../python-modules/pyqtdarktheme/default.nix | 70 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 3 files changed, 97 insertions(+) create mode 100644 pkgs/development/python-modules/pyqtdarktheme/add-missing-argument-to-the-proxy-style-initializer.patch create mode 100644 pkgs/development/python-modules/pyqtdarktheme/default.nix diff --git a/pkgs/development/python-modules/pyqtdarktheme/add-missing-argument-to-the-proxy-style-initializer.patch b/pkgs/development/python-modules/pyqtdarktheme/add-missing-argument-to-the-proxy-style-initializer.patch new file mode 100644 index 000000000000..9d77e2901bed --- /dev/null +++ b/pkgs/development/python-modules/pyqtdarktheme/add-missing-argument-to-the-proxy-style-initializer.patch @@ -0,0 +1,25 @@ +From 816afb6a3a6a340ae2a2a06dc054dd8e65ff9d8f Mon Sep 17 00:00:00 2001 +From: Pavel Sobolev +Date: Mon, 30 Oct 2023 20:42:31 +0300 +Subject: [PATCH] Add missing argument to the `proxy_style` initializer. + +--- + qdarktheme/_proxy_style.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/qdarktheme/_proxy_style.py b/qdarktheme/_proxy_style.py +index b1fb358..f04f01e 100644 +--- a/qdarktheme/_proxy_style.py ++++ b/qdarktheme/_proxy_style.py +@@ -14,7 +14,7 @@ class QDarkThemeStyle(QProxyStyle): + + def __init__(self): + """Initialize style proxy.""" +- super().__init__() ++ super().__init__(None) + + def standardIcon( # noqa: N802 + self, standard_icon: QStyle.StandardPixmap, option: QStyleOption | None, widget +-- +2.42.0 + diff --git a/pkgs/development/python-modules/pyqtdarktheme/default.nix b/pkgs/development/python-modules/pyqtdarktheme/default.nix new file mode 100644 index 000000000000..0d60c8039898 --- /dev/null +++ b/pkgs/development/python-modules/pyqtdarktheme/default.nix @@ -0,0 +1,70 @@ +{ lib +, buildPythonPackage +, pythonOlder +, fetchFromGitHub + +, darkdetect +, poetry-core + +, pyqt5 +, pytest-mock +, pytest-qt +, pytestCheckHook +, qt5 +}: + +buildPythonPackage rec { + pname = "pyqtdarktheme"; + version = "2.1.0"; + pyproject = true; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "5yutan5"; + repo = "PyQtDarkTheme"; + rev = "v${version}"; + hash = "sha256-jK+wnIyPE8Bav0pzbvVisYYCzdRshYw1S2t0H3Pro5M="; + }; + + patches = [ + ./add-missing-argument-to-the-proxy-style-initializer.patch + ]; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + darkdetect + ]; + + nativeCheckInputs = [ + pyqt5 + pytest-mock + pytest-qt + pytestCheckHook + ]; + + pythonImportsCheck = [ + "qdarktheme" + ]; + + prePatch = '' + sed -i 's#darkdetect = ".*"#darkdetect = "*"#' pyproject.toml + ''; + + preCheck = '' + export HOME=$(mktemp -d) + export QT_PLUGIN_PATH="${qt5.qtbase.bin}/${qt5.qtbase.qtPluginPrefix}" + export QT_QPA_PLATFORM_PLUGIN_PATH="${qt5.qtbase.bin}/lib/qt-${qt5.qtbase.version}/plugins"; + export QT_QPA_PLATFORM=offscreen + ''; + + meta = with lib; { + description = "A flat dark theme for PySide and PyQt"; + homepage = "https://pyqtdarktheme.readthedocs.io/en/stable"; + license = licenses.mit; + maintainers = with maintainers; [ paveloom ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 211844d068cd..b889e2778440 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -11042,6 +11042,8 @@ self: super: with self; { setuptools sip; }; + pyqtdarktheme = callPackage ../development/python-modules/pyqtdarktheme { }; + pyqtdatavisualization = pkgs.libsForQt5.callPackage ../development/python-modules/pyqtdatavisualization { inherit (self) buildPythonPackage pyqt5 pyqt-builder python pythonOlder setuptools sip; From 4f38e4136c2c779732f570c2a94da19f1cd14faa Mon Sep 17 00:00:00 2001 From: D3vil0p3r Date: Sat, 17 Feb 2024 13:41:12 +0100 Subject: [PATCH 04/97] lbd: init at 0-unstable-2024-02-17 --- pkgs/by-name/lb/lbd/package.nix | 48 +++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) create mode 100644 pkgs/by-name/lb/lbd/package.nix diff --git a/pkgs/by-name/lb/lbd/package.nix b/pkgs/by-name/lb/lbd/package.nix new file mode 100644 index 000000000000..f84ed553ad25 --- /dev/null +++ b/pkgs/by-name/lb/lbd/package.nix @@ -0,0 +1,48 @@ +{ lib +, stdenvNoCC +, fetchFromGitHub +, makeWrapper +, bash +, coreutils +, diffutils +, gawk +, gnugrep +, gnused +, host +, netcat-openbsd +}: + +stdenvNoCC.mkDerivation { + pname = "lbd"; + version = "0-unstable-2024-02-17"; + + src = fetchFromGitHub { + owner = "D3vil0p3r"; + repo = "lbd"; + rev = "73baaaecddcd834d43d79f50f0808b779c9a97c3"; + hash = "sha256-NHY3NoPigsmfRjOx9Lt3/fGsyeq1/bzKHIXMDBJiI6c="; + }; + + nativeBuildInputs = [ + makeWrapper + ]; + + installPhase = '' + runHook preInstall + mkdir -p $out/{bin,share/lbd} + cp lbd $out/share/lbd/ + makeWrapper ${lib.getExe bash} $out/bin/lbd \ + --prefix PATH : "${lib.makeBinPath [ coreutils diffutils gawk gnugrep gnused host netcat-openbsd ]}" \ + --add-flags "$out/share/lbd/lbd" + runHook postInstall + ''; + + meta = with lib; { + description = "Detect if a domain uses DNS and/or HTTP Load-Balancing"; + mainProgram = "lbd"; + homepage = "https://github.com/D3vil0p3r/lbd"; + maintainers = with maintainers; [ d3vil0p3r ]; + platforms = platforms.unix; + license = licenses.gpl2Plus; + }; +} From b831e46dd1a599ea4e630566cbac28181502d912 Mon Sep 17 00:00:00 2001 From: TomaSajt <62384384+TomaSajt@users.noreply.github.com> Date: Sun, 10 Mar 2024 14:40:07 +0100 Subject: [PATCH 05/97] gogui: make deterministic and clean up --- pkgs/games/gogui/default.nix | 45 ++++++++++++++++++------------------ 1 file changed, 23 insertions(+), 22 deletions(-) diff --git a/pkgs/games/gogui/default.nix b/pkgs/games/gogui/default.nix index 43e1f3397b8f..50cb29ddb454 100644 --- a/pkgs/games/gogui/default.nix +++ b/pkgs/games/gogui/default.nix @@ -1,48 +1,46 @@ -{ ant +{ lib +, stdenv +, fetchFromGitHub +, ant +, jdk +, jre , docbook-xsl-ns , docbook_xml_dtd_42 -, fetchFromGitHub , imagemagick -, lib , libxslt +, stripJavaArchivesHook , makeWrapper -, openjdk -, stdenv }: -let - version = "1.5.4a"; -in stdenv.mkDerivation { +stdenv.mkDerivation (finalAttrs: { pname = "gogui"; - inherit version; + version = "1.5.4a"; src = fetchFromGitHub { owner = "Remi-Coulom"; repo = "gogui"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-UFhOk2mAnTtxfwEOHquN64YDCRq7nNUqZAPQf77MEEw="; }; nativeBuildInputs = [ - makeWrapper ant - ]; - - buildInputs = [ + jdk docbook-xsl-ns imagemagick libxslt - openjdk + stripJavaArchivesHook + makeWrapper ]; buildPhase = '' runHook preBuild substituteInPlace doc/manual/xml/book.xml \ - --replace http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd \ + --replace-fail http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd \ ${docbook_xml_dtd_42}/xml/dtd/docbook/docbookx.dtd substituteInPlace doc/manual/xml/manpages.xml \ - --replace http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd \ + --replace-fail http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd \ ${docbook_xml_dtd_42}/xml/dtd/docbook/docbookx.dtd # generate required gui images from svg @@ -75,21 +73,24 @@ in stdenv.mkDerivation { ln -s $out/share/doc/gogui/manual/man $out/share/man/man1 # copy programs - mv -vi {bin,lib} $out/ + mv -vi bin lib $out/ # wrap programs for x in $out/bin/*; do - wrapProgram $x --prefix PATH ":" ${openjdk}/bin --set GOGUI_JAVA_HOME ${openjdk} + wrapProgram $x \ + --prefix PATH : ${jre}/bin \ + --set GOGUI_JAVA_HOME ${jre} done runHook postInstall ''; meta = { - maintainers = [ lib.maintainers.cleverca22 lib.maintainers.omnipotententity]; description = "A graphical user interface to programs that play the board game Go and support the Go Text Protocol such as GNU Go"; homepage = "https://github.com/Remi-Coulom/gogui"; + license = lib.licenses.gpl3Plus; + mainProgram = "gogui"; + maintainers = with lib.maintainers; [ cleverca22 omnipotententity ]; platforms = lib.platforms.unix; - license = lib.licenses.gpl3; }; -} +}) From 6ef0689a2d2f76a78f1081b159ffda079c3daa64 Mon Sep 17 00:00:00 2001 From: Anomalocaridid <29845794+Anomalocaridid@users.noreply.github.com> Date: Tue, 2 Apr 2024 23:30:10 -0400 Subject: [PATCH 06/97] ternimal: init at 0.1.0-unstable-2017-12-31 --- pkgs/by-name/te/ternimal/package.nix | 44 ++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) create mode 100644 pkgs/by-name/te/ternimal/package.nix diff --git a/pkgs/by-name/te/ternimal/package.nix b/pkgs/by-name/te/ternimal/package.nix new file mode 100644 index 000000000000..31f796f1ae60 --- /dev/null +++ b/pkgs/by-name/te/ternimal/package.nix @@ -0,0 +1,44 @@ +{ lib +, stdenv +, fetchFromGitHub +, rustc +}: +stdenv.mkDerivation { + pname = "ternimal"; + version = "0.1.0-unstable-2017-12-31"; + + src = fetchFromGitHub { + owner = "p-e-w"; + repo = "ternimal"; + rev = "e7953b4f80e514899e0920f0e36bb3141b685122"; + hash = "sha256-uIxuwRvStvlC/YiolOvWZd45Qg3b86jsZQ000zZMo3M="; + }; + + nativeBuildInputs = [ rustc ]; + + buildPhase = '' + runHook preBuild + + rustc -O $src/ternimal.rs + + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + + mkdir -p $out/bin + cp ternimal $out/bin + + runHook postInstall + ''; + + meta = { + description = "Simulate a lifeform in the terminal"; + homepage = "https://github.com/p-e-w/ternimal"; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ anomalocaris ]; + platforms = with lib.platforms; linux ++ darwin; + mainProgram = "ternimal"; + }; +} From bf6eeb31e8d090b20d7ed8bb8dd3286a397b4d69 Mon Sep 17 00:00:00 2001 From: TomaSajt <62384384+TomaSajt@users.noreply.github.com> Date: Thu, 4 Apr 2024 20:58:17 +0200 Subject: [PATCH 07/97] luneta: init at 0.7.4 --- pkgs/by-name/lu/luneta/dub-lock.json | 24 +++++++++++++++ pkgs/by-name/lu/luneta/package.nix | 44 ++++++++++++++++++++++++++++ 2 files changed, 68 insertions(+) create mode 100644 pkgs/by-name/lu/luneta/dub-lock.json create mode 100644 pkgs/by-name/lu/luneta/package.nix diff --git a/pkgs/by-name/lu/luneta/dub-lock.json b/pkgs/by-name/lu/luneta/dub-lock.json new file mode 100644 index 000000000000..b45bfa0fd654 --- /dev/null +++ b/pkgs/by-name/lu/luneta/dub-lock.json @@ -0,0 +1,24 @@ +{ + "dependencies": { + "arsd-official": { + "version": "7.2.0", + "sha256": "1m546r6l0pkk80y5f3ff8im08hp59nwzjb5ikjhfiswvdizpwjlh" + }, + "fuzzyd": { + "version": "2.2.0-beta", + "sha256": "0wzih4yrlrrj12ls9hd27gnxrj4j4c0ha9xprdfc7azszlv16j6g" + }, + "ncurses": { + "version": "1.0.0", + "sha256": "0ivl88vp2dy9rpv6x3f9jlyqa7aps2x1kkyx80w2d4vcs31pzmb2" + }, + "riverd-loader": { + "version": "1.0.2", + "sha256": "0c94551bscnia7vpixaq4xd2anprkd7pkf0q0anyadv5kqa8xgip" + }, + "riverd-ncurses": { + "version": "1.0.5", + "sha256": "1wgdschv6hpdjykf5bblxphnhnpy2kvw8hq8h5iaygi9zr7jf286" + } + } +} diff --git a/pkgs/by-name/lu/luneta/package.nix b/pkgs/by-name/lu/luneta/package.nix new file mode 100644 index 000000000000..02e9a0724da2 --- /dev/null +++ b/pkgs/by-name/lu/luneta/package.nix @@ -0,0 +1,44 @@ +{ + lib, + buildDubPackage, + fetchFromGitHub, + ncurses, +}: + +buildDubPackage rec { + pname = "luneta"; + version = "0.7.4"; + + src = fetchFromGitHub { + owner = "fbeline"; + repo = "luneta"; + rev = "v${version}"; + hash = "sha256-pYE8hccXT87JIMh71PtXzVQBegTzU7bdpVEaV2VkaEk="; + }; + + # not sure why, but this alias does not resolve + postPatch = '' + substituteInPlace source/luneta/keyboard.d \ + --replace-fail "wint_t" "dchar" + ''; + + # ncurses dub package version is locked to 1.0.0 instead of using ~master + dubLock = ./dub-lock.json; + + buildInputs = [ ncurses ]; + + installPhase = '' + runHook preInstall + install -Dm755 luneta -t $out/bin + runHook postInstall + ''; + + meta = { + changelog = "https://github.com/fbeline/luneta/releases/tag/${src.rev}"; + description = "An interactive filter and fuzzy finder for the command-line"; + homepage = "https://github.com/fbeline/luneta"; + license = lib.licenses.gpl2Only; + mainProgram = "luneta"; + maintainers = with lib.maintainers; [ tomasajt ]; + }; +} From 868b1800300885bf11224b0d20b84258787ce19f Mon Sep 17 00:00:00 2001 From: "P." Date: Fri, 5 Apr 2024 22:28:58 -0600 Subject: [PATCH 08/97] python3Packages.proton-vpn-killswitch: 0.2.0-unstable-2023-09-05 -> 0.4.0 --- .../python-modules/proton-vpn-killswitch/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/proton-vpn-killswitch/default.nix b/pkgs/development/python-modules/proton-vpn-killswitch/default.nix index d36dedfbd4aa..912980453ad9 100644 --- a/pkgs/development/python-modules/proton-vpn-killswitch/default.nix +++ b/pkgs/development/python-modules/proton-vpn-killswitch/default.nix @@ -6,16 +6,16 @@ , pytestCheckHook }: -buildPythonPackage { +buildPythonPackage rec { pname = "proton-vpn-killswitch"; - version = "0.2.0-unstable-2023-09-05"; + version = "0.4.0"; pyproject = true; src = fetchFromGitHub { owner = "ProtonVPN"; repo = "python-proton-vpn-killswitch"; - rev = "6e84588ea6ae0946141d4b44b2cf5df8465d5eba"; - hash = "sha256-eFwWN8E+nIDpbut8tkWqXucLhzm7HaLAMBIbAq/X2eo="; + rev = "v${version}"; + hash = "sha256-XZqjAhxgIiATJd3JcW2WWUMC1b6+cfZRhXlIPyMUFH8="; }; nativeBuildInputs = [ From 125d7728432b50ba34e49ce13f4a0e045748669f Mon Sep 17 00:00:00 2001 From: oluceps Date: Wed, 13 Mar 2024 23:46:39 +0800 Subject: [PATCH 09/97] pingtunnel: init at 2.8 Co-authored-by: Aleksana Co-authored-by: Sandro --- pkgs/by-name/pi/pingtunnel/package.nix | 32 ++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 pkgs/by-name/pi/pingtunnel/package.nix diff --git a/pkgs/by-name/pi/pingtunnel/package.nix b/pkgs/by-name/pi/pingtunnel/package.nix new file mode 100644 index 000000000000..826a56269928 --- /dev/null +++ b/pkgs/by-name/pi/pingtunnel/package.nix @@ -0,0 +1,32 @@ +{ lib +, buildGoModule +, fetchFromGitHub +}: + +buildGoModule rec { + pname = "pingtunnel"; + version = "2.8"; + + src = fetchFromGitHub { + owner = "esrrhs"; + repo = "pingtunnel"; + rev = version; + hash = "sha256-qkIeE6gNBUUd5/IhcKhDmXZbzeSTR0r6qCAK/Nz7Kew="; + }; + + vendorHash = "sha256-SkBHFvQn3Q6fl/d1npEspTYhq1YrnusXNWr/Ky4bv64="; + + ldflags = [ "-s" "-w" ]; + + postInstall = '' + mv $out/bin/cmd $out/bin/pingtunnel + ''; + + meta = with lib; { + description = "A tool that send TCP/UDP traffic over ICMP"; + homepage = "https://github.com/esrrhs/pingtunnel"; + license = licenses.mit; + maintainers = with maintainers; [ oluceps ]; + mainProgram = "pingtunnel"; + }; +} From 873db98d3db00eb732a52c59eb911487db657925 Mon Sep 17 00:00:00 2001 From: Julien Malka Date: Mon, 15 Apr 2024 19:55:19 +0200 Subject: [PATCH 10/97] nixos/limesurvey: allow package to be customized --- nixos/modules/services/web-apps/limesurvey.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/nixos/modules/services/web-apps/limesurvey.nix b/nixos/modules/services/web-apps/limesurvey.nix index 0d0361584c3a..cdd60f572b99 100644 --- a/nixos/modules/services/web-apps/limesurvey.nix +++ b/nixos/modules/services/web-apps/limesurvey.nix @@ -2,7 +2,7 @@ let - inherit (lib) mkDefault mkEnableOption mkForce mkIf mkMerge mkOption; + inherit (lib) mkDefault mkEnableOption mkForce mkIf mkMerge mkOption mkPackageOption; inherit (lib) literalExpression mapAttrs optional optionalString types; cfg = config.services.limesurvey; @@ -12,8 +12,6 @@ let group = config.services.httpd.group; stateDir = "/var/lib/limesurvey"; - pkg = pkgs.limesurvey; - configType = with types; oneOf [ (attrsOf configType) str int bool ] // { description = "limesurvey config type (str, int, bool or attribute set thereof)"; }; @@ -34,6 +32,8 @@ in options.services.limesurvey = { enable = mkEnableOption "Limesurvey web application"; + package = mkPackageOption pkgs "limesurvey" { }; + encryptionKey = mkOption { type = types.str; default = "E17687FC77CEE247F0E22BB3ECF27FDE8BEC310A892347EC13013ABA11AA7EB5"; @@ -240,7 +240,7 @@ in adminAddr = mkDefault cfg.virtualHost.adminAddr; extraModules = [ "proxy_fcgi" ]; virtualHosts.${cfg.virtualHost.hostName} = mkMerge [ cfg.virtualHost { - documentRoot = mkForce "${pkg}/share/limesurvey"; + documentRoot = mkForce "${cfg.package}/share/limesurvey"; extraConfig = '' Alias "/tmp" "${stateDir}/tmp" @@ -256,7 +256,7 @@ in Options -Indexes - + SetHandler "proxy:unix:${fpm.socket}|fcgi://localhost/" @@ -277,7 +277,7 @@ in "d ${stateDir}/tmp/assets 0750 ${user} ${group} - -" "d ${stateDir}/tmp/runtime 0750 ${user} ${group} - -" "d ${stateDir}/tmp/upload 0750 ${user} ${group} - -" - "C ${stateDir}/upload 0750 ${user} ${group} - ${pkg}/share/limesurvey/upload" + "C ${stateDir}/upload 0750 ${user} ${group} - ${cfg.package}/share/limesurvey/upload" ]; systemd.services.limesurvey-init = { @@ -288,8 +288,8 @@ in environment.LIMESURVEY_CONFIG = limesurveyConfig; script = '' # update or install the database as required - ${pkgs.php81}/bin/php ${pkg}/share/limesurvey/application/commands/console.php updatedb || \ - ${pkgs.php81}/bin/php ${pkg}/share/limesurvey/application/commands/console.php install admin password admin admin@example.com verbose + ${pkgs.php81}/bin/php ${cfg.package}/share/limesurvey/application/commands/console.php updatedb || \ + ${pkgs.php81}/bin/php ${cfg.package}/share/limesurvey/application/commands/console.php install admin password admin admin@example.com verbose ''; serviceConfig = { User = user; From 1bcf9527353a701312f86b22b6a3e3022f1abd5c Mon Sep 17 00:00:00 2001 From: Adam Stephens Date: Wed, 17 Apr 2024 09:13:06 -0400 Subject: [PATCH 11/97] firefoxpwa: apply nixfmt, sort lists --- pkgs/by-name/fi/firefoxpwa/package.nix | 69 ++++++++++++++++++-------- 1 file changed, 47 insertions(+), 22 deletions(-) diff --git a/pkgs/by-name/fi/firefoxpwa/package.nix b/pkgs/by-name/fi/firefoxpwa/package.nix index 971d5ac16fde..1329b4171014 100644 --- a/pkgs/by-name/fi/firefoxpwa/package.nix +++ b/pkgs/by-name/fi/firefoxpwa/package.nix @@ -1,22 +1,25 @@ -{ lib -, rustPlatform -, fetchFromGitHub -, makeWrapper -, pkg-config -, installShellFiles -, firefox-unwrapped -, openssl -, stdenv -, udev -, libva -, mesa -, libnotify -, xorg -, cups -, pciutils -, libcanberra-gtk3 -, extraLibs ? [ ] -, nixosTests +{ + extraLibs ? [ ], + + lib, + fetchFromGitHub, + installShellFiles, + makeWrapper, + rustPlatform, + + cups, + firefox-unwrapped, + libcanberra-gtk3, + libnotify, + libva, + mesa, + nixosTests, + openssl, + pciutils, + pkg-config, + stdenv, + udev, + xorg, }: rustPlatform.buildRustPackage rec { @@ -47,7 +50,11 @@ rustPlatform.buildRustPackage rec { sed -i $'s;DISTRIBUTION_VERSION = \'0.0.0\';DISTRIBUTION_VERSION = \'${version}\';' userchrome/profile/chrome/pwa/chrome.jsm ''; - nativeBuildInputs = [ makeWrapper pkg-config installShellFiles ]; + nativeBuildInputs = [ + installShellFiles + makeWrapper + pkg-config + ]; buildInputs = [ openssl ]; FFPWA_EXECUTABLES = ""; # .desktop entries generated without any store path references @@ -55,7 +62,22 @@ rustPlatform.buildRustPackage rec { completions = "target/${stdenv.targetPlatform.config}/release/completions"; gtk_modules = map (x: x + x.gtkModule) [ libcanberra-gtk3 ]; - libs = let libs = lib.optionals stdenv.isLinux [ udev libva mesa libnotify xorg.libXScrnSaver cups pciutils ] ++ gtk_modules ++ extraLibs; in lib.makeLibraryPath libs + ":" + lib.makeSearchPathOutput "lib" "lib64" libs; + libs = + let + libs = + lib.optionals stdenv.isLinux [ + cups + libnotify + libva + mesa + pciutils + udev + xorg.libXScrnSaver + ] + ++ gtk_modules + ++ extraLibs; + in + lib.makeLibraryPath libs + ":" + lib.makeSearchPathOutput "lib" "lib64" libs; postInstall = '' # Runtime @@ -127,7 +149,10 @@ rustPlatform.buildRustPackage rec { changelog = "https://github.com/filips123/PWAsForFirefox/releases/tag/v${version}"; license = licenses.mpl20; platforms = platforms.unix; - maintainers = with maintainers; [ camillemndn pasqui23 ]; + maintainers = with maintainers; [ + camillemndn + pasqui23 + ]; mainProgram = "firefoxpwa"; }; } From e7722c10477579c3d5f6857a81752a1e40d30f47 Mon Sep 17 00:00:00 2001 From: Adam Stephens Date: Wed, 17 Apr 2024 09:13:29 -0400 Subject: [PATCH 12/97] firefoxpwa: add adamcstephens as maintainer --- pkgs/by-name/fi/firefoxpwa/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/fi/firefoxpwa/package.nix b/pkgs/by-name/fi/firefoxpwa/package.nix index 1329b4171014..d5aa674016d1 100644 --- a/pkgs/by-name/fi/firefoxpwa/package.nix +++ b/pkgs/by-name/fi/firefoxpwa/package.nix @@ -150,6 +150,7 @@ rustPlatform.buildRustPackage rec { license = licenses.mpl20; platforms = platforms.unix; maintainers = with maintainers; [ + adamcstephens camillemndn pasqui23 ]; From 404bb210268b33f5d1bfc34e1b25e146a3789529 Mon Sep 17 00:00:00 2001 From: Adam Stephens Date: Wed, 17 Apr 2024 09:14:33 -0400 Subject: [PATCH 13/97] firefoxpwa: fix libEGL detection --- pkgs/by-name/fi/firefoxpwa/package.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/by-name/fi/firefoxpwa/package.nix b/pkgs/by-name/fi/firefoxpwa/package.nix index d5aa674016d1..b75d6694c19d 100644 --- a/pkgs/by-name/fi/firefoxpwa/package.nix +++ b/pkgs/by-name/fi/firefoxpwa/package.nix @@ -10,6 +10,7 @@ cups, firefox-unwrapped, libcanberra-gtk3, + libglvnd, libnotify, libva, mesa, @@ -67,6 +68,7 @@ rustPlatform.buildRustPackage rec { libs = lib.optionals stdenv.isLinux [ cups + libglvnd libnotify libva mesa From 30ed264371aad2f7da29cc1e6ca6535262e76881 Mon Sep 17 00:00:00 2001 From: Jared Baur Date: Tue, 16 Apr 2024 00:58:20 -0700 Subject: [PATCH 14/97] clatd: init at 1.6 [clatd](https://github.com/toreanderson/clatd) implements the CLAT component of the 464XLAT network architecture specified in RFC 6877. --- pkgs/by-name/cl/clatd/package.nix | 63 +++++++++++++++++++++++++++++++ 1 file changed, 63 insertions(+) create mode 100644 pkgs/by-name/cl/clatd/package.nix diff --git a/pkgs/by-name/cl/clatd/package.nix b/pkgs/by-name/cl/clatd/package.nix new file mode 100644 index 000000000000..dff8ce4261a9 --- /dev/null +++ b/pkgs/by-name/cl/clatd/package.nix @@ -0,0 +1,63 @@ +{ lib +, stdenv +, fetchFromGitHub +, makeWrapper +, perl +, perlPackages +, tayga +, iproute2 +, iptables +}: + +stdenv.mkDerivation rec { + pname = "clatd"; + version = "1.6"; + + src = fetchFromGitHub { + owner = "toreanderson"; + repo = "clatd"; + rev = "v${version}"; + hash = "sha256-ZUGWQTXXgATy539NQxkZSvQA7HIWkIPsw1NJrz0xKEg="; + }; + + strictDeps = true; + + nativeBuildInputs = [ + makeWrapper + perl # for pod2man + ]; + + buildInputs = with perlPackages; [ + perl + NetIP + NetDNS + ]; + + makeFlags = [ "PREFIX=$(out)" ]; + + preBuild = '' + mkdir -p $out/{sbin,share/man/man8} + ''; + + postFixup = '' + patchShebangs $out/bin/clatd + wrapProgram $out/bin/clatd \ + --set PERL5LIB $PERL5LIB \ + --prefix PATH : ${ + lib.makeBinPath [ + tayga + iproute2 + iptables + ] + } + ''; + + meta = with lib; { + description = "A 464XLAT CLAT implementation for Linux"; + homepage = "https://github.com/toreanderson/clatd"; + license = licenses.mit; + maintainers = with maintainers; [ jmbaur ]; + mainProgram = "clatd"; + platforms = platforms.linux; + }; +} From 87bbc5fbbed9265649c90c2567cc9df6df5266bc Mon Sep 17 00:00:00 2001 From: Jonathan Zielinski Date: Wed, 10 Apr 2024 23:33:39 +0200 Subject: [PATCH 15/97] nixos/oauth2_proxy: add oidc-issuer-url flag --- nixos/modules/services/security/oauth2_proxy.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/nixos/modules/services/security/oauth2_proxy.nix b/nixos/modules/services/security/oauth2_proxy.nix index d1dc37d549d2..d3e1a70d7c20 100644 --- a/nixos/modules/services/security/oauth2_proxy.nix +++ b/nixos/modules/services/security/oauth2_proxy.nix @@ -47,6 +47,7 @@ let reverse-proxy = reverseProxy; proxy-prefix = proxyPrefix; profile-url = profileURL; + oidc-issuer-url = oidcIssuerUrl; redeem-url = redeemURL; redirect-url = redirectURL; request-logging = requestLogging; @@ -131,6 +132,15 @@ in example = "123456.apps.googleusercontent.com"; }; + oidcIssuerUrl = mkOption { + type = types.nullOr types.str; + default = null; + description = '' + The OAuth issuer URL. + ''; + example = "https://login.microsoftonline.com/{TENANT_ID}/v2.0"; + }; + clientSecret = mkOption { type = types.nullOr types.str; description = lib.mdDoc '' From a59ae7b002f5759f0f90c5c0d62a43e1bf198d33 Mon Sep 17 00:00:00 2001 From: emattiza Date: Thu, 18 Apr 2024 17:00:06 -0500 Subject: [PATCH 16/97] python3Packages.result: 0.7.0 -> 0.16.1 --- .../python-modules/result/default.nix | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/pkgs/development/python-modules/result/default.nix b/pkgs/development/python-modules/result/default.nix index 3f15c2ce4c1a..111c8dad2a30 100644 --- a/pkgs/development/python-modules/result/default.nix +++ b/pkgs/development/python-modules/result/default.nix @@ -2,18 +2,20 @@ , buildPythonPackage , fetchFromGitHub , pytestCheckHook +, pytest-asyncio +, nix-update-script }: buildPythonPackage rec { pname = "result"; - version = "0.7.0"; + version = "0.16.1"; format = "setuptools"; src = fetchFromGitHub { owner = "rustedpy"; repo = "result"; - rev = "v${version}"; - hash = "sha256-bEf3OJg6ksDvzZE7ezA58Q2FObb5V7BG8vkKtX284Jg="; + rev = "v${version}"; + hash = "sha256-7BvFIQbl4Udd9GTpbMrAqP0P1BGn/C1CHQ3QUCEMXPs="; }; postPatch = '' @@ -28,19 +30,16 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook + pytest-asyncio ]; - disabledTestPaths = [ - #TODO: figure out the failure "match o:" Invalid Syntax - "tests/test_pattern_matching.py" - ]; - + passthru.updateScript = nix-update-script {}; pythonImportsCheck = [ "result" ]; meta = with lib; { description = "A simple Result type for Python 3 inspired by Rust, fully type annotated"; homepage = "https://github.com/rustedpy/result"; license = licenses.mit; - maintainers = []; + maintainers = with lib.maintainers; [ emattiza ]; }; } From 922ff9ac832d429890bbbe2abaac3484870f3d8f Mon Sep 17 00:00:00 2001 From: Ryan Cao <70191398+ryanccn@users.noreply.github.com> Date: Fri, 19 Apr 2024 10:52:06 +0800 Subject: [PATCH 17/97] nrr: 0.8.0 -> 0.9.0 --- pkgs/by-name/nr/nrr/package.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/nr/nrr/package.nix b/pkgs/by-name/nr/nrr/package.nix index 6b37d272f5f8..0992152aed3e 100644 --- a/pkgs/by-name/nr/nrr/package.nix +++ b/pkgs/by-name/nr/nrr/package.nix @@ -5,20 +5,21 @@ , darwin , pkg-config , libiconv +, nrxAlias ? true }: rustPlatform.buildRustPackage rec { pname = "nrr"; - version = "0.8.0"; + version = "0.9.0"; src = fetchFromGitHub { owner = "ryanccn"; repo = "nrr"; rev = "v${version}"; - hash = "sha256-4zQi7kQxcRXpYuSjolSZoDqX+CcGmq4dvChPlZZZVso="; + hash = "sha256-94BeBCYCxZBoOp6xo4I/uxd6ULjIfmF4nw/vUWoaEpo="; }; - cargoHash = "sha256-XNnyEFEzKQ5N0xtskaUudcb2LtAiEsd6h3D/FdyIbHc="; + cargoHash = "sha256-DTQTIAk914XC+LecQTXk1TdBc/5sMFG8KiD9lO5HLiM="; buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.CoreFoundation @@ -31,8 +32,10 @@ rustPlatform.buildRustPackage rec { pkg-config ]; + postInstall = lib.optionalString nrxAlias "ln -s $out/bin/nr{r,x}"; + meta = with lib; { - description = "Minimal, blazing fast Node.js script runner"; + description = "Minimal, blazing fast npm scripts runner"; maintainers = with maintainers; [ ryanccn ]; license = licenses.gpl3Only; mainProgram = "nrr"; From ef501d8fcdf47082b0ce1d5d9f596ec403bf3d73 Mon Sep 17 00:00:00 2001 From: "P." Date: Fri, 5 Apr 2024 22:43:06 -0600 Subject: [PATCH 18/97] python3Packages.proton-core: 0.1.15-unstable-2023-10-24 -> 0.1.16 --- pkgs/development/python-modules/proton-core/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/proton-core/default.nix b/pkgs/development/python-modules/proton-core/default.nix index 9623cb0544d9..07eb0b9fc707 100644 --- a/pkgs/development/python-modules/proton-core/default.nix +++ b/pkgs/development/python-modules/proton-core/default.nix @@ -10,16 +10,16 @@ , pytestCheckHook }: -buildPythonPackage { +buildPythonPackage rec { pname = "proton-core"; - version = "0.1.15-unstable-2023-10-24"; + version = "0.1.16"; pyproject = true; src = fetchFromGitHub { owner = "ProtonVPN"; repo = "python-proton-core"; - rev = "5e795e04094dff67c03c56f2f3de03ff43514cc4"; - hash = "sha256-hchwrolc65tVmSe2IzxwH2zDU2JZzXrCMzWaETWcMDI="; + rev = "refs/tags/v${version}"; + hash = "sha256-072XuHvgWludlFwp/tqLpuAU89vzifFhwQ01FuiCoL8="; }; nativeBuildInputs = [ From bc8a6765d089de37205a56cf620ce8f26a4558fe Mon Sep 17 00:00:00 2001 From: "P." Date: Fri, 19 Apr 2024 10:13:50 -0600 Subject: [PATCH 19/97] python3Packages.proton-vpn-session: 0.6.5 -> 0.6.7 --- .../development/python-modules/proton-vpn-session/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/proton-vpn-session/default.nix b/pkgs/development/python-modules/proton-vpn-session/default.nix index 38d89bb6d3e0..6295038b6f9e 100644 --- a/pkgs/development/python-modules/proton-vpn-session/default.nix +++ b/pkgs/development/python-modules/proton-vpn-session/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "proton-vpn-session"; - version = "0.6.5"; + version = "0.6.7"; pyproject = true; src = fetchFromGitHub { owner = "ProtonVPN"; repo = "python-proton-vpn-session"; rev = "refs/tags/v${version}"; - hash = "sha256-1oyCxBO9YqMopbw88UJF8k4BJFP4+m23NwSrqTYqcg8="; + hash = "sha256-/5ju/2bxhqK6JWchkxFe3amBKHtO98GCVQWIrUsn+nQ="; }; nativeBuildInputs = [ From f1a441b1e8403daca3da4b04ddd9c6cb0107f85f Mon Sep 17 00:00:00 2001 From: "P." Date: Fri, 19 Apr 2024 10:16:11 -0600 Subject: [PATCH 20/97] python3Packages.proton-keyring-linux: 0.0.1-unstable-2023-04-14 -> 0.0.2 --- .../python-modules/proton-keyring-linux/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/proton-keyring-linux/default.nix b/pkgs/development/python-modules/proton-keyring-linux/default.nix index 4dac98134ac0..231a482658b3 100644 --- a/pkgs/development/python-modules/proton-keyring-linux/default.nix +++ b/pkgs/development/python-modules/proton-keyring-linux/default.nix @@ -7,16 +7,16 @@ , pytestCheckHook }: -buildPythonPackage { +buildPythonPackage rec { pname = "proton-keyring-linux"; - version = "0.0.1-unstable-2023-04-14"; + version = "0.0.2"; pyproject = true; src = fetchFromGitHub { owner = "ProtonVPN"; repo = "python-proton-keyring-linux"; - rev = "5ff3c7f9a1a162836649502dd23c2fbe1f487d73"; - hash = "sha256-4d8ZePG8imURhdNtLbraMRisrTLoRvJ+L2UuuOo3MPM="; + rev = "refs/tags/v${version}"; + hash = "sha256-c2wdbd8Hkz2hF9zYMy4/V/W6uZRItz7tWqLJqTsJoHU="; }; nativeBuildInputs = [ From 73f49016786de1faf890c6c36f9001693125a77e Mon Sep 17 00:00:00 2001 From: "P." Date: Fri, 19 Apr 2024 10:19:17 -0600 Subject: [PATCH 21/97] python3Packages.proton-keyring-linux-secretservice: 0.0.1-unstable-2023-04-14 -> 0.0.2 --- .../proton-keyring-linux-secretservice/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/proton-keyring-linux-secretservice/default.nix b/pkgs/development/python-modules/proton-keyring-linux-secretservice/default.nix index 78de141dad56..db8a0d14cdb3 100644 --- a/pkgs/development/python-modules/proton-keyring-linux-secretservice/default.nix +++ b/pkgs/development/python-modules/proton-keyring-linux-secretservice/default.nix @@ -6,16 +6,16 @@ , pytestCheckHook }: -buildPythonPackage { +buildPythonPackage rec { pname = "proton-keyring-linux-secretservice"; - version = "0.0.1-unstable-2023-04-14"; + version = "0.0.2"; pyproject = true; src = fetchFromGitHub { owner = "ProtonVPN"; repo = "python-proton-keyring-linux-secretservice"; - rev = "973d2646ec4d04bc270df53058df892950244e70"; - hash = "sha256-JlhvJBpbewT2c8k31CPMUlvvo/orWW1qfylFZLnDxeY="; + rev = "refs/tags/v${version}"; + hash = "sha256-IZPT2bL/1YD2TH/djwIQHUE1RRbYMTkQDacjjoqDQWo="; }; nativeBuildInputs = [ From 6c975b60f835e497325a6fd6d23c3348e3f6d602 Mon Sep 17 00:00:00 2001 From: "P." Date: Fri, 19 Apr 2024 10:40:53 -0600 Subject: [PATCH 22/97] python3Packages.proton-vpn-api-core: 0.20.3 -> 0.22.3 --- .../python-modules/proton-vpn-api-core/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/proton-vpn-api-core/default.nix b/pkgs/development/python-modules/proton-vpn-api-core/default.nix index ba8869e42daa..3e602ab839de 100644 --- a/pkgs/development/python-modules/proton-vpn-api-core/default.nix +++ b/pkgs/development/python-modules/proton-vpn-api-core/default.nix @@ -7,20 +7,21 @@ , proton-vpn-logger , proton-vpn-killswitch , proton-vpn-session +, sentry-sdk , distro , pytestCheckHook }: buildPythonPackage rec { pname = "proton-vpn-api-core"; - version = "0.20.3"; + version = "0.22.3"; pyproject = true; src = fetchFromGitHub { owner = "ProtonVPN"; repo = "python-proton-vpn-api-core"; rev = "refs/tags/v${version}"; - hash = "sha256-acck0Nc/15soTJBC/4y83ID9fjF/q4vrYr6SsLAAVRY="; + hash = "sha256-BGei6tw6VTKkHmaIWa2VJfKOL5cRUbauOQ7zp1RY9Bo="; }; nativeBuildInputs = [ @@ -34,6 +35,7 @@ buildPythonPackage rec { proton-vpn-logger proton-vpn-killswitch proton-vpn-session + sentry-sdk ]; postPatch = '' From fec9bbea950b834ea8b79b72515e5261b1fb49bc Mon Sep 17 00:00:00 2001 From: "P." Date: Fri, 19 Apr 2024 11:02:29 -0600 Subject: [PATCH 23/97] python3Packages.proton-vpn-connection: 0.11.3 -> 0.14.4 --- .../python-modules/proton-vpn-connection/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/proton-vpn-connection/default.nix b/pkgs/development/python-modules/proton-vpn-connection/default.nix index 2257130c20e0..9fb7250f10b3 100644 --- a/pkgs/development/python-modules/proton-vpn-connection/default.nix +++ b/pkgs/development/python-modules/proton-vpn-connection/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "proton-vpn-connection"; - version = "0.11.3"; + version = "0.14.4"; pyproject = true; src = fetchFromGitHub { owner = "ProtonVPN"; repo = "python-proton-vpn-connection"; rev = "refs/tags/v${version}"; - hash = "sha256-RuLnc/olI8S09WFG126N2xZgW4gf+DDpRstcelqMhs4="; + hash = "sha256-Ze/te0G0tDzyZPGVVqvuJlZoHWJqJ36LnHO+Cy5nxx8="; }; nativeBuildInputs = [ From 5f69b9ea7ea9c467cda784fbd5837f888e702d6e Mon Sep 17 00:00:00 2001 From: "P." Date: Fri, 19 Apr 2024 11:11:25 -0600 Subject: [PATCH 24/97] python3Packages.proton-vpn-killswitch-network-manager: 0.2.0-unstable-2023-09-05 -> 0.4.3 --- .../proton-vpn-killswitch-network-manager/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/proton-vpn-killswitch-network-manager/default.nix b/pkgs/development/python-modules/proton-vpn-killswitch-network-manager/default.nix index d0f62ac6f998..78e9b29a2925 100644 --- a/pkgs/development/python-modules/proton-vpn-killswitch-network-manager/default.nix +++ b/pkgs/development/python-modules/proton-vpn-killswitch-network-manager/default.nix @@ -11,16 +11,16 @@ , pytestCheckHook }: -buildPythonPackage { +buildPythonPackage rec { pname = "proton-vpn-killswitch-network-manager"; - version = "0.2.0-unstable-2023-09-05"; + version = "0.4.3"; pyproject = true; src = fetchFromGitHub { owner = "ProtonVPN"; repo = "python-proton-vpn-killswitch-network-manager"; - rev = "39d4398f169539e335c1f661e0dfc5551df0e6af"; - hash = "sha256-vmTXMIhXZgRvXeUX/XslT+ShqY60w4P7kJBQzWhA66k="; + rev = "refs/tags/v${version}"; + hash = "sha256-kN41b6OZ2YXoBsmNZD3NrX4uJChSmm6DVP+5LYwiZMw="; }; nativeBuildInputs = [ From cc5020a388f6b928dea79cca437d78f77ec7b148 Mon Sep 17 00:00:00 2001 From: "P." Date: Fri, 19 Apr 2024 11:29:09 -0600 Subject: [PATCH 25/97] python3Packages.proton-vpn-network-manager: 0.3.3 -> 0.4.2 --- .../python-modules/proton-vpn-network-manager/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/proton-vpn-network-manager/default.nix b/pkgs/development/python-modules/proton-vpn-network-manager/default.nix index ccd84eda6698..0327354e7927 100644 --- a/pkgs/development/python-modules/proton-vpn-network-manager/default.nix +++ b/pkgs/development/python-modules/proton-vpn-network-manager/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "proton-vpn-network-manager"; - version = "0.3.3"; + version = "0.4.2"; pyproject = true; src = fetchFromGitHub { owner = "ProtonVPN"; repo = "python-proton-vpn-network-manager"; rev = "refs/tags/v${version}"; - hash = "sha256-UEXoIFLB3/q3G3ASrgsXxF21iT5rCWm4knGezcmxmnk="; + hash = "sha256-zw6fzay1zCBIrouDg2EMhaxDLKIYV5TKYK5lQ3v8W6o="; }; nativeBuildInputs = [ From 903889a04def438126a465018518867343c8d1ee Mon Sep 17 00:00:00 2001 From: "P." Date: Fri, 19 Apr 2024 11:33:10 -0600 Subject: [PATCH 26/97] python3Packages.proton-vpn-network-manager-openvpn: 0.0.4-unstable-2023-07-05 -> 0.0.7 --- .../proton-vpn-network-manager-openvpn/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/proton-vpn-network-manager-openvpn/default.nix b/pkgs/development/python-modules/proton-vpn-network-manager-openvpn/default.nix index 9eca560ac005..57c2615f53fc 100644 --- a/pkgs/development/python-modules/proton-vpn-network-manager-openvpn/default.nix +++ b/pkgs/development/python-modules/proton-vpn-network-manager-openvpn/default.nix @@ -8,16 +8,16 @@ , pytestCheckHook }: -buildPythonPackage { +buildPythonPackage rec { pname = "proton-vpn-network-manager-openvpn"; - version = "0.0.4-unstable-2023-07-05"; + version = "0.0.7"; pyproject = true; src = fetchFromGitHub { owner = "ProtonVPN"; repo = "python-proton-vpn-network-manager-openvpn"; - rev = "b79f6732646378ef1b92696de3665ff9560286d3"; - hash = "sha256-Z5X8RRu+1KaZ0pnH7tzGhfeST2W8bxMZnuryLhFjG/g="; + rev = "refs/tags/v${version}"; + hash = "sha256-AHG4jEEv1ihpboQwz6FmNtlqCE83qyOeGzBDHQcvD6o="; }; nativeBuildInputs = [ From be8db4a28be12624895d2288804c9db663832787 Mon Sep 17 00:00:00 2001 From: "P." Date: Fri, 19 Apr 2024 11:35:33 -0600 Subject: [PATCH 27/97] protonvpn-gui: 4.1.10 -> 4.3.0 --- pkgs/applications/networking/protonvpn-gui/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/protonvpn-gui/default.nix b/pkgs/applications/networking/protonvpn-gui/default.nix index e273a3242739..2930ef450ea2 100644 --- a/pkgs/applications/networking/protonvpn-gui/default.nix +++ b/pkgs/applications/networking/protonvpn-gui/default.nix @@ -27,14 +27,14 @@ buildPythonApplication rec { pname = "protonvpn-gui"; - version = "4.1.10"; + version = "4.3.0"; pyproject = true; src = fetchFromGitHub { owner = "ProtonVPN"; repo = "proton-vpn-gtk-app"; rev = "refs/tags/v${version}"; - hash = "sha256-D06dMMjzFE7gIGFpIH/+0xmVCckqAWLkb3lc2ZmxNZs="; + hash = "sha256-H4m4u9zksab47W5aIsQZPQTPEYiXbmrVCnT67b+A5Tc="; }; nativeBuildInputs = [ From 7a4083dbc06f18abe89615a05438ee5ab760a4dc Mon Sep 17 00:00:00 2001 From: nat-418 <93013864+nat-418@users.noreply.github.com> Date: Fri, 19 Apr 2024 19:58:33 +0200 Subject: [PATCH 28/97] =?UTF-8?q?knock:=20github=20=E2=86=92=20codeberg?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/tools/networking/knock/package.nix | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/networking/knock/package.nix b/pkgs/tools/networking/knock/package.nix index b9879859722a..1197bec808cf 100644 --- a/pkgs/tools/networking/knock/package.nix +++ b/pkgs/tools/networking/knock/package.nix @@ -1,6 +1,6 @@ { lib , buildGoModule -, fetchFromGitHub +, fetchFromGitea , installShellFiles }: @@ -8,11 +8,12 @@ buildGoModule rec { pname = "knock"; version = "0.0.2"; - src = fetchFromGitHub { + src = fetchFromGitea { + domain = "codeberg.org"; owner = "nat-418"; repo ="knock"; - rev = "refs/tags/v${version}"; - hash = "sha256-VXrWphfBDGDNsz4iuUdwwd46oqnmhJ9i3TtzMqHoSJk="; + rev = "v${version}"; + hash = "sha256-K+L4F4bTERQSqISAmfyps/U5GJ2N0FdJ3RmpiUmt4uA="; }; vendorHash = "sha256-wkSXdIgfkHbVJYsgm/hLAeKA9geof92U3mzSzt7eJE8="; @@ -27,9 +28,9 @@ buildGoModule rec { meta = with lib; { description = "A simple CLI network reachability tester"; - homepage = "https://github.com/nat-418/knock"; + homepage = "https://codeberg.org/nat-418/knock"; license = licenses.bsd0; - changelog = "https://github.com/nat-418/knock/blob/${version}/CHANGELOG.md"; + changelog = "https://codeberg.org/nat-418/knock/raw/branch/trunk/CHANGELOG.md"; maintainers = with maintainers; [ nat-418 ]; }; } From 910ecd57ed318cbe109dc3e01b81f807d65e6693 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 19 Apr 2024 19:23:18 +0000 Subject: [PATCH 29/97] intel-compute-runtime: 24.09.28717.12 -> 24.13.29138.7 --- pkgs/os-specific/linux/intel-compute-runtime/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/intel-compute-runtime/default.nix b/pkgs/os-specific/linux/intel-compute-runtime/default.nix index f4a250d4a84c..e686e0680419 100644 --- a/pkgs/os-specific/linux/intel-compute-runtime/default.nix +++ b/pkgs/os-specific/linux/intel-compute-runtime/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "intel-compute-runtime"; - version = "24.09.28717.12"; + version = "24.13.29138.7"; src = fetchFromGitHub { owner = "intel"; repo = "compute-runtime"; rev = version; - hash = "sha256-RzXV6icenMcQxmOfKA8Tpb6FigLXz3ZyoL0n16+jFRc="; + hash = "sha256-AMIuA1AMrSX0xpdGSfye8iUJTk5s9HDiRy9Yy3kZss8="; }; nativeBuildInputs = [ cmake pkg-config ]; From 5cbfb939e5701d0ea1568916e0b5d521a1f24971 Mon Sep 17 00:00:00 2001 From: stuebinm Date: Fri, 19 Apr 2024 21:39:02 +0200 Subject: [PATCH 30/97] nixos/fcast-receiver: remove uses of lib.mdDoc --- nixos/modules/programs/fcast-receiver.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/modules/programs/fcast-receiver.nix b/nixos/modules/programs/fcast-receiver.nix index 8da07a66e222..2e4e6bf8b242 100644 --- a/nixos/modules/programs/fcast-receiver.nix +++ b/nixos/modules/programs/fcast-receiver.nix @@ -11,11 +11,11 @@ in }; options.programs.fcast-receiver = { - enable = mkEnableOption (lib.mdDoc "FCast Receiver"); + enable = mkEnableOption "FCast Receiver"; openFirewall = mkOption { type = types.bool; default = false; - description = lib.mdDoc '' + description = '' Open ports needed for the functionality of the program. ''; }; From 10eac325290ea3d4b1a02dfb2540a12b1c016fc0 Mon Sep 17 00:00:00 2001 From: seth Date: Mon, 4 Mar 2024 11:54:53 -0500 Subject: [PATCH 31/97] glfw: 3.3.10 -> 3.4 Diff: https://github.com/glfw/GLFW/compare/3.3.10...3.4 --- pkgs/development/libraries/glfw/3.x.nix | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/glfw/3.x.nix b/pkgs/development/libraries/glfw/3.x.nix index 014e5f7e9f0e..278214aa809a 100644 --- a/pkgs/development/libraries/glfw/3.x.nix +++ b/pkgs/development/libraries/glfw/3.x.nix @@ -2,18 +2,18 @@ , libGL, libXrandr, libXinerama, libXcursor, libX11, libXi, libXext , Carbon, Cocoa, Kernel, OpenGL, fixDarwinDylibNames , waylandSupport ? false, extra-cmake-modules, wayland -, wayland-protocols, libxkbcommon +, wayland-scanner, wayland-protocols, libxkbcommon }: stdenv.mkDerivation rec { - version = "3.3.10"; + version = "3.4"; pname = "glfw"; src = fetchFromGitHub { owner = "glfw"; repo = "GLFW"; rev = version; - sha256 = "sha256-kTRXsfQ+9PFurG3ffz0lwnITAYAXtNl3h/3O6FSny5o="; + sha256 = "sha256-FcnQPDeNHgov1Z07gjFze0VMz2diOrpbKZCsI96ngz0="; }; # Fix linkage issues on X11 (https://github.com/NixOS/nixpkgs/issues/142583) @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ] ++ lib.optional stdenv.isDarwin fixDarwinDylibNames - ++ lib.optional waylandSupport extra-cmake-modules; + ++ lib.optionals waylandSupport [ extra-cmake-modules wayland-scanner ]; buildInputs = lib.optionals stdenv.isDarwin [ Carbon Cocoa Kernel ] @@ -37,8 +37,10 @@ stdenv.mkDerivation rec { ] ++ lib.optionals (!stdenv.isDarwin && !stdenv.hostPlatform.isWindows) [ "-DCMAKE_C_FLAGS=-D_GLFW_GLX_LIBRARY='\"${lib.getLib libGL}/lib/libGL.so.1\"'" ] ++ lib.optionals waylandSupport [ - "-DGLFW_USE_WAYLAND=ON" + "-DGLFW_BUILD_X11=OFF" "-DCMAKE_C_FLAGS=-D_GLFW_EGL_LIBRARY='\"${lib.getLib libGL}/lib/libEGL.so.1\"'" + ] ++ lib.optionals (!waylandSupport) [ + "-DGLFW_BUILD_WAYLAND=OFF" ]; postPatch = lib.optionalString waylandSupport '' From c857877a3a220604f86d4b4f9426db880ed6e808 Mon Sep 17 00:00:00 2001 From: seth Date: Sun, 31 Mar 2024 18:10:10 -0400 Subject: [PATCH 32/97] glfw-wayland: drop as of 3.4, upstream now builds with Wayland by default --- pkgs/development/libraries/glfw/3.x.nix | 27 +++++++++++++++---------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 3 --- 3 files changed, 17 insertions(+), 14 deletions(-) diff --git a/pkgs/development/libraries/glfw/3.x.nix b/pkgs/development/libraries/glfw/3.x.nix index 278214aa809a..5e0b6adbb226 100644 --- a/pkgs/development/libraries/glfw/3.x.nix +++ b/pkgs/development/libraries/glfw/3.x.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchFromGitHub, cmake , libGL, libXrandr, libXinerama, libXcursor, libX11, libXi, libXext , Carbon, Cocoa, Kernel, OpenGL, fixDarwinDylibNames -, waylandSupport ? false, extra-cmake-modules, wayland +, extra-cmake-modules, wayland , wayland-scanner, wayland-protocols, libxkbcommon }: @@ -17,33 +17,38 @@ stdenv.mkDerivation rec { }; # Fix linkage issues on X11 (https://github.com/NixOS/nixpkgs/issues/142583) - patches = lib.optional (!waylandSupport) ./x11.patch; + patches = ./x11.patch; propagatedBuildInputs = lib.optionals stdenv.isDarwin [ OpenGL ] ++ lib.optionals stdenv.isLinux [ libGL ]; - nativeBuildInputs = [ cmake ] + nativeBuildInputs = [ cmake extra-cmake-modules ] ++ lib.optional stdenv.isDarwin fixDarwinDylibNames - ++ lib.optionals waylandSupport [ extra-cmake-modules wayland-scanner ]; + ++ lib.optionals stdenv.isLinux [ wayland-scanner ]; buildInputs = lib.optionals stdenv.isDarwin [ Carbon Cocoa Kernel ] - ++ lib.optionals (stdenv.isLinux && waylandSupport) [ wayland wayland-protocols libxkbcommon ] - ++ lib.optionals (stdenv.isLinux && !waylandSupport) [ libX11 libXrandr libXinerama libXcursor libXi libXext ]; + ++ lib.optionals stdenv.isLinux [ + wayland + wayland-protocols + libxkbcommon + libX11 + libXrandr + libXinerama + libXcursor + libXi + libXext + ]; cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" ] ++ lib.optionals (!stdenv.isDarwin && !stdenv.hostPlatform.isWindows) [ "-DCMAKE_C_FLAGS=-D_GLFW_GLX_LIBRARY='\"${lib.getLib libGL}/lib/libGL.so.1\"'" - ] ++ lib.optionals waylandSupport [ - "-DGLFW_BUILD_X11=OFF" "-DCMAKE_C_FLAGS=-D_GLFW_EGL_LIBRARY='\"${lib.getLib libGL}/lib/libEGL.so.1\"'" - ] ++ lib.optionals (!waylandSupport) [ - "-DGLFW_BUILD_WAYLAND=OFF" ]; - postPatch = lib.optionalString waylandSupport '' + postPatch = lib.optionalString stdenv.isLinux '' substituteInPlace src/wl_init.c \ --replace "libxkbcommon.so.0" "${lib.getLib libxkbcommon}/lib/libxkbcommon.so.0" ''; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 1d55f600d2f9..725e410e041c 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -355,6 +355,7 @@ mapAliases ({ gitter = throw "gitter has been removed since the client has been abandoned by upstream with the backend migration to Matrix"; # Added 2023-09-18 glide = throw "'glide' has been removed as it is unmaintained, please use Go modules instead"; # Added 2023-12-26 + glfw-wayland = glfw; # Added 2024-04-19 gmailieer = lieer; # Added 2020-04-19 gmic-qt-krita = throw "gmic-qt-krita was removed as it's no longer supported upstream."; # Converted to throw 2023-02-02 gnatboot11 = gnat-bootstrap11; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5de7219b376e..a7b2b9bf84ec 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21347,9 +21347,6 @@ with pkgs; }; glfw = glfw3; - glfw-wayland = glfw.override { - waylandSupport = true; - }; glfw-wayland-minecraft = callPackage ../development/libraries/glfw/3.x-wayland-minecraft.nix {}; glfw2 = callPackage ../development/libraries/glfw/2.x.nix { }; glfw3 = callPackage ../development/libraries/glfw/3.x.nix { From d9f0c7947673bd10f12598f37abf4229ee90e670 Mon Sep 17 00:00:00 2001 From: seth Date: Sun, 31 Mar 2024 18:12:47 -0400 Subject: [PATCH 33/97] vkdt-wayland: drop this follows `glfw-wayland` also being dropped --- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 725e410e041c..bc33d6633a9a 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1168,6 +1168,7 @@ mapAliases ({ virtmanager-qt = throw "'virtmanager-qt' has been renamed to/replaced by 'virt-manager-qt'"; # Converted to throw 2023-09-10 vivaldi-widevine = throw "'vivaldi-widevine' has been renamed to/replaced by 'widevine-cdm'"; # Added 2023-02-25 vkBasalt = vkbasalt; # Added 2022-11-22 + vkdt-wayland = vkdt; # Added 2024-04-19 vsmtp = throw "'vsmtp' has been removed, upstream gone"; # Added 2023-12-18 vte_290 = throw "'vte_290' has been renamed to/replaced by 'vte'"; # Added 2023-01-05 varnish72 = throw "varnish 7.2 is EOL. Either use the LTS or upgrade."; # Added 2023-10-09 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a7b2b9bf84ec..a885b5075557 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -25211,8 +25211,6 @@ with pkgs; vkdt = callPackage ../applications/graphics/vkdt { }; - vkdt-wayland = callPackage ../applications/graphics/vkdt { glfw = glfw-wayland; }; - vlock = callPackage ../misc/screensavers/vlock { }; virtualpg = callPackage ../development/libraries/virtualpg { }; From fabdf2c8a9101306fe884bed4a356facd7961108 Mon Sep 17 00:00:00 2001 From: Yarny0 <41838844+Yarny0@users.noreply.github.com> Date: Fri, 22 Mar 2024 17:53:28 +0100 Subject: [PATCH 34/97] hylafaxplus: 7.0.7 -> 7.0.8 Note that this update makes hylafaxplus compatible with libtiff 4.6.0t (a fork of libtiff at version 4.6.0). A follow-up commit will introduce that library fork and make hylafaxplus build with it. --- pkgs/servers/hylafaxplus/default.nix | 4 ++-- pkgs/servers/hylafaxplus/libtiff-4.patch | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/hylafaxplus/default.nix b/pkgs/servers/hylafaxplus/default.nix index 278f0b4c5260..246ad636ceb4 100644 --- a/pkgs/servers/hylafaxplus/default.nix +++ b/pkgs/servers/hylafaxplus/default.nix @@ -32,8 +32,8 @@ let pname = "hylafaxplus"; - version = "7.0.7"; - hash = "sha512-nUvt+M0HBYN+MsGskuuDt1j0nI5Dk8MbfK/OVxP2FCDby3eiDg0eDtcpIxlOe4o0klko07zDRIb06zqh8ABuKA=="; + version = "7.0.8"; + hash = "sha512-6wTLVcaHpASy+2i+jeoJ1cM2aLgI5vznGrLd4NCkLHiOxlfCh/ASRaj2Nxt9ZZ5NN/deEwf9tNSZ7MkFZHVsqA=="; configSite = substituteAll { name = "${pname}-config.site"; diff --git a/pkgs/servers/hylafaxplus/libtiff-4.patch b/pkgs/servers/hylafaxplus/libtiff-4.patch index e00d94b5a979..d7284e242865 100644 --- a/pkgs/servers/hylafaxplus/libtiff-4.patch +++ b/pkgs/servers/hylafaxplus/libtiff-4.patch @@ -1,11 +1,11 @@ https://bugs.gentoo.org/706154 --- a/configure +++ b/configure -@@ -2583,7 +2583,7 @@ EOF +@@ -2584,7 +2584,7 @@ EOF echo '#define TIFFSTRIPBYTECOUNTS uint32_t' echo '#define TIFFVERSION TIFF_VERSION' echo '#define TIFFHEADER TIFFHeader';; -- 4.[012345]) tiff_runlen_t="uint32_t" +- 4.[0123456]) tiff_runlen_t="uint32_t" + 4.[0-9]) tiff_runlen_t="uint32_t" tiff_offset_t="uint64_t" echo '#define TIFFSTRIPBYTECOUNTS uint64_t' From 376bd1931e864348d7383bada1c3df3c98ef4d37 Mon Sep 17 00:00:00 2001 From: Yarny0 <41838844+Yarny0@users.noreply.github.com> Date: Sat, 23 Mar 2024 09:04:17 +0100 Subject: [PATCH 35/97] libtiff: fix meta.changelog url --- pkgs/development/libraries/libtiff/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libtiff/default.nix b/pkgs/development/libraries/libtiff/default.nix index 04b67ff83bde..66ed2f07c84c 100644 --- a/pkgs/development/libraries/libtiff/default.nix +++ b/pkgs/development/libraries/libtiff/default.nix @@ -93,7 +93,7 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { description = "Library and utilities for working with the TIFF image file format"; homepage = "https://libtiff.gitlab.io/libtiff"; - changelog = "https://libtiff.gitlab.io/libtiff/v${finalAttrs.version}.html"; + changelog = "https://libtiff.gitlab.io/libtiff/releases/v${finalAttrs.version}.html"; license = licenses.libtiff; platforms = platforms.unix ++ platforms.windows; pkgConfigModules = [ "libtiff-4" ]; From 6ce2532285410691a83142877891fd57f340a502 Mon Sep 17 00:00:00 2001 From: Yarny0 <41838844+Yarny0@users.noreply.github.com> Date: Sat, 23 Mar 2024 09:16:15 +0100 Subject: [PATCH 36/97] libtiff_t: init at 4.6.0t (fork of libtiff) libtiff 4.6.0 dropped a bunch of helper tools, thereby breaking packages that depend on these tools. To fix those packages, nixpkgs started packaging libtiff_4_5 separately, see commit f57a4b0ac1b954eec0c8def2a99e2a464ac6ff7a. Currently, two packages use libtiff_4_5: * hylafaplus (cd3771c7097b1ce25b0b3cd4e16361bf2929aa15) * gscan2pdf (9a579e14dd7536bf4cf554c065615810defd72d8) Lee Howard (core developer of hylafaxplus) forked libtiff 4.6.0 to provide a current version that restores those dropped helper tools. The library is also called "libtiff", with current version "4.6.0t". It is based on libtiff 4.6.0 and incorporates several fixes, particularly for the dropped helper tools, see https://sourceforge.net/p/hylafax/mailman/message/58751878/ and http://www.libtiff.org/releases/v4.6.0t.html . The commit at hand packages that fork for nixpkgs. Follow-up commits will replace libtiff_4_5 with libtiff_t, so affected packages can again use a current libtiff library. The build recipe of libtiff_t is based on the libtiff recipe. Besides adapted URLs, the only change is dropping `passthru`, as it referred to many packages depending on the original libtiff. The unorthodox code introduced in all-packages.nix is needed to satisfy the automated "by-name" check; see "Recommendation for new packages with multiple versions" in the file `pkgs/by-name/README.md`. Depending on how things develop in the future, we might want to switch completely to the forked libtiff library one day. Or the original libtiff restores the missing tools, making libtiff_t superfluous. --- .../libraries/libtiff/libtiff_t.nix | 73 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 12 ++- 2 files changed, 83 insertions(+), 2 deletions(-) create mode 100644 pkgs/development/libraries/libtiff/libtiff_t.nix diff --git a/pkgs/development/libraries/libtiff/libtiff_t.nix b/pkgs/development/libraries/libtiff/libtiff_t.nix new file mode 100644 index 000000000000..37e48f6ea14f --- /dev/null +++ b/pkgs/development/libraries/libtiff/libtiff_t.nix @@ -0,0 +1,73 @@ +{ lib +, stdenv +, fetchzip + +, autoreconfHook +, pkg-config +, sphinx + +, libdeflate +, libjpeg +, xz +, zlib +}: + +# This is a fork created by the hylafaxplus developer to +# restore tools dropped by original libtiff in version 4.6.0. + +stdenv.mkDerivation (finalAttrs: { + pname = "libtiff_t"; + version = "4.6.0t"; + + src = fetchzip { + url = "http://www.libtiff.org/downloads/tiff-${finalAttrs.version}.tar.xz"; + hash = "sha256-9ov4w2jw4LtKr82/4jWMAGhc5GEdviJ7bT+y0+U/Ac4="; + }; + + patches = [ + # FreeImage needs this patch + ./headers.patch + # libc++abi 11 has an `#include `, this picks up files name + # `version` in the project's include paths + ./rename-version.patch + ]; + + postPatch = '' + mv VERSION VERSION.txt + ''; + + outputs = [ "bin" "dev" "dev_private" "out" "man" "doc" ]; + + postFixup = '' + moveToOutput include/tif_config.h $dev_private + moveToOutput include/tif_dir.h $dev_private + moveToOutput include/tif_hash_set.h $dev_private + moveToOutput include/tiffiop.h $dev_private + ''; + + # If you want to change to a different build system, please make + # sure cross-compilation works first! + nativeBuildInputs = [ autoreconfHook pkg-config sphinx ]; + + # TODO: opengl support (bogus configure detection) + propagatedBuildInputs = [ + libdeflate + libjpeg + xz + zlib + ]; + + enableParallelBuilding = true; + + doCheck = true; + + meta = with lib; { + description = "Library and utilities for working with the TIFF image file format (fork containing tools dropped in original libtiff version)"; + homepage = "http://www.libtiff.org"; + changelog = "http://www.libtiff.org/releases/v${finalAttrs.version}.html"; + maintainers = with maintainers; [ yarny ]; + license = licenses.libtiff; + platforms = platforms.unix ++ platforms.windows; + pkgConfigModules = [ "libtiff-4" ]; + }; +}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index cb74ff63aa15..c03ad1fc38fc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -23031,8 +23031,16 @@ with pkgs; libtifiles2 = callPackage ../development/libraries/libtifiles2 { }; - libtiff = callPackage ../development/libraries/libtiff { }; - libtiff_4_5 = callPackage ../development/libraries/libtiff/4.5.nix { }; + inherit + ({ + libtiff = callPackage ../development/libraries/libtiff { }; + libtiff_4_5 = callPackage ../development/libraries/libtiff/4.5.nix { }; + libtiff_t = callPackage ../development/libraries/libtiff/libtiff_t.nix { }; + }) + libtiff + libtiff_4_5 + libtiff_t + ; libtiger = callPackage ../development/libraries/libtiger { }; From cff182e2194369a71a21daefd173e9d2c692e901 Mon Sep 17 00:00:00 2001 From: Yarny0 <41838844+Yarny0@users.noreply.github.com> Date: Sat, 23 Mar 2024 09:44:40 +0100 Subject: [PATCH 37/97] hylafaxplus: switch to current libtiff 4.6.0t hylafaxplus is not compatible with libtiff 4.6.0 as published on https://libtiff.gitlab.io/libtiff/ and http://www.simplesystems.org/libtiff/ . To fix the build, we used an older libtiff version (see cd3771c7097b1ce25b0b3cd4e16361bf2929aa15). In the meantime, hylafaxplus developer Lee Howard published a forked version "4.6.0t" of libtiff, providing the missing tools for hylafaxplus, see https://sourceforge.net/p/hylafax/mailman/message/58751879/ . The commit at hand changes the libtiff version for hylafaxplus to use that fork. --- pkgs/top-level/all-packages.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c03ad1fc38fc..817fada27dd7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9167,8 +9167,9 @@ with pkgs; hybridreverb2 = callPackage ../applications/audio/hybridreverb2 { }; hylafaxplus = callPackage ../servers/hylafaxplus { - # libtiff >= 4.6 dropped many executables needed by hylafaxplus - libtiff = libtiff_4_5; + # needs this fork of libtiff, because original libtiff + # stopped packaging required tools with version 4.6 + libtiff = libtiff_t; }; hyphen = callPackage ../development/libraries/hyphen { }; From ec1a3695b48e649ededd2b25bf421aa9145a9afe Mon Sep 17 00:00:00 2001 From: Yarny0 <41838844+Yarny0@users.noreply.github.com> Date: Sat, 23 Mar 2024 10:25:33 +0100 Subject: [PATCH 38/97] gscan2pdf: switch to current libtiff 4.6.0t gscan2pdf is not compatible with libtiff 4.6.0 as published on https://libtiff.gitlab.io/libtiff/ and http://www.simplesystems.org/libtiff/ . To fix the build, we used an older libtiff version (see 9a579e14dd7536bf4cf554c065615810defd72d8). In the meantime, hylafaxplus developer Lee Howard published a forked version "4.6.0t" of libtiff, providing the missing tools, see https://sourceforge.net/p/hylafax/mailman/message/58751879/ . That fork is also suitable for gscan2pdf, so the commit at hand changes the libtiff version for gscan2pdf to use that fork. --- pkgs/applications/graphics/gscan2pdf/default.nix | 9 +++------ pkgs/top-level/all-packages.nix | 6 +++++- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/graphics/gscan2pdf/default.nix b/pkgs/applications/graphics/gscan2pdf/default.nix index bbf52e105a28..d7ebb0a747ea 100644 --- a/pkgs/applications/graphics/gscan2pdf/default.nix +++ b/pkgs/applications/graphics/gscan2pdf/default.nix @@ -2,7 +2,7 @@ # libs librsvg, sane-backends, sane-frontends, # runtime dependencies - imagemagick, libtiff_4_5, djvulibre, poppler_utils, ghostscript, unpaper, pdftk, + imagemagick, libtiff, djvulibre, poppler_utils, ghostscript, unpaper, pdftk, # test dependencies xvfb-run, liberation_ttf, file, tesseract }: @@ -82,7 +82,7 @@ perlPackages.buildPerlPackage rec { wrapProgram "$out/bin/gscan2pdf" \ --prefix PATH : "${sane-backends}/bin" \ --prefix PATH : "${imagemagick}/bin" \ - --prefix PATH : "${libtiff_4_5}/bin" \ + --prefix PATH : "${libtiff}/bin" \ --prefix PATH : "${djvulibre}/bin" \ --prefix PATH : "${poppler_utils}/bin" \ --prefix PATH : "${ghostscript}/bin" \ @@ -98,10 +98,7 @@ perlPackages.buildPerlPackage rec { nativeCheckInputs = [ imagemagick - # Needs older libtiff version, because it stopped packageing tools like - # tiff2pdf and others in version 4.6. These tools are necessary for gscan2pdf. - # See commit f57a4b0ac1b954eec0c8def2a99e2a464ac6ff7a for in-depth explanation. - libtiff_4_5 + libtiff djvulibre poppler_utils ghostscript diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 817fada27dd7..05f11595a9d7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5543,7 +5543,11 @@ with pkgs; grobi = callPackage ../tools/X11/grobi { }; - gscan2pdf = callPackage ../applications/graphics/gscan2pdf { }; + gscan2pdf = callPackage ../applications/graphics/gscan2pdf { + # needs this fork of libtiff, because original libtiff + # stopped packaging required tools with version 4.6 + libtiff = libtiff_t; + }; gsctl = callPackage ../applications/misc/gsctl { }; From 87eabf9c4defa60c12436590b64a68ad4fad790d Mon Sep 17 00:00:00 2001 From: Yarny0 <41838844+Yarny0@users.noreply.github.com> Date: Sat, 23 Mar 2024 09:47:40 +0100 Subject: [PATCH 39/97] Revert "libtiff: introduce libtiff_4_5" This reverts commit f57a4b0ac1b954eec0c8def2a99e2a464ac6ff7a. The old version libtiff_4_5 is no longer needed. Both dependents (gscan2pdf and hylafaxplus) have switched to the forked libtiff version 4.6.0t which is based on the current libtiff version 4.6.0 but also contains required command line tools missing in the original libtiff library. --- pkgs/development/libraries/libtiff/4.5.nix | 86 ------------------- .../development/libraries/libtiff/default.nix | 3 - .../libraries/libtiff/headers-4.5.patch | 16 ---- .../libtiff/rename-version-4.5.patch | 21 ----- pkgs/top-level/all-packages.nix | 2 - 5 files changed, 128 deletions(-) delete mode 100644 pkgs/development/libraries/libtiff/4.5.nix delete mode 100644 pkgs/development/libraries/libtiff/headers-4.5.patch delete mode 100644 pkgs/development/libraries/libtiff/rename-version-4.5.patch diff --git a/pkgs/development/libraries/libtiff/4.5.nix b/pkgs/development/libraries/libtiff/4.5.nix deleted file mode 100644 index 3b24c6f1a2e1..000000000000 --- a/pkgs/development/libraries/libtiff/4.5.nix +++ /dev/null @@ -1,86 +0,0 @@ -{ lib -, stdenv -, fetchFromGitLab -, fetchpatch - -, autoreconfHook -, pkg-config -, sphinx - -, libdeflate -, libjpeg -, xz -, zlib -}: - -stdenv.mkDerivation rec { - pname = "libtiff"; - version = "4.5.1"; - - src = fetchFromGitLab { - owner = "libtiff"; - repo = "libtiff"; - rev = "v${version}"; - hash = "sha256-qQEthy6YhNAQmdDMyoCIvK8f3Tx25MgqhJZW74CB93E="; - }; - - patches = [ - # cf. https://bugzilla.redhat.com/2224974 - (fetchpatch { - name = "CVE-2023-40745.patch"; - url = "https://gitlab.com/libtiff/libtiff/-/commit/bdf7b2621c62e04d0408391b7d5611502a752cd0.diff"; - hash = "sha256-HdU02YJ1/T3dnCT+yG03tUyAHkgeQt1yjZx/auCQxyw="; - }) - # cf. https://bugzilla.redhat.com/2224971 - (fetchpatch { - name = "CVE-2023-41175.patch"; - url = "https://gitlab.com/libtiff/libtiff/-/commit/965fa243004e012adc533ae8e38db3055f101a7f.diff"; - hash = "sha256-Pvg6JfJWOIaTrfFF0YSREZkS9saTG9IsXnsXtcyKILA="; - }) - # FreeImage needs this patch - ./headers-4.5.patch - # libc++abi 11 has an `#include `, this picks up files name - # `version` in the project's include paths - ./rename-version-4.5.patch - ]; - - postPatch = '' - mv VERSION VERSION.txt - ''; - - outputs = [ "bin" "dev" "dev_private" "out" "man" "doc" ]; - - postFixup = '' - moveToOutput include/tif_config.h $dev_private - moveToOutput include/tif_dir.h $dev_private - moveToOutput include/tif_hash_set.h $dev_private - moveToOutput include/tiffiop.h $dev_private - ''; - - # If you want to change to a different build system, please make - # sure cross-compilation works first! - nativeBuildInputs = [ autoreconfHook pkg-config sphinx ]; - - propagatedBuildInputs = [ - libdeflate - libjpeg - xz - zlib - ]; - - enableParallelBuilding = true; - - doCheck = true; - - meta = with lib; { - description = "Library and utilities for working with the TIFF image file format"; - homepage = "https://libtiff.gitlab.io/libtiff"; - changelog = "https://libtiff.gitlab.io/libtiff/v${version}.html"; - # XXX not enabled for now to keep hydra builds running, - # but we have to keep an eye on security updates in supported version - #knownVulnerabilities = [ "support for version 4.5 ended in Sept 2023" ]; - maintainers = with maintainers; [ yarny ]; - license = licenses.libtiff; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/libraries/libtiff/default.nix b/pkgs/development/libraries/libtiff/default.nix index 66ed2f07c84c..c8871a4ba68e 100644 --- a/pkgs/development/libraries/libtiff/default.nix +++ b/pkgs/development/libraries/libtiff/default.nix @@ -28,9 +28,6 @@ stdenv.mkDerivation (finalAttrs: { pname = "libtiff"; version = "4.6.0"; - # if you update this, please consider adding patches and/or - # setting `knownVulnerabilities` in libtiff `4.5.nix` - src = fetchFromGitLab { owner = "libtiff"; repo = "libtiff"; diff --git a/pkgs/development/libraries/libtiff/headers-4.5.patch b/pkgs/development/libraries/libtiff/headers-4.5.patch deleted file mode 100644 index 49af1abb0a54..000000000000 --- a/pkgs/development/libraries/libtiff/headers-4.5.patch +++ /dev/null @@ -1,16 +0,0 @@ -export private headers for freeimage ---- i/libtiff/Makefile.am -+++ w/libtiff/Makefile.am -@@ -36,8 +36,12 @@ EXTRA_DIST = \ - tiffconf.h.cmake.in - - libtiffinclude_HEADERS = \ -+ tif_config.h \ -+ tif_dir.h \ -+ tif_hash_set.h \ - tiff.h \ - tiffio.h \ -+ tiffiop.h \ - tiffvers.h - - if HAVE_CXX diff --git a/pkgs/development/libraries/libtiff/rename-version-4.5.patch b/pkgs/development/libraries/libtiff/rename-version-4.5.patch deleted file mode 100644 index 3e93569d4245..000000000000 --- a/pkgs/development/libraries/libtiff/rename-version-4.5.patch +++ /dev/null @@ -1,21 +0,0 @@ -fix case-insensitive build ---- a/Makefile.am -+++ b/Makefile.am -@@ -34,7 +34,7 @@ docfiles = \ - README.md \ - RELEASE-DATE \ - TODO \ -- VERSION -+ VERSION.txt - - EXTRA_DIST = \ - cmake \ -@@ -61,7 +61,7 @@ SUBDIRS = port libtiff tools build contrib test doc - - release: - (rm -f $(top_srcdir)/RELEASE-DATE && echo $(LIBTIFF_RELEASE_DATE) > $(top_srcdir)/RELEASE-DATE) -- (rm -f $(top_srcdir)/VERSION && echo $(LIBTIFF_VERSION) > $(top_srcdir)/VERSION) -+ (rm -f $(top_srcdir)/VERSION.txt && echo $(LIBTIFF_VERSION) > $(top_srcdir)/VERSION.txt) - (rm -f $(top_srcdir)/libtiff/tiffvers.h && sed 's,LIBTIFF_VERSION,$(LIBTIFF_VERSION),;s,LIBTIFF_RELEASE_DATE,$(LIBTIFF_RELEASE_DATE),;s,LIBTIFF_MAJOR_VERSION,$(LIBTIFF_MAJOR_VERSION),;s,LIBTIFF_MINOR_VERSION,$(LIBTIFF_MINOR_VERSION),;s,LIBTIFF_MICRO_VERSION,$(LIBTIFF_MICRO_VERSION),' $(top_srcdir)/libtiff/tiffvers.h.in > $(top_srcdir)/libtiff/tiffvers.h) - - pkgconfigdir = $(libdir)/pkgconfig diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 05f11595a9d7..78e86a7c0f94 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -23039,11 +23039,9 @@ with pkgs; inherit ({ libtiff = callPackage ../development/libraries/libtiff { }; - libtiff_4_5 = callPackage ../development/libraries/libtiff/4.5.nix { }; libtiff_t = callPackage ../development/libraries/libtiff/libtiff_t.nix { }; }) libtiff - libtiff_4_5 libtiff_t ; From a73b134de52bd0eb922ce63993f736956d96cf2b Mon Sep 17 00:00:00 2001 From: sund3RRR Date: Sat, 20 Apr 2024 11:08:43 +0300 Subject: [PATCH 40/97] rtfm: 0.2.4 -> 0.4.1 --- pkgs/applications/misc/rtfm/default.nix | 26 ++++++------- .../enable-write-permissions.patch | 4 +- pkgs/applications/misc/rtfm/make.patch | 39 +++++++++++++++++++ .../rtfm/patches/friendly-docs-path.patch | 11 ------ .../applications/misc/rtfm/patches/make.patch | 21 ---------- pkgs/applications/misc/rtfm/shards.nix | 20 +++++----- 6 files changed, 63 insertions(+), 58 deletions(-) rename pkgs/applications/misc/rtfm/{patches => }/enable-write-permissions.patch (60%) create mode 100644 pkgs/applications/misc/rtfm/make.patch delete mode 100644 pkgs/applications/misc/rtfm/patches/friendly-docs-path.patch delete mode 100644 pkgs/applications/misc/rtfm/patches/make.patch diff --git a/pkgs/applications/misc/rtfm/default.nix b/pkgs/applications/misc/rtfm/default.nix index 9eb97113c37b..133bede81ae0 100644 --- a/pkgs/applications/misc/rtfm/default.nix +++ b/pkgs/applications/misc/rtfm/default.nix @@ -7,10 +7,10 @@ , desktopToDarwinBundle , webkitgtk_6_0 , sqlite -, gi-crystal , libadwaita , gtk4 , pango +, substituteAll }: let gtk4' = gtk4.override { x11Support = true; }; @@ -18,42 +18,40 @@ let in crystal.buildCrystalPackage rec { pname = "rtfm"; - version = "0.2.4"; + version = "0.4.1"; src = fetchFromGitHub { owner = "hugopl"; repo = "rtfm"; rev = "v${version}"; name = "rtfm"; - hash = "sha256-IfI7jYM1bsrCq2NiANv/SWkCjPyT/HYUofJMUYy0Sbk="; + hash = "sha256-cloaGlHjtwrjuPGzAG55B58w307R+TO+MixAWTw2ags="; }; patches = [ # 1) fixed gi-crystal binding generator command - # 2) removed `-v` arg to `cp` command to prevent build failure due to stdout buffer overflow + # 2) fixed docset generator command # 3) added commands to build gschemas and update icon-cache - ./patches/make.patch - - # fixed docset path and gi libs directory names - ./patches/friendly-docs-path.patch - + (substituteAll { + src = ./make.patch; + inherit crystal; + }) # added chmod +w for copied docs to prevent error: # `Error opening file with mode 'wb': '.../style.css': Permission denied` - ./patches/enable-write-permissions.patch + ./enable-write-permissions.patch ]; postPatch = '' - substituteInPlace Makefile \ - --replace "crystal run src/create_crystal_docset.cr" "crystal src/create_crystal_docset.cr ${crystal}/share/doc/crystal/api/" \ - --replace "crystal run src/create_gtk_docset.cr" "crystal src/create_gtk_docset.cr gtk-doc/" + substituteInPlace src/doc2dash/create_gtk_docset.cr \ + --replace-fail 'basedir = Path.new("/usr/share/doc")' 'basedir = Path.new(ARGV[0]? || "gtk-docs")' ''; shardsFile = ./shards.nix; + copyShardDeps = true; nativeBuildInputs = [ wrapGAppsHook4 gobject-introspection - gi-crystal ] ++ lib.optionals stdenv.isDarwin [ desktopToDarwinBundle ]; buildInputs = [ diff --git a/pkgs/applications/misc/rtfm/patches/enable-write-permissions.patch b/pkgs/applications/misc/rtfm/enable-write-permissions.patch similarity index 60% rename from pkgs/applications/misc/rtfm/patches/enable-write-permissions.patch rename to pkgs/applications/misc/rtfm/enable-write-permissions.patch index efdabce08351..8023d647f782 100644 --- a/pkgs/applications/misc/rtfm/patches/enable-write-permissions.patch +++ b/pkgs/applications/misc/rtfm/enable-write-permissions.patch @@ -1,5 +1,5 @@ ---- a/src/doc2dash/doc_set_builder.cr 2023-07-19 14:00:06.864770147 +0300 -+++ b/src/doc2dash/doc_set_builder.cr 2023-07-19 13:59:35.440707740 +0300 +--- a/src/doc2dash/docset_builder.cr 2024-04-20 10:45:32.000673168 +0300 ++++ b/src/doc2dash/docset_builder.cr 2024-04-20 10:45:56.072895349 +0300 @@ -44,6 +44,7 @@ real_dest = @html_dest.join(dest || source) Dir.mkdir_p(Path.new(real_dest).dirname) diff --git a/pkgs/applications/misc/rtfm/make.patch b/pkgs/applications/misc/rtfm/make.patch new file mode 100644 index 000000000000..40f327193deb --- /dev/null +++ b/pkgs/applications/misc/rtfm/make.patch @@ -0,0 +1,39 @@ +--- a/Makefile 2024-04-20 10:28:36.697545022 +0300 ++++ b/Makefile 2024-04-20 10:37:55.591657540 +0300 +@@ -7,8 +7,10 @@ + shards build --debug -Dpreview_mt + + configure: +- shards install +- ./bin/gi-crystal ++ mkdir bin/ ++ cd lib/gi-crystal && shards build -Dpreview_mt --release --no-debug ++ cd ../.. ++ cp lib/gi-crystal/bin/gi-crystal bin/ && ./bin/gi-crystal + + rtfm: + shards build --release -Dpreview_mt rtfm +@@ -16,10 +18,10 @@ + docsets: crystal-docset gtk-docset + + crystal-docset: +- crystal run src/doc2dash/create_crystal_docset.cr ++ crystal src/doc2dash/create_crystal_docset.cr "@crystal@/share/doc/crystal/api" + + gtk-docset: +- crystal run src/doc2dash/create_gtk_docset.cr ++ crystal src/doc2dash/create_gtk_docset.cr "gtk-doc/" + + test: crystal-docset gtk-docset + crystal spec +@@ -28,8 +30,10 @@ + install -D -m 0755 bin/rtfm $(DESTDIR)$(PREFIX)/bin/rtfm + install -D -m 0644 data/io.github.hugopl.rtfm.desktop $(DESTDIR)$(PREFIX)/share/applications/io.github.hugopl.rtfm.desktop + install -D -m 0644 data/icons/hicolor/scalable/apps/io.github.hugopl.rtfm.svg $(DESTDIR)$(PREFIX)/share/icons/hicolor/scalable/apps/io.github.hugopl.rtfm.svg ++ gtk4-update-icon-cache --ignore-theme-index $(PREFIX)/share/icons/hicolor + # Settings schema + install -D -m644 data/io.github.hugopl.rtfm.gschema.xml $(DESTDIR)$(PREFIX)/share/glib-2.0/schemas/io.github.hugopl.rtfm.gschema.xml ++ glib-compile-schemas $(DESTDIR)$(PREFIX)/share/glib-2.0/schemas + # docsets + mkdir -p $(DESTDIR)$(PREFIX)/share/rtfm/docsets/ + cp -r data/Crystal.docset $(DESTDIR)$(PREFIX)/share/rtfm/docsets/ diff --git a/pkgs/applications/misc/rtfm/patches/friendly-docs-path.patch b/pkgs/applications/misc/rtfm/patches/friendly-docs-path.patch deleted file mode 100644 index cecbeb750b30..000000000000 --- a/pkgs/applications/misc/rtfm/patches/friendly-docs-path.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/src/create_gtk_docset.cr 2023-07-17 14:28:04.882620660 +0300 -+++ b/src/create_gtk_docset.cr 2023-07-17 14:27:09.660643747 +0300 -@@ -136,7 +136,7 @@ - end - - def find_modules : Array(Path) -- basedir = Path.new("/usr/share/doc") -+ basedir = Path.new(ARGV[0]? || "gtk-docs") - MODULES.compact_map do |mod| - print "#{mod.ljust(20, '.')}" - mod_dir = basedir.join(mod) diff --git a/pkgs/applications/misc/rtfm/patches/make.patch b/pkgs/applications/misc/rtfm/patches/make.patch deleted file mode 100644 index 51b95575cd0d..000000000000 --- a/pkgs/applications/misc/rtfm/patches/make.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- a/Makefile 2023-12-07 23:37:38.984501858 +0300 -+++ b/Makefile 2023-12-07 23:47:52.884456064 +0300 -@@ -4,8 +4,7 @@ - all: configure .WAIT rtfm docsets - - configure: -- shards install -- ./bin/gi-crystal -+ gi-crystal - - rtfm: - shards build --release -s rtfm -@@ -36,6 +35,8 @@ - # Changelog - install -D -m0644 CHANGELOG.md $(DESTDIR)$(PREFIX)/share/doc/rtfm/CHANGELOG.md - gzip -9fn $(DESTDIR)$(PREFIX)/share/doc/rtfm/CHANGELOG.md -+ gtk4-update-icon-cache --ignore-theme-index $(PREFIX)/share/icons/hicolor -+ glib-compile-schemas $(DESTDIR)$(PREFIX)/share/glib-2.0/schemas - - uninstall: - rm -f $(DESTDIR)$(PREFIX)/bin/rtfm diff --git a/pkgs/applications/misc/rtfm/shards.nix b/pkgs/applications/misc/rtfm/shards.nix index 0a7ce34cda62..79a2eeb2f0db 100644 --- a/pkgs/applications/misc/rtfm/shards.nix +++ b/pkgs/applications/misc/rtfm/shards.nix @@ -6,18 +6,18 @@ }; fzy = { url = "https://github.com/hugopl/fzy.git"; - rev = "v0.5.5"; - sha256 = "1zk95m43ymx9ilwr6iw9l44nkmp4sas28ib0dkr07hkhgrkw68sv"; + rev = "6c2395bcdea1889969d0d08c16163c276fe4e473"; + sha256 = "0vpradafkwckfsq7wqrgkpsli7bfmgc27d38q06l1jzq0z0j92rw"; }; - gio = { - url = "https://github.com/hugopl/gio.cr.git"; - rev = "v0.2.1"; - sha256 = "0vl5lpvhhdi9pvyl12smag0i3dwj1jjz1zzilc8ai0wjrnbnwlxs"; + gi-crystal = { + url = "https://github.com/hugopl/gi-crystal.git"; + rev = "v0.22.2"; + sha256 = "0bpa1f8iaf97z2kbgjc7nc8km7nd7bppiwna319lm2hvm8m5pw15"; }; gtk4 = { url = "https://github.com/hugopl/gtk4.cr.git"; - rev = "v0.16.0"; - sha256 = "1bnnfy07246vwbjfwhziv2yw1g52pzhhrr25660fp3qcnw8q513w"; + rev = "v0.16.1"; + sha256 = "1cqkbh072y70l8g0p040vf50k920p32ry1larnwn9mqabd74jwaj"; }; harfbuzz = { url = "https://github.com/hugopl/harfbuzz.cr.git"; @@ -31,8 +31,8 @@ }; pango = { url = "https://github.com/hugopl/pango.cr.git"; - rev = "v0.3.0"; - sha256 = "1dg5bcbq11zww4xh68dq4ivnsz89yqsnxz81ggp4j9c9d6dhx0m4"; + rev = "v0.3.1"; + sha256 = "0xlf127flimnll875mcq92q7xsi975rrgdpcpmnrwllhdhfx9qmv"; }; sqlite3 = { url = "https://github.com/crystal-lang/crystal-sqlite3.git"; From f22430b657f73a8be8eb933bee08ca3d19b03ed9 Mon Sep 17 00:00:00 2001 From: Alex Martens Date: Sat, 20 Apr 2024 10:53:00 -0700 Subject: [PATCH 41/97] cargo-spellcheck: fix build --- pkgs/development/tools/rust/cargo-spellcheck/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/tools/rust/cargo-spellcheck/default.nix b/pkgs/development/tools/rust/cargo-spellcheck/default.nix index 23de1bc2a070..f6312ee3f00d 100644 --- a/pkgs/development/tools/rust/cargo-spellcheck/default.nix +++ b/pkgs/development/tools/rust/cargo-spellcheck/default.nix @@ -19,6 +19,11 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-6dhM+FzuLtKtRp2mpE9nlpT+0PBcgGqvBa9vqs6Rs7s="; + postPatch = '' + substituteInPlace src/lib.rs \ + --replace "#![deny(dead_code)]" "#![warn(dead_code)]" + ''; + nativeBuildInputs = [ rustPlatform.bindgenHook ]; buildInputs = lib.optionals stdenv.isDarwin [ Security SystemConfiguration ]; From 8b93127c339b18a069d66dd7d311e3205afac501 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 20 Apr 2024 20:06:16 +0000 Subject: [PATCH 42/97] python311Packages.openstacksdk: 3.0.0 -> 3.1.0 --- pkgs/development/python-modules/openstacksdk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/openstacksdk/default.nix b/pkgs/development/python-modules/openstacksdk/default.nix index 94d2c1b7c216..3f997d4d4ced 100644 --- a/pkgs/development/python-modules/openstacksdk/default.nix +++ b/pkgs/development/python-modules/openstacksdk/default.nix @@ -19,14 +19,14 @@ buildPythonPackage rec { pname = "openstacksdk"; - version = "3.0.0"; + version = "3.1.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-sMf5oCXV2pKtTHYpQeasxMtTkwoH/3OamuvMXlpySuY="; + hash = "sha256-cH8V1+wHSrJDS5peGYT6yrAPgi0nL0wqXeDSKgnrec0="; }; propagatedBuildInputs = [ From 7bdfdda1ad58d0ceb21d9d8cfdfe82f7f9982895 Mon Sep 17 00:00:00 2001 From: Alan Pearce Date: Sat, 20 Apr 2024 22:38:12 +0200 Subject: [PATCH 43/97] flyctl: 0.2.25 -> 0.2.40 https://github.com/superfly/flyctl/releases/tag/v0.2.40 --- pkgs/development/web/flyctl/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/web/flyctl/default.nix b/pkgs/development/web/flyctl/default.nix index 84caa116eea4..78a69303a3cb 100644 --- a/pkgs/development/web/flyctl/default.nix +++ b/pkgs/development/web/flyctl/default.nix @@ -2,16 +2,16 @@ buildGo122Module rec { pname = "flyctl"; - version = "0.2.25"; + version = "0.2.40"; src = fetchFromGitHub { owner = "superfly"; repo = "flyctl"; rev = "v${version}"; - hash = "sha256-yMkTLUM/1P9VrsYaF4m9YyRLV6qz6uMiYlhUN5S58uU="; + hash = "sha256-HIJ2EAfNKVlECXHgw2qx5OlWv5davaBrtrSQVsdrKKY="; }; - vendorHash = "sha256-TMlJbh9tMRNdeZlem27lgknuJ/YNFkVaWS9BNTTuXic="; + vendorHash = "sha256-uA9Sfovz42+JT+AEY7t4dwWpIUgqX8qdGto7LU7qLtY="; subPackages = [ "." ]; From 150aabdc4217b4162f79c40af63133947741ae05 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 13 Apr 2024 13:42:37 +0000 Subject: [PATCH 44/97] dublin-traceroute: 0.4.2-unstable-2024-01-09 -> 0.4.2-unstable-2024-04-11 --- pkgs/by-name/du/dublin-traceroute/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/du/dublin-traceroute/package.nix b/pkgs/by-name/du/dublin-traceroute/package.nix index 5f559c4d97c4..1b9a84432542 100644 --- a/pkgs/by-name/du/dublin-traceroute/package.nix +++ b/pkgs/by-name/du/dublin-traceroute/package.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation { pname = "dublin-traceroute"; - version = "0.4.2-unstable-2024-01-09"; + version = "0.4.2-unstable-2024-04-11"; src = fetchFromGitHub { owner = "insomniacslk"; repo = "dublin-traceroute"; - rev = "b136db81cfbb30d5fd324dfccc97fca49a5ecee1"; - hash = "sha256-FsolpeQGaLDjDE5Yk58t2hFQJgM58zafIx6s5ejYKnY="; + rev = "a92118d93fd1fa7bdb827e741dd848b7f7083a1e"; + hash = "sha256-UJeFPVi3423Jh72fVk8QbLX1tTNAQ504xYs9HwVCkZc="; }; nativeBuildInputs = [ cmake pkg-config ]; From 0ce3e115de2c95039ea977052210255f18c4cb2c Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Sun, 21 Apr 2024 00:18:36 +0200 Subject: [PATCH 45/97] dublin-traceroute: mark as broken on darwin --- pkgs/by-name/du/dublin-traceroute/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/du/dublin-traceroute/package.nix b/pkgs/by-name/du/dublin-traceroute/package.nix index 1b9a84432542..5e797cf97b57 100644 --- a/pkgs/by-name/du/dublin-traceroute/package.nix +++ b/pkgs/by-name/du/dublin-traceroute/package.nix @@ -37,5 +37,6 @@ stdenv.mkDerivation { maintainers = with maintainers; [ baloo ]; platforms = platforms.unix; mainProgram = "dublin-traceroute"; + broken = stdenv.isDarwin; }; } From 68fa712a25025624a465333adb3c6c55cc89a4ad Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 20 Apr 2024 22:51:52 +0000 Subject: [PATCH 46/97] phrase-cli: 2.23.2 -> 2.24.0 --- pkgs/tools/misc/phrase-cli/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/phrase-cli/default.nix b/pkgs/tools/misc/phrase-cli/default.nix index e780f451040b..c06b1d386768 100644 --- a/pkgs/tools/misc/phrase-cli/default.nix +++ b/pkgs/tools/misc/phrase-cli/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "phrase-cli"; - version = "2.23.2"; + version = "2.24.0"; src = fetchFromGitHub { owner = "phrase"; repo = "phrase-cli"; rev = version; - sha256 = "sha256-CzDkIFlStfCJpF82pqD8hTxbjH9Nu+0/uygTR0xxxV4="; + sha256 = "sha256-i1gf/xTdZaseUiu70i0Yh+DZlRoJjKYG1Q+D7uUyMl8="; }; - vendorHash = "sha256-r07nHJqFWHAMTkmQmy0/jK7N/lDzpnHqmuGTG1FTUiI="; + vendorHash = "sha256-+UjUk2Uf4ESHkUSM9X+a3fBF05cVsQ4JwPn93hbELLs="; ldflags = [ "-X=github.com/phrase/phrase-cli/cmd.PHRASE_CLIENT_VERSION=${version}" ]; From 713d9c046a92d78bb7af15886c21054908c62e4a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 20 Apr 2024 23:00:55 +0000 Subject: [PATCH 47/97] typeshare: 1.9.0 -> 1.9.2 --- pkgs/development/tools/rust/typeshare/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/typeshare/default.nix b/pkgs/development/tools/rust/typeshare/default.nix index 8f784bc72d6c..745784fc0304 100644 --- a/pkgs/development/tools/rust/typeshare/default.nix +++ b/pkgs/development/tools/rust/typeshare/default.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "typeshare"; - version = "1.9.0"; + version = "1.9.2"; src = fetchFromGitHub { owner = "1password"; repo = "typeshare"; rev = "v${version}"; - hash = "sha256-20IaTC0fMt6ADSwyQh9yBn3i3z6cmQ1j/wy1KNB3Dog="; + hash = "sha256-ccUeIywOHZYqfo4o0rKKswFmdPcQkwD18OP9v/wkfe0="; }; - cargoHash = "sha256-5jY4GO/EbBokE9p9e68bTKj6nJ0LhtWYHtFGfTIf9Po="; + cargoHash = "sha256-mPA19+8Ti2fluOFn/oDvf62JZTtZNQRggMhf9cem5rU="; nativeBuildInputs = [ installShellFiles ]; From 4fa107f1c9bcf0af6eaea23e30f37c69296ff7bc Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Sun, 21 Apr 2024 02:05:12 +0200 Subject: [PATCH 48/97] nixos/wireless: create empty config for imperative setup If allowAuxiliaryImperativeNetworks is enabled, the wpa_supplicant daemon complains fails to start if /etc/wpa_supplicant.conf does not exist. As this can be created using wpa_cli (or similar) later, it shouldn't matter, so let's create an empty one. This fixes issues #157537, #299466. --- nixos/modules/services/networking/wpa_supplicant.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/nixos/modules/services/networking/wpa_supplicant.nix b/nixos/modules/services/networking/wpa_supplicant.nix index c9dd1d1b0f01..2804e3ecf177 100644 --- a/nixos/modules/services/networking/wpa_supplicant.nix +++ b/nixos/modules/services/networking/wpa_supplicant.nix @@ -124,6 +124,11 @@ let fi ''} + # ensure wpa_supplicant.conf exists, or the daemon will fail to start + ${optionalString cfg.allowAuxiliaryImperativeNetworks '' + touch /etc/wpa_supplicant.conf + ''} + # substitute environment variables if [ -f "${configFile}" ]; then ${pkgs.gawk}/bin/awk '{ From 4420cf35bbcc2c7029bc6057a5219fec15f1f654 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 21 Apr 2024 00:30:54 +0000 Subject: [PATCH 49/97] dbmate: 2.14.0 -> 2.15.0 --- pkgs/development/tools/database/dbmate/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/database/dbmate/default.nix b/pkgs/development/tools/database/dbmate/default.nix index 922f3c081d5d..38f5ba2f19e5 100644 --- a/pkgs/development/tools/database/dbmate/default.nix +++ b/pkgs/development/tools/database/dbmate/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "dbmate"; - version = "2.14.0"; + version = "2.15.0"; src = fetchFromGitHub { owner = "amacneil"; repo = "dbmate"; rev = "refs/tags/v${version}"; - hash = "sha256-jShFLwoxZdUEHA+gd87n3R+faOdC6TboXuPvcZp89+Y="; + hash = "sha256-crn2FSJm7CSBg5TOcB5bJOsWqBrlwDoik7OS3HiCIGw="; }; - vendorHash = "sha256-kBk2KhPDVYBGIUQpXq4ANA7WX+JUOxz7/Ad+4h2CD1c="; + vendorHash = "sha256-eFGQ59fdS+QQounT/byA0w9W+MK2Lhp+mlXAWWAtk6U="; doCheck = false; From 76213d97289489507cb9fc1a05a9060b29ce0635 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 21 Apr 2024 00:56:43 +0000 Subject: [PATCH 50/97] go-minimock: 3.3.6 -> 3.3.7 --- pkgs/development/tools/go-minimock/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/go-minimock/default.nix b/pkgs/development/tools/go-minimock/default.nix index 279004b9c8c7..10010fa82223 100644 --- a/pkgs/development/tools/go-minimock/default.nix +++ b/pkgs/development/tools/go-minimock/default.nix @@ -2,20 +2,20 @@ buildGoModule rec { pname = "go-minimock"; - version = "3.3.6"; + version = "3.3.7"; src = fetchFromGitHub { owner = "gojuno"; repo = "minimock"; rev = "v${version}"; - sha256 = "sha256-ru3+MJ1GbzVDi6niiz7SpL0qa9mE89uhcH5/PHbVugE="; + sha256 = "sha256-jwQT3JmVFS7e6wr+hCFLlA1YhiKdTrMai0RfClJafJQ="; }; ldflags = [ "-s" "-w" "-X main.version=${version}" ]; - vendorHash = "sha256-eCM/EDdXZSa+pg35V6YiZ5gaC4rj8Wt8HhCgaMPoP+Y="; + vendorHash = "sha256-vcYhLMs/skZlhzdeEWUcv28VkRvraavziBwbwrgLZio="; doCheck = true; From 3043085ffbf99af198e59c263c452baf3cdb42c0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 21 Apr 2024 00:56:58 +0000 Subject: [PATCH 51/97] go-camo: 2.4.11 -> 2.4.12 --- pkgs/by-name/go/go-camo/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/go/go-camo/package.nix b/pkgs/by-name/go/go-camo/package.nix index 42cc8b7ba5da..e90fa676cbd4 100644 --- a/pkgs/by-name/go/go-camo/package.nix +++ b/pkgs/by-name/go/go-camo/package.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "go-camo"; - version = "2.4.11"; + version = "2.4.12"; src = fetchFromGitHub { owner = "cactus"; repo = pname; rev = "v${version}"; - sha256 = "sha256-wgneDCBiHg9M1PtLHFxEXRhK9fBNKPWQwV0fwUFxEgQ="; + sha256 = "sha256-rlzAx6xjV4JR3RDL+Kr2ghN3qpfIRqVZ5z/SyDBBaIc="; }; - vendorHash = "sha256-duTW42UL8EtnxUvPr2GXHKcaGQ3d0u2maMzSIOHIxxI="; + vendorHash = "sha256-iyZNOooPH1jvT+S9/ETRoXsTwXUIUi1UKmDzhB7NRuE="; ldflags = [ "-s" "-w" "-X=main.ServerVersion=${version}" ]; From de8da1b57b77d1a66881f7f38ece7cad992aa21a Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 21 Apr 2024 02:52:53 +0200 Subject: [PATCH 52/97] python312Packages.aranet4: 2.2.3 -> 2.3.3 https://github.com/Anrijs/Aranet4-Python/compare/refs/tags/v2.2.3...v2.3.3 --- pkgs/development/python-modules/aranet4/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aranet4/default.nix b/pkgs/development/python-modules/aranet4/default.nix index 338e53fcb788..d6fda0fb4fc2 100644 --- a/pkgs/development/python-modules/aranet4/default.nix +++ b/pkgs/development/python-modules/aranet4/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "aranet4"; - version = "2.2.3"; + version = "2.3.3"; pyproject = true; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "Anrijs"; repo = "Aranet4-Python"; rev = "refs/tags/v${version}"; - hash = "sha256-Jd7yuddxwRrO7XFQsVGy5vRQxwIUZdwFSjiZZHdkE3g="; + hash = "sha256-j53d2Ki9xVWGHWkAu1wkjYE56Xq7kfMmqQrQiKrBg2I="; }; nativeBuildInputs = [ From 3d9dab80e1b0f143a762cf090d8f5029c346edeb Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 21 Apr 2024 02:24:10 +0200 Subject: [PATCH 53/97] python312Packages.bellows: fix build --- pkgs/development/python-modules/bellows/default.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/development/python-modules/bellows/default.nix b/pkgs/development/python-modules/bellows/default.nix index 8c1502a8e1c5..38c938bb7424 100644 --- a/pkgs/development/python-modules/bellows/default.nix +++ b/pkgs/development/python-modules/bellows/default.nix @@ -4,6 +4,7 @@ , click , click-log , fetchFromGitHub +, fetchpatch2 , pure-pcapy3 , pyserial-asyncio , pytest-asyncio @@ -29,6 +30,13 @@ buildPythonPackage rec { hash = "sha256-oxPzjDb+FdHeHsgeGKH3SVvKb0vCB9dIhT7lGzhDcBw="; }; + patches = [ + (fetchpatch2 { + url = "https://github.com/zigpy/bellows/commit/7833647083f27f55b7ad345f4aaa7dffaa369abc.patch"; + hash = "sha256-v+BOPqikWoyNtZ1qRWe3RwraG6nQnfZqoV6yj9PpGX8="; + }) + ]; + postPatch = '' substituteInPlace pyproject.toml \ --replace-fail '"setuptools-git-versioning<2"' "" \ From 13876bd27ad6c54910181fc7a611a11e622bb2f5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 21 Apr 2024 01:09:06 +0000 Subject: [PATCH 54/97] libucl: 0.9.1 -> 0.9.2 --- pkgs/development/libraries/libucl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libucl/default.nix b/pkgs/development/libraries/libucl/default.nix index 77f8f6bfb920..6275a85e6ee2 100644 --- a/pkgs/development/libraries/libucl/default.nix +++ b/pkgs/development/libraries/libucl/default.nix @@ -25,13 +25,13 @@ let in stdenv.mkDerivation rec { pname = "libucl"; - version = "0.9.1"; + version = "0.9.2"; src = fetchFromGitHub { owner = "vstakhov"; repo = pname; rev = version; - sha256 = "sha256-udgsgo6bT7WnUYnAzqHxOtdDg6av3XplptS8H5ukxjo="; + sha256 = "sha256-esNEVBa660rl3Oo2SLaLrFThFkjbqtZ1r0tjMq3h6cM="; }; nativeBuildInputs = [ pkg-config autoreconfHook ]; From 8792aad25522afc96b1e63f46cd03c45887fffa1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 21 Apr 2024 01:22:06 +0000 Subject: [PATCH 55/97] obs-studio-plugins.advanced-scene-switcher: 1.25.4 -> 1.25.5 --- .../obs-studio/plugins/advanced-scene-switcher/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/obs-studio/plugins/advanced-scene-switcher/default.nix b/pkgs/applications/video/obs-studio/plugins/advanced-scene-switcher/default.nix index 96209f3f9406..ea379e6ffc51 100644 --- a/pkgs/applications/video/obs-studio/plugins/advanced-scene-switcher/default.nix +++ b/pkgs/applications/video/obs-studio/plugins/advanced-scene-switcher/default.nix @@ -23,13 +23,13 @@ stdenv.mkDerivation rec { pname = "advanced-scene-switcher"; - version = "1.25.4"; + version = "1.25.5"; src = fetchFromGitHub { owner = "WarmUpTill"; repo = "SceneSwitcher"; rev = version; - hash = "sha256-d/utejwSazepkIMzd1tRrJSrKRFhFRZsQBGiOkt5pYk="; + hash = "sha256-ROR+R1Zak8XkhFk1+Pyi0lB+JZI4SVtKGin4vem7NEE="; }; nativeBuildInputs = [ From f349d875700382d5f2513c8210535ca573759b5d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 21 Apr 2024 01:22:54 +0000 Subject: [PATCH 56/97] novops: 0.12.1 -> 0.13.0 --- pkgs/by-name/no/novops/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/no/novops/package.nix b/pkgs/by-name/no/novops/package.nix index f5893bf66191..eed3077f5ef3 100644 --- a/pkgs/by-name/no/novops/package.nix +++ b/pkgs/by-name/no/novops/package.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "novops"; - version = "0.12.1"; + version = "0.13.0"; src = fetchFromGitHub { owner = "PierreBeucher"; repo = pname; rev = "v${version}"; - hash = "sha256-iQFw3m7dpAii/Nc1UQ/ZXTuHvj5vGsp3SOqd14uHUpc="; + hash = "sha256-LrEPdEVWgbZ6WyEqdfAhUjKXPuk8Xx7kmLA2ZsPFf1U="; }; - cargoHash = "sha256-mQ7Vm80S4FALWiEsV+68pNrah36aYu7PediRlJUXLAk="; + cargoHash = "sha256-kI836Z0fgpmPPoX0HtWkZG731xaVWgWkXF0eCaQfM28="; buildInputs = [ openssl # required for openssl-sys From 0dcf4b681d0c8ade1d16d29ece940493918bcfd6 Mon Sep 17 00:00:00 2001 From: wackbyte Date: Fri, 19 Apr 2024 20:11:40 -0400 Subject: [PATCH 57/97] vscode-extensions.redhat.java: 1.17.2023032504 -> 1.30.2024041908 --- .../editors/vscode/extensions/default.nix | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index 5cf2b7b53d06..edb43489524f 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -3321,13 +3321,18 @@ let mktplcRef = { name = "java"; publisher = "redhat"; - version = "1.17.2023032504"; - hash = "sha256-ni1jzCPjwtcdJTEORn0vYzLRbQ/wseTZmrETJ8QPW58="; + version = "1.30.2024041908"; + hash = "sha256-2VaB7duzDmoQYxLHIuC9yghJvmVnWJIBfH75xq5ljPg="; }; buildInputs = [ jdk ]; meta = { + description = "Java language support for VS Code via the Eclipse JDT Language Server"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=redhat.java"; + homepage = "https://github.com/redhat-developer/vscode-java"; + changelog = "https://marketplace.visualstudio.com/items/redhat.java/changelog"; license = lib.licenses.epl20; - broken = lib.versionOlder jdk.version "11"; + maintainers = [ lib.maintainers.wackbyte ]; + broken = lib.versionOlder jdk.version "17"; }; }; From 003be06a81c114f57becc0ebc0ef44faffcb7c71 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 21 Apr 2024 06:17:54 +0000 Subject: [PATCH 58/97] kubeswitch: 0.9.0 -> 0.9.1 --- pkgs/development/tools/kubeswitch/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/kubeswitch/default.nix b/pkgs/development/tools/kubeswitch/default.nix index 64701124a159..470fdac9b3c2 100644 --- a/pkgs/development/tools/kubeswitch/default.nix +++ b/pkgs/development/tools/kubeswitch/default.nix @@ -9,13 +9,13 @@ buildGoModule rec { pname = "kubeswitch"; - version = "0.9.0"; + version = "0.9.1"; src = fetchFromGitHub { owner = "danielfoehrKn"; repo = "kubeswitch"; rev = version; - hash = "sha256-0SY7JLFkhLEFcE1veqac9I9DZstXfxtnmSYIdDiVieg="; + hash = "sha256-cvMTuiXSpx+ZicN1P3JjGExzW7d51nN1YIpsGArXHzw="; }; vendorHash = null; From 37c022996839d775b49fb42f7d6fe3d9e2e1dd35 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 21 Apr 2024 06:21:45 +0000 Subject: [PATCH 59/97] kubevpn: 2.2.5 -> 2.2.6 --- pkgs/applications/networking/cluster/kubevpn/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/kubevpn/default.nix b/pkgs/applications/networking/cluster/kubevpn/default.nix index 13b45f748ab7..14df6fa5c47d 100644 --- a/pkgs/applications/networking/cluster/kubevpn/default.nix +++ b/pkgs/applications/networking/cluster/kubevpn/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "kubevpn"; - version = "2.2.5"; + version = "2.2.6"; src = fetchFromGitHub { owner = "KubeNetworks"; repo = "kubevpn"; rev = "v${version}"; - hash = "sha256-I4szQNRBW3M+QNwsfkJZlrZL3jJXcXmD2KnFF/E+jaE="; + hash = "sha256-Z+IXSmN1V0xRnhE/PpWv9dQIwfTztJRYaftY9KCIucc="; }; vendorHash = null; From 30210f4054171d6e18c89b49bb08b4bcd0ec9c26 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 21 Apr 2024 07:20:27 +0000 Subject: [PATCH 60/97] renode-unstable: 1.15.0+20240404gitbfa16ba07 -> 1.15.0+20240418git228a25674 --- pkgs/by-name/re/renode-unstable/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/re/renode-unstable/package.nix b/pkgs/by-name/re/renode-unstable/package.nix index 65a2d2cad87a..3eb909bc6346 100644 --- a/pkgs/by-name/re/renode-unstable/package.nix +++ b/pkgs/by-name/re/renode-unstable/package.nix @@ -5,11 +5,11 @@ renode.overrideAttrs (finalAttrs: _: { pname = "renode-unstable"; - version = "1.15.0+20240404gitbfa16ba07"; + version = "1.15.0+20240418git228a25674"; src = fetchurl { url = "https://builds.renode.io/renode-${finalAttrs.version}.linux-portable.tar.gz"; - hash = "sha256-pXA6sGYBlLU2EnhFvUwRWkYirMi5BTgzyUbQ33sIMrg="; + hash = "sha256-v8fWQQM2NZkE+Wsg8pyww6esYLggJzehavqIhzI+EaQ="; }; passthru.updateScript = From 4d2f457f6e02a08c9a6e8b879236facd8dd15fd7 Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Sun, 21 Apr 2024 02:08:48 +0200 Subject: [PATCH 61/97] nixos/tests/wpa_supplicant: test allowAuxiliaryImperativeNetworks --- nixos/tests/wpa_supplicant.nix | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/nixos/tests/wpa_supplicant.nix b/nixos/tests/wpa_supplicant.nix index 8c701ca7d5f7..9288eba189c8 100644 --- a/nixos/tests/wpa_supplicant.nix +++ b/nixos/tests/wpa_supplicant.nix @@ -113,6 +113,21 @@ import ./make-test-python.nix ({ pkgs, lib, ...}: }; }; + imperative = { ... }: { + imports = [ ../modules/profiles/minimal.nix ]; + + # add a virtual wlan interface + boot.kernelModules = [ "mac80211_hwsim" ]; + + # wireless client + networking.wireless = { + enable = lib.mkOverride 0 true; + userControlled.enable = true; + allowAuxiliaryImperativeNetworks = true; + interfaces = [ "wlan1" ]; + }; + }; + # Test connecting to the SAE-only hotspot using SAE machineSae = machineWithHostapd { networking.wireless = { @@ -185,6 +200,15 @@ import ./make-test-python.nix ({ pkgs, lib, ...}: assert "Failed to connect" not in status, \ "Failed to connect to the daemon" + with subtest("Daemon can be configured imperatively"): + imperative.wait_for_unit("wpa_supplicant-wlan1.service") + imperative.wait_until_succeeds("wpa_cli -i wlan1 status") + imperative.succeed("wpa_cli -i wlan1 add_network") + imperative.succeed("wpa_cli -i wlan1 set_network 0 ssid '\"nixos-test\"'") + imperative.succeed("wpa_cli -i wlan1 set_network 0 psk '\"reproducibility\"'") + imperative.succeed("wpa_cli -i wlan1 save_config") + imperative.succeed("grep -q nixos-test /etc/wpa_supplicant.conf") + machineSae.wait_for_unit("hostapd.service") machineSae.copy_from_vm("/run/hostapd/wlan0.hostapd.conf") with subtest("Daemon can connect to the SAE access point using SAE"): From 89a1bde018ad10f723658a988e5aee0b78846b73 Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Sun, 21 Apr 2024 09:39:00 +0200 Subject: [PATCH 62/97] nixos/wireless: correctly handle secrets containing & In the replacement arg of gsub() the & symbol is a special character that need to be escaped. To avoid this, and further issues due to the variable name possibly being interpreted as a regex, we do a normal substring replacement. This fixes issues #279803. --- nixos/modules/services/networking/wpa_supplicant.nix | 8 ++++++-- nixos/tests/wpa_supplicant.nix | 5 ++++- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/nixos/modules/services/networking/wpa_supplicant.nix b/nixos/modules/services/networking/wpa_supplicant.nix index c9dd1d1b0f01..ae2e19c12698 100644 --- a/nixos/modules/services/networking/wpa_supplicant.nix +++ b/nixos/modules/services/networking/wpa_supplicant.nix @@ -127,8 +127,12 @@ let # substitute environment variables if [ -f "${configFile}" ]; then ${pkgs.gawk}/bin/awk '{ - for(varname in ENVIRON) - gsub("@"varname"@", ENVIRON[varname]) + for(varname in ENVIRON) { + find = "@"varname"@" + repl = ENVIRON[varname] + if (i = index($0, find)) + $0 = substr($0, 1, i-1) repl substr($0, i+length(find)) + } print }' "${configFile}" > "${finalConfig}" else diff --git a/nixos/tests/wpa_supplicant.nix b/nixos/tests/wpa_supplicant.nix index 8c701ca7d5f7..76c00368986a 100644 --- a/nixos/tests/wpa_supplicant.nix +++ b/nixos/tests/wpa_supplicant.nix @@ -102,13 +102,15 @@ import ./make-test-python.nix ({ pkgs, lib, ...}: test2.psk = "@PSK_SPECIAL@"; # should be replaced test3.psk = "@PSK_MISSING@"; # should not be replaced test4.psk = "P@ssowrdWithSome@tSymbol"; # should not be replaced + test5.psk = "@PSK_AWK_REGEX@"; # should be replaced }; # secrets environmentFile = pkgs.writeText "wpa-secrets" '' PSK_VALID="S0m3BadP4ssw0rd"; # taken from https://github.com/minimaxir/big-list-of-naughty-strings - PSK_SPECIAL=",./;'[]\-= <>?:\"{}|_+ !@#$%^\&*()`~"; + PSK_SPECIAL=",./;'[]\/\-= <>?:\"{}|_+ !@#$%^&*()`~"; + PSK_AWK_REGEX="PassowrdWith&symbol"; ''; }; }; @@ -171,6 +173,7 @@ import ./make-test-python.nix ({ pkgs, lib, ...}: basic.fail(f"grep -q @PSK_SPECIAL@ {config_file}") basic.succeed(f"grep -q @PSK_MISSING@ {config_file}") basic.succeed(f"grep -q P@ssowrdWithSome@tSymbol {config_file}") + basic.succeed(f"grep -q 'PassowrdWith&symbol' {config_file}") with subtest("WPA2 fallbacks have been generated"): assert int(basic.succeed(f"grep -c sae-only {config_file}")) == 1 From 5d37283092ef05c187e58e475558ddf4b8c7ddca Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Fri, 19 Apr 2024 08:37:41 +0200 Subject: [PATCH 63/97] vimPlugins: update on 2024-04-21 --- .../editors/vim/plugins/generated.nix | 1092 ++++++++--------- .../editors/vim/plugins/overrides.nix | 12 +- .../patches/openscad.nvim/program_paths.patch | 10 +- 3 files changed, 557 insertions(+), 557 deletions(-) diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index ac5fe0cc16a1..fe774440dd29 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -65,12 +65,12 @@ final: prev: Coqtail = buildVimPlugin { pname = "Coqtail"; - version = "2024-03-30"; + version = "2024-04-19"; src = fetchFromGitHub { owner = "whonore"; repo = "Coqtail"; - rev = "c881047dd32cbd9524b0c733821c113ebcc03b07"; - sha256 = "1my43cd1shgjg0f111qq14n217l3msdxgx2ks2hdil9vbrvn530s"; + rev = "c74271e68dfc9e125e6ae197879eb50c7b34512d"; + sha256 = "1x2yhdmmm5sbfpqbkrivwa05hx8vk5xa3468db3554clawkp2mnj"; }; meta.homepage = "https://github.com/whonore/Coqtail/"; }; @@ -173,24 +173,24 @@ final: prev: LazyVim = buildVimPlugin { pname = "LazyVim"; - version = "2024-03-29"; + version = "2024-04-11"; src = fetchFromGitHub { owner = "LazyVim"; repo = "LazyVim"; - rev = "97480dc5d2dbb717b45a351e0b04835f138a9094"; - sha256 = "0p5qrqk958rp85vskh5di05s0v9a02phmpdk6gy61z632ycvym6w"; + rev = "bb36f71b77d8e15788a5b62c82a1c9ec7b209e49"; + sha256 = "1vjckraf062d7dybf1iphp7i7lwphzgc1bns0jzfardbd1q9gw3f"; }; meta.homepage = "https://github.com/LazyVim/LazyVim/"; }; LeaderF = buildVimPlugin { pname = "LeaderF"; - version = "2024-03-29"; + version = "2024-04-20"; src = fetchFromGitHub { owner = "Yggdroot"; repo = "LeaderF"; - rev = "735a2f36d3a25e320182bf3f385f5530d674600e"; - sha256 = "058m5ry3lc4wz7978vd0a2a2wqv7q1z3adzasfzsddhah07dkxa3"; + rev = "d4eded0ab36ba60aa7e13893a2064a74d2cdb6bd"; + sha256 = "0xzdm4ggh5bggnxjgcaxkzdiwfxs11yblgmpwvzqjhpzv8qnzkx1"; }; meta.homepage = "https://github.com/Yggdroot/LeaderF/"; }; @@ -305,12 +305,12 @@ final: prev: SchemaStore-nvim = buildVimPlugin { pname = "SchemaStore.nvim"; - version = "2024-04-03"; + version = "2024-04-18"; src = fetchFromGitHub { owner = "b0o"; repo = "SchemaStore.nvim"; - rev = "32e3a9654693f513a2cbb76ba99cbc9947b1352d"; - sha256 = "1sazs3a8zzbjy6g83fm1kqah8cc3x3pihbzqplmllrw2nbc29qxk"; + rev = "f7cae6f1b38cb296f48ce1a9c5ed1a419d912a42"; + sha256 = "0mdriqqna37a9fjbilaq2qkkn4ik4jn2dz1x6ra51pgh42r86qhl"; }; meta.homepage = "https://github.com/b0o/SchemaStore.nvim/"; }; @@ -522,12 +522,12 @@ final: prev: aerial-nvim = buildVimPlugin { pname = "aerial.nvim"; - version = "2024-03-28"; + version = "2024-04-19"; src = fetchFromGitHub { owner = "stevearc"; repo = "aerial.nvim"; - rev = "24ebacab5821107c50f628e8e7774f105c08fe9b"; - sha256 = "148d8v57g7sxh1xy3df2bzq8jvgp70k52rw9ihr88f0dd3x7zsfj"; + rev = "7045e7cb0017d222122a1f6e5795e69754d8b9db"; + sha256 = "04mclw1drrkr4x4gnb26p6szg6glbkkff7cbrxy4g7fyx6lhl9fy"; fetchSubmodules = true; }; meta.homepage = "https://github.com/stevearc/aerial.nvim/"; @@ -583,12 +583,12 @@ final: prev: ale = buildVimPlugin { pname = "ale"; - version = "2024-03-20"; + version = "2024-04-20"; src = fetchFromGitHub { owner = "dense-analysis"; repo = "ale"; - rev = "6c10a519f1460179cf8f8e329d8eb3186247be2b"; - sha256 = "122hsm461cqs3k48fqzsizqnknm7pg4v8pnpady3zzjwijzgq9h7"; + rev = "adee52fba040428264aee956d99033572fc405a3"; + sha256 = "125hcnl146bh8bpsp3v62dbdqpzwma5n69f8y6gpk5anh4yc1sai"; }; meta.homepage = "https://github.com/dense-analysis/ale/"; }; @@ -691,12 +691,12 @@ final: prev: astrotheme = buildVimPlugin { pname = "astrotheme"; - version = "2024-04-01"; + version = "2024-04-10"; src = fetchFromGitHub { owner = "AstroNvim"; repo = "astrotheme"; - rev = "e056b8216214f7140eda3e0adcfc27efba705231"; - sha256 = "1l17d68y3p1gyhp8w2ll3v9mcvnbc4gyck2qlc595w79d0hgzfhr"; + rev = "8b316aa3ecd8c4206430379c0b1da0b4e7969ab9"; + sha256 = "120fz8z6bmsp7dqjhg8dygbgv1q4bzwk0k8ji55xa2w6bc8ji3ii"; }; meta.homepage = "https://github.com/AstroNvim/astrotheme/"; }; @@ -895,12 +895,12 @@ final: prev: auto-session = buildVimPlugin { pname = "auto-session"; - version = "2024-04-01"; + version = "2024-04-14"; src = fetchFromGitHub { owner = "rmagatti"; repo = "auto-session"; - rev = "64dc86e43c85f0062baafb0b607a6162efc99c91"; - sha256 = "051l736qzpmnljindha84zbbl5i6ckzn2ys1gpmcj93l80nf2jc7"; + rev = "9e0a169b6fce8791278abbd110717b921afe634d"; + sha256 = "0d1rbdsrlprr8dsw948i352c8564hglh56vwg80qxqib2ssfxvy2"; }; meta.homepage = "https://github.com/rmagatti/auto-session/"; }; @@ -1015,24 +1015,24 @@ final: prev: bamboo-nvim = buildVimPlugin { pname = "bamboo.nvim"; - version = "2024-03-16"; + version = "2024-04-18"; src = fetchFromGitHub { owner = "ribru17"; repo = "bamboo.nvim"; - rev = "5c826c8ad27010ac2fcaf7deb4c36b16d00ef5a1"; - sha256 = "1651b4lyll7902817bi4ndx115k7pxsvbx8mdddmmkw863zl60db"; + rev = "aaeda8100e3a7ebcc65b5897c9027eca2bd9cbf2"; + sha256 = "1734skv1z9qd8p6dspda1hhq79rd4y4bkyggf0iphz8qw7g0qm8m"; }; meta.homepage = "https://github.com/ribru17/bamboo.nvim/"; }; barbar-nvim = buildVimPlugin { pname = "barbar.nvim"; - version = "2024-04-01"; + version = "2024-04-12"; src = fetchFromGitHub { owner = "romgrk"; repo = "barbar.nvim"; - rev = "e7521487be265773f81200a2628b141c836c089b"; - sha256 = "11hx8vbspf5ai547x5r3cc217qn40mxrxcasblhcwmjgg9ybnvdd"; + rev = "88fe247ba6453b6ac422f26eb047acaac1a6000a"; + sha256 = "0amim3cminq310rzqyylkf7afkyjpmxcvp1y42ml00vdl7av2484"; }; meta.homepage = "https://github.com/romgrk/barbar.nvim/"; }; @@ -1051,12 +1051,12 @@ final: prev: base16-nvim = buildVimPlugin { pname = "base16-nvim"; - version = "2024-02-17"; + version = "2024-04-18"; src = fetchFromGitHub { owner = "RRethy"; repo = "base16-nvim"; - rev = "b3e9ec6a82c05b562cd71f40fe8964438a9ba64a"; - sha256 = "1qb8g6q8vwq99030nqw719xgrizbqcnmj4n25fqakjq8pbclwh4p"; + rev = "eec6882101dd189117f79c5d18d389d20cfc0415"; + sha256 = "060cm7071gr3vpizd7iinpgk50igsqrgcrffa0ali2r6mdhxcwd7"; }; meta.homepage = "https://github.com/RRethy/base16-nvim/"; }; @@ -1279,12 +1279,12 @@ final: prev: bufferline-nvim = buildVimPlugin { pname = "bufferline.nvim"; - version = "2024-03-07"; + version = "2024-04-19"; src = fetchFromGitHub { owner = "akinsho"; repo = "bufferline.nvim"; - rev = "64e2c5def50dfd6b6f14d96a45fa3d815a4a1eef"; - sha256 = "1r9bb6jmcj2048ny86v7ha8scjv1qispmxhj98l11jb2xb1f1fvn"; + rev = "f6f00d9ac1a51483ac78418f9e63126119a70709"; + sha256 = "1681xqpvxb7zhfig69d0qf287qzxfwcwb6vipnhykiisd8vn9inv"; }; meta.homepage = "https://github.com/akinsho/bufferline.nvim/"; }; @@ -1303,12 +1303,12 @@ final: prev: bullets-vim = buildVimPlugin { pname = "bullets.vim"; - version = "2024-03-08"; + version = "2024-04-18"; src = fetchFromGitHub { owner = "bullets-vim"; repo = "bullets.vim"; - rev = "0cc28d53e9da628e006c89bb2d3b03b94a0dee33"; - sha256 = "0gxa73q89w7mkhhmy3f2zdcsys4p9m4z61ff1c9lmbvd1r8dh898"; + rev = "4ed0785a5a812d9dc96164f2ceab10f5dce68270"; + sha256 = "0dpbh9l4a3009k0qi016zm03wjc12jbf31lhj78mmqnpazfn7gfh"; }; meta.homepage = "https://github.com/bullets-vim/bullets.vim/"; }; @@ -1351,24 +1351,24 @@ final: prev: ccc-nvim = buildVimPlugin { pname = "ccc.nvim"; - version = "2024-04-01"; + version = "2024-04-08"; src = fetchFromGitHub { owner = "uga-rosa"; repo = "ccc.nvim"; - rev = "46b8a38a3bc287f27789800d3d26480d093d65b5"; - sha256 = "0cgmvjkyvrn9c77hl1i5qbak8v8ypl8m0pqkpz886x2f95xa68xd"; + rev = "1283eef5494c092a047baa34ed3e667f3cb2715e"; + sha256 = "1wipfpypa2zjdc2n4cjkiaxcfh0mraiwiripg3vmd4mf37wbxphv"; }; meta.homepage = "https://github.com/uga-rosa/ccc.nvim/"; }; chadtree = buildVimPlugin { pname = "chadtree"; - version = "2024-04-03"; + version = "2024-04-18"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "chadtree"; - rev = "f085e2363ed170b3d90a95e614954395a0a541c0"; - sha256 = "01cfzcm2f6vr67w2l4f80iqmp74l827mmzcfjgcxjc68a70y2y8f"; + rev = "a8271021ec4f5cae4b9a276ab8662e9a7d6074f9"; + sha256 = "0cpzpz17smp3dc4lwid3gkkjwangndy1d6fbijrl1l2jpa8dzrgq"; }; meta.homepage = "https://github.com/ms-jpq/chadtree/"; }; @@ -1423,12 +1423,12 @@ final: prev: citruszest-nvim = buildVimPlugin { pname = "citruszest.nvim"; - version = "2024-04-03"; + version = "2024-04-20"; src = fetchFromGitHub { owner = "zootedb0t"; repo = "citruszest.nvim"; - rev = "b30d441088d579d22e773f4cb28550fb9a65a604"; - sha256 = "03j3n1rjmvylllhhpp6qz5v6n3h1hb12bsp186jvamb3wqky48la"; + rev = "ea9cb04feadc1f7fbd2902fc65f0308354583f5d"; + sha256 = "0mqnh1155pg0dw07hzn7jd5x42gwvffkpn7w1pk4jnmaas3yxpkh"; }; meta.homepage = "https://github.com/zootedb0t/citruszest.nvim/"; }; @@ -1519,12 +1519,12 @@ final: prev: cmake-tools-nvim = buildVimPlugin { pname = "cmake-tools.nvim"; - version = "2024-03-19"; + version = "2024-04-14"; src = fetchFromGitHub { owner = "Civitasv"; repo = "cmake-tools.nvim"; - rev = "a4cd0b3a2c8a166a54b36bc00579954426748959"; - sha256 = "1bi79pv0wd97rvjx1dx60y87c7shw8xrg02mf08rl3l6827zq3p8"; + rev = "8506c426d5b361dbaa7c61c0490a2589a9c555ce"; + sha256 = "1kmrfbxwzi60mf88qfcwjcwn0js9wci0yz89d99zgrm0vxl5jpkh"; }; meta.homepage = "https://github.com/Civitasv/cmake-tools.nvim/"; }; @@ -1747,12 +1747,12 @@ final: prev: cmp-git = buildVimPlugin { pname = "cmp-git"; - version = "2023-12-29"; + version = "2024-04-15"; src = fetchFromGitHub { owner = "petertriho"; repo = "cmp-git"; - rev = "8d8993680d627c8f13bd85094eba84604107dbdd"; - sha256 = "1p7jq14rcljkg2d216498gr0gj76p493vy0h4jzgsz8ncmfxk6qw"; + rev = "b9603f18496bc3ca07e6bd474607081af709e750"; + sha256 = "0r27gf1j77fmqi2m8n5q3s326wp3ns81p7vcfhn6j74y979v11jg"; }; meta.homepage = "https://github.com/petertriho/cmp-git/"; }; @@ -1867,12 +1867,12 @@ final: prev: cmp-nvim-tags = buildVimPlugin { pname = "cmp-nvim-tags"; - version = "2023-05-10"; + version = "2024-04-18"; src = fetchFromGitHub { owner = "quangnguyen30192"; repo = "cmp-nvim-tags"; - rev = "30bdc2eec86eb66730af541bb06d24d4a67e3eeb"; - sha256 = "0dlpw2z9amb4klsr0mjviin73bj7zqfh3lz0g2lwb2n5g6jnakfn"; + rev = "3580b6c97c35831afc25a23f1e7f4aa8ad070481"; + sha256 = "074y4h2p5dx72s7y6spi1iqqpmva3f2mr33pra155ahzqpzqi3v7"; }; meta.homepage = "https://github.com/quangnguyen30192/cmp-nvim-tags/"; }; @@ -2203,12 +2203,12 @@ final: prev: coc-nvim = buildVimPlugin { pname = "coc.nvim"; - version = "2024-03-28"; + version = "2024-04-19"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc.nvim"; - rev = "196d8f0314bc6199f8243f00411ca7d87adc3c30"; - sha256 = "1gq1kqinyqj5d2w7420kvyvs9wkbr29zhhibbrac287smpqvgkw0"; + rev = "a8823eed914f89cdd3940ed9f5f62786e6d585c1"; + sha256 = "1s3hcbhx5kn3b6m1793m02kl94g8hb53jc5lhjhgkg4qhx27hsq9"; }; meta.homepage = "https://github.com/neoclide/coc.nvim/"; }; @@ -2227,12 +2227,12 @@ final: prev: codeium-nvim = buildVimPlugin { pname = "codeium.nvim"; - version = "2024-03-21"; + version = "2024-04-16"; src = fetchFromGitHub { owner = "Exafunction"; repo = "codeium.nvim"; - rev = "a070f57c0f54bd940436b94c8b679bcad5a48811"; - sha256 = "1r2sshdl7afgy5c5v5jc1lffvw4wbb4fv9fhn1fgxvn61r0xm005"; + rev = "dfcac077fa023b7194c6403ac9a8f931b9c24f28"; + sha256 = "03lykrm0d5xm8i5f002xfy7l8wmzji5bqy4ygl3vals12ni5ymph"; }; meta.homepage = "https://github.com/Exafunction/codeium.nvim/"; }; @@ -2491,12 +2491,12 @@ final: prev: conform-nvim = buildVimPlugin { pname = "conform.nvim"; - version = "2024-03-28"; + version = "2024-04-17"; src = fetchFromGitHub { owner = "stevearc"; repo = "conform.nvim"; - rev = "9d5ba06d6ee7418c674f498634617416d15b6239"; - sha256 = "0xpgpjaq40qf686qg0m5hhqpqahjz5wgxviyxny2i7zk4r832bqm"; + rev = "a6965ac128eba75537ec2bc5ddd5d5e357062bdc"; + sha256 = "00knvdl5msvn178skxqxb0ip722cnqrpp8xr1id4z6j5vbysmhiy"; fetchSubmodules = true; }; meta.homepage = "https://github.com/stevearc/conform.nvim/"; @@ -2564,12 +2564,12 @@ final: prev: copilot-vim = buildVimPlugin { pname = "copilot.vim"; - version = "2024-03-14"; + version = "2024-04-13"; src = fetchFromGitHub { owner = "github"; repo = "copilot.vim"; - rev = "9484e35cf222e9360e05450622a884f95c662c4c"; - sha256 = "1c7dabbyk5124xw5k5b29h9nmv04ix6p3j3p7qns7ssqinvfphmm"; + rev = "1e135c5303bc60598f6314a2276f31dc91aa34dd"; + sha256 = "06b5c0xgs3xiajdw7ag3qbv4i0qwn4s084r4pj5v8d9iyc834kiz"; }; meta.homepage = "https://github.com/github/copilot.vim/"; }; @@ -2588,12 +2588,12 @@ final: prev: coq-thirdparty = buildVimPlugin { pname = "coq.thirdparty"; - version = "2024-02-03"; + version = "2024-04-18"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "coq.thirdparty"; - rev = "d9c1492ee60d627b171c7a9bcd0c3bb35af3e0fd"; - sha256 = "0q8fv58v2sy9kq737ddmrrf0vvqpz8wrybnrks3vazq017jc5y7v"; + rev = "5f45777bcb0c14266a7e07ed474cb70c4e8b6397"; + sha256 = "0h2rq7aqxrf58cgwh6iwm2gs2fghkipyz20gdwqcy5hqmy2l0mi1"; }; meta.homepage = "https://github.com/ms-jpq/coq.thirdparty/"; }; @@ -2612,12 +2612,12 @@ final: prev: coq_nvim = buildVimPlugin { pname = "coq_nvim"; - version = "2024-04-03"; + version = "2024-04-18"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "coq_nvim"; - rev = "c7fc9a764f91d7152c6a435de730eb436aeeed49"; - sha256 = "0ljpylgxir8sbcxh9qmvwm1vpabs2l4s3im81yfcyj1164hwsk84"; + rev = "98e389717df1a29f557f7a5d8f1d8a7e5c0560dd"; + sha256 = "16ngidw3lg1virbd731pp9z1s20j8mva6569blkj7cnk08kprh7l"; }; meta.homepage = "https://github.com/ms-jpq/coq_nvim/"; }; @@ -2648,12 +2648,12 @@ final: prev: crates-nvim = buildVimPlugin { pname = "crates.nvim"; - version = "2024-03-13"; + version = "2024-04-13"; src = fetchFromGitHub { owner = "saecki"; repo = "crates.nvim"; - rev = "b4f4987ccdb1cc3899ee541ef4375c73c48c4570"; - sha256 = "0r9l018sfymmbg7lc31bp4q2aqdljaqini5s14mg3r7lwcg15z61"; + rev = "786d12a70c9b91fa2d0d102bb07df02be0db31a1"; + sha256 = "1krd7srvzjrikpirfypw09cv2flcy22jv8amrbxfxykrgg2vn6dd"; }; meta.homepage = "https://github.com/saecki/crates.nvim/"; }; @@ -2744,12 +2744,12 @@ final: prev: cyberdream-nvim = buildVimPlugin { pname = "cyberdream.nvim"; - version = "2024-04-03"; + version = "2024-04-19"; src = fetchFromGitHub { owner = "scottmckendry"; repo = "cyberdream.nvim"; - rev = "10bae2c37bc76e812af769687acb88b11283d38b"; - sha256 = "1w7k5x8da0a3ifw0hgs5wcph5kixx52jd0zqqdf7v76ci3158g95"; + rev = "9a7f07ad318a96f19845683014d27be00495ea98"; + sha256 = "1w8ic8ngfk1x99yl7bx7kfqmwi0py6xj198yczvxwzmgfxby5sjc"; }; meta.homepage = "https://github.com/scottmckendry/cyberdream.nvim/"; }; @@ -2780,24 +2780,24 @@ final: prev: dashboard-nvim = buildVimPlugin { pname = "dashboard-nvim"; - version = "2024-04-03"; + version = "2024-04-18"; src = fetchFromGitHub { owner = "nvimdev"; repo = "dashboard-nvim"; - rev = "7c0c09d55118a2afeb8874e885f87ae80d8ff452"; - sha256 = "0ipn3cbivi04hn1qixxp8cd4kxfsjnkd3a8hz5j3bpn4x74c6qxk"; + rev = "6d06924b562de6f0bb136edf1bf549afbf6b7d00"; + sha256 = "1c5xhwsj84rs00zds9279wfvxc2xjmdfix36mvxdklrq6f083ifd"; }; meta.homepage = "https://github.com/nvimdev/dashboard-nvim/"; }; debugprint-nvim = buildVimPlugin { pname = "debugprint.nvim"; - version = "2024-04-03"; + version = "2024-04-17"; src = fetchFromGitHub { owner = "andrewferrier"; repo = "debugprint.nvim"; - rev = "ff44034c8f52feb252bd88311f91b8c9b9abe0f0"; - sha256 = "1gxfimxg422bgz631nrdxwmmvx1l40vy3qjwawnp0jgi0b32nlfv"; + rev = "4ac809ff035eb246392ce4593c49705e894dbbea"; + sha256 = "1zjycn3qj6mpa7c5aknka2dfq8d05ac8rc6sfh81sal2hwdnq1d1"; }; meta.homepage = "https://github.com/andrewferrier/debugprint.nvim/"; }; @@ -2900,24 +2900,24 @@ final: prev: denops-vim = buildVimPlugin { pname = "denops.vim"; - version = "2024-03-27"; + version = "2024-04-17"; src = fetchFromGitHub { owner = "vim-denops"; repo = "denops.vim"; - rev = "c057cdff217e3f7de9f19c8da270b23523bb19a4"; - sha256 = "1sjsc04ssjblcyxlpp944qhhpf6qizw6d595cgj2i8pap0vpx4bf"; + rev = "c727a3f05a804d1f04b11735f8241518465de9a7"; + sha256 = "1h08jrxa07b59ipxqlk2ni78bn1h2w4qdg0m46bwgn7pb24479f6"; }; meta.homepage = "https://github.com/vim-denops/denops.vim/"; }; deol-nvim = buildVimPlugin { pname = "deol.nvim"; - version = "2024-03-21"; + version = "2024-04-15"; src = fetchFromGitHub { owner = "Shougo"; repo = "deol.nvim"; - rev = "f61f59979c073b663977dbb659f1c9c5a91d88e1"; - sha256 = "0a0dgnh3rk8b6739pb3nacg8pbqw1yj2aib0sgspsvd0zirqwisw"; + rev = "c77537a563a58221eb996ea64304dbe22ebc6f64"; + sha256 = "0gnrx5ll1hmpxsn5jw229w8sa2kkswyw6bdd1ffgx7bvfk7z2k4m"; }; meta.homepage = "https://github.com/Shougo/deol.nvim/"; }; @@ -3298,12 +3298,12 @@ final: prev: dropbar-nvim = buildVimPlugin { pname = "dropbar.nvim"; - version = "2024-04-01"; + version = "2024-04-20"; src = fetchFromGitHub { owner = "Bekaboo"; repo = "dropbar.nvim"; - rev = "26173fd5347bddc28fdc645d7020abd860754a73"; - sha256 = "1lwzl4c9bkw06k875hg9b3yhavqbd1p5xr8zlfcspc05ip57y9l4"; + rev = "e3c7de9f733587373959b220d5a1970c476a3d9f"; + sha256 = "02ipdrrian2s0ddbjaga681sgflcw6nqcq707g7v1f094fc2rvj5"; }; meta.homepage = "https://github.com/Bekaboo/dropbar.nvim/"; }; @@ -3358,12 +3358,12 @@ final: prev: editorconfig-vim = buildVimPlugin { pname = "editorconfig-vim"; - version = "2024-01-15"; + version = "2024-04-13"; src = fetchFromGitHub { owner = "editorconfig"; repo = "editorconfig-vim"; - rev = "0956bc257ca4eaa3e087e0ba2253a3e980805820"; - sha256 = "1w64bpv4hanyxml0hbqqsbm96fckx1imcvksr2raq9al0qlfk4gn"; + rev = "8b7da79e9daee7a3f3a8d4fe29886b9756305aff"; + sha256 = "1ix80rgylpjimv3x13f8nf3gs33lf99wzydswyzyd5mpvz5p8i55"; fetchSubmodules = true; }; meta.homepage = "https://github.com/editorconfig/editorconfig-vim/"; @@ -3383,24 +3383,24 @@ final: prev: efmls-configs-nvim = buildVimPlugin { pname = "efmls-configs-nvim"; - version = "2024-04-02"; + version = "2024-04-19"; src = fetchFromGitHub { owner = "creativenull"; repo = "efmls-configs-nvim"; - rev = "479505abe49a554c0d31104a2fee730188240944"; - sha256 = "1qgwxxwdqk6nqdaka11p5cpyms1d2h5yqcgq3wfcy8f2j94hpbxg"; + rev = "2bd059ef683c232f9d6fa898bfe93173f0d4253e"; + sha256 = "1phyrapplsn5iivl1vfnvg4nfilxdp8digcfy6d9khsbpggjhcmq"; }; meta.homepage = "https://github.com/creativenull/efmls-configs-nvim/"; }; elixir-tools-nvim = buildVimPlugin { pname = "elixir-tools.nvim"; - version = "2024-03-11"; + version = "2024-04-20"; src = fetchFromGitHub { owner = "elixir-tools"; repo = "elixir-tools.nvim"; - rev = "4d003f4b41ab9b4f8b569104fa7818f048ed4e25"; - sha256 = "08qz9azq1m4rfw8s2sd6hhrds5zx0vv2azyjnwyk05q2v95xwl55"; + rev = "3c4f8344a341818417b3d75c04eb96d894cb4640"; + sha256 = "1jwqflzdr9qk27gqsd0h4nfi2scq274l2rgbmyccybj5kmdjv654"; }; meta.homepage = "https://github.com/elixir-tools/elixir-tools.nvim/"; }; @@ -3564,12 +3564,12 @@ final: prev: feline-nvim = buildVimPlugin { pname = "feline.nvim"; - version = "2024-01-05"; + version = "2024-04-19"; src = fetchFromGitHub { owner = "freddiehaddad"; repo = "feline.nvim"; - rev = "6cfbe0608d2552a7d947c6f521670b10379fbe42"; - sha256 = "1hkypnpaws9ijw4k3gqc03y5hmwnjp9jax8k9dxgqiasixk0wqs9"; + rev = "2aa8b757313cc01f7779865bef7c7cc391753bd8"; + sha256 = "1xbaa553l7hc2jfgdj9q44xxgv8bkia51w54297p548w90by3kfl"; }; meta.homepage = "https://github.com/freddiehaddad/feline.nvim/"; }; @@ -3612,12 +3612,12 @@ final: prev: fidget-nvim = buildNeovimPlugin { pname = "fidget.nvim"; - version = "2024-03-20"; + version = "2024-04-04"; src = fetchFromGitHub { owner = "j-hui"; repo = "fidget.nvim"; - rev = "933db4596e4bab1b09b6d48a10e21819e4cc458f"; - sha256 = "15dngi9zink0sq5nvc2qdag8nr9j9i8qqq8l6hrrb8rdwkr6147j"; + rev = "1ba38e4cbb24683973e00c2e36f53ae64da38ef5"; + sha256 = "0g0z1g1nmrjmg9298vg2ski6m41f1yhpas8kr9mi8pa6ibk4m63x"; }; meta.homepage = "https://github.com/j-hui/fidget.nvim/"; }; @@ -3709,12 +3709,12 @@ final: prev: flit-nvim = buildVimPlugin { pname = "flit.nvim"; - version = "2024-03-20"; + version = "2024-04-08"; src = fetchFromGitHub { owner = "ggandor"; repo = "flit.nvim"; - rev = "04f744bbb2b91fb2ad2c702b5eb8e23d17924fa6"; - sha256 = "1jg7acb4qmq7yb679w1r3jxvf7acgzm9kkpj8i8wnilfy3b6n8xc"; + rev = "56490317983218b09698f8c960c3669958b12b32"; + sha256 = "1m1l9dh7gwphf7ry7wzvx1hrha3i9b5alp6kpazpjidnjr1mjzb9"; }; meta.homepage = "https://github.com/ggandor/flit.nvim/"; }; @@ -3769,12 +3769,12 @@ final: prev: flutter-tools-nvim = buildVimPlugin { pname = "flutter-tools.nvim"; - version = "2024-03-28"; + version = "2024-04-19"; src = fetchFromGitHub { owner = "akinsho"; repo = "flutter-tools.nvim"; - rev = "4f18033c3b78aa5450e538d81dfbbb3e67aeadec"; - sha256 = "0xppabjh206gppm7ip0h3i6654k951am80v5ckrsksp0q7c7612d"; + rev = "f04131d6b2c82c2a7624a8843642d6269b50b437"; + sha256 = "0i8nincmm9jnq36hhgmygq2101993mabya61mmjgpcf96dl1mdwj"; }; meta.homepage = "https://github.com/akinsho/flutter-tools.nvim/"; }; @@ -4021,12 +4021,12 @@ final: prev: git-blame-nvim = buildVimPlugin { pname = "git-blame.nvim"; - version = "2024-02-29"; + version = "2024-04-13"; src = fetchFromGitHub { owner = "f-person"; repo = "git-blame.nvim"; - rev = "a0282d05adbee80aaf4e2ff35b81b52940b67bed"; - sha256 = "0r678sln1ixgwby2kl6z344iq3dq2xpkyilrq2zpdrq4gfjhmanx"; + rev = "ad1d1365c9189d89797fe8d559677d5f55dc2830"; + sha256 = "1saw496nx8pimq1sn0ws2k10cvwg4r5q5dizfclm1rpxfp13485j"; }; meta.homepage = "https://github.com/f-person/git-blame.nvim/"; }; @@ -4067,6 +4067,18 @@ final: prev: meta.homepage = "https://github.com/ThePrimeagen/git-worktree.nvim/"; }; + gitignore-nvim = buildVimPlugin { + pname = "gitignore.nvim"; + version = "2024-03-25"; + src = fetchFromGitHub { + owner = "wintermute-cell"; + repo = "gitignore.nvim"; + rev = "2455191ec94da8ed222806a4fe3aa358eac1e558"; + sha256 = "sha256-p6k0NP3Vne6Kl98YodzSruVmJwxyrXziJj8N7u79o1w="; + }; + meta.homepage = "https://github.com/wintermute-cell/gitignore.nvim/"; + }; + gitignore-vim = buildVimPlugin { pname = "gitignore.vim"; version = "2014-03-16"; @@ -4093,12 +4105,12 @@ final: prev: gitsigns-nvim = buildNeovimPlugin { pname = "gitsigns.nvim"; - version = "2024-04-03"; + version = "2024-04-20"; src = fetchFromGitHub { owner = "lewis6991"; repo = "gitsigns.nvim"; - rev = "b45ff86f5618d1421a88c12d4feb286b80a1e2d3"; - sha256 = "0wdz87n5k1wh0c9kzvrqf163nr33iwyvys2j355ql082qwlywhdq"; + rev = "035da036e68e509ed158414416c827d022d914bd"; + sha256 = "1k5qd4k7izirgvc8yvg1hjgfx00f9fml7k0ayzk45lnhzb5c7bah"; }; meta.homepage = "https://github.com/lewis6991/gitsigns.nvim/"; }; @@ -4129,12 +4141,12 @@ final: prev: gleam-vim = buildVimPlugin { pname = "gleam.vim"; - version = "2024-03-19"; + version = "2024-04-10"; src = fetchFromGitHub { owner = "gleam-lang"; repo = "gleam.vim"; - rev = "6739d8b656adb5d2807675b7652afb6e257b2b1c"; - sha256 = "15pz1pzcajz6j146my418xr332dnd5rdr1pxssk7nx2bd2brxj3s"; + rev = "f9e82b70425dc0726ee173ecddf176ffa364e30d"; + sha256 = "1z4vvrxddhncfnr14a7kqc2k6gwknx8ydvs6n4my0nkz9jxh3v6s"; }; meta.homepage = "https://github.com/gleam-lang/gleam.vim/"; }; @@ -4153,12 +4165,12 @@ final: prev: go-nvim = buildVimPlugin { pname = "go.nvim"; - version = "2024-03-27"; + version = "2024-04-19"; src = fetchFromGitHub { owner = "ray-x"; repo = "go.nvim"; - rev = "abd282564a31c5dec14e2038ebf04fdac9ea3278"; - sha256 = "03slm6dwfm62y2fmcfbyja86d51hks6lfcqrd697g5w7qpny5y96"; + rev = "cbc6aca611cdc664f9bfc3c0a9aa9f9912fa9720"; + sha256 = "1a1a7ddg70l74ngwwrygg5r39h1yzwws0myzy5jk837lmr909sb1"; }; meta.homepage = "https://github.com/ray-x/go.nvim/"; }; @@ -4201,12 +4213,12 @@ final: prev: goto-preview = buildVimPlugin { pname = "goto-preview"; - version = "2024-02-17"; + version = "2024-04-05"; src = fetchFromGitHub { owner = "rmagatti"; repo = "goto-preview"; - rev = "527fd81a827234e26ca47891abe90497215db2a6"; - sha256 = "123gbz6313b0qz2ydzv1gi4nlv9a1p0lg2ywp0p365lx3684nqfg"; + rev = "3552fad4a0244ffd9ac86508e29ccc5166f19eb8"; + sha256 = "1a7dbzr3sgabcidwls7mnjbdbhjqayh1xfxwhl96ml3cqhari2k7"; }; meta.homepage = "https://github.com/rmagatti/goto-preview/"; }; @@ -4393,35 +4405,35 @@ final: prev: hardhat-nvim = buildVimPlugin { pname = "hardhat.nvim"; - version = "2024-04-01"; + version = "2024-04-03"; src = fetchFromGitHub { owner = "TheSnakeWitcher"; repo = "hardhat.nvim"; - rev = "9d9f03c27319198ca6f692ce4b12b50bc8ca9d9f"; - sha256 = "156cpcnjgsdynk0d8h8rmcczsi4ipbcdflc12kcnb9a5c87lgk4h"; + rev = "ad39b73b07aab7d1f48a624ba6f3ae35ad0a2e56"; + sha256 = "0fpn0sif0y7xrp8f01fkz0qq0c29l6r5shc6q9bvl32dzp7n2ryp"; }; meta.homepage = "https://github.com/TheSnakeWitcher/hardhat.nvim/"; }; hardtime-nvim = buildVimPlugin { pname = "hardtime.nvim"; - version = "2024-03-17"; + version = "2024-04-17"; src = fetchFromGitHub { owner = "m4xshen"; repo = "hardtime.nvim"; - rev = "21b0f9146198bb43fbc9f5ec66c8af3234f278ed"; - sha256 = "0i95llvcgdwizhxr7ml8hvb1r9mwm0j19z143i7acbfy0dv4sdcd"; + rev = "eaf4bc31b86419c26ad7b3a142dd36ca545ca2e4"; + sha256 = "0z2ppcfqd9zkhmr8xkckq7a7a8pjgma0f6jyyzg83yb3f4443yhw"; }; meta.homepage = "https://github.com/m4xshen/hardtime.nvim/"; }; hare-vim = buildVimPlugin { pname = "hare.vim"; - version = "2024-04-01"; + version = "2024-04-21"; src = fetchgit { url = "https://git.sr.ht/~sircmpwn/hare.vim"; - rev = "d88953356be21eccd3a61671ba50bdd527d0f537"; - sha256 = "0hab1j7hycz44k3k0bymyp865gmj8mms4rhq51ri3rl5dilm7f5d"; + rev = "960c7a342609f373414c1e7fe4be0dcc369716ff"; + sha256 = "1dzpp050gl1a39vdmn57941qzxmyws0x1fqykq82babppn23hzpb"; }; meta.homepage = "https://git.sr.ht/~sircmpwn/hare.vim"; }; @@ -4464,12 +4476,12 @@ final: prev: haskell-tools-nvim = buildNeovimPlugin { pname = "haskell-tools.nvim"; - version = "2024-03-25"; + version = "2024-04-21"; src = fetchFromGitHub { owner = "MrcJkb"; repo = "haskell-tools.nvim"; - rev = "b53d4f2faef93c4b85c1510adef280747b37ec67"; - sha256 = "0lai1w94256x458rhpkmkjy276m6rwql89calqbdvb4ci3hwzv7b"; + rev = "4fdb49333093c0a8aae35cfac68e71cf595666ef"; + sha256 = "0qgrkxmqzlp1z5zxkdzy37lwfc7y3bpqgiy17hxszdrjy6n44vih"; }; meta.homepage = "https://github.com/MrcJkb/haskell-tools.nvim/"; }; @@ -4631,24 +4643,24 @@ final: prev: hop-nvim = buildVimPlugin { pname = "hop.nvim"; - version = "2024-01-01"; + version = "2024-04-21"; src = fetchFromGitHub { owner = "smoka7"; repo = "hop.nvim"; - rev = "6d853addd6e11df8338b26e869a29b36f2c3e893"; - sha256 = "0h7dcrqyb5d67pxg4pmky4cw3qhl1z8z217nxnkvrwxfdl0khwn8"; + rev = "059e88e9dcaad3280ea1fd5c757f6904f274aed5"; + sha256 = "1m5li7gy18d4z2fzzm6ipghn67m2i9a5fq7v1l6qy3vxgh9vzrq7"; }; meta.homepage = "https://github.com/smoka7/hop.nvim/"; }; hotpot-nvim = buildVimPlugin { pname = "hotpot.nvim"; - version = "2024-03-28"; + version = "2024-04-04"; src = fetchFromGitHub { owner = "rktjmp"; repo = "hotpot.nvim"; - rev = "0b5d34f00836400ca80f68dfcd56b2a110c323d6"; - sha256 = "0z0h4b574s2dvvxzw5rpmajjxhkhh4v25d3mrr33y14lczn9fjaa"; + rev = "5c96b423a6663c91c47d6184f810acf1dacf4615"; + sha256 = "136jawqxirrs130ka15hnbwlgplrkisahcv91v4avcbr46rx09d6"; }; meta.homepage = "https://github.com/rktjmp/hotpot.nvim/"; }; @@ -4751,12 +4763,12 @@ final: prev: image-nvim = buildNeovimPlugin { pname = "image.nvim"; - version = "2024-03-30"; + version = "2024-04-18"; src = fetchFromGitHub { owner = "3rd"; repo = "image.nvim"; - rev = "a0b756d589c1623ebbfe344666e6d7c49bdc9d71"; - sha256 = "15c6pz8hhb3mnahzppx46mx0xwq4gc85j7xc5rpjf5jf6ra346z3"; + rev = "301de7919b2c0378cb7a782663f67abbcb198b17"; + sha256 = "0cxqffdync3hfg7xfahwnsd5rwz1gd2mqcgsgm615qbx364as8d9"; }; meta.homepage = "https://github.com/3rd/image.nvim/"; }; @@ -5064,12 +5076,12 @@ final: prev: jsonfly-nvim = buildVimPlugin { pname = "jsonfly.nvim"; - version = "2024-04-12"; + version = "2024-04-19"; src = fetchFromGitHub { owner = "Myzel394"; repo = "jsonfly.nvim"; - rev = "539a0b79a5ea75d201e1e90cebfe9367154d04fc"; - sha256 = "1v1i4x2px0zs65rxkf2yhnxn6clx33vdr54r9gaqq713qj5ddlfm"; + rev = "e47fd7713b083120af6cdb1548de8af513a0ec6f"; + sha256 = "0wnjzqx68kqwza2pnaazmp1l986pys86ncj8hrdfcp4nvmz2i3xv"; }; meta.homepage = "https://github.com/Myzel394/jsonfly.nvim/"; }; @@ -5088,12 +5100,12 @@ final: prev: jupytext-nvim = buildVimPlugin { pname = "jupytext.nvim"; - version = "2024-03-25"; + version = "2024-04-05"; src = fetchFromGitHub { owner = "GCBallesteros"; repo = "jupytext.nvim"; - rev = "6e439dc048986bcc00f8ba8695cb452de932127b"; - sha256 = "1y0mi94q97lykvk4pzx3x6ifgns09pvj08xyv5274j2ykp4hmm9d"; + rev = "c8baf3ad344c59b3abd461ecc17fc16ec44d0f7b"; + sha256 = "1lz8ajcy9gm02bwgq5rr5ppx4g1irzvgx074mqmbv7xawij5241c"; }; meta.homepage = "https://github.com/GCBallesteros/jupytext.nvim/"; }; @@ -5208,12 +5220,12 @@ final: prev: lazy-lsp-nvim = buildVimPlugin { pname = "lazy-lsp.nvim"; - version = "2024-03-26"; + version = "2024-04-16"; src = fetchFromGitHub { owner = "dundalek"; repo = "lazy-lsp.nvim"; - rev = "d341dd528ad6c2199ab20911ed6b56db43af6e3a"; - sha256 = "1bjgpbf9v91pw9x6r23dl6d5cchvl8s4d8fvrbd09jjacbswc1v8"; + rev = "19d2a4de3a57deed4aab304704c1f5e77454f4f3"; + sha256 = "089drz8djyhsksi19ixcpfnci7ag121gsj17cq2a91l8m430j0y4"; }; meta.homepage = "https://github.com/dundalek/lazy-lsp.nvim/"; }; @@ -5244,12 +5256,12 @@ final: prev: lean-nvim = buildVimPlugin { pname = "lean.nvim"; - version = "2024-03-29"; + version = "2024-04-09"; src = fetchFromGitHub { owner = "Julian"; repo = "lean.nvim"; - rev = "023cde8c59ecd02b7478587737450a88041d5856"; - sha256 = "0ivdflbk1qqshnmf5pyn9xn7dn3jbygnyvyqn532d3ic85vqiafi"; + rev = "2828898ad6f6ac6c1c9f404d72bd3d56546b0c72"; + sha256 = "16wxih5nhdybzrm04z18cjwhjvdxq3yjdsq02v7q4kxwkbz5sy1a"; }; meta.homepage = "https://github.com/Julian/lean.nvim/"; }; @@ -5280,24 +5292,24 @@ final: prev: leap-nvim = buildVimPlugin { pname = "leap.nvim"; - version = "2024-04-01"; + version = "2024-04-12"; src = fetchFromGitHub { owner = "ggandor"; repo = "leap.nvim"; - rev = "7a9407d17fab3a1c3cfe201965d680a408776152"; - sha256 = "1nfkcn6xbrzklmx2v1rjzim9wp26w82hay3vhfhvkylzmil8vjqx"; + rev = "626be4c4ec040aeaf6466c9aae17ee0ab09f1a5b"; + sha256 = "1glf2xf4frr1in0yyar3aybmhrymrn5lzc261jdflpi749yfhadi"; }; meta.homepage = "https://github.com/ggandor/leap.nvim/"; }; legendary-nvim = buildVimPlugin { pname = "legendary.nvim"; - version = "2024-03-29"; + version = "2024-04-19"; src = fetchFromGitHub { owner = "mrjones2014"; repo = "legendary.nvim"; - rev = "3a47364508503f0f44e26433cd0c0e4876f2136e"; - sha256 = "183s62zjkamsxf0g78vl2isgrd1373r90lp1jn6p7j9lkwv49v73"; + rev = "02a7799750a56865c58e3ea58e13b19ae1d2dc31"; + sha256 = "1y7v6xa9n620vlzcvvcf7xc1pfbzidz7ybr7yf1k30gyv3sxpp4j"; }; meta.homepage = "https://github.com/mrjones2014/legendary.nvim/"; }; @@ -5592,12 +5604,12 @@ final: prev: lsp-overloads-nvim = buildVimPlugin { pname = "lsp-overloads.nvim"; - version = "2024-02-03"; + version = "2024-04-13"; src = fetchFromGitHub { owner = "Issafalcon"; repo = "lsp-overloads.nvim"; - rev = "6b023414d7a6264ce1880148f1a61cf10294546e"; - sha256 = "1svxn4kvhr666hcjfm3qii03wl2djxch52ffn7a2fggv7116vjnn"; + rev = "be3486a501fdda84ea91a0949178b75e8476030d"; + sha256 = "097vn7y6gal2fimpvvqm70jz6im3pnb370dxvc7zmw1yrr3zjhc4"; }; meta.homepage = "https://github.com/Issafalcon/lsp-overloads.nvim/"; }; @@ -5628,12 +5640,12 @@ final: prev: lsp-zero-nvim = buildVimPlugin { pname = "lsp-zero.nvim"; - version = "2024-04-03"; + version = "2024-04-19"; src = fetchFromGitHub { owner = "VonHeikemen"; repo = "lsp-zero.nvim"; - rev = "74441a6309cf12232da52520e210387dc95412f8"; - sha256 = "0q96939hfqn29svgqrj1cskmxiax5h05yz8lxqmhn9cvpkzm5s4k"; + rev = "b93f040edd57888cd6a1e7d9dee47dddc4463f8f"; + sha256 = "02nhnm7lfdrx6yfwm754khndkq4732qnv99j91d46q68xi305p0n"; }; meta.homepage = "https://github.com/VonHeikemen/lsp-zero.nvim/"; }; @@ -5711,12 +5723,12 @@ final: prev: ltex_extra-nvim = buildVimPlugin { pname = "ltex_extra.nvim"; - version = "2024-02-03"; + version = "2024-04-13"; src = fetchFromGitHub { owner = "barreiroleo"; repo = "ltex_extra.nvim"; - rev = "42dd3572cb09b52a137e91e515f2dff5eb631b1e"; - sha256 = "1hirgy2w7lqn22qb20xkcxd7p1212wvra1xbyy43ky3an0bn6ivs"; + rev = "4296c2c7aefbca721d02a011366a1de30598046c"; + sha256 = "07ql6j5m3sdkwdn273xmqryksrz4ggw3plgxr4f6n7s07jq05qrs"; }; meta.homepage = "https://github.com/barreiroleo/ltex_extra.nvim/"; }; @@ -5735,24 +5747,24 @@ final: prev: lualine-nvim = buildVimPlugin { pname = "lualine.nvim"; - version = "2024-03-21"; + version = "2024-04-05"; src = fetchFromGitHub { owner = "nvim-lualine"; repo = "lualine.nvim"; - rev = "b5e8bb642138f787a2c1c5aedc2a78cb2cebbd67"; - sha256 = "0c2ncxj66p90r3wmc0y96ywqbmvll9gr5zpfs3gfv558q7ky4rzv"; + rev = "0a5a66803c7407767b799067986b4dc3036e1983"; + sha256 = "1llhfs5wgv87k5hv8mdyv4qjpw37zq27488lq0j063jicxszdhar"; }; meta.homepage = "https://github.com/nvim-lualine/lualine.nvim/"; }; luasnip = buildNeovimPlugin { pname = "luasnip"; - version = "2024-04-02"; + version = "2024-04-16"; src = fetchFromGitHub { owner = "l3mon4d3"; repo = "luasnip"; - rev = "825a61bad1d60d917a7962d73cf3c683f4e0407e"; - sha256 = "002ksxnplfmvwclm1713x2m25zd8dkjm6bhfxv56r24i174h3dfb"; + rev = "03c8e67eb7293c404845b3982db895d59c0d1538"; + sha256 = "1abfssd3352kp7r54rnbl85cjz1cbxl4w48vr437k1dr6b3zcgcq"; fetchSubmodules = true; }; meta.homepage = "https://github.com/l3mon4d3/luasnip/"; @@ -5772,12 +5784,12 @@ final: prev: lush-nvim = buildNeovimPlugin { pname = "lush.nvim"; - version = "2024-03-17"; + version = "2024-04-18"; src = fetchFromGitHub { owner = "rktjmp"; repo = "lush.nvim"; - rev = "bc12f010b34cfeefac35720656eb777753b165d9"; - sha256 = "06am05fcipfxz8nfr6yg8yhkcdir53asl9h3k40hl0sscx4a03s9"; + rev = "7c0e27f50901481fe83b974493c4ea67a4296aeb"; + sha256 = "0cacfxrvm1fx73q5mch72gglrg6hvi39w78wgfb7dfkby1j8hl8r"; }; meta.homepage = "https://github.com/rktjmp/lush.nvim/"; }; @@ -5856,24 +5868,24 @@ final: prev: mason-lspconfig-nvim = buildVimPlugin { pname = "mason-lspconfig.nvim"; - version = "2024-03-22"; + version = "2024-04-06"; src = fetchFromGitHub { owner = "williamboman"; repo = "mason-lspconfig.nvim"; - rev = "9dfcf2036c223920826140f0151d929a43f9eceb"; - sha256 = "18fhp9qgadxh8csp1l91m61kxycb302dlcy7d1yvqmvvrhwmsl1j"; + rev = "44509689b9bf3984d729cc264aacb31cb7f41668"; + sha256 = "1z65m3hfx1avi4wfzsf8ypin5d37j3mcipay9rnriwhc8q8vwbb1"; }; meta.homepage = "https://github.com/williamboman/mason-lspconfig.nvim/"; }; mason-tool-installer-nvim = buildVimPlugin { pname = "mason-tool-installer.nvim"; - version = "2024-02-13"; + version = "2024-04-11"; src = fetchFromGitHub { owner = "WhoIsSethDaniel"; repo = "mason-tool-installer.nvim"; - rev = "1212fb6082b7177dde17ea65e429e027835aeb40"; - sha256 = "0zrdpdqklmk1f9gsim209x28h4qisf1hljmwq2imc4lzpwca39kc"; + rev = "b129892f783740e6cf741f2ea09fa5dd512aa584"; + sha256 = "08152z7smaxv82v7ivp92n58lvr3ys7976795k0pxi8a99qj9kw7"; }; meta.homepage = "https://github.com/WhoIsSethDaniel/mason-tool-installer.nvim/"; }; @@ -5904,12 +5916,12 @@ final: prev: material-nvim = buildVimPlugin { pname = "material.nvim"; - version = "2024-03-27"; + version = "2024-04-04"; src = fetchFromGitHub { owner = "marko-cerovac"; repo = "material.nvim"; - rev = "ba56aeea3db29c8c9ffd55158aed7b2e6a749a46"; - sha256 = "1j19q1lczx57s6qci76rxhi0wxp6k5f7ivcsg1pq5g439wj2vab8"; + rev = "772e41a7f33743224f30799a3a887dc7dd853f8d"; + sha256 = "0knb5d6z1hjzn3ib0nznv54rpyyk0ms6g2na59apmcwdqh1wyz6a"; }; meta.homepage = "https://github.com/marko-cerovac/material.nvim/"; }; @@ -6000,12 +6012,12 @@ final: prev: mini-nvim = buildVimPlugin { pname = "mini.nvim"; - version = "2024-04-02"; + version = "2024-04-18"; src = fetchFromGitHub { owner = "echasnovski"; repo = "mini.nvim"; - rev = "5d841fcca666bc27ca777807a63381ce2cf6e2f9"; - sha256 = "0sg82lbzf1s7qkmvc4sdpw25nms61xgdym2pqk8szmm400jk74n1"; + rev = "e623d29561746637b49d30d6434338f88f44e856"; + sha256 = "1if6r4w7qpi3d0z1zdwfwz211n5rfiizxvjjsywdb4659ap5b0mw"; }; meta.homepage = "https://github.com/echasnovski/mini.nvim/"; }; @@ -6036,12 +6048,12 @@ final: prev: mkdnflow-nvim = buildVimPlugin { pname = "mkdnflow.nvim"; - version = "2024-03-04"; + version = "2024-04-18"; src = fetchFromGitHub { owner = "jakewvincent"; repo = "mkdnflow.nvim"; - rev = "0a42aa3c7c2c982a1503e63ce8f0f065e0eb63df"; - sha256 = "1p5vwzl48bgfzxk4nwxlyf98ymjyglm44942lpm8al908ysnpwc2"; + rev = "3486f98dfed4cfbfa83922f73c7189cc88e9e2f2"; + sha256 = "055kcpcjbr011rmccns63k21sg8x24yn9f2r45n30pl92irpvmqa"; }; meta.homepage = "https://github.com/jakewvincent/mkdnflow.nvim/"; }; @@ -6072,12 +6084,12 @@ final: prev: modus-themes-nvim = buildVimPlugin { pname = "modus-themes.nvim"; - version = "2024-03-24"; + version = "2024-04-16"; src = fetchFromGitHub { owner = "miikanissi"; repo = "modus-themes.nvim"; - rev = "7cef53b10b6964a0be483fa27a3d66069cefaa6c"; - sha256 = "0lvr83jirmcn5k8704wmz3kgcc3fhxfmi5yjk7acwih7ib7x821q"; + rev = "08b7268c59f6d4b4030107d9b9fa934f4063d9e7"; + sha256 = "10f9m8jji4yq7pxbrk46wi2s4awvshm8hi6wq50ckwsabfn1wjb5"; }; meta.homepage = "https://github.com/miikanissi/modus-themes.nvim/"; }; @@ -6096,24 +6108,24 @@ final: prev: molten-nvim = buildVimPlugin { pname = "molten-nvim"; - version = "2024-03-31"; + version = "2024-04-19"; src = fetchFromGitHub { owner = "benlubas"; repo = "molten-nvim"; - rev = "66b11de7c3132dcc4521d50039ce2b5f81e64ca2"; - sha256 = "0wijwv3mw3qvr3zmjq1f5mr89l66rrj8pgiyy8a6h4sxrna8wv9x"; + rev = "f3a40c744d177862682f0787eef7e5ab0f4e0118"; + sha256 = "1p9x9zqb3lsi6gzp9n0yh62w69im265yg2xp1dfhvzg3nn2s7pkw"; }; meta.homepage = "https://github.com/benlubas/molten-nvim/"; }; monokai-pro-nvim = buildVimPlugin { pname = "monokai-pro.nvim"; - version = "2024-04-01"; + version = "2024-04-09"; src = fetchFromGitHub { owner = "loctvl842"; repo = "monokai-pro.nvim"; - rev = "8940b2f87343db96ee2c62404a4e4ff9257ed514"; - sha256 = "1vnzyikp9mf4wgs5rh666vjpmk3y7ccz4kwaq8ib47l8kcrywxy7"; + rev = "aafde73a622435891d36b411d8623e705ead6293"; + sha256 = "14cdrkglg0swn5nfs23z0j7jpf5gjdm1cgz1arhi1afi8dx8cr6g"; }; meta.homepage = "https://github.com/loctvl842/monokai-pro.nvim/"; }; @@ -6144,12 +6156,12 @@ final: prev: multicursors-nvim = buildVimPlugin { pname = "multicursors.nvim"; - version = "2024-02-21"; + version = "2024-04-12"; src = fetchFromGitHub { owner = "smoka7"; repo = "multicursors.nvim"; - rev = "8b3e14682eed06a532b155c7eae33e174846b3fd"; - sha256 = "02ar7m9g92lg7rhz7l1vm2sn8c353wk1rvl32wdbqsbi70ac8pi7"; + rev = "b959ad0f38881e81e757208c6adfc9e6dc24dfc7"; + sha256 = "0x4v0bpahwqcrwqv5nc0hnfc0qyc21sgd996h5nksnxykrxvf462"; }; meta.homepage = "https://github.com/smoka7/multicursors.nvim/"; }; @@ -6408,12 +6420,12 @@ final: prev: neo-tree-nvim = buildVimPlugin { pname = "neo-tree.nvim"; - version = "2024-03-21"; + version = "2024-04-16"; src = fetchFromGitHub { owner = "nvim-neo-tree"; repo = "neo-tree.nvim"; - rev = "16d1b194376bf1fc2acd89ccb3c29ba8315bfcea"; - sha256 = "0imgbzf9k98az077zqscf82iilf5rlkawxci2c1p3djb3nf8h43m"; + rev = "25bfdbe802eb913276bb83874b043be57bd70347"; + sha256 = "12z784x1ij1j3dnh71dcx2a0vcz5pnlls00j01gadybxbz4r6y39"; }; meta.homepage = "https://github.com/nvim-neo-tree/neo-tree.nvim/"; }; @@ -6432,24 +6444,24 @@ final: prev: neoconf-nvim = buildVimPlugin { pname = "neoconf.nvim"; - version = "2024-04-02"; + version = "2024-04-20"; src = fetchFromGitHub { owner = "folke"; repo = "neoconf.nvim"; - rev = "f41d28e3f9c873de17ecab12e767fc8cfd94c7a2"; - sha256 = "10ycpk5ipvb8rafx1bpakm6r3c07vqskbjv87cxqy3bk4nc3smq8"; + rev = "19cd99ec623de29a9d0e649b606a13d1775058af"; + sha256 = "16dj2b3vw9zv7p01qiyf6wnnn3lwrh271kx3b4gismg1zbbrhzwi"; }; meta.homepage = "https://github.com/folke/neoconf.nvim/"; }; neocord = buildVimPlugin { pname = "neocord"; - version = "2024-03-28"; + version = "2024-04-20"; src = fetchFromGitHub { owner = "IogaMaster"; repo = "neocord"; - rev = "6269823e78a2d2d8c3954068da196879cf2f0fe6"; - sha256 = "1hsjp04gfdrpb1z5ij2psnyap66ism19pxg6d8n05sgzv6v7p4b5"; + rev = "014e78cff9f1fc7b3b46ec67fdca68a91a9b7c65"; + sha256 = "1dyw315fhh6fll1gxq764yqlrd7xb153y4g7dvc7rih9rnqi3h4m"; }; meta.homepage = "https://github.com/IogaMaster/neocord/"; }; @@ -6480,12 +6492,12 @@ final: prev: neoformat = buildVimPlugin { pname = "neoformat"; - version = "2024-03-30"; + version = "2024-04-07"; src = fetchFromGitHub { owner = "sbdchd"; repo = "neoformat"; - rev = "29e8d9c1e1da985e363d8f87c417adfdd50a5a75"; - sha256 = "13xggjfk8fqxbghyyw7138jvl1i14bam2xacn1v9a2bd7a0iyxza"; + rev = "4372abb846f43ec121df40e620682c985ebc8286"; + sha256 = "1wk6vzigd6kbjfqfbayv5jbrr9lvmkxqc9b4fj5r90qqcqmfp399"; }; meta.homepage = "https://github.com/sbdchd/neoformat/"; }; @@ -6504,12 +6516,12 @@ final: prev: neogit = buildVimPlugin { pname = "neogit"; - version = "2024-03-31"; + version = "2024-04-16"; src = fetchFromGitHub { owner = "NeogitOrg"; repo = "neogit"; - rev = "c0b1d4dfc8ba6371857868ca7c4d33954cf002fd"; - sha256 = "1sqgwp835wjz0cb1j5gfdxvfml1wz9zrgj81973b4dqdqzfcqkm9"; + rev = "0cae7abc30cb91d661f28257c331fcb5b5198e31"; + sha256 = "0alyscd5qhh30p6bsd3qr2h7qsc57yb4g8c0g7abc5z0jsw58cg9"; }; meta.homepage = "https://github.com/NeogitOrg/neogit/"; }; @@ -6576,36 +6588,36 @@ final: prev: neorg = buildVimPlugin { pname = "neorg"; - version = "2024-04-03"; + version = "2024-04-20"; src = fetchFromGitHub { owner = "nvim-neorg"; repo = "neorg"; - rev = "89f9a79179e179e9e0d96d6adce14473bed896bc"; - sha256 = "1mfq1d6s8npnm35hflz80zxiln7wx1d4m90zpbb4vhv7nap975za"; + rev = "e03e82bdf6a2c3173f6e417a63087c7255533b81"; + sha256 = "1n83wjzxd7y8cmbxgmszxlh3anb32cbrzk9zrlfdpawyn2dyby48"; }; meta.homepage = "https://github.com/nvim-neorg/neorg/"; }; neorg-telescope = buildVimPlugin { pname = "neorg-telescope"; - version = "2024-02-10"; + version = "2024-04-19"; src = fetchFromGitHub { owner = "nvim-neorg"; repo = "neorg-telescope"; - rev = "418f8fd4bd7360d954613a2322b4eb2888ac3ad9"; - sha256 = "0r09xwvzb2ma25ngfiilwd9i6ci2llkv98scdzjkq5z96m1h6vnx"; + rev = "92c1c6064429c74505de8e5d84a6dc8488a6f8e3"; + sha256 = "0varnp4wm1sp9mr8yglj2kb5wl8cdf4q9ymxf3szvbv2xw1bbnb2"; }; meta.homepage = "https://github.com/nvim-neorg/neorg-telescope/"; }; neoscroll-nvim = buildVimPlugin { pname = "neoscroll.nvim"; - version = "2024-03-10"; + version = "2024-04-19"; src = fetchFromGitHub { owner = "karb94"; repo = "neoscroll.nvim"; - rev = "21d52973bde32db998fc8b6590f87eb3c3c6d8e4"; - sha256 = "1hxf9218asn22lpa28zb6kmj64a8ak4njxj0whl60a1p0349s4qb"; + rev = "c513218d864d4ccfdaaea991c6de67bdb84bc116"; + sha256 = "0i6xy9xqplv9aii148g1nnwv3shnjqiq9m0gab6gav9l6144mzz9"; }; meta.homepage = "https://github.com/karb94/neoscroll.nvim/"; }; @@ -6648,24 +6660,24 @@ final: prev: neotest = buildNeovimPlugin { pname = "neotest"; - version = "2024-03-20"; + version = "2024-04-08"; src = fetchFromGitHub { owner = "nvim-neotest"; repo = "neotest"; - rev = "e07fe8241112274aae9947b98d255763738a1d52"; - sha256 = "0wcsngcpz8ih6s5amnm1c7c09xr4xsi2bil5iiw8vlr8gbrj8rl2"; + rev = "f03a78cef74db5638e4312e18b767294a90de8da"; + sha256 = "1lvwmgicnqm5r7wg0325ijjfkyl5wyawx7hbzmlmr87g3z1cp62j"; }; meta.homepage = "https://github.com/nvim-neotest/neotest/"; }; neotest-bash = buildVimPlugin { pname = "neotest-bash"; - version = "2023-11-18"; + version = "2024-04-15"; src = fetchFromGitHub { owner = "rcasia"; repo = "neotest-bash"; - rev = "2eaad2ae4577fadf4af1eec32ec169d0fb2698bb"; - sha256 = "0w1x9ya843pa8514974frdd8qmzycnvj418igni4y3wy3s0dc65v"; + rev = "a3480f53300842922ecb79693e64bf51d4f22337"; + sha256 = "1dbjv5zyw5nqqwgqagq0q2255byzgc9ckrzsbm2dc7svqp04hki9"; fetchSubmodules = true; }; meta.homepage = "https://github.com/rcasia/neotest-bash/"; @@ -6697,12 +6709,12 @@ final: prev: neotest-dotnet = buildVimPlugin { pname = "neotest-dotnet"; - version = "2024-03-13"; + version = "2024-04-13"; src = fetchFromGitHub { owner = "Issafalcon"; repo = "neotest-dotnet"; - rev = "15943dd05e2d4d9393531b647ad661e60820c608"; - sha256 = "0vcx6avfbsjxv3nwbmy6101yb33msx6s3l1mzmnb7rprgcy53zm5"; + rev = "3844d16706d7655f4c84387bdb68eb8fb0155ef2"; + sha256 = "0dh66m1yyzzsrcxrhaydqm7ymqspggnd345c8mfjprp7312x3yc5"; }; meta.homepage = "https://github.com/Issafalcon/neotest-dotnet/"; }; @@ -6771,24 +6783,24 @@ final: prev: neotest-haskell = buildVimPlugin { pname = "neotest-haskell"; - version = "2024-03-25"; + version = "2024-04-21"; src = fetchFromGitHub { owner = "MrcJkb"; repo = "neotest-haskell"; - rev = "a4e73415548d2de91912d9f015cced49e82af4c0"; - sha256 = "171qrv5nmdywz8zakc73hi1rkrdy6j63p582igbsf83zp06hnswk"; + rev = "0367f44e49aa64d8b66fc9f736a61e9a60ce9526"; + sha256 = "1yb9l9gac08sqx6maxhfhb1dj796l48gflx1l59l4fxm9sw7djkj"; }; meta.homepage = "https://github.com/MrcJkb/neotest-haskell/"; }; neotest-java = buildVimPlugin { pname = "neotest-java"; - version = "2024-04-03"; + version = "2024-04-20"; src = fetchFromGitHub { owner = "rcasia"; repo = "neotest-java"; - rev = "9af20dbc445f568b5f6b6f3241f07259ee95cfe8"; - sha256 = "1v87jb7fm3xgnhzfxbp6wn5dk4m8r0asff4d0ap3zcc4sr771cl5"; + rev = "68dd64e296c6da73aacd7ad795ac789e15087ee6"; + sha256 = "03iap2dsawqj1c8jac6lm1knc16ikiwzgp7hnpv2k43vny52l492"; }; meta.homepage = "https://github.com/rcasia/neotest-java/"; }; @@ -6807,12 +6819,12 @@ final: prev: neotest-minitest = buildVimPlugin { pname = "neotest-minitest"; - version = "2024-04-01"; + version = "2024-04-19"; src = fetchFromGitHub { owner = "zidhuss"; repo = "neotest-minitest"; - rev = "45718d7995d590aae1371e3758f1f0f582ec0f6f"; - sha256 = "1wk1qyqzi1v6c9b84fg06mkjwyl2x5jgcbfmji4a94r4pnrhpx8b"; + rev = "f56e5a84fc89aafb6e0be368a58ad1a6f8723444"; + sha256 = "18xi436a164ly3d1wb0a8pzsa1fb8rshqm4r9rp0da85ms2nl14c"; }; meta.homepage = "https://github.com/zidhuss/neotest-minitest/"; }; @@ -6879,24 +6891,24 @@ final: prev: neotest-rspec = buildVimPlugin { pname = "neotest-rspec"; - version = "2024-04-01"; + version = "2024-04-05"; src = fetchFromGitHub { owner = "olimorris"; repo = "neotest-rspec"; - rev = "b27bb629d201a2fd24d453d68b44d73bf801c665"; - sha256 = "0lcf4pwhwimjq77gymyg4z5x0rva4rb6l9v6kibh9sl8cm9zfnn7"; + rev = "c1c3f36e1b1a23698534e6326e90876f87b773a4"; + sha256 = "0yfd23mkvpzddgxxsfnzcix0qr4l1cjfk0i8crw8kzb01n6dh5v3"; }; meta.homepage = "https://github.com/olimorris/neotest-rspec/"; }; neotest-rust = buildVimPlugin { pname = "neotest-rust"; - version = "2024-02-28"; + version = "2024-04-08"; src = fetchFromGitHub { owner = "rouge8"; repo = "neotest-rust"; - rev = "9e9df68064bd6fa3b5e40b32fcb7c52af130cdbf"; - sha256 = "0h8fhylg1rhgjxjhg2d3y77fhril6ng3cj49yz2g8hh1p5xassfr"; + rev = "0418811e1e3499b2501593f2e131d02f5e6823d4"; + sha256 = "1ffa0in8zvw6fc9lwga67s9gjqmvn1a69i3wpajrslf2d0ngmw3y"; }; meta.homepage = "https://github.com/rouge8/neotest-rust/"; }; @@ -6927,12 +6939,12 @@ final: prev: neotest-vitest = buildVimPlugin { pname = "neotest-vitest"; - version = "2024-03-12"; + version = "2024-04-17"; src = fetchFromGitHub { owner = "marilari88"; repo = "neotest-vitest"; - rev = "102e7494bbe0f205d28c31a3fd75a9dfbcc78c73"; - sha256 = "03j5vfqryi419d5x0ssxpasx93jkpraj2vhwfclbhwfjf1d20jkl"; + rev = "6965a714793d9d156dadbe734c99b3a307f65c61"; + sha256 = "0dxcnkvhdlxlxa6vrjfgn5pfi3a2g78c3xz13sxggw559wmzp9lr"; }; meta.homepage = "https://github.com/marilari88/neotest-vitest/"; }; @@ -6951,12 +6963,12 @@ final: prev: neovim-ayu = buildVimPlugin { pname = "neovim-ayu"; - version = "2024-02-05"; + version = "2024-04-05"; src = fetchFromGitHub { owner = "Shatur"; repo = "neovim-ayu"; - rev = "0a9804db5c08dba63be9774a57e4214fd0473ce1"; - sha256 = "17324y4ywxmijappa9sb194xc2mwa8ijfxvb3s4302bnd6ggdw7h"; + rev = "e03beacbc51f1a985d7a4b69828fd7612a4151e0"; + sha256 = "1yf3j0lqcsng1ksq5wb1l8pcw6r9f6apzn6y2w5j431sm2by5jw4"; }; meta.homepage = "https://github.com/Shatur/neovim-ayu/"; }; @@ -7095,24 +7107,24 @@ final: prev: night-owl-nvim = buildVimPlugin { pname = "night-owl.nvim"; - version = "2024-04-03"; + version = "2024-04-19"; src = fetchFromGitHub { owner = "oxfist"; repo = "night-owl.nvim"; - rev = "1afa7f158feb79987ca0d017f65558492e6c8a8e"; - sha256 = "1gypvdfbg7s3l3j9hlf6n2d22pjq4q54xv48gsg2zvczzg3c77ww"; + rev = "94aead739b6223feb19650077c9694e6c1c63fbf"; + sha256 = "0baw75s3r09pf747rm3mni07pszkba5ykk1vky2lqq2ga7xplalf"; }; meta.homepage = "https://github.com/oxfist/night-owl.nvim/"; }; nightfox-nvim = buildVimPlugin { pname = "nightfox.nvim"; - version = "2024-03-18"; + version = "2024-04-12"; src = fetchFromGitHub { owner = "EdenEast"; repo = "nightfox.nvim"; - rev = "e352a32e0f54feb2550ebdab815ae8f7f26ed63b"; - sha256 = "11r0hlabysrxqxsh09c42mqfy2zzi6gkafkwqi430ngxc09yzln0"; + rev = "ce0cdf8538c8c0b9c8fb2884d3d1090c8faf515d"; + sha256 = "09hij99myk1ry8sik71sd2cdicaqrhidpkay6yzs0j67wr0705yv"; }; meta.homepage = "https://github.com/EdenEast/nightfox.nvim/"; }; @@ -7155,12 +7167,12 @@ final: prev: nlsp-settings-nvim = buildVimPlugin { pname = "nlsp-settings.nvim"; - version = "2024-04-03"; + version = "2024-04-19"; src = fetchFromGitHub { owner = "tamago324"; repo = "nlsp-settings.nvim"; - rev = "5c4e0796937a3d732f8d489188d55312d802050a"; - sha256 = "12pvrvcd339y8f0pzx398fn7c4shjmdy68xq7rfq6bg245mnd04j"; + rev = "78064fe0dbb67d2f449854bd2fe7fc2b1af0a8c0"; + sha256 = "0yh9xalsj4y2yh7avabvnw2jj7b1nl1amsxmcxm9jiz0xw50nkbf"; }; meta.homepage = "https://github.com/tamago324/nlsp-settings.nvim/"; }; @@ -7227,12 +7239,12 @@ final: prev: none-ls-nvim = buildVimPlugin { pname = "none-ls.nvim"; - version = "2024-04-02"; + version = "2024-04-20"; src = fetchFromGitHub { owner = "nvimtools"; repo = "none-ls.nvim"; - rev = "fff481b65d88415933b9574dc0e1947724bcf64a"; - sha256 = "0qpnsj7pd7lg9qli3pgwxk8m50k65866mxk1id42n85v558hd9nx"; + rev = "88821b67e6007041f43b802f58e3d9fa9bfce684"; + sha256 = "09mv5ndk0xnij3nv2p1qcm6k59xh0j2nl949960d24aln4h354dl"; }; meta.homepage = "https://github.com/nvimtools/none-ls.nvim/"; }; @@ -7323,12 +7335,12 @@ final: prev: nvchad = buildVimPlugin { pname = "nvchad"; - version = "2024-03-26"; + version = "2024-04-19"; src = fetchFromGitHub { owner = "nvchad"; repo = "nvchad"; - rev = "6833c60694a626615911e379d201dd723511546d"; - sha256 = "0wdl610n3060ipsplsb8rrlpxa1xh72vpczpmwswdvwp3y67lmy4"; + rev = "f8e6c59985f1d5f820f051395e88064a8d16ef2a"; + sha256 = "1ss67kpn8lkgcdj90yjg69dfdy3w2v32znqc2nbl6hblgmxfakd4"; }; meta.homepage = "https://github.com/nvchad/nvchad/"; }; @@ -7347,12 +7359,12 @@ final: prev: nvim-FeMaco-lua = buildVimPlugin { pname = "nvim-FeMaco.lua"; - version = "2023-10-21"; + version = "2024-04-21"; src = fetchFromGitHub { owner = "AckslD"; repo = "nvim-FeMaco.lua"; - rev = "6af458f0196215f397db31a6e1fb2df795811693"; - sha256 = "0pvdbk48pyqvi75pzpsz9wsvhfrp5rya2dbccg2gfx3h5yvks6fn"; + rev = "96bbf843595dbe865838b3f2484b73557f34700c"; + sha256 = "0lqqjzzysl5n152z2j93fk536w2vdi67hss76ai881jr9l4xscvq"; }; meta.homepage = "https://github.com/AckslD/nvim-FeMaco.lua/"; }; @@ -7371,36 +7383,36 @@ final: prev: nvim-autopairs = buildVimPlugin { pname = "nvim-autopairs"; - version = "2024-03-20"; + version = "2024-04-06"; src = fetchFromGitHub { owner = "windwp"; repo = "nvim-autopairs"; - rev = "dbfc1c34bed415906395db8303c71039b3a3ffb4"; - sha256 = "1xbyx5fy9mp8x2yshah810zxdkm8f94ng64al2kpx8rjf7iqk28z"; + rev = "4f41e5940bc0443fdbe5f995e2a596847215cd2a"; + sha256 = "0cfi0wmqy8vrrf17s71jyg6c5s8ghb7xjapzhj9l9l6g1s7v9bxm"; }; meta.homepage = "https://github.com/windwp/nvim-autopairs/"; }; nvim-bacon = buildVimPlugin { pname = "nvim-bacon"; - version = "2024-02-12"; + version = "2024-04-10"; src = fetchFromGitHub { owner = "Canop"; repo = "nvim-bacon"; - rev = "3f8e7a80a0e715952a3066fefe7447f1347207ca"; - sha256 = "sha256-jIoRzMjOZlTHR7q4piyY7MjEUgZIR5pjobfOdY/IpeM="; + rev = "94f684baacf22c65e5ef889cfa943cfc90ee1cf4"; + sha256 = "0b4xpmk6cv6k9h2vqk9773hszwy90d7y3fpjz1yqg9nxfvbdjp2b"; }; meta.homepage = "https://github.com/Canop/nvim-bacon/"; }; nvim-biscuits = buildVimPlugin { pname = "nvim-biscuits"; - version = "2023-03-28"; + version = "2024-04-20"; src = fetchFromGitHub { owner = "code-biscuits"; repo = "nvim-biscuits"; - rev = "0224be36b60588e88b21b8244a0bcd069699720e"; - sha256 = "1pw7ad9x4jn1ciam72bdc2087mrmxwr4przivfpkhjj6vjgfpn1v"; + rev = "ff1d12c8b47cd28723da593b2cfa2e98391d439a"; + sha256 = "18dvvg32nxrdp1ydbvxrzkdg7q214naq2bphs7y1s9zmjhyj25pm"; }; meta.homepage = "https://github.com/code-biscuits/nvim-biscuits/"; }; @@ -7563,12 +7575,12 @@ final: prev: nvim-dap = buildVimPlugin { pname = "nvim-dap"; - version = "2024-03-25"; + version = "2024-04-18"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-dap"; - rev = "405df1dcc2e395ab5173a9c3d00e03942c023074"; - sha256 = "00mmxasay25ha4l63jrn3b440xp7k39xr2al6d3kmw9mw1hyg0hy"; + rev = "6ae8a14828b0f3bff1721a35a1dfd604b6a933bb"; + sha256 = "0a75lxhzbwm66c1fa5b7zpsz3i7raljsbq4d3n5h8cfdv8hgcjch"; }; meta.homepage = "https://github.com/mfussenegger/nvim-dap/"; }; @@ -7587,12 +7599,12 @@ final: prev: nvim-dap-python = buildVimPlugin { pname = "nvim-dap-python"; - version = "2024-02-19"; + version = "2024-04-10"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-dap-python"; - rev = "66560f0ebddf96604f7037e1efad3ba6942761e6"; - sha256 = "0yc96r53iy0iim2nkl3rz5fza148fs6wk9y9k19k90ilzhh2ay3k"; + rev = "3dffa58541d1f52c121fe58ced046268c838d802"; + sha256 = "0kjcv8wvh7hwr9wy2najyrxz88fa4s7djz2lnmz2gfrmqhihibjl"; }; meta.homepage = "https://github.com/mfussenegger/nvim-dap-python/"; }; @@ -7611,12 +7623,12 @@ final: prev: nvim-dap-virtual-text = buildVimPlugin { pname = "nvim-dap-virtual-text"; - version = "2024-03-10"; + version = "2024-04-05"; src = fetchFromGitHub { owner = "theHamsta"; repo = "nvim-dap-virtual-text"; - rev = "baa5b0dc6663284cce32e0d00ac1f2511b13496f"; - sha256 = "136qm88phwbyn5zdbr6xnw0hvsa7zcycxyg5anhfdc1vxdsh8lfm"; + rev = "3e8e207513e6ef520894950acd76b79902714103"; + sha256 = "1jsb5l4vda1qgsf8qpnz18gniw1fliia5hgap0l7xl40syvcczzm"; }; meta.homepage = "https://github.com/theHamsta/nvim-dap-virtual-text/"; }; @@ -7695,36 +7707,36 @@ final: prev: nvim-highlight-colors = buildVimPlugin { pname = "nvim-highlight-colors"; - version = "2024-04-01"; + version = "2024-04-19"; src = fetchFromGitHub { owner = "brenoprata10"; repo = "nvim-highlight-colors"; - rev = "ca3731eab0cff414722a5c9c43a3ba06577cb250"; - sha256 = "1z0y0xh9kyk3p2dyr5qfy7y67dawqc6d58g37ii1nxf81bi2lf3h"; + rev = "432dc7a817a4973041f02b418169667c491f60fd"; + sha256 = "1x2791sbifpwk3rzakggja7gr7s4icainaqyhg2x587vw26739cc"; }; meta.homepage = "https://github.com/brenoprata10/nvim-highlight-colors/"; }; nvim-highlite = buildVimPlugin { pname = "nvim-highlite"; - version = "2024-03-21"; + version = "2024-04-13"; src = fetchFromGitHub { owner = "Iron-E"; repo = "nvim-highlite"; - rev = "0962a3a5f206676d7111cd56185b28d5498a0f88"; - sha256 = "1w75kp9dq34294k01a73pialzah875mm4xgfg9h3wdh6zdhjl1jk"; + rev = "e1f68ff238802fdee67c3f8ac547c1832ae2b8ee"; + sha256 = "1n1iqhn67q3fzff4kvqz2ikp5scjbb2wls267aamdqg8apq5dpq1"; }; meta.homepage = "https://github.com/Iron-E/nvim-highlite/"; }; nvim-hlslens = buildVimPlugin { pname = "nvim-hlslens"; - version = "2024-03-22"; + version = "2024-04-05"; src = fetchFromGitHub { owner = "kevinhwang91"; repo = "nvim-hlslens"; - rev = "c42b4526e6d83b904eb5f3d50e68d7c2fc4be4b5"; - sha256 = "13lwshdjrqn9f827xfbnd8pdqk8ild3j2p4xbmwi2lskm17i0vhi"; + rev = "3e8fceb2b030100857ee72741a8f48c9a1d8595e"; + sha256 = "0j6i7rv78xxkmqgmi4w7yqhj4rng7p2skbgs8gq8jcb3k6ghcs3q"; }; meta.homepage = "https://github.com/kevinhwang91/nvim-hlslens/"; }; @@ -7826,12 +7838,12 @@ final: prev: nvim-lint = buildVimPlugin { pname = "nvim-lint"; - version = "2024-04-01"; + version = "2024-04-16"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-lint"; - rev = "6670b3ac73fa4caf720f017b91c619e9424d955e"; - sha256 = "0pwx4l64glhx8cxrka3ms6xl9i9rf1lwsx6brzm0hdragb1lnaqr"; + rev = "f098232d70cebe90e27404928c9bc19ca7a5a7b5"; + sha256 = "1xnirwlnby8fr99qkcicwd1npmkx7i557jzvgxfv4m8f4b2vw923"; }; meta.homepage = "https://github.com/mfussenegger/nvim-lint/"; }; @@ -7862,12 +7874,12 @@ final: prev: nvim-lspconfig = buildVimPlugin { pname = "nvim-lspconfig"; - version = "2024-04-03"; + version = "2024-04-19"; src = fetchFromGitHub { owner = "neovim"; repo = "nvim-lspconfig"; - rev = "96e5711040df23583591391ce49e556b8cd248d8"; - sha256 = "0jlqjhi6x3g8w80mqbnmybh5lmf8cw0lnyywhhdkc5plpzh43j0c"; + rev = "ed8b8a15acc441aec669f97d75f2c1f2ac8c8aa5"; + sha256 = "0rqjcksb0dcvvxnc0r4n499xlkviwp2sbn29r8b1bnf68d7qnapx"; }; meta.homepage = "https://github.com/neovim/nvim-lspconfig/"; }; @@ -7982,12 +7994,12 @@ final: prev: nvim-nio = buildNeovimPlugin { pname = "nvim-nio"; - version = "2024-04-02"; + version = "2024-04-04"; src = fetchFromGitHub { owner = "nvim-neotest"; repo = "nvim-nio"; - rev = "173f285eebb410199273fa178aa517fd2d7edd80"; - sha256 = "0favgnfpsak44lzyzyhfavazr2i64l7ysk370xm4wbrb51kjsdkf"; + rev = "5800f585def265d52f1d8848133217c800bcb25d"; + sha256 = "0y3afl42z41ymksk29al5knasmm9wmqzby860x8zj0i0mfb1q5k5"; }; meta.homepage = "https://github.com/nvim-neotest/nvim-nio/"; }; @@ -8150,12 +8162,12 @@ final: prev: nvim-spectre = buildVimPlugin { pname = "nvim-spectre"; - version = "2024-03-27"; + version = "2024-04-17"; src = fetchFromGitHub { owner = "nvim-pack"; repo = "nvim-spectre"; - rev = "2b012554a2536465243c0dff3605b5927c49ed23"; - sha256 = "09v8pw7a4p0k7aib7yhzadifg9pm8amzqvql3rwx9b95d793710x"; + rev = "9653847cf2f225648967f6e9363643e327387579"; + sha256 = "15866wdyck6snm0iz9iqd036wqkbfwnliwd5f220r9g5v3cwg5lg"; }; meta.homepage = "https://github.com/nvim-pack/nvim-spectre/"; }; @@ -8174,12 +8186,12 @@ final: prev: nvim-surround = buildVimPlugin { pname = "nvim-surround"; - version = "2024-02-27"; + version = "2024-04-11"; src = fetchFromGitHub { owner = "kylechui"; repo = "nvim-surround"; - rev = "84a26afce16cffa7e3322cfa80a42cddf60616eb"; - sha256 = "04sapqxwj4siwv5b0zxhv5vxmc653109bkk7yn6g5bckmwkdg2dq"; + rev = "a4e30d33add8a9743b4f518b3a788b3c8e5def71"; + sha256 = "09m95jd84y3b2wrair263f0csqqdx8h45fjq9jrr4f3108494xc1"; }; meta.homepage = "https://github.com/kylechui/nvim-surround/"; }; @@ -8222,36 +8234,36 @@ final: prev: nvim-tree-lua = buildVimPlugin { pname = "nvim-tree.lua"; - version = "2024-03-31"; + version = "2024-04-21"; src = fetchFromGitHub { owner = "nvim-tree"; repo = "nvim-tree.lua"; - rev = "d8d3a1590a05b2d8b5eb26e2ed1c6052b1b47a77"; - sha256 = "1b2h5hxngzplf3gi72r07s2zrlgyk4213yqs208xrqry2svd9ih0"; + rev = "ae8e46e8fabb32fa3ae5319383ea2c8763f14caa"; + sha256 = "0cb4p6bndid12h2bjdj5ybksqjmwv1876jx5a2wlj6h0q50wfjs0"; }; meta.homepage = "https://github.com/nvim-tree/nvim-tree.lua/"; }; nvim-treesitter = buildVimPlugin { pname = "nvim-treesitter"; - version = "2024-04-03"; + version = "2024-04-20"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter"; - rev = "cc0e29727a9651e27869b7444e835c44fb1e7b4c"; - sha256 = "1lnpmbj0nz33dv5b2kf6p39bxknjfcwqc7qsj5rzsxf4ycf73jig"; + rev = "ea4f6d5175812a3f48302d638a766bc18fcbb04a"; + sha256 = "0smghl0nv4w1rpn7gqsq6lbarh5nzbhvi8pfysh5f7am0p42y86m"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/"; }; nvim-treesitter-context = buildVimPlugin { pname = "nvim-treesitter-context"; - version = "2024-03-22"; + version = "2024-04-19"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter-context"; - rev = "f19766163c18515fb4d3c12d572bf9cba6cdb990"; - sha256 = "1ivaaj3fq33dynrmw67l3m2hfdklyb2f269a2brra613qm84ac48"; + rev = "ba4289ad345ececd335a9cdd7b9616fd0bb6be92"; + sha256 = "0cfklfz2anc8021qi0q8dbrdmnndnd073azgsiwaagbh75s3sgh1"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter-context/"; }; @@ -8294,12 +8306,12 @@ final: prev: nvim-treesitter-textobjects = buildVimPlugin { pname = "nvim-treesitter-textobjects"; - version = "2024-04-03"; + version = "2024-04-15"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter-textobjects"; - rev = "acffd3476eb340faef0ec07e48060b817386b973"; - sha256 = "1mw5dn52dx1lmh98254hj44c4nlwxaf4j5i9fla9fg1g71rc521k"; + rev = "23b820146956b3b681c19e10d3a8bc0cbd9a1d4c"; + sha256 = "1jvx9nbz5sh09jnlcqm5qfyjvryibc3fpnfxim7adk5gb4160xws"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter-textobjects/"; }; @@ -8330,12 +8342,12 @@ final: prev: nvim-ts-context-commentstring = buildVimPlugin { pname = "nvim-ts-context-commentstring"; - version = "2024-03-27"; + version = "2024-04-17"; src = fetchFromGitHub { owner = "joosepalviste"; repo = "nvim-ts-context-commentstring"; - rev = "734ebad31c81c6198dfe102aa23280937c937c42"; - sha256 = "114w2xkb1warjbs6r3z75pzb8k6087j3xlpi5z4nnxcjk1sj03v0"; + rev = "a6382f744f584bbf71d0a563af789af7190aabda"; + sha256 = "12b12ndva3ck5y18mkmhzkbmaz65kjkqsjxvq5gfniz1br7n2y9j"; }; meta.homepage = "https://github.com/joosepalviste/nvim-ts-context-commentstring/"; }; @@ -8366,12 +8378,12 @@ final: prev: nvim-web-devicons = buildVimPlugin { pname = "nvim-web-devicons"; - version = "2024-03-26"; + version = "2024-04-21"; src = fetchFromGitHub { owner = "nvim-tree"; repo = "nvim-web-devicons"; - rev = "3ee60deaa539360518eaab93a6c701fe9f4d82ef"; - sha256 = "1a0z8canxpr5vlnmkqpys35yar8l296gdznqlvvvf1200wai3i8v"; + rev = "beb6367ab8496c9e43f22e0252735fdadae1872d"; + sha256 = "1qqwfzfk5w2sfaavfa2nn01caj753j272hpnhmvgwknfgvl9cv81"; }; meta.homepage = "https://github.com/nvim-tree/nvim-web-devicons/"; }; @@ -8414,12 +8426,12 @@ final: prev: nvim_context_vt = buildVimPlugin { pname = "nvim_context_vt"; - version = "2024-01-15"; + version = "2024-04-18"; src = fetchFromGitHub { owner = "andersevenrud"; repo = "nvim_context_vt"; - rev = "8f7b6b46292e0819290b0d368abc3366b8a163fc"; - sha256 = "06njpi7zr0m7kwcrw2pwnhhmaij49p810bsdkav0ynkcszf60402"; + rev = "4b89241c19909f18d2f6b58777c413c027600fcc"; + sha256 = "116j5k4nznsldiv752rhxlsjzr2cha1zclxrffiqlnbldiyr5i8i"; }; meta.homepage = "https://github.com/andersevenrud/nvim_context_vt/"; }; @@ -8450,12 +8462,12 @@ final: prev: obsidian-nvim = buildVimPlugin { pname = "obsidian.nvim"; - version = "2024-04-01"; + version = "2024-04-19"; src = fetchFromGitHub { owner = "epwalsh"; repo = "obsidian.nvim"; - rev = "d70f3289399c25153b7f503b838afbf981124a37"; - sha256 = "1528p9rhh5gkl726m5r367zdi4wd1yln0l0crg19n0gnif2l8gj4"; + rev = "ec0f44e1921d2701bd99a542031d280f1e3930b5"; + sha256 = "1b9b72yrp1xfkag41hxjk903payfrcnjdi7lr5880183mm0im04w"; }; meta.homepage = "https://github.com/epwalsh/obsidian.nvim/"; }; @@ -8486,24 +8498,24 @@ final: prev: octo-nvim = buildVimPlugin { pname = "octo.nvim"; - version = "2024-04-03"; + version = "2024-04-17"; src = fetchFromGitHub { owner = "pwntester"; repo = "octo.nvim"; - rev = "a511b52fbf040f928a24deb72e17ec465613b442"; - sha256 = "0jrcqxjbv24qa9k701l1bxyz20s0wj9jkr8vxx68j3z51idjygqn"; + rev = "5646539320cd62af6ff28f48ec92aeb724c68e18"; + sha256 = "1qknswy3hs9lkwbs4pqqbsngyvk7ibl6lhdl0df46ymzpmpkkb8h"; }; meta.homepage = "https://github.com/pwntester/octo.nvim/"; }; oil-nvim = buildVimPlugin { pname = "oil.nvim"; - version = "2024-03-18"; + version = "2024-04-19"; src = fetchFromGitHub { owner = "stevearc"; repo = "oil.nvim"; - rev = "e462a3446505185adf063566f5007771b69027a1"; - sha256 = "1pg1sakc1lka2j9nbdy4hqfhg4gc9csbrmpbhsyxwb8p2n4zyiiq"; + rev = "1f05774e1c2dbc1940104b5c950d5c7b65ec6e0b"; + sha256 = "0l6y9xnz8l7flq0jlh9xxnsp9inny9mbbqg2j2sg0rivq630bbnh"; fetchSubmodules = true; }; meta.homepage = "https://github.com/stevearc/oil.nvim/"; @@ -8667,48 +8679,48 @@ final: prev: openscad-nvim = buildVimPlugin { pname = "openscad.nvim"; - version = "2024-03-12"; + version = "2024-04-13"; src = fetchFromGitHub { owner = "salkin-mada"; repo = "openscad.nvim"; - rev = "5c35ce921a63d59f2a0bb20d872c15a0d4c8aa72"; - sha256 = "1l3xhv670apfjns12xzhf7sn3mf3gdd3xiyirydrnp7bxy7dyv1h"; + rev = "bf99a48bff318ceb28646d27f29f925ba0b10af0"; + sha256 = "1b90bfwwnz9iwwr89whpqn939m5bvw8cpiysc8yaq3yy46gzvkw7"; }; meta.homepage = "https://github.com/salkin-mada/openscad.nvim/"; }; orgmode = buildVimPlugin { pname = "orgmode"; - version = "2024-04-03"; + version = "2024-04-19"; src = fetchFromGitHub { owner = "nvim-orgmode"; repo = "orgmode"; - rev = "207d12c8683090195d290c46b00f684ec941f20e"; - sha256 = "1ff4sxq671iwk3c4qbsj9disdb5iaa0ynhq88slmq045ndbjz2bh"; + rev = "389e91f6f935aa845bc0cd13dd80f75431c34751"; + sha256 = "1fzckfi00bb4mi5l9wadhgv98z7fmlgryx24zipcr7k98pdaw36h"; }; meta.homepage = "https://github.com/nvim-orgmode/orgmode/"; }; other-nvim = buildVimPlugin { pname = "other.nvim"; - version = "2024-02-05"; + version = "2024-04-16"; src = fetchFromGitHub { owner = "rgroli"; repo = "other.nvim"; - rev = "d36a66af270b63459c080d4589126a06cf56578c"; - sha256 = "015is3pyjn0jrmz03vsvyiiy8fgwrpd1syfq3zmspyyki7blclcl"; + rev = "2a82971d3763474df29d5d32d0699b5bb13c551f"; + sha256 = "1jxiyabkg3y8fcnms9rms844038hjmynbg9wykfmn7n38sxig300"; }; meta.homepage = "https://github.com/rgroli/other.nvim/"; }; otter-nvim = buildVimPlugin { pname = "otter.nvim"; - version = "2024-03-25"; + version = "2024-04-09"; src = fetchFromGitHub { owner = "jmbuhr"; repo = "otter.nvim"; - rev = "145a7b0c3c40f4e62fc6c0bc9721e2cfe8f95471"; - sha256 = "0a2rpxnvx35xafp19n163hba3p3247sqnwkgdhaka54yx4gx091q"; + rev = "e67aa5082c65eeffd8a57b672e1353e8cf2ca7a9"; + sha256 = "0223cmm4hg9c9ywifr0c7zk091ny5sndarkq7sa9vk5vmar5sz15"; }; meta.homepage = "https://github.com/jmbuhr/otter.nvim/"; }; @@ -8727,12 +8739,12 @@ final: prev: overseer-nvim = buildVimPlugin { pname = "overseer.nvim"; - version = "2024-03-24"; + version = "2024-04-13"; src = fetchFromGitHub { owner = "stevearc"; repo = "overseer.nvim"; - rev = "b04b0b105c07b4f02b3073ea3a98d6eca90bf152"; - sha256 = "1j9ch2n1hxrc0vs48v753jg56jxcv79j96rvbag8f7z7gbl5agpy"; + rev = "dd701ed0639ef1e10d0ca8dec039719e916c4a7b"; + sha256 = "1xr0xzf5h1r8ax6djvq1vq936yqmvwa4l0hbjqq090mgnj60arh5"; fetchSubmodules = true; }; meta.homepage = "https://github.com/stevearc/overseer.nvim/"; @@ -9162,12 +9174,12 @@ final: prev: qmk-nvim = buildVimPlugin { pname = "qmk.nvim"; - version = "2024-02-15"; + version = "2024-04-17"; src = fetchFromGitHub { owner = "codethread"; repo = "qmk.nvim"; - rev = "67c1a94b10f7266ac01b0a2431dade70693edba9"; - sha256 = "sha256-YKp9/unDL52guKRHI50DSPV8nXyPqAHY9mEHUMHFhmc="; + rev = "cfa6cecae362d23778cd97317d33ab12671e157c"; + sha256 = "0p44i25iyryrvy1sf3bp10as39mgd6da1gai332rv2ky3zgc3lbh"; }; meta.homepage = "https://github.com/codethread/qmk.nvim/"; }; @@ -9246,11 +9258,11 @@ final: prev: rainbow-delimiters-nvim = buildVimPlugin { pname = "rainbow-delimiters.nvim"; - version = "2024-03-23"; + version = "2024-04-18"; src = fetchgit { url = "https://gitlab.com/HiPhish/rainbow-delimiters.nvim"; - rev = "580bc045c7ab3ab3ebd267774038c0d8cc19c789"; - sha256 = "1jqxlikp8y2qs9sd48dvwvpim4276kw3a32k85n6nfkvlwjspkqp"; + rev = "7ef0766b5cd2f5cdf4fcb08886f0a2ebf65981fa"; + sha256 = "0pw3dk0rnaa2llvgkqar1j5wqrh3lah2ygvxaqiy7760pyanh38c"; }; meta.homepage = "https://gitlab.com/HiPhish/rainbow-delimiters.nvim"; }; @@ -9389,12 +9401,12 @@ final: prev: rest-nvim = buildNeovimPlugin { pname = "rest.nvim"; - version = "2024-03-27"; + version = "2024-04-17"; src = fetchFromGitHub { owner = "rest-nvim"; repo = "rest.nvim"; - rev = "a1221086cfdeb58de393f4bbae11063c6c8c075c"; - sha256 = "0agjc2jz6jh3k2hm942rdslpypsdxj2i8r1mm0dlqswbl853c9lj"; + rev = "20c5b5259afa7f4867474cc463211d64c93ba371"; + sha256 = "0ysmzf2lfry8abaajjanp3b3358nbgd2d2zs9qfjyrbk0fmqw0gc"; }; meta.homepage = "https://github.com/rest-nvim/rest.nvim/"; }; @@ -9509,12 +9521,12 @@ final: prev: rustaceanvim = buildNeovimPlugin { pname = "rustaceanvim"; - version = "2024-04-01"; + version = "2024-04-21"; src = fetchFromGitHub { owner = "mrcjkb"; repo = "rustaceanvim"; - rev = "e2dbf91daed26d4dd7263affbecbf9a36e0096e5"; - sha256 = "1mk8v1mdkxib9kaypy7kb76yga7zj5zyqka8zhnhn9h4v4kqdj8z"; + rev = "dd4d5d8d1313f0bb343af90e2432ad2f2a9fedaf"; + sha256 = "1zph7b9vdd96xai19g6di48r5p5px0pz8kkq5hfkriq2apygpb99"; }; meta.homepage = "https://github.com/mrcjkb/rustaceanvim/"; }; @@ -9557,12 +9569,12 @@ final: prev: scnvim = buildVimPlugin { pname = "scnvim"; - version = "2024-01-11"; + version = "2024-04-19"; src = fetchFromGitHub { owner = "davidgranstrom"; repo = "scnvim"; - rev = "8929739543e5a4dc51d1af1d122bdbbb54e634b9"; - sha256 = "1mm3lp5q6fvrlmq84637y7gjf04917xz8v1y0jkp2g4hi6v119nc"; + rev = "94e49fa6c596813247549cd594f5ab6246c79973"; + sha256 = "1axbrakr3xpmvbdslh803xam72fg6ar428bgz04h0j2ygg75bqmy"; }; meta.homepage = "https://github.com/davidgranstrom/scnvim/"; }; @@ -9750,12 +9762,12 @@ final: prev: smart-splits-nvim = buildVimPlugin { pname = "smart-splits.nvim"; - version = "2024-03-29"; + version = "2024-04-19"; src = fetchFromGitHub { owner = "mrjones2014"; repo = "smart-splits.nvim"; - rev = "50f52146e4504a3fc0f0d5830c8560a16a95dd08"; - sha256 = "07ca4mn1rlxy11ayfw89i2vvcndd0p4lpfqyzdzd99vnm0cxg2ml"; + rev = "95d11bfc83263236431ead7dc017f5ab0ff992ca"; + sha256 = "0x9s5801si869gh7jazlfd9asiwk5fkr1gv67qf7bs55pc0z9rbf"; }; meta.homepage = "https://github.com/mrjones2014/smart-splits.nvim/"; }; @@ -9979,12 +9991,12 @@ final: prev: sqlite-lua = buildVimPlugin { pname = "sqlite.lua"; - version = "2024-02-19"; + version = "2024-04-21"; src = fetchFromGitHub { owner = "kkharji"; repo = "sqlite.lua"; - rev = "40701b6151f8883980c1548647116de39b763540"; - sha256 = "106j1zzsr97jr0pk6ri2jxdpvqc2ci7g8rlsbb5s30lsqr4ix0ah"; + rev = "d0ffd703b56d090d213b497ed4eb840495f14a11"; + sha256 = "1nj0yqrr8dzjva14irp10g0c6xbnv3wm1igkl2cc7c8f3bddrfwx"; }; meta.homepage = "https://github.com/kkharji/sqlite.lua/"; }; @@ -10099,12 +10111,12 @@ final: prev: statuscol-nvim = buildVimPlugin { pname = "statuscol.nvim"; - version = "2024-02-23"; + version = "2024-04-19"; src = fetchFromGitHub { owner = "luukvbaal"; repo = "statuscol.nvim"; - rev = "d954893262a57a92e46edd87de67e2b3fe72305e"; - sha256 = "1i8nvhbrcsinydd1ppnrw6lr3izh1dwp860hr7axyfjgqxgx39f8"; + rev = "483b9a596dfd63d541db1aa51ee6ee9a1441c4cc"; + sha256 = "0dvpfbyvsalim5ml37vprh5ay9brdjfpcn08rgg77xp6pcjrk2qb"; }; meta.homepage = "https://github.com/luukvbaal/statuscol.nvim/"; }; @@ -10159,12 +10171,12 @@ final: prev: suda-vim = buildVimPlugin { pname = "suda.vim"; - version = "2024-03-12"; + version = "2024-04-18"; src = fetchFromGitHub { owner = "lambdalisue"; repo = "suda.vim"; - rev = "66727b416837836712975e748bc8a19fb6cf4ec3"; - sha256 = "09lbnx6mrqsrn6fvcp3mb6mkwbrkdrvr5rgzp43idj0ipm5j809h"; + rev = "04469d855e36fffcda6be036eb7ff005f64fa0d6"; + sha256 = "18igbn0ldh3mwf8qlnfbbidk88l1wfjx1v95dmdwd1xif642bppn"; }; meta.homepage = "https://github.com/lambdalisue/suda.vim/"; }; @@ -10329,12 +10341,12 @@ final: prev: tabout-nvim = buildVimPlugin { pname = "tabout.nvim"; - version = "2024-02-18"; + version = "2024-04-20"; src = fetchFromGitHub { owner = "abecodes"; repo = "tabout.nvim"; - rev = "6a8f4e67a9bfc9bfc9989cc45253180598cc4339"; - sha256 = "0j4n6f8k2054v77pm458q0qf36ipyk31lplm2m4fszxq0sq0kmwp"; + rev = "c442ae7788c30dbd41d259c51df4046cb8269a96"; + sha256 = "0rd451fz9i6wbyzjrdkjz4phwlq8fz1lcgmbdjrjxvax3hkpbbqx"; }; meta.homepage = "https://github.com/abecodes/tabout.nvim/"; }; @@ -10449,12 +10461,12 @@ final: prev: telekasten-nvim = buildVimPlugin { pname = "telekasten.nvim"; - version = "2024-02-27"; + version = "2024-04-17"; src = fetchFromGitHub { owner = "renerocksai"; repo = "telekasten.nvim"; - rev = "a684d6ebe7026944b0a5323219d5f5364511e5b2"; - sha256 = "03hsj2rfhllpxy0x8nr5sjp2krfg51ib0771bqmwycnlfg3cp1bw"; + rev = "24fd8c1e7eb989dba9efa5d174e42870f08da8fb"; + sha256 = "1ky0035jar8i06k8w4mkizbcyiib393zk3cwr14fnsvq94jp23bs"; fetchSubmodules = true; }; meta.homepage = "https://github.com/renerocksai/telekasten.nvim/"; @@ -10486,12 +10498,12 @@ final: prev: telescope-coc-nvim = buildVimPlugin { pname = "telescope-coc.nvim"; - version = "2024-03-02"; + version = "2024-04-08"; src = fetchFromGitHub { owner = "fannheyward"; repo = "telescope-coc.nvim"; - rev = "421f50c56d66bc8f39c5deec05532deb071b597d"; - sha256 = "1cf6990fkrzbagwphzkyh10i30hrv8vbqgmf4znva3ms1ad7ilhf"; + rev = "55ca0d6960eb1c32f9f7967fa71926f7bad484a8"; + sha256 = "0yzw9k406q1ixascqw8maw9raqny6cc0cp1idmdsrp8dnvl954v8"; }; meta.homepage = "https://github.com/fannheyward/telescope-coc.nvim/"; }; @@ -10522,12 +10534,12 @@ final: prev: telescope-frecency-nvim = buildVimPlugin { pname = "telescope-frecency.nvim"; - version = "2024-03-25"; + version = "2024-04-06"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope-frecency.nvim"; - rev = "2a22815b0928087a5989e2a8e836b13b46015505"; - sha256 = "0jar21cac5q0blpfc25hyfi1kxxx18maw0mvjnpi5awygggxxwx7"; + rev = "94a532cb9c4713db83acf5432f5aadfd096e2af9"; + sha256 = "17243ls89kdalb0vlx84blwxan9g8xdin9fvzyk5xkb8b1wbpz5p"; }; meta.homepage = "https://github.com/nvim-telescope/telescope-frecency.nvim/"; }; @@ -10607,12 +10619,12 @@ final: prev: telescope-manix = buildNeovimPlugin { pname = "telescope-manix"; - version = "2024-03-31"; + version = "2024-04-21"; src = fetchFromGitHub { owner = "MrcJkb"; repo = "telescope-manix"; - rev = "b61eaf260d02da734228e0d54c3999b9b8340d5e"; - sha256 = "1asih4ycx4219zhidsyvlw95rv83vpvx8bdb7ivzsqjnv92s70f4"; + rev = "bd6b110a08cc5b7c098020325ff55218a5b249da"; + sha256 = "1dj6bdx98596l2lnjcdd2c5zm5j00cid0kdb0zd6vhv1jfw8zqsx"; }; meta.homepage = "https://github.com/MrcJkb/telescope-manix/"; }; @@ -10752,12 +10764,12 @@ final: prev: telescope-nvim = buildNeovimPlugin { pname = "telescope.nvim"; - version = "2024-04-02"; + version = "2024-04-21"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope.nvim"; - rev = "4626aaa2bcfdacf55fd6d44b430e2df81b2403ff"; - sha256 = "0rzdasr1lavdrxk7kszi0ari3di48zfki70himrc1m2qs89pa6ph"; + rev = "7d1698f3d88b448e0639974248cc17f49b7b8acf"; + sha256 = "1k3fhgpakr1b8x9fk7sq699h3479k8x9yc3jbq7xq2jk7p0n4m62"; }; meta.homepage = "https://github.com/nvim-telescope/telescope.nvim/"; }; @@ -10860,12 +10872,12 @@ final: prev: texpresso-vim = buildVimPlugin { pname = "texpresso.vim"; - version = "2024-03-08"; + version = "2024-04-18"; src = fetchFromGitHub { owner = "let-def"; repo = "texpresso.vim"; - rev = "04816dcdddc27e6c50fc2a4faff0ef1675a7ee8e"; - sha256 = "08lzl0g1b287agscd345yg9cmxsj2vlbg83s1mgsa13qn81y6jga"; + rev = "30f9b8277b18326e0aa6882fb96d51bc1b40a222"; + sha256 = "1iagc7kld327mkkravk30dz2a0dq4i8718w0k1jrlj0z54981gbn"; }; meta.homepage = "https://github.com/let-def/texpresso.vim/"; }; @@ -11005,12 +11017,12 @@ final: prev: toggleterm-nvim = buildVimPlugin { pname = "toggleterm.nvim"; - version = "2024-02-12"; + version = "2024-04-19"; src = fetchFromGitHub { owner = "akinsho"; repo = "toggleterm.nvim"; - rev = "193786e0371e3286d3bc9aa0079da1cd41beaa62"; - sha256 = "0cz6i3xa61mh8s5b9b2z008ay85ggaw02ak9w58wzgmn172q770l"; + rev = "dca1c80fb8ec41c97e7c3ef308719d8143fbbb05"; + sha256 = "11rmk7hpmf75n0lgchj7hvsw9915m493hlgqsmjkkyhs9w0bwb4n"; }; meta.homepage = "https://github.com/akinsho/toggleterm.nvim/"; }; @@ -11209,12 +11221,12 @@ final: prev: typst-vim = buildVimPlugin { pname = "typst.vim"; - version = "2024-03-25"; + version = "2024-04-18"; src = fetchFromGitHub { owner = "kaarmu"; repo = "typst.vim"; - rev = "86e4fa8dcddd032f9fdbf04602417a8baac8fed3"; - sha256 = "1rhiz5lbkq3d6pd0g07hj9gwk359vyk2vqsj0h4dmkvz6vlnnjv2"; + rev = "d9a7650e76c85f8ba437e056d08dd43b01b8bfd6"; + sha256 = "1l4mq2m8s7kav6hpq6nay4xyy2jvq6jbblyy100yfb9nrzkpggpc"; }; meta.homepage = "https://github.com/kaarmu/typst.vim/"; }; @@ -11245,12 +11257,12 @@ final: prev: undotree = buildVimPlugin { pname = "undotree"; - version = "2024-03-08"; + version = "2024-04-16"; src = fetchFromGitHub { owner = "mbbill"; repo = "undotree"; - rev = "aa93a7e5890dbbebbc064cd22260721a6db1a196"; - sha256 = "110w9nr24rph717w1vs3vhfq1ggsjgq91zvyp431qxpa7wzd5pyk"; + rev = "56c684a805fe948936cda0d1b19505b84ad7e065"; + sha256 = "1yy7y344b906z04rrnvy2hkrgsrxjm6ij399qmfw8b20rxdyi2jh"; }; meta.homepage = "https://github.com/mbbill/undotree/"; }; @@ -11269,12 +11281,12 @@ final: prev: unison = buildVimPlugin { pname = "unison"; - version = "2024-04-01"; + version = "2024-04-17"; src = fetchFromGitHub { owner = "unisonweb"; repo = "unison"; - rev = "80fc452dd8cd325436fb8da1dcd54510348c89de"; - sha256 = "0ndmfsxy4scwahv3917ylxjn59lih9q1rha636h2xq4bcmgbcifb"; + rev = "ac4d817f5e18a0b462b23dcd124f849633d650fe"; + sha256 = "00dsvdqp02bf8zvnk8ljn0f38wb38h8iabsrarycl2a3v6jr8lgr"; }; meta.homepage = "https://github.com/unisonweb/unison/"; }; @@ -11341,12 +11353,12 @@ final: prev: venn-nvim = buildVimPlugin { pname = "venn.nvim"; - version = "2023-11-05"; + version = "2024-04-18"; src = fetchFromGitHub { owner = "jbyuki"; repo = "venn.nvim"; - rev = "e4d68341a73dd56c64955058821a58295fb337b1"; - sha256 = "181sr7p8qn67br64ahg5vhb9b7m9mldwlg27nsgs0hc33vagvr1h"; + rev = "a5430d75875acbe93e9685cdeb78c6eb2a329ed5"; + sha256 = "1dwl75chqbp888yp2ykyqszz0glli2vx2cbw3lsgnrzlhql53alm"; }; meta.homepage = "https://github.com/jbyuki/venn.nvim/"; }; @@ -11377,12 +11389,12 @@ final: prev: vim-CtrlXA = buildVimPlugin { pname = "vim-CtrlXA"; - version = "2024-03-27"; + version = "2024-04-07"; src = fetchFromGitHub { owner = "Konfekt"; repo = "vim-CtrlXA"; - rev = "56a7041a393f08594dc34865ddddc724bffa7684"; - sha256 = "1gw2793hdw7m1k5837ynnzvbb1ikgyhzi6lv817cdfgxa5kkqsh0"; + rev = "cb520cd3f9248b9ede236ff3da8ca3e0b68b6459"; + sha256 = "1csbmjrdrlqsagz5b6hryrcglfdplwc7d26q4r20w37zx3f9qzw3"; }; meta.homepage = "https://github.com/Konfekt/vim-CtrlXA/"; }; @@ -12205,12 +12217,12 @@ final: prev: vim-code-dark = buildVimPlugin { pname = "vim-code-dark"; - version = "2023-11-11"; + version = "2024-04-11"; src = fetchFromGitHub { owner = "tomasiser"; repo = "vim-code-dark"; - rev = "8def3d890b2087ee4c42af03117d7edc7d693706"; - sha256 = "129mrz3jxw4kgbg5lz9gc7rznsjp2fbjvi60zyrpkmv8xa6yhmpw"; + rev = "05d7843412c4fb7d1bdafefd04462ac4db841f0f"; + sha256 = "1ycb94cdady4x1bv957zcndrsk16ia54q5kg1k8r8x0ir0gclmac"; }; meta.homepage = "https://github.com/tomasiser/vim-code-dark/"; }; @@ -12289,12 +12301,12 @@ final: prev: vim-commentary = buildVimPlugin { pname = "vim-commentary"; - version = "2024-01-12"; + version = "2024-04-08"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-commentary"; - rev = "f67e3e67ea516755005e6cccb178bc8439c6d402"; - sha256 = "0r5jlxkxfy5gvpkmzsfkxzlgydn477qiywqlng4xbaw3pijcf04i"; + rev = "c4b8f52cbb7142ec239494e5a2c4a512f92c4d07"; + sha256 = "1v16mnjm8gr540w6smvwbpn1zmjimzwi74a8d165a1yacnmdm6pf"; }; meta.homepage = "https://github.com/tpope/vim-commentary/"; }; @@ -12601,12 +12613,12 @@ final: prev: vim-easy-align = buildVimPlugin { pname = "vim-easy-align"; - version = "2019-04-29"; + version = "2024-04-13"; src = fetchFromGitHub { owner = "junegunn"; repo = "vim-easy-align"; - rev = "12dd6316974f71ce333e360c0260b4e1f81169c3"; - sha256 = "0gpfdla8shaf5ykgakrsf0h0w6ygvwcv3lfpnki24l790xhdi606"; + rev = "9815a55dbcd817784458df7a18acacc6f82b1241"; + sha256 = "028gcsvmihw3nmc4pp9zyh8na29i6h0fhihk060ka2y3rn5xc9zl"; }; meta.homepage = "https://github.com/junegunn/vim-easy-align/"; }; @@ -12913,12 +12925,12 @@ final: prev: vim-floaterm = buildVimPlugin { pname = "vim-floaterm"; - version = "2024-04-02"; + version = "2024-04-08"; src = fetchFromGitHub { owner = "voldikss"; repo = "vim-floaterm"; - rev = "fe61226f8990bb4d36fa274fdc5f6079535cedeb"; - sha256 = "0yy16na6ffjj4kk14ar1gy9zvd9nlz15hnn18s3g92494gipq4q2"; + rev = "4e28c8dd0271e10a5f55142fb6fe9b1599ee6160"; + sha256 = "0nkbp4hcpfqj2s85g03rkb3786pa4cdf80mvmbzc89kiqw2ir260"; }; meta.homepage = "https://github.com/voldikss/vim-floaterm/"; }; @@ -12985,12 +12997,12 @@ final: prev: vim-fugitive = buildVimPlugin { pname = "vim-fugitive"; - version = "2024-03-31"; + version = "2024-04-08"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-fugitive"; - rev = "c0b03f1cac242d96837326d300f42a660306fc1a"; - sha256 = "0czzasq0r4130yxjhsakk65p5yv7wcwlbzrv14dbjjsvgjs0zdlx"; + rev = "dac8e5c2d85926df92672bf2afb4fc48656d96c7"; + sha256 = "1m33vpkfw1dx3kxxgw8r278a5rch4sd3ngc9mbnap97f0q8karm6"; }; meta.homepage = "https://github.com/tpope/vim-fugitive/"; }; @@ -13141,12 +13153,12 @@ final: prev: vim-go = buildVimPlugin { pname = "vim-go"; - version = "2024-03-25"; + version = "2024-04-13"; src = fetchFromGitHub { owner = "fatih"; repo = "vim-go"; - rev = "14eedf6135cf4253b0ed48a0b53d6834a40da1c4"; - sha256 = "06ihf1mrynk28yv4a23khfbz16621pj3lindwd19p2sn3wbz47d1"; + rev = "feef9b31507f8e942bcd21f9e1f22d587c83c72d"; + sha256 = "10baiz4hklzwr53vrvivmx86c84d66k0yzbajd3p8mi19h3a96gy"; }; meta.homepage = "https://github.com/fatih/vim-go/"; }; @@ -13478,12 +13490,12 @@ final: prev: vim-illuminate = buildVimPlugin { pname = "vim-illuminate"; - version = "2024-02-04"; + version = "2024-04-18"; src = fetchFromGitHub { owner = "RRethy"; repo = "vim-illuminate"; - rev = "305bf07b919ac526deb5193280379e2f8b599926"; - sha256 = "1pmzh7pz23dl6jmcify9494jwgyi2jfjkg0l95cxfrbjqghjxli8"; + rev = "e522e0dd742a83506db0a72e1ced68c9c130f185"; + sha256 = "0l9306c3867r6dqn4272kkzql63pwfaibhdwisjlc7pcv9wzah53"; }; meta.homepage = "https://github.com/RRethy/vim-illuminate/"; }; @@ -13743,12 +13755,12 @@ final: prev: vim-just = buildVimPlugin { pname = "vim-just"; - version = "2024-04-03"; + version = "2024-04-09"; src = fetchFromGitHub { owner = "NoahTheDuke"; repo = "vim-just"; - rev = "4f6eea3d5ad64236549411bb2e2fd8f1c7926abc"; - sha256 = "07g61mvln8sdqfacypap5fdx235bmrlbx713s4n8jpxdp6fwnydr"; + rev = "a2777b4b113dafc639f541ad4f0f7da0adc640f4"; + sha256 = "07dwja75dlwjmn687jbk56yz3srijjagppqn7xyl4bzd0svi4s97"; }; meta.homepage = "https://github.com/NoahTheDuke/vim-just/"; }; @@ -13803,12 +13815,12 @@ final: prev: vim-lawrencium = buildVimPlugin { pname = "vim-lawrencium"; - version = "2024-04-03"; + version = "2024-04-10"; src = fetchFromGitHub { owner = "ludovicchabant"; repo = "vim-lawrencium"; - rev = "756d7544c380a92b6f12e501a0d979cb6f53a90a"; - sha256 = "16wzibxqz6jqh4bp43h1hh9kwlnns6zcqd6hdi25zzlfpx5m14q3"; + rev = "a790513b278eba1279e1f053aab760cbddbc3872"; + sha256 = "0awx42g0wak2akxmdm5whp2hcgjyqf28v3vzmb06l1fm7qs76c0v"; }; meta.homepage = "https://github.com/ludovicchabant/vim-lawrencium/"; }; @@ -14007,12 +14019,12 @@ final: prev: vim-lsp-settings = buildVimPlugin { pname = "vim-lsp-settings"; - version = "2024-03-19"; + version = "2024-04-20"; src = fetchFromGitHub { owner = "mattn"; repo = "vim-lsp-settings"; - rev = "d0766475906b8cda4d542a2284efd170da31eff7"; - sha256 = "0abnh5rrir62glayf8kdlq9h16ixa934z0hpw4kc7k4nsx66y91m"; + rev = "4b3732c31b408953a1bb0fca6f003400abb5bfaa"; + sha256 = "1p02j2k68csvcp5wshhzk29byavsc76gpj7a935smirj9d8nhcmr"; }; meta.homepage = "https://github.com/mattn/vim-lsp-settings/"; }; @@ -14116,12 +14128,12 @@ final: prev: vim-markdown-toc = buildVimPlugin { pname = "vim-markdown-toc"; - version = "2024-03-20"; + version = "2024-04-12"; src = fetchFromGitHub { owner = "mzlogin"; repo = "vim-markdown-toc"; - rev = "483c8fbc7d63c9d381b367a9f845674456081534"; - sha256 = "08mvz4qz2mvcyvlii4p7v5w9pc81vwh108p643dm8rzkw0g8kn50"; + rev = "05d6538ccef1d33f2d26f2515c0eacaa93d2e061"; + sha256 = "0x9vq6qi7m532la56i9pnp9l4q1s7iy1g7w36451w4c03lsw39is"; }; meta.homepage = "https://github.com/mzlogin/vim-markdown-toc/"; }; @@ -14668,12 +14680,12 @@ final: prev: vim-paper = buildVimPlugin { pname = "vim-paper"; - version = "2023-08-02"; + version = "2024-04-16"; src = fetchFromGitHub { owner = "yorickpeterse"; repo = "vim-paper"; - rev = "c4995be5a73a5b24d69a9ebd932a4e9be58fdb90"; - sha256 = "11psmnapyz8qg2h6rm2wkaq8xkw8kv12nwq5m16baqvf04fp847c"; + rev = "790c31c56ce510cc0c0f777090be4140fe130d1d"; + sha256 = "1w958a6ga1a6518f5cr1nag6vkkxh92hqcv5k6f7410xm7fqdya6"; }; meta.homepage = "https://github.com/yorickpeterse/vim-paper/"; }; @@ -15040,12 +15052,12 @@ final: prev: vim-rails = buildVimPlugin { pname = "vim-rails"; - version = "2024-02-11"; + version = "2024-04-12"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-rails"; - rev = "3a155462d1c346e291595400ca238037d02a357f"; - sha256 = "0zz510l1ncv3abax76s99cfpc6r6vvb81hnhxzyx4nzgwqzm0qag"; + rev = "8972461e64c7c4bf049f2f86ea1bc571e8077b55"; + sha256 = "08lzlk2lhfcyp45sk90h3j6diwz78c8hx0dm1wb9fykmiiipsr0c"; }; meta.homepage = "https://github.com/tpope/vim-rails/"; }; @@ -15280,12 +15292,12 @@ final: prev: vim-signify = buildVimPlugin { pname = "vim-signify"; - version = "2023-05-10"; + version = "2024-04-05"; src = fetchFromGitHub { owner = "mhinz"; repo = "vim-signify"; - rev = "7d538b77a5a8806e344b057f8846f6d0c035efa9"; - sha256 = "00ybb3l0g9bprdlj33f0n3nlf96gm40gsmnlazh9mzb3nzr2knzr"; + rev = "8670143f9e12ed1cd3c9b2c54f345cdd9a4baac3"; + sha256 = "0wpa5d401slgg41mknm6kiaki7frg7wkzs7ymjyn4l5jxq03x42h"; }; meta.homepage = "https://github.com/mhinz/vim-signify/"; }; @@ -15725,12 +15737,12 @@ final: prev: vim-test = buildVimPlugin { pname = "vim-test"; - version = "2024-04-03"; + version = "2024-04-20"; src = fetchFromGitHub { owner = "vim-test"; repo = "vim-test"; - rev = "8746ef06631293d7d47a6daccd95b0ed3e135494"; - sha256 = "04wp13zpfzvcx7lisjq489m8vh6maynv6lhz7didqr3lawicnvr2"; + rev = "eb5bd18d58a859e7d55d732d37e4e2b94fa50275"; + sha256 = "0v4yi5h8w06vkcl13zhl8hmb79d1g1rc4wrbwj86rxcq7yj490vk"; }; meta.homepage = "https://github.com/vim-test/vim-test/"; }; @@ -15821,12 +15833,12 @@ final: prev: vim-themis = buildVimPlugin { pname = "vim-themis"; - version = "2024-03-02"; + version = "2024-04-06"; src = fetchFromGitHub { owner = "thinca"; repo = "vim-themis"; - rev = "5c8df1b5fa495ece990df5596d8e7fa1be2c2355"; - sha256 = "14v75zl5dgxi9pyv8vm79gd578mnq0mw4c947v8f2zhlc4xbda04"; + rev = "c1f4d465ce7dd23735513551b5c4c918d9c1bab1"; + sha256 = "1vzwjpn3jr3ayal2pjr2qb36mal2pa8szbf83nqzb2awa1lv1ds1"; }; meta.homepage = "https://github.com/thinca/vim-themis/"; }; @@ -15869,12 +15881,12 @@ final: prev: vim-tmux-navigator = buildVimPlugin { pname = "vim-tmux-navigator"; - version = "2023-12-23"; + version = "2024-04-13"; src = fetchFromGitHub { owner = "christoomey"; repo = "vim-tmux-navigator"; - rev = "38b1d0402c4600543281dc85b3f51884205674b6"; - sha256 = "0wj7627bvzw2rjb97b3ddkqx966f4xjlw80lmna6kxi0vvx5hsp1"; + rev = "a26954a585b02a2ac02f87145e204f8798a7cbc2"; + sha256 = "01nqxcsn2w24w33d0c4k2w5xyxb0xxvwn7a3pxlzv4i1k36nyaz9"; }; meta.homepage = "https://github.com/christoomey/vim-tmux-navigator/"; }; @@ -15905,12 +15917,12 @@ final: prev: vim-tpipeline = buildVimPlugin { pname = "vim-tpipeline"; - version = "2024-02-18"; + version = "2024-04-12"; src = fetchFromGitHub { owner = "vimpostor"; repo = "vim-tpipeline"; - rev = "649f079a0bee19565978b82b672d831c6641d952"; - sha256 = "16lyavpy8qh06l03jqs7klyja3nqs3ynjfy7y8xjmlqa4mgfcffn"; + rev = "5dd3832bd6e239feccb11cadca583cdcf9d5bda1"; + sha256 = "14f4fjjjjml3rbh99385xzkkcfqa7awa9bjc191qvvvycqipp0hw"; }; meta.homepage = "https://github.com/vimpostor/vim-tpipeline/"; }; @@ -16145,12 +16157,12 @@ final: prev: vim-wakatime = buildVimPlugin { pname = "vim-wakatime"; - version = "2024-03-15"; + version = "2024-04-11"; src = fetchFromGitHub { owner = "wakatime"; repo = "vim-wakatime"; - rev = "56b4d073adaf18c04c7bb5728d41c03b2f25754d"; - sha256 = "1qcx81hgamz4v7nxhbx0kbwsx2qm0b7rsgpja16imhycvlaf28n1"; + rev = "5d11a253dd1ecabd4612a885175216032d814300"; + sha256 = "1kx5xid8sybwc7fmmcn6j36r8n0m3g0529q5p0mywfn337m8q3np"; }; meta.homepage = "https://github.com/wakatime/vim-wakatime/"; }; @@ -16470,12 +16482,12 @@ final: prev: vimtex = buildVimPlugin { pname = "vimtex"; - version = "2024-03-31"; + version = "2024-04-20"; src = fetchFromGitHub { owner = "lervag"; repo = "vimtex"; - rev = "ac0a41b297a70c101df89bc9c8d43341ba00fd4f"; - sha256 = "1lnakgdi5gp46v0bqivlvmjqqcagvz78h5327p4k9fxccz3gcf58"; + rev = "268dd8d311adebb121fa0a4b31cdabcb98072403"; + sha256 = "1nd6yafqvdx0h7mad3pwfp3fxs8kssjyd758q3f99612fhl63c61"; }; meta.homepage = "https://github.com/lervag/vimtex/"; }; @@ -16554,24 +16566,24 @@ final: prev: vista-vim = buildVimPlugin { pname = "vista.vim"; - version = "2024-02-21"; + version = "2024-04-06"; src = fetchFromGitHub { owner = "liuchengxu"; repo = "vista.vim"; - rev = "f76cecc430003968e6174cae899c2cb2953219b7"; - sha256 = "0hq41f91f97885vx1rcl981vhwariiwbz2hs0dzryka2ycy5lvy4"; + rev = "04fa99afe865b16324af94fd8a8391121117d8f7"; + sha256 = "0gjma1ba0ds0dznhqdajmhib1i49b08iv7hf0c4vjz833kcjagqj"; }; meta.homepage = "https://github.com/liuchengxu/vista.vim/"; }; vscode-nvim = buildVimPlugin { pname = "vscode.nvim"; - version = "2024-03-24"; + version = "2024-04-20"; src = fetchFromGitHub { owner = "Mofiqul"; repo = "vscode.nvim"; - rev = "4fe3e696a90f183d4dbbb432ddb79155c6d4c99b"; - sha256 = "1dxabfrdwm5c8dnpjzgxmb9bnajnk3d4jhg5m1mvkw9vlyjvq8xg"; + rev = "d47aab1fbe423bf14275745684205dca08366277"; + sha256 = "0g4dh47rasd5973mjv8cpsd1c6bf5c1bv7pc05sbjkb8vck2lsl5"; }; meta.homepage = "https://github.com/Mofiqul/vscode.nvim/"; }; @@ -16650,12 +16662,12 @@ final: prev: wiki-vim = buildVimPlugin { pname = "wiki.vim"; - version = "2024-04-02"; + version = "2024-04-18"; src = fetchFromGitHub { owner = "lervag"; repo = "wiki.vim"; - rev = "34c82a61963988bdf9db3ff426ff313d419f2061"; - sha256 = "0qazdn1y0j3pb9qm3f9ydasgkcvishz2km0aw19n1fqyylal0fps"; + rev = "0035cd000cb2a5c60ea67c176ce795852ea04448"; + sha256 = "0xzxscvaflappikhi7l0v6i92cls6jp1y8fq2pfai9rnsyizvh7p"; }; meta.homepage = "https://github.com/lervag/wiki.vim/"; }; @@ -16758,12 +16770,12 @@ final: prev: wrapping-nvim = buildVimPlugin { pname = "wrapping.nvim"; - version = "2024-02-25"; + version = "2024-04-07"; src = fetchFromGitHub { owner = "andrewferrier"; repo = "wrapping.nvim"; - rev = "2b74a9fa326ad42e2a509f9e49543471d2d7c1ea"; - sha256 = "1v66hgmv05w5yz9bg4h5s00j1iz41pc09prm45xdbds6kx02rg2d"; + rev = "d1ac69c0db82ff0c7540088a0f91d74ad7378c3d"; + sha256 = "0cmvgmynr3jkp9ikygrn773f3j8n6580ajvv29p8lzg6h5pvafdc"; }; meta.homepage = "https://github.com/andrewferrier/wrapping.nvim/"; }; @@ -16951,12 +16963,12 @@ final: prev: zk-nvim = buildVimPlugin { pname = "zk-nvim"; - version = "2024-01-05"; + version = "2024-04-14"; src = fetchFromGitHub { owner = "zk-org"; repo = "zk-nvim"; - rev = "fb0962b75a680561f94cae0588b8da92ea8d2fae"; - sha256 = "0xbxkm6inxi09fb0zj4zrbfi8iyhcjn6lfrwqvmym8fnvi5pmz4c"; + rev = "e2b6d62b18a88249016bf917d4e5bb0e417ac974"; + sha256 = "16mmrl34f1bsr1dfl1drg62wwycc23n9w0qczmqz7ylpgb6k8i02"; }; meta.homepage = "https://github.com/zk-org/zk-nvim/"; }; @@ -16987,12 +16999,12 @@ final: prev: catppuccin-nvim = buildVimPlugin { pname = "catppuccin-nvim"; - version = "2024-03-29"; + version = "2024-04-14"; src = fetchFromGitHub { owner = "catppuccin"; repo = "nvim"; - rev = "aebe43db9cb26e1c70fc5b2fd4158169c405e720"; - sha256 = "0921cvaa0hkm47vcih1vjsqabzgnpqj1qvg2hnlrv3shr49z220r"; + rev = "a1439ad7c584efb3d0ce14ccb835967f030450fe"; + sha256 = "1ngjll0khnx1nighazw64kvfdl139z8xhv0hh2r4bb40ynxnhdf9"; }; meta.homepage = "https://github.com/catppuccin/nvim/"; }; @@ -17011,12 +17023,12 @@ final: prev: dracula-vim = buildVimPlugin { pname = "dracula-vim"; - version = "2024-02-23"; + version = "2024-04-14"; src = fetchFromGitHub { owner = "dracula"; repo = "vim"; - rev = "9fa89296884e47bbadc49ad959e37b9d1c24cafb"; - sha256 = "0911akib9ys9vyxnalbmyip7m1ahpnsn89km2hrgj0fc9s5m75ky"; + rev = "28874a1e9d583eb0b1dfebb9191445b822812ea3"; + sha256 = "1answqiln7pg1f0cpgknjrnnzk4cslhn19vnv2hvji9xm45lvvbv"; }; meta.homepage = "https://github.com/dracula/vim/"; }; @@ -17059,12 +17071,12 @@ final: prev: harpoon2 = buildVimPlugin { pname = "harpoon2"; - version = "2024-04-02"; + version = "2024-04-09"; src = fetchFromGitHub { owner = "ThePrimeagen"; repo = "harpoon"; - rev = "4ad05be8fe98092f0dec3bc3b47abebb59c3814a"; - sha256 = "0ssnlid3bd6qnar1xlg2kkmlgfdabrnkwqhvvw02nr9ms901d9sh"; + rev = "0378a6c428a0bed6a2781d459d7943843f374bce"; + sha256 = "129d51cp89dir809yakiw0b7kkjqww7s5h437j8ppn1lq7ghg50m"; }; meta.homepage = "https://github.com/ThePrimeagen/harpoon/"; }; @@ -17083,12 +17095,12 @@ final: prev: nightfly = buildVimPlugin { pname = "nightfly"; - version = "2024-03-28"; + version = "2024-04-20"; src = fetchFromGitHub { owner = "bluz71"; repo = "vim-nightfly-colors"; - rev = "06cd078edc8d92ded2d37270649bd8ed23dec43d"; - sha256 = "1axw4m4xw6nqbiabs7cbd8davgpgbxvyxjn73n21zh9bvjdmm90x"; + rev = "a54ba6131c4e5feb47176efb78b1f93501df1572"; + sha256 = "1ajnyr7lwhmpjzdwni0hzgd46x64kgdgb3x0qjmvw2q456vs1fap"; }; meta.homepage = "https://github.com/bluz71/vim-nightfly-colors/"; }; @@ -17107,12 +17119,12 @@ final: prev: nvchad-ui = buildVimPlugin { pname = "nvchad-ui"; - version = "2024-04-03"; + version = "2024-04-19"; src = fetchFromGitHub { owner = "nvchad"; repo = "ui"; - rev = "e1af69426b3c4b55c88bd1c81790c1c73b30bfa8"; - sha256 = "1rmfjmwm5zckvdyk2pdpi2zgzql9rvy0b2rpsm8z56g98skh3nma"; + rev = "6512f7d1faa4fd86c53e9c5c8492b4bdda692613"; + sha256 = "165yndfj0m3wib17wa15fswsfwixm1bxalprpbdwvyzd2f9p1fd0"; }; meta.homepage = "https://github.com/nvchad/ui/"; }; @@ -17155,12 +17167,12 @@ final: prev: rose-pine = buildVimPlugin { pname = "rose-pine"; - version = "2024-03-30"; + version = "2024-04-18"; src = fetchFromGitHub { owner = "rose-pine"; repo = "neovim"; - rev = "19055dfe90bfa46a1e5b0a706d13980bdffa2dee"; - sha256 = "0h3l8dnzqvbq43zhbgm2p741ivk3zks5qi6azyg0qmjx469h4mhr"; + rev = "17b466e79479758b332a3cac12544a3ad2be6241"; + sha256 = "1fwwp7szzz2yp4z5hngqn8ll8765xv0nlhgcb75yj257kz7x5lq1"; }; meta.homepage = "https://github.com/rose-pine/neovim/"; }; @@ -17213,17 +17225,5 @@ final: prev: meta.homepage = "https://github.com/jhradilek/vim-snippets/"; }; - gitignore-nvim = buildVimPlugin { - pname = "gitignore-nvim"; - version = "2024-03-25"; - src = fetchFromGitHub { - owner = "wintermute-cell"; - repo = "gitignore.nvim"; - rev = "2455191ec94da8ed222806a4fe3aa358eac1e558"; - sha256 = "sha256-p6k0NP3Vne6Kl98YodzSruVmJwxyrXziJj8N7u79o1w="; - }; - meta.homepage = "https://github.com/wintermute-cell/gitignore.nvim/"; - }; - } diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix index 381c9e4a80d8..58524a92d1a7 100644 --- a/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/overrides.nix @@ -321,12 +321,12 @@ codeium-nvim = let # Update according to https://github.com/Exafunction/codeium.nvim/blob/main/lua/codeium/versions.json - codeiumVersion = "1.6.7"; + codeiumVersion = "1.8.25"; codeiumHashes = { - x86_64-linux = "sha256-z1cZ6xmP25iPezeLpz4xRh7czgx1JLwsYwGAEUA6//I="; - aarch64-linux = "sha256-8cSdCiIVbqv91lUMOLV1Xld8KuIzJA5HCIDbhyyc404="; - x86_64-darwin = "sha256-pjW7tNyO0cIFdIm69H6I3HDBpFwnJIRmIN7WRi1OfLw="; - aarch64-darwin = "sha256-DgE4EVNCM9+YdTVJeVYnrDGAXOJV1VrepiVeX3ziwfg="; + x86_64-linux = "sha256-6sIYDI6+1/p54Af+E/GmRAFlfDYJVwxhn0qF47ZH+Zg="; + aarch64-linux = "sha256-1ImcjAqCZm5KZZYHWhG1eO7ipAdrP4Qjj2eBxTst++s="; + x86_64-darwin = "sha256-yHthItxZYFejJlwJJ7BrM2csnLsZXjy/IbzF1iaCCyI="; + aarch64-darwin = "sha256-GIx0yABISj/rH/yVkkx6NBs5qF0P8nhpMyvnzXJ92mA="; }; codeium' = codeium.overrideAttrs rec { @@ -1038,7 +1038,7 @@ inherit (old) version src; sourceRoot = "${old.src.name}/spectre_oxi"; - cargoHash = "sha256-tWJyVBYYQWr3ofYnbvfQZdzPQ9o//7XEbdjN5b2frPo="; + cargoHash = "sha256-UxOAIyVlJWlp5RUFVU3Ib539D5pm6Z+3edjHLerkIRU="; preCheck = '' diff --git a/pkgs/applications/editors/vim/plugins/patches/openscad.nvim/program_paths.patch b/pkgs/applications/editors/vim/plugins/patches/openscad.nvim/program_paths.patch index 82d73809ff79..c3b1368577f3 100644 --- a/pkgs/applications/editors/vim/plugins/patches/openscad.nvim/program_paths.patch +++ b/pkgs/applications/editors/vim/plugins/patches/openscad.nvim/program_paths.patch @@ -21,7 +21,7 @@ index d6d4b4c..9853877 100644 else call v:lua.vim.health.ok("htop is installed") diff --git a/lua/openscad.lua b/lua/openscad.lua -index 7475f29..832c895 100644 +index 0a26d08..1264989 100644 --- a/lua/openscad.lua +++ b/lua/openscad.lua @@ -101,7 +101,7 @@ end @@ -33,12 +33,12 @@ index 7475f29..832c895 100644 end function M.help() -@@ -125,7 +125,7 @@ function M.exec_openscad() - jobCommand = '/Applications/OpenSCAD.app/Contents/MacOS/OpenSCAD ' .. vim.fn.expand('%:p') +@@ -126,7 +126,7 @@ function M.exec_openscad() + jobCommand = '/Applications/OpenSCAD.app/Contents/MacOS/OpenSCAD ' .. filename else -- TODO: What about Windows? -- jobCommand = 'openscad ' .. vim.fn.expand('%:p') -+ jobCommand = '@openscad@ ' .. vim.fn.expand('%:p') +- jobCommand = 'openscad ' .. filename ++ jobCommand = '@openscad@ ' .. filename end vim.fn.jobstart(jobCommand) From f713f3c4427a023920b63be7a13ddc5298005b51 Mon Sep 17 00:00:00 2001 From: "\"Gaetan Lepage\"" <"gaetan@glepage.com"> Date: Fri, 19 Apr 2024 08:47:34 +0200 Subject: [PATCH 64/97] vimPlugins: resolve github repository redirects --- pkgs/applications/editors/vim/plugins/deprecated.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/editors/vim/plugins/deprecated.json b/pkgs/applications/editors/vim/plugins/deprecated.json index d855a3d2cd4b..e73899e66fea 100644 --- a/pkgs/applications/editors/vim/plugins/deprecated.json +++ b/pkgs/applications/editors/vim/plugins/deprecated.json @@ -48,7 +48,7 @@ "new": "sqlite-lua" }, "vim-fsharp": { - "date": "2024-04-03", + "date": "2024-04-21", "new": "zarchive-vim-fsharp" }, "vim-jade": { From b08a1a4dd992066ec4df8ed8f4f9050603016b22 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Fri, 19 Apr 2024 08:48:16 +0200 Subject: [PATCH 65/97] vimPlugins.nvim-treesitter: update grammars --- .../vim/plugins/nvim-treesitter/generated.nix | 508 +++++++++--------- 1 file changed, 264 insertions(+), 244 deletions(-) diff --git a/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix b/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix index 8c1224cbe4c9..42c846ee5ebc 100644 --- a/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix +++ b/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix @@ -27,12 +27,12 @@ }; angular = buildGrammar { language = "angular"; - version = "0.0.0+rev=62179d7"; + version = "0.0.0+rev=b7a7167"; src = fetchFromGitHub { owner = "dlvandenberg"; repo = "tree-sitter-angular"; - rev = "62179d7bbfb5fd8a8f7298495ac654d252a1bd52"; - hash = "sha256-qRsBeJ01kGTKJqFubG1u9SFa1nsDH7ZHKQ0cGwfqi84="; + rev = "b7a7167762e3863b3d6247c708b7f9bca1ca7bea"; + hash = "sha256-GXjjRcB0ml9MMYuJUWAlORWrOUsRxrwZ6kmg0fp3kNQ="; }; meta.homepage = "https://github.com/dlvandenberg/tree-sitter-angular"; }; @@ -50,34 +50,34 @@ }; arduino = buildGrammar { language = "arduino"; - version = "0.0.0+rev=e3d0dea"; + version = "0.0.0+rev=4ddf79e"; src = fetchFromGitHub { owner = "ObserverOfTime"; repo = "tree-sitter-arduino"; - rev = "e3d0dea39dbb8032e754bafe5aec3ed5a234d986"; - hash = "sha256-cBuFIHUZQGkj1C3S6W+yPPuICxL1cCZVoSVvMOqjDAY="; + rev = "4ddf79edaa87170ec12bd6a8d03a8ac528fe0ae7"; + hash = "sha256-DbxzbbmKq0GxbKIKtoygEhbdYeEwp23Nkk15WI2AQW4="; }; meta.homepage = "https://github.com/ObserverOfTime/tree-sitter-arduino"; }; asm = buildGrammar { language = "asm"; - version = "0.0.0+rev=62e4932"; + version = "0.0.0+rev=afdc3d5"; src = fetchFromGitHub { owner = "RubixDev"; repo = "tree-sitter-asm"; - rev = "62e49328113ff318128c640bf0cf6dd3d3d51553"; - hash = "sha256-FwbHDaUqIVKYIAOCF9kv30aV2JX/tEmGUsWXFKQ6Uro="; + rev = "afdc3d5da18d42cbb471c0f40527dbed9cace7ad"; + hash = "sha256-YYzJMGmizeqZxBF2YXYPLjAo54Y60z7RFhLcmOJbeGY="; }; meta.homepage = "https://github.com/RubixDev/tree-sitter-asm"; }; astro = buildGrammar { language = "astro"; - version = "0.0.0+rev=dfa0893"; + version = "0.0.0+rev=b422ccd"; src = fetchFromGitHub { owner = "virchau13"; repo = "tree-sitter-astro"; - rev = "dfa0893bdc4bdfada102043404758c66e3580568"; - hash = "sha256-gToRdyLvvDaeE1b9fYRVPFt1mtdR9kSYzqFBDUYpv3k="; + rev = "b422ccd41f0b433260a3d28df7e39fa2ff63ef9c"; + hash = "sha256-FrXd4dR28GP1CAP+SaGSRO8TImok9MjVw2vWyZgUijQ="; }; meta.homepage = "https://github.com/virchau13/tree-sitter-astro"; }; @@ -105,12 +105,12 @@ }; bash = buildGrammar { language = "bash"; - version = "0.0.0+rev=f3f26f4"; + version = "0.0.0+rev=f8fb327"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-bash"; - rev = "f3f26f47a126797c011c311cec9d449d855c3eab"; - hash = "sha256-6Rfxh8Y6dg2wyQ9jYnbOaXm1SVfQDQ1B1tNqgpz6sY4="; + rev = "f8fb3274f72a30896075585b32b0c54cad65c086"; + hash = "sha256-sj1qYb42k0hXXcNCKg1hINYD11wDcVpnoPhZNtlYT6k="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-bash"; }; @@ -149,12 +149,12 @@ }; bicep = buildGrammar { language = "bicep"; - version = "0.0.0+rev=c3451d1"; + version = "0.0.0+rev=0092c7d"; src = fetchFromGitHub { owner = "amaanq"; repo = "tree-sitter-bicep"; - rev = "c3451d1049c80074b18078ba50007b7c00e063f8"; - hash = "sha256-81Pt/Yyc/r8RDBCaGcXx9giIJ9+smi9Xus43NGOePgM="; + rev = "0092c7d1bd6bb22ce0a6f78497d50ea2b87f19c0"; + hash = "sha256-jj1ccJQOX8oBx1XVKzI53B1sveq5kNADc2DB8bJhsf4="; }; meta.homepage = "https://github.com/amaanq/tree-sitter-bicep"; }; @@ -182,23 +182,23 @@ }; c = buildGrammar { language = "c"; - version = "0.0.0+rev=72084f4"; + version = "0.0.0+rev=1aafaff"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-c"; - rev = "72084f447c2051e01a7cd6c6e0477ec71a9297ed"; - hash = "sha256-M0OWcUS+7G/S8S6iqlHXXcWfwqQLjshZpWniFzf3hvo="; + rev = "1aafaff4d26dac5a36dd3495be33e1c20161d761"; + hash = "sha256-eix/BqsZzrJc+h1sHiG/IDtdyZvIsEdox71sPMNXs58="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-c"; }; c_sharp = buildGrammar { language = "c_sharp"; - version = "0.0.0+rev=92c0a94"; + version = "0.0.0+rev=9de5652"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-c-sharp"; - rev = "92c0a9431400cd8b6b6ee7503f81da3ae83fc830"; - hash = "sha256-8ffTbsAOjGZi1Bcf2mOGjTLbzwVI8K1RAYrUbhj/j94="; + rev = "9de565257ada70ac441c640e3b5d6850e2df5ab8"; + hash = "sha256-QNI2V1CG1DdkMIzR+NUcM/IjtQHnJcYn9Nk3sUmkINE="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-c-sharp"; }; @@ -215,12 +215,12 @@ }; capnp = buildGrammar { language = "capnp"; - version = "0.0.0+rev=dc28c9f"; + version = "0.0.0+rev=7b0883c"; src = fetchFromGitHub { owner = "amaanq"; repo = "tree-sitter-capnp"; - rev = "dc28c9f4212809eab74d10996086297853eb34e5"; - hash = "sha256-4GcOBC5JJsfbdsIrQd33tSW2sz6ytjYGqWgFVFLH6sc="; + rev = "7b0883c03e5edd34ef7bcf703194204299d7099f"; + hash = "sha256-WKrZuOMxmdGlvUI9y8JgwCNMdJ8MULucMhkmW8JCiXM="; }; meta.homepage = "https://github.com/amaanq/tree-sitter-capnp"; }; @@ -270,12 +270,12 @@ }; commonlisp = buildGrammar { language = "commonlisp"; - version = "0.0.0+rev=a2a6749"; + version = "0.0.0+rev=83ae738"; src = fetchFromGitHub { owner = "theHamsta"; repo = "tree-sitter-commonlisp"; - rev = "a2a67494c223ccf8aa419ac419d9cdf483dbb8ca"; - hash = "sha256-6rzHgzXWZW5psOsBxW9ygRIPHc/I3wX40EDDM/nc3Qk="; + rev = "83ae738bed7e914cee9090c3fe4c80a32ab45905"; + hash = "sha256-0qWcrn65vtOYz54NVi/sj+GqnGMztEpZJsl9sjbF5sw="; }; meta.homepage = "https://github.com/theHamsta/tree-sitter-commonlisp"; }; @@ -303,23 +303,23 @@ }; cpon = buildGrammar { language = "cpon"; - version = "0.0.0+rev=f4b3cbc"; + version = "0.0.0+rev=594289e"; src = fetchFromGitHub { owner = "amaanq"; repo = "tree-sitter-cpon"; - rev = "f4b3cbc8b0bd4e13035d39940fef09f1392e8739"; - hash = "sha256-Enxc0sdQS9vSZVvIQkkHxk/1bzT2denRk0+AZdDNnJ8="; + rev = "594289eadfec719198e560f9d7fd243c4db678d5"; + hash = "sha256-Nr+98yrDkOS5Yh/EFmBWV9Yhv2tPfHGb4pPlLUwc+k8="; }; meta.homepage = "https://github.com/amaanq/tree-sitter-cpon"; }; cpp = buildGrammar { language = "cpp"; - version = "0.0.0+rev=e0c1678"; + version = "0.0.0+rev=72fd001"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-cpp"; - rev = "e0c1678a78731e78655b7d953efb4daecf58be46"; - hash = "sha256-CdNCVDMAmeJrHgPb2JLxFHj/tHnUYC8flmxj+UaVXTo="; + rev = "72fd00128f1c38319670cbf4bcedbba0dc849d96"; + hash = "sha256-COlDbMi3kKb1YAjJthBO5TmLOWs1dH4VAGNYgh8iSmE="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-cpp"; }; @@ -348,12 +348,12 @@ }; cuda = buildGrammar { language = "cuda"; - version = "0.0.0+rev=4ec5afd"; + version = "0.0.0+rev=50a28f4"; src = fetchFromGitHub { owner = "theHamsta"; repo = "tree-sitter-cuda"; - rev = "4ec5afdf98041d137c25b555958a1f825c7c1272"; - hash = "sha256-EA37LJeRHBFBra17UwiUASQYTRBuGKE9HNyUrn8HBNk="; + rev = "50a28f4600c559e3d19a1825e854dfe6dcac1d49"; + hash = "sha256-xVf9sD5CbXDn1Kw9vkgKd+hWmerQgHf7ntUtynRXpBo="; }; meta.homepage = "https://github.com/theHamsta/tree-sitter-cuda"; }; @@ -381,12 +381,12 @@ }; dart = buildGrammar { language = "dart"; - version = "0.0.0+rev=7861a48"; + version = "0.0.0+rev=6da4647"; src = fetchFromGitHub { owner = "UserNobody14"; repo = "tree-sitter-dart"; - rev = "7861a4889e7682af453afa4811ae85b1d7a6e415"; - hash = "sha256-zJngHDZVmQtliHpgqYpLpLvSHQYwOXDDIw/U0/CBxF0="; + rev = "6da46473ab8accb13da48113f4634e729a71d335"; + hash = "sha256-AT7DuOq4mZZxizB2a5UsPGSIP11Jn88O7bJeJIEmv8s="; }; meta.homepage = "https://github.com/UserNobody14/tree-sitter-dart"; }; @@ -414,12 +414,12 @@ }; diff = buildGrammar { language = "diff"; - version = "0.0.0+rev=c165725"; + version = "0.0.0+rev=710e881"; src = fetchFromGitHub { owner = "the-mikedavis"; repo = "tree-sitter-diff"; - rev = "c165725c28e69b36c5799ff0e458713a844f1aaf"; - hash = "sha256-qou5ow/Am/qyO0I1j74ojgnBonwmJriLCCeSNpTk7t8="; + rev = "710e881127512bda8157096e26c1f3e91702823a"; + hash = "sha256-BdRWI/7LiUS8z5LehaQgPVcdOPcEOJSmNHowtukHAQw="; }; meta.homepage = "https://github.com/the-mikedavis/tree-sitter-diff"; }; @@ -447,12 +447,12 @@ }; dockerfile = buildGrammar { language = "dockerfile"; - version = "0.0.0+rev=33e22c3"; + version = "0.0.0+rev=439c3e7"; src = fetchFromGitHub { owner = "camdencheek"; repo = "tree-sitter-dockerfile"; - rev = "33e22c33bcdbfc33d42806ee84cfd0b1248cc392"; - hash = "sha256-uCKzTTbJL9Ans3lCQbt2zApF+ERLbbu5D1WcyWJ6Gf4="; + rev = "439c3e7b8a9bfdbf1f7d7c2beaae4173dc484cbf"; + hash = "sha256-sW3fCCAXNak4JszEPgspZFfOHtUlqnW3eRxzHNfzInk="; }; meta.homepage = "https://github.com/camdencheek/tree-sitter-dockerfile"; }; @@ -480,16 +480,27 @@ }; dtd = buildGrammar { language = "dtd"; - version = "0.0.0+rev=2282ad5"; + version = "0.0.0+rev=96beba9"; src = fetchFromGitHub { owner = "tree-sitter-grammars"; repo = "tree-sitter-xml"; - rev = "2282ad5cb8e815523e70d5c82404620bd9a1494c"; - hash = "sha256-CZAVJdT01wXyaDnPxXz6ZhiiDxuvwKCWPGjaWe6FpWk="; + rev = "96beba9f3e4156aaae64bb86997503b1ceb1283d"; + hash = "sha256-XmSU9Om1bj/PtBxr22Sf81Mx68QINtK8Gls1fRldt6Q="; }; location = "dtd"; meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-xml"; }; + earthfile = buildGrammar { + language = "earthfile"; + version = "0.0.0+rev=7d5cc9e"; + src = fetchFromGitHub { + owner = "glehmann"; + repo = "tree-sitter-earthfile"; + rev = "7d5cc9e27e3e340c8b521d11c8da84047494fe30"; + hash = "sha256-0rjD8SJGot/KAsLVW98e7X2tbNPntScRk/oEsS1wmAg="; + }; + meta.homepage = "https://github.com/glehmann/tree-sitter-earthfile"; + }; ebnf = buildGrammar { language = "ebnf"; version = "0.0.0+rev=8e635b0"; @@ -526,12 +537,12 @@ }; elixir = buildGrammar { language = "elixir"; - version = "0.0.0+rev=868620e"; + version = "0.0.0+rev=de690fa"; src = fetchFromGitHub { owner = "elixir-lang"; repo = "tree-sitter-elixir"; - rev = "868620e19f070a5e6b0b685dc6069a611a86259a"; - hash = "sha256-r+G0321T1+RwaqcJ+E/gfzm1iSLCIVGPdus7XZFK9So="; + rev = "de690fa8a028f122af46d9d2685679fe5f2d7d60"; + hash = "sha256-bvbOWF+Fy3IhOPhkW6pB/3LcLXnPzqVQb8GOCCQWzw0="; }; meta.homepage = "https://github.com/elixir-lang/tree-sitter-elixir"; }; @@ -636,12 +647,12 @@ }; firrtl = buildGrammar { language = "firrtl"; - version = "0.0.0+rev=2b5adae"; + version = "0.0.0+rev=8503d3a"; src = fetchFromGitHub { owner = "amaanq"; repo = "tree-sitter-firrtl"; - rev = "2b5adae629c8cba528c7b1e4aa67a8ae28934ea5"; - hash = "sha256-If34GymYMJpSNtzSGpcq4dMxj8djKZ3B5uMHGx9uCnM="; + rev = "8503d3a0fe0f9e427863cb0055699ff2d29ae5f5"; + hash = "sha256-I2EMcm6bTMRODmxOOOiv+U0fhm6yoNhjCyuINfTUtlY="; }; meta.homepage = "https://github.com/amaanq/tree-sitter-firrtl"; }; @@ -779,12 +790,12 @@ }; gitcommit = buildGrammar { language = "gitcommit"; - version = "0.0.0+rev=a427a79"; + version = "0.0.0+rev=edd817e"; src = fetchFromGitHub { owner = "gbprod"; repo = "tree-sitter-gitcommit"; - rev = "a427a79653b6829aa5b663b5b9a6b39e954858b7"; - hash = "sha256-vnuSzMQeBow5A37VOmpAWUgHehVpetjJwos44mdEmP8="; + rev = "edd817e0532f179b7f7f371dc180629070945f0c"; + hash = "sha256-iipzgO8vJJpxhf/ZJh6tsfRa54C6g9rAN9TVdycKiqc="; }; meta.homepage = "https://github.com/gbprod/tree-sitter-gitcommit"; }; @@ -823,12 +834,12 @@ }; glsl = buildGrammar { language = "glsl"; - version = "0.0.0+rev=f704096"; + version = "0.0.0+rev=e7817c9"; src = fetchFromGitHub { owner = "theHamsta"; repo = "tree-sitter-glsl"; - rev = "f7040966a97c6c5a644a230df7fe74623f963d2f"; - hash = "sha256-HwaN4T3dpcMpR2Nch3gMh9QGhBThd4RxdW7o5KTzRtI="; + rev = "e7817c982e0e921c5ee89a1e0283121bb5cc5e01"; + hash = "sha256-pkbvD+VQUtR6GiY4RP6J6tB2Cl2UyqjB7t/HE0dLr78="; }; meta.homepage = "https://github.com/theHamsta/tree-sitter-glsl"; }; @@ -856,12 +867,12 @@ }; go = buildGrammar { language = "go"; - version = "0.0.0+rev=fd577c4"; + version = "0.0.0+rev=eb68645"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-go"; - rev = "fd577c4358c28cbcb6748bbf65354cc85f1cf7a4"; - hash = "sha256-Fz9xSyjJLbNXAXbYMoVDsRqyRrLTWHAxnQBV9EF6n78="; + rev = "eb68645662a3f7bf7fdd4bcb9531585f54c8570e"; + hash = "sha256-RZx8M3QGX/+kfjbEB0+f2jeDZhGF+XGXwtb5oltxHrI="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-go"; }; @@ -944,23 +955,23 @@ }; groovy = buildGrammar { language = "groovy"; - version = "0.0.0+rev=b398a5a"; + version = "0.0.0+rev=6c5c881"; src = fetchFromGitHub { owner = "murtaza64"; repo = "tree-sitter-groovy"; - rev = "b398a5a243c67f0b4d54728c983fa586bd5cd52e"; - hash = "sha256-5PA3of/pD8YDXyV+taKha/zKphpH4EDHRj40YA7aL9c="; + rev = "6c5c8813233fe326e24c5ef032858d13f8006a8d"; + hash = "sha256-NursRJ7DBmlbA7EOzC+WwoxDkjMUZYANcdX48DyjEIY="; }; meta.homepage = "https://github.com/murtaza64/tree-sitter-groovy"; }; gstlaunch = buildGrammar { language = "gstlaunch"; - version = "0.0.0+rev=2c0d9c9"; + version = "0.0.0+rev=549aef2"; src = fetchFromGitHub { owner = "theHamsta"; repo = "tree-sitter-gstlaunch"; - rev = "2c0d9c94d35e37aa63fa5002163c8480985b3e5b"; - hash = "sha256-H5H1v4xJSPHW0oaTY/JczhfVmYExbrdfdugYkMJktPY="; + rev = "549aef253fd38a53995cda1bf55c501174372bf7"; + hash = "sha256-zNUx/9dxEqyqTXCxEiNnYPzplnR7l9b2L4frYpPOA9M="; }; meta.homepage = "https://github.com/theHamsta/tree-sitter-gstlaunch"; }; @@ -977,12 +988,12 @@ }; hare = buildGrammar { language = "hare"; - version = "0.0.0+rev=3d4af17"; + version = "0.0.0+rev=0705249"; src = fetchFromGitHub { owner = "amaanq"; repo = "tree-sitter-hare"; - rev = "3d4af179414525a35dd069ba0208c9b71093d8b3"; - hash = "sha256-RRi2uAE9rf0bjQrk8Asf6z+6ZDZYhEoKaX0m8hZnI9o="; + rev = "070524937539eb8bb4f10debd9c83b66c434f3a2"; + hash = "sha256-NUvbkMYA1nZmS84vLNguto/Fo7wdrDmRCBnveR88ry0="; }; meta.homepage = "https://github.com/amaanq/tree-sitter-hare"; }; @@ -1055,23 +1066,23 @@ }; hlsl = buildGrammar { language = "hlsl"; - version = "0.0.0+rev=ef428a3"; + version = "0.0.0+rev=d200375"; src = fetchFromGitHub { owner = "theHamsta"; repo = "tree-sitter-hlsl"; - rev = "ef428a36b2faa20450ee979a618f802228b38318"; - hash = "sha256-/G5c7Fr7Z23FR7n5oh90QHObicDjx8Ppslp8T6sr1wg="; + rev = "d200375a29b24764b78d7051df0024ed7c2f1ab0"; + hash = "sha256-HCbH8Lyi2ziaUTxhgVPQ4hyOZhRxNFW66gAkoFT/Ubg="; }; meta.homepage = "https://github.com/theHamsta/tree-sitter-hlsl"; }; hlsplaylist = buildGrammar { language = "hlsplaylist"; - version = "0.0.0+rev=5305c06"; + version = "0.0.0+rev=3e65f65"; src = fetchFromGitHub { owner = "Freed-Wu"; repo = "tree-sitter-hlsplaylist"; - rev = "5305c061efce2841942dbbac6f9a5b21e3e4eb35"; - hash = "sha256-XNqkyFLqZTo5mPqbtLM8gq178fkB1YhQkjfp6bcKpcM="; + rev = "3e65f652b9dea8d38f9a44b5b0898a51c9247eb8"; + hash = "sha256-IGfKnEG1b9TSPBjxb+NjgweyKp7HUyZCe2gR/xnV5CY="; }; meta.homepage = "https://github.com/Freed-Wu/tree-sitter-hlsplaylist"; }; @@ -1121,12 +1132,12 @@ }; http = buildGrammar { language = "http"; - version = "0.0.0+rev=86ad05a"; + version = "0.0.0+rev=8d22f33"; src = fetchFromGitHub { owner = "rest-nvim"; repo = "tree-sitter-http"; - rev = "86ad05ac2de3c63c69f65e58f0182a76c1658d1e"; - hash = "sha256-7iUNDri5SB9RygMcAGUo78Cbtm11fM8Wvn+KwjKC0M4="; + rev = "8d22f33faa5aa95c6526606fb656ada342e59e40"; + hash = "sha256-L+9cDLTmisZmdBXocK8u7fkJIlaZId9qeQxVWwFkdJg="; }; meta.homepage = "https://github.com/rest-nvim/tree-sitter-http"; }; @@ -1187,23 +1198,23 @@ }; java = buildGrammar { language = "java"; - version = "0.0.0+rev=2aae502"; + version = "0.0.0+rev=953abfc"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-java"; - rev = "2aae502017d3aed587ba85e3c7e0cbc138f3e07a"; - hash = "sha256-UzMpDQtvbu05iu0kL/qkPaxnAOQKLJlzqWYeUurGSqo="; + rev = "953abfc8bb3eb2f578e1f461edba4a9885f974b8"; + hash = "sha256-COrEPsdTI6MJeb5iIZtyNHHe6nMsD/EnHDRVDTSKFTg="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-java"; }; javascript = buildGrammar { language = "javascript"; - version = "0.0.0+rev=de1e682"; + version = "0.0.0+rev=fff4560"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-javascript"; - rev = "de1e682289a417354df5b4437a3e4f92e0722a0f"; - hash = "sha256-HhqYqU1CwPxXMHp21unRekFDzpGVedlgh/4bsplhe9c="; + rev = "fff4560044bdc51d9f6995f1edc797b7cd72b9dc"; + hash = "sha256-erxZ5nYvUwrzdRnkni8WEsxB04ghI7H3DLASfCoHXYs="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-javascript"; }; @@ -1231,12 +1242,12 @@ }; json = buildGrammar { language = "json"; - version = "0.0.0+rev=3b12920"; + version = "0.0.0+rev=80e623c"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-json"; - rev = "3b129203f4b72d532f58e72c5310c0a7db3b8e6d"; - hash = "sha256-dVErHgsUDEN42wc/Gd68vQfVc8+/r/8No9KZk2GFzmY="; + rev = "80e623c2165887f9829357acfa9c0a0bab34a3cd"; + hash = "sha256-waejAbS7MjrE7w03MPqvBRpEpqTcKc6RgKCVSYaDV1Y="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-json"; }; @@ -1275,12 +1286,12 @@ }; julia = buildGrammar { language = "julia"; - version = "0.0.0+rev=e84f10d"; + version = "0.0.0+rev=acd5ca1"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-julia"; - rev = "e84f10db8eeb8b9807786bfc658808edaa1b4fa2"; - hash = "sha256-jrQjVPLb6SfePxEJV1GgFgLslGxgdmdb8bJy6VHOEbs="; + rev = "acd5ca12cc278df7960629c2429a096c7ac4bbea"; + hash = "sha256-1dOUMS4nlPaG5WxpCONXclVgq4F/Ti4JQK81KOnxvIk="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-julia"; }; @@ -1352,12 +1363,12 @@ }; latex = buildGrammar { language = "latex"; - version = "0.0.0+rev=eb552c7"; + version = "0.0.0+rev=ae2134a"; src = fetchFromGitHub { owner = "latex-lsp"; repo = "tree-sitter-latex"; - rev = "eb552c7022cbd1379138bdc1b2fe464a99d25640"; - hash = "sha256-y+FFT9UmtVDp37hWLwHi+qlCwezHYn0blH1tt/uyKb8="; + rev = "ae2134af67f6c5e45587ace9ec748dd6e7b356a2"; + hash = "sha256-hQaQBQYK0o5qRH5Mjv3pIAUHJe6BWHGzg2I4KCVG2KE="; }; generate = true; meta.homepage = "https://github.com/latex-lsp/tree-sitter-latex"; @@ -1463,12 +1474,12 @@ }; luau = buildGrammar { language = "luau"; - version = "0.0.0+rev=e5f7a02"; + version = "0.0.0+rev=5b088fa"; src = fetchFromGitHub { owner = "amaanq"; repo = "tree-sitter-luau"; - rev = "e5f7a020967407f73959592decdb147bb5fc30bb"; - hash = "sha256-5Tnqt4PA3xX2Gk0CvlzVpWXI3OcqzsIJov4Kn0EWN+w="; + rev = "5b088fac748f2666a315cafd1638a214388eb23e"; + hash = "sha256-m0xHQu9nxjyrCMza9Aw/kRK8Rlhtc2DRbtyyFtMZkJU="; }; meta.homepage = "https://github.com/amaanq/tree-sitter-luau"; }; @@ -1542,12 +1553,12 @@ }; mermaid = buildGrammar { language = "mermaid"; - version = "0.0.0+rev=e8dac87"; + version = "0.0.0+rev=49442bd"; src = fetchFromGitHub { owner = "monaqa"; repo = "tree-sitter-mermaid"; - rev = "e8dac87a9f789b23a2c7ab8e55b485a2f5927b98"; - hash = "sha256-1FCc8goKhFtgxSPeAzFkQhpbpruhZ+GD8VaLRJpnyS4="; + rev = "49442bd087901c60f019b4e34dcb6ecdc8849067"; + hash = "sha256-KoAoEuADv6Xj/bpZV5XGW7nXugSCfk6St2xzx7x2oPA="; }; meta.homepage = "https://github.com/monaqa/tree-sitter-mermaid"; }; @@ -1564,24 +1575,24 @@ }; mlir = buildGrammar { language = "mlir"; - version = "0.0.0+rev=a89a5f2"; + version = "0.0.0+rev=c2845c1"; src = fetchFromGitHub { owner = "artagnon"; repo = "tree-sitter-mlir"; - rev = "a89a5f2bbcf7e82e46b106138977c99d6a644db2"; - hash = "sha256-FIwyHvyIJziliEd+7CBMqUjJuT9G60CZGe73Ees0CRU="; + rev = "c2845c1c0b23e2faf6febfa72a042e5346374ebf"; + hash = "sha256-SQR/1lAWdvNDwa40wNI3uGSF9OBgtyjxVM5lsP4CgIU="; }; generate = true; meta.homepage = "https://github.com/artagnon/tree-sitter-mlir"; }; muttrc = buildGrammar { language = "muttrc"; - version = "0.0.0+rev=2f918f9"; + version = "0.0.0+rev=1a3d3c9"; src = fetchFromGitHub { owner = "neomutt"; repo = "tree-sitter-muttrc"; - rev = "2f918f9c887109fdf1419f98158a0cfff644af75"; - hash = "sha256-tB0qY7p099aNulvuZVah4yuyFdp/Dh6Knw4Qi+/QC6w="; + rev = "1a3d3c98de86689f2bb1e59c8db8067c6784aaed"; + hash = "sha256-9RFz8qaAapJSNxy8YH/6FZG2j1tcrhNWRhxx+fNo7z8="; }; meta.homepage = "https://github.com/neomutt/tree-sitter-muttrc"; }; @@ -1609,12 +1620,12 @@ }; nim = buildGrammar { language = "nim"; - version = "0.0.0+rev=f5cec6a"; + version = "0.0.0+rev=961c279"; src = fetchFromGitHub { owner = "alaviss"; repo = "tree-sitter-nim"; - rev = "f5cec6a841b585e4e7388a120ded07e60ae19c43"; - hash = "sha256-CL041Tjw7CH9EnpjAVl4f66zyOADfG9qwkFxeUjXH0w="; + rev = "961c2798cec9250c44f7d7225ddb33d47d25856a"; + hash = "sha256-zFT316pJwJvPRLJcBk4kvPmwNgdkYG5/10VktNBQwL8="; }; meta.homepage = "https://github.com/alaviss/tree-sitter-nim"; }; @@ -1642,23 +1653,23 @@ }; nix = buildGrammar { language = "nix"; - version = "0.0.0+rev=763168f"; + version = "0.0.0+rev=b3cda61"; src = fetchFromGitHub { owner = "cstrahan"; repo = "tree-sitter-nix"; - rev = "763168fa916a333a459434f1424b5d30645f015d"; - hash = "sha256-MarXhVPVmL505c57HkbUk0kHN7jez83mcGtyM5GMw1o="; + rev = "b3cda619248e7dd0f216088bd152f59ce0bbe488"; + hash = "sha256-Ib83CECi3hvm2GfeAJXIkapeN8rrpFQxCWWFFsIvB/Y="; }; meta.homepage = "https://github.com/cstrahan/tree-sitter-nix"; }; norg = buildGrammar { language = "norg"; - version = "0.0.0+rev=9766442"; + version = "0.0.0+rev=aa1a1a7"; src = fetchFromGitHub { owner = "nvim-neorg"; repo = "tree-sitter-norg"; - rev = "9766442985fd546e2d33f8d1c7e7619ed07860cf"; - hash = "sha256-YMS4UDVulE9PjOTchCSkeRRVbBbDFYgY/dCla32CkwQ="; + rev = "aa1a1a7ded81a094cc3d5cb14bea6f34b86d8688"; + hash = "sha256-baJdvWfwUx1U2RX0G6ECaGPGZBFbWsVUhh3kYPaYeiE="; }; meta.homepage = "https://github.com/nvim-neorg/tree-sitter-norg"; }; @@ -1733,12 +1744,12 @@ }; odin = buildGrammar { language = "odin"; - version = "0.0.0+rev=f94c590"; + version = "0.0.0+rev=b5f668e"; src = fetchFromGitHub { owner = "amaanq"; repo = "tree-sitter-odin"; - rev = "f94c590ed5263e11f1e492d1b53356f8c8459b66"; - hash = "sha256-MLSy1OU8PE2wTfV8JoJdtjoc12MD993TViaZjp3Ujgc="; + rev = "b5f668ef8918aab13812ce73acd89fe191fb8c5e"; + hash = "sha256-D/+ls8a5efAy3sBaH1eGEifEwBRmz+6bYIMGNji949Q="; }; meta.homepage = "https://github.com/amaanq/tree-sitter-odin"; }; @@ -1755,12 +1766,12 @@ }; pascal = buildGrammar { language = "pascal"; - version = "0.0.0+rev=9e99540"; + version = "0.0.0+rev=a9ee969"; src = fetchFromGitHub { owner = "Isopod"; repo = "tree-sitter-pascal"; - rev = "9e995404ddff8319631d72d4b46552e737206912"; - hash = "sha256-y8xPnVZ15+eAnjrLSGjS5wIbLgSKbz9bipgL0o8acmA="; + rev = "a9ee969dec5b2e3b2ccccc5954fec04100c7619e"; + hash = "sha256-U45RkRpE1EdX2ijGyjTKVNRcSu6E6Dh9Z7G9bp24T80="; }; meta.homepage = "https://github.com/Isopod/tree-sitter-pascal.git"; }; @@ -1845,12 +1856,12 @@ }; po = buildGrammar { language = "po"; - version = "0.0.0+rev=d6aed22"; + version = "0.0.0+rev=bd860a0"; src = fetchFromGitHub { owner = "erasin"; repo = "tree-sitter-po"; - rev = "d6aed225290bc71a15ab6f06305cb11419360c56"; - hash = "sha256-fz4DGPA+KtOvLBmVMXqwnEMeXhupFecQC1xfhMbWCJg="; + rev = "bd860a0f57f697162bf28e576674be9c1500db5e"; + hash = "sha256-/St0VxDTAF872ZlBph1TukRoO0PBIOMT0D11DZ6nSLQ="; }; meta.homepage = "https://github.com/erasin/tree-sitter-po"; }; @@ -1878,12 +1889,12 @@ }; pony = buildGrammar { language = "pony"; - version = "0.0.0+rev=16f930b"; + version = "0.0.0+rev=73ff874"; src = fetchFromGitHub { owner = "amaanq"; repo = "tree-sitter-pony"; - rev = "16f930b250433cfcd4fb4144df92bb98ad344c20"; - hash = "sha256-UamgLmI1aI5e/JlGVZzFCPgDol8MnFomncrFKhQYLsk="; + rev = "73ff874ae4c9e9b45462673cbc0a1e350e2522a7"; + hash = "sha256-/9bTbep2AXLoiijeft9amMeFQ6fHXzItjH+bD/w6pDo="; }; meta.homepage = "https://github.com/amaanq/tree-sitter-pony"; }; @@ -1978,12 +1989,12 @@ }; puppet = buildGrammar { language = "puppet"; - version = "0.0.0+rev=5849f96"; + version = "0.0.0+rev=584522f"; src = fetchFromGitHub { owner = "amaanq"; repo = "tree-sitter-puppet"; - rev = "5849f9694197a6e822872945b415429c285fdd54"; - hash = "sha256-Lwfiby7amjTIOz8QRoC4RdZyFPfFikmQ2sqta4akyH8="; + rev = "584522f32495d648b18a53ccb52d988e60de127d"; + hash = "sha256-+zMgzyuGerJ8l+i5ZtWnmGr3i4fFiSLD5FssyKESsmI="; }; meta.homepage = "https://github.com/amaanq/tree-sitter-puppet"; }; @@ -2011,12 +2022,12 @@ }; python = buildGrammar { language = "python"; - version = "0.0.0+rev=b8a4c64"; + version = "0.0.0+rev=a227610"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-python"; - rev = "b8a4c64121ba66b460cb878e934e3157ecbfb124"; - hash = "sha256-ZTqWyr4+pOyXY4X/WnYdn9Sgp7T8FEEUy/TQPuFqb4k="; + rev = "a22761025cdac6c314b7e3aa48fb44fa9e594d6a"; + hash = "sha256-L6iEej6bPqfaZdH5GNoJyNxZWdnIyn7+Cut+zYnMI88="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-python"; }; @@ -2077,12 +2088,12 @@ }; racket = buildGrammar { language = "racket"; - version = "0.0.0+rev=d9858a0"; + version = "0.0.0+rev=171f52a"; src = fetchFromGitHub { owner = "6cdh"; repo = "tree-sitter-racket"; - rev = "d9858a0f607578814f2d34662ad4bc21aa37a455"; - hash = "sha256-UaF9/leXBlyF+3j8lTyi9tn2pVwVHlYM7zLdTpVCmgI="; + rev = "171f52a8c0ed635b85cd42d1e36d82f1066a03b4"; + hash = "sha256-iuigtcakpqm5vPuxsSV5PR32pwzyPMmldYXaJmzO3d0="; }; meta.homepage = "https://github.com/6cdh/tree-sitter-racket"; }; @@ -2187,34 +2198,34 @@ }; roc = buildGrammar { language = "roc"; - version = "0.0.0+rev=649c3b6"; + version = "0.0.0+rev=7df2c08"; src = fetchFromGitHub { owner = "nat-418"; repo = "tree-sitter-roc"; - rev = "649c3b68eb863f350f0aafeb68f4a8ca4f13081a"; - hash = "sha256-oY6mQV4bJ0XCGcx/8AnlYMAIKAs54wbgZ4iNzD4rkVE="; + rev = "7df2c0892e62efb81a7504d9799d4e0d0443d241"; + hash = "sha256-8HJH63NcSuqmPviVWO+UE27ydoU7vRXEIXSTjKLSYvk="; }; meta.homepage = "https://github.com/nat-418/tree-sitter-roc"; }; ron = buildGrammar { language = "ron"; - version = "0.0.0+rev=ce6086b"; + version = "0.0.0+rev=f0ddc95"; src = fetchFromGitHub { owner = "amaanq"; repo = "tree-sitter-ron"; - rev = "ce6086b2c9e8e71065b8129d6c2289c5f66d1879"; - hash = "sha256-4ZKhJ3qvKWwINQIWJLqgPwfnDvQBWzeZb2dZY7imYfc="; + rev = "f0ddc95a4b7bb21a7308642255a80f5496e69c5b"; + hash = "sha256-Wi81LYFfQXjZzj2OuxB64sNDEim/eZKViMeQ0h/w88k="; }; meta.homepage = "https://github.com/amaanq/tree-sitter-ron"; }; rst = buildGrammar { language = "rst"; - version = "0.0.0+rev=c6f7444"; + version = "0.0.0+rev=5120f6e"; src = fetchFromGitHub { owner = "stsewd"; repo = "tree-sitter-rst"; - rev = "c6f7444fd77271862730af49e757c60405fba991"; - hash = "sha256-Z6kW2InTqQ+5p0WDcRjXN1dvKLoruIKdTe04SrspVzg="; + rev = "5120f6e59284cb8b85b450bd2db0bd352635ba9f"; + hash = "sha256-PI1C0W8fiuIQ2fgHXDelkCa0ng1a32x/9hrA33KoefM="; }; meta.homepage = "https://github.com/stsewd/tree-sitter-rst"; }; @@ -2231,23 +2242,23 @@ }; rust = buildGrammar { language = "rust"; - version = "0.0.0+rev=3a56481"; + version = "0.0.0+rev=b77c0d8"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-rust"; - rev = "3a56481f8d13b6874a28752502a58520b9139dc7"; - hash = "sha256-6ROXeKuPehtIOtaI1OJuTtyPfQmZyLzCxv3ZS04yAIk="; + rev = "b77c0d8ac28a7c143224e6ed9b4f9e4bd044ff5b"; + hash = "sha256-7SQ/gOKVIE5bmj3vscY363LTwkYX+VHn7JflSU+zKsQ="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-rust"; }; scala = buildGrammar { language = "scala"; - version = "0.0.0+rev=70b4fe6"; + version = "0.0.0+rev=b76db43"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-scala"; - rev = "70b4fe63c4973b04cc7bd40c6b7646d9c2430db8"; - hash = "sha256-ZwrsEhlZGVJMP+GRIlaxGqS1b7HtiQelg3QBwJT9Igk="; + rev = "b76db435a7f876cf1ede837d66054c534783c72f"; + hash = "sha256-AZ1YIsnw3x84T2ubwWoekfy98L2GdgQP0R3tM8DEXLM="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-scala"; }; @@ -2265,12 +2276,12 @@ }; scheme = buildGrammar { language = "scheme"; - version = "0.0.0+rev=184e759"; + version = "0.0.0+rev=8f9dff3"; src = fetchFromGitHub { owner = "6cdh"; repo = "tree-sitter-scheme"; - rev = "184e7596ee0cbaef79230cae1b4ee5bb4fbad314"; - hash = "sha256-wx/uov0kWoxwTyo9MwJR50efnRoboQUlii2MrwpnDGs="; + rev = "8f9dff3d038f09934db5ea113cebc59c74447743"; + hash = "sha256-QECZQVhWntN+3wnIA+U3JesuoLZiSU7pOrsKRdVPLtk="; }; meta.homepage = "https://github.com/6cdh/tree-sitter-scheme"; }; @@ -2287,34 +2298,34 @@ }; slang = buildGrammar { language = "slang"; - version = "0.0.0+rev=13fdd89"; + version = "0.0.0+rev=b950ddf"; src = fetchFromGitHub { owner = "theHamsta"; repo = "tree-sitter-slang"; - rev = "13fdd899bfa62527cc39887abd74ec24cd626dec"; - hash = "sha256-YImk9t0zrOSBornem2rTzqhl/FUWqh955bjjOWkcfHY="; + rev = "b950ddf54c564fec0efead602268b6e0d3e5f26e"; + hash = "sha256-AYZ7MlAh9AEvyHsGw6stiJFSEb4/FDLfuqFPhpAorAA="; }; meta.homepage = "https://github.com/theHamsta/tree-sitter-slang"; }; slint = buildGrammar { language = "slint"; - version = "0.0.0+rev=acc77c9"; + version = "0.0.0+rev=d5fbeaf"; src = fetchFromGitHub { owner = "slint-ui"; repo = "tree-sitter-slint"; - rev = "acc77c93ef4b73ba8c3a581b8c99d95b55f7178b"; - hash = "sha256-/fvCR8h3C7aL2We8Ijzx4nQ9AN05PFKObPMCwu7Ps6o="; + rev = "d5fbeaf0c26683f1417d00b6a5ab1cca445031f2"; + hash = "sha256-ECzYJue7tKx9Eg043fl5x18ySvPlkWPU21Ga2Zqunv0="; }; meta.homepage = "https://github.com/slint-ui/tree-sitter-slint"; }; smali = buildGrammar { language = "smali"; - version = "0.0.0+rev=5ae51e1"; + version = "0.0.0+rev=3f65178"; src = fetchFromGitHub { owner = "tree-sitter-grammars"; repo = "tree-sitter-smali"; - rev = "5ae51e15c4d1ac93cba6127caf3d1f0a072c140c"; - hash = "sha256-hcqai2QKx6ZG+Sl1HOPu3wlyjKt3MJ60jNfjfcjKKiM="; + rev = "3f6517855898ef23023e5d64a8b175d4ee8d646e"; + hash = "sha256-K1cRK4D0BE9FNq1tpa0L3Crc+8woXIwhRPg86+73snk="; }; meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-smali"; }; @@ -2342,12 +2353,12 @@ }; solidity = buildGrammar { language = "solidity"; - version = "0.0.0+rev=a8ed2f5"; + version = "0.0.0+rev=1653da0"; src = fetchFromGitHub { owner = "JoranHonig"; repo = "tree-sitter-solidity"; - rev = "a8ed2f5d600fed77f8ed3084d1479998c649bca1"; - hash = "sha256-aSQnJR/r4H086Um4TV4mjnCSg+2Y7KFn2Rwo/lP2nfg="; + rev = "1653da09ccd183f4312fba819056a13af22a65f6"; + hash = "sha256-1IW04F6CxTIdGHxRocM1QmfgXHHf5Jn/eaZ6M8o2EU8="; }; meta.homepage = "https://github.com/JoranHonig/tree-sitter-solidity"; }; @@ -2399,34 +2410,34 @@ }; sql = buildGrammar { language = "sql"; - version = "0.0.0+rev=cdb7cde"; + version = "0.0.0+rev=25f94f9"; src = fetchFromGitHub { owner = "derekstride"; repo = "tree-sitter-sql"; - rev = "cdb7cde9bf70b194ab8beb5069fbbc3c9640284e"; - hash = "sha256-yxr+AbKp4pkVpjMQXL3P5VEzSo2Ii6yE7ceEBYiDHJA="; + rev = "25f94f998de79bae9df28add9782f9ea6ea0e2b8"; + hash = "sha256-UmGvjtN0Pi7uH8+Sb6JbvdV60gow7KQCbDRcKo3nMYw="; }; meta.homepage = "https://github.com/derekstride/tree-sitter-sql"; }; squirrel = buildGrammar { language = "squirrel"; - version = "0.0.0+rev=e8b5835"; + version = "0.0.0+rev=f93fd28"; src = fetchFromGitHub { owner = "amaanq"; repo = "tree-sitter-squirrel"; - rev = "e8b5835296f931bcaa1477d3c5a68a0c5c2ba034"; - hash = "sha256-wKefWCqcQcg7zLT6abaDC9lWoJiJp7EbbsBOWRRsWFQ="; + rev = "f93fd2864dd05cc39b0490145fd86a1a93bfa3a3"; + hash = "sha256-06cmaCyBkdwSmIHSEE0xr9V4M6pp+ApIZNopbnW3pok="; }; meta.homepage = "https://github.com/amaanq/tree-sitter-squirrel"; }; ssh_config = buildGrammar { language = "ssh_config"; - version = "0.0.0+rev=514695d"; + version = "0.0.0+rev=77450e8"; src = fetchFromGitHub { owner = "ObserverOfTime"; repo = "tree-sitter-ssh-config"; - rev = "514695df4985f56455b8f139a319453a2325cdcf"; - hash = "sha256-LDqRP8FA5m1tnbGNTxItQlp6B6U+M6gOBlbi4zX0FHI="; + rev = "77450e8bce8853921512348f83c73c168c71fdfb"; + hash = "sha256-V7JI1o30+mzGA4X1oh+pyu3rSWOfHFKfCUbYaFPLOmM="; }; meta.homepage = "https://github.com/ObserverOfTime/tree-sitter-ssh-config"; }; @@ -2454,12 +2465,12 @@ }; styled = buildGrammar { language = "styled"; - version = "0.0.0+rev=5e52758"; + version = "0.0.0+rev=c68a457"; src = fetchFromGitHub { owner = "mskelton"; repo = "tree-sitter-styled"; - rev = "5e52758b32e02adca16bb93f95b3f9c050c72b56"; - hash = "sha256-3x/ZKVYyWuLGkgdm9HutI16m8xpJKSMOZHY48WqH9b0="; + rev = "c68a4572e2d6403b6e99066c9a113b43f4a07a27"; + hash = "sha256-ZOMHyhtlKVOty+0lyUX7aJiwyP9yNN+r0eXVhpu22WQ="; }; meta.homepage = "https://github.com/mskelton/tree-sitter-styled"; }; @@ -2487,23 +2498,23 @@ }; svelte = buildGrammar { language = "svelte"; - version = "0.0.0+rev=6909efa"; + version = "0.0.0+rev=2c97326"; src = fetchFromGitHub { owner = "tree-sitter-grammars"; repo = "tree-sitter-svelte"; - rev = "6909efa7179cd655f9b48123357d65ce8fc661fd"; - hash = "sha256-s/aO6f91vW+XITaDkB3kyNSReLU1V125wgPcTATvgcY="; + rev = "2c97326cd96b7c3016c3d249e8dc244c89b4abeb"; + hash = "sha256-rlfLelXjNLtQ2/UACwxB3QO5l+QYFLsfGnBaxTAtgTE="; }; meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-svelte"; }; swift = buildGrammar { language = "swift"; - version = "0.0.0+rev=67ea4e9"; + version = "0.0.0+rev=e2f0b7c"; src = fetchFromGitHub { owner = "alex-pinkus"; repo = "tree-sitter-swift"; - rev = "67ea4e9ea7302b731d392cd8b1aad7b8e79a5547"; - hash = "sha256-+ms6YcgcwpEuF+KWoC75KA/cQuOeqqDlfOJkWPApor4="; + rev = "e2f0b7cf8136b801e4743790b7a956ab29a4d6b0"; + hash = "sha256-DFoNyZmpzSDI37Gto2DxeoRZuDgLtx9NJxyYGIG6lrY="; }; generate = true; meta.homepage = "https://github.com/alex-pinkus/tree-sitter-swift"; @@ -2532,34 +2543,34 @@ }; t32 = buildGrammar { language = "t32"; - version = "0.0.0+rev=95caba8"; + version = "0.0.0+rev=6182836"; src = fetchFromGitLab { owner = "xasc"; repo = "tree-sitter-t32"; - rev = "95caba87f00c51177b254e95be55b2dc46d2ac78"; - hash = "sha256-Z02LcEzzAHVKw0lyeuo4bdeFclLUtyXU8XGevBbJJPc="; + rev = "6182836f4128725f1e74ce986840d7317021a015"; + hash = "sha256-w9X/CL5X6Lwr4/GGVQcMZ1O2HfJmdNiVjRQKGZHrRqg="; }; meta.homepage = "https://gitlab.com/xasc/tree-sitter-t32.git"; }; tablegen = buildGrammar { language = "tablegen"; - version = "0.0.0+rev=300f6a4"; + version = "0.0.0+rev=6b7eb09"; src = fetchFromGitHub { owner = "amaanq"; repo = "tree-sitter-tablegen"; - rev = "300f6a490e71f895e644ed2deec6920860a2e107"; - hash = "sha256-V4fEmiGPBAnZO+NAyA7FdlyjLSA0ByUfrCTbsdDOxc8="; + rev = "6b7eb096621443627cc5e29c8c34ff1fde482cf3"; + hash = "sha256-kdOqHAyKAI4IgI2/GbEx13DWLB8JklURd3ndaicxUno="; }; meta.homepage = "https://github.com/amaanq/tree-sitter-tablegen"; }; tcl = buildGrammar { language = "tcl"; - version = "0.0.0+rev=56ad1fa"; + version = "0.0.0+rev=8784024"; src = fetchFromGitHub { owner = "tree-sitter-grammars"; repo = "tree-sitter-tcl"; - rev = "56ad1fa6a34ba800e5495d1025a9b0fda338d5b8"; - hash = "sha256-GhK92+nbJ+M5/1ZnPbIJ3EuNub332YK+hyWiwyBqUmk="; + rev = "8784024358c233efd0f3a6fd9e7a3c5852e628bc"; + hash = "sha256-/uw+Nb5A+DklN+BxMpufSCMb/VOE/zqJNnLZVFwjWtc="; }; meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-tcl"; }; @@ -2577,12 +2588,12 @@ }; templ = buildGrammar { language = "templ"; - version = "0.0.0+rev=db66241"; + version = "0.0.0+rev=e2218a2"; src = fetchFromGitHub { owner = "vrischmann"; repo = "tree-sitter-templ"; - rev = "db662414ccd6f7c78b1e834e7abe11c224b04759"; - hash = "sha256-DPVVdzAU3xGa1TpndlwPZr11zi1ToYkvqWDJeddfDYs="; + rev = "e2218a2376e3ff18c9963b21aa567770baab0462"; + hash = "sha256-lyxXb71FVfpWw4IbU5P6uDVETNSDO+r7+YgZDvaIEbc="; }; meta.homepage = "https://github.com/vrischmann/tree-sitter-templ"; }; @@ -2611,12 +2622,12 @@ }; thrift = buildGrammar { language = "thrift"; - version = "0.0.0+rev=d4deb1b"; + version = "0.0.0+rev=68fd0d8"; src = fetchFromGitHub { owner = "duskmoon314"; repo = "tree-sitter-thrift"; - rev = "d4deb1bd9e848f2dbe81103a151d99e8546de480"; - hash = "sha256-MCa7319E8bo3r2kDClBmjOvvs+yZDlE1E+52WqJqvMI="; + rev = "68fd0d80943a828d9e6f49c58a74be1e9ca142cf"; + hash = "sha256-owZbs8ttjKrqTA8fQ/NmBGyIUUItSUvvW4hRv0NPV8Y="; }; meta.homepage = "https://github.com/duskmoon314/tree-sitter-thrift"; }; @@ -2633,23 +2644,23 @@ }; tlaplus = buildGrammar { language = "tlaplus"; - version = "0.0.0+rev=439dad0"; + version = "0.0.0+rev=410122a"; src = fetchFromGitHub { owner = "tlaplus-community"; repo = "tree-sitter-tlaplus"; - rev = "439dad01355e4db335fe9cd12eb177b4f2563dd6"; - hash = "sha256-d2CPUjqMOu9xc+wjw2uGk2UmkR9OzoYFchbK+IMH7YA="; + rev = "410122a012abb06fbacc8c0b8f288b684f8113e1"; + hash = "sha256-vWxMaka5h8L+tJctiflEWT1/nofPYHIgpf1/3jfsgVU="; }; meta.homepage = "https://github.com/tlaplus-community/tree-sitter-tlaplus"; }; tmux = buildGrammar { language = "tmux"; - version = "0.0.0+rev=7499587"; + version = "0.0.0+rev=1415bd8"; src = fetchFromGitHub { owner = "Freed-Wu"; repo = "tree-sitter-tmux"; - rev = "7499587642a46ee156e1bb58851904ac750dcc7c"; - hash = "sha256-0zeAaQtHZrOwfoSyzj37GZH4tpm+BSuJvLyilVHUW4E="; + rev = "1415bd8b5bb69c230947663deceb62c2a0ae4155"; + hash = "sha256-3kF6H3tP20FUfNoIRxQCnVzvyd4MFLd9oN6rhB/ePvo="; }; meta.homepage = "https://github.com/Freed-Wu/tree-sitter-tmux"; }; @@ -2746,12 +2757,12 @@ }; typst = buildGrammar { language = "typst"; - version = "0.0.0+rev=f457c77"; + version = "0.0.0+rev=13863dd"; src = fetchFromGitHub { owner = "uben0"; repo = "tree-sitter-typst"; - rev = "f457c77edffd4b93190794355ff5acf7acfb99c6"; - hash = "sha256-f/vIpDZkQOK0GWlwvGEGucYkv4FHGpmhQDchnE6ddz8="; + rev = "13863ddcbaa7b68ee6221cea2e3143415e64aea4"; + hash = "sha256-n6RTRMJS3h+g+Wawjb7I9NJbz+w/SGi+DQVj1jiyGaU="; }; meta.homepage = "https://github.com/uben0/tree-sitter-typst"; }; @@ -2779,12 +2790,12 @@ }; unison = buildGrammar { language = "unison"; - version = "0.0.0+rev=fb49b81"; + version = "0.0.0+rev=a1eba0f"; src = fetchFromGitHub { owner = "kylegoetz"; repo = "tree-sitter-unison"; - rev = "fb49b8125509c079e08f345758c03a427129010e"; - hash = "sha256-Y4Pnte9ZxXq7tzjc+cliXO8U57cnHlQxOMuX8u39ptE="; + rev = "a1eba0fef887800de97126e2c9ae4109c1c6a2ea"; + hash = "sha256-p0LArEOspQvpgNponLpMakEHrwHM+UzA9SU5PdwQCTU="; }; generate = true; meta.homepage = "https://github.com/kylegoetz/tree-sitter-unison"; @@ -2813,12 +2824,12 @@ }; v = buildGrammar { language = "v"; - version = "0.0.0+rev=95869fa"; + version = "0.0.0+rev=7e11a6f"; src = fetchFromGitHub { owner = "vlang"; repo = "v-analyzer"; - rev = "95869fa2058fbc9098f640b87399971c6d7552c0"; - hash = "sha256-Y3htLfDQ6gjYReQ1z5vlCA+A5n0qFSlu7GHog/b+7/E="; + rev = "7e11a6f8f369df935664fadd2f0c99d90fe3226f"; + hash = "sha256-zCXfYW8NCsdqKKEMkZUudpCEQM4bLePyCGFS0w86DY0="; }; location = "tree_sitter_v"; meta.homepage = "https://github.com/vlang/v-analyzer"; @@ -2880,12 +2891,12 @@ }; vimdoc = buildGrammar { language = "vimdoc"; - version = "0.0.0+rev=a75a932"; + version = "0.0.0+rev=0b36856"; src = fetchFromGitHub { owner = "neovim"; repo = "tree-sitter-vimdoc"; - rev = "a75a932449675bbd260213a95f4cd8b3193286f0"; - hash = "sha256-spj8h1ZDY+6sWi+FCALapBsG+ig9H1u3bjkI2+UP0ds="; + rev = "0b36856db88680f662cc67545c82af4ce83bf158"; + hash = "sha256-8kq1Y+WXL6qu8CyS5zmE7pe/a0K5rmiGgZMxj5O/VHY="; }; meta.homepage = "https://github.com/neovim/tree-sitter-vimdoc"; }; @@ -2913,27 +2924,36 @@ }; wgsl_bevy = buildGrammar { language = "wgsl_bevy"; - version = "0.0.0+rev=4d7b469"; + version = "0.0.0+rev=f5980f5"; src = fetchFromGitHub { owner = "theHamsta"; repo = "tree-sitter-wgsl-bevy"; - rev = "4d7b4697dd2598c60a6ccbc51db8b768cd8700b8"; - hash = "sha256-n4RkD6Q0QPYY34MlJSlzlzsUix5xnZnMEU/UCdbxGYI="; + rev = "f5980f534ee64256b1e64b0a42e2864d91154a5d"; + hash = "sha256-LbysBXujWWDVtgyHte9RLOPu/LMk1TN/9DC0t0WWdcQ="; }; meta.homepage = "https://github.com/theHamsta/tree-sitter-wgsl-bevy"; }; wing = buildGrammar { language = "wing"; - version = "0.0.0+rev=0cdff2b"; + version = "0.0.0+rev=bd1d35c"; src = fetchFromGitHub { owner = "winglang"; - repo = "wing"; - rev = "0cdff2bc50e3664049905e952746cadf4ac62f15"; - hash = "sha256-ocHNpn7EKDdoBsanBf8XPhqZYM0wna9a+tDxy4gIO3o="; + repo = "tree-sitter-wing"; + rev = "bd1d35cf3e013dc7e189b46a593bdc2b281b0dd7"; + hash = "sha256-jygMTswZ8r4tUJQ0lUH8GHz56dyGd6rV1wL5i75Ni88="; }; - location = "libs/tree-sitter-wing"; - generate = true; - meta.homepage = "https://github.com/winglang/wing"; + meta.homepage = "https://github.com/winglang/tree-sitter-wing"; + }; + wit = buildGrammar { + language = "wit"; + version = "0.0.0+rev=6f511f9"; + src = fetchFromGitHub { + owner = "liamwh"; + repo = "tree-sitter-wit"; + rev = "6f511f9c6676e597c2f0930e4d2629595319882d"; + hash = "sha256-xvMIcbeYdr/KIz0fqnARAwEKWmm4dlWhFAS/NZFU16s="; + }; + meta.homepage = "https://github.com/liamwh/tree-sitter-wit"; }; xcompose = buildGrammar { language = "xcompose"; @@ -2948,24 +2968,24 @@ }; xml = buildGrammar { language = "xml"; - version = "0.0.0+rev=2282ad5"; + version = "0.0.0+rev=96beba9"; src = fetchFromGitHub { owner = "tree-sitter-grammars"; repo = "tree-sitter-xml"; - rev = "2282ad5cb8e815523e70d5c82404620bd9a1494c"; - hash = "sha256-CZAVJdT01wXyaDnPxXz6ZhiiDxuvwKCWPGjaWe6FpWk="; + rev = "96beba9f3e4156aaae64bb86997503b1ceb1283d"; + hash = "sha256-XmSU9Om1bj/PtBxr22Sf81Mx68QINtK8Gls1fRldt6Q="; }; location = "xml"; meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-xml"; }; yaml = buildGrammar { language = "yaml"; - version = "0.0.0+rev=c9ee63b"; + version = "0.0.0+rev=ee09311"; src = fetchFromGitHub { owner = "tree-sitter-grammars"; repo = "tree-sitter-yaml"; - rev = "c9ee63b15c92656a89f7007f38a98f21c3eca81d"; - hash = "sha256-2MWTBUoaf+F/TJU+CWJ22JAoyq63XKxy1wJPxcZFePc="; + rev = "ee093118211be521742b9866a8ed8ce6d87c7a94"; + hash = "sha256-tE39KP86JYYmj8WW1l3HAIiBZr/E4IyOgdsUm6d6pQ8="; }; meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-yaml"; }; @@ -2982,23 +3002,23 @@ }; yuck = buildGrammar { language = "yuck"; - version = "0.0.0+rev=c348825"; + version = "0.0.0+rev=a513732"; src = fetchFromGitHub { owner = "Philipp-M"; repo = "tree-sitter-yuck"; - rev = "c348825d3f86dec71dee0e1223c6bd73114e3579"; - hash = "sha256-H4tsLDo9Egp1mpZGcA5Z9C9wPFNxPEBDTugUYKeYW9I="; + rev = "a513732feb813426b51d1ead8397a9c285c411be"; + hash = "sha256-XfenP9bXkskCfiq2sE8qLog0NmSecP50Ur+8HDtU4pQ="; }; meta.homepage = "https://github.com/Philipp-M/tree-sitter-yuck"; }; zathurarc = buildGrammar { language = "zathurarc"; - version = "0.0.0+rev=aad4302"; + version = "0.0.0+rev=09b837d"; src = fetchFromGitHub { owner = "Freed-Wu"; repo = "tree-sitter-zathurarc"; - rev = "aad4302fb5a5176004b688fcab4ae7dcf36bf49a"; - hash = "sha256-mo/gYg6cDp38hx3HTqI4CqPHTGLQ/Je9fs1rYn10Aws="; + rev = "09b837dc8f7445fd86e1245c23b1a7804229edd4"; + hash = "sha256-t7eBWDfn0nq1nGqSyCZmoSGVGgeTcGFfPrZl62OkD1I="; }; meta.homepage = "https://github.com/Freed-Wu/tree-sitter-zathurarc"; }; From 48da82630898fbbb79e12a5ce50295a64bfd41b6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 21 Apr 2024 08:38:12 +0000 Subject: [PATCH 66/97] texpresso: 0-unstable-2024-04-08 -> 0-unstable-2024-04-18 --- pkgs/tools/typesetting/tex/texpresso/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/typesetting/tex/texpresso/default.nix b/pkgs/tools/typesetting/tex/texpresso/default.nix index ccbc43a1c615..e2e244ceda69 100644 --- a/pkgs/tools/typesetting/tex/texpresso/default.nix +++ b/pkgs/tools/typesetting/tex/texpresso/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { pname = "texpresso"; - version = "0-unstable-2024-04-08"; + version = "0-unstable-2024-04-18"; nativeBuildInputs = [ makeWrapper @@ -35,8 +35,8 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "let-def"; repo = "texpresso"; - rev = "9db77502f238c75ef03ce94f34cc5170d0b2a833"; - hash = "sha256-YK4+GqjBjKui4J7YkNyeF1GyquMQMLMhp9o5u4Z8Bmc="; + rev = "62b2b5913420d92bb2863d9c92ac2072f7aaa5f9"; + hash = "sha256-kVGRuFVkJvQfl1bEjBU0pyx+SB+k5yI9C6XFiKZRpLQ="; }; buildFlags = [ "texpresso" ]; From 44186ac628aaddc4d837818ee0276d45555f6122 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 21 Apr 2024 09:35:46 +0000 Subject: [PATCH 67/97] python311Packages.types-psycopg2: 2.9.21.20240311 -> 2.9.21.20240417 --- pkgs/development/python-modules/types-psycopg2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/types-psycopg2/default.nix b/pkgs/development/python-modules/types-psycopg2/default.nix index 4dce98b9c379..e9901ef6678d 100644 --- a/pkgs/development/python-modules/types-psycopg2/default.nix +++ b/pkgs/development/python-modules/types-psycopg2/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "types-psycopg2"; - version = "2.9.21.20240311"; + version = "2.9.21.20240417"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-cilF3/pqcpvrxmDxQTfzft/OrVosFesjQhKn0BfugHI="; + hash = "sha256-Bdslb0pFn7IaQmuOf8oGVsNTkQX/Agjq9r2vQGo4cIc="; }; nativeBuildInputs = [ From 987bfa6b06ff79da807b3b88084a26a65bb3006e Mon Sep 17 00:00:00 2001 From: Mauricio Scheffer Date: Sun, 21 Apr 2024 10:59:01 +0100 Subject: [PATCH 68/97] vscode-extensions.thenuprojectcontributors.vscode-nushell-lang: 1.1.0 -> 1.9.0 --- pkgs/applications/editors/vscode/extensions/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index d7c8380930e7..e74e30e1a717 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -4063,8 +4063,8 @@ let mktplcRef = { name = "vscode-nushell-lang"; publisher = "thenuprojectcontributors"; - version = "1.1.0"; - hash = "sha256-7v4q0OEqv7q2ejHp4lph2Dsqg0GWE65pxyz9goQEm8g="; + version = "1.9.0"; + hash = "sha256-E9CK/GChd/yZT+P3ttROjL2jHtKPJ0KZzc32/nbuE4w="; }; meta.license = lib.licenses.mit; }; From 473b609c37d9b896823a1909d4c7c5c62574e9f0 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 21 Apr 2024 12:24:08 +0200 Subject: [PATCH 69/97] python312Packages.homeassistant-stubs: 2024.4.2 -> 2024.4.3 https://github.com/KapJI/homeassistant-stubs/releases/tag/2024.4.3 --- pkgs/servers/home-assistant/stubs.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/home-assistant/stubs.nix b/pkgs/servers/home-assistant/stubs.nix index b70aa8ed3d23..f8e4e49b13ff 100644 --- a/pkgs/servers/home-assistant/stubs.nix +++ b/pkgs/servers/home-assistant/stubs.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "homeassistant-stubs"; - version = "2024.4.2"; + version = "2024.4.3"; format = "pyproject"; disabled = python.version != home-assistant.python.version; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "KapJI"; repo = "homeassistant-stubs"; rev = "refs/tags/${version}"; - hash = "sha256-qt7NBbjjeiNcHOM6wKI7Y3+L579xBQJD48hU89BB+ss="; + hash = "sha256-uFQQNcRfo4m3GnfCbAe4yjdphkpqnhpqVr1EZP3bqVM="; }; nativeBuildInputs = [ From 3c35c90c20c75d9268bbd3ae1c0e87707d13a392 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 21 Apr 2024 12:26:03 +0200 Subject: [PATCH 70/97] home-assistant: 2024.4.2 -> 2024.4.3 https://github.com/home-assistant/core/releases/tag/2024.4.3 --- pkgs/servers/home-assistant/component-packages.nix | 2 +- pkgs/servers/home-assistant/default.nix | 8 +++++--- pkgs/servers/home-assistant/frontend.nix | 4 ++-- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 33b56ccb134a..51c324a0bef3 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -2,7 +2,7 @@ # Do not edit! { - version = "2024.4.2"; + version = "2024.4.3"; components = { "3_day_blinds" = ps: with ps; [ ]; diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index cc42a6b90582..e3bec47d25a8 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -526,7 +526,7 @@ let extraBuildInputs = extraPackages python.pkgs; # Don't forget to run parse-requirements.py after updating - hassVersion = "2024.4.2"; + hassVersion = "2024.4.3"; in python.pkgs.buildPythonApplication rec { pname = "homeassistant"; @@ -544,13 +544,13 @@ in python.pkgs.buildPythonApplication rec { owner = "home-assistant"; repo = "core"; rev = "refs/tags/${version}"; - hash = "sha256-V6qvpPrhfSLINH99hYkAjvG8pfIN8AXGO3HuwiKgMPo="; + hash = "sha256-jHt4cWi1JxUs2XKf0N9gqsYj5XZK7TXwgj7WPZ7dmEA="; }; # Secondary source is pypi sdist for translations sdist = fetchPypi { inherit pname version; - hash = "sha256-ZtTlLRDSXKUz+ZA+UctFL+d3wdKrcPdeROIUhS35qWU="; + hash = "sha256-sj3usdXUl/wNElO3OgGx6dsBqn9+h9zq/AC3Zdn379M="; }; nativeBuildInputs = with python.pkgs; [ @@ -559,6 +559,7 @@ in python.pkgs.buildPythonApplication rec { ]; pythonRelaxDeps = [ + "aiohttp" "attrs" "bcrypt" "ciso8601" @@ -566,6 +567,7 @@ in python.pkgs.buildPythonApplication rec { "hass-nabucasa" "httpx" "orjson" + "pillow" "pyopenssl" "typing-extensions" "urllib3" diff --git a/pkgs/servers/home-assistant/frontend.nix b/pkgs/servers/home-assistant/frontend.nix index 4b95c1cb8688..afa2c53ca3f7 100644 --- a/pkgs/servers/home-assistant/frontend.nix +++ b/pkgs/servers/home-assistant/frontend.nix @@ -4,7 +4,7 @@ buildPythonPackage rec { # the frontend version corresponding to a specific home-assistant version can be found here # https://github.com/home-assistant/home-assistant/blob/master/homeassistant/components/frontend/manifest.json pname = "home-assistant-frontend"; - version = "20240404.1"; + version = "20240404.2"; format = "wheel"; src = fetchPypi { @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "home_assistant_frontend"; dist = "py3"; python = "py3"; - hash = "sha256-Vuk/e+wn8Cbko7tbjLIbclhdj3R+BdHzu4OSsBUAOcU="; + hash = "sha256-xCpQHzfXXt9aOWWVGYtt9NYws//ZPjI/owXBQafb31k="; }; # there is nothing to strip in this package From a4c413810f869c0a8b11381431d2a2ed30885910 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 21 Apr 2024 10:36:56 +0000 Subject: [PATCH 71/97] python311Packages.unidata-blocks: 0.0.9 -> 0.0.10 --- pkgs/development/python-modules/unidata-blocks/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/unidata-blocks/default.nix b/pkgs/development/python-modules/unidata-blocks/default.nix index 1275543088d3..93857756bb65 100644 --- a/pkgs/development/python-modules/unidata-blocks/default.nix +++ b/pkgs/development/python-modules/unidata-blocks/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "unidata-blocks"; - version = "0.0.9"; + version = "0.0.10"; disabled = pythonOlder "3.11"; src = fetchPypi { pname = "unidata_blocks"; inherit version; - hash = "sha256-OuIhajgUyO5qdcxJCO06Q1xNbeSNGzlbaWnAqXORm9g="; + hash = "sha256-wwiOjfIAx6AZtK98uuPQ0jwblq+CdnMQp+JkQWh+RgM="; }; format = "pyproject"; From 821fa71ddff3e8aa2e3f53225bfadcdb00757c5c Mon Sep 17 00:00:00 2001 From: aktaboot Date: Sat, 20 Apr 2024 22:33:42 +0200 Subject: [PATCH 72/97] cargo-modules: 0.11.2 -> 0.15.5 skip failing tests --- .../tools/rust/cargo-modules/default.nix | 31 ++++++++++++++++--- 1 file changed, 27 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-modules/default.nix b/pkgs/development/tools/rust/cargo-modules/default.nix index b237c64dc2af..6fa78cef0b4d 100644 --- a/pkgs/development/tools/rust/cargo-modules/default.nix +++ b/pkgs/development/tools/rust/cargo-modules/default.nix @@ -2,21 +2,44 @@ rustPlatform.buildRustPackage rec { pname = "cargo-modules"; - version = "0.11.2"; + version = "0.15.5"; src = fetchFromGitHub { owner = "regexident"; repo = pname; - rev = version; - hash = "sha256-dfeY9YylHF1QHNv7yTNYxUBxzcb276H80WL6JgXR/KY="; + rev = "v${version}"; + hash = "sha256-+jHanZ2/BIgNLUpMlibfUAVfA6QTPlavRci2YD1w3zE="; }; - cargoHash = "sha256-elzLO2YNDsD9FjCW0+2pUWgcJzOvzK+lyZBxrjVXoA8="; + cargoHash = "sha256-umaKVs1fFiUKz2HIJuB+7skSwRQbG12dl9eD+et42go="; buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.CoreServices ]; + checkFlags = [ + "--skip=cfg_test::smoke" + "--skip=colors::ansi::smoke" + "--skip=colors::plain::smoke" + "--skip=colors::truecolor::smoke" + "--skip=focus_on::glob_path::smoke" + "--skip=focus_on::self_path::smoke" + "--skip=focus_on::simple_path::smoke" + "--skip=focus_on::use_tree::smoke" + "--skip=functions::function_body" + "--skip=functions::function_inputs" + "--skip=functions::function_outputs" + "--skip=max_depth::depth_2::smoke" + "--skip=selection::no_fns::smoke" + "--skip=selection::no_modules::smoke" + "--skip=selection::no_traits::smoke" + "--skip=selection::no_types::smoke" + "--skip=fields::enum_fields" + "--skip=fields::struct_fields" + "--skip=fields::tuple_fields" + "--skip=fields::union_fields" + ]; + meta = with lib; { description = "A cargo plugin for showing a tree-like overview of a crate's modules"; mainProgram = "cargo-modules"; From cf99dec338917009c992386bf037ad0e778a8c0b Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 21 Apr 2024 13:19:51 +0200 Subject: [PATCH 73/97] python311Packages.mechanize: fix compat with Python 3.11+ Closes: #305577 --- pkgs/development/python-modules/mechanize/default.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/development/python-modules/mechanize/default.nix b/pkgs/development/python-modules/mechanize/default.nix index 0f89f3f42525..3724fa64d06e 100644 --- a/pkgs/development/python-modules/mechanize/default.nix +++ b/pkgs/development/python-modules/mechanize/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchPypi +, fetchpatch2 , html5lib , pytestCheckHook , pythonOlder @@ -19,6 +20,14 @@ buildPythonPackage rec { hash = "sha256-aaXtsJYvkh6LEINzaMIkLYrQSfC5H/aZzn9gG/xDFSE="; }; + patches = [ + (fetchpatch2 { + # python 3.11+ compat + url = "https://github.com/python-mechanize/mechanize/commit/1324b09b661aaac7d4cdc7e1e9d49e1c3851db2c.patch"; + hash = "sha256-d0Zuz6m2Uv8pnR8TC0L+AStS82rPPTpQrrjkCZnJliE="; + }) + ]; + nativeBuildInputs = [ setuptools ]; From 8bb35a61f2b6a3fab8c61e72fb2d411da2e06b13 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Sun, 21 Apr 2024 13:25:18 +0200 Subject: [PATCH 74/97] python311Packages.spacy-models: rename from spacy_models --- pkgs/development/python-modules/snorkel/default.nix | 4 ++-- .../spacy-transformers/annotation-test/default.nix | 4 ++-- .../python-modules/spacy/annotation-test/default.nix | 4 ++-- pkgs/development/python-modules/spacy/default.nix | 2 +- pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 4 ++-- 6 files changed, 10 insertions(+), 9 deletions(-) diff --git a/pkgs/development/python-modules/snorkel/default.nix b/pkgs/development/python-modules/snorkel/default.nix index 8da4fd87d736..04e605d14554 100644 --- a/pkgs/development/python-modules/snorkel/default.nix +++ b/pkgs/development/python-modules/snorkel/default.nix @@ -16,7 +16,7 @@ , pyspark , dill , dask -, spacy_models +, spacy-models }: let pname = "snorkel"; @@ -56,7 +56,7 @@ buildPythonPackage { pyspark dill dask - spacy_models.en_core_web_sm + spacy-models.en_core_web_sm ] ++ dask.optional-dependencies.distributed; meta = with lib; { diff --git a/pkgs/development/python-modules/spacy-transformers/annotation-test/default.nix b/pkgs/development/python-modules/spacy-transformers/annotation-test/default.nix index c9e1f3400f3a..f2b4bfb3a068 100644 --- a/pkgs/development/python-modules/spacy-transformers/annotation-test/default.nix +++ b/pkgs/development/python-modules/spacy-transformers/annotation-test/default.nix @@ -1,4 +1,4 @@ -{ stdenv, pytest, spacy_models }: +{ stdenv, pytest, spacy-models }: stdenv.mkDerivation { name = "spacy-transformers-annotation-test"; @@ -9,7 +9,7 @@ stdenv.mkDerivation { dontBuild = true; doCheck = true; - nativeCheckInputs = [ pytest spacy_models.en_core_web_trf ]; + nativeCheckInputs = [ pytest spacy-models.en_core_web_trf ]; checkPhase = '' pytest annotate.py diff --git a/pkgs/development/python-modules/spacy/annotation-test/default.nix b/pkgs/development/python-modules/spacy/annotation-test/default.nix index c7d5efe86641..91ab0f33acaa 100644 --- a/pkgs/development/python-modules/spacy/annotation-test/default.nix +++ b/pkgs/development/python-modules/spacy/annotation-test/default.nix @@ -1,4 +1,4 @@ -{ stdenv, pytest, spacy_models }: +{ stdenv, pytest, spacy-models }: stdenv.mkDerivation { name = "spacy-annotation-test"; @@ -9,7 +9,7 @@ stdenv.mkDerivation { dontBuild = true; doCheck = true; - nativeCheckInputs = [ pytest spacy_models.en_core_web_sm ]; + nativeCheckInputs = [ pytest spacy-models.en_core_web_sm ]; checkPhase = '' pytest annotate.py diff --git a/pkgs/development/python-modules/spacy/default.nix b/pkgs/development/python-modules/spacy/default.nix index fa1c101ecb38..8e2bd3cb4870 100644 --- a/pkgs/development/python-modules/spacy/default.nix +++ b/pkgs/development/python-modules/spacy/default.nix @@ -123,7 +123,7 @@ buildPythonPackage rec { nix-update python3Packages.spacy # update spacy models as well - echo | nix-shell maintainers/scripts/update.nix --argstr package python3Packages.spacy_models.en_core_web_sm + echo | nix-shell maintainers/scripts/update.nix --argstr package python3Packages.spacy-models.en_core_web_sm ''; tests.annotation = callPackage ./annotation-test { }; }; diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 4a4a5addeac0..1667222413a5 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -476,6 +476,7 @@ mapAliases ({ smpp_pdu = smpp-pdu; # added 2024-03-05 somecomfort = throw "somecomfort was removed because Home Assistant switched to aiosomecomfort"; # added 2023-02-01 sorl_thumbnail = sorl-thumbnail; # added 2023-11-12 + spacy_models = spacy-models; # added 2024-04-21 SPARQLWrapper = sparqlwrapper; spark_parser = spark-parser; # added 2024-01-07 sphinx-jquery = sphinxcontrib-jquery; # added 2023-02-24 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 2ccfa2087a5f..e292c7a767d4 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -14086,7 +14086,7 @@ self: super: with self; { spacy-lookups-data = callPackage ../development/python-modules/spacy/lookups-data.nix { }; - spacy_models = callPackage ../development/python-modules/spacy/models.nix { + spacy-models = callPackage ../development/python-modules/spacy/models.nix { inherit (pkgs) jq; }; @@ -14913,7 +14913,7 @@ self: super: with self; { textacy = callPackage ../development/python-modules/textacy { }; textnets = callPackage ../development/python-modules/textnets { - en_core_web_sm = spacy_models.en_core_web_sm; + en_core_web_sm = spacy-models.en_core_web_sm; }; texttable = callPackage ../development/python-modules/texttable { }; From 2980c6217b0d0726e9d0040178a6adb8cb596738 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 21 Apr 2024 11:31:47 +0000 Subject: [PATCH 75/97] nh: 3.5.10 -> 3.5.13 --- pkgs/by-name/nh/nh/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/nh/nh/package.nix b/pkgs/by-name/nh/nh/package.nix index 780e3b2a0693..3d1480da73d2 100644 --- a/pkgs/by-name/nh/nh/package.nix +++ b/pkgs/by-name/nh/nh/package.nix @@ -10,7 +10,7 @@ , nix-output-monitor }: let - version = "3.5.10"; + version = "3.5.13"; runtimeDeps = [ nvd nix-output-monitor ]; in rustPlatform.buildRustPackage { @@ -21,7 +21,7 @@ rustPlatform.buildRustPackage { owner = "viperML"; repo = "nh"; rev = "refs/tags/v${version}"; - hash = "sha256-uEVd15WsX+Wti9PXW724puFcsFO72VTiJyBwW2WXT9M="; + hash = "sha256-lTy5gmB3dJZJKag2uuuxXvZCAt/RhLnI0jbIicBJfCo="; }; strictDeps = true; @@ -47,7 +47,7 @@ rustPlatform.buildRustPackage { --prefix PATH : ${lib.makeBinPath runtimeDeps} ''; - cargoHash = "sha256-/aqs/l+Qi2b8zxHXqxdHLBpSr5+vVsd6pY/QnHbkmb0="; + cargoHash = "sha256-X8+GmPFxvgeNxMuOacoCUCgdZ/+N4mwQFMUtvO1E998="; passthru.updateScript = nix-update-script { }; From 40abc6a169392327abfac5b09ef793ac5776a675 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 21 Apr 2024 12:11:09 +0000 Subject: [PATCH 76/97] numix-icon-theme-circle: 24.03.12 -> 24.04.16 --- pkgs/data/icons/numix-icon-theme-circle/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/icons/numix-icon-theme-circle/default.nix b/pkgs/data/icons/numix-icon-theme-circle/default.nix index 5422eaac8073..5fd04d5a1b1d 100644 --- a/pkgs/data/icons/numix-icon-theme-circle/default.nix +++ b/pkgs/data/icons/numix-icon-theme-circle/default.nix @@ -2,13 +2,13 @@ stdenvNoCC.mkDerivation rec { pname = "numix-icon-theme-circle"; - version = "24.03.12"; + version = "24.04.16"; src = fetchFromGitHub { owner = "numixproject"; repo = pname; rev = version; - sha256 = "sha256-WWgppmMIXa7AtMu8Tu3TOt4JvsAkpufZva1reE+UaWg="; + sha256 = "sha256-1SBIEqbgJwRcoCPWDL5YoapNHsrqWcpjFo0xp+GSXXs="; }; nativeBuildInputs = [ gtk3 ]; From c0270e4a90667cbad2689ceec7c316b7f1cc0f8a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 21 Apr 2024 12:46:45 +0000 Subject: [PATCH 77/97] hishtory: 0.290 -> 0.291 --- pkgs/shells/hishtory/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/shells/hishtory/default.nix b/pkgs/shells/hishtory/default.nix index 051fed0074cc..b5bc4ce70539 100644 --- a/pkgs/shells/hishtory/default.nix +++ b/pkgs/shells/hishtory/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "hishtory"; - version = "0.290"; + version = "0.291"; src = fetchFromGitHub { owner = "ddworken"; repo = pname; rev = "v${version}"; - hash = "sha256-zFBq1BHj0w+ubKAnyL+Asd5vykM2Vpg2va0jxY2vwUk="; + hash = "sha256-pBUe0iwzv9Yv9/wmqIjZrDkjBYbARL+A8fhUZJnHRaQ="; }; vendorHash = "sha256-qw4whXAX8y0x7IWnpZHT45XTQ82CdoWPDnoQhr20cII="; From 1ada504517ec7b763a72496396fc51ce2f40f530 Mon Sep 17 00:00:00 2001 From: Francesco Gazzetta Date: Fri, 19 Apr 2024 16:03:05 +0200 Subject: [PATCH 78/97] rkpd2: 2.0.5 -> 2.0.6 --- pkgs/games/shattered-pixel-dungeon/rkpd2.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/shattered-pixel-dungeon/rkpd2.nix b/pkgs/games/shattered-pixel-dungeon/rkpd2.nix index d671e25cc34f..5f73a825fca4 100644 --- a/pkgs/games/shattered-pixel-dungeon/rkpd2.nix +++ b/pkgs/games/shattered-pixel-dungeon/rkpd2.nix @@ -4,13 +4,13 @@ callPackage ./generic.nix rec { pname = "rkpd2"; - version = "2.0.5"; + version = "2.0.6"; src = fetchFromGitHub { owner = "Zrp200"; repo = "rkpd2"; rev = "v${version}"; - hash = "sha256-VVqwgwDuIyRd5MU1/64Xz+8TbIOrXcHufs0XqD/Q4ls="; + hash = "sha256-jwH0nEsv3agUCZt5Mhuv1JSeELOKfrsj3cnmAJsV9sM="; }; depsHash = "sha256-vihoR0bPh7590sRxeYJ1uuynNRxtRBuiFUrdmsRNUJc="; From 3a506c127429517163e61aca6afc8c0a3e0867e0 Mon Sep 17 00:00:00 2001 From: Francesco Gazzetta Date: Fri, 19 Apr 2024 16:04:43 +0200 Subject: [PATCH 79/97] faircamp: 0.13.0 -> 0.14.0 Diff: https://codeberg.org/simonrepp/faircamp/compare/0.13.0...0.14.0 --- pkgs/applications/misc/faircamp/Cargo.lock | 487 ++++++++++++++++++-- pkgs/applications/misc/faircamp/default.nix | 6 +- 2 files changed, 446 insertions(+), 47 deletions(-) diff --git a/pkgs/applications/misc/faircamp/Cargo.lock b/pkgs/applications/misc/faircamp/Cargo.lock index 3c9a2765b2a2..deeaca6b86be 100644 --- a/pkgs/applications/misc/faircamp/Cargo.lock +++ b/pkgs/applications/misc/faircamp/Cargo.lock @@ -53,7 +53,7 @@ dependencies = [ "actix-service", "actix-utils", "ahash", - "base64", + "base64 0.21.7", "bitflags 2.4.1", "brotli", "bytes", @@ -261,6 +261,12 @@ dependencies = [ "mp4parse 0.10.1", ] +[[package]] +name = "aligned-vec" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4aa90d7ce82d4be67b64039a3d588d38dbcc6736577de4a847025ce5b0c468d1" + [[package]] name = "alloc-no-stdlib" version = "2.0.4" @@ -345,12 +351,35 @@ version = "1.0.75" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6" +[[package]] +name = "arbitrary" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7d5a26814d8dcb93b0e5a0ff3c6d80a8843bafb21b39e8e18a6f05471870e110" + [[package]] name = "arbitrary-int" version = "1.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fe8e2a586ecd6eb29477a0c25b19742acca4fa5e39c92e127656616810c20579" +[[package]] +name = "arg_enum_proc_macro" +version = "0.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ae92a5119aa49cdbcf6b9f893fe4e1d98b04ccbf82ee0584ad948a44a734dea" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.48", +] + +[[package]] +name = "arrayvec" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" + [[package]] name = "atomic-polyfill" version = "0.1.11" @@ -377,6 +406,29 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" +[[package]] +name = "av1-grain" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6678909d8c5d46a42abcf571271e15fdbc0a225e3646cf23762cd415046c78bf" +dependencies = [ + "anyhow", + "arrayvec", + "log", + "nom", + "num-rational", + "v_frame", +] + +[[package]] +name = "avif-serialize" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "876c75a42f6364451a033496a14c44bffe41f5f4a8236f697391f11024e596d2" +dependencies = [ + "arrayvec", +] + [[package]] name = "az" version = "1.2.1" @@ -404,6 +456,12 @@ version = "0.21.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" +[[package]] +name = "base64" +version = "0.22.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9475866fec1451be56a3c2400fd081ff546538961565ccb5b7142cbd22bc7a51" + [[package]] name = "base64ct" version = "1.6.0" @@ -446,6 +504,12 @@ dependencies = [ "cfg-if", ] +[[package]] +name = "bitstream-io" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06c9989a51171e2e81038ab168b6ae22886fe9ded214430dbb4f41c28cf176da" + [[package]] name = "block-buffer" version = "0.10.4" @@ -476,6 +540,12 @@ dependencies = [ "alloc-stdlib", ] +[[package]] +name = "built" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38d17f4d6e4dc36d1a02fbedc2753a096848e7c1b0772f7654eab8e2c927dd53" + [[package]] name = "bumpalo" version = "3.14.0" @@ -546,6 +616,16 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6d43a04d8753f35258c91f8ec639f792891f748a1edbd759cf1dcea3382ad83c" +[[package]] +name = "cfg-expr" +version = "0.15.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa50868b64a9a6fda9d593ce778849ea8715cd2a3d2cc17ffdb4a2f2f2f1961d" +dependencies = [ + "smallvec", + "target-lexicon", +] + [[package]] name = "cfg-if" version = "1.0.0" @@ -554,9 +634,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "chrono" -version = "0.4.33" +version = "0.4.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f13690e35a5e4ace198e7beea2895d29f3a9cc55015fcebe6336bd2010af9eb" +checksum = "8a0d04d43504c61aa6c7531f1871dd0d418d91130162063b789da00fd7057a5e" dependencies = [ "android-tzdata", "iana-time-zone", @@ -579,9 +659,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.4.18" +version = "4.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e578d6ec4194633722ccf9544794b71b1385c3c027efe0c55db226fc880865c" +checksum = "90bc066a67923782aa8515dbaea16946c5bcc5addbd668bb80af688e53e548a0" dependencies = [ "clap_builder", "clap_derive", @@ -589,9 +669,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.4.18" +version = "4.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4df4df40ec50c46000231c914968278b1eb05098cf8f1b3a518a95030e71d1c7" +checksum = "ae129e2e766ae0ec03484e609954119f123cc1fe650337e155d03b022f24f7b4" dependencies = [ "anstream", "anstyle", @@ -601,9 +681,9 @@ dependencies = [ [[package]] name = "clap_derive" -version = "4.4.7" +version = "4.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf9804afaaf59a91e75b022a30fb7229a7901f60c755489cc61c9b423b836442" +checksum = "528131438037fd55894f62d6e9f068b8f45ac57ffa77517819645d10aed04f64" dependencies = [ "heck", "proc-macro2", @@ -613,9 +693,9 @@ dependencies = [ [[package]] name = "clap_lex" -version = "0.6.0" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "702fc72eb24e5a1e48ce58027a675bc24edd52096d5397d4aea7c6dd9eca0bd1" +checksum = "98cc8fbded0c607b7ba9dd60cd98df59af97e84d24e49c8557331cfc26d301ce" [[package]] name = "claxon" @@ -822,8 +902,8 @@ dependencies = [ [[package]] name = "enolib" -version = "0.4.1" -source = "git+https://codeberg.org/simonrepp/enolib-rs?tag=0.4.1#1ca85dc8af9f74f65b199b2ab6c5c94f5b119b93" +version = "0.4.2" +source = "git+https://codeberg.org/simonrepp/enolib-rs?tag=0.4.2#b97102e1890d91f184469f9c778d07df7d117adc" [[package]] name = "equivalent" @@ -849,12 +929,12 @@ dependencies = [ [[package]] name = "faircamp" -version = "0.13.0" +version = "0.14.0" dependencies = [ "actix-files", "actix-web", "alac", - "base64", + "base64 0.22.0", "bincode", "chrono", "clap", @@ -1010,9 +1090,9 @@ dependencies = [ [[package]] name = "gif" -version = "0.12.0" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80792593675e051cf94a4b111980da2ba60d4a83e43e0048c5693baab3977045" +checksum = "3fb2d69b19215e18bb912fa30f7ce15846e301408695e44e0ef719f1da9e19f2" dependencies = [ "color_quant", "weezl", @@ -1092,9 +1172,9 @@ dependencies = [ [[package]] name = "heck" -version = "0.4.1" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" +checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" [[package]] name = "hermit-abi" @@ -1186,9 +1266,9 @@ dependencies = [ [[package]] name = "id3" -version = "1.12.0" +version = "1.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ba0a11a3cf6f08d58a5629531bdb4e7c3b8b595e9812a31a7058b1176c4631e" +checksum = "79f41f7e5ad125c63d55b112a98afb753742fa7f97692bfbbc52544b89e1ff1f" dependencies = [ "bitflags 2.4.1", "byteorder", @@ -1207,22 +1287,43 @@ dependencies = [ [[package]] name = "image" -version = "0.24.8" +version = "0.25.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "034bbe799d1909622a74d1193aa50147769440040ff36cb2baa947609b0a4e23" +checksum = "fd54d660e773627692c524beaad361aca785a4f9f5730ce91f42aabe5bce3d11" dependencies = [ "bytemuck", "byteorder", "color_quant", "exr", "gif", - "jpeg-decoder", + "image-webp", "num-traits", "png", "qoi", + "ravif", + "rayon", + "rgb", "tiff", + "zune-core", + "zune-jpeg", ] +[[package]] +name = "image-webp" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a84a25dcae3ac487bc24ef280f9e20c79c9b1a3e5e32cbed3041d1c514aa87c" +dependencies = [ + "byteorder", + "thiserror", +] + +[[package]] +name = "imgref" +version = "1.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "44feda355f4159a7c757171a77de25daf6411e217b4cabd03bd6650690468126" + [[package]] name = "indexmap" version = "2.1.0" @@ -1235,9 +1336,9 @@ dependencies = [ [[package]] name = "indoc" -version = "2.0.4" +version = "2.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e186cfbae8084e513daff4240b4797e342f988cecda4fb6c939150f96315fd8" +checksum = "b248f5224d1d606005e02c97f5aa4e88eeb230488bcc03bc9ca4d7991399f2b5" [[package]] name = "inout" @@ -1248,6 +1349,17 @@ dependencies = [ "generic-array", ] +[[package]] +name = "interpolate_name" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c34819042dc3d3971c46c2190835914dfbe0c3c13f61449b2997f4e9722dfa60" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.48", +] + [[package]] name = "iso_country" version = "0.1.4" @@ -1266,6 +1378,15 @@ dependencies = [ "iso_country", ] +[[package]] +name = "itertools" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569" +dependencies = [ + "either", +] + [[package]] name = "itoa" version = "1.0.9" @@ -1308,9 +1429,6 @@ name = "jpeg-decoder" version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bc0000e42512c92e31c2252315bda326620a4e034105e900c98ec492fa077b3e" -dependencies = [ - "rayon", -] [[package]] name = "js-sys" @@ -1356,13 +1474,24 @@ version = "0.2.150" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "89d92a4743f9a61002fae18374ed11e7973f530cb3a3255fb354818118b2203c" +[[package]] +name = "libfuzzer-sys" +version = "0.4.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a96cfd5557eb82f2b83fed4955246c988d331975a002961b07c81584d107e7f7" +dependencies = [ + "arbitrary", + "cc", + "once_cell", +] + [[package]] name = "libvips" version = "1.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bfedc1cd1634c8bc74e91653646f4be7ec7630fcd828ae35a35272a0bbfd9e8d" dependencies = [ - "num-derive", + "num-derive 0.3.3", "num-traits", ] @@ -1399,6 +1528,15 @@ version = "0.4.20" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" +[[package]] +name = "loop9" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fae87c125b03c1d2c0150c90365d7d6bcc53fb73a9acaef207d2d065860f062" +dependencies = [ + "imgref", +] + [[package]] name = "malloc_buf" version = "0.0.6" @@ -1408,6 +1546,16 @@ dependencies = [ "libc", ] +[[package]] +name = "maybe-rayon" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ea1f30cedd69f0a2954655f7188c6a834246d2bcf1e315e2ac40c4b24dc9519" +dependencies = [ + "cfg-if", + "rayon", +] + [[package]] name = "memchr" version = "2.6.4" @@ -1528,6 +1676,12 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "27b02d87554356db9e9a873add8782d4ea6e3e58ea071a9adb9a2e8ddb884a8b" +[[package]] +name = "new_debug_unreachable" +version = "1.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "650eef8c711430f1a879fdd01d4745a7deea475becfb90269c06775983bbf086" + [[package]] name = "nom" version = "7.1.3" @@ -1538,6 +1692,23 @@ dependencies = [ "minimal-lexical", ] +[[package]] +name = "noop_proc_macro" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0676bb32a98c1a483ce53e500a81ad9c3d5b3f7c920c28c24e9cb0980d0b5bc8" + +[[package]] +name = "num-bigint" +version = "0.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "608e7659b5c3d7cba262d894801b9ec9d00de989e8a82bd4bef91d08da45cdc0" +dependencies = [ + "autocfg", + "num-integer", + "num-traits", +] + [[package]] name = "num-derive" version = "0.3.3" @@ -1549,6 +1720,38 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "num-derive" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed3955f1a9c7c0c15e092f9c887db08b1fc683305fdf6eb6684f22555355e202" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.48", +] + +[[package]] +name = "num-integer" +version = "0.1.46" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7969661fd2958a5cb096e56c8e1ad0444ac2bbcd0061bd28660485a44879858f" +dependencies = [ + "num-traits", +] + +[[package]] +name = "num-rational" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0638a1c9d0a3c0914158145bc76cff373a75a627e6ecbfb71cbe6f453a5a19b0" +dependencies = [ + "autocfg", + "num-bigint", + "num-integer", + "num-traits", +] + [[package]] name = "num-traits" version = "0.2.17" @@ -1606,9 +1809,9 @@ dependencies = [ [[package]] name = "once_cell" -version = "1.18.0" +version = "1.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" +checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" [[package]] name = "opus" @@ -1769,6 +1972,25 @@ dependencies = [ "unicode-ident", ] +[[package]] +name = "profiling" +version = "1.0.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "43d84d1d7a6ac92673717f9f6d1518374ef257669c24ebc5ac25d5033828be58" +dependencies = [ + "profiling-procmacros", +] + +[[package]] +name = "profiling-procmacros" +version = "1.0.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8021cf59c8ec9c432cfc2526ac6b8aa508ecaf29cd415f271b8406c1b851c3fd" +dependencies = [ + "quote", + "syn 2.0.48", +] + [[package]] name = "pulldown-cmark" version = "0.10.0" @@ -1796,6 +2018,12 @@ dependencies = [ "bytemuck", ] +[[package]] +name = "quick-error" +version = "2.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a993555f31e5a609f617c12db6250dedcac1b0a85076912c436e6fc9b2c8e6a3" + [[package]] name = "quote" version = "1.0.35" @@ -1835,6 +2063,56 @@ dependencies = [ "getrandom", ] +[[package]] +name = "rav1e" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cd87ce80a7665b1cce111f8a16c1f3929f6547ce91ade6addf4ec86a8dda5ce9" +dependencies = [ + "arbitrary", + "arg_enum_proc_macro", + "arrayvec", + "av1-grain", + "bitstream-io", + "built", + "cfg-if", + "interpolate_name", + "itertools", + "libc", + "libfuzzer-sys", + "log", + "maybe-rayon", + "new_debug_unreachable", + "noop_proc_macro", + "num-derive 0.4.2", + "num-traits", + "once_cell", + "paste", + "profiling", + "rand", + "rand_chacha", + "simd_helpers", + "system-deps", + "thiserror", + "v_frame", + "wasm-bindgen", +] + +[[package]] +name = "ravif" +version = "0.11.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bc13288f5ab39e6d7c9d501759712e6969fcc9734220846fc9ed26cae2cc4234" +dependencies = [ + "avif-serialize", + "imgref", + "loop9", + "quick-error", + "rav1e", + "rayon", + "rgb", +] + [[package]] name = "raw-window-handle" version = "0.5.2" @@ -1899,6 +2177,15 @@ version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" +[[package]] +name = "rgb" +version = "0.8.37" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05aaa8004b64fd573fc9d002f4e632d51ad4f026c2b5ba95fcb6c2f32c2c47d8" +dependencies = [ + "bytemuck", +] + [[package]] name = "rmp3" version = "0.3.1" @@ -1963,18 +2250,18 @@ checksum = "836fa6a3e1e547f9a2c4040802ec865b5d85f4014efe00555d7090a3dcaa1090" [[package]] name = "serde" -version = "1.0.196" +version = "1.0.197" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "870026e60fa08c69f064aa766c10f10b1d62db9ccd4d0abb206472bee0ce3b32" +checksum = "3fb1c873e1b9b056a4dc4c0c198b24c3ffa059243875552b2bd0933b1aee4ce2" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.196" +version = "1.0.197" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33c85360c95e7d137454dc81d9a4ed2b8efd8fbe19cee57357b32b9771fccb67" +checksum = "7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b" dependencies = [ "proc-macro2", "quote", @@ -1992,6 +2279,15 @@ dependencies = [ "serde", ] +[[package]] +name = "serde_spanned" +version = "0.6.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eb3622f419d1296904700073ea6cc23ad690adbd66f13ea683df73298736f0c1" +dependencies = [ + "serde", +] + [[package]] name = "serde_urlencoded" version = "0.7.1" @@ -2041,6 +2337,15 @@ version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe" +[[package]] +name = "simd_helpers" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95890f873bec569a0362c235787f3aca6e1e887302ba4840839bcc6459c42da6" +dependencies = [ + "quote", +] + [[package]] name = "slab" version = "0.4.9" @@ -2099,9 +2404,9 @@ checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" [[package]] name = "strsim" -version = "0.10.0" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" +checksum = "5ee073c9e4cd00e28217186dbe12796d692868f432bf2e97ee73bed0c56dfa01" [[package]] name = "subtle" @@ -2131,6 +2436,25 @@ dependencies = [ "unicode-ident", ] +[[package]] +name = "system-deps" +version = "6.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a3e535eb8dded36d55ec13eddacd30dec501792ff23a0b1682c38601b8cf2349" +dependencies = [ + "cfg-expr", + "heck", + "pkg-config", + "toml", + "version-compare", +] + +[[package]] +name = "target-lexicon" +version = "0.12.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e1fc403891a21bcfb7c37834ba66a547a8f402146eba7265b5a6d88059c9ff2f" + [[package]] name = "thiserror" version = "1.0.50" @@ -2208,9 +2532,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.36.0" +version = "1.37.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61285f6515fa018fb2d1e46eb21223fff441ee8db5d0f1435e8ab4f5cdb80931" +checksum = "1adbebffeca75fcfd058afa480fb6c0b81e165a0323f9c9d39c9697e37c46787" dependencies = [ "backtrace", "bytes", @@ -2250,6 +2574,40 @@ dependencies = [ "tracing", ] +[[package]] +name = "toml" +version = "0.8.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e9dd1545e8208b4a5af1aa9bbd0b4cf7e9ea08fabc5d0a5c67fcaafa17433aa3" +dependencies = [ + "serde", + "serde_spanned", + "toml_datetime", + "toml_edit", +] + +[[package]] +name = "toml_datetime" +version = "0.6.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1" +dependencies = [ + "serde", +] + +[[package]] +name = "toml_edit" +version = "0.22.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e40bb779c5187258fd7aad0eb68cb8706a0a81fa712fbea808ab43c4b8374c4" +dependencies = [ + "indexmap", + "serde", + "serde_spanned", + "toml_datetime", + "winnow", +] + [[package]] name = "tracing" version = "0.1.40" @@ -2329,12 +2687,29 @@ version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" +[[package]] +name = "v_frame" +version = "0.3.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d6f32aaa24bacd11e488aa9ba66369c7cd514885742c9fe08cfe85884db3e92b" +dependencies = [ + "aligned-vec", + "num-traits", + "wasm-bindgen", +] + [[package]] name = "v_htmlescape" version = "0.15.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4e8257fbc510f0a46eb602c10215901938b5c2a7d5e70fc11483b1d3c9b5b18c" +[[package]] +name = "version-compare" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "852e951cb7832cb45cb1169900d19760cfa39b82bc0ea9c0e5a14ae88411c98b" + [[package]] name = "version_check" version = "0.9.4" @@ -2423,9 +2798,9 @@ dependencies = [ [[package]] name = "webbrowser" -version = "0.8.12" +version = "0.8.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "82b2391658b02c27719fc5a0a73d6e696285138e8b12fba9d4baa70451023c71" +checksum = "d1b04c569c83a9bb971dd47ec6fd48753315f4bf989b9b04a2e7ca4d7f0dc950" dependencies = [ "core-foundation", "home", @@ -2440,9 +2815,9 @@ dependencies = [ [[package]] name = "weezl" -version = "0.1.7" +version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9193164d4de03a926d909d3bc7c30543cecb35400c02114792c2cae20d5e2dbb" +checksum = "53a85b86a771b1c87058196170769dd264f66c0782acf1ae6cc51bfd64b39082" [[package]] name = "winapi" @@ -2673,6 +3048,15 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04" +[[package]] +name = "winnow" +version = "0.6.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dffa400e67ed5a4dd237983829e66475f0a4a26938c4b04c21baede6262215b8" +dependencies = [ + "memchr", +] + [[package]] name = "zerocopy" version = "0.7.27" @@ -2760,6 +3144,12 @@ dependencies = [ "pkg-config", ] +[[package]] +name = "zune-core" +version = "0.4.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f423a2c17029964870cfaabb1f13dfab7d092a62a29a89264f4d36990ca414a" + [[package]] name = "zune-inflate" version = "0.2.54" @@ -2768,3 +3158,12 @@ checksum = "73ab332fe2f6680068f3582b16a24f90ad7096d5d39b974d1c0aff0125116f02" dependencies = [ "simd-adler32", ] + +[[package]] +name = "zune-jpeg" +version = "0.4.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec866b44a2a1fd6133d363f073ca1b179f438f99e7e5bfb1e33f7181facfe448" +dependencies = [ + "zune-core", +] diff --git a/pkgs/applications/misc/faircamp/default.nix b/pkgs/applications/misc/faircamp/default.nix index 9aa92101a1cc..3b1cdf51321b 100644 --- a/pkgs/applications/misc/faircamp/default.nix +++ b/pkgs/applications/misc/faircamp/default.nix @@ -16,20 +16,20 @@ rustPlatform.buildRustPackage rec { pname = "faircamp"; - version = "0.13.0"; + version = "0.14.0"; src = fetchFromGitea { domain = "codeberg.org"; owner = "simonrepp"; repo = "faircamp"; rev = version; - hash = "sha256-Q0jsqOWeXEfekegxYvq3oIIuVMGyeKL1no2Jh4JByD0="; + hash = "sha256-gHlm5ZQ5u+gOSBERlg6iYJxGTfs/+L4y2TY+ZOsVYh8="; }; cargoLock = { lockFile = ./Cargo.lock; outputHashes = { - "enolib-0.4.1" = "sha256-Uz9AXksD3YO6PjSr29RZCQjdoPiFBTXecbE0fluA0LU="; + "enolib-0.4.2" = "sha256-FJuWKcwjoi/wKfTzxghobNWblhnKRdUvHOejhpCF7kY="; }; }; From 68c6f17a49d024e77a51b145c13537398dde9887 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 21 Apr 2024 13:18:41 +0000 Subject: [PATCH 80/97] mount-zip: 1.0.13 -> 1.0.14 --- pkgs/tools/filesystems/mount-zip/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/filesystems/mount-zip/default.nix b/pkgs/tools/filesystems/mount-zip/default.nix index 362ca4e2743e..8bff2e4fb47e 100644 --- a/pkgs/tools/filesystems/mount-zip/default.nix +++ b/pkgs/tools/filesystems/mount-zip/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "mount-zip"; - version = "1.0.13"; + version = "1.0.14"; src = fetchFromGitHub { owner = "google"; repo = "mount-zip"; rev = "v${finalAttrs.version}"; - hash = "sha256-/iPq/v7ap5livYR5tA90JiaGxQfR9VG+FONECeCFdOQ="; + hash = "sha256-S2snseC9JAjYRberL2/CyRQTcZQ8GtGQNU3WuTqSRl4="; }; nativeBuildInputs = [ boost gcc icu pandoc pkg-config ]; From 5d60c6147a4a860c5fa07647ea9ea10df8936d46 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 21 Apr 2024 13:29:01 +0000 Subject: [PATCH 81/97] ov: 0.33.3 -> 0.34.0 --- pkgs/tools/text/ov/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/text/ov/default.nix b/pkgs/tools/text/ov/default.nix index d74d4bc06182..e0ccf023a5ae 100644 --- a/pkgs/tools/text/ov/default.nix +++ b/pkgs/tools/text/ov/default.nix @@ -10,16 +10,16 @@ buildGoModule rec { pname = "ov"; - version = "0.33.3"; + version = "0.34.0"; src = fetchFromGitHub { owner = "noborus"; repo = "ov"; rev = "refs/tags/v${version}"; - hash = "sha256-dKAZ8rcm1J3jRfOyLz74YuVv0hZ3iWXR1slBTu5CtYU="; + hash = "sha256-2Qk94xaDD+O8jO7Pq1MUWieEjUlVLxYxMMcsrEUwP4M="; }; - vendorHash = "sha256-6Ik//r6JJ2n9lXr6JZ6BGIIL7yXXray+flEwQ0IKyA4="; + vendorHash = "sha256-USMDIgB4LhI4kzSg2kkCXfbN9t49WEg0fUtAcZkngac="; ldflags = [ "-s" From 588427c9836a61ad45843ed868054ae1312b386d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 21 Apr 2024 13:31:22 +0000 Subject: [PATCH 82/97] open-scq30: 1.11.0 -> 1.12.0 --- pkgs/by-name/op/open-scq30/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/op/open-scq30/package.nix b/pkgs/by-name/op/open-scq30/package.nix index 12b709282f6c..7ab3452bd2df 100644 --- a/pkgs/by-name/op/open-scq30/package.nix +++ b/pkgs/by-name/op/open-scq30/package.nix @@ -18,13 +18,13 @@ rustPlatform.buildRustPackage rec { pname = "open-scq30"; - version = "1.11.0"; + version = "1.12.0"; src = fetchFromGitHub { owner = "Oppzippy"; repo = "OpenSCQ30"; rev = "v${version}"; - hash = "sha256-yls7F6ou0TsoY6CDi694fJrq30Y3B6d96T1VWl47K0w="; + hash = "sha256-DL2hYm1j27K0nnBvE3iGnguqm0m1k56bkuG+6+u4u4c="; }; nativeBuildInputs = [ @@ -48,7 +48,7 @@ rustPlatform.buildRustPackage rec { darwin.apple_sdk.frameworks.Foundation ]; - cargoHash = "sha256-VxweKzXNWOrBrzLzId8D6O0tZG8bI7HjhD+GJ3vRyhk="; + cargoHash = "sha256-YBJd43xOCumQbrvzfV/+F63McYzHg1bGI3icgGzGZrQ="; INSTALL_PREFIX = placeholder "out"; From b87790536d7151d6fef61bc9362bafb0ce8b1445 Mon Sep 17 00:00:00 2001 From: Preston Hunt Date: Fri, 12 Apr 2024 08:19:41 -0700 Subject: [PATCH 83/97] nixos/greenclip: restart daemon if it exits --- nixos/modules/services/misc/greenclip.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/misc/greenclip.nix b/nixos/modules/services/misc/greenclip.nix index 9d1483a5a047..d92cd1854877 100644 --- a/nixos/modules/services/misc/greenclip.nix +++ b/nixos/modules/services/misc/greenclip.nix @@ -18,7 +18,10 @@ in { description = "greenclip daemon"; wantedBy = [ "graphical-session.target" ]; after = [ "graphical-session.target" ]; - serviceConfig.ExecStart = "${cfg.package}/bin/greenclip daemon"; + serviceConfig = { + ExecStart = "${cfg.package}/bin/greenclip daemon"; + Restart = "always"; + }; }; environment.systemPackages = [ cfg.package ]; From 93ed9a478212a54f92293358c98633c27ab22648 Mon Sep 17 00:00:00 2001 From: Marcus Ramberg Date: Sun, 21 Apr 2024 16:02:42 +0200 Subject: [PATCH 84/97] rtfm: Add meta.mainProgram --- pkgs/applications/misc/rtfm/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/misc/rtfm/default.nix b/pkgs/applications/misc/rtfm/default.nix index 133bede81ae0..256ed98f9a8c 100644 --- a/pkgs/applications/misc/rtfm/default.nix +++ b/pkgs/applications/misc/rtfm/default.nix @@ -84,6 +84,7 @@ crystal.buildCrystalPackage rec { description = "Dash/docset reader with built in documentation for Crystal and GTK APIs"; homepage = "https://github.com/hugopl/rtfm/"; license = licenses.mit; + mainProgram = "rtfm"; maintainers = with maintainers; [ sund3RRR ]; }; } From dba1632221ede93219e940f4d51aa9a2c02b1aa0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 21 Apr 2024 14:12:19 +0000 Subject: [PATCH 85/97] vscode-extensions.myriad-dreamin.tinymist: 0.11.4 -> 0.11.5 --- .../vscode/extensions/myriad-dreamin.tinymist/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/vscode/extensions/myriad-dreamin.tinymist/default.nix b/pkgs/applications/editors/vscode/extensions/myriad-dreamin.tinymist/default.nix index 5e7c3f59f198..9dbf71b8b101 100644 --- a/pkgs/applications/editors/vscode/extensions/myriad-dreamin.tinymist/default.nix +++ b/pkgs/applications/editors/vscode/extensions/myriad-dreamin.tinymist/default.nix @@ -12,8 +12,8 @@ vscode-utils.buildVscodeMarketplaceExtension { publisher = "myriad-dreamin"; # Please update the corresponding binary (tinymist) when updating # this extension. - version = "0.11.4"; - hash = "sha256-VR+vl6mctwq9oSIgnfutvPFwfGUdEco8fCOjzMvPtII="; + version = "0.11.5"; + hash = "sha256-p97RREGKhTeXO5s4jP8qUsLtYxOj91ddQhsk6Q+50jc="; }; nativeBuildInputs = [ From accd533c431de4246746509e42dc8dbc6dd0aaea Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 21 Apr 2024 14:46:55 +0000 Subject: [PATCH 86/97] svd2rust: 0.33.0 -> 0.33.1 --- pkgs/development/tools/rust/svd2rust/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/svd2rust/default.nix b/pkgs/development/tools/rust/svd2rust/default.nix index 8891b364b56c..260809a5c9bf 100644 --- a/pkgs/development/tools/rust/svd2rust/default.nix +++ b/pkgs/development/tools/rust/svd2rust/default.nix @@ -2,14 +2,14 @@ rustPlatform.buildRustPackage rec { pname = "svd2rust"; - version = "0.33.0"; + version = "0.33.1"; src = fetchCrate { inherit pname version; - hash = "sha256-EdU/Hr1OQ02Jeq4OgJPOS//4wltBPoYdUcFMvlOjIBY="; + hash = "sha256-omAL/nRdB5wngOQTaZdnq9XaPnDj6kxda+27TQS7dUQ="; }; - cargoHash = "sha256-T4QRrSBjf47wGJIVfxZNGig8k7KWvQQIvV8zwRUP/38="; + cargoHash = "sha256-YmnKZhGDQ+eqHy/KQxp3ZdCxKrZEKcS2R+5/t6HhOCg="; # error: linker `aarch64-linux-gnu-gcc` not found postPatch = '' From 00ad4eba21cb456b0d6262ad3328c24cf77ec417 Mon Sep 17 00:00:00 2001 From: Tom Fitzhenry Date: Sun, 17 Mar 2024 13:23:52 +1100 Subject: [PATCH 87/97] nixos/tests/phosh: check phosh-mobile-settings starts --- nixos/tests/phosh.nix | 11 ++++++++++- .../window-managers/phosh/phosh-mobile-settings.nix | 6 +++++- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/nixos/tests/phosh.nix b/nixos/tests/phosh.nix index 78d6da31beee..d505f0ffc524 100644 --- a/nixos/tests/phosh.nix +++ b/nixos/tests/phosh.nix @@ -25,6 +25,10 @@ in { }; }; + environment.systemPackages = [ + pkgs.phosh-mobile-settings + ]; + systemd.services.phosh = { environment = { # Accelerated graphics fail on phoc 0.20 (wlroots 0.15) @@ -63,8 +67,13 @@ in { phone.screenshot("03launcher") with subtest("Check the on-screen keyboard shows"): - phone.send_chars("setting", delay=0.2) + phone.send_chars("mobile setting", delay=0.2) phone.wait_for_text("123") # A button on the OSK phone.screenshot("04osk") + + with subtest("Check mobile-phosh-settings starts"): + phone.send_chars("\n") + phone.wait_for_text("Tweak advanced mobile settings"); + phone.screenshot("05settings") ''; }) diff --git a/pkgs/applications/window-managers/phosh/phosh-mobile-settings.nix b/pkgs/applications/window-managers/phosh/phosh-mobile-settings.nix index 64ccff89f6e3..0635d7a5e407 100644 --- a/pkgs/applications/window-managers/phosh/phosh-mobile-settings.nix +++ b/pkgs/applications/window-managers/phosh/phosh-mobile-settings.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchurl +, nixosTests , directoryListingUpdater , meson , ninja @@ -59,7 +60,10 @@ stdenv.mkDerivation rec { ln -s '${phosh}/lib/phosh' "$out/lib/phosh" ''; - passthru.updateScript = directoryListingUpdater { }; + passthru = { + tests.phosh = nixosTests.phosh; + updateScript = directoryListingUpdater { }; + }; meta = with lib; { description = "A settings app for mobile specific things"; From 58bcc174af38c22b6846cb51de73f4a065ba43ac Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 20 Apr 2024 00:25:34 +0000 Subject: [PATCH 88/97] ccls: 0.20230717 -> 0.20240202 --- pkgs/development/tools/language-servers/ccls/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/language-servers/ccls/default.nix b/pkgs/development/tools/language-servers/ccls/default.nix index 078d9129f58a..c2e6ed7a0ea5 100644 --- a/pkgs/development/tools/language-servers/ccls/default.nix +++ b/pkgs/development/tools/language-servers/ccls/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "ccls"; - version = "0.20230717"; + version = "0.20240202"; src = fetchFromGitHub { owner = "MaskRay"; repo = "ccls"; rev = version; - sha256 = "sha256-u499fHd2lyqOYXJApFdiIXHQGF+QEVlQ4E8jm5VMb3w="; + sha256 = "sha256-xVx3+cnmIdoA7R1S31EaiPj+DOTqkINoQeMgauW61Ys="; }; nativeBuildInputs = [ cmake llvmPackages.llvm.dev ]; From f875d413f190509ea8233f464216eb9e2b08879c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sun, 21 Apr 2024 17:13:11 +0200 Subject: [PATCH 89/97] xorg.xorgserver: 21.1.12 -> 21.1.13 https://lists.x.org/archives/xorg-announce/2024-April/003504.html --- pkgs/servers/x11/xorg/default.nix | 6 +++--- pkgs/servers/x11/xorg/tarballs.list | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index ca9483ab0c20..a76a05fd0517 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -4158,11 +4158,11 @@ self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! xorgserver = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, openssl, libX11, libXau, libxcb, xcbutil, xcbutilwm, xcbutilimage, xcbutilkeysyms, xcbutilrenderutil, libXdmcp, libXfixes, libxkbfile, testers }: stdenv.mkDerivation (finalAttrs: { pname = "xorg-server"; - version = "21.1.12"; + version = "21.1.13"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/xserver/xorg-server-21.1.12.tar.xz"; - sha256 = "03x954bygi6sdynk5yy3yvsfhg6i9gjhisn3x9jxvk5mw4mnw08y"; + url = "mirror://xorg/individual/xserver/xorg-server-21.1.13.tar.xz"; + sha256 = "033lvjihidc68v08izrr63va8jhkfmzcjg0d6rm26wizjkah4nml"; }; hardeningDisable = [ "bindnow" "relro" ]; strictDeps = true; diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list index ce0d9105bea5..53836294211e 100644 --- a/pkgs/servers/x11/xorg/tarballs.list +++ b/pkgs/servers/x11/xorg/tarballs.list @@ -218,4 +218,4 @@ mirror://xorg/individual/util/lndir-1.0.4.tar.xz mirror://xorg/individual/util/makedepend-1.0.9.tar.xz mirror://xorg/individual/util/util-macros-1.20.0.tar.xz mirror://xorg/individual/util/xorg-cf-files-1.0.8.tar.xz -mirror://xorg/individual/xserver/xorg-server-21.1.12.tar.xz +mirror://xorg/individual/xserver/xorg-server-21.1.13.tar.xz From dc405305731f506c80f44f3079cd2e55ebde4740 Mon Sep 17 00:00:00 2001 From: teto sse Date: Sat, 6 Apr 2024 03:11:56 +0200 Subject: [PATCH 90/97] luaPackages.nlua: disable patchShebangAuto the automatic shebang patch adds a -l in the shebang which nlua picks up and aborts saying it doesn't accept -l --- pkgs/development/lua-modules/overrides.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/pkgs/development/lua-modules/overrides.nix b/pkgs/development/lua-modules/overrides.nix index 31ff2e6e3c58..ce17a6f89ef3 100644 --- a/pkgs/development/lua-modules/overrides.nix +++ b/pkgs/development/lua-modules/overrides.nix @@ -480,7 +480,6 @@ in }; }); - plenary-nvim = prev.plenary-nvim.overrideAttrs (oa: { postPatch = '' sed -Ei lua/plenary/curl.lua \ @@ -585,6 +584,15 @@ in }; }); + nlua = prev.nlua.overrideAttrs(oa: { + + # patchShebang removes the nvim in nlua's shebang so we hardcode one + postFixup = '' + sed -i -e "1 s|.*|#\!${coreutils}/bin/env -S ${neovim-unwrapped}/bin/nvim -l|" "$out/bin/nlua" + ''; + dontPatchShebangs = true; + }); + rapidjson = prev.rapidjson.overrideAttrs (oa: { preBuild = '' sed -i '/set(CMAKE_CXX_FLAGS/d' CMakeLists.txt From b791c2e7236e7cc9415887ff1ca515563a4b2da4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 21 Apr 2024 00:29:19 +0000 Subject: [PATCH 91/97] cppcheck: 2.13.4 -> 2.14.0 --- pkgs/development/tools/analysis/cppcheck/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/analysis/cppcheck/default.nix b/pkgs/development/tools/analysis/cppcheck/default.nix index 0da5fcc9efbb..00fd9b08b1e1 100644 --- a/pkgs/development/tools/analysis/cppcheck/default.nix +++ b/pkgs/development/tools/analysis/cppcheck/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "cppcheck"; - version = "2.13.4"; + version = "2.14.0"; outputs = [ "out" "man" ]; @@ -22,7 +22,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "danmar"; repo = "cppcheck"; rev = finalAttrs.version; - hash = "sha256-Bz8ACCsxKfN1Y8TpS+oD/6lixLItL1TQR0Ud4gj1txk="; + hash = "sha256-w5k7WO2Kwx0ac/vP54ndPUp/AG6jG3MDf03h5z/+Cso="; }; nativeBuildInputs = [ From 6c0a5bef965318da037febf4114e4dfe52ada460 Mon Sep 17 00:00:00 2001 From: Siddhartha Date: Tue, 12 Mar 2024 20:46:50 -0400 Subject: [PATCH 92/97] zziplib: 0.13.72 -> 0.13.74 --- .../development/libraries/zziplib/default.nix | 25 ++----------------- 1 file changed, 2 insertions(+), 23 deletions(-) diff --git a/pkgs/development/libraries/zziplib/default.nix b/pkgs/development/libraries/zziplib/default.nix index e90df0888a0d..c40cf9594cfa 100644 --- a/pkgs/development/libraries/zziplib/default.nix +++ b/pkgs/development/libraries/zziplib/default.nix @@ -13,36 +13,15 @@ stdenv.mkDerivation rec { pname = "zziplib"; - version = "0.13.72"; + version = "0.13.74"; src = fetchFromGitHub { owner = "gdraheim"; repo = pname; rev = "v${version}"; - hash = "sha256-Ht3fBgdrTm4mCi5uhgQPNtpGzADoRVOpSuGPsIS6y0Q="; + hash = "sha256-MjqGHzb+dsAq2PrcBhU3sv4eMX3afkgFWUbhDp+5o/s="; }; - patches = [ - # apply https://github.com/gdraheim/zziplib/pull/113 - (fetchpatch { - url = "https://github.com/gdraheim/zziplib/commit/82a7773cd17828a3b0a4f5f552ae80c1cc8777c7.diff"; - sha256 = "0ifqdzxwb5d19mziy9j6lhl8wj95jpxzm0d2c6y3bgwa931avd3y"; - }) - (fetchpatch { - url = "https://github.com/gdraheim/zziplib/commit/1cd611514c5f9559eb9dfc191d678dfc991f66db.diff"; - sha256 = "11w9qa46xq49l113k266dnv8izzdk1fq4y54yy5w8zps8zd3xfny"; - }) - (fetchpatch { - url = "https://github.com/gdraheim/zziplib/commit/e47b1e1da952a92f917db6fb19485b8a0b1a42f3.diff"; - sha256 = "0d032hkmi3s3db12z2zbppl2swa3gdpbj0c6w13ylv2g2ixglrwg"; - }) - # Fixes invalid pointer conversions that cause compilation to fail with clang 15+ - (fetchpatch { - url = "https://github.com/gdraheim/zziplib/commit/38e4d5f561318fa825e6544c2ef55ac5899c81b0.diff"; - sha256 = "sha256-VJuFyiPhuAZlDxmNHBty+JbYwG85ea5u2sv7HZRHMwo="; - }) - ]; - nativeBuildInputs = [ cmake perl From a204cd05a1bdd471f4215207bf1421a06635affc Mon Sep 17 00:00:00 2001 From: teto sse Date: Sat, 6 Apr 2024 03:12:20 +0200 Subject: [PATCH 93/97] luaPackages.haskell-tools-nvim: enable tests limited to 5.1 as nlua uses neovim as lua interpreter, which is 5.1 --- pkgs/development/lua-modules/overrides.nix | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/pkgs/development/lua-modules/overrides.nix b/pkgs/development/lua-modules/overrides.nix index ce17a6f89ef3..45cd51b71753 100644 --- a/pkgs/development/lua-modules/overrides.nix +++ b/pkgs/development/lua-modules/overrides.nix @@ -480,6 +480,17 @@ in }; }); + haskell-tools-nvim = prev.haskell-tools-nvim.overrideAttrs(oa: { + doCheck = lua.luaversion == "5.1"; + nativeCheckInputs = [ final.nlua final.busted ]; + checkPhase = '' + runHook preCheck + export HOME=$(mktemp -d) + busted --lua=nlua + runHook postCheck + ''; + }); + plenary-nvim = prev.plenary-nvim.overrideAttrs (oa: { postPatch = '' sed -Ei lua/plenary/curl.lua \ From c11815167fcc656f84f1bc63e26f9de76967e32e Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Fri, 9 Jun 2023 10:26:41 +1200 Subject: [PATCH 94/97] nixos/duosec: Split `mkdir` mode into `chmod` command for clarity As recommended by ShellCheck . --- nixos/modules/security/duosec.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/nixos/modules/security/duosec.nix b/nixos/modules/security/duosec.nix index 7fb75f42db1f..e755b5f0ee53 100644 --- a/nixos/modules/security/duosec.nix +++ b/nixos/modules/security/duosec.nix @@ -200,7 +200,8 @@ in unitConfig.DefaultDependencies = false; script = '' if test -f "${cfg.secretKeyFile}"; then - mkdir -m 0755 -p /etc/duo + mkdir -p /etc/duo + chmod 0755 /etc/duo umask 0077 conf="$(mktemp)" @@ -222,7 +223,8 @@ in unitConfig.DefaultDependencies = false; script = '' if test -f "${cfg.secretKeyFile}"; then - mkdir -m 0755 -p /etc/duo + mkdir -p /etc/duo + chmod 0755 /etc/duo umask 0077 conf="$(mktemp)" From 2872e103333eb910cf015c36dbab5911f3630f95 Mon Sep 17 00:00:00 2001 From: emilylange Date: Sun, 21 Apr 2024 16:53:29 +0200 Subject: [PATCH 95/97] nixos/manual: apply `cfg.warningsAreErrors` to nix eval as well This change makes `baseOptionsJSON` (`lazy-option.json`) take our existing `documentation.nixos.options.warningsAreErrors` option into account to then set the `NIX_ABORT_ON_WARN` environment variable within its build sandbox accordingly. Given `documentation.nixos.options.warningsAreErrors` default to true, our nixpkgs CI check that builds the NixOS manual for each PR, will now fail when something raises a warning, e.g. as part of the `lib.mdDoc` deprecation. This should prevent new PRs with lib.mdDoc from getting merged. Previously, the manual would build successfully, even if an eval warning was raised. --- nixos/modules/misc/documentation.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/misc/documentation.nix b/nixos/modules/misc/documentation.nix index 2a25f8e56468..26323e14b901 100644 --- a/nixos/modules/misc/documentation.nix +++ b/nixos/modules/misc/documentation.nix @@ -101,6 +101,7 @@ let libPath = filter (pkgs.path + "/lib"); pkgsLibPath = filter (pkgs.path + "/pkgs/pkgs-lib"); nixosPath = filter (pkgs.path + "/nixos"); + NIX_ABORT_ON_WARN = warningsAreErrors; modules = "[ " + concatMapStringsSep " " (p: ''"${removePrefix "${modulesPath}/" (toString p)}"'') docModules.lazy From e9729aedd5139ca39b7b558eba9941068cd5a591 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Wed, 17 Apr 2024 01:50:46 +0200 Subject: [PATCH 96/97] cdrtools: remove overrideLibcxx overrideLibcxx is no longer necessary since libcxxabi was merged into libcxx earlier this year. --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f905a26ffdf0..004da890a54c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6669,7 +6669,7 @@ with pkgs; cdrkit = callPackage ../tools/cd-dvd/cdrkit { }; cdrtools = callPackage ../tools/cd-dvd/cdrtools { - stdenv = if stdenv.isDarwin then overrideLibcxx llvmPackages_14.stdenv else stdenv; + stdenv = if stdenv.isDarwin then llvmPackages_14.stdenv else stdenv; inherit (darwin.apple_sdk.frameworks) Carbon IOKit; }; From 25a77d37f32347875a5079d9f1beb192f0a5e93b Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Wed, 17 Apr 2024 09:32:31 +0200 Subject: [PATCH 97/97] lib2geom: remove overrideLibcxx overrideLibcxx is no longer necessary since libcxxabi was merged into libcxx earlier this year. --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 004da890a54c..bdc536dd363a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21884,7 +21884,7 @@ with pkgs; lerc = callPackage ../development/libraries/lerc { }; lib2geom = callPackage ../development/libraries/lib2geom { - stdenv = if stdenv.cc.isClang then overrideLibcxx llvmPackages_13.stdenv else stdenv; + stdenv = if stdenv.cc.isClang then llvmPackages_13.stdenv else stdenv; }; lib3ds = callPackage ../development/libraries/lib3ds { };