From 0594a95c96071266cbaacff295e35fd8133490e8 Mon Sep 17 00:00:00 2001
From: Chris Ostrouchov <chris.ostrouchov@gmail.com>
Date: Mon, 29 Oct 2018 11:06:37 -0400
Subject: [PATCH] pythonPackages.libarchive: refactor move to python-modules

---
 .../python-libarchive/default.nix             | 27 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            | 13 +--------
 2 files changed, 28 insertions(+), 12 deletions(-)
 create mode 100644 pkgs/development/python-modules/python-libarchive/default.nix

diff --git a/pkgs/development/python-modules/python-libarchive/default.nix b/pkgs/development/python-modules/python-libarchive/default.nix
new file mode 100644
index 000000000000..bae94191fc03
--- /dev/null
+++ b/pkgs/development/python-modules/python-libarchive/default.nix
@@ -0,0 +1,27 @@
+{ stdenv
+, buildPythonPackage
+, fetchurl
+, isPy3k
+, pkgs
+}:
+
+buildPythonPackage rec {
+  version = "3.1.2-1";
+  pname = "libarchive";
+  disabled = isPy3k;
+
+  src = fetchurl {
+    url = "http://python-libarchive.googlecode.com/files/python-libarchive-${version}.tar.gz";
+    sha256 = "0j4ibc4mvq64ljya9max8832jafi04jciff9ia9qy0xhhlwkcx8x";
+  };
+
+  propagatedBuildInputs = [ pkgs.libarchive.lib ];
+
+  meta = with stdenv.lib; {
+    description = "Multi-format archive and compression library";
+    homepage = https://libarchive.org/;
+    license = licenses.bsd0;
+    broken = true;
+  };
+
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index df0c57efcd2c..f072305706ea 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -4237,19 +4237,8 @@ in {
   tarman = callPackage ../development/python-modules/tarman { };
 
   libarchive = self.python-libarchive; # The latter is the name upstream uses
-  python-libarchive = buildPythonPackage rec {
-    version = "3.1.2-1";
-    name = "libarchive-${version}";
-    disabled = isPy3k;
 
-    src = pkgs.fetchurl {
-      url = "http://python-libarchive.googlecode.com/files/python-libarchive-${version}.tar.gz";
-      sha256 = "0j4ibc4mvq64ljya9max8832jafi04jciff9ia9qy0xhhlwkcx8x";
-    };
-
-    propagatedBuildInputs = with self; [ pkgs.libarchive.lib ];
-    meta.broken = true;
-  };
+  python-libarchive = callPackage ../development/python-modules/python-libarchive { };
 
   libarchive-c = buildPythonPackage rec {
     name = "libarchive-c-${version}";