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: 5c73dc4eec11
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 4ed98532a254
Choose a head ref
  • 1 commit
  • 3 files changed
  • 1 contributor

Commits on Mar 24, 2020

  1. kitty: 0.16.0 -> 0.17.1 

    https://github.com/kovidgoyal/kitty/releases/tag/v0.17.1

The png2icns patch is no longer needed because kitty will now automatically use `png2icns` when `iconutil` cannot be found.
The zsh completions will now work without needing to invoke them with `source`, which means, that we can just install them like the other shell completions.
    @Luflosi @teto
    Luflosi authored and teto committed Mar 24, 2020

    Verified

    This commit was signed with the committer’s verified signature.
    veprbl Dmitry Kalinkin
    GPG key ID: 5157B3EC8B2CA333
    Verified
    Learn about vigilant mode
    Copy the full SHA
    4ed9853 View commit details
Showing with 6 additions and 26 deletions.
  1. +3 −3 pkgs/applications/misc/kitty/default.nix
  2. +3 −2 pkgs/applications/misc/kitty/no-lto.patch
  3. +0 −21 pkgs/applications/misc/kitty/png2icns.patch
6 changes: 3 additions & 3 deletions pkgs/applications/misc/kitty/default.nix
View file
Original file line number Diff line number Diff line change
@@ -20,14 +20,14 @@
with python3Packages;
buildPythonApplication rec {
pname = "kitty";
version = "0.16.0";
version = "0.17.1";
format = "other";

src = fetchFromGitHub {
owner = "kovidgoyal";
repo = "kitty";
rev = "v${version}";
sha256 = "1bszyddar0g1gdz67h8rd3gbrdhi6ahjg7j14cjiqxm1938z9ajf";
sha256 = "1ydli1phgcy17iz6jxgixn8yc86dp8q2yfxk08c8lwh7gxjnjz7f";
};

buildInputs = [
@@ -72,7 +72,6 @@ buildPythonApplication rec {
})
] ++ stdenv.lib.optionals stdenv.isDarwin [
./no-lto.patch
./png2icns.patch
];

# Causes build failure due to warning
@@ -106,6 +105,7 @@ buildPythonApplication rec {
mkdir -p "$out/share/"{bash-completion/completions,fish/vendor_completions.d,zsh/site-functions}
"$out/bin/kitty" + complete setup fish > "$out/share/fish/vendor_completions.d/kitty.fish"
"$out/bin/kitty" + complete setup bash > "$out/share/bash-completion/completions/kitty.bash"
"$out/bin/kitty" + complete setup zsh > "$out/share/zsh/site-functions/_kitty"
'';

postInstall = ''
5 changes: 3 additions & 2 deletions pkgs/applications/misc/kitty/no-lto.patch
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
--- a/setup.py
+++ b/setup.py
@@ -233,9 +233,6 @@ def init_env(
@@ -277,10 +277,6 @@ def init_env(
cppflags += shlex.split(os.environ.get('CPPFLAGS', ''))
cflags += shlex.split(os.environ.get('CFLAGS', ''))
ldflags += shlex.split(os.environ.get('LDFLAGS', ''))
- if not debug and not sanitize:
- # See https://github.com/google/sanitizers/issues/647
- cflags.append('-flto'), ldflags.append('-flto')
- cflags.append('-flto')
- ldflags.append('-flto')

if profile:
cppflags.append('-DWITH_PROFILER')
21 changes: 0 additions & 21 deletions pkgs/applications/misc/kitty/png2icns.patch
View file

This file was deleted.