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: 3a599765214d
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 21e75aac80bd
Choose a head ref
  • 2 commits
  • 2 files changed
  • 2 contributors

Commits on May 12, 2017

  1. nvidia stable: 375.39 -> 375.66 

    (cherry picked from commit 995d41c)
    @lheckemann @vcunat
    lheckemann authored and vcunat committed May 12, 2017

    Verified

    This commit was signed with the committer’s verified signature.
    vcunat Vladimír Čunát
    GPG key ID: E747DF1F9575A3AA
    Verified
    Learn about vigilant mode
    Copy the full SHA
    f883be5 View commit details

  2. nvidia_x11_beta: 378.13 -> 381.22 

    also remove nvidia 4.10 kernel patch as it is no longer needed

(cherry picked from commit 11b8cfb)
    @vcunat
    Cray Elliott authored and vcunat committed May 12, 2017

    Verified

    This commit was signed with the committer’s verified signature.
    vcunat Vladimír Čunát
    GPG key ID: E747DF1F9575A3AA
    Verified
    Learn about vigilant mode
    Copy the full SHA
    21e75aa View commit details
Showing with 11 additions and 13 deletions.
  1. +10 −10 pkgs/os-specific/linux/nvidia-x11/default.nix
  2. +1 −3 pkgs/os-specific/linux/nvidia-x11/generic.nix
20 changes: 10 additions & 10 deletions pkgs/os-specific/linux/nvidia-x11/default.nix
View file
Original file line number Diff line number Diff line change
@@ -6,19 +6,19 @@ 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 {
version = "378.13";
sha256_32bit = "1ca6kbk20kki5f698x1ga9b1v1is4mr10f7f70s3gixak1h2mrh5";
sha256_64bit = "1vj2vyy6vim0qis7iqq4la6k6bnby65p3qjbl888qnpjkqj7kqrx";
settingsSha256 = "08q04cd769l1i6737ylvanaxrqg8fym05kjp7kvpz28764g96gxj";
persistencedSha256 = "0hmxp5fbxwl9f7c9fspg65my6lwynpqhz02zw7100dgwqb2vn1qj";
version = "381.22";
sha256_32bit = "024x3c6hrivg2bkbzv1xd0585hvpa2kbn1y2gwvca7c73kpdczbv";
sha256_64bit = "13fj9ndy5rmh410d0vi2b0crfl7rbsm6rn7cwms0frdzkyhshghs";
settingsSha256 = "1gls187zfd201b29qfvwvqvl5gvp5wl9lq966vd28crwqh174jrh";
persistencedSha256 = "08315rb9l932fgvy758an5vh3jgks0qc4g36xip4l32pkxd9k963";
};

legacy_340 = generic {
4 changes: 1 addition & 3 deletions pkgs/os-specific/linux/nvidia-x11/generic.nix
View file
Original file line number Diff line number Diff line change
@@ -58,9 +58,7 @@ 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 null;

inherit version useGLVND useProfiles;
inherit (stdenv) system;