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

clifm 1.14.6 -> 1.15 #263659

Merged
merged 1 commit into from
Nov 5, 2023
Merged

clifm 1.14.6 -> 1.15 #263659

merged 1 commit into from
Nov 5, 2023

Conversation

nadir-ishiguro
Copy link
Contributor

changelog: https://github.com/leo-arch/clifm/releases/tag/v1.15

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/)
  • 23.11 Release Notes (or backporting 23.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.

@nixos-discourse
Copy link

This pull request has been mentioned on NixOS Discourse. There might be relevant details there:

https://discourse.nixos.org/t/prs-ready-for-review/3032/2853

@pbsds
Copy link
Contributor

pbsds commented Nov 3, 2023

Please reword the commit to start with clifm:, otherwise ofborg doesn't understand it. :)

Also the shebangs in $out/share/clifm/tools/ don't work on nixos, consider patching #!/usr/bin/python3 to #!/usr/bin/env python3

@nadir-ishiguro
Copy link
Contributor Author

Please reword the commit to start with clifm:, otherwise ofborg doesn't understand it. :)

Also the shebangs in $out/share/clifm/tools/ don't work on nixos, consider patching #!/usr/bin/python3 to #!/usr/bin/env python3

I changed the commit message. Thank you for pointing that out. I have no idea how to patch the python shebang though. Would be grateful for any help with that.

@ghost
Copy link

ghost commented Nov 3, 2023

Please reword the commit to start with clifm:, otherwise ofborg doesn't understand it. :)
Also the shebangs in $out/share/clifm/tools/ don't work on nixos, consider patching #!/usr/bin/python3 to #!/usr/bin/env python3

I changed the commit message. Thank you for pointing that out. I have no idea how to patch the python shebang though. Would be grateful for any help with that.

not sure what the OP has in mind but adding python3 to the args and buildInputs will enable patchShebangs to work. though if those scripts are run for the build -- the python ones look like they are related to manpages -- might need to add

  postPatch = ''
    patchShebangs misc/tools
  ''; 

@nadir-ishiguro
Copy link
Contributor Author

nadir-ishiguro commented Nov 3, 2023

Please reword the commit to start with clifm:, otherwise ofborg doesn't understand it. :)
Also the shebangs in $out/share/clifm/tools/ don't work on nixos, consider patching #!/usr/bin/python3 to #!/usr/bin/env python3

I changed the commit message. Thank you for pointing that out. I have no idea how to patch the python shebang though. Would be grateful for any help with that.

not sure what the OP has in mind but adding python3 to the args and buildInputs will enable patchShebangs to work. though if those scripts are run for the build -- the python ones look like they are related to manpages -- might need to add

  postPatch = ''
    patchShebangs misc/tools
  ''; 

Thank you. I was playing around with patchShebangs, but missed that I had to add python3 to buildInputs and args. After I did that, I checked if manually invoking patchShebangs was necessary at all and it's not. Everything gets automatically patched without manually specifying the python scripts.

Seems like things are working fine now.

@pbsds
Copy link
Contributor

pbsds commented Nov 3, 2023

I'm traveling atm and won't be able to test this for a few days, but if none get to this by Wednesday I'll have a look. Diff lgtm!

@pbsds
Copy link
Contributor

pbsds commented Nov 5, 2023

Found WIFI, LGTM

Result of nixpkgs-review pr 263659 run on x86_64-linux 1

1 package built:
  • clifm

@pbsds pbsds merged commit 81baa4d into NixOS:master Nov 5, 2023
21 of 22 checks passed
@nadir-ishiguro nadir-ishiguro deleted the update-clifm branch January 9, 2024 23:02
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.

None yet

6 participants