Skip to content
This repository was archived by the owner on Apr 12, 2021. It is now read-only.
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-channels
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 9c19a2e51a83
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 4fd551ee2f12
Choose a head ref
  • 8 commits
  • 173 files changed
  • 4 contributors

Commits on Sep 18, 2019

  1. doc: Disable wrapping source

    Even a simple typo fix can result in a reflow of a whole paragraph, leading to illegible diffs. The majority of text editors supports wrapping the source code to a comfortable width so it makes sense to me to sacrifice the few that do not rather than the unfortunately line-oriented diff tools.
    
    (cherry picked from commit 641f635)
    jtojnar committed Sep 18, 2019

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    Ma27 Maximilian Bosch
    Copy the full SHA
    7909a8f View commit details
  2. nixos/doc: re-format

    jtojnar committed Sep 18, 2019

    Verified

    This commit was signed with the committer’s verified signature.
    dywedir Vlad M.
    Copy the full SHA
    37f6004 View commit details
  3. doc: re-format

    jtojnar committed Sep 18, 2019
    Copy the full SHA
    7aa9367 View commit details
  4. Merge pull request #69043 from jtojnar/no-wrap-doc-19.09

    [19.09] doc: Disable wrapping source
    grahamc authored Sep 18, 2019

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    dtzWill Will Dietz
    Copy the full SHA
    2121897 View commit details

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

    Verified

    This commit was signed with the committer’s verified signature.
    costrouc Christopher Ostrouchov
    Copy the full SHA
    d0c0f0d View commit details
  2. Verified

    This commit was signed with the committer’s verified signature.
    delroth Pierre Bourdon
    Copy the full SHA
    ba6769a View commit details
  3. linux: 4.19.73 -> 4.19.74

    NeQuissimus committed Sep 19, 2019

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    c536f0e View commit details
  4. linux: 5.2.15 -> 5.2.16

    NeQuissimus committed Sep 19, 2019

    Verified

    This commit was signed with the committer’s verified signature.
    vcunat Vladimír Čunát
    Copy the full SHA
    4fd551e View commit details
Loading