all-packages: do not export lib functions from pkgs (03bb7d81) · Commits · nix / nixpkgs

nixos/tests/all-tests.nix

+16 −11

Original line number	Diff line number	Diff line
		@@ -14,10 +14,15 @@
		# where said tests are unsupported.
		# Example callTest that just extracts the derivation from the test:
		# callTest = t: t.test;

		with pkgs.lib;

		let
		inherit (pkgs.lib)
		isAttrs
		isFunction
		mapAttrs
		elem
		recurseIntoAttrs
		;

		# TODO: remove when handleTest is gone (make sure nixosTests and nixos/release.nix#tests are unaffected)
		# TODO: when removing, also deprecate `test` attribute in ../lib/testing/run.nix
		discoverTests =
		@@ -667,7 +672,7 @@ in
		guacamole-server = runTest ./guacamole-server.nix;
		guix = handleTest ./guix { };
		gvisor = runTest ./gvisor.nix;
		h2o = import ./web-servers/h2o { inherit recurseIntoAttrs runTest; };
		h2o = import ./web-servers/h2o { inherit runTest; };
		hadoop = import ./hadoop {
		inherit handleTestOn;
		package = pkgs.hadoop;
		@@ -737,13 +742,13 @@ in
		immich-vectorchord-migration = runTest ./web-apps/immich-vectorchord-migration.nix;
		immich-vectorchord-reindex = runTest ./web-apps/immich-vectorchord-reindex.nix;
		incron = runTest ./incron.nix;
		incus = pkgs.recurseIntoAttrs (
		incus = recurseIntoAttrs (
		handleTest ./incus {
		lts = false;
		inherit system pkgs;
		}
		);
		incus-lts = pkgs.recurseIntoAttrs (handleTest ./incus { inherit system pkgs; });
		incus-lts = recurseIntoAttrs (handleTest ./incus { inherit system pkgs; });
		influxdb = runTest ./influxdb.nix;
		influxdb2 = runTest ./influxdb2.nix;
		initrd-luks-empty-passphrase = runTest ./initrd-luks-empty-passphrase.nix;
		@@ -754,7 +759,7 @@ in
		initrdNetwork = runTest ./initrd-network.nix;
		input-remapper = runTest ./input-remapper.nix;
		inspircd = runTest ./inspircd.nix;
		installed-tests = pkgs.recurseIntoAttrs (handleTest ./installed-tests { });
		installed-tests = recurseIntoAttrs (handleTest ./installed-tests { });
		installer = handleTest ./installer.nix { };
		installer-systemd-stage-1 = handleTest ./installer-systemd-stage-1.nix { };
		intune = runTest ./intune.nix;
		@@ -808,7 +813,7 @@ in
		ksm = runTest ./ksm.nix;
		kthxbye = runTest ./kthxbye.nix;
		kubernetes = handleTestOn [ "x86_64-linux" ] ./kubernetes { };
		kubo = import ./kubo { inherit recurseIntoAttrs runTest; };
		kubo = import ./kubo { inherit runTest; };
		lact = runTest ./lact.nix;
		ladybird = runTest ./ladybird.nix;
		languagetool = runTest ./languagetool.nix;
		@@ -891,7 +896,7 @@ in
		man = runTest ./man.nix;
		mariadb-galera = handleTest ./mysql/mariadb-galera.nix { };
		marytts = runTest ./marytts.nix;
		mastodon = pkgs.recurseIntoAttrs (handleTest ./web-apps/mastodon { inherit handleTestOn; });
		mastodon = recurseIntoAttrs (handleTest ./web-apps/mastodon { inherit handleTestOn; });
		mate = runTest ./mate.nix;
		mate-wayland = runTest ./mate-wayland.nix;
		matomo = runTest ./matomo.nix;
		@@ -953,7 +958,7 @@ in
		mopidy = runTest ./mopidy.nix;
		morph-browser = runTest ./morph-browser.nix;
		mosquitto = runTest ./mosquitto.nix;
		movim = import ./web-apps/movim { inherit recurseIntoAttrs runTest; };
		movim = import ./web-apps/movim { inherit runTest; };
		mpd = runTest ./mpd.nix;
		mpv = runTest ./mpv.nix;
		mtp = runTest ./mtp.nix;
		@@ -1410,7 +1415,7 @@ in
		suricata = runTest ./suricata.nix;
		suwayomi-server = import ./suwayomi-server.nix {
		inherit runTest;
		lib = pkgs.lib;
		inherit (pkgs) lib;
		};
		svnserve = runTest ./svnserve.nix;
		swap-file-btrfs = runTest ./swap-file-btrfs.nix;

nixos/tests/kubo/default.nix

+2 −2

Original line number	Diff line number	Diff line
		{ recurseIntoAttrs, runTest }:
		recurseIntoAttrs {
		{ lib, runTest }:
		lib.recurseIntoAttrs {
		kubo = runTest ./kubo.nix;
		kubo-fuse = runTest ./kubo-fuse.nix;
		}

nixos/tests/web-apps/movim/default.nix

+2 −3

Original line number	Diff line number	Diff line
		{ recurseIntoAttrs, runTest }:

		recurseIntoAttrs {
		{ lib, runTest }:
		lib.recurseIntoAttrs {
		ejabberd-h2o = runTest ./ejabberd-h2o.nix;
		prosody-nginx = runTest ./prosody-nginx.nix;
		}

nixos/tests/web-servers/h2o/default.nix

+2 −3

Original line number	Diff line number	Diff line
		{ recurseIntoAttrs, runTest }:

		recurseIntoAttrs {
		{ lib, runTest }:
		lib.recurseIntoAttrs {
		basic = runTest ./basic.nix;
		mruby = runTest ./mruby.nix;
		tls-recommendations = runTest ./tls-recommendations.nix;

pkgs/applications/editors/emacs/make-emacs.nix

+1 −2

Original line number	Diff line number	Diff line
		@@ -53,7 +53,6 @@
		ncurses,
		nixosTests,
		pkg-config,
		recurseIntoAttrs,
		sigtool,
		sqlite,
		replaceVars,
		@@ -496,7 +495,7 @@ stdenv.mkDerivation (finalAttrs: {
		inherit withNativeCompilation;
		inherit withTreeSitter;
		inherit withXwidgets;
		pkgs = recurseIntoAttrs (emacsPackagesFor finalAttrs.finalPackage);
		pkgs = lib.recurseIntoAttrs (emacsPackagesFor finalAttrs.finalPackage);
		tests = {
		inherit (nixosTests) emacs-daemon;
		withPackages = callPackage ./build-support/wrapper-test.nix {