public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #112634 from eduardosm/ghdl 

ghdl: unstable-2021.01.14 -> 1.0.0, ghdl-yosys: 2021.01.01 -> 2021.01.25
This commit is contained in:
Austin Seipp 2021-02-11 02:59:32 -06:00 committed by GitHub
parent 4f6ca4d5a6 5def007f40
commit 6f23e01b79
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkgs/development/compilers/ghdl/default.nix
View File

@ -5,24 +5,22 @@ assert backend == "mcode" || backend == "llvm";
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "ghdl-${backend}"; pname = "ghdl-${backend}";
# NOTE(aseipp): move to 0.38 when it comes out, since it should support a stable version = "1.0.0";
# version of the yosys plugin
version = "unstable-2021.01.14";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "ghdl"; owner = "ghdl";
repo = "ghdl"; repo = "ghdl";
rev = "4868294436574660552ccef50a5b0849559393de"; rev = "v${version}";
sha256 = "1wqjf0qc66dam1n2mskmlvj53bcsdwwk5rq9gimq6ah1vcwi222p"; sha256 = "1gyh0xckwbzgslbpw9yrpj4gqs9fm1a2qpbzl0sh143fk1kwjlly";
}; };
LIBRARY_PATH = "${stdenv.cc.libc}/lib"; LIBRARY_PATH = "${stdenv.cc.libc}/lib";
buildInputs = [ gnat zlib ]; buildInputs = [ gnat zlib ] ++ lib.optional (backend == "llvm") [ llvm ];
preConfigure = '' preConfigure = ''
# If llvm 7.0 works, 7.x releases should work too. # 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") configureFlags = [ "--enable-synth" ] ++ lib.optional (backend == "llvm")

6
pkgs/development/compilers/yosys/plugins/ghdl.nix
View File

@ -4,13 +4,13 @@
stdenv.mkDerivation { stdenv.mkDerivation {
pname = "yosys-ghdl"; pname = "yosys-ghdl";
version = "2021.01.01"; version = "2021.01.25";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "ghdl"; owner = "ghdl";
repo = "ghdl-yosys-plugin"; repo = "ghdl-yosys-plugin";
rev = "8b3e740fef9a653a20a838f1ade475960e1d379b"; rev = "cba859cacf8c6631146dbdaa0f297c060b5a68cd";
sha256 = "13kpcp37r11xgqd8aksddi40a5vpzqi7p8qgyjbs99lyscyli75x"; sha256 = "01d9wb7sqkmkf2y9bnn3pmhy08khzs5m1d06whxsiwgwnjzfk9mx";
}; };
buildInputs = [ yosys readline zlib ghdl ]; buildInputs = [ yosys readline zlib ghdl ];