From f6c51efa852e6e346f898b257b98f18b6759d1ee Mon Sep 17 00:00:00 2001
From: t-nojiri <68096132+t-nojiri@users.noreply.github.com>
Date: Tue, 27 Oct 2020 23:53:38 +0900
Subject: diamond: Add version 2.0.4 (#19535)

---
 var/spack/repos/builtin/packages/diamond/package.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'var')

diff --git a/var/spack/repos/builtin/packages/diamond/package.py b/var/spack/repos/builtin/packages/diamond/package.py
index b008750981..59ecb7e1da 100644
--- a/var/spack/repos/builtin/packages/diamond/package.py
+++ b/var/spack/repos/builtin/packages/diamond/package.py
@@ -13,6 +13,8 @@ class Diamond(CMakePackage):
     homepage = "https://ab.inf.uni-tuebingen.de/software/diamond"
     url      = "https://github.com/bbuchfink/diamond/archive/v0.9.14.tar.gz"
 
+    version('2.0.4', sha256='94e8fe72bdc28b83fd0f2d90c439b58b63b38263aa1a3905582ef68f614ae95d',
+            url="https://github.com/bbuchfink/diamond/archive/diamond-2.0.4.tar.gz")
     version('0.9.25', sha256='65298f60cf9421dcc7669ce61642611cd9eeffc32f66fd39ebfa25dd64416808')
     version('0.9.23', sha256='0da5cdd5e5b77550ec0eaba2c6c431801cdd10d31606ca12f952b57d3d31db92')
     version('0.9.22', sha256='35e518cfa0ac2fbc57e422d380bdb5123c6335742dd7965b76c34c95f241b729')
@@ -25,6 +27,8 @@ class Diamond(CMakePackage):
 
     depends_on('zlib')
 
+    conflicts('target=aarch64:', when='@:0.9.25')
+
     # fix error [-Wc++11-narrowing]
     # Ref: https://github.com/bbuchfink/diamond/commit/155e076d662b0e9268e2b00bef6d33d90aede7ff
-    patch('fix_narrowing_error.patch')
+    patch('fix_narrowing_error.patch', when='@:0.9.25')
-- 
cgit v1.2.3-60-g2f50