JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tests.stdenv: move patch-shebangs test

Browse Source
This commit is contained in:
Artturin 2023-01-17 04:20:36 +02:00
parent 792907e3bf
commit 8876a5c91f
5 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/test/default.nix
View File

@ -63,8 +63,6 @@ with pkgs;
overriding = callPackage ./overriding.nix { };
patch-shebangs = callPackage ./patch-shebangs {};
texlive = callPackage ./texlive {};
cuda = callPackage ./cuda { };

4
pkgs/test/stdenv/default.nix
View File

@ -98,7 +98,7 @@ in
{
# tests for hooks in `stdenv.defaultNativeBuildInputs`
hooks = lib.recurseIntoAttrs (import ./hooks.nix { stdenv = bootStdenv; pkgs = earlyPkgs; });
hooks = lib.recurseIntoAttrs (import ./hooks.nix { stdenv = bootStdenv; pkgs = earlyPkgs; inherit lib; });
outputs-no-out = runCommand "outputs-no-out-assert" {
result = testers.testBuildFailure (stdenv.mkDerivation {
@ -158,7 +158,7 @@ in
structuredAttrsByDefault = lib.recurseIntoAttrs {
hooks = lib.recurseIntoAttrs (import ./hooks.nix { stdenv = bootStdenvStructuredAttrsByDefault; pkgs = earlyPkgs; });
hooks = lib.recurseIntoAttrs (import ./hooks.nix { stdenv = bootStdenvStructuredAttrsByDefault; pkgs = earlyPkgs; inherit lib; });
test-cc-wrapper-substitutions = ccWrapperSubstitutionsTest {
name = "test-cc-wrapper-substitutions-structuredAttrsByDefault";

4
pkgs/test/stdenv/hooks.nix
View File

@ -1,4 +1,4 @@
{ stdenv, pkgs }:
{ stdenv, pkgs, lib }:
# ordering should match defaultNativeBuildInputs
@ -91,7 +91,7 @@
'';
};
# TODO: add multiple-outputs
# TODO: move patch-shebangs test from pkgs/test/patch-shebangs/default.nix to here
patch-shebangs = import ./patch-shebangs.nix { inherit stdenv lib pkgs; };
prune-libtool-files =
let
libFoo = pkgs.writeText "libFoo" ''

0
pkgs/test/patch-shebangs/default.nix → pkgs/test/stdenv/patch-shebangs.nix
View File

6
pkgs/top-level/release.nix
View File

@ -82,7 +82,7 @@ let
jobs.tests.cc-wrapper-libcxx.x86_64-darwin
jobs.tests.stdenv-inputs.x86_64-darwin
jobs.tests.macOSSierraShared.x86_64-darwin
jobs.tests.patch-shebangs.x86_64-darwin
jobs.tests.stdenv.hooks.patch-shebangs.x86_64-darwin
*/
];
} else null;
@ -127,7 +127,7 @@ let
jobs.tests.cc-multilib-gcc.x86_64-linux
jobs.tests.cc-multilib-clang.x86_64-linux
jobs.tests.stdenv-inputs.x86_64-linux
jobs.tests.patch-shebangs.x86_64-linux
jobs.tests.stdenv.hooks.patch-shebangs.x86_64-linux
*/
]
# FIXME: reintroduce aarch64-darwin after this builds again
@ -158,7 +158,7 @@ let
jobs.tests.cc-wrapper-libcxx-6.x86_64-darwin
jobs.tests.stdenv-inputs.x86_64-darwin
jobs.tests.macOSSierraShared.x86_64-darwin
jobs.tests.patch-shebangs.x86_64-darwin
jobs.tests.stdenv.hooks.patch-shebangs.x86_64-darwin
*/
];
};