Unverified Commit 5de5b62c authored by Weijia Wang's avatar Weijia Wang Committed by GitHub
Browse files

Merge pull request #225422 from wegank/nvc-bump 

nvc: 1.8.2 -> 1.9.0
parents 0e18148b 282c22a4

pkgs/applications/science/electronics/nvc/default.nix

+21 −10
Original line number Diff line number Diff line 
{ 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;

  };

}

pkgs/top-level/all-packages.nix

+1 −1
Original line number Diff line number Diff line
@@ -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;