Merge master into staging-next

2021-05-08 06:20:05 +00:00
parent 01bf147849 2af2325cf7
commit e21fb16f9a
26 changed files with 442 additions and 317 deletions
@@ -605,7 +605,7 @@ self: super: {
            libiconv
          ];

-          cargoSha256 = "1c8bwvwd23d7c3bk1ky1i8xgfz10dr8nqqcvp20g8rldjl8p2r08";
+          cargoSha256 = "sha256-Jy8ThtcdPV4fMGcQbJJnibwb3o5iEHNn54831OI9adc=";
        };
      in
      ''