Skip to content

zsh-powerlevel10k: v1.2.0 → v1.3.0#81934

Merged
flokli merged 2 commits into
NixOS:masterfrom
mweinelt:pr/zsh-powerlevel10k/v1.3
Mar 12, 2020
Merged

zsh-powerlevel10k: v1.2.0 → v1.3.0#81934
flokli merged 2 commits into
NixOS:masterfrom
mweinelt:pr/zsh-powerlevel10k/v1.3

Conversation

@mweinelt

@mweinelt mweinelt commented Mar 6, 2020

Copy link
Copy Markdown
Member
Motivation for this change

New upstream release.

https://github.com/romkatv/powerlevel10k/releases/tag/v1.3.0

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • 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 nixpkgs-review --run "nixpkgs-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)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@flokli @maralorn @andir

@mweinelt
mweinelt requested review from FRidh and jonringer as code owners March 6, 2020 22:56
@ofborg ofborg Bot added 6.topic: python Python is a high-level, general-purpose programming language. 11.by: package-maintainer This PR was created by a maintainer of all the package it changes. 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. labels Mar 6, 2020
jonringer
jonringer reviewed Mar 6, 2020
View reviewed changes

@jonringer jonringer left a comment •
edited
Loading

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

I think the nrfutil python package was snuck in on accident. It's not being used by either of the other two packages

Comment thread pkgs/development/python-modules/nrfutil/default.nix Outdated

@jonringer jonringer Mar 6, 2020

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Suggested change
homepage = https://github.com/NordicSemiconductor/pc-nrfutil;
homepage = "https://github.com/NordicSemiconductor/pc-nrfutil";

mweinelt added 2 commits March 7, 2020 01:02
@mweinelt
zsh-powerlevel10k v1.2.0 → v1.3.0
e7aef9d 
Changes since the last release

    New prompt segments:
        haskell_stack: haskell version from stack.
    New and changed parameters:
        POWERLEVEL9K_MODE can now be set to ascii for ASCII prompt.
        The default value of POWERLEVEL9K_VIRTUALENV_GENERIC_NAMES now contains env.
        New parameter: POWERLEVEL9K_JAVA_VERSION_PROJECT_ONLY. Display java_version only in java project (sub)directories.
        POWERLEVEL9K_KUBECONTEXT_SHOW_ON_COMMAND now contains istioctl and kogito in all config templates. Thanks, @errantepiphany!
        All *env segments now respect POWERLEVEL9K_*ENV_SHOW_SYSTEM. If set to false, the segment will be hidden if its content is "system". The default value is true.
        nodenv now understand POWERLEVEL9K_NODENV_SOURCES, just like all other *env segments.
        POWERLEVEL9K_DIR_OMIT_FIRST_CHARACTER now has useful semantics (incompatible with powerleve9k, where it was useless). If set to true, it'll remove the leading slash from the current directory if it's absolute. It no longer does anything if the directory is not absolute or if the leading character has been removed or changed by the shortener. This is meant for users who override POWERLEVEL9K_DIR_PATH_SEPARATOR.
    Robustness improvements:
        Powerlevel10k now works when there are no utf-8 locales on the machine.
    Configuration wizard:
        Lean, Classic and Rainbow styles now have an option to restrict prompt character set to ASCII.
        Styles that require 256 colors are not offered when terminal cannot display 256 colors.
        Rainbow and Classic styles now have an option to use flat heads. This option is offered in ASCII mode and when powerline glyphs are unavailable.
        Configuration wizard now restores screen upon exit.
        New segments in config templates: haskell_stack (enabled by default) and java_version (disabled by default).
    Bug fixes:
        Visual mode indicator now correctly switches back to command mode indicator after pressing d and similar when using Zsh >= 5.3. Visual mode indicator no longer gets displayed in Zsh prior to 5.3. Please upgrade Zsh if this matters to you.
        *ENV_DIR parameters are now handled the same way as in the underlying *env projects.
    Misc:
        There is no longer an empty line at the top of the screen after hitting Ctrl-L or typing clear or reset, even with POWERLEVEL9K_PROMPT_ADD_NEWLINE=true and POWERLEVEL9K_TRANSIENT_PROMPT=always.
        It's now possible to install powerlevel10k with Homebrew.
        Subseparators are now displayed with the foreground color of the previous/next segment in left/right prompt. Used to be the other way around. Thanks, @ahaasler!
    gitstatus:
        make now produces usrbin/gitstatusd instead of ./gitstatusd.
        build.zsh now puts the binary in usrbin subdirectory. If you place it in the same subdirectory of your gitstatus installation without changing the file name, gitstatus will pick it up automatically.
@mweinelt
gitstatusd: unstable-2020-02-26 → unstable-2020-03-06
4307ef6
@mweinelt
mweinelt force-pushed the pr/zsh-powerlevel10k/v1.3 branch from a728d26 to 4307ef6 Compare March 7, 2020 00:02
@mweinelt

mweinelt commented Mar 7, 2020

Copy link
Copy Markdown
Member Author

Good catch, that was by accident. Removed.

@ofborg ofborg Bot removed the 6.topic: python Python is a high-level, general-purpose programming language. label Mar 7, 2020
@flokli
flokli merged commit 5ffc683 into NixOS:master Mar 12, 2020
@flokli

flokli commented Mar 12, 2020 •
edited
Loading

Copy link
Copy Markdown
Member

Hrm, gitAndTools.gitstatus from the PR built, but it doesn't build on master:

/nix/store/m6bb8cbdmb5yirxm8pa9ah9xri4557v7-binutils-2.31.1/bin/ld: /nix/store/sk51zaasw4n8981ia6fyq9304q0pabxh-libgit2-0.99.0/lib/libgit2.a(httpclient.c.o): in function `on_headers_complete':
(.text+0xaf5): undefined reference to `http_should_keep_alive'
/nix/store/m6bb8cbdmb5yirxm8pa9ah9xri4557v7-binutils-2.31.1/bin/ld: (.text+0xd68): undefined reference to `http_parser_pause'
/nix/store/m6bb8cbdmb5yirxm8pa9ah9xri4557v7-binutils-2.31.1/bin/ld: /nix/store/sk51zaasw4n8981ia6fyq9304q0pabxh-libgit2-0.99.0/lib/libgit2.a(httpclient.c.o): in function `git_http_client_read_response':
(.text+0x1493): undefined reference to `http_parser_execute'
/nix/store/m6bb8cbdmb5yirxm8pa9ah9xri4557v7-binutils-2.31.1/bin/ld: (.text+0x15e6): undefined reference to `http_parser_pause'
/nix/store/m6bb8cbdmb5yirxm8pa9ah9xri4557v7-binutils-2.31.1/bin/ld: (.text+0x1651): undefined reference to `http_parser_execute'
/nix/store/m6bb8cbdmb5yirxm8pa9ah9xri4557v7-binutils-2.31.1/bin/ld: (.text+0x179a): undefined reference to `http_errno_description'
/nix/store/m6bb8cbdmb5yirxm8pa9ah9xri4557v7-binutils-2.31.1/bin/ld: (.text+0x1814): undefined reference to `http_errno_description'
/nix/store/m6bb8cbdmb5yirxm8pa9ah9xri4557v7-binutils-2.31.1/bin/ld: /nix/store/sk51zaasw4n8981ia6fyq9304q0pabxh-libgit2-0.99.0/lib/libgit2.a(httpclient.c.o): in function `git_http_client_read_body':
(.text+0x194b): undefined reference to `http_parser_execute'
/nix/store/m6bb8cbdmb5yirxm8pa9ah9xri4557v7-binutils-2.31.1/bin/ld: (.text+0x1ace): undefined reference to `http_parser_pause'
/nix/store/m6bb8cbdmb5yirxm8pa9ah9xri4557v7-binutils-2.31.1/bin/ld: (.text+0x1b39): undefined reference to `http_parser_execute'
/nix/store/m6bb8cbdmb5yirxm8pa9ah9xri4557v7-binutils-2.31.1/bin/ld: (.text+0x1b71): undefined reference to `http_errno_description'
/nix/store/m6bb8cbdmb5yirxm8pa9ah9xri4557v7-binutils-2.31.1/bin/ld: (.text+0x1bcf): undefined reference to `http_errno_description'
/nix/store/m6bb8cbdmb5yirxm8pa9ah9xri4557v7-binutils-2.31.1/bin/ld: /nix/store/sk51zaasw4n8981ia6fyq9304q0pabxh-libgit2-0.99.0/lib/libgit2.a(httpclient.c.o): in function `git_http_client_skip_body':
(.text+0x1d13): undefined reference to `http_parser_execute'
/nix/store/m6bb8cbdmb5yirxm8pa9ah9xri4557v7-binutils-2.31.1/bin/ld: (.text+0x1eb6): undefined reference to `http_parser_pause'
/nix/store/m6bb8cbdmb5yirxm8pa9ah9xri4557v7-binutils-2.31.1/bin/ld: (.text+0x1f21): undefined reference to `http_parser_execute'
/nix/store/m6bb8cbdmb5yirxm8pa9ah9xri4557v7-binutils-2.31.1/bin/ld: (.text+0x1fa4): undefined reference to `http_errno_description'
/nix/store/m6bb8cbdmb5yirxm8pa9ah9xri4557v7-binutils-2.31.1/bin/ld: (.text+0x1fe9): undefined reference to `http_errno_description'
/nix/store/m6bb8cbdmb5yirxm8pa9ah9xri4557v7-binutils-2.31.1/bin/ld: /nix/store/sk51zaasw4n8981ia6fyq9304q0pabxh-libgit2-0.99.0/lib/libgit2.a(httpclient.c.o): in function `git_http_client_send_request':
(.text+0x22fc): undefined reference to `http_parser_init'
/nix/store/m6bb8cbdmb5yirxm8pa9ah9xri4557v7-binutils-2.31.1/bin/ld: (.text+0x2b9f): undefined reference to `http_parser_execute'
/nix/store/m6bb8cbdmb5yirxm8pa9ah9xri4557v7-binutils-2.31.1/bin/ld: (.text+0x2cf9): undefined reference to `http_parser_init'
/nix/store/m6bb8cbdmb5yirxm8pa9ah9xri4557v7-binutils-2.31.1/bin/ld: (.text+0x2fdc): undefined reference to `http_parser_init'
/nix/store/m6bb8cbdmb5yirxm8pa9ah9xri4557v7-binutils-2.31.1/bin/ld: (.text+0x30d6): undefined reference to `http_parser_pause'
/nix/store/m6bb8cbdmb5yirxm8pa9ah9xri4557v7-binutils-2.31.1/bin/ld: (.text+0x3158): undefined reference to `http_parser_execute'
/nix/store/m6bb8cbdmb5yirxm8pa9ah9xri4557v7-binutils-2.31.1/bin/ld: (.text+0x31b1): undefined reference to `http_errno_description'
/nix/store/m6bb8cbdmb5yirxm8pa9ah9xri4557v7-binutils-2.31.1/bin/ld: (.text+0x3245): undefined reference to `http_errno_description'
/nix/store/m6bb8cbdmb5yirxm8pa9ah9xri4557v7-binutils-2.31.1/bin/ld: /nix/store/sk51zaasw4n8981ia6fyq9304q0pabxh-libgit2-0.99.0/lib/libgit2.a(net.c.o): in function `git_net_url_parse':
(.text+0xc0): undefined reference to `http_parser_parse_url'
collect2: error: ld returned 1 exit status
make: *** [Makefile:17: usrbin/gitstatusd] Error 1
builder for '/nix/store/ii0xnca2p9pdy1sspwyxjjyvmgays2qh-gitstatus-unstable-2020-03-06.drv' failed with exit code 2

Might have been introduced by the (fairly big version bump of libgit from 0.28.4 to 0.99.0 in #81496.

(note the cmakeFlags "-DUSE_HTTP_PARSER=system" addition)

@mweinelt
mweinelt deleted the pr/zsh-powerlevel10k/v1.3 branch March 12, 2020 10:39
@mweinelt

mweinelt commented Mar 12, 2020

Copy link
Copy Markdown
Member Author

Fixed in #82373 .

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

Reviewers

@FRidh FRidh Awaiting requested review from FRidh
1 more reviewer
@jonringer jonringer jonringer left review comments
Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. 11.by: package-maintainer This PR was created by a maintainer of all the package it changes.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@mweinelt @flokli @jonringer