Merge remote-tracking branch 'origin/staging-next' into staging (4acb251a) · Commits · nix / nixpkgs

nixos/modules/services/security/paretosecurity.nix

+5 −1

Original line number	Diff line number	Diff line
		@@ -12,7 +12,11 @@ in
		options.services.paretosecurity = {
		enable = lib.mkEnableOption "[ParetoSecurity](https://paretosecurity.com) [agent](https://github.com/ParetoSecurity/agent) and its root helper";
		package = lib.mkPackageOption pkgs "paretosecurity" { };
		trayIcon = lib.mkEnableOption "tray icon for ParetoSecurity";
		trayIcon = lib.mkOption {
		type = lib.types.bool;
		default = true;
		description = "Set to false to disable the tray icon and run as a CLI tool only.";
		};
		};

		config = lib.mkIf cfg.enable {

+12 −4

Original line number	Diff line number	Diff line
		@@ -46,10 +46,7 @@
		{
		imports = [ ./common/user-account.nix ];

		services.paretosecurity = {
		enable = true;
		trayIcon = true;
		};
		services.paretosecurity.enable = true;

		services.xserver.enable = true;
		services.xserver.displayManager.lightdm.enable = true;
		@@ -119,5 +116,16 @@
		xfce.wait_for_text("Pareto Security")
		xfce.succeed("xdotool click 1")
		xfce.wait_for_text("Run Checks")

		# Test 5: paretosecurity:// URL handler is registered
		xfce.succeed("su - alice -c 'xdg-open paretosecurity://foo'")

		# Test 6: Desktop entry
		xfce.succeed("xdotool mousemove 10 10")
		xfce.succeed("xdotool click 1") # hide the tray icon window
		xfce.succeed("xdotool click 1") # show the Applications menu
		xfce.succeed("xdotool mousemove 10 200")
		xfce.succeed("xdotool click 1")
		xfce.wait_for_text("Pareto Security")
		'';
		}

+14 −11

Original line number	Diff line number	Diff line
		@@ -8,17 +8,18 @@
		qtbase,
		rocksdb_7_10,
		zeromq,
		nix-update-script,
		}:

		stdenv.mkDerivation rec {
		stdenv.mkDerivation (finalAttrs: {
		pname = "fulcrum";
		version = "1.11.1";
		version = "1.12.0.1";

		src = fetchFromGitHub {
		owner = "cculianu";
		repo = "Fulcrum";
		rev = "v${version}";
		sha256 = "sha256-+hBc7jW1MVLVjYXNOV7QvFJJpZ5RzW5/c9NdqOXrsj0=";
		tag = "v${finalAttrs.version}";
		hash = "sha256-/RlvbZ6/f0Jxj6oCeHjGWqlktvtNUNczOXi2/wYw2LQ=";
		};

		nativeBuildInputs = [
		@@ -26,8 +27,6 @@ stdenv.mkDerivation rec {
		qmake
		];

		dontWrapQtApps = true; # no GUI

		buildInputs = [
		python3
		qtbase
		@@ -35,11 +34,15 @@ stdenv.mkDerivation rec {
		zeromq
		];

		meta = with lib; {
		dontWrapQtApps = true; # no GUI

		passthru.updateScript = nix-update-script { };

		meta = {
		description = "Fast & nimble SPV server for Bitcoin Cash & Bitcoin BTC";
		homepage = "https://github.com/cculianu/Fulcrum";
		maintainers = with maintainers; [ prusnak ];
		license = licenses.gpl3Plus;
		platforms = platforms.unix;
		maintainers = with lib.maintainers; [ prusnak ];
		license = lib.licenses.gpl3Plus;
		platforms = lib.platforms.unix;
		};
		}
		})

+13 −0

Original line number	Diff line number	Diff line
		@@ -4355,6 +4355,19 @@ final: prev: {
		meta.hydraPlatforms = [ ];
		};

		ecolog-nvim = buildVimPlugin {
		pname = "ecolog.nvim";
		version = "2025-04-23";
		src = fetchFromGitHub {
		owner = "t3ntxcl3s";
		repo = "ecolog.nvim";
		rev = "cfd19e7a8841c538fdb706ee6ba3a22943d45ca6";
		sha256 = "12mlhmzqgv45v98gi5jvqkn9bkl6nfixlgvb76b6ci6rzdkyxg52";
		};
		meta.homepage = "https://github.com/t3ntxcl3s/ecolog.nvim/";
		meta.hydraPlatforms = [ ];
		};

		edge = buildVimPlugin {
		pname = "edge";
		version = "2025-04-16";

+1 −0

Original line number	Diff line number	Diff line
		@@ -333,6 +333,7 @@ https://github.com/Bekaboo/dropbar.nvim/,HEAD,
		https://github.com/earthly/earthly.vim/,HEAD,
		https://github.com/GustavEikaas/easy-dotnet.nvim/,HEAD,
		https://github.com/Shougo/echodoc.vim/,,
		https://github.com/t3ntxcl3s/ecolog.nvim/,HEAD,
		https://github.com/sainnhe/edge/,,
		https://github.com/geldata/edgedb-vim/,,
		https://github.com/folke/edgy.nvim/,HEAD,