From 493adc9227e5e2649e71756679b2527c144a8441 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Mon, 17 Feb 2014 20:43:35 +0100
Subject: [PATCH] Rename 'gnome-terminator' to 'terminator'

Align the package name with what other distros call it.

Other distros: Fedora, Debian, Archlinux, OpenSUSE, Mageia, Slackware
(and probably more).
---
 .../misc/{gnome_terminator => terminator}/default.nix  |  4 ++--
 pkgs/top-level/all-packages.nix                        | 10 +++++-----
 2 files changed, 7 insertions(+), 7 deletions(-)
 rename pkgs/applications/misc/{gnome_terminator => terminator}/default.nix (94%)

diff --git a/pkgs/applications/misc/gnome_terminator/default.nix b/pkgs/applications/misc/terminator/default.nix
similarity index 94%
rename from pkgs/applications/misc/gnome_terminator/default.nix
rename to pkgs/applications/misc/terminator/default.nix
index 71d8bbfd8e7e..c337cd329c92 100644
--- a/pkgs/applications/misc/gnome_terminator/default.nix
+++ b/pkgs/applications/misc/terminator/default.nix
@@ -3,11 +3,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "gnome-terminator-${version}";
+  name = "terminator-${version}";
   version = "0.97";
   
   src = fetchurl {
-    url = "https://launchpad.net/terminator/trunk/${version}/+download/terminator-${version}.tar.gz";
+    url = "https://launchpad.net/terminator/trunk/${version}/+download/${name}.tar.gz";
     sha256 = "1xykpx10g2zssx0ss6351ca6vmmma7zwxxhjz0fg28ps4dq88cci";
   };
   
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d20cee5501fe..c7b554de6e1c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8107,11 +8107,6 @@ let
     inherit (gnome) GConf;
   };
 
-  gnome_terminator = callPackage ../applications/misc/gnome_terminator {
-    vte = gnome.vte.override { pythonSupport = true; };
-    inherit (pythonPackages) notify;
-  };
-
   googleearth = callPackage_i686 ../applications/misc/googleearth { };
 
   google_talk_plugin = callPackage ../applications/networking/browsers/mozilla-plugins/google-talk-plugin {
@@ -8912,6 +8907,11 @@ let
 
   telepathy_salut = callPackage ../applications/networking/instant-messengers/telepathy/salut {};
 
+  terminator = callPackage ../applications/misc/terminator {
+    vte = gnome.vte.override { pythonSupport = true; };
+    inherit (pythonPackages) notify;
+  };
+
   tesseract = callPackage ../applications/graphics/tesseract { };
 
   thinkingRock = callPackage ../applications/misc/thinking-rock { };