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

st: remove unused build inputs, drop wrapper #47724

Merged
merged 1 commit into from Oct 3, 2018
Merged

st: remove unused build inputs, drop wrapper #47724

merged 1 commit into from Oct 3, 2018

Conversation

xeji
Copy link
Contributor

@xeji xeji commented Oct 3, 2018 •
edited

Motivation for this change

cleanup:

  • remove unused buildInputs
  • ncurses belongs in nativeBuildInputs (tic to compile terminfo)
  • drop dmenu wrapper, st doesn't use dmenu at all
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.

cc @andsild

@xeji
st: remove unused build inputs, drop wrapper
63ff7bd 
- remove unused buildInputs
- ncurses belongs in nativeBuildInputs (tic to compile terminfo)
- drop dmenu wrapper, st doesn't use dmenu at all
@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: st

Partial log (click to expand)

Please see the README file regarding the terminfo entry of st.
post-installation fixup
shrinking RPATHs of ELF executables and libraries in /nix/store/jzhh76mq4abclbz4wbmcic5vfsiln417-st-0.8.1
shrinking /nix/store/jzhh76mq4abclbz4wbmcic5vfsiln417-st-0.8.1/bin/st
gzipping man pages under /nix/store/jzhh76mq4abclbz4wbmcic5vfsiln417-st-0.8.1/share/man/
strip is /nix/store/dxf1m7dhc4qb655bdljc1fsd74v1nag3-binutils-2.30/bin/strip
stripping (with command strip and flags -S) in /nix/store/jzhh76mq4abclbz4wbmcic5vfsiln417-st-0.8.1/bin
patching script interpreter paths in /nix/store/jzhh76mq4abclbz4wbmcic5vfsiln417-st-0.8.1
checking for references to /build in /nix/store/jzhh76mq4abclbz4wbmcic5vfsiln417-st-0.8.1...
/nix/store/jzhh76mq4abclbz4wbmcic5vfsiln417-st-0.8.1

@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Attempted: st

Partial log (click to expand)

Please see the README file regarding the terminfo entry of st.
post-installation fixup
shrinking RPATHs of ELF executables and libraries in /nix/store/rhjk47bd37jinhy55wqjdpp9r1pknanm-st-0.8.1
shrinking /nix/store/rhjk47bd37jinhy55wqjdpp9r1pknanm-st-0.8.1/bin/st
gzipping man pages under /nix/store/rhjk47bd37jinhy55wqjdpp9r1pknanm-st-0.8.1/share/man/
strip is /nix/store/428gs2z4b8f9byvghzlpbjwjb3a7jwxx-binutils-2.30/bin/strip
stripping (with command strip and flags -S) in /nix/store/rhjk47bd37jinhy55wqjdpp9r1pknanm-st-0.8.1/bin
patching script interpreter paths in /nix/store/rhjk47bd37jinhy55wqjdpp9r1pknanm-st-0.8.1
checking for references to /build in /nix/store/rhjk47bd37jinhy55wqjdpp9r1pknanm-st-0.8.1...
/nix/store/rhjk47bd37jinhy55wqjdpp9r1pknanm-st-0.8.1

@GrahamcOfBorg
Copy link

No attempt on x86_64-darwin (full log)

The following builds were skipped because they don't evaluate on x86_64-darwin: st

Partial log (click to expand)


a) For `nixos-rebuild` you can set
  { nixpkgs.config.allowUnsupportedSystem = true; }
in configuration.nix to override this.

b) For `nix-env`, `nix-build`, `nix-shell` or any other Nix command you can add
  { allowUnsupportedSystem = true; }
to ~/.config/nixpkgs/config.nix.

andsild
andsild approved these changes Oct 3, 2018
View reviewed changes
Copy link
Contributor

@andsild andsild left a comment

Choose a reason for hiding this comment

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

Still works on my machine with ncurses and all, and less code is usually always better 😄

@Mic92 Mic92 merged commit 3e953d6 into NixOS:master Oct 3, 2018
@xeji xeji deleted the p/st branch October 3, 2018 10:21
@oxzi
Copy link
Member

oxzi commented Nov 18, 2018

I'm kind of late for the party, but just realized that the dmenu-wrapper was removed. I added this one in #37492 because the st's man page says:

Launch dmenu to enter a unicode codepoint and send the corresponding glyph to st.

This should be reverted imho.

@Mic92
Copy link
Member

Mic92 commented Nov 18, 2018

I don't see this line here: https://git.suckless.org/st/file/st.1.html

@oxzi
Copy link
Member

oxzi commented Nov 18, 2018

I'm not sure which revision this web version shows, perhaps the master branch. However, the packaged 0.8.1 version relies on dmenu as shown below.

$ git clone git://git.suckless.org/st
$ cd st
$ git checkout 0.8.1
$ grep dmenu st.1
Launch dmenu to enter a unicode codepoint and send the corresponding glyph

@xeji
Copy link
Contributor Author

xeji commented Nov 18, 2018

Upstream removed that feature in https://git.suckless.org/st/commit/67d0cb65d0794e2d91e72e5fa1e3612172e5812e.html.

@oxzi
Copy link
Member

oxzi commented Nov 18, 2018

Thanks for this information. But shouldn't this be removed on a version bump from 0.8.1?

@xeji
Copy link
Contributor Author

xeji commented Nov 18, 2018

I'm not sure we need to revert this. I use st 0.8.1 and have dmenu installed separately. The codepoint feature works fine without a wrapper. I suggest to leave st as is and treat dmenu as an optional dependency that needs to be in PATH if you want to use it.

@oxzi
Copy link
Member

oxzi commented Nov 18, 2018

I have to admit that I'm not 100% on your side with this one, but we can leave this as it is. The assumption that users of st also have dmenu in their environment may be true, but is imho against the whole idea of determinism.
Perhaps we should have another look after the next version bump.

@xeji
Copy link
Contributor Author

xeji commented Nov 18, 2018

Perhaps we should have another look after the next version bump.

Let's do that. Sorry for the inconvenience. When I made this PR I apparently looked at a newer source version and thought dmenu wasn't used at all. I didn't even know that feature existed. My mistake.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@andsild andsild andsild approved these changes

Assignees
No one assigned
Labels
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
5 participants
@xeji @GrahamcOfBorg @oxzi @Mic92 @andsild