about summary refs log tree commit diff
path: root/pkgs/test
diff options
context:
space:
mode:
authorgithub-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>2023-08-15 06:01:24 +0000
committerGitHub <noreply@github.com>2023-08-15 06:01:24 +0000
commitdf770ba961e1ddac2407cce53fe67454d38894e2 (patch)
treecb71210f513936043393bc3945b4b279a4d09b4d /pkgs/test
parentbb945f3cea0f2d2fa2812381262fc90f6211730c (diff)
parentb51db7ec1be773cc478a3f7060e04721f2a5c881 (diff)
Merge master into staging-next
Diffstat (limited to 'pkgs/test')
-rw-r--r--pkgs/test/cross/default.nix4
1 files changed, 3 insertions, 1 deletions
diff --git a/pkgs/test/cross/default.nix b/pkgs/test/cross/default.nix
index 46bb3c8d522d2..d6fd8d3b1f80c 100644
--- a/pkgs/test/cross/default.nix
+++ b/pkgs/test/cross/default.nix
@@ -115,6 +115,7 @@ let
   in
     pkgs.runCommand "test-mbuffer" {} ''
       echo hello | ${emulator} ${mbuffer}/bin/mbuffer
+      touch $out
     '';
 
   # This is meant to be a carefully curated list of builds/packages
@@ -127,13 +128,14 @@ let
   # of things that often break.  So, no buckshot `mapTestOnCross`
   # calls here.
   sanity = [
-    #pkgs.mbuffer              # https://github.com/NixOS/nixpkgs/issues/213453
+    mbuffer
     #pkgs.pkgsCross.gnu64.bash # https://github.com/NixOS/nixpkgs/issues/243164
     pkgs.gcc_multi.cc
     pkgs.pkgsMusl.stdenv
     pkgs.pkgsLLVM.stdenv
     pkgs.pkgsStatic.bash
     pkgs.pkgsCross.arm-embedded.stdenv
+    pkgs.pkgsCross.armv7l-hf-multiplatform.stdenv
     pkgs.pkgsCross.m68k.stdenv
     pkgs.pkgsCross.aarch64-multiplatform.pkgsBuildTarget.gcc
     pkgs.pkgsCross.powernv.pkgsBuildTarget.gcc