From e0d947c79c191d39fc120499d53916327c97d167 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Wed, 23 Sep 2020 00:52:45 +0300 Subject: [PATCH] arpack: cosmetic changes Don't use `with stdenv.lib` at the top of the expression, per: https://nix.dev/anti-patterns/language.html#with-attrset-expression Use rec and version inside `mkDerivation`, like almost any other derivation. --- .../libraries/science/math/arpack/default.nix | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/pkgs/development/libraries/science/math/arpack/default.nix b/pkgs/development/libraries/science/math/arpack/default.nix index 02d51f0c419..057a2d4b397 100644 --- a/pkgs/development/libraries/science/math/arpack/default.nix +++ b/pkgs/development/libraries/science/math/arpack/default.nix @@ -1,14 +1,9 @@ { stdenv, fetchFromGitHub, cmake , gfortran, blas, lapack, eigen }: -with stdenv.lib; - -let - version = "3.7.0"; -in -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "arpack"; - inherit version; + version = "3.7.0"; src = fetchFromGitHub { owner = "opencollab"; @@ -27,7 +22,7 @@ stdenv.mkDerivation { cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" - "-DINTERFACE64=${optionalString blas.isILP64 "1"}" + "-DINTERFACE64=${stdenv.lib.optionalString blas.isILP64 "1"}" ]; preCheck = if stdenv.isDarwin then ''