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

.github/ISSUE_TEMPLATE/module_request.md

0 → 100644

+27 −0

Original line number	Diff line number	Diff line
		---
		name: Module requests
		about: For NixOS modules that you would like to see
		title: 'Module request: MODULENAME'
		labels: '9.needs: module (new)'
		assignees: ''

		---

		### Description

		<!-- Describe what the module should accomplish: -->

		### Notify maintainers

		<!-- If applicable, tag the maintainers of the package that corresponds to the module. If the search.nixos.org result shows no maintainers, tag the person that last updated the package. -->

		-----

		Note for maintainers: Please tag this issue in your PR.

		---

		Add a :+1: [reaction] to [issues you find important].

		[reaction]: https://github.blog/2016-03-10-add-reactions-to-pull-requests-issues-and-comments/
		[issues you find important]: https://github.com/NixOS/nixpkgs/issues?q=is%3Aissue+is%3Aopen+sort%3Areactions-%2B1-desc

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

+7 −2

Original line number	Diff line number	Diff line
		@@ -116,7 +116,7 @@ in
		description = ''
		Configuration for Immich.
		See <https://immich.app/docs/install/config-file/> or navigate to
		<https://your-immich-domain/admin/system-settings> for
		<https://my.immich.app/admin/system-settings> for
		options and defaults.
		Setting it to `null` allows configuring Immich in the web interface.
		'';
		@@ -270,7 +270,7 @@ in
		let
		postgresEnv =
		if isPostgresUnixSocket then
		{ DB_URL = "socket://${cfg.database.host}?dbname=${cfg.database.name}"; }
		{ DB_URL = "postgresql:///${cfg.database.name}?host=${cfg.database.host}"; }
		else
		{
		DB_HOSTNAME = cfg.database.host;
		@@ -317,6 +317,11 @@ in
		after = [ "network.target" ];
		wantedBy = [ "multi-user.target" ];
		inherit (cfg) environment;
		path = [
		# gzip and pg_dumpall are used by the backup service
		pkgs.gzip
		config.services.postgresql.package
		];

		serviceConfig = commonServiceConfig // {
		ExecStart = lib.getExe cfg.package;

nixos/tests/web-apps/immich.nix

+12 −3

Original line number	Diff line number	Diff line
		@@ -31,21 +31,30 @@ import ../make-test-python.nix (
		machine.succeed("curl --fail http://localhost:2283/")

		machine.succeed("""
		curl -H 'Content-Type: application/json' --data '{ "email": "test@example.com", "name": "Admin", "password": "admin" }' -X POST http://localhost:2283/api/auth/admin-sign-up
		curl -f --json '{ "email": "test@example.com", "name": "Admin", "password": "admin" }' http://localhost:2283/api/auth/admin-sign-up
		""")
		res = machine.succeed("""
		curl -H 'Content-Type: application/json' --data '{ "email": "test@example.com", "password": "admin" }' -X POST http://localhost:2283/api/auth/login
		curl -f --json '{ "email": "test@example.com", "password": "admin" }' http://localhost:2283/api/auth/login
		""")
		token = json.loads(res)['accessToken']

		res = machine.succeed("""
		curl -H 'Content-Type: application/json' -H 'Cookie: immich_access_token=%s' --data '{ "name": "API Key", "permissions": ["all"] }' -X POST http://localhost:2283/api/api-keys
		curl -f -H 'Cookie: immich_access_token=%s' --json '{ "name": "API Key", "permissions": ["all"] }' http://localhost:2283/api/api-keys
		""" % token)
		key = json.loads(res)['secret']

		machine.succeed(f"immich login http://localhost:2283/api {key}")
		res = machine.succeed("immich server-info")
		print(res)

		machine.succeed("""
		curl -f -X PUT -H 'Cookie: immich_access_token=%s' --json '{ "command": "start" }' http://localhost:2283/api/jobs/backupDatabase
		""" % token)
		res = machine.succeed("""
		curl -f -H 'Cookie: immich_access_token=%s' http://localhost:2283/api/jobs
		""" % token)
		assert json.loads(res)["backupDatabase"]["jobCounts"]["active"] == 1
		machine.wait_until_succeeds("ls /var/lib/immich/backups/*.sql.gz")
		'';
		}
		)

pkgs/applications/blockchains/zcash/default.nix

+3 −3

Original line number	Diff line number	Diff line
		@@ -39,9 +39,9 @@ rustPlatform.buildRustPackage.override { inherit stdenv; } rec {
		# Use the stdenv default phases (./configure; make) instead of the
		# ones from buildRustPackage.
		configurePhase = "configurePhase";
		buildPhase = "buildPhase";
		checkPhase = "checkPhase";
		installPhase = "installPhase";
		dontCargoBuild = true;
		dontCargoCheck = true;
		dontCargoInstall = true;

		postPatch = ''
		# Have to do this here instead of in preConfigure because

pkgs/applications/editors/vim/plugins/overrides.nix

+7 −0

Original line number	Diff line number	Diff line
		@@ -1532,6 +1532,13 @@ in
		dependencies = with self; [ ultisnips ];
		};

		neoconf-nvim = super.neoconf-nvim.overrideAttrs {
		dependencies = with self; [ nvim-lspconfig ];

		doInstallCheck = true;
		nvimRequireCheck = "neoconf";
		};

		neogit = super.neogit.overrideAttrs {
		dependencies = with self; [ plenary-nvim ];
		nvimRequireCheck = "neogit";