about summary refs log tree commit diff
path: root/pkgs/development/compilers/ghdl
diff options
context:
space:
mode:
authorEduardo Sánchez Muñoz <esm@eduardosm.net>2021-02-10 10:04:28 +0100
committerEduardo Sánchez Muñoz <esm@eduardosm.net>2021-02-10 10:16:38 +0100
commitbe7906e6ee664a4862be4b5142d1fd845c5541de (patch)
treeae021e8cda03a8276b6321d82f90f140b5656eea /pkgs/development/compilers/ghdl
parent2b65b02c75086217aeb94c0370b287c42555d4b1 (diff)
ghdl: unstable-2021.01.14 -> 1.0.0
Diffstat (limited to 'pkgs/development/compilers/ghdl')
-rw-r--r--pkgs/development/compilers/ghdl/default.nix12
1 files changed, 5 insertions, 7 deletions
diff --git a/pkgs/development/compilers/ghdl/default.nix b/pkgs/development/compilers/ghdl/default.nix
index 6181486f50c7b..e733243943943 100644
--- a/pkgs/development/compilers/ghdl/default.nix
+++ b/pkgs/development/compilers/ghdl/default.nix
@@ -5,24 +5,22 @@ assert backend == "mcode" || backend == "llvm";
 
 stdenv.mkDerivation rec {
   pname = "ghdl-${backend}";
-  # NOTE(aseipp): move to 0.38 when it comes out, since it should support a stable
-  # version of the yosys plugin
-  version = "unstable-2021.01.14";
+  version = "1.0.0";
 
   src = fetchFromGitHub {
     owner  = "ghdl";
     repo   = "ghdl";
-    rev    = "4868294436574660552ccef50a5b0849559393de";
-    sha256 = "1wqjf0qc66dam1n2mskmlvj53bcsdwwk5rq9gimq6ah1vcwi222p";
+    rev    = "v${version}";
+    sha256 = "1gyh0xckwbzgslbpw9yrpj4gqs9fm1a2qpbzl0sh143fk1kwjlly";
   };
 
   LIBRARY_PATH = "${stdenv.cc.libc}/lib";
 
-  buildInputs = [ gnat zlib ];
+  buildInputs = [ gnat zlib ] ++ lib.optional (backend == "llvm") [ llvm ];
 
   preConfigure = ''
     # If llvm 7.0 works, 7.x releases should work too.
-    sed -i 's/check_version 7.0/check_version 7/g' configure
+    sed -i 's/check_version  7.0/check_version  7/g' configure
   '';
 
   configureFlags = [ "--enable-synth" ] ++ lib.optional (backend == "llvm")