Skip to content

[Backport release-25.05] qrencode: adopt, cleanup#419438

Merged
pbsds merged 2 commits intoNixOS:release-25.05from
mdaniels5757:backport-418487-to-release-25.05
Jul 2, 2025
Merged

[Backport release-25.05] qrencode: adopt, cleanup#419438
pbsds merged 2 commits intoNixOS:release-25.05from
mdaniels5757:backport-418487-to-release-25.05

Conversation

@mdaniels5757
Copy link
Member

@mdaniels5757 mdaniels5757 commented Jun 24, 2025

Manual backport of #407835 (2 commits), b8ade8b#diff-f26ba77dc8656c487f887e926fa7f28c1aa0a8dd0916eb984919707b79f817a5 (just this file, which will probably set off the cherry-pick check), and #418487 to release-25.05.

  • Before merging, ensure that this backport is acceptable for the release.
    • Even as a non-committer, if you find that it is not acceptable, leave a comment.

@mdaniels5757 mdaniels5757 marked this pull request as draft June 24, 2025 03:05
@mdaniels5757
Copy link
Member Author

mdaniels5757 commented Jun 24, 2025

I'll need to rebase this once #419440 is merged and the staging-25.05 cycle finishes. (That will also remove the first two commits.)

@pbsds
Copy link
Member

pbsds commented Jun 25, 2025

subscribed

Picked from a treewide.

Signed-off-by: phanirithvij <phanirithvij2000@gmail.com>
(cherry picked from commit d75957a)
* Switched `rev` to `tag`.
* Added `passthru.updateScript`
* Removed `with lib;` from `meta`
* Updated `meta.description` and `meta.longDescription` to reflect that there is a CLI tool too.
* Adopted.

(cherry picked from commit 9d644e7)
@mdaniels5757 mdaniels5757 force-pushed the backport-418487-to-release-25.05 branch from 2c00d36 to da0a6ae Compare July 2, 2025 11:04
@mdaniels5757 mdaniels5757 marked this pull request as ready for review July 2, 2025 11:05
@mdaniels5757
Copy link
Member Author

Should be ready now! Tested on x86_64-linux.

@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: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 1 This PR causes 1 package to rebuild on Linux. 4.workflow: backport This targets a stable branch labels Jul 2, 2025
@pbsbot
Copy link

pbsbot commented Jul 2, 2025

nixpkgs-review result

Generated using nixpkgs-review.

Command: nixpkgs-review pr 419438
Commit: da0a6aee0f6499233683bf49acc17a4a55b8de5e


x86_64-linux

✅ 1 package built:
  • tests.testers.runCommand.bork

@pbsds
Copy link
Member

pbsds commented Jul 2, 2025

lol what is this eval? I'll do an --eval local...

@pbsbot
Copy link

pbsbot commented Jul 2, 2025

nixpkgs-review result

Generated using nixpkgs-review.

Command: nixpkgs-review pr 419438
Commit: da0a6aee0f6499233683bf49acc17a4a55b8de5e


x86_64-linux

@pbsds pbsds merged commit 62c728b into NixOS:release-25.05 Jul 2, 2025
28 of 33 checks passed
@mdaniels5757 mdaniels5757 deleted the backport-418487-to-release-25.05 branch July 2, 2025 13:13
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

4.workflow: backport This targets a stable branch 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. 10.rebuild-linux: 1 This PR causes 1 package to rebuild on Linux.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants