diff options
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/libtins/default.nix')
-rw-r--r-- | nixpkgs/pkgs/development/libraries/libtins/default.nix | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/nixpkgs/pkgs/development/libraries/libtins/default.nix b/nixpkgs/pkgs/development/libraries/libtins/default.nix index b27ad6634797..6f195615551f 100644 --- a/nixpkgs/pkgs/development/libraries/libtins/default.nix +++ b/nixpkgs/pkgs/development/libraries/libtins/default.nix @@ -1,25 +1,20 @@ -{ boost, cmake, fetchFromGitHub, fetchpatch, gtest, libpcap, openssl, lib, stdenv }: +{ boost, cmake, fetchFromGitHub, gtest, libpcap, openssl, lib, stdenv }: stdenv.mkDerivation rec { pname = "libtins"; - version = "4.4"; + version = "4.5"; src = fetchFromGitHub { owner = "mfontanini"; repo = pname; rev = "v${version}"; - sha256 = "sha256-mXbinXh/CO0SZZ71+K+FozbHCCoi12+AIa2o+P0QmUw="; + sha256 = "sha256-zL4C2Cgs9Y3NebL8MPQBO5j8Bm6xhl8ZggQBPJLRn0o="; }; patches = [ - # Pull gcc-13 fixes: - # https://github.com/mfontanini/libtins/pull/496 - # TODO: remove when upgrade to the next version. - (fetchpatch { - name = "gcc-13.patch"; - url = "https://github.com/mfontanini/libtins/commit/812be7966d445ec56e88eab512f8fd2d57152427.patch"; - hash = "sha256-5RCFPe95r1CBrAocjTPR2SvUlgaGa1aBc8RazyxUj3M="; - }) + # Required for gtest 1.13+, see also upstream report at: + # https://github.com/mfontanini/libtins/issues/529 + ./0001-force-cpp-14.patch ]; postPatch = '' |