Skip to content

{sigrok-cli, libsigrok, pulseview, libsigrok-sipeed}: bump version, init libsigrok fork#483165

Merged
cab404 merged 4 commits intoNixOS:masterfrom
AwesomeQubic:update-sigrok-related-packages
Mar 3, 2026
Merged

{sigrok-cli, libsigrok, pulseview, libsigrok-sipeed}: bump version, init libsigrok fork#483165
cab404 merged 4 commits intoNixOS:masterfrom
AwesomeQubic:update-sigrok-related-packages

Conversation

@AwesomeQubic
Copy link
Member

Updated sigrok packages, and swiched libsigrok to a fork so I can use my devices (its just libsigrok with extra drivers)
Tested pulseview and sigrok-cli seems to work fine

Things done

  • Built on platform:
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • Tested, as applicable:
  • Ran nixpkgs-review on this PR. See nixpkgs-review usage.
  • Tested basic functionality of all binary files, usually in ./result/bin/.
  • Nixpkgs Release Notes
    • Package update: when the change is major or breaking.
  • NixOS Release Notes
    • Module addition: when adding a new NixOS module.
    • Module update: when the change is significant.
  • Fits CONTRIBUTING.md, pkgs/README.md, maintainers/README.md and other READMEs.

@nixpkgs-ci nixpkgs-ci bot added 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. labels Jan 23, 2026
@AwesomeQubic AwesomeQubic force-pushed the update-sigrok-related-packages branch from f732f58 to 30bedb4 Compare January 23, 2026 20:27
@qweered
Copy link
Contributor

qweered commented Jan 23, 2026

nixpkgs-review result

Generated using nixpkgs-review-gha

Command: nixpkgs-review pr 483165
Commit: 30bedb4e855254a010225ffa65ea2f51360bc6ff (subsequent changes)
Merge: 281d40f5eb80427a8f8a3db7a1ebd13d7a3effa1

Logs: https://github.com/qweered/nixpkgs-review-gha/actions/runs/21304419596


x86_64-linux

✅ 7 packages built:
  • collectd
  • libsigrok
  • pulseview
  • python313Packages.sigrok
  • python314Packages.sigrok
  • sigrok-cli
  • smuview

aarch64-linux

✅ 7 packages built:
  • collectd
  • libsigrok
  • pulseview
  • python313Packages.sigrok
  • python314Packages.sigrok
  • sigrok-cli
  • smuview

x86_64-darwin (sandbox = relaxed)

✅ 6 packages built:
  • libsigrok
  • pulseview
  • python313Packages.sigrok
  • python314Packages.sigrok
  • sigrok-cli
  • smuview

aarch64-darwin (sandbox = relaxed)

✅ 6 packages built:
  • libsigrok
  • pulseview
  • python313Packages.sigrok
  • python314Packages.sigrok
  • sigrok-cli
  • smuview

Copy link
Contributor

@qweered qweered left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Approved automatically following the successful run of nixpkgs-review.

@nixpkgs-ci nixpkgs-ci bot added the 12.approvals: 1 This PR was reviewed and approved by one person. label Jan 24, 2026
Copy link
Member

@sternenseemann sternenseemann left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think this change of upstream makes sense to do since it isn't even a fork with any kind of maintenance goals (except adding drivers for a device its authors are developing). It should rather be a separate package, e.g. libsigrok-sipeed for now.

@AwesomeQubic
Copy link
Member Author

AwesomeQubic commented Jan 24, 2026

yes but you need to build everything against it for it to well work, also we could just fetchPatch from their PR to libsigrok adding device support

sigrokproject/libsigrok#275

@sternenseemann
Copy link
Member

This can be achieved by final: prev: { libsigrok = final.libsigrok-sipeed; } downstream. Patching would be better, but I'm not really comfortable declaring that this big code addition is fine to ship to users necessarily.

@AwesomeQubic
Copy link
Member Author

AwesomeQubic commented Jan 24, 2026

Sure, but if you do not these users will have hardware that is unusable without knowing why.
I am fine with using a overlay tho I would ask kindly that you test my changes on your devices that work with upstream libsigrok since well I will not be able to for obvious reasons.

@AwesomeQubic
Copy link
Member Author

Perhaps a good idea would just be to add a option like hardware.sipeed.enable and then deciding what libsigrok to use systemwide?
Tho idk if that is a good solution for a problem that will be fixed in 4 weeks

@nixpkgs-ci nixpkgs-ci bot added the 8.has: package (update) This PR updates a package to a newer version label Jan 27, 2026
@AwesomeQubic AwesomeQubic force-pushed the update-sigrok-related-packages branch from 30bedb4 to b9813f8 Compare February 3, 2026 18:40
@AwesomeQubic AwesomeQubic changed the title {sigrok-cli, libsigrok, pulseview}: bump version, switch libsigrok to fork {sigrok-cli, libsigrok, pulseview, libsigrok-sipeed}: bump version, init ligsigrok fork Feb 3, 2026
@nixpkgs-ci nixpkgs-ci bot added the 8.has: package (new) This PR adds a new package label Feb 3, 2026
@AwesomeQubic AwesomeQubic force-pushed the update-sigrok-related-packages branch from b9813f8 to 512bade Compare February 3, 2026 19:11
@bjornfor bjornfor changed the title {sigrok-cli, libsigrok, pulseview, libsigrok-sipeed}: bump version, init ligsigrok fork {sigrok-cli, libsigrok, pulseview, libsigrok-sipeed}: bump version, init libsigrok fork Feb 3, 2026
@AwesomeQubic
Copy link
Member Author

@sternenseemann please review

@cab404
Copy link
Member

cab404 commented Mar 3, 2026

@AwesomeQubic hi! thanks for your PR

since pulseview got broken in master, I came across it)

given that pulseview does require a bump rn (upstream boost stopped being compatible with the current version), and that upstream libsigrok didn't merge slogic yet (alas they do seem close), maybe let's just go ahead and merge it.

however i don't really think that temporary not-yet-upstream patches like libsigrok-sipeed belong in nixpkgs — and more like in nixos documentation or wiki
if it makes it to 26.05 — we'll have to add a shim upon removal, which will have to stay there for a while, which is undesirable

so... would it be okay for you to not add libsigrok-sipeed, since it seems that you yourself agree it will be upstreamed soon?

eeh, if it will be upstreamed soon (in the next two months) — we'll have time to remove it. otherwise we would be justified to have it.

since from what i've checked it appears to be functioning just fine, and that edits appear to coinside with wishes of package maintainer, I'll be merging it

@cab404 cab404 added this pull request to the merge queue Mar 3, 2026
Merged via the queue into NixOS:master with commit 1eb3355 Mar 3, 2026
29 of 31 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

8.has: package (new) This PR adds a new package 8.has: package (update) This PR updates a package to a newer version 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. 12.approvals: 1 This PR was reviewed and approved by one person.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants