Unverified Commit 0de2568e authored by Doron Behar's avatar Doron Behar Committed by GitHub
Browse files

Merge pull request #296217 from doronbehar/pkg/libtins 

libtins: 4.4 -> 4.5
parents 562bf338 113f140a

pkgs/applications/networking/compactor/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec { 


  src = fetchFromGitHub {

    owner = "dns-stats";

    repo = pname;

    repo = "compactor";

    rev = version;

    fetchSubmodules = true;

    hash = "sha256-5Z14suhO5ghhmZsSj4DsSoKm+ct2gQFO6qxhjmx4Xm4=";
@@ -68,7 +68,7 @@ stdenv.mkDerivation rec { 
  meta = with lib; {

    description = "Tools to capture DNS traffic and record it in C-DNS files";

    homepage    = "https://dns-stats.org/";

    changelog   = "https://github.com/dns-stats/${pname}/raw/${version}/ChangeLog.txt";

    changelog   = "https://github.com/dns-stats/compactor/raw/${version}/ChangeLog.txt";

    license     = licenses.mpl20;

    maintainers = with maintainers; [ fdns ];

    platforms   = platforms.unix;

pkgs/development/libraries/libtins/default.nix

+5 −12
Original line number Diff line number Diff line 
{ 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+.

    # Required for gtest 1.13+, see also upstream report at:

    # https://github.com/mfontanini/libtins/issues/529

    ./0001-force-cpp-14.patch

  ];