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

lesspipe: 2.14 -> 2.17 #371214

Merged
merged 2 commits into from
Jan 8, 2025
Merged

lesspipe: 2.14 -> 2.17 #371214

merged 2 commits into from
Jan 8, 2025

Conversation

sersorrel
Copy link
Contributor

Fixes a regression which completely broke lesspipe for bat users with specific config options, and includes a security fix related to ar.

resholve appears to complain about locale for me on x86_64-linux now (possibly as a result of wofr06/lesspipe@23e0e4d?), so it's now just included in external unconditionally.

Changelog: https://github.com/wofr06/lesspipe/blob/v2.17/ChangeLog

Fixes #371076

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.

@sersorrel sersorrel added 1.severity: security Issues which raise a security issue, or PRs that fix one backport release-24.11 Backport PR automatically labels Jan 5, 2025
@lucasew
Copy link
Contributor

lucasew commented Jan 7, 2025

nixpkgs-review result

Generated using nixpkgs-review.

Command: nixpkgs-review pr 371214


x86_64-linux

✅ 1 package built:
  • lesspipe

@pbsds pbsds merged commit ac22168 into NixOS:master Jan 8, 2025
23 of 27 checks passed
@nix-backports
Copy link

nix-backports bot commented Jan 8, 2025

Backport failed for release-24.11, because it was unable to cherry-pick the commit(s).

Please cherry-pick the changes locally and resolve any conflicts.

git fetch origin release-24.11
git worktree add -d .worktree/backport-371214-to-release-24.11 origin/release-24.11
cd .worktree/backport-371214-to-release-24.11
git switch --create backport-371214-to-release-24.11
git cherry-pick -x 4b487410b65093fdb9de269b0b86aeee1ca481d3 7233b53e3c3d484f7f29eca9073135dbf1a871b3

@vancluever
Copy link
Contributor

vancluever commented Jan 8, 2025

@sersorrel sorry for the delay! I was just looking over this as the merge was happening 😆 excited to see it in! Hopefully it gets into 24.11 (although looks like we're still stuck on 2.11 there).

@@ -85,89 +85,84 @@ stdenv.mkDerivation rec {
];
fake = {
# script guards usage behind has_cmd test function, it's safe to leave these external and optional
external =
Copy link
Member

Choose a reason for hiding this comment

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

This is nothing you can fix but this behaviour by the new formatter is really dumb.

@sersorrel sersorrel deleted the lesspipe-2.17 branch January 8, 2025 21:12
@sersorrel sersorrel added backport release-24.11 Backport PR automatically and removed backport release-24.11 Backport PR automatically labels Jan 11, 2025
@nix-backports
Copy link

nix-backports bot commented Jan 11, 2025

Successfully created backport PR for release-24.11:

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
1.severity: security Issues which raise a security issue, or PRs that fix one 10.rebuild-darwin: 1-10 10.rebuild-linux: 1-10 backport release-24.11 Backport PR automatically
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Update request: lesspipe 2.14 → 2.17
5 participants