Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: ce6dbccdfb0f
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 2b81a974ae63
Choose a head ref
  • 3 commits
  • 2 files changed
  • 2 contributors

Commits on Apr 27, 2020

  1. zsh-powerlevel10k: v1.5.0 → v1.6.0 

    Changes since the last release

    Wizard
        Configuration wizard now reacts to terminal size changes in real time and can function at much smaller terminal dimensions.
        Configs with prompt_char now have vi_mode disabled by default.
        Generated configs now unset DEFAULT_USER.
        Classic and Rainbow configs now set POWERLEVEL9K_MULTILINE_NEWLINE_PROMPT_GAP_BACKGROUND. This makes it easier to define 3-line prompt.

    New parameters
        If POWERLEVEL9K_CONFIG_FILE is set, configuration wizard will write configs to the specified location instead of the default ${ZDOTDIR:-~}/.p10k.zsh.

    gitstatus
        Support older macOS versions (at least El Capitan; even older versions might work).
        Support Linux on armv6, i386 and i686.
        Support cygwin and msys2 on i686.
        macOS builds now use iconv from Homebrew.
        gitstatusd binaries are now being built with https://github.com/romkatv/gitstatus/blob/release/mbuild.

    Misc
        The default icon for proxy segment is now ↔ instead of ⮂. The old icon is missing in many fonts.

    Bug fixes
        gitstatus once again works on 64-bit Linux without glibc.
        Instant prompt no longer gets gradually slower over time when XDG_HOME_CACHE is on a slow filesystem.
        Instant prompt no longer prints spurious erros when XDG_HOME_CACHE is on NTFS.
        The old-style (and discouraged) custom prompts now work on zsh 5.3.1.
        Configuration wizard once again presents "extra icons" and "fluent prompt" options when using 12-hour time format.
    @mweinelt
    mweinelt committed Apr 27, 2020

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    mweinelt Martin Weinelt
    GPG key ID: BD4AA0528F63F17E
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    c17800c View commit details

  2. gitstatus: unstable-2020-03-15 → unstable-2020-04-21

    @mweinelt
    mweinelt committed Apr 27, 2020

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    mweinelt Martin Weinelt
    GPG key ID: BD4AA0528F63F17E
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    b53cabc View commit details

  3. Merge pull request #86119 from mweinelt/powerlevel10k/v1.6.0

    @Mic92
    Mic92 authored Apr 27, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    2b81a97 View commit details
Showing with 5 additions and 5 deletions.
  1. +3 −3 pkgs/applications/version-management/git-and-tools/gitstatus/default.nix
  2. +2 −2 pkgs/shells/zsh/zsh-powerlevel10k/default.nix
6 changes: 3 additions & 3 deletions pkgs/applications/version-management/git-and-tools/gitstatus/default.nix
View file
Original file line number Diff line number Diff line change
@@ -2,13 +2,13 @@

stdenv.mkDerivation {
pname = "gitstatus";
version = "unstable-2020-03-15";
version = "unstable-2020-04-21";

src = fetchFromGitHub {
owner = "romkatv";
repo = "gitstatus";
rev = "c07996bc3ea1912652f52a816b830a5a3ee9b49c";
sha256 = "07s8hwx3i5mnafi2xfim44z3q2nsvlcibfdxj17w8mkjhfpywi00";
rev = "3494f25b0b3b2eac241cf669d1fea2b49ea42fb3";
sha256 = "0b4g14dkkgih6zps2w1krl9xf44ysj02617zj1k51z127v2lpm1f";
};

buildInputs = [ (callPackage ./romkatv_libgit2.nix {}) ];
4 changes: 2 additions & 2 deletions pkgs/shells/zsh/zsh-powerlevel10k/default.nix
View file
Original file line number Diff line number Diff line change
@@ -5,13 +5,13 @@

stdenv.mkDerivation rec {
pname = "powerlevel10k";
version = "1.5.0";
version = "1.6.0";

src = fetchFromGitHub {
owner = "romkatv";
repo = "powerlevel10k";
rev = "v${version}";
sha256 = "0r8vccgfy85ryswaigzgwmvhvrhlap7nrg7bi66w63877znqlksj";
sha256 = "1v6lwjlc4qrxfv1yjy31xh59ayf7jprm3y87l75d08pzj1v4lsj5";
};

patches = [