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: 37f0a4f1997c
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 708164fe94e0
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Dec 3, 2018

  1. nvidia_legacy_340: Remove unneeded/failing patch 

    The patch is not applying and no longer needed after upgrade in
045575e. Now the same result is
achieved by the following lines in the driver package itself:

    #if defined(NV_DRM_LEGACY_PCI_INIT_PRESENT)
    #define nv_drm_pci_init drm_legacy_pci_init
    #define nv_drm_pci_exit drm_legacy_pci_exit
    #else
    #define nv_drm_pci_init drm_pci_init
    #define nv_drm_pci_exit drm_pci_exit
    #endif
    @binarin
    binarin committed Dec 3, 2018

    Verified

    This commit was signed with the committer’s verified signature.
    costrouc Christopher Ostrouchov
    GPG key ID: 9ED59B0AB1EAF573
    Verified
    Learn about vigilant mode
    Copy the full SHA
    caed71e View commit details

Commits on Dec 4, 2018

  1. Merge pull request #51457 from binarin/nvidia-legacy-340-no-longer-pa… 

    …tch-414

nvidia_legacy_340: Remove unneeded/failing patch
    @Mic92
    Mic92 authored Dec 4, 2018

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    708164f View commit details
Showing with 1 addition and 1 deletion.
  1. +1 −1 pkgs/os-specific/linux/nvidia-x11/default.nix
2 changes: 1 addition & 1 deletion pkgs/os-specific/linux/nvidia-x11/default.nix
View file
Original file line number Diff line number Diff line change
@@ -47,7 +47,7 @@ rec {
persistencedSha256 = "0nwv6kh4gxgy80x1zs6gcg5hy3amg25xhsfa2v4mwqa36sblxz6l";
useGLVND = false;

patches = maybePatch_drm_legacy ++ [ ./vm_operations_struct-fault.patch ];
patches = [ ./vm_operations_struct-fault.patch ];
};

legacy_304 = generic {