public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Addressing review

This commit is contained in:
Matthieu Coudron 2019-05-17 18:26:39 +09:00
parent 2da1ad60a8
commit 4e30a2852c
3 changed files with 4 additions and 2 deletions
pkgs
os-specific/linux
blcr
default.nix
prl-tools
default.nix
top-level
all-packages.nix

2
pkgs/os-specific/linux/blcr/default.nix
View File

@ -2,7 +2,7 @@
# BLCR version 0.8.6 should works with linux kernel up to version 3.17.x # BLCR version 0.8.6 should works with linux kernel up to version 3.17.x
assert builtins.compareVersions "3.18" kernel.version == 1; assert stdenv.lib.versionOlder "3.18" kernel.version;
stdenv.mkDerivation { stdenv.mkDerivation {
name = "blcr_${kernel.version}-0.8.6pre4"; name = "blcr_${kernel.version}-0.8.6pre4";

2
pkgs/os-specific/linux/prl-tools/default.nix
View File

@ -5,6 +5,8 @@
}: }:
assert (!libsOnly) -> kernel != null; assert (!libsOnly) -> kernel != null;
# Disable for kernels 4.15 and above due to compatibility issues
assert kernel != null -> stdenv.lib.versionOlder kernel.version "4.15";
let xorgFullVer = (builtins.parseDrvName xorg.xorgserver.name).version; let xorgFullVer = (builtins.parseDrvName xorg.xorgserver.name).version;
xorgVer = lib.concatStringsSep "." (lib.take 2 (lib.splitString "." xorgFullVer)); xorgVer = lib.concatStringsSep "." (lib.take 2 (lib.splitString "." xorgFullVer));

2
pkgs/top-level/all-packages.nix
View File

@ -15636,7 +15636,7 @@ in
ati_drivers_x11 = callPackage ../os-specific/linux/ati-drivers { }; ati_drivers_x11 = callPackage ../os-specific/linux/ati-drivers { };
blcr = if builtins.compareVersions "3.18" kernel.version == 1 then callPackage ../os-specific/linux/blcr { } else null; blcr = if stdenv.lib.versionOlder "3.18" kernel.version then callPackage ../os-specific/linux/blcr { } else null;
chipsec = callPackage ../tools/security/chipsec { chipsec = callPackage ../tools/security/chipsec {
inherit kernel; inherit kernel;