summary refs log tree commit diff
diff options
context:
space:
mode:
authorChris Ostrouchov <chris.ostrouchov@gmail.com>2018-10-17 01:02:39 -0400
committerFrederik Rietdijk <freddyrietdijk@fridh.nl>2018-10-18 11:02:23 +0200
commita38edd38b29432ddc19a826c134754020d77e4f5 (patch)
tree032f13594345e5244a9350c70d77c914b263a977
parent5f03c01b358c8ff30927bf33c56305ca67b6dab1 (diff)
downloadnixpkgs-a38edd38b29432ddc19a826c134754020d77e4f5.tar
nixpkgs-a38edd38b29432ddc19a826c134754020d77e4f5.tar.gz
nixpkgs-a38edd38b29432ddc19a826c134754020d77e4f5.tar.bz2
nixpkgs-a38edd38b29432ddc19a826c134754020d77e4f5.tar.lz
nixpkgs-a38edd38b29432ddc19a826c134754020d77e4f5.tar.xz
nixpkgs-a38edd38b29432ddc19a826c134754020d77e4f5.tar.zst
nixpkgs-a38edd38b29432ddc19a826c134754020d77e4f5.zip
pythonPackages.nixpkgs: refactor move to python-modules
-rw-r--r--pkgs/development/python-modules/nixpkgs/default.nix29
-rw-r--r--pkgs/top-level/python-packages.nix18
2 files changed, 30 insertions, 17 deletions
diff --git a/pkgs/development/python-modules/nixpkgs/default.nix b/pkgs/development/python-modules/nixpkgs/default.nix
new file mode 100644
index 00000000000..71c142436d9
--- /dev/null
+++ b/pkgs/development/python-modules/nixpkgs/default.nix
@@ -0,0 +1,29 @@
+{ stdenv
+, buildPythonPackage
+, fetchPypi
+, pbr
+, pythonix
+, pythonAtLeast
+}:
+
+buildPythonPackage rec {
+  pname = "nixpkgs";
+  version = "0.2.2";
+  disabled = ! pythonAtLeast "3.5";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0gsrd99kkv99jsrh3hckz7ns1zwndi9vvh4465v4gnpz723dd6fj";
+  };
+
+  buildInputs = [ pbr ];
+  propagatedBuildInputs = [ pythonix ];
+
+  meta = with stdenv.lib; {
+    description = "Allows to `from nixpkgs import` stuff in interactive Python sessions";
+    homepage = http://github.com/t184256/nixpkgs-python-importer;
+    license = licenses.mit;
+    maintainers = with maintainers; [ t184256 ];
+  };
+
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 1c5156eab68..849488a0884 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2973,23 +2973,7 @@ in {
     inherit (pkgs) which;
   };
 
-  nixpkgs = buildPythonPackage rec {
-    disabled = ! pythonAtLeast "3.5";
-    pname = "nixpkgs";
-    version = "0.2.2";
-    src = fetchPypi {
-      inherit pname version;
-      sha256 = "0gsrd99kkv99jsrh3hckz7ns1zwndi9vvh4465v4gnpz723dd6fj";
-    };
-    buildInputs = with self; [ pbr ];
-    propagatedBuildInputs = with self; [ pythonix ];
-    meta = {
-      description = "Allows to `from nixpkgs import` stuff in interactive Python sessions";
-      homepage = http://github.com/t184256/nixpkgs-python-importer;
-      license = licenses.mit;
-      maintainers = with maintainers; [ t184256 ];
-    };
-  };
+  nixpkgs = callPackage ../development/python-modules/nixpkgs { };
 
   nodeenv = callPackage ../development/python-modules/nodeenv { };