From 83a15925a4673e7b0027ebc6ac7e559c419b085c Mon Sep 17 00:00:00 2001 From: Michael Hoang Date: Sat, 11 Aug 2018 15:36:03 +1000 Subject: [PATCH 1/2] pythonPackages.Flootty: Remove redundant package --- pkgs/top-level/python-packages.nix | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 26c1215ae01..34669de9298 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"; From 78961b663c55a07286abfbf63b5de0d8bda4121f Mon Sep 17 00:00:00 2001 From: Michael Hoang Date: Sat, 11 Aug 2018 15:23:36 +1000 Subject: [PATCH 2/2] flootty: 3.2.1 -> 3.2.2 --- pkgs/development/tools/flootty/default.nix | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/pkgs/development/tools/flootty/default.nix b/pkgs/development/tools/flootty/default.nix index 796c3dc79a0..1baddb52259 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 ]; }; }