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.

Sign up for GitHub

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

Jump to bottom

tmux-plugins: fix the fzf-tmux-url derivation #44559

Merged
merged 1 commit into from Aug 6, 2018
Merged

tmux-plugins: fix the fzf-tmux-url derivation #44559

merged 1 commit into from Aug 6, 2018

Conversation

kalbasit
Copy link
Member

@kalbasit kalbasit commented Aug 6, 2018 •
edited

Motivation for this change

The current buildTmuxPluginFrom2Nix computes the path of rtp by replacing dashes with an underscore in the plugin name and assume it's at the root of the plugin repo. This PR adds a new parameter to buildTmuxPluginFrom2Nix called rtpFilePath to allow plugins to specify a custom path for the rtp (relative to the plugin $out). This path for fzf-tmux-url is fzf-url.tmux

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nox --run "nox-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Fits CONTRIBUTING.md.
$ nix repl .
Welcome to Nix version 2.0.4. Type :? for help.

Loading '.'...
Added 9270 variables.

nix-repl> p = tmuxPlugins.fzf-tmux-url

nix-repl> p.rtp
"/nix/store/k3v0vvfkw9kkirf0k5gdiz8kqvrj8i3i-tmuxplugin-fzf-tmux-url/share/tmux-plugins/fzf-tmux-url/fzf-url.tmux"

$ stat /nix/store/k3v0vvfkw9kkirf0k5gdiz8kqvrj8i3i-tmuxplugin-fzf-tmux-url/share/tmux-plugins/fzf-tmux-url/fzf-url.tmux
  File: /nix/store/k3v0vvfkw9kkirf0k5gdiz8kqvrj8i3i-tmuxplugin-fzf-tmux-url/share/tmux-plugins/fzf-tmux-url/fzf-url.tmux
  Size: 612             Blocks: 8          IO Block: 4096   regular file
Device: 1bh/27d Inode: 11909887    Links: 7
Access: (0555/-r-xr-xr-x)  Uid: (    0/    root)   Gid: (    0/    root)
Access: 2018-08-05 00:12:57.245965835 -0700
Modify: 1969-12-31 16:00:01.000000000 -0800
Change: 2018-08-06 11:14:51.614312143 -0700
 Birth: -

@kalbasit kalbasit mentioned this pull request Aug 6, 2018
Merged
9 tasks
@infinisil
Copy link
Member

@GrahamcOfBorg build tmuxPlugins.fzf-tmux-url

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: tmuxPlugins.fzf-tmux-url

Partial log (click to expand)

building
installing
post-installation fixup
shrinking RPATHs of ELF executables and libraries in /nix/store/k3v0vvfkw9kkirf0k5gdiz8kqvrj8i3i-tmuxplugin-fzf-tmux-url
strip is /nix/store/1hi76hr87bd1y1q1qjk0lv8nmcjip1c8-binutils-2.30/bin/strip
patching script interpreter paths in /nix/store/k3v0vvfkw9kkirf0k5gdiz8kqvrj8i3i-tmuxplugin-fzf-tmux-url
/nix/store/k3v0vvfkw9kkirf0k5gdiz8kqvrj8i3i-tmuxplugin-fzf-tmux-url/share/tmux-plugins/fzf-tmux-url/fzf-url.tmux: interpreter directive changed from "/usr/bin/env bash" to "/nix/store/dkh7l9a4sx7zqh8riqbj3z21sz25p8xy-bash-4.4-p23/bin/bash"
/nix/store/k3v0vvfkw9kkirf0k5gdiz8kqvrj8i3i-tmuxplugin-fzf-tmux-url/share/tmux-plugins/fzf-tmux-url/fzf-url.sh: interpreter directive changed from "/usr/bin/env bash" to "/nix/store/dkh7l9a4sx7zqh8riqbj3z21sz25p8xy-bash-4.4-p23/bin/bash"
checking for references to /build in /nix/store/k3v0vvfkw9kkirf0k5gdiz8kqvrj8i3i-tmuxplugin-fzf-tmux-url...
/nix/store/k3v0vvfkw9kkirf0k5gdiz8kqvrj8i3i-tmuxplugin-fzf-tmux-url

@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Attempted: tmuxPlugins.fzf-tmux-url

Partial log (click to expand)

building
installing
post-installation fixup
shrinking RPATHs of ELF executables and libraries in /nix/store/8pd0w2w8kf43smk0c2r09jk5qpiimxd6-tmuxplugin-fzf-tmux-url
strip is /nix/store/zrs21zqcchgyabjf4xfimncdq16njizc-binutils-2.30/bin/strip
patching script interpreter paths in /nix/store/8pd0w2w8kf43smk0c2r09jk5qpiimxd6-tmuxplugin-fzf-tmux-url
/nix/store/8pd0w2w8kf43smk0c2r09jk5qpiimxd6-tmuxplugin-fzf-tmux-url/share/tmux-plugins/fzf-tmux-url/fzf-url.tmux: interpreter directive changed from "/usr/bin/env bash" to "/nix/store/6vqgi9d49smsbr2qxra52yhipg0yxf9f-bash-4.4-p23/bin/bash"
/nix/store/8pd0w2w8kf43smk0c2r09jk5qpiimxd6-tmuxplugin-fzf-tmux-url/share/tmux-plugins/fzf-tmux-url/fzf-url.sh: interpreter directive changed from "/usr/bin/env bash" to "/nix/store/6vqgi9d49smsbr2qxra52yhipg0yxf9f-bash-4.4-p23/bin/bash"
checking for references to /build in /nix/store/8pd0w2w8kf43smk0c2r09jk5qpiimxd6-tmuxplugin-fzf-tmux-url...
/nix/store/8pd0w2w8kf43smk0c2r09jk5qpiimxd6-tmuxplugin-fzf-tmux-url

@infinisil infinisil merged commit b234f07 into NixOS:master Aug 6, 2018
@kalbasit kalbasit deleted the nixpkgs_fix-tmux-fzf-url branch August 6, 2018 18:41
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
8.has: clean-up 10.rebuild-darwin: 0 10.rebuild-linux: 1-10
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@kalbasit @infinisil @GrahamcOfBorg