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: ed5cb7311814
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 89ce83688cda
Choose a head ref
  • 2 commits
  • 2 files changed
  • 1 contributor

Commits on May 12, 2017

  1. nvidia stable: 375.39 -> 375.66

    @lheckemann
    lheckemann authored and Cray Elliott committed May 12, 2017

    Unverified

    The committer email address is not verified.
    Learn about vigilant mode
    Copy the full SHA
    995d41c View commit details

  2. nvidia-x11: fix linux 4.10 patch URL

    @lheckemann
    lheckemann authored and Cray Elliott committed May 12, 2017

    Verified

    This commit was signed with the committer’s verified signature.
    ttuegel Thomas Tuegel
    GPG key ID: 22CBF5249D4B4D59
    Verified
    Learn about vigilant mode
    Copy the full SHA
    89ce836 View commit details
Showing with 11 additions and 8 deletions.
  1. +5 −5 pkgs/os-specific/linux/nvidia-x11/default.nix
  2. +6 −3 pkgs/os-specific/linux/nvidia-x11/generic.nix
10 changes: 5 additions & 5 deletions pkgs/os-specific/linux/nvidia-x11/default.nix
View file
Original file line number Diff line number Diff line change
@@ -6,11 +6,11 @@ in
{
# Policy: use the highest stable version as the default (on our master).
stable = generic {
version = "375.39";
sha256_32bit = "0mlly5n84640xa2mcdqqg44s42ck6g3lj5skf7gmfp2w5ibzccvz";
sha256_64bit = "19w5v81f770rqjrvdwz11k015zli2y8f4x10ydqxcy0nhhh5mgli";
settingsSha256 = "0f881q4jzliqzqi1p5lzwz86h829m5g74zdj7nlfi1cc6s45g5p5";
persistencedSha256 = "0zj6wdcgg2ljhvsssfsqz9wk28ykmsh4gwmis31q3rsrkq668x33";
version = "375.66";
sha256_32bit = "0k7ib5ah3c2apzgzxlq75l48zm8901mbwj7slv18k3rhk8j0w8i9";
sha256_64bit = "1h01s8brpz42jwc24dsflm4psd3zsy26ds98h0adgwx51dbpzqsr";
settingsSha256 = "0bpdayyqw4cpgl7bgddfz6w5j8y3wsgr89p5vxnzgk9g0vgqxh5h";
persistencedSha256 = "113rllf9l26z546jjfijpxllp17qcpawblzxvsqc6rbzbkmvcdwi";
};

beta = generic {
9 changes: 6 additions & 3 deletions pkgs/os-specific/linux/nvidia-x11/generic.nix
View file
Original file line number Diff line number Diff line change
@@ -57,9 +57,12 @@ let
# with datestamps removed
./fs52243.patch
]
else [ (fetchurl {
url = https://git.archlinux.org/svntogit/packages.git/plain/trunk/kernel_4.10.patch?h=packages/nvidia; sha256 = "0zhpx3baq2pca2pmz1af5cp2nzjxjx0j9w5xrdy204mnv3v2708z";
}) ];
else if versionOlder version "375.66"
then [ (fetchurl {
url = https://git.archlinux.org/svntogit/packages.git/plain/trunk/kernel_4.10.patch?h=packages/nvidia&id=0aac90023677e08838c75a1d7429d5c64e2093ae;
sha256 = "0zhpx3baq2pca2pmz1af5cp2nzjxjx0j9w5xrdy204mnv3v2708z";
}) ]
else null;

inherit version useGLVND useProfiles;
inherit (stdenv) system;