Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions pkgs/by-name/ki/kicad/libraries.nix
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
stdenv,
cmake,
libSrc,
compressStep,
stepreduce,
parallel,
zip,
Expand All @@ -27,9 +28,9 @@ let

postInstall =
lib.optionalString (name == "packages3d") ''
find $out -type f -name '*.step' | parallel 'stepreduce {} {} && zip -9 {.}.stpZ {} && rm {}'
find $out -type f -name '*.step' | parallel 'stepreduce {} {} ${lib.optionalString compressStep "&& zip -9 {.}.stpZ {} && rm {}"}'
''
+ lib.optionalString (name == "footprints") ''
+ lib.optionalString ((name == "footprints") && compressStep) ''
grep -rl '\.step' $out | xargs sed -i 's/\.step/.stpZ/g'
'';

Expand Down
3 changes: 2 additions & 1 deletion pkgs/by-name/ki/kicad/package.nix
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@

pname ? "kicad",
stable ? true,
compressStep ? true,
testing ? false,
withNgspice ? !stdenv.hostPlatform.isDarwin,
libngspice,
Expand Down Expand Up @@ -177,7 +178,7 @@ in
stdenv.mkDerivation rec {

# Common libraries, referenced during runtime, via the wrapper.
passthru.libraries = callPackages ./libraries.nix { inherit libSrc; };
passthru.libraries = callPackages ./libraries.nix { inherit libSrc compressStep; };
passthru.callPackage = newScope { inherit addonPath python3; };
base = callPackage ./base.nix {
inherit stable testing;
Expand Down
3 changes: 2 additions & 1 deletion pkgs/by-name/op/openroad/package.nix
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,8 @@ stdenv.mkDerivation rec {

# Upstream uses vendored package versions for some dependencies, so regression testing is prudent
# to see if there are any breaking changes in unstable that should be vendored as well.
doCheck = !stdenv.hostPlatform.isDarwin; # it seems to hang on darwin
doCheck =
!(stdenv.hostPlatform.isDarwin || (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64)); # it seems to hang on darwin and linux-aarch64
checkPhase = ''
make test
../test/regression
Expand Down
2 changes: 1 addition & 1 deletion pkgs/by-name/sb/sby/package.nix
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ stdenv.mkDerivation (finalAttrs: {
btor2tools
];

doCheck = true;
doCheck = !(stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64); # timeout tests fail on linux-aarch64

checkPhase = ''
runHook preCheck
Expand Down
6 changes: 3 additions & 3 deletions pkgs/by-name/si/silice/package.nix
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,13 @@

stdenv.mkDerivation (finalAttrs: {
pname = "silice";
version = "0-unstable-2025-07-03";
version = "0-unstable-2025-10-02";

src = fetchFromGitHub {
owner = "sylefeb";
repo = "silice";
rev = "656632ec300f8be3636cfd9bca5be954fc9c9120";
hash = "sha256-0awHQrGm4ggWE9+69ova1cXAaesaMNihbzpgAytRTks=";
rev = "73bebc454ef36cf447a99b5c50409af171675279";
hash = "sha256-GsIOs41wUjq1IYZcrASMEHAvS2/vJeJRK7I/cqSgzYY=";
fetchSubmodules = true;
};

Expand Down
41 changes: 0 additions & 41 deletions pkgs/by-name/yo/yosys/fix-clang-build.patch

This file was deleted.

14 changes: 2 additions & 12 deletions pkgs/by-name/yo/yosys/package.nix
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
lib,
stdenv,
fetchFromGitHub,
fetchpatch2,

# nativeBuildInputs
bison,
Expand Down Expand Up @@ -87,13 +86,13 @@ let
in
stdenv.mkDerivation (finalAttrs: {
pname = "yosys";
version = "0.55";
version = "0.58";

src = fetchFromGitHub {
owner = "YosysHQ";
repo = "yosys";
tag = "v${finalAttrs.version}";
hash = "sha256-GddNbAtH5SPm7KTa5kCm/vGq4xOczx+jCnOSQl55gUI=";
hash = "sha256-UAivGDi7omNTS5Qb9Yx8vMiAzbu7ezR8sa/8dag3AlY=";
fetchSubmodules = true;
leaveDotGit = true;
postFetch = ''
Expand Down Expand Up @@ -135,16 +134,7 @@ stdenv.mkDerivation (finalAttrs: {
makeFlags = [ "PREFIX=${placeholder "out"}" ];

patches = [
# Backport fix amaranth code compilation
# TODO remove when updating to 0.56
# https://github.com/YosysHQ/yosys/pull/5182
(fetchpatch2 {
name = "treat-zero-width-constant-as-zero.patch";
url = "https://github.com/YosysHQ/yosys/commit/478b6a2b3fbab0fd4097b841914cbe8bb9f67268.patch";
hash = "sha256-KeLoZfkXMk2KIPN9XBQdqWqohywQONlWUIvrGwgphKs=";
})
./plugin-search-dirs.patch
./fix-clang-build.patch
];

postPatch = ''
Expand Down
1 change: 1 addition & 0 deletions pkgs/development/compilers/yosys/plugins/synlig.nix
Original file line number Diff line number Diff line change
Expand Up @@ -87,5 +87,6 @@ stdenv.mkDerivation (finalAttrs: {
license = lib.licenses.asl20;
maintainers = with lib.maintainers; [ hzeller ];
platforms = lib.platforms.all;
broken = true; # expected headers not found in yosys 0.58
};
})
Loading