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

nixos/doc/manual/release-notes/rl-2411.section.md

+2 −0

Original line number	Diff line number	Diff line
		@@ -236,6 +236,8 @@

		- `knot-dns` has been updated to version 3.4.x. Check the [migration guide](https://www.knot-dns.cz/docs/latest/html/migration.html#upgrade-3-3-x-to-3-4-x) for breaking changes.

		- `mutmut` has been updated to version 3.0.5.

		- `services.kubernetes.kubelet.clusterDns` now accepts a list of DNS resolvers rather than a single string, bringing the module more in line with the upstream Kubelet configuration schema.

		- `bluemap` has changed the format used to store map tiles, and the database layout has been heavily modified. Upstream recommends a clean reinstallation: <https://github.com/BlueMap-Minecraft/BlueMap/releases/tag/v5.2>. Unless you are using an SQL storage backend, this should only entail deleting the contents of `config.services.bluemap.coreSettings.data` (defaults to `/var/lib/bluemap`) and `config.services.bluemap.webRoot` (defaults to `/var/lib/bluemap/web`).

+7 −5

Original line number	Diff line number	Diff line
		@@ -18,6 +18,8 @@ in

		enable = lib.mkEnableOption "udisks2, a DBus service that allows applications to query and manipulate storage devices";

		package = lib.mkPackageOption pkgs "udisks2" {};

		mountOnMedia = lib.mkOption {
		type = lib.types.bool;
		default = false;
		@@ -67,11 +69,11 @@ in

		config = lib.mkIf config.services.udisks2.enable {

		environment.systemPackages = [ pkgs.udisks2 ];
		environment.systemPackages = [ cfg.package ];

		environment.etc = (lib.mapAttrs' (name: value: lib.nameValuePair "udisks2/${name}" { source = value; } ) configFiles) // (
		let
		libblockdev = pkgs.udisks2.libblockdev;
		libblockdev = cfg.package.libblockdev;
		majorVer = lib.versions.major libblockdev.version;
		in {
		# We need to make sure /etc/libblockdev/@major_ver@/conf.d is populated to avoid
		@@ -82,18 +84,18 @@ in

		security.polkit.enable = true;

		services.dbus.packages = [ pkgs.udisks2 ];
		services.dbus.packages = [ cfg.package ];

		systemd.tmpfiles.rules = [ "d /var/lib/udisks2 0755 root root -" ]
		++ lib.optional cfg.mountOnMedia "D! /media 0755 root root -";

		services.udev.packages = [ pkgs.udisks2 ];
		services.udev.packages = [ cfg.package ];

		services.udev.extraRules = lib.optionalString cfg.mountOnMedia ''
		ENV{ID_FS_USAGE}=="filesystem", ENV{UDISKS_FILESYSTEM_SHARED}="1"
		'';

		systemd.packages = [ pkgs.udisks2 ];
		systemd.packages = [ cfg.package ];
		};

		}

+1 −0

Original line number	Diff line number	Diff line
		@@ -255,6 +255,7 @@ in
		Grafana settings. See <https://grafana.com/docs/grafana/latest/setup-grafana/configure-grafana/>
		for available options. INI format is used.
		'';
		default = { };
		type = types.submodule {
		freeformType = settingsFormatIni.type;

+2 −2

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

		mkDerivation rec {
		pname = "caneda";
		version = "0.3.1";
		version = "0.4.0";

		src = fetchFromGitHub {
		owner = "Caneda";
		repo = "Caneda";
		rev = version;
		sha256 = "0hx8qid50j9xvg2kpbpqmbdyakgyjn6m373m1cvhp70v2gp1v8l2";
		sha256 = "sha256-oE0cdOwufc7CHEFr3YU8stjg1hBGs4bemhXpNTCTpDQ=";
		};

		nativeBuildInputs = [ cmake ];

+3 −3

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

		buildGoModule rec {
		pname = "docker-compose";
		version = "2.29.7";
		version = "2.30.0";

		src = fetchFromGitHub {
		owner = "docker";
		repo = "compose";
		rev = "v${version}";
		hash = "sha256-6ksZAGVAFnLwPnCXlCtp4cWfxzJRp/bfVkpvp3Z6fiQ=";
		hash = "sha256-L31O/Hzn0jbu5VqVB18PZUSJPGfqU+73Jx3e1njxGiI=";
		};

		postPatch = ''
		@@ -16,7 +16,7 @@ buildGoModule rec {
		rm -rf e2e/
		'';

		vendorHash = "sha256-B2ywdZjp7h7eFYNJ4wXmAdbOxc8ftGqHnLmDvzQASJE=";
		vendorHash = "sha256-j9gV1PNTqVRctbhnYRydGwJvBpb9uQCxcdBrQCdbBrg=";

		ldflags = [ "-X github.com/docker/compose/v2/internal.Version=${version}" "-s" "-w" ];