diff options
| author | Weijia Wang <9713184+wegank@users.noreply.github.com> | 2024-05-13 11:26:18 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-05-13 11:26:18 +0200 |
| commit | fdb226bcbeb6f578cec6f608e41cc79ad440b3c8 (patch) | |
| tree | 2257ed516e878edb76c498247c64e82e09d16892 | |
| parent | 2b598dee5f450c635f848fe9fca4ffa049d1e896 (diff) | |
| parent | 0be087f1f3687b8a0ae595cae7d13c46811216b1 (diff) | |
Merge pull request #311130 from risicle/ris-clamav-1.2.3-r23.11
[23.11] clamav: 1.2.2 -> 1.2.3
| -rw-r--r-- | pkgs/tools/security/clamav/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 5 |
2 files changed, 5 insertions, 4 deletions
diff --git a/pkgs/tools/security/clamav/default.nix b/pkgs/tools/security/clamav/default.nix index c423aef04511d..3a3dcd2855985 100644 --- a/pkgs/tools/security/clamav/default.nix +++ b/pkgs/tools/security/clamav/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { pname = "clamav"; - version = "1.2.2"; + version = "1.2.3"; src = fetchurl { url = "https://www.clamav.net/downloads/production/${pname}-${version}.tar.gz"; - hash = "sha256-3oYS4BGwbxKvP4bjigrWq8W3T+WqVOenhGp6UWtMP/E="; + hash = "sha256-nPcjBDn1JowskHe8hySVtv5SxlJ09VmkXQzZF9fNGWA="; }; patches = [ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a755518a292fb..be626048bb85b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7193,8 +7193,9 @@ with pkgs; ckb-next = libsForQt5.callPackage ../tools/misc/ckb-next { }; - clamav = darwin.apple_sdk_11_0.callPackage ../tools/security/clamav { - inherit (darwin.apple_sdk_11_0.frameworks) Foundation; + clamav = callPackage ../tools/security/clamav { + stdenv = if stdenv.isDarwin then overrideSDK stdenv "11.0" else stdenv; + inherit (darwin.apple_sdk.frameworks) Foundation; }; client-ip-echo = callPackage ../servers/misc/client-ip-echo { }; |