Merge staging-next into staging

This commit is contained in:
github-actions[bot]
2021-05-01 18:26:21 +00:00
committed by GitHub
44 changed files with 1021 additions and 61 deletions
@@ -6,13 +6,13 @@
stdenv.mkDerivation rec {
pname = "android-udev-rules";
version = "20210302";
version = "20210425";
src = fetchFromGitHub {
owner = "M0Rf30";
repo = "android-udev-rules";
rev = version;
sha256 = "sha256-yIVHcaQAr2gKH/NZeN+vRmGS8OgyNeRsZkCYyqjsSsI=";
sha256 = "sha256-crNK6mZCCqD/Lm3rNtfH/4F48RuQCqHWP+qsTNVLOGY=";
};
installPhase = ''
+2 -2
View File
@@ -68,13 +68,13 @@ with lib;
stdenv.mkDerivation rec {
pname = "conky";
version = "1.12.1";
version = "1.12.2";
src = fetchFromGitHub {
owner = "brndnmtthws";
repo = "conky";
rev = "v${version}";
sha256 = "sha256-qQx9+Z1OAQlbHupflzHD5JV4NqedoF8A57F1+rPT3/o=";
sha256 = "sha256-x6bR5E5LIvKWiVM15IEoUgGas/hcRp3F/O4MTOhVPb8=";
};
postPatch = ''