Merge master into staging-next

2021-05-15 12:25:33 +00:00
parent 13295e7f55 5d176f3c20
commit ec10b0958d
20 changed files with 239 additions and 164 deletions
@@ -605,7 +605,7 @@ self: super: {
            libiconv
          ];

-          cargoSha256 = "sha256-Jy8ThtcdPV4fMGcQbJJnibwb3o5iEHNn54831OI9adc=";
+          cargoSha256 = "16fhiv6qmf7dv968jyybkgs1wkphy383s78g8w5wnz4i0czld8dq";
        };
      in
      ''