Commit 30f11e43 authored by Jörg Thalheim's avatar Jörg Thalheim
Browse files

nix: add installer test and adapt passthru tests based on the platform

parent e36ab645

pkgs/tools/package-management/nix/common.nix

+10 −8
Original line number Diff line number Diff line
@@ -263,14 +263,6 @@ self = stdenv.mkDerivation { 
    perl-bindings = perl.pkgs.toPerlModule (callPackage ./nix-perl.nix { nix = self; inherit Security; });



    tests = {

      nixi686 = pkgsi686Linux.nixVersions.${self_attribute_name};

      nixStatic = pkgsStatic.nixVersions.${self_attribute_name};



      # Basic smoke test that needs to pass when upgrading nix.

      # Note that this test does only test the nixVersions.stable attribute.

      misc = nixosTests.nix-misc.default;

      upgrade = nixosTests.nix-upgrade;



      srcVersion = runCommand "nix-src-version" {

        inherit version;

      } ''
@@ -291,6 +283,16 @@ self = stdenv.mkDerivation { 
        inherit lib pkgs;

        nix = self;

      };

    } // lib.optionalAttrs stdenv.isLinux {

      nixStatic = pkgsStatic.nixVersions.${self_attribute_name};



      # Basic smoke tests that needs to pass when upgrading nix.

      # Note that this test does only test the nixVersions.stable attribute.

      misc = nixosTests.nix-misc.default;

      upgrade = nixosTests.nix-upgrade;

      simpleUefiSystemdBoot = nixosTests.installer.simpleUefiSystemdBoot;

    } // lib.optionalAttrs (stdenv.hostPlatform.system == "x86_64-linux") {

      nixi686 = pkgsi686Linux.nixVersions.${self_attribute_name};

    };

  };