Merge staging-next into staging (5fa18e5a) · Commits · nix / nixpkgs

maintainers/maintainer-list.nix

+0 −5

Original line number	Diff line number	Diff line
		@@ -2543,11 +2543,6 @@
		github = "AtilaSaraiva";
		githubId = 29521461;
		};
		atinba = {
		name = "Atin Bainada";
		github = "atinba";
		githubId = 61903527;
		};
		atkinschang = {
		email = "atkinschang+nixpkgs@gmail.com";
		github = "AtkinsChang";

+3 −2

Original line number	Diff line number	Diff line
		@@ -10,6 +10,7 @@ with lib;
		let

		inInitrd = config.boot.initrd.supportedFilesystems.cifs or false;
		mount_cifs = "${lib.getBin pkgs.cifs-utils}/sbin/mount.cifs";

		in

		@@ -29,10 +30,10 @@ in
		];

		boot.initrd.extraUtilsCommands = mkIf (inInitrd && !config.boot.initrd.systemd.enable) ''
		copy_bin_and_libs ${pkgs.cifs-utils}/sbin/mount.cifs
		copy_bin_and_libs ${mount_cifs}
		'';

		boot.initrd.systemd.extraBin."mount.cifs" = mkIf inInitrd "${pkgs.cifs-utils}/sbin/mount.cifs";
		boot.initrd.systemd.extraBin."mount.cifs" = mkIf inInitrd mount_cifs;

		};
		}

+1 −1

Original line number	Diff line number	Diff line
		@@ -18,7 +18,7 @@ in
		boot.initrd.kernelModules = mkIf inInitrd [ "jfs" ];

		boot.initrd.extraUtilsCommands = mkIf (inInitrd && !config.boot.initrd.systemd.enable) ''
		copy_bin_and_libs ${pkgs.jfsutils}/sbin/fsck.jfs
		copy_bin_and_libs ${lib.getBin pkgs.jfsutils}/sbin/fsck.jfs
		'';

		boot.initrd.systemd.initrdBin = mkIf inInitrd [ pkgs.jfsutils ];

+0 −1

Original line number	Diff line number	Diff line
		@@ -148,7 +148,6 @@ stdenv.mkDerivation rec {
		"aarch64-darwin"
		];
		maintainers = with lib.maintainers; [
		atinba
		ilian
		viraptor
		];

+354 −355

File changed.

Preview size limit exceeded, changes collapsed.