From 6e6a32eb6fff37ec02df1610780aa6d959751acc Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Mon, 4 Mar 2024 22:05:50 +0000 Subject: [PATCH] zeroc-ice: 3.7.7 -> 3.7.10 Anong other things added support for `gcc-13` building without the need to inhibit warnings. --- pkgs/development/libraries/zeroc-ice/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/zeroc-ice/default.nix b/pkgs/development/libraries/zeroc-ice/default.nix index f62dec911d81..3ccb7c17f9c9 100644 --- a/pkgs/development/libraries/zeroc-ice/default.nix +++ b/pkgs/development/libraries/zeroc-ice/default.nix @@ -22,13 +22,13 @@ let in stdenv.mkDerivation rec { pname = "zeroc-ice"; - version = "3.7.7"; + version = "3.7.10"; src = fetchFromGitHub { owner = "zeroc-ice"; repo = "ice"; rev = "v${version}"; - sha256 = "sha256-h455isEmnRyoasXhh1UaA5PICcEEM8/C3IJf5yHRl5g="; + hash = "sha256-l3cKsR8HSdtFGw1S12xueQOu/U9ABlOxQQtbHBj2izs="; }; buildInputs = [ zeroc_mcpp bzip2 expat libedit lmdb openssl libxcrypt ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ae8cfef98c10..038cc88e8629 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -36543,7 +36543,7 @@ with pkgs; zerobin = callPackage ../applications/networking/zerobin { }; - zeroc-ice = disable-warnings-if-gcc13 (callPackage ../development/libraries/zeroc-ice { }); + zeroc-ice = callPackage ../development/libraries/zeroc-ice { }; zeroc-ice-cpp11 = zeroc-ice.override { cpp11 = true; };