Merge master into haskell-updates (26d2f291) · Commits · nix / nixpkgs

doc/default.nix

+1 −1

Original line number	Diff line number	Diff line
		@@ -111,7 +111,7 @@ in pkgs.stdenv.mkDerivation {
		${lib-docs}/index.md \
		> ./functions/library.md
		substitute ./manual.md.in ./manual.md \
		--replace '@MANUAL_VERSION@' '${pkgs.lib.version}'
		--replace-fail '@MANUAL_VERSION@' '${pkgs.lib.version}'

		mkdir -p out/media

doc/hooks/zig.section.md

+2 −2

Original line number	Diff line number	Diff line
		@@ -9,14 +9,14 @@ In Nixpkgs, `zig.hook` overrides the default build, check and install phases.
		```nix
		{ lib
		, stdenv
		, zig_0_11
		, zig
		}:

		stdenv.mkDerivation {
		# . . .

		nativeBuildInputs = [
		zig_0_11.hook
		zig.hook
		];

		zigBuildFlags = [ "-Dman-pages=true" ];

lib/gvariant.nix

+60 −1

Original line number	Diff line number	Diff line
		@@ -53,6 +53,53 @@ rec {

		inherit type isGVariant;

		intConstructors = [
		{
		name = "mkInt32";
		type = type.int32;
		min = -2147483648;
		max = 2147483647;
		}
		{
		name = "mkUint32";
		type = type.uint32;
		min = 0;
		max = 4294967295;
		}
		{
		name = "mkInt64";
		type = type.int64;
		# Nix does not support such large numbers.
		min = null;
		max = null;
		}
		{
		name = "mkUint64";
		type = type.uint64;
		min = 0;
		# Nix does not support such large numbers.
		max = null;
		}
		{
		name = "mkInt16";
		type = type.int16;
		min = -32768;
		max = 32767;
		}
		{
		name = "mkUint16";
		type = type.uint16;
		min = 0;
		max = 65535;
		}
		{
		name = "mkUchar";
		type = type.uchar;
		min = 0;
		max = 255;
		}
		];

		/* Returns the GVariant value that most closely matches the given Nix value.
		If no GVariant value can be found unambiguously then error is thrown.

		@@ -70,8 +117,20 @@ rec {
		mkArray v
		else if isGVariant v then
		v
		else if builtins.isInt v then
		let
		validConstructors = builtins.filter ({ min, max, ... }: (min == null \|\| min <= v) && (max == null \|\| v <= max)) intConstructors;
		in
		throw ''
		The GVariant type for number “${builtins.toString v}” is unclear.
		Please wrap the value with one of the following, depending on the value type in GSettings schema:

		${lib.concatMapStringsSep "\n" ({ name, type, ...}: "- `lib.gvariant.${name}` for `${type}`") validConstructors}
		''
		else if builtins.isAttrs v then
		throw "Cannot construct GVariant value from an attribute set. If you want to construct a dictionary, you will need to create an array containing items constructed with `lib.gvariant.mkDictionaryEntry`."
		else
		throw "The GVariant type of ${v} can't be inferred.";
		throw "The GVariant type of “${builtins.typeOf v}” can't be inferred.";

		/* Returns the GVariant array from the given type of the elements and a Nix list.

lib/licenses.nix

+5 −0

Original line number	Diff line number	Diff line
		@@ -632,6 +632,11 @@ in mkLicense lset) ({
		url = "https://old.calculate-linux.org/packages/licenses/iASL";
		};

		icu = {
		spdxId = "ICU";
		fullName = "ICU";
		};

		ijg = {
		spdxId = "IJG";
		fullName = "Independent JPEG Group License";

maintainers/maintainer-list.nix

+63 −0

Original line number	Diff line number	Diff line
		@@ -429,6 +429,12 @@
		githubId = 1517066;
		name = "Aiken Cairncross";
		};
		a-camarillo = {
		name = "Anthony Camarillo";
		email = "anthony.camarillo.96@gmail.com";
		github = "a-camarillo";
		githubId = 58638902;
		};
		aciceri = {
		name = "Andrea Ciceri";
		email = "andrea.ciceri@autistici.org";
		@@ -1448,6 +1454,12 @@
		githubId = 5411704;
		name = "Manuel Sanchez Pinar";
		};
		aos = {
		email = "n@aos.sh";
		github = "aos";
		githubId = 25783780;
		name = "aos";
		};
		apeschar = {
		email = "albert@peschar.net";
		github = "apeschar";
		@@ -2937,6 +2949,12 @@
		fingerprint = "BF4FCB85C69989B4ED95BF938AE74787A4B7C07E";
		}];
		};
		b-rodrigues = {
		email = "bruno@brodrigues.co";
		github = "b-rodrigues";
		githubId = 2998834;
		name = "Bruno Rodrigues";
		};
		broke = {
		email = "broke@in-fucking.space";
		github = "broke";
		@@ -3012,6 +3030,12 @@
		githubId = 37375448;
		name = "Buildit";
		};
		buurro = {
		email = "marcoburro98@gmail.com";
		github = "buurro";
		githubId = 9320677;
		name = "Marco Burro";
		};
		bwc9876 = {
		email = "bwc9876@gmail.com";
		github = "Bwc9876";
		@@ -5792,6 +5816,15 @@
		githubId = 4576666;
		name = "Eliza Velasquez";
		};
		eljamm = {
		name = "Fedi Jamoussi";
		email = "fedi.jamoussi@protonmail.ch";
		github = "eljamm";
		githubId = 83901271;
		keys = [{
		fingerprint = "FF59 E027 4EE2 E792 512B BDC8 7630 FDF7 C8FB 1F3F";
		}];
		};
		elkowar = {
		email = "thereal.elkowar@gmail.com";
		github = "elkowar";
		@@ -7567,6 +7600,12 @@
		githubId = 76716;
		name = "Graham Christensen";
		};
		grahamnorris = {
		email = "oss@grahamjnorris.com";
		github = "grahamnorris";
		githubId = 66037909;
		name = "Graham J. Norris";
		};
		gravndal = {
		email = "gaute.ravndal+nixos@gmail.com";
		github = "gravndal";
		@@ -7791,6 +7830,12 @@
		github = "HannahMR";
		githubId = 9088467;
		};
		hannesgith = {
		email = "nix@h-h.win";
		github = "hannesgith";
		githubId = 33062605;
		name = "Hannes Hattenbach";
		};
		hansjoergschurr = {
		email = "commits@schurr.at";
		github = "hansjoergschurr";
		@@ -15846,6 +15891,13 @@
		githubId = 4056630;
		name = "Patrick Steinhardt";
		};
		pkulak = {
		name = "Phil Kulak";
		email = "phil@kulak.us";
		matrix = "@phil:kulak.us";
		github = "pkulak";
		githubId = 502905;
		};
		plabadens = {
		name = "Pierre Labadens";
		email = "labadens.pierre+nixpkgs@gmail.com";
		@@ -16512,6 +16564,11 @@
		githubId = 35229674;
		name = "Armin Rothfuss";
		};
		r3n3gad3p3arl = {
		github = "r3n3gad3p3arl";
		githubId = 20760527;
		name = "Madelyn";
		};
		raboof = {
		email = "arnout@bzzt.net";
		matrix = "@raboof:matrix.org";
		@@ -16815,6 +16872,12 @@
		githubId = 18155001;
		name = "Gabe Dunn";
		};
		redyf = {
		email = "mateusalvespereira7@gmail.com";
		github = "redyf";
		githubId = 98139059;
		name = "Mateus Alves";
		};
		reedrw = {
		email = "reedrw5601@gmail.com";
		github = "reedrw";

Admin message