Merge master into staging-next

This commit is contained in:
github-actions[bot]
2021-02-18 06:16:42 +00:00
committed by GitHub
44 changed files with 299 additions and 154 deletions
+3 -3
View File
@@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "topgrade";
version = "6.5.1";
version = "6.5.2";
src = fetchFromGitHub {
owner = "r-darwish";
repo = pname;
rev = "v${version}";
sha256 = "sha256-5S9mKmnrycrL7DFq8duWVbzEHQfiXAXQYcc3bdiVu1k=";
sha256 = "sha256-7tgYVxZ4E6qi/HLgfC0ZreHuXgtd3JMg4ENQL50YWr4=";
};
cargoSha256 = "0sbkqdwfsfb7q52a9vh5lmggrc8ny2l0xr4qx3m42xm0h64f3y6n";
cargoSha256 = "sha256-xxJfNFegvtHJno7o54Rqai9DvvffrkxTFci673Yq/NI=";
buildInputs = lib.optional stdenv.isDarwin Foundation;
@@ -32,8 +32,6 @@ stdenv.mkDerivation rec {
buildInputs = [ pythonPackages.python qtbase qtgraphicaleffects qtquickcontrols qtquickcontrols2 pyotherside ];
enableParallelBuilding = true;
pythonPath = [ yubikey-manager ];
dontWrapQtApps = true;