Merge master into staging-next (80fadb6a) · Commits · nix / nixpkgs

maintainers/maintainer-list.nix

+6 −0

Original line number	Diff line number	Diff line
		@@ -14068,6 +14068,12 @@
		githubId = 629430;
		keys = [ { fingerprint = "2843 750C B1AB E256 94BE 40E2 D843 D30B 42CA 0E2D"; } ];
		};
		KunyaKud = {
		name = "KunyaKud";
		email = "KunyaKud@proton.me";
		github = "KunyaKud";
		githubId = 238898928;
		};
		kupac = {
		github = "Kupac";
		githubId = 8224569;

+9 −1

Original line number	Diff line number	Diff line
		@@ -138,7 +138,15 @@ in
		Type = "simple";
		ExecStart = "${pkgs.nats-server}/bin/nats-server -c ${configFile}";
		ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID";
		ExecStop = "${pkgs.coreutils}/bin/kill -SIGINT $MAINPID";

		KillMode = "mixed";
		KillSignal = "SIGUSR2";
		SuccessExitStatus = [
		0
		"SIGUSR2"
		];

		TimeoutStopSec = "150"; # must exceed lame_duck_duration, which defaults to 2min
		Restart = "on-failure";

		User = cfg.user;

+1 −2

Original line number	Diff line number	Diff line
		@@ -85,13 +85,12 @@ let
		restartService = optionalAttrs cfg.restartAfterSleep {
		openvpn-restart = {
		wantedBy = [ "sleep.target" ];
		path = [ pkgs.procps ];
		script =
		let
		unitNames = map (n: "openvpn-${n}.service") (builtins.attrNames cfg.servers);
		in
		"systemctl try-restart ${lib.escapeShellArgs unitNames}";
		description = "Sends a signal to OpenVPN process to trigger a restart after return from sleep";
		description = "Restart system OpenVPN connections when returning from sleep";
		};
		};

+7 −6

Original line number	Diff line number	Diff line
		@@ -101,14 +101,15 @@ in

		serviceConfig = {
		Type = "simple";
		ExecStart = utils.escapeSystemdExecArgs (
		[
		(lib.getExe' cfg.package cfg.scheduler)
		]
		++ cfg.extraArgs
		);
		ExecStart = ''
		${pkgs.runtimeShell} -c 'exec ${cfg.package}/bin/''${SCX_SCHEDULER_OVERRIDE:-$SCX_SCHEDULER} ''${SCX_FLAGS_OVERRIDE:-$SCX_FLAGS}'
		'';
		Restart = "on-failure";
		};
		environment = {
		SCX_SCHEDULER = cfg.scheduler;
		SCX_FLAGS = lib.escapeShellArgs cfg.extraArgs;
		};

		wantedBy = [ "multi-user.target" ];
		};

0 → 100644

+75 −0

Original line number	Diff line number	Diff line
		{
		lib,
		fetchFromGitHub,
		rustPlatform,
		pkg-config,
		perl,
		openssl,
		vimUtils,
		nix-update-script,
		}:
		let
		version = "0-unstable-2025-10-18";
		src = fetchFromGitHub {
		owner = "dmtrKovalenko";
		repo = "fff.nvim";
		rev = "ee8bd6e839ff3e70660e794d79d4ce26a33a8e1e";
		hash = "sha256-Wj6YLTUqLzOngiSDkM3ci85WwdQgjoonwHbvXyvN9cE=";
		};
		fff-nvim-lib = rustPlatform.buildRustPackage {
		pname = "fff-nvim-lib";
		inherit version src;

		postPatch = ''
		substituteInPlace $cargoDepsCopy/neo_frizbee*/src/lib.rs \
		--replace-fail "#![feature(avx512_target_feature)]" ""
		'';

		cargoHash = "sha256-ZZt4BlMgRik4LH92F5cgS84WI1Jeuw68jP+y1+QXfDE=";

		nativeBuildInputs = [
		pkg-config
		perl
		];

		buildInputs = [
		openssl
		];

		env = {
		RUSTC_BOOTSTRAP = 1; # We need rust unstable features

		OPENSSL_NO_VENDOR = true;
		};
		};
		in
		vimUtils.buildVimPlugin {
		pname = "fff.nvim";
		inherit version src;

		postPatch = ''
		substituteInPlace lua/fff/download.lua \
		--replace-fail \
		"return plugin_dir .. '/../target'" \
		"return '${fff-nvim-lib}/lib'"
		'';

		passthru = {
		updateScript = nix-update-script {
		extraArgs = [ "--version=branch" ];
		attrPath = "vimPlugins.fff-nvim.fff-nvim-lib";
		};

		# needed for the update script
		inherit fff-nvim-lib;
		};

		meta = {
		description = "Fast Fuzzy File Finder for Neovim";
		homepage = "https://github.com/dmtrKovalenko/fff.nvim";
		license = lib.licenses.mit;
		maintainers = with lib.maintainers; [
		GaetanLepage
		];
		};
		}