Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

sby: 0.47 -> 0.48 #369528

Merged
merged 2 commits into from
Jan 2, 2025
Merged

sby: 0.47 -> 0.48 #369528

merged 2 commits into from
Jan 2, 2025

Conversation

Liamolucko
Copy link
Contributor

Its tag naming was changed the same as Yosys, so r-ryantm couldn't update it either.

This also gets sby working with Yosys 0.48; I didn't notice it being broken in #368946 because I only ran nixpkgs-review on macOS where sby doesn't build due to broken dependencies anyway. Sorry!

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 25.05 Release Notes (or backporting 24.11 and 25.05 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

Add a 👍 reaction to pull requests you find important.

Its tag naming was changed the same as Yosys, so r-ryantm couldn't
update it either.

This also gets sby working with Yosys 0.48; I didn't notice it being
broken in NixOS#368946 because I only ran `nixpkgs-review` on macOS where sby
doesn't build due to broken dependencies anyway. Sorry!
@lucasew
Copy link
Contributor

lucasew commented Dec 31, 2024

nixpkgs-review result

Generated using nixpkgs-review.

Command: nixpkgs-review pr 369528


x86_64-linux

⏩ 10 packages marked as broken and skipped:
  • python312Packages.cynthion
  • python312Packages.cynthion.dist
  • python312Packages.luna-soc
  • python312Packages.luna-soc.dist
  • python312Packages.luna-usb
  • python312Packages.luna-usb.dist
  • python313Packages.luna-soc
  • python313Packages.luna-soc.dist
  • python313Packages.luna-usb
  • python313Packages.luna-usb.dist
❌ 2 packages failed to build:
  • cynthion
  • cynthion.dist
✅ 15 packages built:
  • glasgow
  • glasgow.dist
  • python312Packages.amaranth
  • python312Packages.amaranth-boards
  • python312Packages.amaranth-boards.dist
  • python312Packages.amaranth-soc
  • python312Packages.amaranth-soc.dist
  • python312Packages.amaranth.dist
  • python313Packages.amaranth
  • python313Packages.amaranth-boards
  • python313Packages.amaranth-boards.dist
  • python313Packages.amaranth-soc
  • python313Packages.amaranth-soc.dist
  • python313Packages.amaranth.dist
  • sby

@FliegendeWurst
Copy link
Member

You can additionally put the test programs in the correct input:

diff --git a/pkgs/by-name/sb/sby/package.nix b/pkgs/by-name/sb/sby/package.nix
index ca9687a2e70d..28ee23e1947f 100644
--- a/pkgs/by-name/sb/sby/package.nix
+++ b/pkgs/by-name/sb/sby/package.nix
@@ -19,18 +19,21 @@ in
 
 stdenv.mkDerivation rec {
   pname = "sby";
-  version = "0.47";
+  version = "0.48";
 
   src = fetchFromGitHub {
     owner = "YosysHQ";
     repo = "sby";
-    rev = "yosys-${version}";
-    hash = "sha256-Il2pXw2doaoZrVme2p0dSUUa8dCQtJJrmYitn1MkTD4=";
+    rev = "v${version}";
+    hash = "sha256-icOlWutvajHMCi2YUIGU4v5S63YobXw4fYYUvPoSzo4=";
   };
 
-  nativeBuildInputs = [ bash ];
-  buildInputs = [
+  nativeBuildInputs = [
+    bash
     pythonEnv
+  ];
+
+  nativeCheckInputs = [
     yosys
     boolector
     yices
@@ -40,7 +43,7 @@ stdenv.mkDerivation rec {
   ];
 
   postPatch = ''
-    patchShebangs docs/source/conf.py \
+    patchShebangs --build docs/source/conf.py \
       docs/source/conf.diff \
       tests/autotune/*.sh \
       tests/keepgoing/*.sh \

The references patched in postPatch will still work.

@ofborg ofborg bot requested review from RCoeurjoly and thoughtpolice December 31, 2024 10:40
@thoughtpolice
Copy link
Member

It would be nice to include the fixes mentioned by @FliegendeWurst but it's not absolutely mandatory. I can wait a bit until merging this to give you a chance to fix it.

@lucasew
Copy link
Contributor

lucasew commented Dec 31, 2024

nixpkgs-review result

Generated using nixpkgs-review.

Command: nixpkgs-review pr 369528


x86_64-linux

⏩ 10 packages marked as broken and skipped:
  • python312Packages.cynthion
  • python312Packages.cynthion.dist
  • python312Packages.luna-soc
  • python312Packages.luna-soc.dist
  • python312Packages.luna-usb
  • python312Packages.luna-usb.dist
  • python313Packages.luna-soc
  • python313Packages.luna-soc.dist
  • python313Packages.luna-usb
  • python313Packages.luna-usb.dist
❌ 2 packages failed to build:
  • cynthion
  • cynthion.dist
✅ 15 packages built:
  • glasgow
  • glasgow.dist
  • python312Packages.amaranth
  • python312Packages.amaranth-boards
  • python312Packages.amaranth-boards.dist
  • python312Packages.amaranth-soc
  • python312Packages.amaranth-soc.dist
  • python312Packages.amaranth.dist
  • python313Packages.amaranth
  • python313Packages.amaranth-boards
  • python313Packages.amaranth-boards.dist
  • python313Packages.amaranth-soc
  • python313Packages.amaranth-soc.dist
  • python313Packages.amaranth.dist
  • sby

@lucasew
Copy link
Contributor

lucasew commented Dec 31, 2024

Seems like nixpkgs-review was working right this time lol

@wegank wegank merged commit 2c9288a into NixOS:master Jan 2, 2025
23 of 24 checks passed
@Liamolucko Liamolucko deleted the update-sby branch January 3, 2025 11:25
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants