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: d392cf879915
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 9ce5780ab7c5
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Oct 12, 2019

  1. nvidia-x11: Remove patches from the 390 version. (#69851) 

    Without those patches it builds and works with kernels 4.19 and 5.2.

Fixes #65937

(cherry picked from commit b1ed9c6)
    @ambrop72 @vcunat
    ambrop72 authored and vcunat committed Oct 12, 2019
    1
    Copy the full SHA
    9ce5780 View commit details
Showing with 0 additions and 12 deletions.
  1. +0 −12 pkgs/os-specific/linux/nvidia-x11/default.nix
12 changes: 0 additions & 12 deletions pkgs/os-specific/linux/nvidia-x11/default.nix
View file
Original file line number Diff line number Diff line change
@@ -39,18 +39,6 @@ rec {
sha256_64bit = "0h0jcckqpd63vaj95lvdgj2sbbn9y1ri1xx7r2snxfx0plhwz46n";
settingsSha256 = "1w5nkxs7a40mq0qf97nhfazdqhfn1bvr54v50s8p0ggixb6vdm3l";
persistencedSha256 = "02v76202qcnh8hvg4y9wmk9swdlv7z39ppfd1c850nlv158vn5nf";

patches = [
(fetchurl {
url = "https://git.archlinux.org/svntogit/packages.git/plain/trunk/kernel-4.16.patch?h=2ad07241ea525a6b6b555b6cb96a97634a4b2cb0";
sha256 = "11b3dp0na496rn13v5q4k66bf61174800g36rcwj42r0xj9cfak2";
})

(fetchurl {
url = "https://git.archlinux.org/svntogit/packages.git/plain/trunk/kernel-5.1.patch?h=42d50ef8d6048608d18bdf2c296dd335260c5a1a";
sha256 = "03v46ym2bcckg9q2xrilkg21hfiwypr6gl4jmly2q3m4yza9ja6r";
})
];
};

legacy_340 = generic {