diff options
| author | Artturin <Artturin@artturin.com> | 2023-01-17 04:20:36 +0200 |
|---|---|---|
| committer | Artturin <Artturin@artturin.com> | 2023-02-17 22:23:33 +0200 |
| commit | 8876a5c91faf35e37e08d647dd6e9ea9d4a4f79f (patch) | |
| tree | 0a4a5f066933cb1a9c1c9fb870a14542295fa2f5 /pkgs/test | |
| parent | 792907e3bf429784a42ca57805025f2737c98eed (diff) | |
| download | nixpkgs-8876a5c91faf35e37e08d647dd6e9ea9d4a4f79f.tar nixpkgs-8876a5c91faf35e37e08d647dd6e9ea9d4a4f79f.tar.gz nixpkgs-8876a5c91faf35e37e08d647dd6e9ea9d4a4f79f.tar.bz2 nixpkgs-8876a5c91faf35e37e08d647dd6e9ea9d4a4f79f.tar.lz nixpkgs-8876a5c91faf35e37e08d647dd6e9ea9d4a4f79f.tar.xz nixpkgs-8876a5c91faf35e37e08d647dd6e9ea9d4a4f79f.tar.zst nixpkgs-8876a5c91faf35e37e08d647dd6e9ea9d4a4f79f.zip | |
tests.stdenv: move patch-shebangs test
Diffstat (limited to 'pkgs/test')
| -rw-r--r-- | pkgs/test/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/test/stdenv/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/test/stdenv/hooks.nix | 4 | ||||
| -rw-r--r-- | pkgs/test/stdenv/patch-shebangs.nix (renamed from pkgs/test/patch-shebangs/default.nix) | 0 |
4 files changed, 4 insertions, 6 deletions
diff --git a/pkgs/test/default.nix b/pkgs/test/default.nix index 71d065179d1..5d154d1630b 100644 --- a/pkgs/test/default.nix +++ b/pkgs/test/default.nix @@ -63,8 +63,6 @@ with pkgs; overriding = callPackage ./overriding.nix { }; - patch-shebangs = callPackage ./patch-shebangs {}; - texlive = callPackage ./texlive {}; cuda = callPackage ./cuda { }; diff --git a/pkgs/test/stdenv/default.nix b/pkgs/test/stdenv/default.nix index bad6eb7ba7a..91964213bbc 100644 --- a/pkgs/test/stdenv/default.nix +++ b/pkgs/test/stdenv/default.nix @@ -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"; diff --git a/pkgs/test/stdenv/hooks.nix b/pkgs/test/stdenv/hooks.nix index 3d72efae6c4..eb1b3f61bda 100644 --- a/pkgs/test/stdenv/hooks.nix +++ b/pkgs/test/stdenv/hooks.nix @@ -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" '' diff --git a/pkgs/test/patch-shebangs/default.nix b/pkgs/test/stdenv/patch-shebangs.nix index 5c49787eee3..5c49787eee3 100644 --- a/pkgs/test/patch-shebangs/default.nix +++ b/pkgs/test/stdenv/patch-shebangs.nix |