diff options
| author | Roman Volosatovs <rvolosatovs@riseup.net> | 2019-05-25 15:17:27 +0200 |
|---|---|---|
| committer | Roman Volosatovs <rvolosatovs@riseup.net> | 2019-05-26 20:06:56 +0200 |
| commit | b73cd684cb41e092a8e75a462a232390f2759a32 (patch) | |
| tree | 47e7963738a1f1daedd4304e15c599445570f12f /pkgs/applications/misc/kitty | |
| parent | 25837378a22f227a674671b31f56ce2987d1c928 (diff) | |
| download | nixpkgs-b73cd684cb41e092a8e75a462a232390f2759a32.tar nixpkgs-b73cd684cb41e092a8e75a462a232390f2759a32.tar.gz nixpkgs-b73cd684cb41e092a8e75a462a232390f2759a32.tar.bz2 nixpkgs-b73cd684cb41e092a8e75a462a232390f2759a32.tar.lz nixpkgs-b73cd684cb41e092a8e75a462a232390f2759a32.tar.xz nixpkgs-b73cd684cb41e092a8e75a462a232390f2759a32.tar.zst nixpkgs-b73cd684cb41e092a8e75a462a232390f2759a32.zip | |
kitty: 0.13.3 -> 0.14.0
Diffstat (limited to 'pkgs/applications/misc/kitty')
| -rw-r--r-- | pkgs/applications/misc/kitty/default.nix | 15 | ||||
| -rw-r--r-- | pkgs/applications/misc/kitty/fix-paths.patch | 8 |
2 files changed, 6 insertions, 17 deletions
diff --git a/pkgs/applications/misc/kitty/default.nix b/pkgs/applications/misc/kitty/default.nix index be70efba5ad..13e4268d353 100644 --- a/pkgs/applications/misc/kitty/default.nix +++ b/pkgs/applications/misc/kitty/default.nix @@ -21,14 +21,14 @@ with python3Packages; buildPythonApplication rec { pname = "kitty"; - version = "0.13.3"; + version = "0.14.0"; format = "other"; src = fetchFromGitHub { owner = "kovidgoyal"; repo = "kitty"; rev = "v${version}"; - sha256 = "1y0vd75j8g61jdj8miml79w5ri3pqli5rv9iq6zdrxvzfa4b2rmb"; + sha256 = "122573l7xirs9dsi5p8gra47qpgxb3vahqp2r0c043pgz4i22v5z"; }; buildInputs = [ @@ -67,17 +67,6 @@ buildPythonApplication rec { libstartup_notification = "${libstartup_notification}/lib/libstartup-notification-1.so"; }) ] ++ 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 ./no-lto.patch ./no-werror.patch diff --git a/pkgs/applications/misc/kitty/fix-paths.patch b/pkgs/applications/misc/kitty/fix-paths.patch index d6e52adc445..70460581307 100644 --- a/pkgs/applications/misc/kitty/fix-paths.patch +++ b/pkgs/applications/misc/kitty/fix-paths.patch @@ -12,15 +12,15 @@ --- a/docs/Makefile +++ b/docs/Makefile @@ -3,7 +3,7 @@ -# Patching is needed here for the following reasons: -# * `sphinx-build` in nixpkgs is not a Python file but a wrapper shell script +# Patching is needed here for the following reason: # * importing the `constants` package from Kitty has a side effect that it # creates the user configuration directory. This package gets imported # while sphinx scans the code for documentation strings. # + # You can set these variables from the command line. - SPHINXOPTS = -T $(FAIL_WARN) --SPHINXBUILD = python3 .. +launch :sphinx-build + SPHINXOPTS = -j auto -T $(FAIL_WARN) +-SPHINXBUILD = sphinx-build +SPHINXBUILD = PYTHONPATH=${PYTHONPATH}:.. HOME=${TMPDIR}/kitty-build-home sphinx-build SPHINXPROJ = kitty SOURCEDIR = . |