From 076857913fa207c5842d00b3a531171fa16067c2 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Mon, 15 Oct 2018 16:04:15 -0400 Subject: [PATCH] pythonPackages.gateone: refactor move to python-modules --- .../python-modules/gateone/default.nix | 35 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 21 +---------- 2 files changed, 36 insertions(+), 20 deletions(-) create mode 100644 pkgs/development/python-modules/gateone/default.nix diff --git a/pkgs/development/python-modules/gateone/default.nix b/pkgs/development/python-modules/gateone/default.nix new file mode 100644 index 00000000000..136c089ee4b --- /dev/null +++ b/pkgs/development/python-modules/gateone/default.nix @@ -0,0 +1,35 @@ +{ stdenv +, buildPythonPackage +, fetchFromGitHub +, tornado +, futures +, html5lib +, pkgs +, isPy3k +}: + +buildPythonPackage rec { + name = "gateone-1.2-0d57c3"; + disabled = isPy3k; + + src = pkgs.fetchFromGitHub { + rev = "1d0e8037fbfb7c270f3710ce24154e24b7031bea"; + owner= "liftoff"; + repo = "GateOne"; + sha256 = "1ghrawlqwv7wnck6alqpbwy9mpv0y21cw2jirrvsxaracmvgk6vv"; + }; + + propagatedBuildInputs = [tornado futures html5lib pkgs.openssl pkgs.cacert pkgs.openssh]; + + postInstall='' + cp -R "$out/gateone/"* $out/lib/python2.7/site-packages/gateone + ''; + + meta = with stdenv.lib; { + homepage = https://liftoffsoftware.com/; + description = "GateOne is a web-based terminal emulator and SSH client"; + maintainers = with maintainers; [ tomberek ]; + license = licenses.gpl3; + }; + +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index d846e9b99ec..4828b667911 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1802,26 +1802,7 @@ in { functools32 = callPackage ../development/python-modules/functools32 { }; - gateone = buildPythonPackage rec { - name = "gateone-1.2-0d57c3"; - disabled = ! isPy27; - src = pkgs.fetchFromGitHub { - rev = "1d0e8037fbfb7c270f3710ce24154e24b7031bea"; - owner= "liftoff"; - repo = "GateOne"; - sha256 = "1ghrawlqwv7wnck6alqpbwy9mpv0y21cw2jirrvsxaracmvgk6vv"; - }; - propagatedBuildInputs = with self; [tornado futures html5lib pkgs.openssl pkgs.cacert pkgs.openssh]; - meta = { - homepage = https://liftoffsoftware.com/; - description = "GateOne is a web-based terminal emulator and SSH client"; - maintainers = with maintainers; [ tomberek ]; - - }; - postInstall='' - cp -R "$out/gateone/"* $out/lib/python2.7/site-packages/gateone - ''; - }; + gateone = callPackage ../development/python-modules/gateone { }; gcutil = buildPythonPackage rec { name = "gcutil-1.16.1";