diff options
author | Weijia Wang <9713184+wegank@users.noreply.github.com> | 2023-04-10 13:34:15 +0300 |
---|---|---|
committer | Weijia Wang <9713184+wegank@users.noreply.github.com> | 2023-04-10 13:34:15 +0300 |
commit | 282c22a4d23a261c0efe9ccf67ce8805a7fd7033 (patch) | |
tree | 73698c9608ce2ac419043c8d5bf5d146ba9d9684 /pkgs | |
parent | 19502db2c3c2864a6a5b8bca0f41c0be092a00c5 (diff) |
nvc: 1.8.2 -> 1.9.0
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/applications/science/electronics/nvc/default.nix | 31 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
2 files changed, 22 insertions, 11 deletions
diff --git a/pkgs/applications/science/electronics/nvc/default.nix b/pkgs/applications/science/electronics/nvc/default.nix index cff9809b03065..5ec866ea9c490 100644 --- a/pkgs/applications/science/electronics/nvc/default.nix +++ b/pkgs/applications/science/electronics/nvc/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch , autoreconfHook , check , flex @@ -15,15 +16,28 @@ stdenv.mkDerivation rec { pname = "nvc"; - version = "1.8.2"; + version = "1.9.0"; src = fetchFromGitHub { owner = "nickg"; repo = pname; rev = "r${version}"; - hash = "sha256-s7QgufD3sQ6sZh2H78E8x0dMidHRKHUm8tASXoKK3xk="; + hash = "sha256-hsoEAFSXI2bvzZV33jdg1849fipPQlUu3MZVvht54fI="; }; + patches = [ + # TODO: remove me on next release + (fetchpatch { + url = "https://github.com/nickg/nvc/commit/c857e16c33851f8a5386b97bc0dada2836b5db83.patch"; + hash = "sha256-rvZHI1iQXT9zLpCugg5mGmMZBRbTe9PSHtDG7FVZ67Q="; + }) + ]; + + # TODO: recheck me on next release + postPatch = lib.optionalString stdenv.isLinux '' + sed -i "/vhpi4/d" test/regress/testlist.txt + ''; + nativeBuildInputs = [ autoreconfHook check @@ -36,15 +50,12 @@ stdenv.mkDerivation rec { libffi llvm zlib - ] ++ [ - (if stdenv.isLinux then elfutils else libelf) + ] ++ lib.optionals stdenv.isLinux [ + elfutils + ] ++ lib.optionals (!stdenv.isLinux) [ + libelf ]; - # TODO: recheck me on next release - postPatch = lib.optionalString stdenv.isLinux '' - sed -i "/vhpi4/d" test/regress/testlist.txt - ''; - preConfigure = '' mkdir build cd build @@ -63,7 +74,7 @@ stdenv.mkDerivation rec { description = "VHDL compiler and simulator"; homepage = "https://www.nickg.me.uk/nvc/"; license = licenses.gpl3Plus; - platforms = platforms.unix; maintainers = with maintainers; [ wegank ]; + platforms = platforms.unix; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6abbd13ebc77f..64a732f1a0d89 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -37811,7 +37811,7 @@ with pkgs; ngspice = callPackage ../applications/science/electronics/ngspice { }; - nvc = callPackage ../applications/science/electronics/nvc { }; + nvc = darwin.apple_sdk_11_0.callPackage ../applications/science/electronics/nvc { }; openems = callPackage ../applications/science/electronics/openems { qcsxcad = libsForQt5.qcsxcad; |