4 Commits

Author	SHA1	Message	Date
Jonathan Ringer	f7a112f6c4	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	2021-05-18 08:57:16 -07:00
Stéphan Kochen	049d5a7219	pactorio: fix darwin build	2021-05-18 11:39:57 +02:00
Daniël de Kok	85f96822a0	treewide: fix cargoSha256/cargoHash ... Rust 1.50.0 incorporated a Cargo change (rust-lang/cargo#8937) in which cargo vendor erroneously changed permissions of vendored crates. This was fixed in Rust 1.51.0 (rust-lang/cargo#9131). Unfortunately, this means that all cargoSha256/cargoHashes produced during the Rust 1.50.0 cycle are potentially broken. This change updates cargoSha256/cargoHash tree-wide. Fixes #121994.	2021-05-08 00:36:37 -07:00
figsoda	184494bc5a	pactorio: init at 0.5.1	2021-02-25 15:30:58 -05:00