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

nixos/modules/services/networking/sabnzbd.nix

+23 −11

Original line number	Diff line number	Diff line
		@@ -36,6 +36,14 @@ in
		default = "sabnzbd";
		description = lib.mdDoc "Group to run the service as";
		};

		openFirewall = mkOption {
		type = types.bool;
		default = false;
		description = lib.mdDoc ''
		Open ports in the firewall for the sabnzbd web interface
		'';
		};
		};
		};

		@@ -43,17 +51,16 @@ in
		###### implementation

		config = mkIf cfg.enable {

		users.users.sabnzbd = {
		users.users = mkIf (cfg.user == "sabnzbd") {
		sabnzbd = {
		uid = config.ids.uids.sabnzbd;
		group = "sabnzbd";
		group = cfg.group;
		description = "sabnzbd user";
		home = "/var/lib/sabnzbd/";
		createHome = true;
		};
		};

		users.groups.sabnzbd = {
		gid = config.ids.gids.sabnzbd;
		users.groups = mkIf (cfg.group == "sabnzbd") {
		sabnzbd.gid = config.ids.gids.sabnzbd;
		};

		systemd.services.sabnzbd = {
		@@ -63,10 +70,15 @@ in
		serviceConfig = {
		Type = "forking";
		GuessMainPID = "no";
		User = "${cfg.user}";
		Group = "${cfg.group}";
		User = cfg.user;
		Group = cfg.group;
		StateDirectory = "sabnzbd";
		ExecStart = "${lib.getBin cfg.package}/bin/sabnzbd -d -f ${cfg.configFile}";
		};
		};

		networking.firewall = mkIf cfg.openFirewall {
		allowedTCPPorts = [ 8080 ];
		};
		};
		}

+3 −1

Original line number	Diff line number	Diff line
		@@ -39,7 +39,7 @@ in {
		};
		extraAppsEnable = true;
		extraApps = {
		inherit (pkgs."nextcloud${lib.versions.major config.services.nextcloud.package.version}Packages".apps) notify_push;
		inherit (pkgs."nextcloud${lib.versions.major config.services.nextcloud.package.version}Packages".apps) notify_push notes;
		};
		settings.trusted_proxies = [ "::1" ];
		};
		@@ -92,5 +92,7 @@ in {

		# redis cache should not be empty
		nextcloud.fail('test "[]" = "$(redis-cli --json KEYS "*")"')

		nextcloud.fail("curl -f http://nextcloud/nix-apps/notes/lib/AppInfo/Application.php")
		'';
		})) args

+0 −1

Original line number	Diff line number	Diff line
		@@ -107,7 +107,6 @@ stdenv.mkDerivation (finalAttrs: {
		"--with-proj-share=${proj}/share/proj"
		"--with-pthread"
		"--with-readline"
		"--with-wxwidgets"
		"--with-zstd"
		"--without-opengl"
		] ++ lib.optionals stdenv.isLinux [

+10 −10

Original line number	Diff line number	Diff line
		{
		stable = {
		chromedriver = {
		hash_darwin = "sha256-IDPdjq3FpLy6Y9xkR15mzbIal8wjeQzzWtWuZ4uKmzA=";
		hash_darwin = "sha256-Mdm+aOd8czNX7oJcNCSdu5TFwIlh5Y37OLdiPpOD+mk=";
		hash_darwin_aarch64 =
		"sha256-3Mol45MrvrSqrpkKy2Trt0JFNfV4ekXTxEveUUGmJm4=";
		hash_linux = "sha256-O8U4pZ76/N7q9bV7d0A+wlIqqaoz6WyfZQO4cIV2CIM=";
		version = "121.0.6167.85";
		"sha256-ZF8nfAXX99I4x6RUEvQkiXZ/SMugXYYyzgC1SzcE1OE=";
		hash_linux = "sha256-DIC7Ew7aCvtYMVXVXsnMItdeLPDdkNZXZH35I0ZdWEs=";
		version = "122.0.6261.57";
		};
		deps = {
		gn = {
		hash = "sha256-eD3KORYYuIH+94+BgL+yFD5lTQFvj/MqPU9DPiHc98s=";
		rev = "7367b0df0a0aa25440303998d54045bda73935a5";
		hash = "sha256-UhdDsq9JyP0efGpAaJ/nLp723BbjM6pkFPcAnQbgMKY=";
		rev = "f99e015ac35f689cfdbf46e4eb174e5d2da78d8e";
		url = "https://gn.googlesource.com/gn";
		version = "2023-11-28";
		version = "2024-01-22";
		};
		};
		hash = "sha256-mLXBaW4KBieOiz2gRXfgA/KPdmUnNlpUIOqdj7CywcY=";
		hash_deb_amd64 = "sha256-UDgO1sJ7bggFTe7C36CnHYXjG9rM+ZqFCOzNyIDpQ0Y=";
		version = "121.0.6167.184";
		hash = "sha256-VvurD1r89dI0ahaVDQ3yinGlHOfzzm7TkL09tF4nebE=";
		hash_deb_amd64 = "sha256-Q3AUKzUsRzW00+WLhuri86QzBGk/rlq5Hk+NdoRbbM4=";
		version = "122.0.6261.57";
		};
		ungoogled-chromium = {
		deps = {

+3 −3

Original line number	Diff line number	Diff line
		@@ -2,16 +2,16 @@

		buildGoModule rec {
		pname = "kube-capacity";
		version = "0.7.4";
		version = "0.8.0";

		src = fetchFromGitHub {
		rev = "v${version}";
		owner = "robscott";
		repo = pname;
		sha256 = "sha256-zf6e8+jkgJns1c71QLL1gd0zK34X7gJo1gS38A1DPJo=";
		sha256 = "sha256-zAwCz4Qs1OF/CdSmy9p4X9hL9iNkAH/EeSU2GgekzV8=";
		};

		vendorHash = "sha256-qfSya42wZEmJCC7o8zJQEv0BWrxTuBT2Jzcq/AfI+OE=";
		vendorHash = "sha256-YME4AXpHvr1bNuc/HoHxam+7ZkwLzjhIvFSfD4hga1A=";

		meta = with lib; {
		description =