From 8090784c0cf8a6cc8a9b84454dd3d5ad5dbd1c17 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Sun, 28 Oct 2018 12:45:59 -0400 Subject: [PATCH] pythonPackages.linecache2: refactor move to python-modules --- .../python-modules/linecache2/default.nix | 26 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 19 +------------- 2 files changed, 27 insertions(+), 18 deletions(-) create mode 100644 pkgs/development/python-modules/linecache2/default.nix diff --git a/pkgs/development/python-modules/linecache2/default.nix b/pkgs/development/python-modules/linecache2/default.nix new file mode 100644 index 000000000000..9890d382742c --- /dev/null +++ b/pkgs/development/python-modules/linecache2/default.nix @@ -0,0 +1,26 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, pbr +}: + +buildPythonPackage rec { + pname = "linecache2"; + version = "1.0.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "0z79g3ds5wk2lvnqw0y2jpakjf32h95bd9zmnvp7dnqhf57gy9jb"; + }; + + buildInputs = [ pbr ]; + # circular dependencies for tests + doCheck = false; + + meta = with stdenv.lib; { + description = "A backport of linecache to older supported Pythons"; + homepage = "https://github.com/testing-cabal/linecache2"; + license = licenses.psfl; + }; + +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 5cafa6ed0c09..e0dd52a1bf3b 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4055,24 +4055,7 @@ in { traceback2 = callPackage ../development/python-modules/traceback2 { }; - linecache2 = buildPythonPackage rec { - name = "linecache2-${version}"; - version = "1.0.0"; - - src = pkgs.fetchurl { - url = "mirror://pypi/l/linecache2/${name}.tar.gz"; - sha256 = "0z79g3ds5wk2lvnqw0y2jpakjf32h95bd9zmnvp7dnqhf57gy9jb"; - }; - - buildInputs = with self; [ pbr ]; - # circular dependencies for tests - doCheck = false; - - meta = with stdenv.lib; { - description = "A backport of linecache to older supported Pythons"; - homepage = "https://github.com/testing-cabal/linecache2"; - }; - }; + linecache2 = callPackage ../development/python-modules/linecache2 { }; upass = buildPythonPackage rec { version = "0.1.4";