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

maintainers/maintainer-list.nix

+13 −0

Original line number	Diff line number	Diff line
		@@ -10138,6 +10138,12 @@
		githubId = 44377258;
		name = "Heitor Augusto";
		};
		heitorPB = {
		email = "heitorpbittencourt@gmail.com";
		github = "heitorPB";
		githubId = 13461702;
		name = "Heitor Pascoal de Bittencourt";
		};
		hekazu = {
		name = "Henri Peurasaari";
		email = "henri.peurasaari@helsinki.fi";
		@@ -21152,6 +21158,13 @@
		githubId = 2141853;
		name = "Bang Lee";
		};
		qweered = {
		email = "grubian2@gmail.com";
		github = "qweered";
		githubId = 41731334;
		name = "Aliaksandr Samatyia";
		keys = [ { fingerprint = "4D3C 1993 340D 0ACE F6AF 1903 CACB 28BA 93CE 71A2"; } ];
		};
		qxrein = {
		email = "mnv07@proton.me";
		github = "qxrein";

nixos/modules/services/monitoring/grafana.nix

+8 −1

Original line number	Diff line number	Diff line
		@@ -414,7 +414,14 @@ in
		declarativePlugins = mkOption {
		type = with types; nullOr (listOf path);
		default = null;
		description = "If non-null, then a list of packages containing Grafana plugins to install. If set, plugins cannot be manually installed.";
		description = ''
		If non-null, then a list of packages containing Grafana plugins to install. If set, plugins cannot
		be manually installed.

		Keep in mind that this turns off drilldown: for this to work, you need to add
		`grafana-metricsdrilldown-app`, `grafana-lokiexplore-app`, `grafana-exploretraces-app`
		and `grafana-pyroscope-app` to this option.
		'';
		example = literalExpression "with pkgs.grafanaPlugins; [ grafana-piechart-panel ]";
		# Make sure each plugin is added only once; otherwise building
		# the link farm fails, since the same path is added multiple

nixos/modules/services/networking/ifstate.nix

+40 −43

Original line number	Diff line number	Diff line
		@@ -66,6 +66,33 @@ let
		"wireguard" = [ "wireguard" ];
		"xfrm" = [ "xfrm_interface" ];
		};
		# https://github.com/systemd/systemd/blob/main/units/systemd-networkd.service.in
		commonServiceConfig = {
		after = [
		"systemd-udevd.service"
		"network-pre.target"
		"systemd-sysusers.service"
		"systemd-sysctl.service"
		];
		before = [
		"network.target"
		"multi-user.target"
		"shutdown.target"
		"initrd-switch-root.target"
		];
		conflicts = [
		"shutdown.target"
		"initrd-switch-root.target"
		];
		wants = [
		"network.target"
		];

		unitConfig = {
		# Avoid default dependencies like "basic.target", which prevents ifstate from starting before luks is unlocked.
		DefaultDependencies = "no";
		};
		};
		in
		{
		meta.maintainers = with lib.maintainers; [ marcel ];
		@@ -150,31 +177,12 @@ in
		etc."ifstate/ifstate.yaml".source = settingsFormat.generate "ifstate.yaml" cfg.settings cfg.package;
		};

		systemd.services.ifstate = {
		systemd.services.ifstate = commonServiceConfig // {
		description = "IfState";

		wantedBy = [
		"multi-user.target"
		];
		after = [
		"systemd-udevd.service"
		"network-pre.target"
		"systemd-sysusers.service"
		"systemd-sysctl.service"
		];
		before = [
		"network.target"
		"multi-user.target"
		"shutdown.target"
		"initrd-switch-root.target"
		];
		conflicts = [
		"shutdown.target"
		"initrd-switch-root.target"
		];
		wants = [
		"network.target"
		];

		# mount is always available on nixos, avoid adding additional store paths to the closure
		path = [ "/run/wrappers" ];
		@@ -254,31 +262,23 @@ in
		)
		];

		services.ifstate-initrd = {
		# https://github.com/NixOS/nixpkgs/blob/master/nixos/modules/system/boot/networkd.nix#L3444
		additionalUpstreamUnits = [
		"network-online.target"
		"network-pre.target"
		"network.target"
		"nss-lookup.target"
		"nss-user-lookup.target"
		"remote-fs-pre.target"
		"remote-fs.target"
		];

		services.ifstate-initrd = commonServiceConfig // {
		description = "IfState initrd";

		wantedBy = [
		"initrd.target"
		];
		after = [
		"systemd-udevd.service"
		"network-pre.target"
		"systemd-sysusers.service"
		"systemd-sysctl.service"
		];
		before = [
		"network.target"
		"multi-user.target"
		"shutdown.target"
		"initrd-switch-root.target"
		];
		conflicts = [
		"shutdown.target"
		"initrd-switch-root.target"
		];
		wants = [
		"network.target"
		];

		# mount is always available on nixos, avoid adding additional store paths to the closure
		# https://github.com/NixOS/nixpkgs/blob/2b8e2457ebe576ebf41ddfa8452b5b07a8d493ad/nixos/modules/system/boot/systemd/initrd.nix#L550-L551
		@@ -291,9 +291,6 @@ in
		# Otherwise systemd starts ifstate again, after the encryption password was entered by the user
		# and we are able to implement the cleanup using ExecStop rather than a separate unit.
		RemainAfterExit = true;
		# When using network namespaces pyroute2 expects this directory to exists.
		# @liske is currently investigating whether this should be considered a bug in pyroute2.
		ExecStartPre = "${lib.getExe' pkgs.coreutils "mkdir"} /var/run";
		ExecStart = "${lib.getExe initrdCfg.package} --config ${
		config.environment.etc."ifstate/ifstate.initrd.yaml".source
		} apply";

pkgs/applications/audio/codecserver/default.nix

+0 −1

Original line number	Diff line number	Diff line
		@@ -41,7 +41,6 @@ stdenv.mkDerivation rec {
		description = "Modular audio codec server";
		license = licenses.gpl3Only;
		platforms = platforms.unix;
		teams = [ teams.c3d2 ];
		mainProgram = "codecserver";
		};
		}

pkgs/applications/graphics/sane/backends/default.nix

+8 −21

Original line number	Diff line number	Diff line
		@@ -3,7 +3,6 @@
		lib,
		fetchFromGitLab,
		fetchpatch,
		runtimeShell,
		buildPackages,
		gettext,
		pkg-config,
		@@ -18,8 +17,8 @@
		libv4l,
		net-snmp,
		curl,
		systemd,
		withSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd,
		systemdLibs,
		withSystemd ? lib.meta.availableOn stdenv.hostPlatform systemdLibs,
		libxml2,
		poppler,
		gawk,
		@@ -42,14 +41,14 @@
		scanSnapDriversPackage ? sane-drivers.epjitsu,
		}:

		stdenv.mkDerivation rec {
		stdenv.mkDerivation (finalAttrs: {
		pname = "sane-backends";
		version = "1.4.0";

		src = fetchFromGitLab {
		owner = "sane-project";
		repo = "backends";
		rev = "refs/tags/${version}";
		tag = finalAttrs.version;
		hash = "sha256-e7Wjda+CobYatblvVCGkMAO2aWrdSCp7q+qIEGnGDCY=";
		};

		@@ -78,10 +77,6 @@ stdenv.mkDerivation rec {
		# Fixes for cross compilation
		# https://github.com/NixOS/nixpkgs/issues/308283

		# related to the compile-sane-desc-for-build
		substituteInPlace tools/Makefile.in \
		--replace 'cc -I' '$(CC_FOR_BUILD) -I'

		# sane-desc will be used in postInstall so compile it for build
		# https://github.com/void-linux/void-packages/blob/master/srcpkgs/sane/patches/sane-desc-cross.patch
		patch -p1 -i ${./sane-desc-cross.patch}
		@@ -123,7 +118,7 @@ stdenv.mkDerivation rec {
		net-snmp
		]
		++ lib.optionals withSystemd [
		systemd
		systemdLibs
		];

		enableParallelBuilding = true;
		@@ -131,8 +126,8 @@ stdenv.mkDerivation rec {
		configureFlags = [
		"--with-lockdir=/var/lock/sane"
		]
		++ lib.optional (avahi != null) "--with-avahi"
		++ lib.optional (libusb1 != null) "--with-usb";
		++ lib.optionals (avahi != null) [ "--with-avahi" ]
		++ lib.optionals (libusb1 != null) [ "--with-usb" ];

		# autoconf check for HAVE_MMAP is never set on cross compilation.
		# The pieusb backend fails compilation if HAVE_MMAP is not set.
		@@ -142,7 +137,6 @@ stdenv.mkDerivation rec {

		postInstall =
		let

		compatFirmware =
		extraFirmware
		++ lib.optional (gt68xxFirmware != null) {
		@@ -160,18 +154,11 @@ stdenv.mkDerivation rec {
		mkdir -p $out/share/sane/${f.backend}
		ln -sv ${f.src} $out/share/sane/${f.backend}/${f.name}
		'';

		in
		''
		mkdir -p $out/etc/udev/rules.d/ $out/etc/udev/hwdb.d
		./tools/sane-desc -m udev+hwdb -s doc/descriptions:doc/descriptions-external > $out/etc/udev/rules.d/49-libsane.rules
		./tools/sane-desc -m udev+hwdb -s doc/descriptions:doc/descriptions-external -m hwdb > $out/etc/udev/hwdb.d/20-sane.hwdb
		# the created 49-libsane references /bin/sh
		substituteInPlace $out/etc/udev/rules.d/49-libsane.rules \
		--replace "RUN+=\"/bin/sh" "RUN+=\"${runtimeShell}"

		substituteInPlace $out/lib/libsane.la \
		--replace "-ljpeg" "-L${lib.getLib libjpeg}/lib -ljpeg"

		# net.conf conflicts with the file generated by the nixos module
		rm $out/etc/sane.d/net.conf
		@@ -208,4 +195,4 @@ stdenv.mkDerivation rec {
		platforms = lib.platforms.linux ++ lib.platforms.darwin;
		maintainers = [ lib.maintainers.symphorien ];
		};
		}
		})

Admin message