From b5389e2ae9cef0dfacbdb0aad492f39d6b9397b7 Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Sun, 28 Jul 2024 22:52:11 +0200 Subject: [PATCH] nixosTests.docker-tools-nix-shell: Enable on aarch64-linux 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 --- nixos/tests/all-tests.nix | 2 +- .../dev-shell-tools/tests/default.nix | 14 ++------------ 2 files changed, 3 insertions(+), 13 deletions(-) diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index e7d6b7a6290d..b69b22c15b85 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -264,7 +264,7 @@ in { docker-rootless = handleTestOn ["aarch64-linux" "x86_64-linux"] ./docker-rootless.nix {}; docker-registry = handleTest ./docker-registry.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-overlay = handleTestOn ["x86_64-linux"] ./docker-tools-overlay.nix {}; documize = handleTest ./documize.nix {}; diff --git a/pkgs/build-support/dev-shell-tools/tests/default.nix b/pkgs/build-support/dev-shell-tools/tests/default.nix index fa52a20e8b89..06ef7e393e32 100644 --- a/pkgs/build-support/dev-shell-tools/tests/default.nix +++ b/pkgs/build-support/dev-shell-tools/tests/default.nix @@ -13,23 +13,13 @@ let concatLines escapeShellArg isString - mapAttrs mapAttrsToList ; in lib.recurseIntoAttrs { - nixos = lib.recurseIntoAttrs ( - # This should have been a simple optioanlAttrs, but release.nix is very picky. - # > 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.nixos + nixos = nixosTests.docker-tools-nix-shell; # nix-build -A tests.devShellTools.valueToString valueToString =