Merge master into staging-next

2021-04-19 18:11:51 +00:00
parent 965c8e08a5 b26886474a
commit 6ef7c23763
54 changed files with 512 additions and 279 deletions
@@ -139,7 +139,7 @@ let

      # Utility flags to test the type of platform.
      inherit (hostPlatform)
-        isDarwin isLinux isSunOS isCygwin isFreeBSD isOpenBSD
+        isDarwin isLinux isSunOS isCygwin isBSD isFreeBSD isOpenBSD
        isi686 isx86_32 isx86_64
        is32bit is64bit
        isAarch32 isAarch64 isMips isBigEndian;