From 6920d8ca42b081c874486ad16fc66f43d8bb8074 Mon Sep 17 00:00:00 2001 From: Anders Kaseorg Date: Mon, 25 Apr 2022 13:35:24 -0700 Subject: treewide: Simplify negated uses of versionAtLeast, versionOlder Signed-off-by: Anders Kaseorg --- pkgs/development/libraries/boost/generic.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/development/libraries/boost') diff --git a/pkgs/development/libraries/boost/generic.nix b/pkgs/development/libraries/boost/generic.nix index 1881f06aa4a..34ab5554e74 100644 --- a/pkgs/development/libraries/boost/generic.nix +++ b/pkgs/development/libraries/boost/generic.nix @@ -32,7 +32,7 @@ assert enablePython -> stdenv.hostPlatform == stdenv.buildPlatform; assert enableNumpy -> enablePython; # Boost <1.69 can't be built on linux with clang >8, because pth was removed -assert with lib; ((stdenv.isLinux && toolset == "clang" && !(versionOlder stdenv.cc.version "8.0.0")) -> !(versionOlder version "1.69")); +assert with lib; (stdenv.isLinux && toolset == "clang" && versionAtLeast stdenv.cc.version "8.0.0") -> versionAtLeast version "1.69"; with lib; let @@ -143,7 +143,7 @@ stdenv.mkDerivation { stripLen = 1; extraPrefix = "libs/context/"; }) - ++ optional (and (versionAtLeast version "1.70") (!versionAtLeast version "1.73")) ./cmake-paths.patch + ++ optional (versionAtLeast version "1.70" && versionOlder version "1.73") ./cmake-paths.patch ++ optional (versionAtLeast version "1.73") ./cmake-paths-173.patch ++ optional (version == "1.77.0") (fetchpatch { url = "https://github.com/boostorg/math/commit/7d482f6ebc356e6ec455ccb5f51a23971bf6ce5b.patch"; -- cgit 1.4.1