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

nixos/modules/services/web-apps/miniflux.nix

+44 −20

Original line number	Diff line number	Diff line
		@@ -17,7 +17,7 @@ let
		;
		cfg = config.services.miniflux;

		defaultAddress = "localhost:8080";
		boolToInt = b: if b then 1 else 0;

		pgbin = "${config.services.postgresql.package}/bin";
		preStart = pkgs.writeScript "miniflux-pre-start" ''
		@@ -44,25 +44,53 @@ in
		};

		config = mkOption {
		type =
		type = types.submodule {
		freeformType =
		with types;
		attrsOf (oneOf [
		str
		int
		]);
		example = literalExpression ''
		{
		CLEANUP_FREQUENCY = 48;
		LISTEN_ADDR = "localhost:8080";
		}
		options = {
		LISTEN_ADDR = mkOption {
		type = types.str;
		default = "localhost:8080";
		description = ''
		Address to listen on. Use absolute path for a Unix socket.
		Multiple addresses can be specified, separated by commas.
		'';
		example = "127.0.0.1:8080, 127.0.0.1:8081";
		};
		DATABASE_URL = mkOption {
		type = types.str;
		defaultText = "user=miniflux host=/run/postgresql dbname=miniflux";
		description = ''
		Postgresql connection parameters.
		See [lib/pq](https://pkg.go.dev/github.com/lib/pq#hdr-Connection_String_Parameters) for more details.
		'';
		};
		RUN_MIGRATIONS = mkOption {
		type = with types; coercedTo bool boolToInt int;
		default = true;
		description = "Run database migrations.";
		};
		CREATE_ADMIN = mkOption {
		type = with types; coercedTo bool boolToInt int;
		default = true;
		description = "Create an admin user from environment variables.";
		};
		WATCHDOG = mkOption {
		type = with types; coercedTo bool boolToInt int;
		default = true;
		description = "Enable or disable Systemd watchdog.";
		};
		};
		};
		default = { };
		description = ''
		Configuration for Miniflux, refer to
		<https://miniflux.app/docs/configuration.html>
		for documentation on the supported values.

		Correct configuration for the database is already provided.
		By default, listens on ${defaultAddress}.
		'';
		};

		@@ -87,11 +115,7 @@ in
		}
		];
		services.miniflux.config = {
		LISTEN_ADDR = mkDefault defaultAddress;
		DATABASE_URL = lib.mkIf cfg.createDatabaseLocally "user=miniflux host=/run/postgresql dbname=miniflux";
		RUN_MIGRATIONS = 1;
		CREATE_ADMIN = lib.mkDefault 1;
		WATCHDOG = 1;
		};

		services.postgresql = lib.mkIf cfg.createDatabaseLocally {

pkgs/applications/audio/mopidy/tidal.nix

+2 −2

Original line number	Diff line number	Diff line
		@@ -7,14 +7,14 @@

		python3Packages.buildPythonApplication rec {
		pname = "Mopidy-Tidal";
		version = "0.3.10";
		version = "0.3.11";
		pyproject = true;

		src = fetchFromGitHub {
		owner = "tehkillerbee";
		repo = "mopidy-tidal";
		tag = "v${version}";
		hash = "sha256-hUYT9c4bEPfUU3f2ywK0MO0jDDLmM+3hp17XH4XJQt8=";
		hash = "sha256-wqx/30UQVm1fEwP/bZeW7TtzGfn/wI0klQnFr9E3AOs=";
		};

		build-system = [ python3Packages.poetry-core ];

pkgs/applications/editors/vscode/extensions/default.nix

+8 −8

Original line number	Diff line number	Diff line
		@@ -262,8 +262,8 @@ let
		mktplcRef = {
		name = "ng-template";
		publisher = "Angular";
		version = "20.2.1";
		hash = "sha256-oemc2lJDPsWWG+tcJAk8u5lSGUpIoI6K/fE/TZC5bWw=";
		version = "20.2.2";
		hash = "sha256-2I5Pmd05zNGjM15tFo2yw6AGUKp3zxufVcoe4oSAO5U=";
		};
		meta = {
		changelog = "https://marketplace.visualstudio.com/items/Angular.ng-template/changelog";
		@@ -1437,8 +1437,8 @@ let
		# semver scheme, contrary to preview versions which are listed on
		# the VSCode Marketplace and use a calver scheme. We should avoid
		# using preview versions, because they expire after two weeks.
		version = "17.3.4";
		hash = "sha256-HrIvJ0+E9lL6wa6lQSjvqdiQiVVCcKAJIPp+x8x/QMc=";
		version = "17.4.1";
		hash = "sha256-H14LJ1diURp6dtZE5djSmvI7aJFBnwVAj7Qi7VFf5oo=";
		};
		meta = {
		changelog = "https://marketplace.visualstudio.com/items/eamodio.gitlens/changelog";
		@@ -2303,8 +2303,8 @@ let
		mktplcRef = {
		name = "vscode-vibrancy-continued";
		publisher = "illixion";
		version = "1.1.59";
		hash = "sha256-ClzUxKdiYZqAlmXJ3W54kJddLRov5XKo0t8PPWA/Qq8=";
		version = "1.1.60";
		hash = "sha256-GHAyC9ScrBV/huVXXrgbubrBmKIzUhYmCL2+GqoOjqc=";
		};
		meta = {
		downloadPage = "https://marketplace.visualstudio.com/items?itemName=illixion.vscode-vibrancy-continued";
		@@ -3657,8 +3657,8 @@ let
		mktplcRef = {
		name = "ocaml-platform";
		publisher = "ocamllabs";
		version = "1.32.0";
		hash = "sha256-tLGHAEvKy+83PcF35zMABV7HtdXZGwCBdhMB+EG1El0=";
		version = "1.32.3";
		hash = "sha256-KUzLrt7y3I6szpWVGk0NtBfXncw6ovNAkm1HyHj+MDk=";
		};
		};

pkgs/applications/editors/vscode/extensions/github.copilot-chat/default.nix

+2 −2

Original line number	Diff line number	Diff line
		@@ -7,8 +7,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
		mktplcRef = {
		publisher = "github";
		name = "copilot-chat";
		version = "0.30.1";
		hash = "sha256-itANvwMSzFBPnU4B6erEXO/x3SNlqHygXlTE6jLc+0U=";
		version = "0.31.0";
		hash = "sha256-jMy6mjPUxz3p1dvrveZ/9tyn+KZ6rBLJinZMBUUb9QY=";
		};

		meta = {

pkgs/applications/editors/vscode/extensions/github.copilot/default.nix

+2 −2

Original line number	Diff line number	Diff line
		@@ -7,8 +7,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
		mktplcRef = {
		publisher = "github";
		name = "copilot";
		version = "1.350.0";
		hash = "sha256-F675MNhjhg0ZP1CepJA1m6Cb5rRcd1vj9tBeNLqjzA0=";
		version = "1.372.0";
		hash = "sha256-1L4zE2waIjI1Z8hYFaeHbnSWX9g31Sre4uDNOiQ2Fz8=";
		};

		meta = {

Admin message