Merge pull request #44447 from NixOS/staging-next

Staging next
2018-08-09 09:04:03 +02:00
parent 12c05697b5 94e608d587
commit 786cbba7be
22 changed files with 278 additions and 222 deletions
@@ -21,7 +21,6 @@ stdenv.mkDerivation rec {
    description = "Pretty small HTTP server - a command-line tool to share files";
    homepage = https://github.com/mgorny/pshs;
    license = stdenv.lib.licenses.bsd3;
-    maintainers = [ stdenv.lib.maintainers.eduarrrd ];
    platforms = stdenv.lib.platforms.linux;
  };
 }