From 93e026ce04df3b495ba70bcf7747a3533af5d5d9 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Mon, 15 Oct 2018 17:10:16 -0400 Subject: [PATCH] pythonPackages.lxc: refactor move to python-modules --- .../python-modules/lxc/default.nix | 29 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 21 +------------- 2 files changed, 30 insertions(+), 20 deletions(-) create mode 100644 pkgs/development/python-modules/lxc/default.nix diff --git a/pkgs/development/python-modules/lxc/default.nix b/pkgs/development/python-modules/lxc/default.nix new file mode 100644 index 000000000000..a078d33a8895 --- /dev/null +++ b/pkgs/development/python-modules/lxc/default.nix @@ -0,0 +1,29 @@ +{ stdenv +, buildPythonPackage +, fetchFromGitHub +, isPy3k +, pkgs +}: + +buildPythonPackage rec { + pname = "python-lxc-unstable"; + version = "2016-08-25"; + disabled = isPy3k; + + src = fetchFromGitHub { + owner = "lxc"; + repo = "python2-lxc"; + rev = "0553f05d23b56b59bf3015fa5e45bfbfab9021ef"; + sha256 = "0p9kb20xvq91gx2wfs3vppb7vsp8kmd90i3q95l4nl1y4aismdn4"; + }; + + buildInputs = [ pkgs.lxc ]; + + meta = with stdenv.lib; { + description = "Out of tree python 2.7 binding for liblxc"; + homepage = https://github.com/lxc/python2-lxc; + license = licenses.lgpl2; + maintainers = with maintainers; [ mic92 ]; + }; + +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 8cf847a07c35..c259ed984c55 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5765,26 +5765,7 @@ in { lxml = callPackage ../development/python-modules/lxml {inherit (pkgs) libxml2 libxslt;}; - lxc = buildPythonPackage (rec { - name = "python-lxc-unstable-2016-08-25"; - disabled = !isPy27; - - src = pkgs.fetchFromGitHub { - owner = "lxc"; - repo = "python2-lxc"; - rev = "0553f05d23b56b59bf3015fa5e45bfbfab9021ef"; - sha256 = "0p9kb20xvq91gx2wfs3vppb7vsp8kmd90i3q95l4nl1y4aismdn4"; - }; - - buildInputs = [ pkgs.lxc ]; - - meta = { - description = "Out of tree python 2.7 binding for liblxc"; - homepage = https://github.com/lxc/python2-lxc; - license = licenses.lgpl2; - maintainers = with maintainers; [ mic92 ]; - }; - }); + lxc = callPackage ../development/python-modules/lxc { }; py_scrypt = callPackage ../development/python-modules/py_scrypt { };