nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-25 08:23:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

nixosTests.docker-tools-nix-shell: Enable on aarch64-linux

Browse Source 
The docker-tools test, where this originates, was not run on aarch64-linux, but this is an artifact of its age more so than anything else.

Co-authored-by: Ivan Trubach <mr.trubach@icloud.com>
This commit is contained in:
Robert Hensing 2024-07-28 22:52:11 +02:00 committed by Robert Hensing
parent 32c9e3193c
commit b5389e2ae9
2 changed files with 3 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nixos/tests/all-tests.nix
View File

@ -264,7 +264,7 @@ in {
docker-rootless = handleTestOn ["aarch64-linux" "x86_64-linux"] ./docker-rootless.nix {}; docker-rootless = handleTestOn ["aarch64-linux" "x86_64-linux"] ./docker-rootless.nix {};
docker-registry = handleTest ./docker-registry.nix {}; docker-registry = handleTest ./docker-registry.nix {};
docker-tools = handleTestOn ["x86_64-linux"] ./docker-tools.nix {}; docker-tools = handleTestOn ["x86_64-linux"] ./docker-tools.nix {};
docker-tools-nix-shell = runTestOn ["x86_64-linux"] ./docker-tools-nix-shell.nix; docker-tools-nix-shell = runTest ./docker-tools-nix-shell.nix;
docker-tools-cross = handleTestOn ["x86_64-linux" "aarch64-linux"] ./docker-tools-cross.nix {}; docker-tools-cross = handleTestOn ["x86_64-linux" "aarch64-linux"] ./docker-tools-cross.nix {};
docker-tools-overlay = handleTestOn ["x86_64-linux"] ./docker-tools-overlay.nix {}; docker-tools-overlay = handleTestOn ["x86_64-linux"] ./docker-tools-overlay.nix {};
documize = handleTest ./documize.nix {}; documize = handleTest ./documize.nix {};

14
pkgs/build-support/dev-shell-tools/tests/default.nix
View File

@ -13,23 +13,13 @@ let
concatLines concatLines
escapeShellArg escapeShellArg
isString isString
mapAttrs
mapAttrsToList mapAttrsToList
; ;
in in
lib.recurseIntoAttrs { lib.recurseIntoAttrs {
nixos = lib.recurseIntoAttrs ( # nix-build -A tests.devShellTools.nixos
# This should have been a simple optioanlAttrs, but release.nix is very picky. nixos = nixosTests.docker-tools-nix-shell;
# > cannot find attribute `tests.devShellTools.nixos.docker-tools-nix-shell'
let
tests = {
inherit (nixosTests) docker-tools-nix-shell;
};
in
if stdenv.hostPlatform.system == "x86_64-linux" then tests else
mapAttrs (k: v: emptyFile) tests
);
# nix-build -A tests.devShellTools.valueToString # nix-build -A tests.devShellTools.valueToString
valueToString = valueToString =