From a2fc5f439a2ca583d706169f08b96c602fac7dc9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 30 Aug 2022 16:49:27 +0200 Subject: [PATCH] nix: add i686 nix package to passthru tests --- pkgs/tools/package-management/nix/common.nix | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/package-management/nix/common.nix b/pkgs/tools/package-management/nix/common.nix index c2e9febea64d..0429074638c3 100644 --- a/pkgs/tools/package-management/nix/common.nix +++ b/pkgs/tools/package-management/nix/common.nix @@ -54,6 +54,9 @@ in , confDir , stateDir , storeDir + + # passthru tests +, pkgsi686Linux }: let self = stdenv.mkDerivation { pname = "nix"; @@ -194,6 +197,16 @@ self = stdenv.mkDerivation { enableParallelBuilding = true; + passthru = { + inherit aws-sdk-cpp boehmgc; + + perl-bindings = perl.pkgs.toPerlModule (callPackage ./nix-perl.nix { nix = self; inherit Security; }); + + tests = { + nixi686 = pkgsi686Linux.nixVersions.${"nix_${lib.versions.major version}_${lib.versions.minor version}"}; + }; + }; + meta = with lib; { description = "Powerful package manager that makes package management reliable and reproducible"; longDescription = '' @@ -209,11 +222,5 @@ self = stdenv.mkDerivation { platforms = platforms.unix; outputsToInstall = [ "out" ] ++ optional enableDocumentation "man"; }; - - passthru = { - inherit aws-sdk-cpp boehmgc; - - perl-bindings = perl.pkgs.toPerlModule (callPackage ./nix-perl.nix { nix = self; inherit Security; }); - }; }; in self