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
base: 2121897d1209
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: d0c0f0d737a5
Choose a head ref
  • 1 commit
  • 2 files changed
  • 1 contributor

Commits on Sep 19, 2019

  1. ntopng: Add patch needed to build with newer libpcap

    Fixes build errors for the third-party mongoose module:
    ```
    In file included from
    /nix/store/r5s3w32ahjzdlzsfrhybc3l2qcpi6yb2-libpcap-1.9.0/include/pcap.h:43,
                     from /build/ntopng-2.0/include/ntop_includes.h:93,
                                      from src/HTTPserver.cpp:22:
    /nix/store/r5s3w32ahjzdlzsfrhybc3l2qcpi6yb2-libpcap-1.9.0/include/pcap/pcap.h:958: note: this is the location of the previous definition
       #define INVALID_SOCKET -1
    
    src/../third-party/mongoose/mongoose.c:270:13: error: multiple types in one declaration
     typedef int SOCKET;
                 ^~~~~~
    ```
    avdv authored and Matthieu Coudron committed Sep 19, 2019
    Copy the full SHA
    d0c0f0d View commit details
    Browse the repository at this point in the history