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

doc/build-helpers/images/appimagetools.section.md

+17 −7

Original line number	Diff line number	Diff line
		@@ -110,12 +110,12 @@ appimageTools.wrapType2 {
		extraPkgs = pkgs: [ pkgs.at-spi2-core ];

		extraInstallCommands = ''
		mv $out/bin/${pname}-${version} $out/bin/${pname}
		mv $out/bin/irccloud-${version} $out/bin/irccloud
		install -m 444 -D ${appimageContents}/irccloud.desktop $out/share/applications/irccloud.desktop
		install -m 444 -D ${appimageContents}/usr/share/icons/hicolor/512x512/apps/irccloud.png \
		$out/share/icons/hicolor/512x512/apps/irccloud.png
		substituteInPlace $out/share/applications/irccloud.desktop \
		--replace-fail 'Exec=AppRun' 'Exec=${pname}'
		--replace-fail 'Exec=AppRun' 'Exec=irccloud'
		'';
		}
		```
		@@ -125,11 +125,16 @@ appimageTools.wrapType2 {
		The argument passed to `extract` can also contain a `postExtract` attribute, which allows you to execute additional commands after the files are extracted from the AppImage.
		`postExtract` must be a string with commands to run.

		:::{.warning}
		When specifying `postExtract`, you should use `appimageTools.wrapAppImage` instead of `appimageTools.wrapType2`.
		Otherwise `wrapType2` will extract the AppImage contents without respecting the `postExtract` instructions.
		:::

		:::{.example #ex-extracting-appimage-with-postextract}

		# Extracting an AppImage to install extra files, using `postExtract`

		This is a rewrite of [](#ex-extracting-appimage) to use `postExtract`.
		This is a rewrite of [](#ex-extracting-appimage) to use `postExtract` and `wrapAppImage`.

		```nix
		{ appimageTools, fetchurl }:
		@@ -145,21 +150,26 @@ let
		appimageContents = appimageTools.extract {
		inherit pname version src;
		postExtract = ''
		substituteInPlace $out/irccloud.desktop --replace-fail 'Exec=AppRun' 'Exec=${pname}'
		substituteInPlace $out/irccloud.desktop --replace-fail 'Exec=AppRun' 'Exec=irccloud'
		'';
		};
		in
		appimageTools.wrapType2 {
		inherit pname version src;
		appimageTools.wrapAppImage {
		inherit pname version;

		src = appimageContents;

		extraPkgs = pkgs: [ pkgs.at-spi2-core ];

		extraInstallCommands = ''
		mv $out/bin/${pname}-${version} $out/bin/${pname}
		mv $out/bin/irccloud-${version} $out/bin/irccloud
		install -m 444 -D ${appimageContents}/irccloud.desktop $out/share/applications/irccloud.desktop
		install -m 444 -D ${appimageContents}/usr/share/icons/hicolor/512x512/apps/irccloud.png \
		$out/share/icons/hicolor/512x512/apps/irccloud.png
		'';

		# specify src archive for nix-update
		passthru.src = src;
		}
		```

maintainers/team-list.nix

+4 −0

Original line number	Diff line number	Diff line
		@@ -843,8 +843,12 @@ with lib.maintainers;

		marketing = {
		members = [
		djacu
		flyfloh
		thilobillerbeck
		tomberek
		];
		githubTeams = [ "marketing-team" ];
		scope = "Marketing of Nix/NixOS/nixpkgs.";
		shortName = "Marketing";
		enableFeatureFreezePing = true;

nixos/modules/services/networking/hostapd.nix

+1 −1

Original line number	Diff line number	Diff line
		@@ -274,7 +274,7 @@ in
		channel = mkOption {
		default = 0;
		example = 11;
		type = types.ints.positive;
		type = types.ints.unsigned;
		description = ''
		The channel to operate on. Use 0 to enable ACS (Automatic Channel Selection).
		Beware that not every device supports ACS in which case {command}`hostapd`

nixos/modules/tasks/filesystems/bcachefs.nix

+4 −0

Original line number	Diff line number	Diff line
		@@ -231,6 +231,10 @@ in
		lib.mkMerge [
		{
		inherit assertions;

		# Bcachefs upstream recommends using the latest kernel
		boot.kernelPackages = lib.mkDefault pkgs.linuxPackages_latest;

		# needed for systemd-remount-fs
		system.fsPackages = [ cfg.package ];
		services.udev.packages = [ cfg.package ];

pkgs/applications/editors/rednotebook/default.nix

+2 −2

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

		buildPythonApplication rec {
		pname = "rednotebook";
		version = "2.39";
		version = "2.41";
		pyproject = true;

		src = fetchFromGitHub {
		owner = "jendrikseipp";
		repo = "rednotebook";
		tag = "v${version}";
		sha256 = "sha256-H7Ub4dCJQa4Y3DNBzeIYWlNkpYftezY2MNWokw8ocoA=";
		sha256 = "sha256-sWfazIeROc3Pf4pUaUdcF00A5AV7bxzwI3R6eoSQkto=";
		};

		# We have not packaged tests.