summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
authorSandro <sandro.jaeckel@gmail.com>2021-02-17 15:46:43 +0100
committerGitHub <noreply@github.com>2021-02-17 15:46:43 +0100
commitc4ee39c2a0dd79c4758ca6b6527e7cd87acfbb6f (patch)
treeffc72f08f955115c74c0d63eef96e234839cc70b /pkgs
parente9ac6062895ec39fc1540c292ed1dfb3c3a4c6ca (diff)
parenta0e2df27c9442d8da7b79db0d99446c236956cad (diff)
downloadnixpkgs-c4ee39c2a0dd79c4758ca6b6527e7cd87acfbb6f.tar
nixpkgs-c4ee39c2a0dd79c4758ca6b6527e7cd87acfbb6f.tar.gz
nixpkgs-c4ee39c2a0dd79c4758ca6b6527e7cd87acfbb6f.tar.bz2
nixpkgs-c4ee39c2a0dd79c4758ca6b6527e7cd87acfbb6f.tar.lz
nixpkgs-c4ee39c2a0dd79c4758ca6b6527e7cd87acfbb6f.tar.xz
nixpkgs-c4ee39c2a0dd79c4758ca6b6527e7cd87acfbb6f.tar.zst
nixpkgs-c4ee39c2a0dd79c4758ca6b6527e7cd87acfbb6f.zip
Merge pull request #100472 from SFrijters/terminator-2.0.1
terminator: 1.92 -> 2.1.0
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/applications/terminal-emulators/terminator/default.nix15
1 files changed, 5 insertions, 10 deletions
diff --git a/pkgs/applications/terminal-emulators/terminator/default.nix b/pkgs/applications/terminal-emulators/terminator/default.nix
index 433e5c30618..82286289fba 100644
--- a/pkgs/applications/terminal-emulators/terminator/default.nix
+++ b/pkgs/applications/terminal-emulators/terminator/default.nix
@@ -13,13 +13,13 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "terminator";
-  version = "1.92";
+  version = "2.1.0";
 
   src = fetchFromGitHub {
     owner = "gnome-terminator";
     repo = "terminator";
     rev = "v${version}";
-    sha256 = "105f660wzf9cpn24xzwaaa09igg5h3qhchafv190v5nqck6g1ssh";
+    sha256 = "sha256-Rd5XieB7K2BkSzrAr6Kmoa30xuwvsGKpPrsG2wrU1o8=";
   };
 
   nativeBuildInputs = [
@@ -27,6 +27,7 @@ python3.pkgs.buildPythonApplication rec {
     intltool
     gobject-introspection
     wrapGAppsHook
+    python3.pkgs.pytestrunner
   ];
 
   buildInputs = [
@@ -47,19 +48,13 @@ python3.pkgs.buildPythonApplication rec {
   ];
 
   postPatch = ''
-    patchShebangs run_tests tests po
+    patchShebangs tests po
     # 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.
     substituteInPlace setup.py --replace "'dbus-python'," ""
   '';
 
-  checkPhase = ''
-    runHook preCheck
-
-    ./run_tests
-
-    runHook postCheck
-  '';
+  doCheck = false;
 
   meta = with lib; {
     description = "Terminal emulator with support for tiling and tabs";