public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

kitty: 0.13.3 -> 0.14.0

Browse Source
This commit is contained in:
Roman Volosatovs 2019-05-25 15:17:27 +02:00
parent 25837378a2
commit b73cd684cb
No known key found for this signature in database
GPG Key ID: 2660C5FDCEBE6F87
2 changed files with 6 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
pkgs/applications/misc/kitty/default.nix
View File

@ -21,14 +21,14 @@
with python3Packages; with python3Packages;
buildPythonApplication rec { buildPythonApplication rec {
pname = "kitty"; pname = "kitty";
version = "0.13.3"; version = "0.14.0";
format = "other"; format = "other";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "kovidgoyal"; owner = "kovidgoyal";
repo = "kitty"; repo = "kitty";
rev = "v${version}"; rev = "v${version}";
sha256 = "1y0vd75j8g61jdj8miml79w5ri3pqli5rv9iq6zdrxvzfa4b2rmb"; sha256 = "122573l7xirs9dsi5p8gra47qpgxb3vahqp2r0c043pgz4i22v5z";
}; };
buildInputs = [ buildInputs = [
@ -67,17 +67,6 @@ buildPythonApplication rec {
libstartup_notification = "${libstartup_notification}/lib/libstartup-notification-1.so"; libstartup_notification = "${libstartup_notification}/lib/libstartup-notification-1.so";
}) })
] ++ stdenv.lib.optionals stdenv.isDarwin [ ] ++ stdenv.lib.optionals stdenv.isDarwin [
(fetchpatch {
name = "macos-symlink-1";
url = https://github.com/kovidgoyal/kitty/commit/bdeec612667f6976109247fe1750b10dda9c24c0.patch;
sha256 = "1d18x260w059qag80kgb2cgi2h4rricvqhwpbrw79s8yxzs7jhxk";
})
(fetchpatch {
# fixup of previous patch
name = "macos-symlink-2";
url = https://github.com/kovidgoyal/kitty/commit/af2c9a49b1ad31e94242295d88598591623fbf11.patch;
sha256 = "0k3dmgbvmh66j8k3h8dw6la6ma6f20fng6jjypy982kxvracsnl5";
})
./macos-10.11.patch ./macos-10.11.patch
./no-lto.patch ./no-lto.patch
./no-werror.patch ./no-werror.patch

8
pkgs/applications/misc/kitty/fix-paths.patch
View File

@ -12,15 +12,15 @@
--- a/docs/Makefile --- a/docs/Makefile
+++ b/docs/Makefile +++ b/docs/Makefile
@@ -3,7 +3,7 @@ @@ -3,7 +3,7 @@
# Patching is needed here for the following reasons: # Patching is needed here for the following reason:
# * `sphinx-build` in nixpkgs is not a Python file but a wrapper shell script
# * importing the `constants` package from Kitty has a side effect that it # * importing the `constants` package from Kitty has a side effect that it
# creates the user configuration directory. This package gets imported # creates the user configuration directory. This package gets imported
# while sphinx scans the code for documentation strings. # while sphinx scans the code for documentation strings.
# #
# You can set these variables from the command line. # You can set these variables from the command line.
SPHINXOPTS = -T $(FAIL_WARN) SPHINXOPTS = -j auto -T $(FAIL_WARN)
-SPHINXBUILD = python3 .. +launch :sphinx-build -SPHINXBUILD = sphinx-build
+SPHINXBUILD = PYTHONPATH=${PYTHONPATH}:.. HOME=${TMPDIR}/kitty-build-home sphinx-build +SPHINXBUILD = PYTHONPATH=${PYTHONPATH}:.. HOME=${TMPDIR}/kitty-build-home sphinx-build
SPHINXPROJ = kitty SPHINXPROJ = kitty
SOURCEDIR = . SOURCEDIR = .