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

nixos/modules/services/matrix/dendrite.nix

+8 −1

Original line number	Diff line number	Diff line
		@@ -211,7 +211,7 @@ in
		};
		};
		options.sync_api.search = {
		enable = lib.mkEnableOption "Dendrite's full-text search engine";
		enabled = lib.mkEnableOption "Dendrite's full-text search engine";
		index_path = lib.mkOption {
		type = lib.types.str;
		default = "${workingDir}/searchindex";
		@@ -287,6 +287,13 @@ in
		nix-shell -p dendrite --command "generate-keys --tls-cert server.crt --tls-key server.key"
		'';
		}
		{
		assertion = !(cfg.settings.sync_api.search ? enable);
		message = ''
		The `services.dendrite.settings.sync_api.search.enable` option
		has been renamed to `services.dendrite.settings.sync_api.search.enabled`.
		'';
		}
		];

		systemd.services.dendrite = {

deleted100644 → 0

+0 −7103

File deleted.

Preview size limit exceeded, changes collapsed.

+2 −15

Original line number	Diff line number	Diff line
		@@ -44,21 +44,8 @@ rustPlatform.buildRustPackage rec {
		sha256 = "sha256-vBBYNHgZiW5JfGeUG6YZObf4oK0hHxTbsZNTfnIX95Y=";
		};

		cargoLock = {
		lockFile = ./Cargo.lock;
		outputHashes = {
		"alacritty_terminal-0.24.1-dev" = "sha256-aVB1CNOLjNh6AtvdbomODNrk00Md8yz8QzldzvDo1LI=";
		"floem-0.1.1" = "sha256-/4Y38VXx7wFVVEzjqZ2D6+jiXCXPfzK44rDiNOR1lAk=";
		"human-sort-0.2.2" = "sha256-tebgIJGXOY7pwWRukboKAzXY47l4Cn//0xMKQTaGu8w=";
		"locale_config-0.3.1-alpha.0" = "sha256-cCEO+dmU05TKkpH6wVK6tiH94b7k2686xyGxlhkcmAM=";
		"lsp-types-0.95.1" = "sha256-+tWqDBM5x/gvQOG7V3m2tFBZB7smgnnZHikf9ja2FfE=";
		"psp-types-0.1.0" = "sha256-/oFt/AXxCqBp21hTSYrokWsbFYTIDCrHMUBuA2Nj5UU=";
		"regalloc2-0.9.3" = "sha256-tzXFXs47LDoNBL1tSkLCqaiHDP5vZjvh250hz0pbEJs=";
		"structdesc-0.1.0" = "sha256-KiR0R2YWZ7BucXIIeziu2FPJnbP7WNSQrxQhcNlpx2Q=";
		"tracing-0.2.0" = "sha256-31jmSvspNstOAh6VaWie+aozmGu4RpY9Gx2kbBVD+CI=";
		"wasi-experimental-http-wasmtime-0.10.0" = "sha256-FuF3Ms1bT9bBasbLK+yQ2xggObm/lFDRyOvH21AZnQI=";
		};
		};
		useFetchCargoVendor = true;
		cargoHash = "sha256-cgSr1GHQUF4ccVd9w3TT0+EI+lqQpDzfXHdRWr75eDE=";

		env = {
		# Get openssl-sys to use pkg-config

+2 −2

Original line number	Diff line number	Diff line
		@@ -8,8 +8,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
		mktplcRef = {
		name = "vscode-pylance";
		publisher = "MS-python";
		version = "2025.2.1";
		hash = "sha256-8aqua60QeKue8DUpRQynUQRm2tZNt8qq/OS8VdWTDas=";
		version = "2025.3.1";
		hash = "sha256-W7+nwMwoux2m3ZWlgne8XQApsHsqynnTp4WgMa8RHvQ=";
		};

		buildInputs = [ pyright ];

+3 −3

Original line number	Diff line number	Diff line
		@@ -5,13 +5,13 @@
		}:
		mkLibretroCore {
		core = "bsnes";
		version = "0-unstable-2025-01-17";
		version = "0-unstable-2025-02-28";

		src = fetchFromGitHub {
		owner = "libretro";
		repo = "bsnes-libretro";
		rev = "05e820a436d2e2cbbb1b871400f84a96e76e2359";
		hash = "sha256-jq1W1OrltfTc4WEnEDZSNQUPSWfnUtzrOtiA4fzlIpk=";
		rev = "cb4a0695ec4eea7298ddc5dd013bb1bb23d5a496";
		hash = "sha256-13d2quwMBK7ocNWWmbQNJXYj2MxvfGwvpXy2bcCGfMQ=";
		};

		makefile = "Makefile";