Merge master into staging-next (614efe64) · Commits · nix / nixpkgs

maintainers/maintainer-list.nix

+7 −1

Original line number	Diff line number	Diff line
		@@ -7353,7 +7353,7 @@
		};
		getpsyched = {
		name = "Priyanshu Tripathi";
		email = "priyanshu@getpsyched.dev";
		email = "nixos@getpsyched.dev";
		matrix = "@getpsyched:matrix.org";
		github = "getpsyched";
		githubId = 43472218;
		@@ -20101,6 +20101,12 @@
		githubId = 29044;
		name = "Jacek Galowicz";
		};
		tfkhdyt = {
		email = "tfkhdyt@proton.me";
		name = "Taufik Hidayat";
		github = "tfkhdyt";
		githubId = 47195537;
		};
		tfmoraes = {
		name = "Thiago Franco de Moraes";
		github = "tfmoraes";

+2 −1

Original line number	Diff line number	Diff line
		@@ -119,7 +119,8 @@ in
		enable = mkEnableOption "Radicle Seed Node";
		package = mkPackageOption pkgs "radicle-node" { };
		privateKeyFile = mkOption {
		type = types.path;
		# Note that a key encrypted by systemd-creds is not a path but a str.
		type = with types; either path str;
		description = ''
		Absolute file path to an SSH private key,
		usually generated by `rad auth`.

+0 −12

Original line number	Diff line number	Diff line
		@@ -4618,18 +4618,6 @@ final: prev:
		meta.homepage = "https://github.com/mrcjkb/haskell-snippets.nvim/";
		};

		haskell-tools-nvim = buildNeovimPlugin {
		pname = "haskell-tools.nvim";
		version = "2024-07-14";
		src = fetchFromGitHub {
		owner = "MrcJkb";
		repo = "haskell-tools.nvim";
		rev = "b003e20e99aa79bfec7c632e5ab817e1c10c8036";
		sha256 = "18gjqnf66nxq76bcb0icihyplmzs0nwav6qpxmszqm05cm1m8l30";
		};
		meta.homepage = "https://github.com/MrcJkb/haskell-tools.nvim/";
		};

		haskell-vim = buildVimPlugin {
		pname = "haskell-vim";
		version = "2021-01-19";

+2 −0

Original line number	Diff line number	Diff line
		@@ -844,6 +844,8 @@
		dependencies = with self; [ nvim-treesitter ];
		};

		haskell-tools-nvim = neovimUtils.buildNeovimPlugin { luaAttr = "haskell-tools-nvim"; };

		hex-nvim = super.hex-nvim.overrideAttrs {
		postPatch = ''
		substituteInPlace lua/hex.lua --replace xxd ${xxd}/bin/xxd

+0 −1

Original line number	Diff line number	Diff line
		@@ -386,7 +386,6 @@ 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,
		https://github.com/travitch/hasksyn/,,