Clone of https://github.com/NixOS/nixpkgs.git (to stress-test knotserver)

terminator: clean up

(cherry picked from commit 64c09a3d5c130ca346ac3bbc3fd122a3a4372c14)

authored by

Jan Tojnar and committed by
Bjørn Forsman
07683662 97d3082c

+12 -8
+11 -7
pkgs/applications/misc/terminator/default.nix
··· 1 1 { stdenv 2 2 , fetchFromGitHub 3 - , python 3 + , python3 4 4 , keybinder3 5 5 , intltool 6 6 , file ··· 11 11 , vte 12 12 }: 13 13 14 - python.pkgs.buildPythonApplication rec { 15 - name = "terminator-${version}"; 14 + python3.pkgs.buildPythonApplication rec { 15 + pname = "terminator"; 16 16 version = "1.92"; 17 17 18 18 src = fetchFromGitHub { 19 19 owner = "gnome-terminator"; 20 20 repo = "terminator"; 21 - rev = "bb24273eb40dc5eac97de74064488701fa40a743"; 21 + rev = "v${version}"; 22 22 sha256 = "105f660wzf9cpn24xzwaaa09igg5h3qhchafv190v5nqck6g1ssh"; 23 23 }; 24 24 ··· 34 34 gobject-introspection # Temporary fix, see https://github.com/NixOS/nixpkgs/issues/56943 35 35 keybinder3 36 36 libnotify 37 - python 37 + python3 38 38 vte 39 39 ]; 40 40 41 - propagatedBuildInputs = with python.pkgs; [ 41 + propagatedBuildInputs = with python3.pkgs; [ 42 42 configobj 43 43 dbus-python 44 44 pygobject3 ··· 47 47 ]; 48 48 49 49 postPatch = '' 50 - patchShebangs . 50 + patchShebangs run_tests tests po 51 51 # dbus-python is correctly passed in propagatedBuildInputs, but for some reason setup.py complains. 52 52 # The wrapped terminator has the correct path added, so ignore this. 53 53 substituteInPlace setup.py --replace "'dbus-python'," "" 54 54 ''; 55 55 56 56 checkPhase = '' 57 + runHook preCheck 58 + 57 59 ./run_tests 60 + 61 + runHook postCheck 58 62 ''; 59 63 60 64 meta = with stdenv.lib; {
+1 -1
pkgs/top-level/all-packages.nix
··· 21722 21722 21723 21723 terminal-notifier = callPackage ../applications/misc/terminal-notifier {}; 21724 21724 21725 - terminator = callPackage ../applications/misc/terminator { python = python3; }; 21725 + terminator = callPackage ../applications/misc/terminator { }; 21726 21726 21727 21727 terminus = callPackage ../applications/misc/terminus { }; 21728 21728