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: 90effb5c70cd
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: e9322d43861f
Choose a head ref
  • 3 commits
  • 2 files changed
  • 2 contributors

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
    avdv committed Sep 19, 2019
    Copy the full SHA
    c4486a0 View commit details
    Browse the repository at this point in the history

  2. ntopng: Remove broken = true

    @avdv
    avdv committed Sep 19, 2019
    Copy the full SHA
    3b437eb View commit details
    Browse the repository at this point in the history

  3. Merge pull request #69080 from avdv/ntopng-zhf-fix 

    ntopng: Add patch needed to build with newer libpcap
    @teto
    teto committed Sep 19, 2019
    Copy the full SHA
    e9322d4 View commit details
    Browse the repository at this point in the history