diff --git a/lib/maintainers.nix b/lib/maintainers.nix index ea1cff03fe2e..85669a28c281 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -530,6 +530,7 @@ schristo = "Scott Christopher "; scolobb = "Sergiu Ivanov "; sdll = "Sasha Illarionov "; + sellout = "Greg Pfeil "; sepi = "Raffael Mancini "; seppeljordan = "Sebastian Jordan "; shanemikel = "Shane Pearlman "; diff --git a/pkgs/development/python-modules/flootty/default.nix b/pkgs/development/python-modules/flootty/default.nix new file mode 100644 index 000000000000..92ce520fd194 --- /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 175b3a98df13..1cb45cf76573 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 0d89d6bd8d76..e01434758fae 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; };