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

herbstluftwm: 0.7.0 -> 0.7.1 #45669

Merged
merged 1 commit into from Aug 29, 2018
Merged

herbstluftwm: 0.7.0 -> 0.7.1 #45669

merged 1 commit into from Aug 29, 2018

Conversation

ThibautMarty
Copy link
Member

Motivation for this change
Things done

Note that commit herbstluftwm/herbstluftwm@e5a52f2 introduces a new variable FISHCOMPLETIONDIR in config.mk, thus a new line in patchPhase is needed. The package does not seem to have been tested with a non-standard PREFIX (or it was, but mkdir /usr/share/fish/vendor_completions.d worked on a non-Nixos system), which anyway does not seem to be a priority (herbstluftwm/herbstluftwm#107 is opened since 1 year).

  • 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 @the-kenny

timokau
timokau reviewed Aug 27, 2018
View reviewed changes
pkgs/applications/window-managers/herbstluftwm/default.nix
};

patchPhase = ''
substituteInPlace config.mk \
--replace "/usr/local" "$out" \
--replace "/etc" "$out/etc" \
--replace "/zsh/functions/Completion/X" "/zsh/site-functions"
--replace "/zsh/functions/Completion/X" "/zsh/site-functions" \
--replace "/usr/share" "\$(PREFIX)/share"
Copy link
Member

Choose a reason for hiding this comment

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

Even though it may not be a priority for them, can you still file an upstream issue for the inconsistent usage of PREFIX?

Copy link
Member Author

Choose a reason for hiding this comment

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

Yes, I planned to do it.

Copy link
Member

Choose a reason for hiding this comment

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

Great. If you plan to do it soon it would be nice to add a comment with a link to the upstream issue. Other than that, this should be ready for merge.

@timokau
Copy link
Member

timokau commented Aug 27, 2018

Thanks! Nice to see that they are still working on herbstluftwm.

@Mic92
Copy link
Member

Mic92 commented Aug 27, 2018

@GrahamcOfBorg build herbstluftwm

@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: herbstluftwm

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.

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: herbstluftwm

Partial log (click to expand)

/nix/store/jcibdjyk3wyzyg6aw69zlg372sv9w3ag-herbstluftwm-0.7.1/share/doc/herbstluftwm/examples/herbstcommander.sh: interpreter directive changed from "/usr/bin/env bash" to "/nix/store/czx8vkrb9jdgjyz8qfksh10vrnqa723l-bash-4.4-p23/bin/bash"
/nix/store/jcibdjyk3wyzyg6aw69zlg372sv9w3ag-herbstluftwm-0.7.1/share/doc/herbstluftwm/examples/dumpbeautify.sh: interpreter directive changed from "/usr/bin/env bash" to "/nix/store/czx8vkrb9jdgjyz8qfksh10vrnqa723l-bash-4.4-p23/bin/bash"
/nix/store/jcibdjyk3wyzyg6aw69zlg372sv9w3ag-herbstluftwm-0.7.1/share/doc/herbstluftwm/examples/layout.sh: interpreter directive changed from "/usr/bin/env bash" to "/nix/store/czx8vkrb9jdgjyz8qfksh10vrnqa723l-bash-4.4-p23/bin/bash"
/nix/store/jcibdjyk3wyzyg6aw69zlg372sv9w3ag-herbstluftwm-0.7.1/share/doc/herbstluftwm/examples/execwith.sh: interpreter directive changed from "/usr/bin/env bash" to "/nix/store/czx8vkrb9jdgjyz8qfksh10vrnqa723l-bash-4.4-p23/bin/bash"
/nix/store/jcibdjyk3wyzyg6aw69zlg372sv9w3ag-herbstluftwm-0.7.1/share/doc/herbstluftwm/examples/toggledualhead.sh: interpreter directive changed from "/usr/bin/env bash" to "/nix/store/czx8vkrb9jdgjyz8qfksh10vrnqa723l-bash-4.4-p23/bin/bash"
/nix/store/jcibdjyk3wyzyg6aw69zlg372sv9w3ag-herbstluftwm-0.7.1/share/doc/herbstluftwm/examples/scratchpad.sh: interpreter directive changed from "/usr/bin/env bash" to "/nix/store/czx8vkrb9jdgjyz8qfksh10vrnqa723l-bash-4.4-p23/bin/bash"
/nix/store/jcibdjyk3wyzyg6aw69zlg372sv9w3ag-herbstluftwm-0.7.1/share/doc/herbstluftwm/examples/savestate.sh: interpreter directive changed from "/usr/bin/env bash" to "/nix/store/czx8vkrb9jdgjyz8qfksh10vrnqa723l-bash-4.4-p23/bin/bash"
/nix/store/jcibdjyk3wyzyg6aw69zlg372sv9w3ag-herbstluftwm-0.7.1/bin/dmenu_run_hlwm: interpreter directive changed from "/usr/bin/env bash" to "/nix/store/czx8vkrb9jdgjyz8qfksh10vrnqa723l-bash-4.4-p23/bin/bash"
checking for references to /build in /nix/store/jcibdjyk3wyzyg6aw69zlg372sv9w3ag-herbstluftwm-0.7.1...
/nix/store/jcibdjyk3wyzyg6aw69zlg372sv9w3ag-herbstluftwm-0.7.1

@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Attempted: herbstluftwm

Partial log (click to expand)

/nix/store/yyxn746pisccgl2vi2dhb88al5g9938s-herbstluftwm-0.7.1/share/doc/herbstluftwm/examples/keychain.sh: interpreter directive changed from "/usr/bin/env bash" to "/nix/store/fqm2x6kiay1q4vg7pqp4wp17bdijlyc3-bash-4.4-p23/bin/bash"
/nix/store/yyxn746pisccgl2vi2dhb88al5g9938s-herbstluftwm-0.7.1/share/doc/herbstluftwm/examples/herbstcommander.sh: interpreter directive changed from "/usr/bin/env bash" to "/nix/store/fqm2x6kiay1q4vg7pqp4wp17bdijlyc3-bash-4.4-p23/bin/bash"
/nix/store/yyxn746pisccgl2vi2dhb88al5g9938s-herbstluftwm-0.7.1/share/doc/herbstluftwm/examples/floatmon.sh: interpreter directive changed from "/usr/bin/env bash" to "/nix/store/fqm2x6kiay1q4vg7pqp4wp17bdijlyc3-bash-4.4-p23/bin/bash"
/nix/store/yyxn746pisccgl2vi2dhb88al5g9938s-herbstluftwm-0.7.1/share/doc/herbstluftwm/examples/float-maximize.sh: interpreter directive changed from "/usr/bin/env bash" to "/nix/store/fqm2x6kiay1q4vg7pqp4wp17bdijlyc3-bash-4.4-p23/bin/bash"
/nix/store/yyxn746pisccgl2vi2dhb88al5g9938s-herbstluftwm-0.7.1/share/doc/herbstluftwm/examples/execwith.sh: interpreter directive changed from "/usr/bin/env bash" to "/nix/store/fqm2x6kiay1q4vg7pqp4wp17bdijlyc3-bash-4.4-p23/bin/bash"
/nix/store/yyxn746pisccgl2vi2dhb88al5g9938s-herbstluftwm-0.7.1/share/doc/herbstluftwm/examples/exec_on_tag.sh: interpreter directive changed from "/usr/bin/env bash" to "/nix/store/fqm2x6kiay1q4vg7pqp4wp17bdijlyc3-bash-4.4-p23/bin/bash"
/nix/store/yyxn746pisccgl2vi2dhb88al5g9938s-herbstluftwm-0.7.1/share/doc/herbstluftwm/examples/dumpbeautify.sh: interpreter directive changed from "/usr/bin/env bash" to "/nix/store/fqm2x6kiay1q4vg7pqp4wp17bdijlyc3-bash-4.4-p23/bin/bash"
/nix/store/yyxn746pisccgl2vi2dhb88al5g9938s-herbstluftwm-0.7.1/share/doc/herbstluftwm/examples/dmenu.sh: interpreter directive changed from "/usr/bin/env bash" to "/nix/store/fqm2x6kiay1q4vg7pqp4wp17bdijlyc3-bash-4.4-p23/bin/bash"
checking for references to /build in /nix/store/yyxn746pisccgl2vi2dhb88al5g9938s-herbstluftwm-0.7.1...
/nix/store/yyxn746pisccgl2vi2dhb88al5g9938s-herbstluftwm-0.7.1

@xeji xeji merged commit e9f0afe into NixOS:master Aug 29, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@timokau timokau timokau left review comments

@xeji xeji xeji approved these changes

Assignees
No one assigned
Labels
10.rebuild-darwin: 0 10.rebuild-linux: 1-10 12. first-time contribution
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
6 participants
@ThibautMarty @timokau @Mic92 @GrahamcOfBorg @xeji @Janik-Haag