Unverified Commit 5a036cc9 authored by github-actions[bot]'s avatar github-actions[bot] Committed by GitHub
Browse files

Merge master into staging-next

parents bcb6afc7 144fcada

nixos/modules/services/x11/xserver.nix

+2 −2
Original line number Diff line number Diff line
@@ -710,9 +710,9 @@ in 
          '';

        }

      # Needed since 1.18; see https://bugs.freedesktop.org/show_bug.cgi?id=89023#c5

      // (let cfgPath = "/X11/xorg.conf.d/10-evdev.conf"; in

      // (let cfgPath = "X11/xorg.conf.d/10-evdev.conf"; in

        {

          ${cfgPath}.source = xorg.xf86inputevdev.out + "/share" + cfgPath;

          ${cfgPath}.source = xorg.xf86inputevdev.out + "/share/" + cfgPath;

        });



    environment.systemPackages = utils.removePackagesByName

nixos/modules/system/etc/build-composefs-dump.py

+11 −3
Original line number Diff line number Diff line
@@ -58,7 +58,7 @@ class ComposefsPath: 
    ):

        if path is None:

            path = attrs["target"]

        self.path = "/" + path

        self.path = path

        self.size = size

        self.filetype = filetype

        self.mode = mode
@@ -83,8 +83,12 @@ class ComposefsPath: 
        return " ".join(line_list)





def eprint(*args, **kwargs) -> None:

    print(args, **kwargs, file=sys.stderr)

def eprint(*args: Any, **kwargs: Any) -> None:

    print(*args, **kwargs, file=sys.stderr)





def normalize_path(path: str) -> str:

    return str("/" + os.path.normpath(path).lstrip("/"))





def leading_directories(path: str) -> list[str]:
@@ -145,6 +149,10 @@ def main() -> None: 


    paths: dict[str, ComposefsPath] = {}

    for attrs in config:

        # Normalize the target path to work around issues in how targets are

        # declared in `environment.etc`.

        attrs["target"] = normalize_path(attrs["target"])



        target = attrs["target"]

        source = attrs["source"]

        mode = attrs["mode"]

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

+12 −0
Original line number Diff line number Diff line
@@ -4162,6 +4162,18 @@ final: prev: 
    meta.homepage = "https://github.com/kiyoon/haskell-scope-highlighting.nvim/";

  };



  haskell-snippets-nvim = buildVimPlugin {

    pname = "haskell-snippets.nvim";

    version = "2024-01-15";

    src = fetchFromGitHub {

      owner = "mrcjkb";

      repo = "haskell-snippets.nvim";

      rev = "c26279d568452f5474f26470aff6549f94ff7cd3";

      sha256 = "1rl9g25afaqiw16i582hbnnag0v6xcn28f09cy8vfddj696ygzg6";

    };

    meta.homepage = "https://github.com/mrcjkb/haskell-snippets.nvim/";

  };



  haskell-tools-nvim = buildNeovimPlugin {

    pname = "haskell-tools.nvim";

    version = "2024-01-21";

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

+4 −0
Original line number Diff line number Diff line
@@ -670,6 +670,10 @@ 
    dependencies = with self; [ plenary-nvim ];

  };



  haskell-snippets-nvim = super.haskell-snippets-nvim.overrideAttrs {

    dependencies = [ self.luasnip ];

  };



  haskell-scope-highlighting-nvim = super.haskell-scope-highlighting-nvim.overrideAttrs {

    dependencies = with self; [ nvim-treesitter ];

  };

pkgs/applications/editors/vim/plugins/vim-plugin-names

+1 −0
Original line number Diff line number Diff line
@@ -348,6 +348,7 @@ https://git.sr.ht/~sircmpwn/hare.vim,HEAD, 
https://github.com/ThePrimeagen/harpoon/,master,

https://github.com/ThePrimeagen/harpoon/,harpoon2,harpoon2

https://github.com/kiyoon/haskell-scope-highlighting.nvim/,HEAD,

https://github.com/mrcjkb/haskell-snippets.nvim/,HEAD,

https://github.com/MrcJkb/haskell-tools.nvim/,HEAD,

https://github.com/neovimhaskell/haskell-vim/,,

https://github.com/wenzel-hoffman/haskell-with-unicode.vim/,HEAD,