Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: f9a35507778b
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: da297ef8aa77
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Dec 4, 2018

  1. libpcap: 1.8.1 -> 1.9.0 

    * libpcap to 1.8.1 -> 1.9.0 (#51216)
Changelog: http://www.tcpdump.org/libpcap-changes.txt

* libpcap: refresh meta.homepage
and fix SHA hash
    @locallycompact @c0bw3b
    locallycompact authored and c0bw3b committed Dec 4, 2018
    Copy the full SHA
    da297ef View commit details
Showing with 4 additions and 20 deletions.
  1. +4 −20 pkgs/development/libraries/libpcap/default.nix
24 changes: 4 additions & 20 deletions pkgs/development/libraries/libpcap/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, fetchpatch, flex, bison }:
{ stdenv, fetchurl, flex, bison }:

stdenv.mkDerivation rec {
name = "libpcap-1.8.1";
name = "libpcap-1.9.0";

src = fetchurl {
url = "https://www.tcpdump.org/release/${name}.tar.gz";
sha256 = "07jlhc66z76dipj4j5v3dig8x6h3k6cb36kmnmpsixf3zmlvqgb7";
sha256 = "06bhydl4vr4z9c3vahl76f2j96z1fbrcl7wwismgs4sris08inrf";
};

nativeBuildInputs = [ flex bison ];
@@ -27,26 +27,10 @@ stdenv.mkDerivation rec {
substituteInPlace configure --replace " -arch i386" ""
'';

patches = [
(fetchpatch {
url = "https://sources.debian.net/data/main/libp/libpcap/1.8.1-3/debian/patches/disable-remote.diff";
sha256 = "0dvjax9c0spvq8cdjnkbnm65wlzaml259yragf95kzg611vszfmj";
})
# See https://github.com/wjt/bustle/commit/f62cf6bfa662af4ae39effbbd4891bc619e3b4e9
(fetchpatch {
url = "https://github.com/the-tcpdump-group/libpcap/commit/2be9c29d45fb1fab8e9549342a30c160b7dea3e1.patch";
sha256 = "1g8mh942vr0abn48g0bdvi4gmhq1bz0l80276603y7064qhy3wq5";
})
(fetchpatch {
url = "https://github.com/the-tcpdump-group/libpcap/commit/1a6b088a88886eac782008f37a7219a32b86da45.patch";
sha256 = "1n5ylm7ch3i1lh4y2q16b0vabgym8g8mqiqxpqcdkjdn05c1wflr";
})
];

preInstall = ''mkdir -p $out/bin'';

meta = with stdenv.lib; {
homepage = http://www.tcpdump.org;
homepage = https://www.tcpdump.org;
description = "Packet Capture Library";
platforms = platforms.unix;
maintainers = with maintainers; [ fpletz ];