diff options
Diffstat (limited to 'pkgs/os-specific')
-rw-r--r-- | pkgs/os-specific/linux/nvidia-x11/default.nix | 4 | ||||
-rw-r--r-- | pkgs/os-specific/linux/nvidia-x11/generic.nix | 2 | ||||
-rw-r--r-- | pkgs/os-specific/linux/rtl8723bs/default.nix | 2 | ||||
-rw-r--r-- | pkgs/os-specific/linux/sch_cake/default.nix | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix index 76df6047390..100ca403f62 100644 --- a/pkgs/os-specific/linux/nvidia-x11/default.nix +++ b/pkgs/os-specific/linux/nvidia-x11/default.nix @@ -3,8 +3,8 @@ let generic = args: let imported = import ./generic.nix args; - in if ((!lib.versionOlder args.version "391") - && stdenv.hostPlatform.system != "x86_64-linux") then null + in if lib.versionAtLeast args.version "391" + && stdenv.hostPlatform.system != "x86_64-linux" then null else callPackage imported { lib32 = (pkgsi686Linux.callPackage imported { libsOnly = true; diff --git a/pkgs/os-specific/linux/nvidia-x11/generic.nix b/pkgs/os-specific/linux/nvidia-x11/generic.nix index c7e062534a4..bc867d8b82b 100644 --- a/pkgs/os-specific/linux/nvidia-x11/generic.nix +++ b/pkgs/os-specific/linux/nvidia-x11/generic.nix @@ -33,7 +33,7 @@ with lib; assert !libsOnly -> kernel != null; assert versionOlder version "391" -> sha256_32bit != null; -assert ! versionOlder version "391" -> stdenv.hostPlatform.system == "x86_64-linux"; +assert versionAtLeast version "391" -> stdenv.hostPlatform.system == "x86_64-linux"; let nameSuffix = optionalString (!libsOnly) "-${kernel.version}"; diff --git a/pkgs/os-specific/linux/rtl8723bs/default.nix b/pkgs/os-specific/linux/rtl8723bs/default.nix index a862b351716..b6ab883ca75 100644 --- a/pkgs/os-specific/linux/rtl8723bs/default.nix +++ b/pkgs/os-specific/linux/rtl8723bs/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/hadess/rtl8723bs"; license = lib.licenses.gpl2; platforms = lib.platforms.linux; - broken = (! versionOlder kernel.version "4.12"); # Now in kernel staging drivers + broken = versionAtLeast kernel.version "4.12"; # Now in kernel staging drivers maintainers = with maintainers; [ elitak ]; }; } diff --git a/pkgs/os-specific/linux/sch_cake/default.nix b/pkgs/os-specific/linux/sch_cake/default.nix index a959fac5dca..f93713344ef 100644 --- a/pkgs/os-specific/linux/sch_cake/default.nix +++ b/pkgs/os-specific/linux/sch_cake/default.nix @@ -29,6 +29,6 @@ stdenv.mkDerivation { license = with licenses; [ bsd3 gpl2 ]; maintainers = with maintainers; [ fpletz ]; platforms = platforms.linux; - broken = !lib.versionOlder kernel.version "4.13"; + broken = lib.versionAtLeast kernel.version "4.13"; }; } |