Unverified Commit 332adeef authored by nixpkgs-ci[bot]'s avatar nixpkgs-ci[bot] Committed by GitHub
Browse files

Merge master into staging-nixos

parents 9358b3d1 3aebc5e7

maintainers/maintainer-list.nix

+7 −0
Original line number Diff line number Diff line
@@ -3829,6 +3829,13 @@ 
    github = "brancz";

    githubId = 4546722;

  };

  brantes = {

    name = "Pedro Brantes";

    email = "contact@brantes.simplelogin.com";

    github = "pedrobrantes";

    githubId = 58346706;

    matrix = "@brantes:matrix.org";

  };

  braydenjw = {

    email = "nixpkgs@willenborg.ca";

    github = "braydenjw";

maintainers/scripts/luarocks-packages.csv

+3 −3
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ http,,,,0.4-0,,vcunat 
image.nvim,,,,,,teto

inspect,,,,,,

jsregexp,,,,,,

ldbus,,,http://luarocks.org/dev,,,

ldbus,,,https://luarocks.org/dev,,,

ldoc,,,,,,

lgi,,,,,,

linenoise,https://raw.githubusercontent.com/hoelzro/lua-linenoise/master/linenoise-0.9-1.rockspec,,,,,
@@ -80,10 +80,10 @@ luadbi-sqlite3,,,,,, 
luaepnf,,,,,,

luaevent,,,,,,

luaexpat,,,,1.4.1-1,,arobyn flosse

luaffi,,,http://luarocks.org/dev,,,

luaffi,,,https://luarocks.org/dev,,,

luafilesystem,,,,1.8.0-1,,flosse

lualdap,,,,,,aanderse

lualine.nvim,,,http://luarocks.org/dev,,,

lualine.nvim,,,https://luarocks.org/dev,,,

lualogging,,,,,,

luaossl,,,,,5.1,

luaposix,,,,34.1.1-1,,lblasc

nixos/modules/services/networking/knot-resolver.nix

+16 −5
Original line number Diff line number Diff line
@@ -7,17 +7,28 @@ 
let

  cfg = config.services.knot-resolver;

  # pkgs.writers.yaml_1_1.generate with additional kresctl validate

  configFile =

    pkgs.runCommandLocal "knot-resolver.yaml"

  configFile = pkgs.callPackage (

    {

        nativeBuildInputs = [ pkgs.remarshal_0_17 ];

      runCommandLocal,

      remarshal_0_17,

      stdenv,

    }:

    runCommandLocal "knot-resolver.yaml"

      {

        nativeBuildInputs = [ remarshal_0_17 ];

        value = builtins.toJSON cfg.settings;

        passAsFile = [ "value" ];

      }

      ''

        json2yaml "$valuePath" "$out"

        ${

          # We skip validation if the build platform cannot execute # the binary targeting the host platform.

          lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''

            ${cfg.managerPackage}/bin/kresctl validate "$out"

      '';

          ''

        }

      ''

  ) { };

in

{

  meta.maintainers = [

pkgs/applications/editors/vim/plugins/overrides.nix

+29 −15
Original line number Diff line number Diff line
@@ -127,6 +127,7 @@ 
  sad,

  # tv.nvim dependency

  television,

  tree-sitter,

}:

self: super:

let
@@ -1558,21 +1559,34 @@ assertNoAdditions { 
    ];

  };



  kulala-nvim = super.kulala-nvim.overrideAttrs {

    dependencies = with self; [

      nvim-treesitter

      nvim-treesitter-parsers.http

    ];

  kulala-nvim = super.kulala-nvim.overrideAttrs (

    old:

    let

      kulala-http-grammar = neovimUtils.grammarToPlugin (

        tree-sitter.buildGrammar {

          inherit (old) version src meta;

          language = "kulala_http";

          location = "lua/tree-sitter";

          generate = false;

        }

      );

    in

    {

      dependencies = [ kulala-http-grammar ];

      buildInputs = [ curl ];



      patches = [ ./patches/kulala-nvim/do-not-install-grammar.patch ];

      postPatch = ''

        substituteInPlace lua/kulala/config/defaults.lua \

          --replace-fail 'curl_path = "curl"' 'curl_path = "${lib.getExe curl}"'

      '';



      nvimSkipModules = [

        # Requires some extra work to get CLI working in nixpkgs

        "cli.kulala_cli"

      ];

  };

    }

  );



  lazydocker-nvim = super.lazydocker-nvim.overrideAttrs {

    runtimeDeps = [

pkgs/applications/editors/vim/plugins/patches/kulala-nvim/do-not-install-grammar.patch

0 → 100644
+15 −0
Original line number Diff line number Diff line 
diff --git a/lua/kulala/config/init.lua b/lua/kulala/config/init.lua

index 7298f95..d781a12 100644

--- a/lua/kulala/config/init.lua

+++ b/lua/kulala/config/init.lua

@@ -122,6 +122,10 @@ local function setup_treesitter_master()

 end

 

 local function set_kulala_parser()

+  assert(vim.treesitter.language.add("kulala_http"))

+  vim.treesitter.language.register("kulala_http", { "http", "rest" })

+  do return end

+

   local parsers = vim.F.npcall(require, "nvim-treesitter.parsers")

 

   if not parsers then