Merge pull request #122540 from Mic92/nvidia-x11-legacy304

nvidia_x11_legacy304: remove
This commit is contained in:
Jörg Thalheim 2021-05-11 07:53:26 +01:00 committed by GitHub
commit 958f32bebb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 0 additions and 38 deletions

View file

@ -14,15 +14,6 @@ let
kernel = callPackage # a hacky way of extracting parameters from callPackage kernel = callPackage # a hacky way of extracting parameters from callPackage
({ kernel, libsOnly ? false }: if libsOnly then { } else kernel) { }; ({ kernel, libsOnly ? false }: if libsOnly then { } else kernel) { };
maybePatch_drm_legacy =
lib.optional (lib.versionOlder "4.14" (kernel.version or "0"))
(fetchurl {
url = "https://raw.githubusercontent.com/MilhouseVH/LibreELEC.tv/b5d2d6a1"
+ "/packages/x11/driver/xf86-video-nvidia-legacy/patches/"
+ "xf86-video-nvidia-legacy-0010-kernel-4.14.patch";
sha256 = "18clfpw03g8dxm61bmdkmccyaxir3gnq451z6xqa2ilm3j820aa5";
});
in in
rec { rec {
# Policy: use the highest stable version as the default (on our master). # Policy: use the highest stable version as the default (on our master).
@ -73,32 +64,4 @@ rec {
patches = [ ./vm_operations_struct-fault.patch ]; patches = [ ./vm_operations_struct-fault.patch ];
}; };
legacy_304 = generic {
version = "304.137";
sha256_32bit = "1y34c2gvmmacxk2c72d4hsysszncgfndc4s1nzldy2q9qagkg66a";
sha256_64bit = "1qp3jv6279k83k3z96p6vg3dd35y9bhmlyyyrkii7sib7bdmc7zb";
settingsSha256 = "129f0j0hxzjd7g67qwxn463rxp295fsq8lycwm6272qykmab46cj";
persistencedSha256 = null;
useGLVND = false;
useProfiles = false;
settings32Bit = true;
prePatch = let
debPatches = fetchurl {
url = "mirror://debian/pool/non-free/n/nvidia-graphics-drivers-legacy-304xx/"
+ "nvidia-graphics-drivers-legacy-304xx_304.137-5.debian.tar.xz";
sha256 = "0n8512mfcnvklfbg8gv4lzbkm3z6nncwj6ix2b8ngdkmc04f3b6l";
};
prefix = "debian/module/debian/patches";
applyPatches = pnames: if pnames == [] then null else
''
tar xf '${debPatches}'
sed 's|^\([+-]\{3\} [ab]\)/|\1/kernel/|' -i ${prefix}/*.patch
patches="$patches ${lib.concatMapStringsSep " " (pname: "${prefix}/${pname}.patch") pnames}"
'';
in applyPatches [ "fix-typos" ];
patches = maybePatch_drm_legacy;
broken = lib.versionAtLeast kernel.version "4.18";
};
} }

View file

@ -20293,7 +20293,6 @@ in
nvidiaPackages = dontRecurseIntoAttrs (callPackage ../os-specific/linux/nvidia-x11 { }); nvidiaPackages = dontRecurseIntoAttrs (callPackage ../os-specific/linux/nvidia-x11 { });
nvidia_x11_legacy304 = nvidiaPackages.legacy_304;
nvidia_x11_legacy340 = nvidiaPackages.legacy_340; nvidia_x11_legacy340 = nvidiaPackages.legacy_340;
nvidia_x11_legacy390 = nvidiaPackages.legacy_390; nvidia_x11_legacy390 = nvidiaPackages.legacy_390;
nvidia_x11_beta = nvidiaPackages.beta; nvidia_x11_beta = nvidiaPackages.beta;