Merge master into staging-next

This commit is contained in:
github-actions[bot]
2021-05-17 06:22:23 +00:00
committed by GitHub
154 changed files with 1062 additions and 1089 deletions

View File

@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "The httperf HTTP load generator";
homepage = "https://github.com/httperf/httperf";
maintainers = with maintainers; [ nand0p ];
maintainers = with maintainers; [ ];
license = licenses.gpl2;
platforms = platforms.all;
};

View File

@@ -27,7 +27,7 @@ in stdenv.mkDerivation rec {
description = "WebDav server implementation and library using libsoup";
homepage = "https://wiki.gnome.org/phodav";
license = licenses.lgpl21;
maintainers = with maintainers; [ gnidorah ];
maintainers = with maintainers; [ ];
platforms = platforms.linux;
};
}