From face360c0802e054b200d06bffc1b8681b13b207 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Thu, 28 Oct 2021 16:46:13 +0200 Subject: [PATCH 1/2] gromacs: replace lib.lists.optional with lib.optional --- .../science/molecular-dynamics/gromacs/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/science/molecular-dynamics/gromacs/default.nix b/pkgs/applications/science/molecular-dynamics/gromacs/default.nix index 6d7f4bf09092..a78f462e6f1d 100644 --- a/pkgs/applications/science/molecular-dynamics/gromacs/default.nix +++ b/pkgs/applications/science/molecular-dynamics/gromacs/default.nix @@ -34,12 +34,12 @@ in stdenv.mkDerivation rec { hwloc blas lapack - ] ++ lib.lists.optional enableMpi mpi - ++ lib.lists.optional enableCuda cudatoolkit + ] ++ lib.optional enableMpi mpi + ++ lib.optional enableCuda cudatoolkit ; - propagatedBuildInputs = lib.lists.optional enableMpi mpi; - propagatedUserEnvPkgs = lib.lists.optional enableMpi mpi; + propagatedBuildInputs = lib.optional enableMpi mpi; + propagatedUserEnvPkgs = lib.optional enableMpi mpi; cmakeFlags = [ "-DGMX_SIMD:STRING=${SIMD cpuAcceleration}" @@ -61,7 +61,7 @@ in stdenv.mkDerivation rec { else [ "-DGMX_MPI:BOOL=FALSE" ] - ) ++ lib.lists.optional enableCuda "-DGMX_GPU=CUDA"; + ) ++ lib.optional enableCuda "-DGMX_GPU=CUDA"; meta = with lib; { homepage = "http://www.gromacs.org"; From a3286ac6cb49a84f44f7ba936ea1b3a724f69770 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Thu, 28 Oct 2021 16:47:06 +0200 Subject: [PATCH 2/2] gromacs: fix formatting --- .../science/molecular-dynamics/gromacs/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/science/molecular-dynamics/gromacs/default.nix b/pkgs/applications/science/molecular-dynamics/gromacs/default.nix index a78f462e6f1d..f7756f33499e 100644 --- a/pkgs/applications/science/molecular-dynamics/gromacs/default.nix +++ b/pkgs/applications/science/molecular-dynamics/gromacs/default.nix @@ -1,8 +1,8 @@ -{ lib, stdenv, fetchurl, cmake, hwloc, fftw, perl, blas, lapack, mpi, cudatoolkit, - singlePrec ? true, - enableMpi ? false, - enableCuda ? false, - cpuAcceleration ? null +{ lib, stdenv, fetchurl, cmake, hwloc, fftw, perl, blas, lapack, mpi, cudatoolkit +, singlePrec ? true +, enableMpi ? false +, enableCuda ? false +, cpuAcceleration ? null }: let