Unverified Commit 40981448 authored by Pierre Bourdon's avatar Pierre Bourdon Committed by GitHub
Browse files

Merge pull request #266486 from Luflosi/update/yosys 

yosys: 0.34 -> 0.35
parents 8ee39d83 46478168

pkgs/applications/science/logic/abc/default.nix

+17 −10
Original line number Diff line number Diff line 
{ lib, stdenv, fetchFromGitHub

, readline, cmake

{ lib

, stdenv

, fetchFromGitHub

, readline

, cmake

}:



stdenv.mkDerivation rec {

stdenv.mkDerivation (finalAttrs: {

  pname   = "abc-verifier";

  version = "unstable-2023-09-13";

  version = "unstable-2023-10-13";



  src = fetchFromGitHub {

    owner = "yosyshq";

    repo  = "abc";

    rev   = "daad9ede0137dc58487a0abc126253e671a85b14";

    hash  = "sha256-5XeFYvdqT08xduFUDC5yK1jEOV1fYzyQD7N9ZmG3mpQ=";

    rev   = "896e5e7dedf9b9b1459fa019f1fa8aa8101fdf43";

    hash  = "sha256-ou+E2lvDEOxXRXNygE/TyVi7quqk+CJHRI+HDI0xljE=";

  };



  nativeBuildInputs = [ cmake ];

  buildInputs = [ readline ];



  installPhase = "mkdir -p $out/bin && mv abc $out/bin";

  installPhase = ''

    runHook preInstall

    install -Dm755 'abc' "$out/bin/abc"

    runHook postInstall

  '';



  # needed by yosys

  passthru.rev = src.rev;

  passthru.rev = finalAttrs.src.rev;



  meta = with lib; {

    description = "A tool for squential logic synthesis and formal verification";

    homepage    = "https://people.eecs.berkeley.edu/~alanmi/abc";

    license     = licenses.mit;

    maintainers = with maintainers; [ thoughtpolice ];

    maintainers = with maintainers; [ thoughtpolice Luflosi ];

    mainProgram = "abc";

    platforms   = platforms.unix;

  };

}
 
})

pkgs/development/compilers/yosys/default.nix

+8 −8
Original line number Diff line number Diff line
@@ -69,15 +69,15 @@ let 
  } // (yosys-symbiflow);





in stdenv.mkDerivation rec {

in stdenv.mkDerivation (finalAttrs: {

  pname   = "yosys";

  version = "0.34";

  version = "0.35";



  src = fetchFromGitHub {

    owner = "YosysHQ";

    repo  = "yosys";

    rev   = "refs/tags/${pname}-${version}";

    hash  = "sha256-GHDsMBj7DRb9ffESgzd1HzDAA6Cyft5PomidvIMzn9g=";

    rev   = "refs/tags/${finalAttrs.pname}-${finalAttrs.version}";

    hash  = "sha256-jB8y7XGDX9rVF6c4FSTLOyvsxPhdjU8Taj6MQeoU4KQ=";

  };



  enableParallelBuilding = true;
@@ -101,7 +101,7 @@ in stdenv.mkDerivation rec { 


  postPatch = ''

    substituteInPlace ./Makefile \

      --replace 'echo UNKNOWN' 'echo ${builtins.substring 0 10 src.rev}'

      --replace 'echo UNKNOWN' 'echo ${builtins.substring 0 10 finalAttrs.src.rev}'



    chmod +x ./misc/yosys-config.in

    patchShebangs tests ./misc/yosys-config.in
@@ -120,7 +120,7 @@ in stdenv.mkDerivation rec { 
    fi



    if ! grep -q "YOSYS_VER := $version" Makefile; then

      echo "ERROR: yosys version in Makefile isn't equivalent to version of the nix package (allegedly ${version}), failing."

      echo "ERROR: yosys version in Makefile isn't equivalent to version of the nix package (allegedly ${finalAttrs.version}), failing."

      exit 1

    fi

  '';
@@ -150,6 +150,6 @@ in stdenv.mkDerivation rec { 
    homepage    = "https://yosyshq.net/yosys/";

    license     = licenses.isc;

    platforms   = platforms.all;

    maintainers = with maintainers; [ shell thoughtpolice emily ];

    maintainers = with maintainers; [ shell thoughtpolice emily Luflosi ];

  };

}
 
})