From 5a0577265e7c644603a42da0fe7f907b199d57e4 Mon Sep 17 00:00:00 2001 From: Guillaume Girol Date: Sat, 21 May 2022 12:00:00 +0000 Subject: [PATCH 01/27] nixos/tests/ihatemoney: fix test ihm blocks on smtpd accepting the email --- nixos/tests/ihatemoney/default.nix | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/nixos/tests/ihatemoney/default.nix b/nixos/tests/ihatemoney/default.nix index cd5f073343da..894a97d43d35 100644 --- a/nixos/tests/ihatemoney/default.nix +++ b/nixos/tests/ihatemoney/default.nix @@ -32,14 +32,7 @@ let }; }; # ihatemoney needs a local smtp server otherwise project creation just crashes - services.opensmtpd = { - enable = true; - serverConfiguration = '' - listen on lo - action foo relay - match from any for any action foo - ''; - }; + services.postfix.enable = true; }; testScript = '' machine.wait_for_open_port(8000) From 36a116742ded785300809dfa25a7dba18e54f443 Mon Sep 17 00:00:00 2001 From: mingchuan Date: Mon, 23 May 2022 19:13:00 +0800 Subject: [PATCH 02/27] krita: 5.0.2 -> 5.0.6 --- pkgs/applications/graphics/krita/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/krita/default.nix b/pkgs/applications/graphics/krita/default.nix index 063c5cc1551c..4aea1c4d9813 100644 --- a/pkgs/applications/graphics/krita/default.nix +++ b/pkgs/applications/graphics/krita/default.nix @@ -1,7 +1,7 @@ { callPackage, ... } @ args: callPackage ./generic.nix (args // { - version = "5.0.2"; + version = "5.0.6"; kde-channel = "stable"; - sha256 = "sha256-5nUfx+tQSXekiAo3brvTmVyH2tFUSGCE6COX5l1JnL8="; + sha256 = "sha256:0qhf7vm13v33yk67n7wdcgrqpk7yvajdlkqcp7zhrl2z7qdnvmzd"; }) From 09c911a42a35a99b56efffbe044cc5213924d38e Mon Sep 17 00:00:00 2001 From: Andreas Schmid Date: Sun, 22 May 2022 12:48:32 +0200 Subject: [PATCH 03/27] colima: 0.3.4 -> 0.4.2 Signed-off-by: Andreas Schmid --- pkgs/applications/virtualization/colima/default.nix | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/virtualization/colima/default.nix b/pkgs/applications/virtualization/colima/default.nix index 96fa856f1ed6..4b756bb720a0 100644 --- a/pkgs/applications/virtualization/colima/default.nix +++ b/pkgs/applications/virtualization/colima/default.nix @@ -1,20 +1,20 @@ { lib -, buildGoModule +, buildGo118Module , fetchFromGitHub , installShellFiles , lima , makeWrapper }: -buildGoModule rec { +buildGo118Module rec { pname = "colima"; - version = "0.3.4"; + version = "0.4.2"; src = fetchFromGitHub { owner = "abiosoft"; repo = pname; rev = "v${version}"; - sha256 = "sha256-KYW3gxf21aWnuRHkysOjArzMSNH3m3XDoi6Sic3N+Po="; + sha256 = "sha256-66nKH5jxTzLB9bg2lH1E8Cc0GZ6C/N/+yPYhCVEKOBY="; # We need the git revision leaveDotGit = true; @@ -26,7 +26,9 @@ buildGoModule rec { nativeBuildInputs = [ installShellFiles makeWrapper ]; - vendorSha256 = "sha256-Z4+qwoX04VnLsUIYRfOowFLgcaA9w8oGRl77jzFigIc="; + vendorSha256 = "sha256-91Ex3RPWxOHyZcR3Bo+bRdDAFw2mEGiC/uNKjdX2kuw="; + + doCheck = false; preConfigure = '' ldflags="-X github.com/abiosoft/colima/config.appVersion=${version} From 05a1cba10bbaa866572a86b1cdfa743acd21e024 Mon Sep 17 00:00:00 2001 From: linsui Date: Mon, 30 May 2022 00:21:58 +0800 Subject: [PATCH 04/27] qt6.qtwebengine: fix LibraryExecutablesPath --- .../libraries/qt-6/modules/qtwebengine.nix | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/pkgs/development/libraries/qt-6/modules/qtwebengine.nix b/pkgs/development/libraries/qt-6/modules/qtwebengine.nix index 81782144c75d..c8e43d72bb71 100644 --- a/pkgs/development/libraries/qt-6/modules/qtwebengine.nix +++ b/pkgs/development/libraries/qt-6/modules/qtwebengine.nix @@ -116,13 +116,6 @@ qtModule rec { patchShebangs . ) - # Patch library paths in sources - sed -i \ - -e "s,QLibraryInfo::location(QLibraryInfo::DataPath),QLatin1String(\"$out\"),g" \ - -e "s,QLibraryInfo::location(QLibraryInfo::TranslationsPath),QLatin1String(\"$out/translations\"),g" \ - -e "s,QLibraryInfo::location(QLibraryInfo::LibraryExecutablesPath),QLatin1String(\"$out/libexec\"),g" \ - src/core/web_engine_library_info.cpp - sed -i -e '/lib_loader.*Load/s!"\(libudev\.so\)!"${lib.getLib systemd}/lib/\1!' \ src/3rdparty/chromium/device/udev_linux/udev?_loader.cc @@ -132,9 +125,11 @@ qtModule rec { substituteInPlace src/3rdparty/chromium/ui/events/ozone/layout/xkb/xkb_keyboard_layout_engine.cc \ --replace "/usr/share/X11/xkb" "${xkeyboard_config}/share/X11/xkb" + # Patch library paths in sources substituteInPlace src/core/web_engine_library_info.cpp \ --replace "QLibraryInfo::path(QLibraryInfo::DataPath)" "\"$out\"" \ - --replace "QLibraryInfo::path(QLibraryInfo::TranslationsPath)" "\"$out/translations\"" + --replace "QLibraryInfo::path(QLibraryInfo::TranslationsPath)" "\"$out/translations\"" \ + --replace "QLibraryInfo::path(QLibraryInfo::LibraryExecutablesPath)" "\"$out/libexec\"" ''; cmakeFlags = [ @@ -232,6 +227,12 @@ qtModule rec { requiredSystemFeatures = [ "big-parallel" ]; + postInstall = '' + # This is required at runtime + mkdir $out/libexec + mv $dev/libexec/QtWebEngineProcess $out/libexec + ''; + meta = with lib; { description = "A web engine based on the Chromium web browser"; platforms = platforms.linux; From f630ac5f2d9bd20623e9fe51797a98cf59b12a6d Mon Sep 17 00:00:00 2001 From: Evgeny Kurnevsky Date: Mon, 30 May 2022 12:09:15 +0300 Subject: [PATCH 05/27] deadbeef-statusnotifier-plugin: fix libdbusmenu dependency --- pkgs/applications/audio/deadbeef/plugins/statusnotifier.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/deadbeef/plugins/statusnotifier.nix b/pkgs/applications/audio/deadbeef/plugins/statusnotifier.nix index a1ca052f9c6b..287f439c94d5 100644 --- a/pkgs/applications/audio/deadbeef/plugins/statusnotifier.nix +++ b/pkgs/applications/audio/deadbeef/plugins/statusnotifier.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, pkg-config, deadbeef, gtk3, perl -, libdbusmenu-glib }: +, libdbusmenu }: stdenv.mkDerivation rec { pname = "deadbeef-statusnotifier-plugin"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ deadbeef gtk3 libdbusmenu-glib ]; + buildInputs = [ deadbeef gtk3 libdbusmenu ]; buildFlags = [ "gtk3" ]; From 54fd97c276093deece376189530d50cc2cfbf620 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 2 Jun 2022 02:42:24 +0000 Subject: [PATCH 06/27] discordchatexporter-cli: 2.34 -> 2.34.1 --- pkgs/tools/backup/discordchatexporter-cli/default.nix | 4 ++-- pkgs/tools/backup/discordchatexporter-cli/deps.nix | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/backup/discordchatexporter-cli/default.nix b/pkgs/tools/backup/discordchatexporter-cli/default.nix index ae1aab2ad092..e8ebbee66056 100644 --- a/pkgs/tools/backup/discordchatexporter-cli/default.nix +++ b/pkgs/tools/backup/discordchatexporter-cli/default.nix @@ -8,13 +8,13 @@ buildDotnetModule rec { pname = "discordchatexporter-cli"; - version = "2.34"; + version = "2.34.1"; src = fetchFromGitHub { owner = "tyrrrz"; repo = "discordchatexporter"; rev = version; - sha256 = "EHpnLUFHR+FC1qlwW0TuLas9aA/CMELHkzbLlNyiwgE="; + sha256 = "U+AwxHvyLD2BwrJH3h0yKKHBsgBM/D657TuG9IgllPs="; }; projectFile = "DiscordChatExporter.Cli/DiscordChatExporter.Cli.csproj"; diff --git a/pkgs/tools/backup/discordchatexporter-cli/deps.nix b/pkgs/tools/backup/discordchatexporter-cli/deps.nix index ecc872877763..bdc388c18270 100644 --- a/pkgs/tools/backup/discordchatexporter-cli/deps.nix +++ b/pkgs/tools/backup/discordchatexporter-cli/deps.nix @@ -1,5 +1,5 @@ { fetchNuGet }: [ - (fetchNuGet { pname = "CliFx"; version = "2.2.2"; sha256 = "13g5xlrbyhnbwkyzic5jlhxl0kpvkfrdmb5h2rdf9yp4gp5p9mwg"; }) + (fetchNuGet { pname = "CliFx"; version = "2.2.5"; sha256 = "1bk716rdswy28h53qy68xywci8k1h2iqdy2iz1yf7v8g0sa2n79p"; }) (fetchNuGet { pname = "Gress"; version = "2.0.1"; sha256 = "00xhyfkrlc38nbl6aymr7zwxc3kj0rxvx5gwk6fkfrvi1pzgq0wc"; }) (fetchNuGet { pname = "JsonExtensions"; version = "1.2.0"; sha256 = "0g54hibabbqqfhxjlnxwv1rxagpali5agvnpymp2w3dk8h6q66xy"; }) (fetchNuGet { pname = "MiniRazor.CodeGen"; version = "2.2.1"; sha256 = "1mrjw3vq59pbiqvayilazjgv6l87j20j8hmhcpbacz9p5bl1hvvr"; }) From 3a09010b9d5d7dac68bfca200a9447e1eb77f3eb Mon Sep 17 00:00:00 2001 From: Alexandru Scvortov Date: Thu, 2 Jun 2022 19:16:25 +0100 Subject: [PATCH 07/27] nixos/network-interfaces: add networking.interfaces..ipv[46].routes.type --- .../tasks/network-interfaces-scripted.nix | 5 ++-- .../tasks/network-interfaces-systemd.nix | 3 ++ nixos/modules/tasks/network-interfaces.nix | 16 ++++++++++ nixos/tests/networking.nix | 29 ++++++++++++++++--- 4 files changed, 47 insertions(+), 6 deletions(-) diff --git a/nixos/modules/tasks/network-interfaces-scripted.nix b/nixos/modules/tasks/network-interfaces-scripted.nix index b0f160c1dbf9..66fdc61d2835 100644 --- a/nixos/modules/tasks/network-interfaces-scripted.nix +++ b/nixos/modules/tasks/network-interfaces-scripted.nix @@ -219,14 +219,15 @@ let cidr = "${route.address}/${toString route.prefixLength}"; via = optionalString (route.via != null) ''via "${route.via}"''; options = concatStrings (mapAttrsToList (name: val: "${name} ${val} ") route.options); + type = toString route.type; in '' echo "${cidr}" >> $state echo -n "adding route ${cidr}... " - if out=$(ip route add "${cidr}" ${options} ${via} dev "${i.name}" proto static 2>&1); then + if out=$(ip route add ${type} "${cidr}" ${options} ${via} dev "${i.name}" proto static 2>&1); then echo "done" elif ! echo "$out" | grep "File exists" >/dev/null 2>&1; then - echo "'ip route add "${cidr}" ${options} ${via} dev "${i.name}"' failed: $out" + echo "'ip route add ${type} "${cidr}" ${options} ${via} dev "${i.name}"' failed: $out" exit 1 fi '' diff --git a/nixos/modules/tasks/network-interfaces-systemd.nix b/nixos/modules/tasks/network-interfaces-systemd.nix index 110e84494a3d..80808e0c08fa 100644 --- a/nixos/modules/tasks/network-interfaces-systemd.nix +++ b/nixos/modules/tasks/network-interfaces-systemd.nix @@ -142,6 +142,9 @@ in optionalAttrs (route.via != null) { Gateway = route.via; } // + optionalAttrs (route.type != null) { + Type = route.type; + } // optionalAttrs (route.options ? onlink) { GatewayOnLink = true; } // diff --git a/nixos/modules/tasks/network-interfaces.nix b/nixos/modules/tasks/network-interfaces.nix index d56159f15960..07bccf98f407 100644 --- a/nixos/modules/tasks/network-interfaces.nix +++ b/nixos/modules/tasks/network-interfaces.nix @@ -90,6 +90,22 @@ let ''; }; + type = mkOption { + type = types.nullOr (types.enum [ + "unicast" "local" "broadcast" "multicast" + ]); + default = null; + description = '' + Type of the route. See the Route types section + in the ip-route(8) manual page for the details. + + Note that prohibit, blackhole, + unreachable, and throw cannot + be configured per device, so they are not available here. Similarly, + nat hasn't been supported since kernel 2.6. + ''; + }; + via = mkOption { type = types.nullOr types.str; default = null; diff --git a/nixos/tests/networking.nix b/nixos/tests/networking.nix index 2cc1e9b0942c..1fe1229f24a4 100644 --- a/nixos/tests/networking.nix +++ b/nixos/tests/networking.nix @@ -77,12 +77,14 @@ let testCases = { loopback = { name = "Loopback"; - machine.networking.useDHCP = false; - machine.networking.useNetworkd = networkd; + nodes.client = { pkgs, ... }: with pkgs.lib; { + networking.useDHCP = false; + networking.useNetworkd = networkd; + }; testScript = '' start_all() - machine.wait_for_unit("network.target") - loopback_addresses = machine.succeed("ip addr show lo") + client.wait_for_unit("network.target") + loopback_addresses = client.succeed("ip addr show lo") assert "inet 127.0.0.1/8" in loopback_addresses assert "inet6 ::1/128" in loopback_addresses ''; @@ -139,6 +141,25 @@ let client.wait_until_succeeds("ping -c 1 192.168.3.1") ''; }; + routeType = { + name = "RouteType"; + nodes.client = { pkgs, ... }: with pkgs.lib; { + networking = { + useDHCP = false; + useNetworkd = networkd; + interfaces.eth1.ipv4.routes = [{ + address = "192.168.1.127"; + prefixLength = 32; + type = "local"; + }]; + }; + }; + testScript = '' + start_all() + client.wait_for_unit("network.target") + client.succeed("ip -4 route list table local | grep 'local 192.168.1.127'") + ''; + }; dhcpDefault = { name = "useDHCP-by-default"; nodes.router = router; From 4f3fc00d759340332d40f0cd3824ed4311d70439 Mon Sep 17 00:00:00 2001 From: Bruno Bigras Date: Thu, 2 Jun 2022 17:40:59 -0400 Subject: [PATCH 08/27] chatterino2: add missing icon --- .../networking/instant-messengers/chatterino2/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/applications/networking/instant-messengers/chatterino2/default.nix b/pkgs/applications/networking/instant-messengers/chatterino2/default.nix index 6f5255bf1860..e637881d968c 100644 --- a/pkgs/applications/networking/instant-messengers/chatterino2/default.nix +++ b/pkgs/applications/networking/instant-messengers/chatterino2/default.nix @@ -15,6 +15,9 @@ mkDerivation rec { postInstall = lib.optionalString stdenv.isDarwin '' mkdir -p "$out/Applications" mv bin/chatterino.app "$out/Applications/" + '' + '' + mkdir -p $out/share/icons/hicolor/256x256/apps + cp $src/resources/icon.png $out/share/icons/hicolor/256x256/apps/chatterino.png ''; meta = with lib; { description = "A chat client for Twitch chat"; From c240539dbaeb605c089c1d4a599f4e3044f1137e Mon Sep 17 00:00:00 2001 From: InternetUnexplorer Date: Fri, 3 Jun 2022 00:43:08 -0700 Subject: [PATCH 09/27] linux_zen: 5.18.0-zen1 -> 5.18.1-zen1 This also disables WERROR, which is necessary until #175433 reaches master (which disables it for all kernels). --- pkgs/os-specific/linux/kernel/linux-zen.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-zen.nix b/pkgs/os-specific/linux/kernel/linux-zen.nix index 6cd542c10726..0e9a632ddb56 100644 --- a/pkgs/os-specific/linux/kernel/linux-zen.nix +++ b/pkgs/os-specific/linux/kernel/linux-zen.nix @@ -2,7 +2,7 @@ let # having the full version string here makes it easier to update - modDirVersion = "5.18.0-zen1"; + modDirVersion = "5.18.1-zen1"; parts = lib.splitString "-" modDirVersion; version = lib.elemAt parts 0; suffix = lib.elemAt parts 1; @@ -20,11 +20,14 @@ buildLinux (args // { owner = "zen-kernel"; repo = "zen-kernel"; inherit rev; - sha256 = "sha256-A0QrY1REbRODnHtmyNqVaiLhDgYCECevfHZCxtoQ9kU="; + sha256 = "sha256-LCLfLE85NifuskYl2dxLOJEsUNHLegF8ecYyU4xOCtY="; }; structuredExtraConfig = with lib.kernel; { ZEN_INTERACTIVE = yes; + # TODO: Remove once #175433 reaches master + # https://nixpk.gs/pr-tracker.html?pr=175433 + WERROR = no; }; extraMeta = { From e9e734bf1710f2bd38e7a63b0f098873139a11b4 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Fri, 3 Jun 2022 13:43:06 +0100 Subject: [PATCH 10/27] openjfx11, openjfx15: add -fcommon workaround Workaround build failure on -fno-common toolchains like upstream gcc-10. Otherwise build fails as: ld: gsttypefindelement.o:(.bss._gst_disable_registry_cache+0x0): multiple definition of `_gst_disable_registry_cache'; gst.o:(.bss._gst_disable_registry_cache+0x0): first defined here openjfx17 is not affected. --- .../development/compilers/openjdk/openjfx/11.nix | 5 ++++- .../development/compilers/openjdk/openjfx/15.nix | 16 +++++++++++++--- 2 files changed, 17 insertions(+), 4 deletions(-) diff --git a/pkgs/development/compilers/openjdk/openjfx/11.nix b/pkgs/development/compilers/openjdk/openjfx/11.nix index ff243372b4a5..7a01486e2dd9 100644 --- a/pkgs/development/compilers/openjdk/openjfx/11.nix +++ b/pkgs/development/compilers/openjdk/openjfx/11.nix @@ -92,7 +92,10 @@ in makePackage { ''; # glib-2.62 deprecations - NIX_CFLAGS_COMPILE = "-DGLIB_DISABLE_DEPRECATION_WARNINGS"; + # -fcommon: gstreamer workaround for -fno-common toolchains: + # ld: gsttypefindelement.o:(.bss._gst_disable_registry_cache+0x0): multiple definition of + # `_gst_disable_registry_cache'; gst.o:(.bss._gst_disable_registry_cache+0x0): first defined here + NIX_CFLAGS_COMPILE = "-DGLIB_DISABLE_DEPRECATION_WARNINGS -fcommon"; stripDebugList = [ "." ]; diff --git a/pkgs/development/compilers/openjdk/openjfx/15.nix b/pkgs/development/compilers/openjdk/openjfx/15.nix index 3feda519b084..74f83fdabf1a 100644 --- a/pkgs/development/compilers/openjdk/openjfx/15.nix +++ b/pkgs/development/compilers/openjdk/openjfx/15.nix @@ -31,8 +31,15 @@ let JDK_HOME = ${openjdk11_headless.home} '' + args.gradleProperties or ""); - #avoids errors about deprecation of GTypeDebugFlags, GTimeVal, etc. - NIX_CFLAGS_COMPILE = [ "-DGLIB_DISABLE_DEPRECATION_WARNINGS" ]; + NIX_CFLAGS_COMPILE = [ + #avoids errors about deprecation of GTypeDebugFlags, GTimeVal, etc. + "-DGLIB_DISABLE_DEPRECATION_WARNINGS" + + # gstreamer workaround for -fno-common toolchains: + # ld: gsttypefindelement.o:(.bss._gst_disable_registry_cache+0x0): multiple definition of + # `_gst_disable_registry_cache'; gst.o:(.bss._gst_disable_registry_cache+0x0): first defined here + "-fcommon" + ]; buildPhase = '' runHook preBuild @@ -89,7 +96,10 @@ in makePackage { ''; # glib-2.62 deprecations - NIX_CFLAGS_COMPILE = "-DGLIB_DISABLE_DEPRECATION_WARNINGS"; + # -fcommon: gstreamer workaround for -fno-common toolchains: + # ld: gsttypefindelement.o:(.bss._gst_disable_registry_cache+0x0): multiple definition of + # `_gst_disable_registry_cache'; gst.o:(.bss._gst_disable_registry_cache+0x0): first defined here + NIX_CFLAGS_COMPILE = "-DGLIB_DISABLE_DEPRECATION_WARNINGS -fcommon"; stripDebugList = [ "." ]; From 80a7bf95cb6ed7163fb107b519f7d3ce1b6e2132 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 3 Jun 2022 17:57:30 +0000 Subject: [PATCH 11/27] libdeltachat: 1.84.0 -> 1.85.0 https://github.com/deltachat/deltachat-core-rust/blob/1.85.0/CHANGELOG.md --- pkgs/development/libraries/libdeltachat/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/libdeltachat/default.nix b/pkgs/development/libraries/libdeltachat/default.nix index 61fe3175681e..a8915e92e58a 100644 --- a/pkgs/development/libraries/libdeltachat/default.nix +++ b/pkgs/development/libraries/libdeltachat/default.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation rec { pname = "libdeltachat"; - version = "1.84.0"; + version = "1.85.0"; src = fetchFromGitHub { owner = "deltachat"; repo = "deltachat-core-rust"; rev = version; - hash = "sha256-ZG3siulXVHTbdSd9tmenljFODZ3LWX+BXn6OJfrbEYA="; + hash = "sha256-bgx1j2ESAv9cRe3Iv6nYOS7bUAQcXj3Ta4rAC800Nf8="; }; patches = [ @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-vQ+A4dEWh5+BgWOdxd7GTPuHk6M6bHgGnZcWNwR/Urs="; + hash = "sha256-7ZdN/7CKFuFOIReM7BkMsO/E2lPyDnl4ssPhK5BPLh8="; }; nativeBuildInputs = [ From 5bf496fc778602412daf411a2b1f3c072ba5bc8f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 3 Jun 2022 18:01:29 +0000 Subject: [PATCH 12/27] deltachat-cursed: 0.6.0 -> 0.7.1 https://github.com/adbenitez/deltachat-cursed/blob/v0.7.1/CHANGELOG.md --- .../instant-messengers/deltachat-cursed/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/deltachat-cursed/default.nix b/pkgs/applications/networking/instant-messengers/deltachat-cursed/default.nix index aeb7677a10ee..8e1ce52c266e 100644 --- a/pkgs/applications/networking/instant-messengers/deltachat-cursed/default.nix +++ b/pkgs/applications/networking/instant-messengers/deltachat-cursed/default.nix @@ -5,13 +5,13 @@ python3.pkgs.buildPythonApplication rec { pname = "deltachat-cursed"; - version = "0.6.0"; + version = "0.7.1"; src = fetchFromGitHub { owner = "adbenitez"; repo = "deltachat-cursed"; rev = "v${version}"; - hash = "sha256-qFX5CjrF0HLR41BbrCPT+rI9vAP6VLzXXAaVq/Loabs="; + hash = "sha256-EA3yTP4j/jj26E8zdRwTIW+9FkI0ehK4Y8AqiCnF2xA="; }; nativeBuildInputs = [ From 2e0c733dbff32912e35cf10436264bbb4f966ac4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 3 Jun 2022 18:35:26 +0000 Subject: [PATCH 13/27] deltachat-desktop: use build4production --- .../networking/instant-messengers/deltachat-desktop/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/instant-messengers/deltachat-desktop/default.nix b/pkgs/applications/networking/instant-messengers/deltachat-desktop/default.nix index a8842b14a6de..94ffd40364c0 100644 --- a/pkgs/applications/networking/instant-messengers/deltachat-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/deltachat-desktop/default.nix @@ -81,7 +81,7 @@ in nodePackages.deltachat-desktop.override rec { postInstall = '' rm -r node_modules/deltachat-node/node/prebuilds - npm run build + npm run build4production npm prune --production From 1922caf3f499e65f216a52d4b1a8e02bbc1368b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 3 Jun 2022 08:15:57 +0000 Subject: [PATCH 14/27] python310Packages.ocrmypdf: 13.4.6 -> 13.4.7 https://github.com/ocrmypdf/OCRmyPDF/blob/v13.4.7/docs/release_notes.rst --- pkgs/development/python-modules/ocrmypdf/default.nix | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/ocrmypdf/default.nix b/pkgs/development/python-modules/ocrmypdf/default.nix index c2f7f1c9df13..89faff436664 100644 --- a/pkgs/development/python-modules/ocrmypdf/default.nix +++ b/pkgs/development/python-modules/ocrmypdf/default.nix @@ -2,7 +2,6 @@ , buildPythonPackage , coloredlogs , fetchFromGitHub -, fetchpatch , ghostscript , img2pdf , importlib-metadata @@ -28,7 +27,7 @@ buildPythonPackage rec { pname = "ocrmypdf"; - version = "13.4.6"; + version = "13.4.7"; src = fetchFromGitHub { owner = "ocrmypdf"; @@ -40,7 +39,7 @@ buildPythonPackage rec { postFetch = '' rm "$out/.git_archival.txt" ''; - hash = "sha256-Hd9vsw+UEpE7juYSCiHhXtxaC58OtS/Uy20Jdp6QXPA="; + hash = "sha256-jCfMCjh8MdH5K76iyJCgtkgPtpxnCxlXlzttTIzINPk="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; @@ -54,11 +53,6 @@ buildPythonPackage rec { tesseract = "${lib.getBin tesseract4}/bin/tesseract"; unpaper = "${lib.getBin unpaper}/bin/unpaper"; }) - # https://github.com/ocrmypdf/OCRmyPDF/pull/973 - (fetchpatch { - url = "https://github.com/ocrmypdf/OCRmyPDF/commit/808b24d59f5b541a335006aa6ea7cdc3c991adc0.patch"; - hash = "sha256-khsH70fWk5fStf94wcRKKX7cCbgD69LtKkngJIqA3+w="; - }) ]; nativeBuildInputs = [ From 0c77eaeba4448c76251b57f62474b0977ed02c25 Mon Sep 17 00:00:00 2001 From: mingchuan Date: Mon, 23 May 2022 19:13:11 +0800 Subject: [PATCH 15/27] krita: Fix python plugins, add missing dependencies Builtin python plugins (e.g. ten brushes) was not working because krita cannot find sip during build. (Upstream changed how this works in recent versions) libmypaint is for MyPaint brush engine introduced in krita 5. Builtin mypaint brushes won't work without this dependency. libwebp is for exporting to WebP format. --- pkgs/applications/graphics/krita/generic.nix | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/graphics/krita/generic.nix b/pkgs/applications/graphics/krita/generic.nix index a0819a203e72..825e8882a557 100644 --- a/pkgs/applications/graphics/krita/generic.nix +++ b/pkgs/applications/graphics/krita/generic.nix @@ -3,7 +3,7 @@ , kguiaddons, ki18n, kitemmodels, kitemviews, kwindowsystem , kio, kcrash, breeze-icons , boost, libraw, fftw, eigen, exiv2, libheif, lcms2, gsl, openexr, giflib -, openjpeg, opencolorio_1, vc, poppler, curl, ilmbase +, openjpeg, opencolorio_1, vc, poppler, curl, ilmbase, libmypaint, libwebp , qtmultimedia, qtx11extras, quazip , python3Packages @@ -23,13 +23,13 @@ mkDerivation rec { inherit sha256; }; - nativeBuildInputs = [ cmake extra-cmake-modules python3Packages.sip_4 makeWrapper ]; + nativeBuildInputs = [ cmake extra-cmake-modules python3Packages.sip makeWrapper ]; buildInputs = [ karchive kconfig kwidgetsaddons kcompletion kcoreaddons kguiaddons ki18n kitemmodels kitemviews kwindowsystem kio kcrash breeze-icons boost libraw fftw eigen exiv2 lcms2 gsl openexr libheif giflib - openjpeg opencolorio_1 poppler curl ilmbase + openjpeg opencolorio_1 poppler curl ilmbase libmypaint libwebp qtmultimedia qtx11extras quazip python3Packages.pyqt5 ] ++ lib.optional stdenv.hostPlatform.isx86 vc; @@ -37,6 +37,17 @@ mkDerivation rec { NIX_CFLAGS_COMPILE = [ "-I${ilmbase.dev}/include/OpenEXR" ] ++ lib.optional stdenv.cc.isGNU "-Wno-deprecated-copy"; + # Krita runs custom python scripts in CMake with custom PYTHONPATH which krita determined in their CMake script. + # Patch the PYTHONPATH so python scripts can import sip successfully. + postPatch = let + pythonPath = python3Packages.makePythonPath (with python3Packages; [ sip setuptools ]); + in '' + substituteInPlace cmake/modules/FindSIP.cmake \ + --replace 'PYTHONPATH=''${_sip_python_path}' 'PYTHONPATH=${pythonPath}' + substituteInPlace cmake/modules/SIPMacros.cmake \ + --replace 'PYTHONPATH=''${_krita_python_path}' 'PYTHONPATH=${pythonPath}' + ''; + cmakeFlags = [ "-DPYQT5_SIP_DIR=${python3Packages.pyqt5}/${python3Packages.python.sitePackages}/PyQt5/bindings" "-DPYQT_SIP_DIR_OVERRIDE=${python3Packages.pyqt5}/${python3Packages.python.sitePackages}/PyQt5/bindings" @@ -52,7 +63,7 @@ mkDerivation rec { meta = with lib; { description = "A free and open source painting application"; homepage = "https://krita.org/"; - maintainers = with maintainers; [ abbradar ]; + maintainers = with maintainers; [ abbradar sifmelcara ]; platforms = platforms.linux; license = licenses.gpl3Only; }; From 63c45ddaf871f30a48009244346be64c10445938 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Sat, 4 Jun 2022 11:04:23 +0800 Subject: [PATCH 16/27] pantheon.elementary-camera: 6.0.3 -> 6.1.0 --- .../apps/elementary-camera/default.nix | 22 ++----------------- 1 file changed, 2 insertions(+), 20 deletions(-) diff --git a/pkgs/desktops/pantheon/apps/elementary-camera/default.nix b/pkgs/desktops/pantheon/apps/elementary-camera/default.nix index 31dfa369818f..5a6f630fe45d 100644 --- a/pkgs/desktops/pantheon/apps/elementary-camera/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-camera/default.nix @@ -1,12 +1,7 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch , nix-update-script -, appstream -, desktop-file-utils -, gettext -, libxml2 , meson , ninja , pkg-config @@ -24,29 +19,16 @@ stdenv.mkDerivation rec { pname = "elementary-camera"; - version = "6.0.3"; + version = "6.1.0"; src = fetchFromGitHub { owner = "elementary"; repo = "camera"; rev = version; - sha256 = "sha256-xIv+mOlZV58XD0Z6Vc2wA1EQUxT5BaQ0zhYc9v+ne1w="; + sha256 = "sha256-uccH9rCZaifIlLDx+zat3Zx8ecgKo2M6x+mg7AnuFBs="; }; - patches = [ - # Fix build with meson 0.61 - # https://github.com/elementary/camera/pull/216 - (fetchpatch { - url = "https://github.com/elementary/camera/commit/ead143b7e3246c5fa9bb37c95d491fb07cea9e04.patch"; - sha256 = "sha256-2zGigUi6DpjJx8SEvAE3Q3jrm7MggOvLc72lAPMPvs4="; - }) - ]; - nativeBuildInputs = [ - appstream - desktop-file-utils - gettext - libxml2 meson ninja pkg-config From 2c90bada3dc7b56f317dc6f5112f7542c98b8beb Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sat, 4 Jun 2022 07:37:00 +0100 Subject: [PATCH 17/27] mimic: pull upstream fix for -fno-common toolchains Without the change build fails on upstream gcc-10 as: ld: cmu_indic_lang.o:cmu_indic_lang.h:54: multiple definition of `cst_rx_not_indic'; cmu_indic_lang.h:54: first defined here --- pkgs/applications/audio/mimic/default.nix | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/audio/mimic/default.nix b/pkgs/applications/audio/mimic/default.nix index 870584d357eb..7e11c0a8d75f 100644 --- a/pkgs/applications/audio/mimic/default.nix +++ b/pkgs/applications/audio/mimic/default.nix @@ -1,4 +1,5 @@ -{ config, lib, stdenv, autoreconfHook, fetchFromGitHub, pkg-config, makeWrapper +{ config, lib, stdenv, autoreconfHook, fetchFromGitHub, fetchpatch +, pkg-config, makeWrapper , alsa-lib, alsa-plugins, libtool, icu, pcre2 , pulseaudioSupport ? config.pulseaudio or false, libpulseaudio }: @@ -13,6 +14,16 @@ stdenv.mkDerivation rec { sha256 = "1agwgby9ql8r3x5rd1rgx3xp9y4cdg4pi3kqlz3vanv9na8nf3id"; }; + patches = [ + # Pull upstream fix for -fno-common toolchains: + # https://github.com/MycroftAI/mimic1/pull/216 + (fetchpatch { + name = "fno-common"; + url = "https://github.com/MycroftAI/mimic1/commit/77b36eaeb2c38eba571b8db7e9bb0fd507774e6d.patch"; + sha256 = "0n3hqrfpbdp44y0c8bq55ay9m4c96r09k18hjxka4x54j5c7lw1m"; + }) + ]; + nativeBuildInputs = [ autoreconfHook pkg-config From af0278308ae5ec73e17d4e7778f0af461f5b624a Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Wed, 1 Jun 2022 16:48:25 +0300 Subject: [PATCH 18/27] sile: Add passthru, and change some pre/post hooks. --- pkgs/tools/typesetting/sile/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/typesetting/sile/default.nix b/pkgs/tools/typesetting/sile/default.nix index 4ab4ae7c0f2e..565b0345e50a 100644 --- a/pkgs/tools/typesetting/sile/default.nix +++ b/pkgs/tools/typesetting/sile/default.nix @@ -59,19 +59,23 @@ stdenv.mkDerivation rec { makeWrapper ]; buildInputs = [ + luaEnv harfbuzz icu fontconfig libiconv - luaEnv ] ++ lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.AppKit ; checkInputs = [ poppler_utils ]; + passthru = { + # So it will be easier to inspect this environment, in comparison to others + inherit luaEnv; + }; - preConfigure = '' + postPatch = '' patchShebangs build-aux/*.sh '' + lib.optionalString stdenv.isDarwin '' sed -i -e 's|@import AppKit;|#import |' src/macfonts.m From 6b34e58f80f2d68993fb885575c4e54de1b250d9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 4 Jun 2022 11:24:43 +0000 Subject: [PATCH 19/27] python310Packages.aws-adfs: 2.0.5 -> 2.2.1 --- pkgs/development/python-modules/aws-adfs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aws-adfs/default.nix b/pkgs/development/python-modules/aws-adfs/default.nix index 8aad36037a42..3b2963f7d693 100644 --- a/pkgs/development/python-modules/aws-adfs/default.nix +++ b/pkgs/development/python-modules/aws-adfs/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "aws-adfs"; - version = "2.0.5"; + version = "2.2.1"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "venth"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-OBxKJN14CuWSq88KxSttpK/Paj2sBHrBVMyP+oPkHys="; + hash = "sha256-REJYuOGq22onMj4WcfA7i4/cG99UGZA9D99ESIKY1A8="; }; nativeBuildInputs = [ From 6caae0f901d45b523bfb377bf453061a9e4eba9b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 4 Jun 2022 13:29:38 +0200 Subject: [PATCH 20/27] python310Packages.pypck: 0.7.14 -> 0.7.15 --- pkgs/development/python-modules/pypck/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pypck/default.nix b/pkgs/development/python-modules/pypck/default.nix index 724be70163ab..6fe6e016d1cd 100644 --- a/pkgs/development/python-modules/pypck/default.nix +++ b/pkgs/development/python-modules/pypck/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "pypck"; - version = "0.7.14"; + version = "0.7.15"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "alengwenus"; repo = pname; rev = version; - sha256 = "sha256-v8eCCbSnAmJUmHSNS+lz8JRhDFrqyxgAkgcZ2bzfOTg="; + hash = "sha256-OuM/r9rxIl4niY87cEcbZ73x2ZIQbaPZqbMrQ7hZE/g="; }; checkInputs = [ From c53e1cc67499e155b48b19276124125402576e5b Mon Sep 17 00:00:00 2001 From: Aaron Jheng Date: Thu, 2 Jun 2022 13:40:54 +0000 Subject: [PATCH 21/27] btops: remove --- .../window-managers/btops/default.nix | 25 ---- .../window-managers/btops/deps.nix | 120 ------------------ pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 - 4 files changed, 1 insertion(+), 147 deletions(-) delete mode 100644 pkgs/applications/window-managers/btops/default.nix delete mode 100644 pkgs/applications/window-managers/btops/deps.nix diff --git a/pkgs/applications/window-managers/btops/default.nix b/pkgs/applications/window-managers/btops/default.nix deleted file mode 100644 index a837c435204a..000000000000 --- a/pkgs/applications/window-managers/btops/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ lib, buildGoPackage, fetchFromGitHub }: - -buildGoPackage rec { - pname = "btops"; - version = "0.1.0"; - - goPackagePath = "github.com/cmschuetz/btops"; - - src = fetchFromGitHub { - owner = "cmschuetz"; - repo = "btops"; - rev = version; - sha256 = "sha256-eE28PGfpmmhcyeSy3PICebAs+cHAZXPxT+S/4+9ukcY="; - }; - - goDeps = ./deps.nix; - - meta = with lib; { - description = "bspwm desktop management that supports dymanic appending, removing, and renaming"; - homepage = "https://github.com/cmschuetz/btops"; - maintainers = with maintainers; [ mnacamura ]; - license = licenses.mit; - platforms = platforms.linux; - }; -} diff --git a/pkgs/applications/window-managers/btops/deps.nix b/pkgs/applications/window-managers/btops/deps.nix deleted file mode 100644 index a893d40e2107..000000000000 --- a/pkgs/applications/window-managers/btops/deps.nix +++ /dev/null @@ -1,120 +0,0 @@ -# This file was generated by https://github.com/kamilchm/go2nix v1.2.1 -[ - { - goPackagePath = "github.com/fsnotify/fsnotify"; - fetch = { - type = "git"; - url = "https://github.com/fsnotify/fsnotify"; - rev = "c2828203cd70a50dcccfb2761f8b1f8ceef9a8e9"; - sha256 = "07va9crci0ijlivbb7q57d2rz9h27zgn2fsm60spjsqpdbvyrx4g"; - }; - } - { - goPackagePath = "github.com/hashicorp/hcl"; - fetch = { - type = "git"; - url = "https://github.com/hashicorp/hcl"; - rev = "ef8a98b0bbce4a65b5aa4c368430a80ddc533168"; - sha256 = "1qalfsc31fra7hcw2lc3s20aj7al62fq3j5fn5kga3mg99b82nyr"; - }; - } - { - goPackagePath = "github.com/magiconair/properties"; - fetch = { - type = "git"; - url = "https://github.com/magiconair/properties"; - rev = "c2353362d570a7bfa228149c62842019201cfb71"; - sha256 = "1a10362wv8a8qwb818wygn2z48lgzch940hvpv81hv8gc747ajxn"; - }; - } - { - goPackagePath = "github.com/mitchellh/mapstructure"; - fetch = { - type = "git"; - url = "https://github.com/mitchellh/mapstructure"; - rev = "bb74f1db0675b241733089d5a1faa5dd8b0ef57b"; - sha256 = "1aqk9qr46bwgdc5j7n7als61xvssvyjf4qzfsvhacl4izpygqnw7"; - }; - } - { - goPackagePath = "github.com/pelletier/go-toml"; - fetch = { - type = "git"; - url = "https://github.com/pelletier/go-toml"; - rev = "66540cf1fcd2c3aee6f6787dfa32a6ae9a870f12"; - sha256 = "1n8na0yg90gm0rpifmzrby5r385vvd62cdam3ls7ssy02bjvfw15"; - }; - } - { - goPackagePath = "github.com/spf13/afero"; - fetch = { - type = "git"; - url = "https://github.com/spf13/afero"; - rev = "63644898a8da0bc22138abf860edaf5277b6102e"; - sha256 = "13piahaq4vw1y1sklq5scrsflqx0a8hzmdqfz1fy4871kf2gl8qw"; - }; - } - { - goPackagePath = "github.com/spf13/cast"; - fetch = { - type = "git"; - url = "https://github.com/spf13/cast"; - rev = "8965335b8c7107321228e3e3702cab9832751bac"; - sha256 = "177bk7lq40jbgv9p9r80aydpaccfk8ja3a7jjhfwiwk9r1pa4rr2"; - }; - } - { - goPackagePath = "github.com/spf13/jwalterweatherman"; - fetch = { - type = "git"; - url = "https://github.com/spf13/jwalterweatherman"; - rev = "7c0cea34c8ece3fbeb2b27ab9b59511d360fb394"; - sha256 = "132p84i20b9s5r6fs597lsa6648vd415ch7c0d018vm8smzqpd0h"; - }; - } - { - goPackagePath = "github.com/spf13/pflag"; - fetch = { - type = "git"; - url = "https://github.com/spf13/pflag"; - rev = "583c0c0531f06d5278b7d917446061adc344b5cd"; - sha256 = "0nr4mdpfhhk94hq4ymn5b2sxc47b29p1akxd8b0hx4dvdybmipb5"; - }; - } - { - goPackagePath = "github.com/spf13/viper"; - fetch = { - type = "git"; - url = "https://github.com/spf13/viper"; - rev = "15738813a09db5c8e5b60a19d67d3f9bd38da3a4"; - sha256 = "1mjfzg8zvnxckaq6l8gw99i2msrfqn9yr04dc3b7kd5bpxi6zr4v"; - }; - } - { - goPackagePath = "golang.org/x/sys"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/sys"; - rev = "7c87d13f8e835d2fb3a70a2912c811ed0c1d241b"; - sha256 = "03fhkng37rczqwfgah5hd7d373jps3hcfx79dmky2fh62yvpcyn3"; - }; - } - { - goPackagePath = "golang.org/x/text"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/text"; - rev = "5c1cf69b5978e5a34c5f9ba09a83e56acc4b7877"; - sha256 = "03br8p1sb1ffr02l8hyrgcyib7ms0z06wy3v4r1dj2l6q4ghwzfs"; - }; - } - { - goPackagePath = "gopkg.in/yaml.v2"; - fetch = { - type = "git"; - url = "https://gopkg.in/yaml.v2"; - rev = "5420a8b6744d3b0345ab293f6fcba19c978f1183"; - sha256 = "0dwjrs2lp2gdlscs7bsrmyc5yf6mm4fvgw71bzr9mv2qrd2q73s1"; - }; - } -] diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 921827488255..be8b03b65444 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -128,6 +128,7 @@ mapAliases ({ brackets = throw "brackets has been removed, it was unmaintained and had open vulnerabilities"; # Added 2021-01-24 bridge_utils = throw "'bridge_utils' has been renamed to/replaced by 'bridge-utils'"; # Converted to throw 2022-02-22 bro = zeek; # Added 2019-09-29 + btops = throw "btops has been dropped due to the lack of maintenance from upstream since 2017"; # Added 2022-06-02 btrfsProgs = throw "'btrfsProgs' has been renamed to/replaced by 'btrfs-progs'"; # Converted to throw 2022-02-22 bud = throw "bud has been removed: abandoned by upstream"; # Added 2022-03-14 inherit (libsForQt5.mauiPackages) buho; # added 2022-05-17 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 68c03ac3d468..574538152347 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -25510,8 +25510,6 @@ with pkgs; bspwm = callPackage ../applications/window-managers/bspwm { }; - btops = callPackage ../applications/window-managers/btops { }; - bvi = callPackage ../applications/editors/bvi { }; bviplus = callPackage ../applications/editors/bviplus { }; From 10bef0e28f16eaa77bd710c58679b9360205f97e Mon Sep 17 00:00:00 2001 From: Kira Bruneau Date: Sat, 4 Jun 2022 08:45:51 -0400 Subject: [PATCH 22/27] texlab: remove unused dylib of human_name --- pkgs/development/tools/misc/texlab/default.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/development/tools/misc/texlab/default.nix b/pkgs/development/tools/misc/texlab/default.nix index 47f08d4dcc8d..a051087bdd2f 100644 --- a/pkgs/development/tools/misc/texlab/default.nix +++ b/pkgs/development/tools/misc/texlab/default.nix @@ -30,6 +30,13 @@ rustPlatform.buildRustPackage rec { postInstall = '' installManPage texlab.1 + + # Remove generated dylib of human_name dependency. TexLab statically + # links to the generated rlib and doesn't reference the dylib. I + # couldn't find any way to prevent building this by passing cargo flags. + # See https://github.com/djudd/human-name/blob/master/Cargo.toml#L43 + rm "$out/lib/libhuman_name${stdenv.hostPlatform.extensions.sharedLibrary}" + rmdir "$out/lib" ''; passthru.updateScript = nix-update-script { From 9b96eef86e7d8d60e2f7a2a45ef604079282e0d5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 4 Jun 2022 13:55:03 +0000 Subject: [PATCH 23/27] python310Packages.meross-iot: 0.4.4.4 -> 0.4.4.5 --- pkgs/development/python-modules/meross-iot/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/meross-iot/default.nix b/pkgs/development/python-modules/meross-iot/default.nix index 064d8a8d203b..bcc914a8eb45 100644 --- a/pkgs/development/python-modules/meross-iot/default.nix +++ b/pkgs/development/python-modules/meross-iot/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "meross-iot"; - version = "0.4.4.4"; + version = "0.4.4.5"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,8 +19,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "albertogeniola"; repo = "MerossIot"; - rev = version; - sha256 = "sha256-bazAhCsxr8UNV51UnaGbP7kTC6mcDNM7N78f0jy26ew="; + rev = "refs/tags/${version}"; + sha256 = "sha256-PBf8uHEeHXoYZcFD9KCWg1I5QRAILjVMl3oglWsEsag="; }; propagatedBuildInputs = [ From 9d80c2f6821d2bacbe127b7a9cbe18a26426cf3d Mon Sep 17 00:00:00 2001 From: Aaron Jheng Date: Sat, 4 Jun 2022 14:19:08 +0000 Subject: [PATCH 24/27] docker-slim: use buildGoModule --- .../virtualization/docker-slim/default.nix | 23 ++++++++----------- 1 file changed, 9 insertions(+), 14 deletions(-) diff --git a/pkgs/applications/virtualization/docker-slim/default.nix b/pkgs/applications/virtualization/docker-slim/default.nix index dbf4bb734d84..09c8de64f280 100644 --- a/pkgs/applications/virtualization/docker-slim/default.nix +++ b/pkgs/applications/virtualization/docker-slim/default.nix @@ -1,15 +1,9 @@ -{ lib -, buildGoPackage -, fetchFromGitHub -, makeWrapper -}: +{ lib, buildGoModule, fetchFromGitHub, makeWrapper }: -buildGoPackage rec { +buildGoModule rec { pname = "docker-slim"; version = "1.37.6"; - goPackagePath = "github.com/docker-slim/docker-slim"; - src = fetchFromGitHub { owner = "docker-slim"; repo = "docker-slim"; @@ -17,16 +11,17 @@ buildGoPackage rec { sha256 = "sha256-Jzi6JC6DRklZhNqmFx6eHx6qR8/fb/JuSpgwtPThcc4="; }; + vendorSha256 = null; + subPackages = [ "cmd/docker-slim" "cmd/docker-slim-sensor" ]; - nativeBuildInputs = [ - makeWrapper - ]; + nativeBuildInputs = [ makeWrapper ]; ldflags = [ - "-s" "-w" - "-X ${goPackagePath}/pkg/version.appVersionTag=${version}" - "-X ${goPackagePath}/pkg/version.appVersionRev=${src.rev}" + "-s" + "-w" + "-X github.com/docker-slim/docker-slim/pkg/version.appVersionTag=${version}" + "-X github.com/docker-slim/docker-slim/pkg/version.appVersionRev=${src.rev}" ]; # docker-slim tries to create its state dir next to the binary (inside the nix From 9684c0fa4ebbf36a56a740b03df14829ab0c671d Mon Sep 17 00:00:00 2001 From: QuantMint Date: Sat, 4 Jun 2022 16:57:41 +0200 Subject: [PATCH 25/27] vimPlugins: update and add new (#176207) vimPlugins.flutter-tools-nvim: init at 2022-05-19 vimPlugins.grammar-guard-nvim: init at 2022-01-03 vimPlugins.omnisharp-extended-lsp-nvim: init at 2022-05-10 vimPlugins.com-cloudedmountain-ide-neovim: init at 2022-05-19 vimPlugins: update vimPlugins.csharpls-extended-lsp-nvim: init at 2022-03-08 vimPlugins: update vimPlugins.clangd_extensions-nvim: init at 2022-05-31 vimPlugins.Ionide-vim: init at 2022-05-13 vimPlugins.coq-artifacts: init at 2022-06-04 vimPlugins.coq-thirdparty: init at 2022-06-04 vimPlugins.spellsitter-nvim: init at 2022-06-02 --- .../editors/vim/plugins/generated.nix | 554 +++++++++++------- .../editors/vim/plugins/vim-plugin-names | 10 + 2 files changed, 347 insertions(+), 217 deletions(-) diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index 5207c48b19ac..385b0d2aadea 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -111,6 +111,18 @@ final: prev: meta.homepage = "https://github.com/vim-scripts/Improved-AnsiEsc/"; }; + Ionide-vim = buildVimPluginFrom2Nix { + pname = "Ionide-vim"; + version = "2022-05-13"; + src = fetchFromGitHub { + owner = "ionide"; + repo = "Ionide-vim"; + rev = "3092ca0fed470c01457d0cecbe5e108e2b008f0d"; + sha256 = "0fbkmsqpnwrh8skv5yiva8y4aj4d7zm2z5vxbzl0hl6k728dwxvz"; + }; + meta.homepage = "https://github.com/ionide/Ionide-vim/"; + }; + Jenkinsfile-vim-syntax = buildVimPluginFrom2Nix { pname = "Jenkinsfile-vim-syntax"; version = "2021-01-26"; @@ -269,12 +281,12 @@ final: prev: SchemaStore-nvim = buildVimPluginFrom2Nix { pname = "SchemaStore.nvim"; - version = "2022-05-29"; + version = "2022-05-30"; src = fetchFromGitHub { owner = "b0o"; repo = "SchemaStore.nvim"; - rev = "18ffd42754ae82b2fb8bc86c035f315c43a57dca"; - sha256 = "1gd4v8n1q5pldkypz7sy48jksdi1w384kbi4fw3pqjp3knkdfqmd"; + rev = "af73c24dfbc245a99a16d30444003fa86267d254"; + sha256 = "04d8jwwrfdlcdvn2jvmw6n9ih9zz5a4aympyzmsnnnc8kgzzjk5j"; }; meta.homepage = "https://github.com/b0o/SchemaStore.nvim/"; }; @@ -329,12 +341,12 @@ final: prev: SpaceVim = buildVimPluginFrom2Nix { pname = "SpaceVim"; - version = "2022-05-29"; + version = "2022-06-04"; src = fetchFromGitHub { owner = "SpaceVim"; repo = "SpaceVim"; - rev = "a8922726165031cc99d78018eafb0be8dca68b2d"; - sha256 = "1s68j8mzz54njfxhbcr2gkc8hjzla18si0a2cnmxzqpf0z92757k"; + rev = "4397ec5814e311f9079e5ac3d54190fe0fac4a47"; + sha256 = "0vf0qr5xj7p78z6br1wdj3la88xa5xb4dk8sk2nsrvayzl0xqvgz"; }; meta.homepage = "https://github.com/SpaceVim/SpaceVim/"; }; @@ -486,12 +498,12 @@ final: prev: aerial-nvim = buildVimPluginFrom2Nix { pname = "aerial.nvim"; - version = "2022-05-30"; + version = "2022-05-31"; src = fetchFromGitHub { owner = "stevearc"; repo = "aerial.nvim"; - rev = "e633f0d836827b225ff3275da458e6e8a47a084f"; - sha256 = "0aj9klbx2g744gwvgcnx0b8nqnmp5mlf95h85hy7ay2h1jaw9lyi"; + rev = "ece90c4820e7cea7be0aade9d19ef11f53bbc028"; + sha256 = "1wb2hs4navxmr6d3ify653w7wwpg32zrvpqb2kc413rsaxhbw5q0"; }; meta.homepage = "https://github.com/stevearc/aerial.nvim/"; }; @@ -522,12 +534,12 @@ final: prev: ale = buildVimPluginFrom2Nix { pname = "ale"; - version = "2022-05-29"; + version = "2022-06-04"; src = fetchFromGitHub { owner = "dense-analysis"; repo = "ale"; - rev = "876140832cd33e0566c5a30a755939e088925e66"; - sha256 = "15zii6c7ari89limfrw09vpj42rmsc38x0pq43vsz6j96xhz57ic"; + rev = "9bdc923624a489aa4c0a44cb1c77b984ad90e8ba"; + sha256 = "1s6ba5h0cv8y80x2nv9m98q724xv242nqzgxxh7bniakzp3jm4j4"; }; meta.homepage = "https://github.com/dense-analysis/ale/"; }; @@ -762,12 +774,12 @@ final: prev: barbar-nvim = buildVimPluginFrom2Nix { pname = "barbar.nvim"; - version = "2022-05-27"; + version = "2022-05-31"; src = fetchFromGitHub { owner = "romgrk"; repo = "barbar.nvim"; - rev = "3ff68b8ce6c777cc12a452d8ee265a0b0788d475"; - sha256 = "0zkqgyj5prs1anzbggrnijyfygkmw2xrpd6nbnyqp8rr7yvdqz7i"; + rev = "0bd9de963bcc5c35e9cb9f8bcf2035042927503f"; + sha256 = "059brc6lc87n9ghfj5b9l1pygq5if9yp56prj46ig1w8ad5lgsd4"; }; meta.homepage = "https://github.com/romgrk/barbar.nvim/"; }; @@ -894,19 +906,19 @@ final: prev: bufferline-nvim = buildVimPluginFrom2Nix { pname = "bufferline.nvim"; - version = "2022-05-29"; + version = "2022-06-01"; src = fetchFromGitHub { owner = "akinsho"; repo = "bufferline.nvim"; - rev = "e2b1e99deb077bf49f8e167d1320292e66b22477"; - sha256 = "1m7jxmf9gfnqz3im167dbviw820clagl1yanp2x556zh94jxp4hf"; + rev = "e9697f74612f90cc1fac7b5a973e1aa1323f9aff"; + sha256 = "1f5qarhf9d3i0b40l9lyigjfpgx9ji3lalw0zbgs0iwga28q2sih"; }; meta.homepage = "https://github.com/akinsho/bufferline.nvim/"; }; bullets-vim = buildVimPluginFrom2Nix { pname = "bullets.vim"; - version = "2022-06-01"; + version = "2022-01-30"; src = fetchFromGitHub { owner = "dkarter"; repo = "bullets.vim"; @@ -990,12 +1002,12 @@ final: prev: circles-nvim = buildVimPluginFrom2Nix { pname = "circles.nvim"; - version = "2022-05-29"; + version = "2022-06-03"; src = fetchFromGitHub { owner = "projekt0n"; repo = "circles.nvim"; - rev = "a1d72d2e775b187028ee992c422ff1db92ceea4e"; - sha256 = "0nrv56f43mfkwaw53yyyhxmhgjcfvz9q7c6yqrchnj9gh62x22b5"; + rev = "1d1bae3dd7669efcb8d394c6c78d7c32c5c16f71"; + sha256 = "1hg89i080xy7wqwsqfhybkfp09689dynjxc86wp2g09rf4lxkgjs"; }; meta.homepage = "https://github.com/projekt0n/circles.nvim/"; }; @@ -1012,6 +1024,18 @@ final: prev: meta.homepage = "https://github.com/xavierd/clang_complete/"; }; + clangd_extensions-nvim = buildVimPluginFrom2Nix { + pname = "clangd_extensions.nvim"; + version = "2022-05-31"; + src = fetchFromGitHub { + owner = "p00f"; + repo = "clangd_extensions.nvim"; + rev = "81b56d41d8ab791509a8464b0afc54144be9f23d"; + sha256 = "13mainbpndl3mlvalghkvykbqjpvdp5pbhk5ma93vgj38sk6ph0d"; + }; + meta.homepage = "https://github.com/p00f/clangd_extensions.nvim/"; + }; + clever-f-vim = buildVimPluginFrom2Nix { pname = "clever-f.vim"; version = "2021-07-07"; @@ -1386,12 +1410,12 @@ final: prev: coc-nvim = buildVimPluginFrom2Nix { pname = "coc.nvim"; - version = "2022-05-28"; + version = "2022-06-03"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc.nvim"; - rev = "d6287a8c6c40fb2aafb7c763b9a262d48de48760"; - sha256 = "0ra8pia1l18y23pby4nmd665lylbxh72s5nsc7x9gv7phj3l7q6g"; + rev = "102fe82be44e878d6eefdab2cb2fc4aaa5a346f3"; + sha256 = "0j5xhs1p14z0x622mxf5dsgj0byic26rc02xs1g3hm1hmy1fj530"; }; meta.homepage = "https://github.com/neoclide/coc.nvim/"; }; @@ -1444,6 +1468,18 @@ final: prev: meta.homepage = "https://github.com/lilydjwg/colorizer/"; }; + com-cloudedmountain-ide-neovim = buildVimPluginFrom2Nix { + pname = "com.cloudedmountain.ide.neovim"; + version = "2022-05-19"; + src = fetchFromGitHub { + owner = "Domeee"; + repo = "com.cloudedmountain.ide.neovim"; + rev = "d5d6c5151e8643abfabd22e9fe7e31467c679be2"; + sha256 = "1h2379ibzadv7549i13zjzavya7n7q8z532awvwqdr8incja5b4c"; + }; + meta.homepage = "https://github.com/Domeee/com.cloudedmountain.ide.neovim/"; + }; + command-t = buildVimPluginFrom2Nix { pname = "command-t"; version = "2022-05-28"; @@ -1627,16 +1663,40 @@ final: prev: copilot-vim = buildVimPluginFrom2Nix { pname = "copilot.vim"; - version = "2022-05-20"; + version = "2022-06-03"; src = fetchFromGitHub { owner = "github"; repo = "copilot.vim"; - rev = "ad102c7a58356414f18680f60c2298246e41ccea"; - sha256 = "0pnb7mb889nf963flgmp9kzc7bxkgih8pgx7zrmv56qmzlch1mii"; + rev = "042543ffc2e77a819da0415da1af6b1842a0f9c2"; + sha256 = "1anyphnyrigidsmqlczf92y46v8zi9gz3zlnzzyw1dkpp0dzm15h"; }; meta.homepage = "https://github.com/github/copilot.vim/"; }; + coq-artifacts = buildVimPluginFrom2Nix { + pname = "coq.artifacts"; + version = "2022-06-04"; + src = fetchFromGitHub { + owner = "ms-jpq"; + repo = "coq.artifacts"; + rev = "d89dd1f003cdaca6a08f87894d99de77ffb077f2"; + sha256 = "0n2naw94asbw4dqnzpkjmxwmgyfyw09fk7a42111n44mb48xi9qc"; + }; + meta.homepage = "https://github.com/ms-jpq/coq.artifacts/"; + }; + + coq-thirdparty = buildVimPluginFrom2Nix { + pname = "coq.thirdparty"; + version = "2022-06-04"; + src = fetchFromGitHub { + owner = "ms-jpq"; + repo = "coq.thirdparty"; + rev = "da33c118f5a69776cfc85e7db102a0bf88984dc2"; + sha256 = "0kkadnbk1176d4ykz6hcsi7nkc1vmk0x1h1q2d9zb61l4h5agxmh"; + }; + meta.homepage = "https://github.com/ms-jpq/coq.thirdparty/"; + }; + coq-vim = buildVimPluginFrom2Nix { pname = "coq.vim"; version = "2013-01-16"; @@ -1651,12 +1711,12 @@ final: prev: coq_nvim = buildVimPluginFrom2Nix { pname = "coq_nvim"; - version = "2022-05-30"; + version = "2022-06-04"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "coq_nvim"; - rev = "fa9607249fc2e073ce8fa3805a49f86569d819e3"; - sha256 = "1bjr3s5xy2b7a50b4cqzyc6bvkm4sn90530ss0jlgxfyxc8bv046"; + rev = "0a7e549cb0a3e4c7eeb54e3719457600e702de96"; + sha256 = "1n96sv9kk5igcgdx291c8lr5y6b5wavsycq0mdg60h7078d21cd3"; }; meta.homepage = "https://github.com/ms-jpq/coq_nvim/"; }; @@ -1687,12 +1747,12 @@ final: prev: crates-nvim = buildVimPluginFrom2Nix { pname = "crates.nvim"; - version = "2022-05-02"; + version = "2022-05-30"; src = fetchFromGitHub { owner = "saecki"; repo = "crates.nvim"; - rev = "ce6da0ec93d8160e2bf1f0850bc3d0eec1a2e383"; - sha256 = "1yl0b3fx71axpn1n6dwpdijdq8zjdb028a1gfzzwa6b62ry1qc0q"; + rev = "cceea1a4f2d0131f43b6d17ad5c793aded19443b"; + sha256 = "1hx53p8zgpaa6ql9z50gfcjlspsdd3p2hz1yak9r5qp9j94fk1as"; }; meta.homepage = "https://github.com/saecki/crates.nvim/"; }; @@ -1709,6 +1769,18 @@ final: prev: meta.homepage = "https://github.com/godlygeek/csapprox/"; }; + csharpls-extended-lsp-nvim = buildVimPluginFrom2Nix { + pname = "csharpls-extended-lsp.nvim"; + version = "2022-03-08"; + src = fetchFromGitHub { + owner = "Decodetalkers"; + repo = "csharpls-extended-lsp.nvim"; + rev = "a1985fd1cd3c67d5e1b1be7c9283222fd46e7615"; + sha256 = "159mlvz9bb91v8nld2g52r0v4gbdp182l489jdm5pvxc5yf5zl3w"; + }; + meta.homepage = "https://github.com/Decodetalkers/csharpls-extended-lsp.nvim/"; + }; + csv-vim = buildVimPluginFrom2Nix { pname = "csv.vim"; version = "2022-01-12"; @@ -1783,12 +1855,12 @@ final: prev: dashboard-nvim = buildVimPluginFrom2Nix { pname = "dashboard-nvim"; - version = "2022-05-09"; + version = "2022-05-30"; src = fetchFromGitHub { owner = "glepnir"; repo = "dashboard-nvim"; - rev = "3b31a80513969752a8c53ff8b16a8e060404cf50"; - sha256 = "0gcjyywjdsigq7a4jmcg8zgj6na5zagncdgp2a5qs81sa962k798"; + rev = "b661c8118b902dbf9ad86018ce48781ee8466612"; + sha256 = "0106jhw9fg2zmk0fqnr126f9gnh5bw7sjrxldn06ajj15ll15p9p"; }; meta.homepage = "https://github.com/glepnir/dashboard-nvim/"; }; @@ -2157,12 +2229,12 @@ final: prev: diffview-nvim = buildNeovimPluginFrom2Nix { pname = "diffview.nvim"; - version = "2022-05-28"; + version = "2022-05-31"; src = fetchFromGitHub { owner = "sindrets"; repo = "diffview.nvim"; - rev = "08e4340f690d0b611a393eafb633b2fb62f78601"; - sha256 = "0v7fabqw5ld4s9s3r8wblj7cjf3nbvhgnzawiip0jl4xi77d454d"; + rev = "3ffe4a70c4b434ee933cb869b1706632c4407495"; + sha256 = "04xma63803bprwjynj6nsybiz56h5wzrj8jbfj05hf24q9bbklfd"; }; meta.homepage = "https://github.com/sindrets/diffview.nvim/"; }; @@ -2193,36 +2265,36 @@ final: prev: dressing-nvim = buildVimPluginFrom2Nix { pname = "dressing.nvim"; - version = "2022-05-30"; + version = "2022-06-01"; src = fetchFromGitHub { owner = "stevearc"; repo = "dressing.nvim"; - rev = "b2406a0ea7b88177219ed475a14bc490a4653323"; - sha256 = "009867kvvzn6kf07la4wbisfbkyxlmj5sgzs83mh75r8j9al7j8n"; + rev = "1706d00209ee250be56029f8c5b439daa19a1411"; + sha256 = "0wkixp0gc001hgryqxkm5hdw1pcbjxndz2x4za1b7djq340n9md4"; }; meta.homepage = "https://github.com/stevearc/dressing.nvim/"; }; echodoc-vim = buildVimPluginFrom2Nix { pname = "echodoc.vim"; - version = "2021-11-26"; + version = "2022-06-04"; src = fetchFromGitHub { owner = "Shougo"; repo = "echodoc.vim"; - rev = "42b7fb45c6a45e90410203d9c248b79bc46ea933"; - sha256 = "14as4q6dnc540in68039c1bbdn4ag86872pbra6h06s5rbhbgzky"; + rev = "945cdbbbd0e3c93d6514c0283425c32c35cddb17"; + sha256 = "0jqy96mc5kdgh7gxcxlgl94fvaxgazhkwkydki78vpgszvshrbry"; }; meta.homepage = "https://github.com/Shougo/echodoc.vim/"; }; edge = buildVimPluginFrom2Nix { pname = "edge"; - version = "2022-05-26"; + version = "2022-06-04"; src = fetchFromGitHub { owner = "sainnhe"; repo = "edge"; - rev = "2f2683f918fa1a90f41650682bb53819fc0c1849"; - sha256 = "0vl3ffrdaz38qax9k2lfvw2wlj94688w6gd1831is17dm9wv50ys"; + rev = "2c7c3a1bfbd7ce1a62ef61e6cfdcdb9e8c04d1f0"; + sha256 = "0g3az80iisdbk5w6yqhpw8ws5jh82hzqwq8y6808n3f0ki1b5mz9"; }; meta.homepage = "https://github.com/sainnhe/edge/"; }; @@ -2303,12 +2375,12 @@ final: prev: everforest = buildVimPluginFrom2Nix { pname = "everforest"; - version = "2022-05-26"; + version = "2022-05-31"; src = fetchFromGitHub { owner = "sainnhe"; repo = "everforest"; - rev = "ee24cd4bde3fea5c536a6a319900683825b16adc"; - sha256 = "1s5d85rjwyqpamidkjwsn52l2pdgz96rspmq6nx5lnis5gdn5idr"; + rev = "eca7c8c196215f687319295c81e6ba1d4e2f53a4"; + sha256 = "10jfag6ngarq2gnwlz4w7b0ckm9j899lppznz4sbrhisv35l4mjf"; }; meta.homepage = "https://github.com/sainnhe/everforest/"; }; @@ -2363,12 +2435,12 @@ final: prev: feline-nvim = buildVimPluginFrom2Nix { pname = "feline.nvim"; - version = "2022-05-27"; + version = "2022-05-31"; src = fetchFromGitHub { owner = "feline-nvim"; repo = "feline.nvim"; - rev = "fba1aaa74ceb0df222a556c6ca0db8f303fa893e"; - sha256 = "1nlryj4jivlmgbr2j0dvhv9z0nk93gzl8kix76wn37z9prd8zci4"; + rev = "1ea42671c523a080a01c62c40c2c8e7fc0139a8f"; + sha256 = "0yrkdzikpcq9phybbzfggdfj4y983y9qw1fvnzpvff7mp11jskqw"; }; meta.homepage = "https://github.com/feline-nvim/feline.nvim/"; }; @@ -2482,6 +2554,18 @@ final: prev: meta.homepage = "https://github.com/floobits/floobits-neovim/"; }; + flutter-tools-nvim = buildVimPluginFrom2Nix { + pname = "flutter-tools.nvim"; + version = "2022-05-19"; + src = fetchFromGitHub { + owner = "akinsho"; + repo = "flutter-tools.nvim"; + rev = "9301eeb3f1b4ea15845ee72f778b6af7bad60321"; + sha256 = "0c1f7cljpa6mndk1aqs1w64jlhjjybfbyqs0s4g1jdcz5a7b4fqi"; + }; + meta.homepage = "https://github.com/akinsho/flutter-tools.nvim/"; + }; + formatter-nvim = buildVimPluginFrom2Nix { pname = "formatter.nvim"; version = "2022-05-16"; @@ -2820,12 +2904,12 @@ final: prev: goto-preview = buildVimPluginFrom2Nix { pname = "goto-preview"; - version = "2021-12-25"; + version = "2022-06-03"; src = fetchFromGitHub { owner = "rmagatti"; repo = "goto-preview"; - rev = "7f842e981f81cce14f28c49befad9146c18c3931"; - sha256 = "018lf4z50j25j5y3lhcw1al2jp6dm9xy39mi9732zx4wa8my8gix"; + rev = "37116fb5167d2a93cada8db9135c5032a25348a7"; + sha256 = "0mrayyzc4z70rr9c66iwpdqk475pbmgvqanq5nakx1a19blqkkzj"; }; meta.homepage = "https://github.com/rmagatti/goto-preview/"; }; @@ -2842,6 +2926,18 @@ final: prev: meta.homepage = "https://github.com/junegunn/goyo.vim/"; }; + grammar-guard-nvim = buildVimPluginFrom2Nix { + pname = "grammar-guard.nvim"; + version = "2022-01-03"; + src = fetchFromGitHub { + owner = "brymer-meneses"; + repo = "grammar-guard.nvim"; + rev = "ea163c4adfd68fdd40e095cdf39cb506bf3ce3b2"; + sha256 = "0wdbpkg1y0s7fhaybyj735dxdkvfgnng49i8k0zrsy16d75md4bs"; + }; + meta.homepage = "https://github.com/brymer-meneses/grammar-guard.nvim/"; + }; + graphviz-vim = buildVimPluginFrom2Nix { pname = "graphviz.vim"; version = "2021-04-09"; @@ -2880,12 +2976,12 @@ final: prev: gruvbox-material = buildVimPluginFrom2Nix { pname = "gruvbox-material"; - version = "2022-05-26"; + version = "2022-06-02"; src = fetchFromGitHub { owner = "sainnhe"; repo = "gruvbox-material"; - rev = "b47a19b27273f6e02e5342a448a5f82c9bd377f9"; - sha256 = "0iz3a9s4m8bmaghdd84yjr2hlib3gnm3khjavq97cknsid3cakgh"; + rev = "8aba3586fdefbdad3f758e24799245b799ae5a6f"; + sha256 = "03hkgzirnjahi44xwbzmpcbzpj4lgydq07wva32cyyrv3h8qplar"; }; meta.homepage = "https://github.com/sainnhe/gruvbox-material/"; }; @@ -3024,12 +3120,12 @@ final: prev: hotpot-nvim = buildVimPluginFrom2Nix { pname = "hotpot.nvim"; - version = "2022-04-24"; + version = "2022-05-31"; src = fetchFromGitHub { owner = "rktjmp"; repo = "hotpot.nvim"; - rev = "f481b30f1d93df6016092623199ddc8bfe1624d0"; - sha256 = "0zqz1m46bpj74l5vckvhaynbdq7vvi8vx1r1lrsjapb0blmfh0fj"; + rev = "21258d4194a606d8d53bf68d06cc25457b2e8449"; + sha256 = "0ily343jzx9ra2mxp1flmshsl5bara0wx10fgyrrps1cfag383jm"; }; meta.homepage = "https://github.com/rktjmp/hotpot.nvim/"; }; @@ -3397,12 +3493,12 @@ final: prev: lean-nvim = buildVimPluginFrom2Nix { pname = "lean.nvim"; - version = "2022-05-21"; + version = "2022-05-30"; src = fetchFromGitHub { owner = "Julian"; repo = "lean.nvim"; - rev = "2cc1642188f61778c8c7212b98d01f1a36e89a07"; - sha256 = "0wbd4agk21zn1icnn79s1dpx8nz6g6j0sfi7jif06w4yysj7cj98"; + rev = "2be99e3fa33ab24beb035ed46c51b353fc373cd5"; + sha256 = "0235cc6wcir4qgv9yksrj3ycd3w44w2gkb1zn0yljd5ygi3xp2mz"; }; meta.homepage = "https://github.com/Julian/lean.nvim/"; }; @@ -3649,12 +3745,12 @@ final: prev: litee-nvim = buildVimPluginFrom2Nix { pname = "litee.nvim"; - version = "2022-05-19"; + version = "2022-06-03"; src = fetchFromGitHub { owner = "ldelossa"; repo = "litee.nvim"; - rev = "f181c7674e8a826ef66d1f67f23e92631477bb7c"; - sha256 = "0zq4l46c6q8x27lkyzjji1d4i8q5b5s2x198a427d87ps1dswv85"; + rev = "de1a3d65c0917bcb933ad023768f6b6e74f6ca92"; + sha256 = "1qmvqh9xw8y7vgnc532glcgv94mbwr0ilaiw100ri2qlr9lri2np"; }; meta.homepage = "https://github.com/ldelossa/litee.nvim/"; }; @@ -3744,12 +3840,12 @@ final: prev: lspsaga-nvim = buildVimPluginFrom2Nix { pname = "lspsaga.nvim"; - version = "2022-05-18"; + version = "2022-06-02"; src = fetchFromGitHub { owner = "tami5"; repo = "lspsaga.nvim"; - rev = "39b6faccb57fd640a06c7d73a30507b13263fcbf"; - sha256 = "09xym8gbrabr0y8bwkb4aq3iwdrd6yb9104gzy7l180pvrjq58qn"; + rev = "e4beaeff66ae4f70d0b67fe045b70d78780bb947"; + sha256 = "1in3yhbr535xrzgnm6n8623xgqm73djphv2xnd1q84psr1lrkzb7"; }; meta.homepage = "https://github.com/tami5/lspsaga.nvim/"; }; @@ -3780,12 +3876,12 @@ final: prev: lualine-nvim = buildVimPluginFrom2Nix { pname = "lualine.nvim"; - version = "2022-05-22"; + version = "2022-05-30"; src = fetchFromGitHub { owner = "nvim-lualine"; repo = "lualine.nvim"; - rev = "c12b1673107c181e32ce54f2dc4c76a2a884d7ba"; - sha256 = "13msrlhwm8vsnk50gfx8lzswk50qgzx7namdh6gm1aw4ckmwfsyc"; + rev = "3362b28f917acc37538b1047f187ff1b5645ecdd"; + sha256 = "0pfkh7zhnwhbfdcild5vayymw4vqzcfb31nq1y33pk1zlvpwxksv"; }; meta.homepage = "https://github.com/nvim-lualine/lualine.nvim/"; }; @@ -3900,12 +3996,12 @@ final: prev: mini-nvim = buildVimPluginFrom2Nix { pname = "mini.nvim"; - version = "2022-05-26"; + version = "2022-06-02"; src = fetchFromGitHub { owner = "echasnovski"; repo = "mini.nvim"; - rev = "75477368c63e3dee65b2a39e6050391ef521f0b8"; - sha256 = "1i9x44m9f6nakv1vb2pxij7b71pyblm2w55nlbbklja19diggw3n"; + rev = "6adaf4c42455c093f00d0df3882ab48838423a57"; + sha256 = "0198f7818m58h2bxgdnfnx5nm7vxi2psssx105dn6ndg55yf2qsx"; }; meta.homepage = "https://github.com/echasnovski/mini.nvim/"; }; @@ -4248,24 +4344,24 @@ final: prev: neoformat = buildVimPluginFrom2Nix { pname = "neoformat"; - version = "2022-05-27"; + version = "2022-06-02"; src = fetchFromGitHub { owner = "sbdchd"; repo = "neoformat"; - rev = "c010862fa151f1d6a009d94a0acbe49514781cdc"; - sha256 = "08y0srr1i5n7d15w3shp8cdj4gqhdxpb6311k879amb28am5n8zk"; + rev = "e8ce68ba5b57df18b54b96adb80ad533c7a2eb3d"; + sha256 = "09ylazsa933dqhx0x9qc4v2ackqvr22dpzbgyhkvqfs476fj5pn4"; }; meta.homepage = "https://github.com/sbdchd/neoformat/"; }; neogit = buildVimPluginFrom2Nix { pname = "neogit"; - version = "2022-05-16"; + version = "2022-06-01"; src = fetchFromGitHub { owner = "TimUntersberger"; repo = "neogit"; - rev = "1453acd27c38fb4374093bc5c2c85dd1fc03d689"; - sha256 = "1hrk8p0ma43p30ka8zv3k0czv66qxy88kmv34m5lc813qsrzhivn"; + rev = "441c23d355b77f4067a1ad018c5dba64efd7ff7f"; + sha256 = "0yay92x3jmvpgqhx0hv0w19fjisakmmdzd286m656v5g26hmfxj1"; }; meta.homepage = "https://github.com/TimUntersberger/neogit/"; }; @@ -4320,12 +4416,12 @@ final: prev: neorg = buildVimPluginFrom2Nix { pname = "neorg"; - version = "2022-05-26"; + version = "2022-06-03"; src = fetchFromGitHub { owner = "nvim-neorg"; repo = "neorg"; - rev = "d63ad5129b935b84f975df12c9669a466d7c6c23"; - sha256 = "1w6mwy6pan0cpm997lwx2fm45lfd4mm2lw8adpivlkw3jknaallk"; + rev = "535fca8fd422fdedd686825d1f59a4e40e00259e"; + sha256 = "16yvvqmr7hg5g23ndig65y6by1y2khac1j9lmibvf91sxqdqrhxr"; }; meta.homepage = "https://github.com/nvim-neorg/neorg/"; }; @@ -4368,12 +4464,12 @@ final: prev: neoterm = buildVimPluginFrom2Nix { pname = "neoterm"; - version = "2022-05-27"; + version = "2022-05-31"; src = fetchFromGitHub { owner = "kassio"; repo = "neoterm"; - rev = "5343120620544c00c98e0f52cb15a76944b74fee"; - sha256 = "0v6jwrfmlr3hnczgiygxx99289w9g8jf3nzr0qg2qsc19239glqq"; + rev = "4881d6428bcaa524ad4686431ce184c6fb9bfe59"; + sha256 = "1i98sfb7vb0fx16zl15lf6ac65f1j0h9hbskmfk6zdiqcfcwhx4f"; }; meta.homepage = "https://github.com/kassio/neoterm/"; }; @@ -4476,12 +4572,12 @@ final: prev: neuron-vim = buildVimPluginFrom2Nix { pname = "neuron.vim"; - version = "2020-12-06"; + version = "2022-06-02"; src = fetchFromGitHub { owner = "fiatjaf"; repo = "neuron.vim"; - rev = "0b820b2191bf239c38e62ffa63501333590d6810"; - sha256 = "0x00y0a46jwqq9gx741m3j7p78ps7nycp5hl3bjxqmwj289gc12y"; + rev = "e4e7f0b012d39d8e5dfb7d13ca199eaa130279ba"; + sha256 = "06qqbg4d0gk8d236f08sr847m5icbfknxsya2q3f52alnlpjry32"; }; meta.homepage = "https://github.com/fiatjaf/neuron.vim/"; }; @@ -4500,12 +4596,12 @@ final: prev: nightfox-nvim = buildVimPluginFrom2Nix { pname = "nightfox.nvim"; - version = "2022-05-25"; + version = "2022-05-30"; src = fetchFromGitHub { owner = "EdenEast"; repo = "nightfox.nvim"; - rev = "b37efa583fe7edbf347a25ff5ce07514c9316c88"; - sha256 = "19gx3vr0jz8b26vlfmg13nx70r411i6xdn6k5nsalf6lfapp01ky"; + rev = "e602acaad91a546be2250e026f0bdc6be8c8a44c"; + sha256 = "0666alx5yh6kzh417x4wydijh7aslxl4mivjzcvi74zr46h1xwz5"; }; meta.homepage = "https://github.com/EdenEast/nightfox.nvim/"; }; @@ -4548,12 +4644,12 @@ final: prev: nord-vim = buildVimPluginFrom2Nix { pname = "nord-vim"; - version = "2022-05-14"; + version = "2022-05-31"; src = fetchFromGitHub { owner = "arcticicestudio"; repo = "nord-vim"; - rev = "d32b4dd6aa494c7e18aed11222fb8fed2034c515"; - sha256 = "0k1bhr2nyqrr350bp6jcp1l4x67yjdqfnq922ywyaaji1adbr1i1"; + rev = "bc0f057162491e9228207d74bd88b5efe875316e"; + sha256 = "16fm573my8ysmcy68wy9kxwrm85q8fmpggwr83z1gwq3mmws59xy"; }; meta.homepage = "https://github.com/arcticicestudio/nord-vim/"; }; @@ -4608,12 +4704,12 @@ final: prev: null-ls-nvim = buildVimPluginFrom2Nix { pname = "null-ls.nvim"; - version = "2022-05-30"; + version = "2022-05-31"; src = fetchFromGitHub { owner = "jose-elias-alvarez"; repo = "null-ls.nvim"; - rev = "5ef0680d66d4fbebdcc8bed8cabe056470c802ff"; - sha256 = "1xlflkd2zivc0dd6w84b27i9wcx99dp5jw2j8gq8a7n54043jwq4"; + rev = "7b8560d53045f36d74236d17f0b280ec94e65198"; + sha256 = "0pnp79l7ml97l25xm5c7g9ywnjqb2b9wvzlxp82apqns4qmgq9c2"; }; meta.homepage = "https://github.com/jose-elias-alvarez/null-ls.nvim/"; }; @@ -4680,24 +4776,24 @@ final: prev: nvim-biscuits = buildNeovimPluginFrom2Nix { pname = "nvim-biscuits"; - version = "2021-11-12"; + version = "2022-05-31"; src = fetchFromGitHub { owner = "code-biscuits"; repo = "nvim-biscuits"; - rev = "15a0cb1273bd36d5a734210cdc3406fb4bcfb733"; - sha256 = "15incx76ps8k4bra3s6ml66ckjhzjgbc7q2njs61yzfg46vdbhsd"; + rev = "ed33933c1b4098f11ef61c06e2db76974490044d"; + sha256 = "17pd72djkmqivdkpx9awr9irwysmgsimh9mabd4dha4kjh1ar32j"; }; meta.homepage = "https://github.com/code-biscuits/nvim-biscuits/"; }; nvim-bqf = buildVimPluginFrom2Nix { pname = "nvim-bqf"; - version = "2022-05-24"; + version = "2022-05-31"; src = fetchFromGitHub { owner = "kevinhwang91"; repo = "nvim-bqf"; - rev = "f1551f355ce418dfa435bf972c53c4f385d6287d"; - sha256 = "0vfd9hfwgcca7nypppisz9xi5d43420gb0rvfrggppjwfrsw3cj9"; + rev = "0cc539c52e51d32d8febf1f04c5e7ed5353fead2"; + sha256 = "1kljchr83ms3f7nc9lvy3fnvqv13xmh3xksyyazs0ivk20wgmbb3"; }; meta.homepage = "https://github.com/kevinhwang91/nvim-bqf/"; }; @@ -4824,12 +4920,12 @@ final: prev: nvim-dap = buildVimPluginFrom2Nix { pname = "nvim-dap"; - version = "2022-05-26"; + version = "2022-06-03"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-dap"; - rev = "0062c19424ac751f47227b440c3d6c7e584687ff"; - sha256 = "1a3isml45wp6sdwhyc7ch4z1vpfv23lrcnnljykk2dp5iznfa3da"; + rev = "9c783d8d2a6f776ee817281f0bf07d356524cc1f"; + sha256 = "0rg4riwb8fbm661j1bmp1ffi04cfy4y5asmx0a8j9yyaz6bsn0d3"; }; meta.homepage = "https://github.com/mfussenegger/nvim-dap/"; }; @@ -4896,12 +4992,12 @@ final: prev: nvim-gdb = buildVimPluginFrom2Nix { pname = "nvim-gdb"; - version = "2022-05-12"; + version = "2022-05-31"; src = fetchFromGitHub { owner = "sakhnik"; repo = "nvim-gdb"; - rev = "9c630705829fbe8c21a9379ae2be948560189d80"; - sha256 = "1cdc2r12k1nma37vicshy4kbk79ap8qj040rscxzl41z96ff8v0b"; + rev = "713e333d3d5cecaaee20c1e4d55fb5a344b5ca2e"; + sha256 = "19jm1i5z1y3bfyp92rwjmbxjalhp3anbmfafhrp10f7sd3mbcxhf"; }; meta.homepage = "https://github.com/sakhnik/nvim-gdb/"; }; @@ -4956,12 +5052,12 @@ final: prev: nvim-jdtls = buildVimPluginFrom2Nix { pname = "nvim-jdtls"; - version = "2022-05-06"; + version = "2022-06-02"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-jdtls"; - rev = "f582b5be2ae1fee2e5dc974cd9b979a1ab08cca6"; - sha256 = "0bfdp6xbq7qr7185m06ccfmln2gc24vc1215cxczm1bpyrh98ncq"; + rev = "72a40cdcde653df645644375307b4ea0cb658281"; + sha256 = "180v9810bmnh9xf74sq7nrgv98iva5xpka9yyhqp7n9li7c7xp93"; }; meta.homepage = "https://github.com/mfussenegger/nvim-jdtls/"; }; @@ -4992,12 +5088,12 @@ final: prev: nvim-lightline-lsp = buildVimPluginFrom2Nix { pname = "nvim-lightline-lsp"; - version = "2022-01-06"; + version = "2022-05-30"; src = fetchFromGitHub { owner = "josa42"; repo = "nvim-lightline-lsp"; - rev = "d9e61801f54c8824b59e93068865e3bc4f1ca0b8"; - sha256 = "0sd38c4cp7i6prgr86b5nq9fhpi2h1yrn3ggs3d7my65ayz759m6"; + rev = "0fe34eed830b223770111c6333fe48d9fca158d5"; + sha256 = "08qxyr998d7zwnk0czfq4hif0q801fm2ijpbwql32kd6a62bnhjf"; }; meta.homepage = "https://github.com/josa42/nvim-lightline-lsp/"; }; @@ -5028,12 +5124,12 @@ final: prev: nvim-lspconfig = buildVimPluginFrom2Nix { pname = "nvim-lspconfig"; - version = "2022-05-22"; + version = "2022-06-03"; src = fetchFromGitHub { owner = "neovim"; repo = "nvim-lspconfig"; - rev = "b86a37caf7a4e53e62ba883aef5889b590260de9"; - sha256 = "0bp1wqiwngrcl4isnnk12v3kzzrvjfbwhx79jvfzqnlqnl9q4m1p"; + rev = "2a455c148341c4faf2dd60401397fed35d084c59"; + sha256 = "1plhjirvg4xvh147xdr339z7jvw2mf973rkahhgxfwfzp1g1gjq9"; }; meta.homepage = "https://github.com/neovim/nvim-lspconfig/"; }; @@ -5052,12 +5148,12 @@ final: prev: nvim-metals = buildVimPluginFrom2Nix { pname = "nvim-metals"; - version = "2022-05-27"; + version = "2022-06-02"; src = fetchFromGitHub { owner = "scalameta"; repo = "nvim-metals"; - rev = "9f8272802d35928df6c739f8e06f0e2767ad53a7"; - sha256 = "1h918npmwf46ddrr7hfdxgbmfvdvczhxb8lpdwqia76zx1pz14qs"; + rev = "6738fe3c0e2142de01c753f8b7c18281d11488ce"; + sha256 = "19k330fv68z9icdlbf6bjn8ckwrjkdn9k9hl4r4ss95lm7sfgzd8"; }; meta.homepage = "https://github.com/scalameta/nvim-metals/"; }; @@ -5088,12 +5184,12 @@ final: prev: nvim-notify = buildVimPluginFrom2Nix { pname = "nvim-notify"; - version = "2022-05-16"; + version = "2022-06-04"; src = fetchFromGitHub { owner = "rcarriga"; repo = "nvim-notify"; - rev = "c6ca279271f03db5ee03523d1c312ba624d3fa75"; - sha256 = "096pk6gzxvwg55acz9r3wmrmdbz9s0ccyikmm0r91y42aa13xl73"; + rev = "b517277b2782b9fe20f64220435b8b6f9f02f840"; + sha256 = "0najyal8r9a443jqyv84sgpa235lkms2ggy835i4pb47azizwmfa"; }; meta.homepage = "https://github.com/rcarriga/nvim-notify/"; }; @@ -5160,24 +5256,24 @@ final: prev: nvim-tree-lua = buildVimPluginFrom2Nix { pname = "nvim-tree.lua"; - version = "2022-05-30"; + version = "2022-06-04"; src = fetchFromGitHub { owner = "kyazdani42"; repo = "nvim-tree.lua"; - rev = "8198fa01fcb1469b20a268d6f9f0c5f7dbedc424"; - sha256 = "14s914imkfxwbwk2a0vrq9r1s4hy1lsy2crf2h2p7g9cm7y0mkhd"; + rev = "3aeb59b0754afb60751cd58b9903852b6076cea4"; + sha256 = "0zw9rafhc4s9fhk53a4mxy9kspmcizzii1phvs2hib34laj78gwb"; }; meta.homepage = "https://github.com/kyazdani42/nvim-tree.lua/"; }; nvim-treesitter = buildVimPluginFrom2Nix { pname = "nvim-treesitter"; - version = "2022-05-29"; + version = "2022-06-04"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter"; - rev = "8c56988d79f95a9d75b001a0a9e302f7b1c4b384"; - sha256 = "17qii6j681v06f6kmj7p2hbrcjpvdqicii7lfnz81dq1ga522mkw"; + rev = "d7ec2e6ab938b60baa5a9f4cd46d1d88d6da22ac"; + sha256 = "03y5zl1drl1p072980kd247ksqlh33kvk0sjq1iaplwjmbxkmjfg"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/"; }; @@ -5268,12 +5364,12 @@ final: prev: nvim-web-devicons = buildVimPluginFrom2Nix { pname = "nvim-web-devicons"; - version = "2022-05-26"; + version = "2022-05-30"; src = fetchFromGitHub { owner = "kyazdani42"; repo = "nvim-web-devicons"; - rev = "8a3ab5eb181b5a10d6ed031f3eeafa1acd2058f9"; - sha256 = "0yvzhv8m6zbrgnfa8x4z8sii2jx2rs4l96y5zh368ywn4ih7p8d8"; + rev = "8d2c5337f0a2d0a17de8e751876eeb192b32310e"; + sha256 = "0jb25z0bw2xyix18pf59lrmbnih8yxxkb81xi9zl034k9l9cmsv3"; }; meta.homepage = "https://github.com/kyazdani42/nvim-web-devicons/"; }; @@ -5352,16 +5448,28 @@ final: prev: octo-nvim = buildVimPluginFrom2Nix { pname = "octo.nvim"; - version = "2022-05-23"; + version = "2022-06-02"; src = fetchFromGitHub { owner = "pwntester"; repo = "octo.nvim"; - rev = "5517cbdf302be2abc4ac43e5b8b2a812d0222bbb"; - sha256 = "0lndw6dhkwqm6kx5d9iizdjkvmk45yzrbx05fz6cz22mmyzrxka2"; + rev = "a23c1f1c810c543d9da69a8a6feb2061738fc714"; + sha256 = "0jy2az08il2w4wyabggmqhmi8cgmyqmm4x4zypvkv8qs7m9l72kq"; }; meta.homepage = "https://github.com/pwntester/octo.nvim/"; }; + omnisharp-extended-lsp-nvim = buildVimPluginFrom2Nix { + pname = "omnisharp-extended-lsp.nvim"; + version = "2022-05-10"; + src = fetchFromGitHub { + owner = "Hoffs"; + repo = "omnisharp-extended-lsp.nvim"; + rev = "e0dbe96194465f26e2cfff5d170ba8c88287e329"; + sha256 = "119pc3va1g76clvm6c09jldsybjqml8fycx23lyh85f00jrwr2y9"; + }; + meta.homepage = "https://github.com/Hoffs/omnisharp-extended-lsp.nvim/"; + }; + one-nvim = buildVimPluginFrom2Nix { pname = "one-nvim"; version = "2021-06-10"; @@ -5448,12 +5556,12 @@ final: prev: orgmode = buildVimPluginFrom2Nix { pname = "orgmode"; - version = "2022-05-29"; + version = "2022-06-01"; src = fetchFromGitHub { owner = "nvim-orgmode"; repo = "orgmode"; - rev = "35f4fb6faf7b26d8c09e382092f0ece0bc11ebd7"; - sha256 = "10iwn09sjcbckphpndrnhn76ls336gybwm53iwji582shyx6wmsf"; + rev = "b0649b59144338d3a6d6bd04425a98acd203e413"; + sha256 = "1q5gxmsjnchp39py0dv4gl4fy0fhjlca1calnlq4vil63yr4jpry"; }; meta.homepage = "https://github.com/nvim-orgmode/orgmode/"; }; @@ -5472,12 +5580,12 @@ final: prev: packer-nvim = buildVimPluginFrom2Nix { pname = "packer.nvim"; - version = "2022-03-23"; + version = "2022-06-02"; src = fetchFromGitHub { owner = "wbthomason"; repo = "packer.nvim"; - rev = "4dedd3b08f8c6e3f84afbce0c23b66320cd2a8f2"; - sha256 = "09sqfak384lhqr37003bq4wm9v0hi690ilag89z6cw5c0fnsysbl"; + rev = "00ec5adef58c5ff9a07f11f45903b9dbbaa1b422"; + sha256 = "1rgff84r4h5va58652ylspsdv9zhya46fak55spb69m5f9wh2vn5"; }; meta.homepage = "https://github.com/wbthomason/packer.nvim/"; }; @@ -5496,12 +5604,12 @@ final: prev: papercolor-theme = buildVimPluginFrom2Nix { pname = "papercolor-theme"; - version = "2022-04-30"; + version = "2022-05-31"; src = fetchFromGitHub { owner = "NLKNguyen"; repo = "papercolor-theme"; - rev = "beb86c7630e19314f5990acef81f9823bbb5bf3c"; - sha256 = "14jf8fm1bjcmbw3mbr1a5731bac4i4mb8fv9ahdxd8i9349nyj3c"; + rev = "7cd968118f6d00d7c9b7d946f88476ad4f2cbbd3"; + sha256 = "0yixp5a8gl6bvsp3341zzyil8fjr02g2s2xplqw3y5r16afcqngz"; }; meta.homepage = "https://github.com/NLKNguyen/papercolor-theme/"; }; @@ -5592,12 +5700,12 @@ final: prev: plenary-nvim = buildNeovimPluginFrom2Nix { pname = "plenary.nvim"; - version = "2022-05-21"; + version = "2022-06-01"; src = fetchFromGitHub { owner = "nvim-lua"; repo = "plenary.nvim"; - rev = "1da13add868968802157a0234136d5b1fbc34dfe"; - sha256 = "019kj1iv941shzzj8343yqavw894f4819r5h58p4fhs3fk40qq6b"; + rev = "54b2e3d58f567983feabaeb9408eccf6b7f32206"; + sha256 = "1ldjdc7yq4awlllr9dcv8fnkcwgdpvj0py5mhvx3v1yjniwrkn2i"; }; meta.homepage = "https://github.com/nvim-lua/plenary.nvim/"; }; @@ -5870,12 +5978,12 @@ final: prev: refactoring-nvim = buildVimPluginFrom2Nix { pname = "refactoring.nvim"; - version = "2022-05-28"; + version = "2022-06-02"; src = fetchFromGitHub { owner = "theprimeagen"; repo = "refactoring.nvim"; - rev = "0210e88fdcc8032046289ed654ef39779d97e343"; - sha256 = "11mjx1r1cjagf15yii3rjf09is3y68kd6gacgfp71z39qxqgicm9"; + rev = "8aae61389d3654335b2fd913d137f4908d482717"; + sha256 = "0jk6cmng7cyxwdb5a7pnrvhaha32sj225zpjrng52yr1s9zg9hrl"; }; meta.homepage = "https://github.com/theprimeagen/refactoring.nvim/"; }; @@ -6207,12 +6315,12 @@ final: prev: sonokai = buildVimPluginFrom2Nix { pname = "sonokai"; - version = "2022-05-26"; + version = "2022-05-31"; src = fetchFromGitHub { owner = "sainnhe"; repo = "sonokai"; - rev = "4cb3cae7d95e452569962d9ba05deb0e48ec4c12"; - sha256 = "1rccaaca1l0hc5hv1js831k5sggvzkp3zin5narwa7p20w6jqm3d"; + rev = "c2f8a7259e4b67fb4d0242afababbb1dda3285a3"; + sha256 = "1ni8b2b3cqqmi8lr4dh2f5bwnxwcdwqdjfvvds4m8jq2s3kql4bh"; }; meta.homepage = "https://github.com/sainnhe/sonokai/"; }; @@ -6277,6 +6385,18 @@ final: prev: meta.homepage = "https://github.com/edluffy/specs.nvim/"; }; + spellsitter-nvim = buildVimPluginFrom2Nix { + pname = "spellsitter.nvim"; + version = "2022-06-02"; + src = fetchFromGitHub { + owner = "lewis6991"; + repo = "spellsitter.nvim"; + rev = "430a25393abbf482bddf03c224cd5b8eeb27b5e1"; + sha256 = "1cypvpyaarn9ckin2cgf2hpsq5qj517pz64imvyckzg22x9cf6yi"; + }; + meta.homepage = "https://github.com/lewis6991/spellsitter.nvim/"; + }; + splice-vim = buildVimPluginFrom2Nix { pname = "splice.vim"; version = "2020-01-15"; @@ -6570,12 +6690,12 @@ final: prev: tagalong-vim = buildVimPluginFrom2Nix { pname = "tagalong.vim"; - version = "2022-05-16"; + version = "2022-05-31"; src = fetchFromGitHub { owner = "AndrewRadev"; repo = "tagalong.vim"; - rev = "04a6102cfa67e3e384593ced2226d4c054d379d9"; - sha256 = "1kjblsn5gglqz57vinlghjknn3s39q2r11vdqgk2xfdaqvrvfhk5"; + rev = "7b8cf57d8b5cbf5ece29e8198e72e8db39d9fe26"; + sha256 = "0qs9vrqc84v62g1qmlf5h07g4s97gg83mvl9jskcz2v3m7wxa6x3"; }; meta.homepage = "https://github.com/AndrewRadev/tagalong.vim/"; }; @@ -6690,12 +6810,12 @@ final: prev: telescope-file-browser-nvim = buildVimPluginFrom2Nix { pname = "telescope-file-browser.nvim"; - version = "2022-05-28"; + version = "2022-06-02"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope-file-browser.nvim"; - rev = "ea7905ed9b13bcf50e0ba4f3bff13330028d298c"; - sha256 = "0zzbgm9v0rzdk9c04qjhi3k6wgkp4k6rplw8lqq1wxxa0ffwvqgz"; + rev = "61a5521853ac739ae3d0d395f52c1178108e0114"; + sha256 = "18zr37rcr0f0066zkp5v3yrji3y1b48dj0sn4zf543pglppz2kz6"; }; meta.homepage = "https://github.com/nvim-telescope/telescope-file-browser.nvim/"; }; @@ -6714,12 +6834,12 @@ final: prev: telescope-fzf-native-nvim = buildVimPluginFrom2Nix { pname = "telescope-fzf-native.nvim"; - version = "2022-05-15"; + version = "2022-06-01"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope-fzf-native.nvim"; - rev = "2330a7eac13f9147d6fe9ce955cb99b6c1a0face"; - sha256 = "107qh744nw316clvm5nhn2xlb663j59bq346lal12mlvd6wkrsbc"; + rev = "f0dba7df9536ddb0c8f7b6482ede77940d728d23"; + sha256 = "1fyww6h5y8624qn30j6297ipjs4h5rbn1af1fslwn3cz0qsfww2h"; }; meta.homepage = "https://github.com/nvim-telescope/telescope-fzf-native.nvim/"; }; @@ -6859,12 +6979,12 @@ final: prev: telescope-nvim = buildVimPluginFrom2Nix { pname = "telescope.nvim"; - version = "2022-05-29"; + version = "2022-06-02"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope.nvim"; - rev = "54be102e20ee4acaaa17e9fce8be07fb586630df"; - sha256 = "0w4h02xkdmjjmz5fr98h24ylcq7jdm3mg1x9hka9cqdvdsdbck1s"; + rev = "d3aad43b3fcf707052f7dd8a7c7072fa69773f3c"; + sha256 = "0m84qnm7pxn26a4znf0gxrz2q0kr951lqzk7pph54xdxrcvjha10"; }; meta.homepage = "https://github.com/nvim-telescope/telescope.nvim/"; }; @@ -7988,12 +8108,12 @@ final: prev: vim-clap = buildVimPluginFrom2Nix { pname = "vim-clap"; - version = "2022-05-29"; + version = "2022-05-30"; src = fetchFromGitHub { owner = "liuchengxu"; repo = "vim-clap"; - rev = "acdf27bab79e9c40adbbb25fe4d3ed12a957d008"; - sha256 = "1qhmf34qc9kd1khwr8k57f6x41qyx3avivaz7n3p7aslsnwryz1v"; + rev = "2256c3e4860f9bddfb539ec4c3faab30535cbb9a"; + sha256 = "0fcmx1hirf40qdgb76g3bsf6n4s18v3yq4hw4hlwdp4jpbl2zymw"; }; meta.homepage = "https://github.com/liuchengxu/vim-clap/"; }; @@ -8060,12 +8180,12 @@ final: prev: vim-codefmt = buildVimPluginFrom2Nix { pname = "vim-codefmt"; - version = "2022-02-09"; + version = "2022-06-02"; src = fetchFromGitHub { owner = "google"; repo = "vim-codefmt"; - rev = "27e5ac299a0714025cc46fc1da11694a8662b058"; - sha256 = "06zp45w1mxq075lrw1x2p87l4gdc5fijgag4mj7j61jd2x92xsx7"; + rev = "b5270ae807fdbad5183f2831a9348f2fb7cfea1d"; + sha256 = "0fq1dcizdvrnq6faw36206wvvnfzgcpz83a3kpn466hfbbysmn45"; }; meta.homepage = "https://github.com/google/vim-codefmt/"; }; @@ -8252,12 +8372,12 @@ final: prev: vim-dadbod = buildVimPluginFrom2Nix { pname = "vim-dadbod"; - version = "2022-03-26"; + version = "2022-06-03"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-dadbod"; - rev = "d6b9957a1e13f34fb66795fad729c611b2513922"; - sha256 = "14a0mbhcw10400g6ybj6h8nq5bis9hba76qvjx5mph7vbb3rhjwn"; + rev = "c2495b008f1adce6d21745b2c4c576eecc985959"; + sha256 = "1zj1bab5ck9k9c11cmyszmlnfw3sis79kmlag2a0c0p035rzsl35"; }; meta.homepage = "https://github.com/tpope/vim-dadbod/"; }; @@ -8696,12 +8816,12 @@ final: prev: vim-floaterm = buildVimPluginFrom2Nix { pname = "vim-floaterm"; - version = "2022-05-25"; + version = "2022-06-03"; src = fetchFromGitHub { owner = "voldikss"; repo = "vim-floaterm"; - rev = "8cd8d3bcbe8075f1126be151ba01b90b4370734a"; - sha256 = "1nv18sn0nr75b9f9hf4ax1f22srqv2basayy1yz2mc42m0mp8ra2"; + rev = "875c404da92bb716fdfb33d4948277651ff345a9"; + sha256 = "0gkbd8vvyiln3v1f0hgx34ixhbqda8ggivqfgpnb7vlx5j9za706"; }; meta.homepage = "https://github.com/voldikss/vim-floaterm/"; }; @@ -8768,12 +8888,12 @@ final: prev: vim-fugitive = buildVimPluginFrom2Nix { pname = "vim-fugitive"; - version = "2022-05-29"; + version = "2022-06-04"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-fugitive"; - rev = "92870eb6d2f9663f34f20537ef0393b5ffeb2291"; - sha256 = "0d60kdp539il0vka0ixayf8cq9xb756bafbnjw1mz725s0h5r927"; + rev = "5920f807f5a52957a6a09dd36aab1c00bfd85455"; + sha256 = "1jzlrmc9prv3yhsqjn6bnjhllh7h7vqf6088ady4b2ical1lr839"; }; meta.homepage = "https://github.com/tpope/vim-fugitive/"; }; @@ -9694,12 +9814,12 @@ final: prev: vim-markbar = buildVimPluginFrom2Nix { pname = "vim-markbar"; - version = "2022-05-14"; + version = "2022-06-04"; src = fetchFromGitHub { owner = "Yilin-Yang"; repo = "vim-markbar"; - rev = "7a57b2fb54ee36cbc196674f2929e1c334eb9907"; - sha256 = "02piwnqh1pca7v1h75wn5jr5kh4ik4jj3xmz32b7z8a521wfawa9"; + rev = "623f7f64f167c32d7dd358c908544609307a1cfb"; + sha256 = "1yxb9pk12nyvaxjyckbgvfkf4xql6l5yah6gn21pa5j05n8fd7b5"; }; meta.homepage = "https://github.com/Yilin-Yang/vim-markbar/"; }; @@ -10199,12 +10319,12 @@ final: prev: vim-pandoc-syntax = buildVimPluginFrom2Nix { pname = "vim-pandoc-syntax"; - version = "2022-02-16"; + version = "2022-06-01"; src = fetchFromGitHub { owner = "vim-pandoc"; repo = "vim-pandoc-syntax"; - rev = "7bea0ba8929749b2a471520af87635163fb28bdf"; - sha256 = "1dqd11qmb5jlkmalp10niysz1c2rv2pzwq332i3incq1v1l5146j"; + rev = "ff52ed9296715988fc3269b64a903415c3bdf322"; + sha256 = "08p51a7alj173j0n8qlg4lpyyr4m2i6jfm7wqxl0k4qnfw3lpyx9"; }; meta.homepage = "https://github.com/vim-pandoc/vim-pandoc-syntax/"; }; @@ -10703,12 +10823,12 @@ final: prev: vim-scriptease = buildVimPluginFrom2Nix { pname = "vim-scriptease"; - version = "2022-05-29"; + version = "2022-05-30"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-scriptease"; - rev = "66da29cf9bf679c4d011b308bd494204dc50d251"; - sha256 = "1zxypaj0396khnj5iw3icr30hsm52lrr9kcgpqp3zwnmxk42chrd"; + rev = "18511d389675d773994215ddb572ccdc2b72f52b"; + sha256 = "1mzs4x6y68akysbibprfif1dksaafhcyhddkcyh3da6by6sp5l0l"; }; meta.homepage = "https://github.com/tpope/vim-scriptease/"; }; @@ -11003,12 +11123,12 @@ final: prev: vim-startuptime = buildVimPluginFrom2Nix { pname = "vim-startuptime"; - version = "2022-03-17"; + version = "2022-05-30"; src = fetchFromGitHub { owner = "dstein64"; repo = "vim-startuptime"; - rev = "61f122ebc41e9bcf1793c752a728db59feee77bb"; - sha256 = "1p9b2xgfcfbikadb2250ja0zbz1hcj02knqj5jw5kr3fp170100h"; + rev = "a8ab56f30c603f8022f5fb6a436f5183beeb7b27"; + sha256 = "1xlb8q93ff9qdlk17b76sbrz2adixj7zxf8b9ccvafki8diaqkj9"; }; meta.homepage = "https://github.com/dstein64/vim-startuptime/"; }; @@ -11160,12 +11280,12 @@ final: prev: vim-test = buildVimPluginFrom2Nix { pname = "vim-test"; - version = "2022-05-24"; + version = "2022-05-30"; src = fetchFromGitHub { owner = "vim-test"; repo = "vim-test"; - rev = "99e2bdd80bc9aeb45eb24e4637dd5d2db05e88fb"; - sha256 = "0vwr2hsfa7ya97501998k28smhx437hclsa5f5zx1j8np1zkspbv"; + rev = "9bd4cd2d772018087d016fa4d35c45c09f13effd"; + sha256 = "1bs2q5aw7figwk08b0qahyyzdh1g8gp4vbfzxayxh340qj465f8p"; }; meta.homepage = "https://github.com/vim-test/vim-test/"; }; @@ -11832,12 +11952,12 @@ final: prev: vimspector = buildVimPluginFrom2Nix { pname = "vimspector"; - version = "2022-05-19"; + version = "2022-06-04"; src = fetchFromGitHub { owner = "puremourning"; repo = "vimspector"; - rev = "4e03d5ea5c2d7efb8d1f5e73dcc917ad53b0bfb9"; - sha256 = "0501qcy0kx4nd1ny1fb2klp8fpss3j5vvcynhvx3pn9jxj77mpqn"; + rev = "44eeaebd8cf8514de2b503e8698f2f341b5f23ad"; + sha256 = "197l41s256z6iyb1pym6h9m4046k7m0jiwlrgfbf60yy2fxka7f3"; fetchSubmodules = true; }; meta.homepage = "https://github.com/puremourning/vimspector/"; @@ -12110,12 +12230,12 @@ final: prev: zephyr-nvim = buildVimPluginFrom2Nix { pname = "zephyr-nvim"; - version = "2022-05-29"; + version = "2022-06-03"; src = fetchFromGitHub { owner = "glepnir"; repo = "zephyr-nvim"; - rev = "8e6f37d18d9aff6a04bfd9d6fd8a988bfafa9d0b"; - sha256 = "0nhi40qffzwkkb2a3454i2v8c7fa375lzizylam9ms86d0g9iy7k"; + rev = "ab81680a4a78c6be800edba547ebf309a477be6e"; + sha256 = "1dip9ls8m1dvk69kzyb3wkxvkrv48x1lnv8l4l6xzp1d5xdnh5jy"; }; meta.homepage = "https://github.com/glepnir/zephyr-nvim/"; }; @@ -12158,24 +12278,24 @@ final: prev: catppuccin-nvim = buildVimPluginFrom2Nix { pname = "catppuccin-nvim"; - version = "2022-05-29"; + version = "2022-05-30"; src = fetchFromGitHub { owner = "catppuccin"; repo = "nvim"; - rev = "a40c5d8fe2219df22fe87625169a62c90cab917a"; - sha256 = "0d12dzqary3hbqzdzl2mgnkcgg3g8yn1rcrn94c064bw0mivlhx7"; + rev = "773d339cbd307fe218cf7b3ea04eac26b345a3b7"; + sha256 = "005r3nmjd3s0gbf319xwrvighjg391j3qh79sfc2568z53wxj8r0"; }; meta.homepage = "https://github.com/catppuccin/nvim/"; }; chad = buildVimPluginFrom2Nix { pname = "chad"; - version = "2022-05-30"; + version = "2022-06-04"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "chadtree"; - rev = "cf2170bb881eebd62aa3b96c4af18998f77c4138"; - sha256 = "12vl7m4wc3jsqcbaf011bl9y0qd50rxylli8b1k75zdfwf66f587"; + rev = "574b9612fa8e91b2d6a5fed538b30cc5dc74098e"; + sha256 = "0hwji2mlf7awm303kxyy5b9hgz8kya38paqpw5l04g5b8a7qzwss"; }; meta.homepage = "https://github.com/ms-jpq/chadtree/"; }; @@ -12242,12 +12362,12 @@ final: prev: rose-pine = buildVimPluginFrom2Nix { pname = "rose-pine"; - version = "2022-05-14"; + version = "2022-06-02"; src = fetchFromGitHub { owner = "rose-pine"; repo = "neovim"; - rev = "3a6bcc2706409e08280354925006e8a8a01620cb"; - sha256 = "1l796ap9lsgk5bhy9g72m5nmficbigrfa5rix90dn6mam37jhc8s"; + rev = "04fb9d3bf29755a0cd6e53373e5750ca78a8d37c"; + sha256 = "14zdlm3rpfkkg0y94071i6qx4bk3vp2wd2f5v7503mdc3p684amq"; }; meta.homepage = "https://github.com/rose-pine/neovim/"; }; diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index 5a88140eba3a..0749ec1dc092 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -8,6 +8,7 @@ https://github.com/vim-scripts/DoxygenToolkit.vim/,, https://github.com/numToStr/FTerm.nvim/,, https://github.com/antoinemadec/FixCursorHold.nvim/,, https://github.com/vim-scripts/Improved-AnsiEsc/,, +https://github.com/ionide/Ionide-vim/,HEAD, https://github.com/martinda/Jenkinsfile-vim-syntax/,, https://github.com/autozimu/LanguageClient-neovim/,, https://github.com/vigoux/LanguageTool.nvim/,, @@ -85,6 +86,7 @@ https://github.com/sudormrfbin/cheatsheet.nvim/,, https://github.com/yunlingz/ci_dark/,, https://github.com/projekt0n/circles.nvim/,, https://github.com/xavierd/clang_complete/,, +https://github.com/p00f/clangd_extensions.nvim/,HEAD, https://github.com/rhysd/clever-f.vim/,, https://github.com/bbchung/clighter8/,, https://github.com/winston0410/cmd-parser.nvim/,, @@ -121,6 +123,7 @@ https://github.com/manicmaniac/coconut.vim/,HEAD, https://github.com/metakirby5/codi.vim/,, https://github.com/tjdevries/colorbuddy.nvim/,, https://github.com/lilydjwg/colorizer/,, +https://github.com/Domeee/com.cloudedmountain.ide.neovim/,HEAD, https://github.com/wincent/command-t/,, https://github.com/numtostr/comment.nvim/,, https://github.com/rhysd/committia.vim/,, @@ -137,12 +140,15 @@ https://github.com/rhysd/conflict-marker.vim/,, https://github.com/Olical/conjure/,, https://github.com/Shougo/context_filetype.vim/,, https://github.com/github/copilot.vim/,, +https://github.com/ms-jpq/coq.artifacts/,HEAD, +https://github.com/ms-jpq/coq.thirdparty/,HEAD, https://github.com/jvoorhis/coq.vim/,, https://github.com/ms-jpq/coq_nvim/,, https://github.com/lfilho/cosco.vim/,, https://github.com/nixprime/cpsm/,, https://github.com/saecki/crates.nvim/,, https://github.com/godlygeek/csapprox/,, +https://github.com/Decodetalkers/csharpls-extended-lsp.nvim/,HEAD, https://github.com/chrisbra/csv.vim/,, https://github.com/JazzCore/ctrlp-cmatcher/,, https://github.com/FelikZ/ctrlp-py-matcher/,, @@ -207,6 +213,7 @@ https://github.com/andviro/flake8-vim/,, https://github.com/ncm2/float-preview.nvim/,, https://github.com/fhill2/floating.nvim/,, https://github.com/floobits/floobits-neovim/,, +https://github.com/akinsho/flutter-tools.nvim/,HEAD, https://github.com/mhartington/formatter.nvim/,, https://github.com/megaannum/forms/,, https://github.com/rafamadriz/friendly-snippets/,, @@ -237,6 +244,7 @@ https://github.com/roman/golden-ratio/,, https://github.com/buoto/gotests-vim/,, https://github.com/rmagatti/goto-preview/,, https://github.com/junegunn/goyo.vim/,, +https://github.com/brymer-meneses/grammar-guard.nvim/,HEAD, https://github.com/liuchengxu/graphviz.vim/,, https://github.com/gruvbox-community/gruvbox/,,gruvbox-community https://github.com/morhetz/gruvbox/,, @@ -451,6 +459,7 @@ https://github.com/neovim/nvimdev.nvim/,, https://github.com/glepnir/oceanic-material/,, https://github.com/mhartington/oceanic-next/,, https://github.com/pwntester/octo.nvim/,, +https://github.com/Hoffs/omnisharp-extended-lsp.nvim/,HEAD, https://github.com/Th3Whit3Wolf/one-nvim/,, https://github.com/navarasu/onedark.nvim/,, https://github.com/joshdick/onedark.vim/,, @@ -527,6 +536,7 @@ https://github.com/liuchengxu/space-vim/,, https://github.com/ctjhoa/spacevim/,, https://github.com/chrisgeo/sparkup/,, https://github.com/edluffy/specs.nvim/,, +https://github.com/lewis6991/spellsitter.nvim/,HEAD, https://github.com/sjl/splice.vim/,, https://github.com/vimlab/split-term.vim/,, https://github.com/AndrewRadev/splitjoin.vim/,, From 9e2d1c849242a6c26902230ae292464dd27f0f69 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Sat, 4 Jun 2022 22:55:07 +0800 Subject: [PATCH 26/27] goofys: unstable-2021-03-26 -> unstable-2022-04-21 --- pkgs/tools/filesystems/goofys/default.nix | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/filesystems/goofys/default.nix b/pkgs/tools/filesystems/goofys/default.nix index 10ea061f8608..53841f684208 100644 --- a/pkgs/tools/filesystems/goofys/default.nix +++ b/pkgs/tools/filesystems/goofys/default.nix @@ -6,17 +6,17 @@ buildGoModule { pname = "goofys"; - version = "unstable-2021-03-26"; + version = "unstable-2022-04-21"; src = fetchFromGitHub { owner = "kahing"; repo = "goofys"; # Same as v0.24.0 but migrated to Go modules - rev = "0c993271269b539196330a18716a33fbeeebd624"; - sha256 = "18is5sv2a9wmsm0qpakly988z1qyl2b2hf2105lpxrgl659sf14p"; + rev = "829d8e5ce20faa3f9f6f054077a14325e00e9249"; + sha256 = "sha256-6yVMNSwwPZlADXuPBDRlgoz4Stuz2pgv6r6+y2/C8XY="; }; - vendorSha256 = "15yq0msh9icxd5n2zkkqrlwxifizhpa99d4aznv8clg32ybs61fj"; + vendorSha256 = "sha256-2N8MshBo9+2q8K00eTW5So6d8ZNRzOfQkEKmxR428gI="; subPackages = [ "." ]; @@ -30,8 +30,7 @@ buildGoModule { description = "A high-performance, POSIX-ish Amazon S3 file system written in Go."; license = [ lib.licenses.mit ]; maintainers = [ lib.maintainers.adisbladis ]; - # does not build with go 1.17 - broken = true; + broken = stdenv.isDarwin; # needs to update gopsutil to at least v3.21.3 to include https://github.com/shirou/gopsutil/pull/1042 }; } From 2a97f41dd0ed0685c6c71ee10b2d8829bb26a88e Mon Sep 17 00:00:00 2001 From: FliegendeWurst <2012gdwu+github@posteo.de> Date: Sat, 4 Jun 2022 12:42:41 +0200 Subject: [PATCH 27/27] marp: drop --- pkgs/applications/office/marp/default.nix | 37 ----------------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 -- 3 files changed, 1 insertion(+), 39 deletions(-) delete mode 100644 pkgs/applications/office/marp/default.nix diff --git a/pkgs/applications/office/marp/default.nix b/pkgs/applications/office/marp/default.nix deleted file mode 100644 index c223fa40cc4b..000000000000 --- a/pkgs/applications/office/marp/default.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ lib, stdenv, fetchurl, atomEnv, libXScrnSaver, gtk2 }: - -stdenv.mkDerivation rec { - pname = "marp"; - version = "0.0.14"; - - src = fetchurl { - url = "https://github.com/yhatt/marp/releases/download/v${version}/${version}-Marp-linux-x64.tar.gz"; - sha256 = "0nklzxwdx5llzfwz1hl2jpp2kwz78w4y63h5l00fh6fv6zisw6j4"; - }; - - unpackPhase = '' - mkdir {locales,resources} - tar --delay-directory-restore -xf $src - chmod u+x {locales,resources} - ''; - - installPhase = '' - mkdir -p $out/lib/marp $out/bin - cp -r ./* $out/lib/marp - ln -s $out/lib/marp/Marp $out/bin - ''; - - postFixup = '' - patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath "${atomEnv.libPath}:${lib.makeLibraryPath [ libXScrnSaver gtk2 ]}:$out/lib/marp" \ - $out/bin/Marp - ''; - - meta = with lib; { - description = "Markdown presentation writer, powered by Electron"; - homepage = "https://yhatt.github.io/marp/"; - license = licenses.mit; - maintainers = [ maintainers.puffnfresh ]; - platforms = [ "x86_64-linux" ]; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 3daa67b1e174..2e42ed27b8fc 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -826,6 +826,7 @@ mapAliases ({ manpages = throw "'manpages' has been renamed to/replaced by 'man-pages'"; # Converted to throw 2022-02-22 marathon = throw "marathon has been removed from nixpkgs, as it's unmaintained"; # Added 2020-08-15 mariadb-client = hiPrio mariadb.client; #added 2019.07.28 + marp = throw "marp has been removed from nixpkgs, as it's unmaintained and has security issues"; # Added 2022-06-04 matcha = throw "matcha was renamed to matcha-gtk-theme"; # added 2020-05-09 mathics = throw "mathics has been removed from nixpkgs, as it's unmaintained"; # Added 2020-08-15 matrique = spectral; # Added 2020-01-27 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8ac0b34ce0ea..e1627a46f557 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -28015,8 +28015,6 @@ with pkgs; electron = electron_9; }; - marp = callPackage ../applications/office/marp { }; - magnetico = callPackage ../applications/networking/p2p/magnetico { }; mastodon-bot = nodePackages.mastodon-bot;