swendel/nixpkgs
1
0
Fork 0
mirror of https://github.com/SebastianWendel/nixpkgs.git synced 2024-09-20 04:19:00 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #296217 from doronbehar/pkg/libtins

Browse source 
libtins: 4.4 -> 4.5
This commit is contained in:
Doron Behar 2024-03-17 10:52:28 +02:00 committed by GitHub
parent 562bf3389f 113f140a15
commit 0de2568ed4
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 7 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkgs/applications/networking/compactor/default.nix
View file

@ -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;

17
pkgs/development/libraries/libtins/default.nix
View file

@ -1,26 +1,19 @@
{ 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
];