From 410edb293a4ab7601a6ba80f672cf214320e1e5b Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Sun, 28 Oct 2018 12:55:51 -0400 Subject: [PATCH] pythonPackages.uptime: refactor move to python-modules --- .../python-modules/uptime/default.nix | 22 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 17 +------------- 2 files changed, 23 insertions(+), 16 deletions(-) create mode 100644 pkgs/development/python-modules/uptime/default.nix diff --git a/pkgs/development/python-modules/uptime/default.nix b/pkgs/development/python-modules/uptime/default.nix new file mode 100644 index 00000000000..035acbcec2b --- /dev/null +++ b/pkgs/development/python-modules/uptime/default.nix @@ -0,0 +1,22 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +}: + +buildPythonPackage rec { + pname = "uptime"; + version = "3.0.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "0wr9jkixprlywz0plyn5p42a5fd31aiwvjrxdvj7r02vfxa04c3w"; + }; + + meta = with stdenv.lib; { + homepage = https://github.com/Cairnarvon/uptime; + description = "Cross-platform way to retrieve system uptime and boot time"; + license = licenses.bsd2; + maintainers = with maintainers; [ rob ]; + }; + +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 1d4b44b6fb6..729af1a38ea 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4067,22 +4067,7 @@ in { uproot-methods = callPackage ../development/python-modules/uproot-methods { }; - uptime = buildPythonPackage rec { - name = "uptime-${version}"; - version = "3.0.1"; - - src = pkgs.fetchurl { - url = "mirror://pypi/u/uptime/${name}.tar.gz"; - sha256 = "0wr9jkixprlywz0plyn5p42a5fd31aiwvjrxdvj7r02vfxa04c3w"; - }; - - meta = with stdenv.lib; { - homepage = https://github.com/Cairnarvon/uptime; - description = "Cross-platform way to retrieve system uptime and boot time"; - license = licenses.bsd2; - maintainers = with maintainers; [ rob ]; - }; - }; + uptime = callPackage ../development/python-modules/uptime { }; urlgrabber = callPackage ../development/python-modules/urlgrabber {};