summary refs log tree commit diff
diff options
context:
space:
mode:
authorRobert Schütz <rschuetz17@gmail.com>2018-08-12 11:03:19 +0200
committerGitHub <noreply@github.com>2018-08-12 11:03:19 +0200
commit4af9ee49f1ebc72d34c9c482ba50f887f90aebdc (patch)
treebb883fcd363d7f2ca435165cbd338fbcbb815890
parentf4f93d6dd13c6fe3f3ce3b39d16a51f70496e273 (diff)
parent78961b663c55a07286abfbf63b5de0d8bda4121f (diff)
downloadnixlib-4af9ee49f1ebc72d34c9c482ba50f887f90aebdc.tar
nixlib-4af9ee49f1ebc72d34c9c482ba50f887f90aebdc.tar.gz
nixlib-4af9ee49f1ebc72d34c9c482ba50f887f90aebdc.tar.bz2
nixlib-4af9ee49f1ebc72d34c9c482ba50f887f90aebdc.tar.lz
nixlib-4af9ee49f1ebc72d34c9c482ba50f887f90aebdc.tar.xz
nixlib-4af9ee49f1ebc72d34c9c482ba50f887f90aebdc.tar.zst
nixlib-4af9ee49f1ebc72d34c9c482ba50f887f90aebdc.zip
Merge pull request #44889 from Enzime/update/flootty
Remove redundant flootty package and update the correct package
-rw-r--r--pkgs/development/tools/flootty/default.nix16
-rw-r--r--pkgs/top-level/python-packages.nix16
2 files changed, 6 insertions, 26 deletions
diff --git a/pkgs/development/tools/flootty/default.nix b/pkgs/development/tools/flootty/default.nix
index 796c3dc79a09..1baddb52259c 100644
--- a/pkgs/development/tools/flootty/default.nix
+++ b/pkgs/development/tools/flootty/default.nix
@@ -1,22 +1,18 @@
-{ stdenv, python }:
+{ stdenv, python3Packages }:
 
-let
-  inherit (python.pkgs) buildPythonApplication fetchPypi;
-in
-
-buildPythonApplication rec {
+python3Packages.buildPythonApplication rec {
   pname = "Flootty";
-  version = "3.2.1";
+  version = "3.2.2";
 
-  src = fetchPypi {
+  src = python3Packages.fetchPypi {
     inherit pname version;
-    sha256 = "0vjwl6g1bwm6jwp9wjla663cm831zf0rc9361mvpn4imdsfz7hxs";
+    sha256 = "0gfl143ly81pmmrcml91yr0ypvwrs5q4s1sfdc0l2qkqpy233ih7";
   };
 
   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 ];
+    maintainers = with maintainers; [ sellout enzime ];
   };
 }
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 26c1215ae019..34669de92983 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2450,22 +2450,6 @@ in {
 
   flit = callPackage ../development/python-modules/flit { };
 
-  Flootty = buildPythonPackage rec {
-    name = "Flootty-3.2.0";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/F/Flootty/${name}.tar.gz";
-      sha256 = "14n2q2k388xbmp5rda5ss879bg5cbibk4zzz7c8mrjsmxhgagmmg";
-    };
-
-    meta = with pkgs.stdenv.lib; {
-      description = "Floobits collaborative terminal";
-      homepage = "https://github.com/Floobits/flootty/";
-      maintainers = with maintainers; [ garbas ];
-      license = licenses.asl20;
-    };
-  };
-
   flowlogs_reader = buildPythonPackage rec {
     name = "flowlogs_reader-1.0.0";