pyrox.dev / nixpkgs
lol
fork atom

Merge pull request #266486 from Luflosi/update/yosys

yosys: 0.34 -> 0.35

authored by Pierre Bourdon and committed by GitHub 40981448 8ee39d83

+25 -18
unified split
+17 -10
pkgs/applications/science/logic/abc/default.nix
··· 1 - { lib, stdenv, fetchFromGitHub 2 - , readline, cmake 3 }: 4 5 - stdenv.mkDerivation rec { 6 pname = "abc-verifier"; 7 - version = "unstable-2023-09-13"; 8 9 src = fetchFromGitHub { 10 owner = "yosyshq"; 11 repo = "abc"; 12 - rev = "daad9ede0137dc58487a0abc126253e671a85b14"; 13 - hash = "sha256-5XeFYvdqT08xduFUDC5yK1jEOV1fYzyQD7N9ZmG3mpQ="; 14 }; 15 16 nativeBuildInputs = [ cmake ]; 17 buildInputs = [ readline ]; 18 19 - installPhase = "mkdir -p $out/bin && mv abc $out/bin"; 20 21 # needed by yosys 22 - passthru.rev = src.rev; 23 24 meta = with lib; { 25 description = "A tool for squential logic synthesis and formal verification"; 26 homepage = "https://people.eecs.berkeley.edu/~alanmi/abc"; 27 license = licenses.mit; 28 - maintainers = with maintainers; [ thoughtpolice ]; 29 mainProgram = "abc"; 30 platforms = platforms.unix; 31 }; 32 - }
··· 1 + { lib 2 + , stdenv 3 + , fetchFromGitHub 4 + , readline 5 + , cmake 6 }: 7 8 + stdenv.mkDerivation (finalAttrs: { 9 pname = "abc-verifier"; 10 + version = "unstable-2023-10-13"; 11 12 src = fetchFromGitHub { 13 owner = "yosyshq"; 14 repo = "abc"; 15 + rev = "896e5e7dedf9b9b1459fa019f1fa8aa8101fdf43"; 16 + hash = "sha256-ou+E2lvDEOxXRXNygE/TyVi7quqk+CJHRI+HDI0xljE="; 17 }; 18 19 nativeBuildInputs = [ cmake ]; 20 buildInputs = [ readline ]; 21 22 + installPhase = '' 23 + runHook preInstall 24 + install -Dm755 'abc' "$out/bin/abc" 25 + runHook postInstall 26 + ''; 27 28 # needed by yosys 29 + passthru.rev = finalAttrs.src.rev; 30 31 meta = with lib; { 32 description = "A tool for squential logic synthesis and formal verification"; 33 homepage = "https://people.eecs.berkeley.edu/~alanmi/abc"; 34 license = licenses.mit; 35 + maintainers = with maintainers; [ thoughtpolice Luflosi ]; 36 mainProgram = "abc"; 37 platforms = platforms.unix; 38 }; 39 + })
+8 -8
pkgs/development/compilers/yosys/default.nix
··· 69 } // (yosys-symbiflow); 70 71 72 - in stdenv.mkDerivation rec { 73 pname = "yosys"; 74 - version = "0.34"; 75 76 src = fetchFromGitHub { 77 owner = "YosysHQ"; 78 repo = "yosys"; 79 - rev = "refs/tags/${pname}-${version}"; 80 - hash = "sha256-GHDsMBj7DRb9ffESgzd1HzDAA6Cyft5PomidvIMzn9g="; 81 }; 82 83 enableParallelBuilding = true; ··· 101 102 postPatch = '' 103 substituteInPlace ./Makefile \ 104 - --replace 'echo UNKNOWN' 'echo ${builtins.substring 0 10 src.rev}' 105 106 chmod +x ./misc/yosys-config.in 107 patchShebangs tests ./misc/yosys-config.in ··· 120 fi 121 122 if ! grep -q "YOSYS_VER := $version" Makefile; then 123 - echo "ERROR: yosys version in Makefile isn't equivalent to version of the nix package (allegedly ${version}), failing." 124 exit 1 125 fi 126 ''; ··· 150 homepage = "https://yosyshq.net/yosys/"; 151 license = licenses.isc; 152 platforms = platforms.all; 153 - maintainers = with maintainers; [ shell thoughtpolice emily ]; 154 }; 155 - }
··· 69 } // (yosys-symbiflow); 70 71 72 + in stdenv.mkDerivation (finalAttrs: { 73 pname = "yosys"; 74 + version = "0.35"; 75 76 src = fetchFromGitHub { 77 owner = "YosysHQ"; 78 repo = "yosys"; 79 + rev = "refs/tags/${finalAttrs.pname}-${finalAttrs.version}"; 80 + hash = "sha256-jB8y7XGDX9rVF6c4FSTLOyvsxPhdjU8Taj6MQeoU4KQ="; 81 }; 82 83 enableParallelBuilding = true; ··· 101 102 postPatch = '' 103 substituteInPlace ./Makefile \ 104 + --replace 'echo UNKNOWN' 'echo ${builtins.substring 0 10 finalAttrs.src.rev}' 105 106 chmod +x ./misc/yosys-config.in 107 patchShebangs tests ./misc/yosys-config.in ··· 120 fi 121 122 if ! grep -q "YOSYS_VER := $version" Makefile; then 123 + echo "ERROR: yosys version in Makefile isn't equivalent to version of the nix package (allegedly ${finalAttrs.version}), failing." 124 exit 1 125 fi 126 ''; ··· 150 homepage = "https://yosyshq.net/yosys/"; 151 license = licenses.isc; 152 platforms = platforms.all; 153 + maintainers = with maintainers; [ shell thoughtpolice emily Luflosi ]; 154 }; 155 + })