Merge master into staging-next

2023-02-12 16:02:45 +00:00
parent d381e51fb5 8d4db5e081
commit 87f957b5e2
35 changed files with 1155 additions and 1154 deletions
@@ -12,6 +12,8 @@
 , withDocs ? false
 , texinfo
 , forFHSEnv ? false
+
+, pkgsStatic
 }:

 let
@@ -116,6 +118,7 @@ stdenv.mkDerivation rec {

  passthru = {
    shellPath = "/bin/bash";
+    tests.static = pkgsStatic.bash;
  };

  meta = with lib; {