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: 561425b1ba28
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: 00b92751f614
Choose a head ref
  • 5 commits
  • 2 files changed
  • 1 contributor

Commits on Dec 5, 2017

  1. nvidia_x11_legacy340: patch to support kernel 4.14 

    /cc #31640.

(cherry picked from commit 6aa3f54)
    @vcunat
    vcunat committed Dec 5, 2017
    Copy the full SHA
    a8b76c4 View commit details
    Browse the repository at this point in the history

  2. nvidia_x11_legacy304: 304.135 -> 304.137 

    This now builds with kernel 4.13; Debian has only the typo patch there.
Curiously, .settings still fails to link on x86_64-linux but works
on i686-linux, just as with .135.

(cherry picked from commit 1e4d675)
    @vcunat
    vcunat committed Dec 5, 2017
    Copy the full SHA
    422f786 View commit details
    Browse the repository at this point in the history

  3. nvidia_x11_legacy304: fix build with kernel 4.14 

    /cc #31640.

(cherry picked from commit b934716)
    @vcunat
    vcunat committed Dec 5, 2017
    Copy the full SHA
    120ebc0 View commit details
    Browse the repository at this point in the history

  4. nvidia_x11_legacy340: add another patch 

    I *suspect* that NV_VM_OPERATIONS_STRUCT_HAS_FAULT isn't detected
in our case for some reason, so this patch doesn't make a difference.
In any case, the patch seems unlikely to make anything worse.

(cherry picked from commit e9550f2)
    @vcunat
    vcunat committed Dec 5, 2017
    Copy the full SHA
    84c97d2 View commit details
    Browse the repository at this point in the history

  5. Merge: nvidia_x11* backports - minor+patch updates

    @vcunat
    vcunat committed Dec 5, 2017
    Copy the full SHA
    00b9275 View commit details
    Browse the repository at this point in the history