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
@@ -5,11 +5,11 @@
stdenv.mkDerivation rec {
pname = "avocode";
version = "4.12.0";
version = "4.14.0";
src = fetchurl {
url = "https://media.avocode.com/download/avocode-app/${version}/avocode-${version}-linux.zip";
sha256 = "sha256-qbG0Ii3Xmj1UGGS+n+LdiNPAHBkpQZMGEzrDvOcaUNA=";
sha256 = "sha256-BDW87UVN1Jub0sJFvtkZr5ssz835Yf2CNn5kHCn70cE=";
};
libPath = lib.makeLibraryPath (with xorg; [
@@ -37,16 +37,16 @@ let
in
rustPlatform.buildRustPackage rec {
pname = "emulsion";
version = "8.0";
version = "9.0";
src = fetchFromGitHub {
owner = "ArturKovacs";
repo = pname;
rev = "v${version}";
sha256 = "sha256-xv3q59HobunrFyc+CPLztpsQd20Eu4+JI+iYhlGI0bc=";
sha256 = "sha256-Cdi+PQDHxMQG7t7iwDi6UWfDwQjjA2yiOf9p/ahBlOw=";
};
cargoSha256 = "sha256-+jJMi3uBpvKYegURFyAV3TfP8eX4xRxgL4WGew7WMws=";
cargoSha256 = "sha256-2wiLamnGqACx1r4WJbWPCN3tvhww/rRWz8fcvAbjYE0=";
nativeBuildInputs = [
installShellFiles
@@ -38,7 +38,7 @@ let
}
// attrs
// {
name = "${gimp.name}-plugin-${name}";
name = "${gimp.pname}-plugin-${name}";
buildInputs = [
gimp
gimp.gtk