Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Remove redundant flootty package and update the correct package #44889

Merged
merged 2 commits into from
Aug 12, 2018
Merged

Remove redundant flootty package and update the correct package #44889

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
83a1592
pythonPackages.Flootty: Remove redundant package
Enzime Aug 11, 2018
78961b6
flootty: 3.2.1 -> 3.2.2
Enzime Aug 11, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
16 changes: 6 additions & 10 deletions pkgs/development/tools/flootty/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 ];
};
}
16 changes: 0 additions & 16 deletions pkgs/top-level/python-packages.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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";

Expand Down