Commit 9e568d61 authored by jopejoe1's avatar jopejoe1
Browse files

tests.stdenv: migrate tests-stdenv-gcc-stageCompare from all-packages

parent d0f58c54

nixos/release-small.nix

+6 −2
Original line number Diff line number Diff line
@@ -110,9 +110,13 @@ rec { 
      subversion

      tarball

      vim

      ;

    tests.stdenv = {

      inherit (nixpkgs'.tests.stdenv)

        tests-stdenv-gcc-stageCompare

        ;

    };

  };



  tested =

    let
@@ -163,7 +167,7 @@ rec { 
          "nixos.tests.proxy"

          "nixos.tests.simple"

          "nixpkgs.jdk"

          "nixpkgs.tests-stdenv-gcc-stageCompare"

          "nixpkgs.tetsts.stdenv.tests-stdenv-gcc-stageCompare"

          "nixpkgs.opensshTest"

        ])

      ];

pkgs/test/stdenv/default.nix

+2 −0
Original line number Diff line number Diff line
@@ -452,6 +452,8 @@ in 
    stdenv' = bootStdenv;

  };



  tests-stdenv-gcc-stageCompare = pkgs.callPackage ./gcc-stageCompare.nix { };



  ensure-no-execve-in-setup-sh =

    derivation {

      name = "ensure-no-execve-in-setup-sh";

pkgs/top-level/all-packages.nix

+0 −2
Original line number Diff line number Diff line
@@ -11825,8 +11825,6 @@ with pkgs; 


  twmn = libsForQt5.callPackage ../applications/misc/twmn { };



  tests-stdenv-gcc-stageCompare = callPackage ../test/stdenv/gcc-stageCompare.nix { };



  twinkle = qt5.callPackage ../applications/networking/instant-messengers/twinkle { };



  linphonePackages = recurseIntoAttrs (

pkgs/top-level/release-small.nix

+1 −1
Original line number Diff line number Diff line
@@ -175,5 +175,5 @@ in 
  xfsprogs = linux;

  xkeyboard_config = linux;

  zip = all;

  tests-stdenv-gcc-stageCompare = linux;

  tests.stdenv.tests-stdenv-gcc-stageCompare = linux;

})