diff options
Diffstat (limited to 'pkgs/applications/science')
| -rw-r--r-- | pkgs/applications/science/chemistry/cp2k/default.nix | 11 | ||||
| -rw-r--r-- | pkgs/applications/science/logic/abella/default.nix | 9 |
2 files changed, 14 insertions, 6 deletions
diff --git a/pkgs/applications/science/chemistry/cp2k/default.nix b/pkgs/applications/science/chemistry/cp2k/default.nix index 5bc0dddd79b..16eabbcbcaa 100644 --- a/pkgs/applications/science/chemistry/cp2k/default.nix +++ b/pkgs/applications/science/chemistry/cp2k/default.nix @@ -28,8 +28,16 @@ , spfft , enableElpa ? false , elpa -, gpuBackend ? "none" , cudaPackages +, rocmPackages +, config +, gpuBackend ? ( + if config.cudaSupport + then "cuda" + else if config.rocmSupport + then "rocm" + else "none" +) # gpuVersion needs to be set for both CUDA as well as ROCM hardware. # gpuArch is only required for the ROCM stack. # Change to a value suitable for your target GPU. @@ -37,7 +45,6 @@ # and for Nvidia see https://github.com/cp2k/cp2k/blob/master/INSTALL.md#2i-cuda-optional-improved-performance-on-gpu-systems , gpuVersion ? "Mi100" , gpuArch ? "gfx908" -, rocmPackages }: assert builtins.elem gpuBackend [ "none" "cuda" "rocm" ]; diff --git a/pkgs/applications/science/logic/abella/default.nix b/pkgs/applications/science/logic/abella/default.nix index 1d0c72359cf..7e4cfad72ed 100644 --- a/pkgs/applications/science/logic/abella/default.nix +++ b/pkgs/applications/science/logic/abella/default.nix @@ -2,20 +2,21 @@ stdenv.mkDerivation rec { pname = "abella"; - version = "2.0.7"; + version = "2.0.8"; src = fetchurl { url = "http://abella-prover.org/distributions/${pname}-${version}.tar.gz"; - sha256 = "sha256-/eOiebMFHgrurtrSHPlgZO3xmmxBOUmyAzswXZLd3Yc="; + sha256 = "sha256-80b/RUpE3KRY0Qu8eeTxAbk6mwGG6jVTPOP0qFjyj2M="; }; strictDeps = true; - nativeBuildInputs = [ rsync ] ++ (with ocamlPackages; [ ocaml ocamlbuild findlib ]); + nativeBuildInputs = [ rsync ] ++ (with ocamlPackages; [ ocaml dune_3 menhir findlib ]); + buildInputs = with ocamlPackages; [ cmdliner yojson ]; installPhase = '' mkdir -p $out/bin - rsync -av abella $out/bin/ + rsync -av _build/default/src/abella.exe $out/bin/abella mkdir -p $out/share/emacs/site-lisp/abella/ rsync -av emacs/ $out/share/emacs/site-lisp/abella/ |