Merge staging-next into staging

pkgs/tools/archivers/arc_unpacker/add-missing-import.patch

@@ -0,0 +1,22 @@
+From 29c0b393283395c69ecdd747e960301e95c93bcf Mon Sep 17 00:00:00 2001
+From: Felix Rath <felixm.rath@gmail.com>
+Date: Sat, 15 May 2021 13:07:38 +0200
+Subject: [PATCH] add missing <stdexcept> import
+
+`std::logic_error` is used in this file, which resides in `<stdexcept>`, but was not imported before. This caused the build to fail, see, e.g., https://hydra.nixos.org/build/141997371/log.
+---
+ src/algo/crypt/lcg.cc | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/algo/crypt/lcg.cc b/src/algo/crypt/lcg.cc
+index 6c2a7945..66630a08 100644
+--- a/src/algo/crypt/lcg.cc
++++ b/src/algo/crypt/lcg.cc
+@@ -17,6 +17,7 @@
+ 
+ #include "algo/crypt/lcg.h"
+ #include <functional>
++#include <stdexcept>
+ 
+ using namespace au;
+ using namespace au::algo::crypt;

pkgs/tools/archivers/arc_unpacker/default.nix

@@ -18,22 +18,37 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ cmake makeWrapper catch ];
   buildInputs = [ boost libpng libjpeg zlib openssl libwebp ];
 
+  patches = [
+    # Add a missing `<stdexcept>` import that caused the build to fail.
+    # Failure: https://hydra.nixos.org/build/141997371/log
+    # Also submitted as an upstream PR: https://github.com/vn-tools/arc_unpacker/pull/194
+    ./add-missing-import.patch
+  ];
+
   postPatch = ''
     cp ${catch}/include/catch/catch.hpp tests/test_support/catch.h
   '';
 
   checkPhase = ''
+    runHook preCheck
+
     pushd ..
     ./build/run_tests
     popd
+
+    runHook postCheck
   '';
 
   installPhase = ''
+    runHook preInstall
+
     mkdir -p $out/bin $out/share/doc/arc_unpacker $out/libexec/arc_unpacker
     cp arc_unpacker $out/libexec/arc_unpacker/arc_unpacker
     cp ../GAMELIST.{htm,js} $out/share/doc/arc_unpacker
     cp -r ../etc $out/libexec/arc_unpacker
     makeWrapper $out/libexec/arc_unpacker/arc_unpacker $out/bin/arc_unpacker
+
+    runHook postInstall
   '';
 
   doCheck = true;
@@ -41,7 +56,7 @@ stdenv.mkDerivation rec {
   meta = with lib; {
     description = "A tool to extract files from visual novel archives";
     homepage = "https://github.com/vn-tools/arc_unpacker";
-    license = licenses.gpl3;
+    license = licenses.gpl3Plus;
     maintainers = with maintainers; [ midchildan ];
   };
 }

pkgs/tools/graphics/agi/default.nix

@@ -14,11 +14,11 @@
 
 stdenv.mkDerivation rec {
   pname = "agi";
-  version = "1.1.0-dev-20210507";
+  version = "1.1.0-dev-20210513";
 
   src = fetchzip {
     url = "https://github.com/google/agi-dev-releases/releases/download/v${version}/agi-${version}-linux.zip";
-    sha256 = "sha256-Tbxbsh40Lel4kGnCIWyNRge15Y71ao+oUixClBdj4f4=";
+    sha256 = "sha256-epDwZpdyPreufPwiSFadmMjtZ9nq9mQsQt+Asm5rx8Y=";
   };
 
   nativeBuildInputs = [

pkgs/tools/networking/croc/default.nix

@@ -2,13 +2,13 @@
 
 buildGoModule rec {
   pname = "croc";
-  version = "9.1.3";
+  version = "9.1.4";
 
   src = fetchFromGitHub {
     owner = "schollz";
     repo = pname;
     rev = "v${version}";
-    sha256 = "rVR2KfrK7M74kZUm5q23Lbj7hTLCN+p12RBaf3JAEXM=";
+    sha256 = "16HmRluhqCr6Gt+x8PSCU4W9pUJp89l4GO29uI+ZzkI=";
   };
 
   vendorSha256 = "sha256-f0KiXHspGX96k5ViCwI62Qs+rHowpqm+gLy7/iqdnE4=";

pkgs/tools/networking/getmail6/default.nix

@@ -2,13 +2,13 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "getmail6";
-  version = "6.15";
+  version = "6.16";
 
   src = fetchFromGitHub {
     owner = pname;
     repo = pname;
     rev = "v${version}";
-    sha256 = "0cvwvlhilrqlcvza06lsrm5l1yazzvym3s5kcjxcm9cminfaf4qb";
+    sha256 = "1y373nzbffjjjs43441cn3wrb0yq1mw2vqixhizbzdacrs45xbfa";
   };
 
   doCheck = false;