Merge pull request #100472 from SFrijters/terminator-2.0.1

terminator: 1.92 -> 2.1.0
This commit is contained in:
Sandro 2021-02-17 15:46:43 +01:00 committed by GitHub
commit c4ee39c2a0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -13,13 +13,13 @@
python3.pkgs.buildPythonApplication rec { python3.pkgs.buildPythonApplication rec {
pname = "terminator"; pname = "terminator";
version = "1.92"; version = "2.1.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "gnome-terminator"; owner = "gnome-terminator";
repo = "terminator"; repo = "terminator";
rev = "v${version}"; rev = "v${version}";
sha256 = "105f660wzf9cpn24xzwaaa09igg5h3qhchafv190v5nqck6g1ssh"; sha256 = "sha256-Rd5XieB7K2BkSzrAr6Kmoa30xuwvsGKpPrsG2wrU1o8=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
@ -27,6 +27,7 @@ python3.pkgs.buildPythonApplication rec {
intltool intltool
gobject-introspection gobject-introspection
wrapGAppsHook wrapGAppsHook
python3.pkgs.pytestrunner
]; ];
buildInputs = [ buildInputs = [
@ -47,19 +48,13 @@ python3.pkgs.buildPythonApplication rec {
]; ];
postPatch = '' postPatch = ''
patchShebangs run_tests tests po patchShebangs tests po
# dbus-python is correctly passed in propagatedBuildInputs, but for some reason setup.py complains. # dbus-python is correctly passed in propagatedBuildInputs, but for some reason setup.py complains.
# The wrapped terminator has the correct path added, so ignore this. # The wrapped terminator has the correct path added, so ignore this.
substituteInPlace setup.py --replace "'dbus-python'," "" substituteInPlace setup.py --replace "'dbus-python'," ""
''; '';
checkPhase = '' doCheck = false;
runHook preCheck
./run_tests
runHook postCheck
'';
meta = with lib; { meta = with lib; {
description = "Terminal emulator with support for tiling and tabs"; description = "Terminal emulator with support for tiling and tabs";