Merge remote-tracking branch 'origin/master' into staging-next

Conflicts:
  pkgs/applications/graphics/emulsion/default.nix
  pkgs/development/tools/misc/texlab/default.nix
  pkgs/development/tools/rust/bindgen/default.nix
  pkgs/development/tools/rust/cargo-udeps/default.nix
  pkgs/misc/emulators/ruffle/default.nix
  pkgs/tools/misc/code-minimap/default.nix
This commit is contained in:
Jonathan Ringer
2021-05-18 08:57:16 -07:00
264 changed files with 3781 additions and 1606 deletions
+3 -3
View File
@@ -13,13 +13,13 @@
rustPlatform.buildRustPackage rec {
pname = "ruffle";
version = "nightly-2021-04-02";
version = "nightly-2021-05-14";
src = fetchFromGitHub {
owner = "ruffle-rs";
repo = pname;
rev = version;
sha256 = "1diz94y53hvii28894zz65aya12v8yw1864lqpkrdbj67yc6ykdj";
sha256 = "15azv8y7a4sgxvvhl7z45jyxj91b4nn681vband5726c7znskhwl";
};
nativeBuildInputs = [
@@ -48,7 +48,7 @@ rustPlatform.buildRustPackage rec {
wrapProgram $out/bin/ruffle_desktop --prefix LD_LIBRARY_PATH ':' ${vulkan-loader}/lib
'';
cargoSha256 = "1ad7xf9h3v5h8jv5y304vxy32k52b0x2wkc3yqqf23sxky2sj843";
cargoSha256 = "0ihy4rgw9b4yqlqs87rx700h3a8wm02wpahhg7inic1lcag4bxif";
meta = with lib; {
description = "An Adobe Flash Player emulator written in the Rust programming language.";