b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #244644 from amiloradovsky/master

Browse source 
verilator & systemc: update & integration
This commit is contained in:
Nick Cao 2023-07-24 17:01:34 -06:00 committed by GitHub
parent 7482a0e6ef a655cc3d9e
commit c4a065f6c3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 28 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
pkgs/applications/science/electronics/systemc/default.nix
View file

@ -1,18 +1,26 @@
{ lib, stdenv, fetchurl }:
{ lib, stdenv, fetchFromGitHub, autoreconfHook }:
stdenv.mkDerivation rec {
pname = "systemc";
version = "2.3.3";
version = "2.3.4";
src = fetchurl {
url = "https://www.accellera.org/images/downloads/standards/systemc/${pname}-${version}.tar.gz";
sha256 = "5781b9a351e5afedabc37d145e5f7edec08f3fd5de00ffeb8fa1f3086b1f7b3f";
src = fetchFromGitHub {
owner = "accellera-official";
repo = pname;
rev = version;
sha256 = "0sj8wlkp68cjhmkd9c9lvm3lk3sckczpz7w9vby64inc1f9fnf0b";
};
enableParallelBuilding = true;
nativeBuildInputs = [ autoreconfHook ];
configureFlags = [ "--with-unix-layout" ];
meta = with lib; {
description = "The language for System-level design, modeling and verification";
homepage = "https://systemc.org/";
license = licenses.asl20;
maintainers = with maintainers; [ victormignot ];
platforms = platforms.linux;
maintainers = with maintainers; [ victormignot amiloradovsky ];
};
}

26
pkgs/applications/science/electronics/verilator/default.nix
View file

@ -1,8 +1,6 @@
{ lib, stdenv, fetchFromGitHub
, perl, flex, bison, python3, autoconf
, which, cmake, help2man
, makeWrapper, glibcLocales
}:
{ lib, stdenv, fetchFromGitHub, perl, flex, bison, python3, autoconf,
which, cmake, ccache, help2man, makeWrapper, glibcLocales,
systemc, git, numactl }:
stdenv.mkDerivation rec {
pname = "verilator";
@ -16,9 +14,9 @@ stdenv.mkDerivation rec {
};
enableParallelBuilding = true;
buildInputs = [ perl ];
nativeBuildInputs = [ makeWrapper flex bison python3 autoconf help2man ];
nativeCheckInputs = [ which ];
buildInputs = [ perl python3 systemc ]; # ccache
nativeBuildInputs = [ makeWrapper flex bison autoconf help2man git ];
nativeCheckInputs = [ which numactl ]; # cmake
doCheck = stdenv.isLinux; # darwin tests are broken for now...
checkTarget = "test";
@ -26,8 +24,12 @@ stdenv.mkDerivation rec {
preConfigure = "autoconf";
postPatch = ''
patchShebangs bin/* src/{flexfix,vlcovgen} test_regress/{driver.pl,t/*.pl}
patchShebangs bin/* src/* nodist/* docs/bin/* examples/xml_py/* \
test_regress/{driver.pl,t/*.{pl,pf}} \
ci/* ci/docker/run/* ci/docker/run/hooks/* ci/docker/buildenv/build.sh
'';
# grep '^#!/' -R . | grep -v /nix/store | less
# (in nix-shell after patchPhase)
postInstall = lib.optionalString stdenv.isLinux ''
for x in $(ls $out/bin/verilator*); do
@ -36,10 +38,10 @@ stdenv.mkDerivation rec {
'';
meta = with lib; {
description = "Fast and robust (System)Verilog simulator/compiler";
homepage = "https://www.veripool.org/wiki/verilator";
description = "Fast and robust (System)Verilog simulator/compiler and linter";
homepage = "https://www.veripool.org/verilator";
license = with licenses; [ lgpl3Only artistic2 ];
platforms = platforms.unix;
maintainers = with maintainers; [ thoughtpolice ];
maintainers = with maintainers; [ thoughtpolice amiloradovsky ];
};
}