From 79db7c0616c38ac15ea0f6734034053e92b3cca2 Mon Sep 17 00:00:00 2001
From: Gregory Pfeil <greg@technomadic.org>
Date: Fri, 12 Jan 2018 10:19:46 -0700
Subject: [PATCH 1/2] flootty: init at 3.2.1

---
 lib/maintainers.nix                           |  1 +
 .../python-modules/flootty/default.nix        | 19 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  4 +++-
 pkgs/top-level/python-packages.nix            |  2 ++
 4 files changed, 25 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/development/python-modules/flootty/default.nix

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index ea1cff03fe2..85669a28c28 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -530,6 +530,7 @@
   schristo = "Scott Christopher <schristopher@konputa.com>";
   scolobb = "Sergiu Ivanov <sivanov@colimite.fr>";
   sdll = "Sasha Illarionov <sasha.delly@gmail.com>";
+  sellout = "Greg Pfeil <greg@technomadic.org>";
   sepi = "Raffael Mancini <raffael@mancini.lu>";
   seppeljordan = "Sebastian Jordan <sebastian.jordan.mail@googlemail.com>";
   shanemikel = "Shane Pearlman <shanemikel1@gmail.com>";
diff --git a/pkgs/development/python-modules/flootty/default.nix b/pkgs/development/python-modules/flootty/default.nix
new file mode 100644
index 00000000000..92ce520fd19
--- /dev/null
+++ b/pkgs/development/python-modules/flootty/default.nix
@@ -0,0 +1,19 @@
+{ stdenv, buildPythonPackage, fetchPypi }:
+
+buildPythonPackage rec {
+  pname = "Flootty";
+  version = "3.2.1";
+  name = "${pname}-${version}";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0vjwl6g1bwm6jwp9wjla663cm831zf0rc9361mvpn4imdsfz7hxs";
+  };
+
+  meta = with stdenv.lib; {
+    description = "A collaborative terminal. In practice, it's similar to a shared screen or tmux session";
+    homepage = "https://floobits.com/help/flootty";
+    license = licenses.asl20;
+    maintainers = with maintainers; [ sellout ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 175b3a98df1..1cb45cf7657 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7004,7 +7004,7 @@ with pkgs;
 
   findbugs = callPackage ../development/tools/analysis/findbugs { };
 
-  foreman = callPackage ../tools/system/foreman { };
+  flootty = pythonPackages.flootty;
 
   flow = callPackage ../development/tools/analysis/flow {
     inherit (darwin.apple_sdk.frameworks) CoreServices;
@@ -7012,6 +7012,8 @@ with pkgs;
     inherit (ocamlPackages_4_03) ocaml findlib camlp4 sedlex ocamlbuild;
   };
 
+  foreman = callPackage ../tools/system/foreman { };
+
   framac = callPackage ../development/tools/analysis/frama-c { };
 
   frame = callPackage ../development/libraries/frame { };
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 0d89d6bd8d7..e01434758fa 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -167,6 +167,8 @@ in {
 
   distorm3 = callPackage ../development/python-modules/distorm3 { };
 
+  flootty = callPackage ../development/python-modules/flootty { };
+
   h5py = callPackage ../development/python-modules/h5py {
     hdf5 = pkgs.hdf5;
   };

From d40d41ef51cbe82bf98e4d309374706002f50385 Mon Sep 17 00:00:00 2001
From: Gregory Pfeil <greg@technomadic.org>
Date: Sat, 13 Jan 2018 09:56:42 -0700
Subject: [PATCH 2/2] Move flootty from python-modules.

---
 .../{python-modules => tools}/flootty/default.nix         | 8 ++++++--
 pkgs/top-level/all-packages.nix                           | 2 +-
 pkgs/top-level/python-packages.nix                        | 2 --
 3 files changed, 7 insertions(+), 5 deletions(-)
 rename pkgs/development/{python-modules => tools}/flootty/default.nix (80%)

diff --git a/pkgs/development/python-modules/flootty/default.nix b/pkgs/development/tools/flootty/default.nix
similarity index 80%
rename from pkgs/development/python-modules/flootty/default.nix
rename to pkgs/development/tools/flootty/default.nix
index 92ce520fd19..9535ba86dd0 100644
--- a/pkgs/development/python-modules/flootty/default.nix
+++ b/pkgs/development/tools/flootty/default.nix
@@ -1,6 +1,10 @@
-{ stdenv, buildPythonPackage, fetchPypi }:
+{ stdenv, python }:
 
-buildPythonPackage rec {
+let
+  inherit (python.pkgs) buildPythonApplication fetchPypi;
+in
+
+buildPythonApplication rec {
   pname = "Flootty";
   version = "3.2.1";
   name = "${pname}-${version}";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 84384931974..4d31c9bcfdf 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7444,7 +7444,7 @@ with pkgs;
 
   findbugs = callPackage ../development/tools/analysis/findbugs { };
 
-  flootty = pythonPackages.flootty;
+  flootty = callPackage ../development/tools/flootty { };
 
   flow = callPackage ../development/tools/analysis/flow {
     inherit (darwin.apple_sdk.frameworks) CoreServices;
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index eede8853574..fec2e3fd493 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -225,8 +225,6 @@ in {
 
   diff-match-patch = callPackage ../development/python-modules/diff-match-patch { };
 
-  flootty = callPackage ../development/python-modules/flootty { };
-
   gssapi = callPackage ../development/python-modules/gssapi { };
 
   h5py = callPackage ../development/python-modules/h5py {