Merge master into staging-next

2022-12-01 18:01:25 +00:00
parent 5d71fe0cdb 4c5c40f176
commit 237453e7f7
82 changed files with 645 additions and 423 deletions
@@ -65,7 +65,7 @@ let
  manylinux1Libs = getLibOutputs(manylinux2010Libs // (with pkgs; {
    "libpanelw.so.5" = ncurses5;
    "libncursesw.so.5" = ncurses5;
-    "libcrypt.so.1" = glibc;
+    "libcrypt.so.1" = libxcrypt;
    }));

 in {