From 1fe585403d17c3a7995bdfa50408aaed15965117 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Mon, 29 Oct 2018 09:29:27 -0400 Subject: [PATCH] pythonPackages.vultr: refactor move to python-modules --- .../python-modules/vultr/default.nix | 30 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 25 +--------------- 2 files changed, 31 insertions(+), 24 deletions(-) create mode 100644 pkgs/development/python-modules/vultr/default.nix diff --git a/pkgs/development/python-modules/vultr/default.nix b/pkgs/development/python-modules/vultr/default.nix new file mode 100644 index 000000000000..e66e21f01a66 --- /dev/null +++ b/pkgs/development/python-modules/vultr/default.nix @@ -0,0 +1,30 @@ +{ stdenv +, buildPythonPackage +, fetchFromGitHub +, requests +}: + +buildPythonPackage rec { + version = "0.1.2"; + pname = "vultr"; + + src = fetchFromGitHub { + owner = "spry-group"; + repo = "python-vultr"; + rev = "${version}"; + sha256 = "1qjvvr2v9gfnwskdl0ayazpcmiyw9zlgnijnhgq9mcri5gq9jw5h"; + }; + + propagatedBuildInputs = [ requests ]; + + # Tests disabled. They fail because they try to access the network + doCheck = false; + + meta = with stdenv.lib; { + description = "Vultr.com API Client"; + homepage = "https://github.com/spry-group/python-vultr"; + license = licenses.mit; + maintainers = with maintainers; [ lihop ]; + }; + +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 63df7057691b..74796882a81f 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4093,30 +4093,7 @@ in { vmprof = callPackage ../development/python-modules/vmprof { }; - vultr = buildPythonPackage rec { - version = "0.1.2"; - name = "vultr-${version}"; - - src = pkgs.fetchFromGitHub { - owner = "spry-group"; - repo = "python-vultr"; - rev = "${version}"; - sha256 = "1qjvvr2v9gfnwskdl0ayazpcmiyw9zlgnijnhgq9mcri5gq9jw5h"; - }; - - propagatedBuildInputs = with self; [ requests ]; - - # Tests disabled. They fail because they try to access the network - doCheck = false; - - meta = { - description = "Vultr.com API Client"; - homepage = "https://github.com/spry-group/python-vultr"; - license = licenses.mit; - maintainers = with maintainers; [ lihop ]; - platforms = platforms.all; - }; - }; + vultr = callPackage ../development/python-modules/vultr { }; waitress = buildPythonPackage rec { name = "waitress-1.0.2";