Merge master into staging-nixos (2f24c8d4) · Commits · nix / nixpkgs

doc/languages-frameworks/octave.section.md

+11 −0

Original line number	Diff line number	Diff line
		@@ -76,6 +76,17 @@ See [Symbolic](https://github.com/NixOS/nixpkgs/blob/master/pkgs/development/oct
		`requiredOctavePackages`
		: This is a special dependency that ensures the specified Octave packages are dependent on others, and are made available simultaneously when loading them in Octave.

		### Testing Octave packages {#sssec-testing-octave-packages}

		Octave packages built using the `buildOctavePackage` function do not have a `checkPhase` or `installCheckPhase`.
		Instead, the tests `testOctaveBuildEnv` and `testOctavePkgTests` are added to the package's `passthru.tests`.

		`passthru.tests.testOctaveBuildEnv` tests whether the package can be used by `octave.withPackages` successfully.

		`passthru.tests.testOctavePkgTests` runs a `pkg test` command for the package.
		If the package needs additional inputs to successfully run the tests, the `nativeOctavePkgTestInputs` attribute can be specified.
		If the package needs environment variables to be set to successfully run the tests, ensure that `__structuredAttrs = true;` in the package, then set the environment variables you need in `octavePkgTestEnv` (which should be an attrset where the key is the name of the variable and the value is its value (as a string)).

		### Installing Octave Packages {#sssec-installing-octave-packages}

		By default, the `buildOctavePackage` function does _not_ install the requested package into Octave for use.

+3 −0

Original line number	Diff line number	Diff line
		@@ -695,6 +695,9 @@
		"footnote-stdenv-find-inputs-location.__back.0": [
		"index.html#footnote-stdenv-find-inputs-location.__back.0"
		],
		"sssec-testing-octave-packages": [
		"index.html#sssec-testing-octave-packages"
		],
		"strictflexarrays1": [
		"index.html#strictflexarrays1"
		],

+6 −0

Original line number	Diff line number	Diff line
		@@ -22725,6 +22725,12 @@
		githubId = 3302;
		name = "Renzo Carbonara";
		};
		replicapra = {
		name = "replicapra";
		github = "replicapra";
		githubId = 154707993;
		email = "nixpkgs@replicapra.dev";
		};
		repparw = {
		email = "ubritos@gmail.com";
		github = "repparw";

+23 −28

Original line number	Diff line number	Diff line
		@@ -201,7 +201,8 @@ in
		server.succeed("systemctl --no-pager -l status apparmor.service")
		server.wait_for_unit("apparmor.service")
		''
		+ lib.optionalString cfg.feature.user (
		+
		lib.optionalString cfg.feature.user
		# python
		''
		with subtest("incus-user allows restricted access for users"):
		@@ -211,13 +212,8 @@ in
		server.succeed("incus project show user-1000")
		# user can create an instance
		server.succeed("su - testuser bash -c 'incus create --empty'")
		''
		+ lib.optionalString (lib.versionOlder cfg.package.version "6.21") ''
		# users shouldn't be able to list storage pools
		server.fail("su - testuser bash -c 'incus storage list'")
		''
		+ lib.optionalString (lib.versionAtLeast cfg.package.version "6.21") ''
		# users shouldn't be able to read storage pools

		# users should be able to read storage pools
		server.succeed("su - testuser bash -c 'incus storage list'")

		# pre-check that there is a pool source
		@@ -228,6 +224,5 @@ in
		code, pool_source = server.execute("su - testuser bash -c 'incus storage get default source'")
		assert pool_source.strip() == "", f"Expected empty string, got {pool_source}"
		''
		)
		+ instanceScript;
		}

+3 −3

Original line number	Diff line number	Diff line
		@@ -5,13 +5,13 @@
		}:
		mkLibretroCore {
		core = "mednafen-pce-fast";
		version = "0-unstable-2026-01-23";
		version = "0-unstable-2026-03-13";

		src = fetchFromGitHub {
		owner = "libretro";
		repo = "beetle-pce-fast-libretro";
		rev = "52675734da114a19b3705f03906b1455f3d76644";
		hash = "sha256-hITofg0UB5sGNOKAijfORz3ZtHY5CCdqFmbT4nMkmG8=";
		rev = "0fa44d2500ebc9bf96d2808209be27a69006df79";
		hash = "sha256-NBL506+aaLRQh9XawvvynNRunWDPqxrt7ngy6FCmiIQ=";
		};

		makefile = "Makefile";