Skip to content
This repository was archived by the owner on Apr 12, 2021. It is now read-only.
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-channels
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: c2570ef90712
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 727e5bce8801
Choose a head ref
  • 5 commits
  • 4 files changed
  • 2 contributors

Commits on May 12, 2019

  1. Merge #61181: spl: fix build with linux 5.1 

    (cherry picked from commit 359a734)
    @vcunat
    vcunat committed May 12, 2019

    Partially verified

    This commit is signed with the committer’s verified signature.
    domenkozar’s contribution has been verified via GPG key.
    We cannot verify signatures from co-authors, and some of the co-authors attributed to this commit require their commits to be signed.
    Copy the full SHA
    b531a3b View commit details

  2. nvidia_x11_legacy390: 390.87 -> 390.116 

    (cherry picked from commit 9629324)
    @eadwu @FRidh
    eadwu authored and FRidh committed May 12, 2019

    Verified

    This commit was signed with the committer’s verified signature.
    domenkozar Domen Kožar
    GPG key ID: C2FFBCAFD2C24246
    Verified
    Learn about vigilant mode
    Copy the full SHA
    552c7c5 View commit details

  3. nvidia_x11_beta: stable -> 430.09 

    (cherry picked from commit 0f9672d)
    @eadwu @FRidh
    eadwu authored and FRidh committed May 12, 2019

    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
    cd31b65 View commit details

  4. nvidia_x11: 418.56 -> 418.74 

    (cherry picked from commit f81836c)
    @eadwu @FRidh
    eadwu authored and FRidh committed May 12, 2019
    Copy the full SHA
    b0641e0 View commit details

  5. nvidia_x11: partial revert of 0f9672d 

    Only long-lived branches should be backported to release branches.
    @eadwu @FRidh
    eadwu authored and FRidh committed May 12, 2019
    Copy the full SHA
    727e5bc View commit details
24 changes: 12 additions & 12 deletions pkgs/os-specific/linux/nvidia-x11/default.nix
View file
Original file line number Diff line number Diff line change
@@ -22,19 +22,19 @@ rec {
beta = stable;

stable_418 = generic {
version = "418.56";
sha256_64bit = "1cg7927g5ml1rwgpydlrjzr55gza5dfkqkch29bbarpzd7dh0mf4";
settingsSha256 = "1dai4dh6g3arkgicbjwhfr948i1xc13a7s0xcgalan0pn5zd56z6";
persistencedSha256 = "1r13jjpqg9ri5mw633k01dq2ivblc8nrbsnh7709v1xibaydwnhn";
version = "418.74";
sha256_64bit = "03qj42ppzkc9nphdr9zc12968bb8fc9cpcx5f66y29wnrgg3d1yw";
settingsSha256 = "15mbqdx5wyk7iq13kl2vd99lykpil618izwpi1kfldlabxdxsi9d";
persistencedSha256 = "0442qbby0r1b6l72wyw0b3iwvln6k20s6dn0zqlpxafnia9bvc8c";
};

# Last one supporting x86
legacy_390 = generic {
version = "390.87";
sha256_32bit = "0rlr1f4lnpb8c4qz4w5r8xw5gdy9bzz26qww45qyl1qav3wwaaaw";
sha256_64bit = "07k1kq8lkgbvjyr2dnbxcz6nppcwpq17wf925w8kfq78345hla9q";
settingsSha256 = "0xlaiy7jr95z0v2c6cwll89nxnb142pybw7m08jg44r7n13ffv3r";
persistencedSha256 = "0mhwk321garyl6m12261cj03ycv0qz1sbrlbq6cqwjpq4f1s7h58";
version = "390.116";
sha256_32bit = "0aavzi99ps7r6nrchf4h9gw3fkvm2z6wppkqkz5fwcy7x03ky4qk";
sha256_64bit = "106qc62a7m9imchqfq8rfn8fwyrjxg383354q7z2wr8112fyhyg1";
settingsSha256 = "0n4pj8dzkr7ccwrn5p46mn59cnijdhg8zmn3idjzrk56pq0hbgjr";
persistencedSha256 = "0bnjr0smhlwlqpyg9m6lca3b7brl2mw8aypc6p7525dn9d9kv6kb";

patches = lib.optional (kernel.meta.branch == "4.19") ./drm_mode_connector.patch;
};
@@ -43,8 +43,8 @@ rec {
version = "340.107";
sha256_32bit = "0mh83affz6bim26ws7kkwwcfj2s6vkdy4d45hifsbshr82qd52wd";
sha256_64bit = "0pv9yv3x0kg9hfkmc50xb54ahxkbnyy2vyy4hj2h0s6m9sb5kqz3";
settingsSha256 = "1rgaa24acdyqa1rqrx56293vxpskr792njqqpigqmps04llsx703";
persistencedSha256 = "0nwv6kh4gxgy80x1zs6gcg5hy3amg25xhsfa2v4mwqa36sblxz6l";
settingsSha256 = "1zf0fy9jj6ipm5vk153swpixqm75iricmx7x49pmr97kzyczaxa7";
persistencedSha256 = "0v225jkiqk9rma6whxs1a4fyr4haa75bvi52ss3vsyn62zzl24na";
useGLVND = false;

patches = [ ./vm_operations_struct-fault.patch ];
@@ -54,7 +54,7 @@ rec {
version = "304.137";
sha256_32bit = "1y34c2gvmmacxk2c72d4hsysszncgfndc4s1nzldy2q9qagkg66a";
sha256_64bit = "1qp3jv6279k83k3z96p6vg3dd35y9bhmlyyyrkii7sib7bdmc7zb";
settingsSha256 = "0i5znfq6jkabgi8xpcy12pdpww6a67i8mq60z1kjq36mmnb25pmi";
settingsSha256 = "129f0j0hxzjd7g67qwxn463rxp295fsq8lycwm6272qykmab46cj";
persistencedSha256 = null;
useGLVND = false;
useProfiles = false;
10 changes: 6 additions & 4 deletions pkgs/os-specific/linux/nvidia-x11/persistenced.nix
View file
Original file line number Diff line number Diff line change
@@ -1,13 +1,15 @@
nvidia_x11: sha256:

{ stdenv, fetchurl, m4 }:
{ stdenv, fetchFromGitHub, m4 }:

stdenv.mkDerivation rec {
name = "nvidia-persistenced-${nvidia_x11.version}";
pname = "nvidia-persistenced";
inherit (nvidia_x11) version;

src = fetchurl {
url = "https://download.nvidia.com/XFree86/nvidia-persistenced/${name}.tar.bz2";
src = fetchFromGitHub {
owner = "NVIDIA";
repo = "nvidia-persistenced";
rev = nvidia_x11.version;
inherit sha256;
};

12 changes: 7 additions & 5 deletions pkgs/os-specific/linux/nvidia-x11/settings.nix
View file
Original file line number Diff line number Diff line change
@@ -1,18 +1,20 @@
nvidia_x11: sha256:

{ stdenv, lib, fetchurl, pkgconfig, m4, jansson, gtk2, dbus, gtk3, libXv, libXrandr, libXext, libXxf86vm, libvdpau
{ stdenv, lib, fetchFromGitHub, pkgconfig, m4, jansson, gtk2, dbus, gtk3, libXv, libXrandr, libXext, libXxf86vm, libvdpau
, librsvg, wrapGAppsHook
, withGtk2 ? false, withGtk3 ? true
}:

let
src = fetchurl {
url = "https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-${nvidia_x11.version}.tar.bz2";
src = fetchFromGitHub {
owner = "NVIDIA";
repo = "nvidia-settings";
rev = nvidia_x11.version;
inherit sha256;
};

libXNVCtrl = stdenv.mkDerivation {
name = "libXNVCtrl-${nvidia_x11.version}";
pname = "libXNVCtrl";
inherit (nvidia_x11) version;
inherit src;

@@ -35,7 +37,7 @@ let
in

stdenv.mkDerivation rec {
name = "nvidia-settings-${nvidia_x11.version}";
pname = "nvidia-settings";
inherit (nvidia_x11) version;
inherit src;

5 changes: 5 additions & 0 deletions pkgs/os-specific/linux/spl/default.nix
View file
Original file line number Diff line number Diff line change
@@ -21,6 +21,11 @@ stdenv.mkDerivation rec {

patches = [ ./install_prefix.patch ];

# Backported fix for 0.7.13 to build with 5.1, please remove when updating to 0.7.14
postPatch = optionalString (versionAtLeast kernel.version "5.1") ''
sed -i 's/get_ds()/KERNEL_DS/g' module/spl/spl-vnode.c
'';

nativeBuildInputs = [ autoreconfHook ] ++ kernel.moduleBuildDependencies;

hardeningDisable = [ "fortify" "stackprotector" "pic" ];