Merge branch master into haskell-updates

Conflicts from #341407 resolved.

1 files changed, 3 insertions, 3 deletions

diff --git a/pkgs/tools/admin/acme-sh/default.nix b/pkgs/tools/admin/acme-sh/default.nix
index e7fbb962c831..055f6a5b6167 100644
--- a/pkgs/tools/admin/acme-sh/default.nix
+++ b/pkgs/tools/admin/acme-sh/default.nix
@@ -15,13 +15,13 @@
 
 stdenv.mkDerivation rec {
   pname = "acme.sh";
-  version = "3.0.7";
+  version = "3.0.8";
 
   src = fetchFromGitHub {
     owner = "acmesh-official";
     repo = "acme.sh";
     rev = "refs/tags/${version}";
-    hash = "sha256-ymj97aWWOLen7YEfG72N2nyxlwuB/Su4+pgpWUuckgc=";
+    hash = "sha256-RFybUjBRrpnNCEVKmix2EPiIXrq8p+v4zJaI14NFQQ0=";
   };
 
   nativeBuildInputs = [
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
       gnused
       openssl
       socat
-      (if stdenv.isLinux then iproute2 else unixtools.netstat)
+      (if stdenv.hostPlatform.isLinux then iproute2 else unixtools.netstat)
     ];
   in
     ''