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

doc/languages-frameworks/ocaml.section.md

+12 −10

Original line number	Diff line number	Diff line
		@@ -75,7 +75,7 @@ Here is a simple package example.
		ppx_let,
		}:

		buildDunePackage rec {
		buildDunePackage (finalAttrs: {
		pname = "angstrom";
		version = "0.15.0";

		@@ -84,20 +84,22 @@ buildDunePackage rec {
		src = fetchFromGitHub {
		owner = "inhabitedtype";
		repo = "angstrom";
		tag = version;
		tag = finalAttrs.version;
		hash = "sha256-MK8o+iPGANEhrrTc1Kz9LBilx2bDPQt7Pp5P2libucI=";
		};

		checkInputs = [
		alcotest
		ppx_let
		];
		buildInputs = [ ocaml-syntax-shims ];

		propagatedBuildInputs = [
		bigstringaf
		result
		];

		doCheck = lib.versionAtLeast ocaml.version "4.05";
		checkInputs = [
		alcotest
		ppx_let
		];

		meta = {
		homepage = "https://github.com/inhabitedtype/angstrom";
		@@ -105,7 +107,7 @@ buildDunePackage rec {
		license = lib.licenses.bsd3;
		maintainers = with lib.maintainers; [ sternenseemann ];
		};
		}
		})
		```

		Here is a second example, this time using a source archive generated with `dune-release`. It is a good idea to use this archive when it is available as it will usually contain substituted variables such as a `%%VERSION%%` field. This library does not depend on any other OCaml library and no tests are run after building it.
		@@ -117,14 +119,14 @@ Here is a second example, this time using a source archive generated with `dune-
		buildDunePackage,
		}:

		buildDunePackage rec {
		buildDunePackage (finalAtts: {
		pname = "wtf8";
		version = "1.0.2";

		minimalOCamlVersion = "4.02";

		src = fetchurl {
		url = "https://github.com/flowtype/ocaml-wtf8/releases/download/v${version}/wtf8-v${version}.tbz";
		url = "https://github.com/flowtype/ocaml-wtf8/releases/download/v${finalAtts.version}/wtf8-v${finalAtts.version}.tbz";
		hash = "sha256-d5/3KUBAWRj8tntr4RkJ74KWW7wvn/B/m1nx0npnzyc=";
		};

		@@ -134,7 +136,7 @@ buildDunePackage rec {
		license = lib.licenses.mit;
		maintainers = [ lib.maintainers.eqyiel ];
		};
		}
		})
		```

		The build will automatically fail if two distinct versions of the same library

doc/release-notes/rl-2511.section.md

+2 −0

Original line number	Diff line number	Diff line
		@@ -78,6 +78,8 @@

		- `hiawata` has been removed, due to lack of active development upstream, lack of maintainership downstream and upcoming security issues.

		- `forgejo` main program has been renamed to `bin/forgejo` from the previous `bin/gitea`.

		- `cudaPackages.cudatoolkit-legacy-runfile` has been removed.

		- `conduwuit` was removed due to upstream ceasing development and deleting their repository. For existing data, a migration to `matrix-conduit`, `matrix-continuwuity` or `matrix-tuwunel` may be possible.

lib/tests/modules.sh

+3 −0

Original line number	Diff line number	Diff line
		@@ -210,6 +210,9 @@ checkConfigError 'A definition for option .intStrings\.badTagTypeError\.left. is
		checkConfigError 'A definition for option .nested\.right\.left. is not of type .signed integer.' config.nested.right.left ./types-attrTag.nix
		checkConfigError 'In attrTag, each tag value must be an option, but tag int was a bare type, not wrapped in mkOption.' config.opt.int ./types-attrTag-wrong-decl.nix

		# types
		checkConfigOutput '"ok"' config.assertions ./types.nix

		# types.pathInStore
		checkConfigOutput '".*/store/0lz9p8xhf89kb1c1kk6jxrzskaiygnlh-bash-5.2-p15.drv"' config.pathInStore.ok1 ./types.nix
		checkConfigOutput '".*/store/0fb3ykw9r5hpayd05sr0cizwadzq1d8q-bash-5.2-p15"' config.pathInStore.ok2 ./types.nix

lib/tests/modules/types.nix

+459 −0

File changed.

Preview size limit exceeded, changes collapsed.

lib/types.nix

+8 −1

Original line number	Diff line number	Diff line
		@@ -1247,7 +1247,14 @@ let
		let
		docsEval = base.extendModules { modules = [ noCheckForDocsModule ]; };
		in
		docsEval._module.freeformType.description or name;
		if docsEval._module.freeformType ? description then
		"open ${name} of ${
		optionDescriptionPhrase (
		class: class == "noun" \|\| class == "composite"
		) docsEval._module.freeformType
		}"
		else
		name;
		inherit check;
		merge = {
		__functor =

Admin message