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

maintainers/maintainer-list.nix

+6 −0

Original line number	Diff line number	Diff line
		@@ -7439,6 +7439,12 @@
		fingerprint = "B768 6CD7 451A 650D 9C54 4204 6710 CF0C 1CBD 7762";
		}];
		};
		jleightcap = {
		email = "jack@leightcap.com";
		github = "jleightcap";
		githubId = 30168080;
		name = "Jack Leightcap";
		};
		jlesquembre = {
		email = "jl@lafuente.me";
		github = "jlesquembre";

nixos/modules/system/boot/loader/grub/grub.nix

+5 −50

Original line number	Diff line number	Diff line
		@@ -13,10 +13,6 @@ let
		if cfg.forcei686 then pkgs.pkgsi686Linux else pkgs;

		realGrub = if cfg.zfsSupport then grubPkgs.grub2.override { zfsSupport = true; }
		else if cfg.trustedBoot.enable
		then if cfg.trustedBoot.isHPLaptop
		then grubPkgs.trustedGrub-for-HP
		else grubPkgs.trustedGrub
		else grubPkgs.grub2;

		grub =
		@@ -674,39 +670,6 @@ in
		'';
		};

		trustedBoot = {

		enable = mkOption {
		default = false;
		type = types.bool;
		description = lib.mdDoc ''
		Enable trusted boot. GRUB will measure all critical components during
		the boot process to offer TCG (TPM) support.
		'';
		};

		systemHasTPM = mkOption {
		default = "";
		example = "YES_TPM_is_activated";
		type = types.str;
		description = lib.mdDoc ''
		Assertion that the target system has an activated TPM. It is a safety
		check before allowing the activation of 'trustedBoot.enable'. TrustedBoot
		WILL FAIL TO BOOT YOUR SYSTEM if no TPM is available.
		'';
		};

		isHPLaptop = mkOption {
		default = false;
		type = types.bool;
		description = lib.mdDoc ''
		Use a special version of TrustedGRUB that is needed by some HP laptops
		and works only for the HP laptops.
		'';
		};

		};

		};

		};
		@@ -782,18 +745,6 @@ in
		assertion = cfg.efiSupport \|\| all (c: c < 2) (mapAttrsToList (n: c: if n == "nodev" then 0 else c) bootDeviceCounters);
		message = "You cannot have duplicated devices in mirroredBoots";
		}
		{
		assertion = !cfg.efiSupport \|\| !cfg.trustedBoot.enable;
		message = "Trusted GRUB does not have EFI support";
		}
		{
		assertion = !cfg.zfsSupport \|\| !cfg.trustedBoot.enable;
		message = "Trusted GRUB does not have ZFS support";
		}
		{
		assertion = !cfg.trustedBoot.enable \|\| cfg.trustedBoot.systemHasTPM == "YES_TPM_is_activated";
		message = "Trusted GRUB can break the system! Confirm that the system has an activated TPM by setting 'systemHasTPM'.";
		}
		{
		assertion = cfg.efiInstallAsRemovable -> cfg.efiSupport;
		message = "If you wish to to use boot.loader.grub.efiInstallAsRemovable, then turn on boot.loader.grub.efiSupport";
		@@ -841,6 +792,10 @@ in
		(mkRenamedOptionModule [ "boot" "grubDevice" ] [ "boot" "loader" "grub" "device" ])
		(mkRenamedOptionModule [ "boot" "bootMount" ] [ "boot" "loader" "grub" "bootDevice" ])
		(mkRenamedOptionModule [ "boot" "grubSplashImage" ] [ "boot" "loader" "grub" "splashImage" ])
		(mkRemovedOptionModule [ "boot" "loader" "grub" "trustedBoot" ] ''
		Support for Trusted GRUB has been removed, because the project
		has been retired upstream.
		'')
		(mkRemovedOptionModule [ "boot" "loader" "grub" "extraInitrd" ] ''
		This option has been replaced with the bootloader agnostic
		boot.initrd.secrets option. To migrate to the initrd secrets system,

pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix

+2 −2

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

		(if stdenv.isDarwin then darwin.apple_sdk_11_0.clang14Stdenv else stdenv).mkDerivation rec {
		pname = "signalbackup-tools";
		version = "20230508-1";
		version = "20230510";

		src = fetchFromGitHub {
		owner = "bepaald";
		repo = pname;
		rev = version;
		hash = "sha256-0kkbJGZEnB6bL+aNhHpSI2oHpsVmju3OEFG7mitKBsc=";
		hash = "sha256-EsFF9fPpHfVmbLm2hRpcJBmwfovfK4CV3LukrG9nP3U=";
		};

		postPatch = ''

pkgs/applications/office/gnote/default.nix

0 → 100644

+61 −0

Original line number	Diff line number	Diff line
		{ lib
		, stdenv
		, fetchurl
		, desktop-file-utils
		, gettext
		, gspell
		, gtkmm3
		, itstool
		, libsecret
		, libuuid
		, libxml2
		, libxslt
		, meson
		, ninja
		, pkg-config
		, wrapGAppsHook
		, gnome
		}:

		stdenv.mkDerivation rec {
		pname = "gnote";
		version = "44.0";

		src = fetchurl {
		url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz";
		hash = "sha256-3DvXkmj+mdTtVmeawHbMnZqq9ieWE403HPCIFffmSS0=";
		};

		buildInputs = [
		gspell
		gtkmm3
		libsecret
		libuuid
		libxml2
		libxslt
		];

		nativeBuildInputs = [
		desktop-file-utils
		gettext
		itstool
		meson
		ninja
		pkg-config
		wrapGAppsHook
		];

		passthru = {
		updateScript = gnome.updateScript {
		packageName = pname;
		};
		};

		meta = with lib; {
		homepage = "https://wiki.gnome.org/Apps/Gnote";
		description = "A note taking application";
		maintainers = with maintainers; [ jfvillablanca ];
		license = licenses.gpl3Only;
		platforms = platforms.linux;
		};
		}

pkgs/development/python-modules/azure-mgmt-security/default.nix

+2 −2

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

		buildPythonPackage rec {
		pname = "azure-mgmt-security";
		version = "3.0.0";
		version = "5.0.0";
		format = "setuptools";

		disabled = pythonOlder "3.7";

		src = fetchPypi {
		inherit pname version;
		hash = "sha256-vLp874V/awKi2Yr+sH+YcbFij6M9iGGrE4fnMufbP4Q=";
		hash = "sha256-OLA+/oLCNEzqID/alebQC3rCJ4L6HAtYXNDqLI/z5wI=";
		extension = "zip";
		};

Admin message