diff --git a/pkgs/tools/networking/gandi-cli/default.nix b/pkgs/tools/networking/gandi-cli/default.nix
new file mode 100644
index 000000000000..2f95123ba212
--- /dev/null
+++ b/pkgs/tools/networking/gandi-cli/default.nix
@@ -0,0 +1,28 @@
+{ stdenv, pythonPackages, fetchFromGitHub }:
+
+with pythonPackages;
+
+buildPythonPackage rec {
+  namePrefix = "";
+  name = "gandi-cli-${version}";
+  version = "0.18";
+
+  src = fetchFromGitHub {
+    sha256 = "045gnz345nfbi1g7j3gcyzrxrx3hcidaxzr05cb49rcr8nmqh1s3";
+    rev = version;
+    repo = "gandi.cli";
+    owner = "Gandi";
+  };
+
+  propagatedBuildInputs = [ click ipy pyyaml requests ];
+
+  doCheck = false;    # Tests try to contact the actual remote API
+
+  meta = with stdenv.lib; {
+    description = "Command-line interface to the public Gandi.net API";
+    homepage = http://cli.gandi.net/;
+    license = licenses.gpl3Plus;
+    maintainers = with maintainers; [ nckx ];
+  };
+}
+
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ec2523b975a5..446501c094b6 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1594,6 +1594,8 @@ in
 
   galen = callPackage ../development/tools/galen {};
 
+  gandi-cli = callPackage ../tools/networking/gandi-cli { };
+
   garmin-plugin = callPackage ../applications/misc/garmin-plugin {};
 
   garmintools = callPackage ../development/libraries/garmintools {};
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index e664ab56703c..8edba3627e4d 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -5785,25 +5785,6 @@ in modules // {
     };
   };
 
-  gandi-cli = buildPythonPackage rec {
-    name = "gandi-cli-${version}";
-    version = "0.18";
-    src = pkgs.fetchFromGitHub {
-      sha256 = "045gnz345nfbi1g7j3gcyzrxrx3hcidaxzr05cb49rcr8nmqh1s3";
-      rev = version;
-      repo = "gandi.cli";
-      owner = "Gandi";
-    };
-    propagatedBuildInputs = with self; [ click ipy pyyaml requests ];
-    doCheck = false;	# Tests try to contact the actual remote API
-    meta = {
-      homepage = http://cli.gandi.net/;
-      description = "Command-line interface to the public Gandi.net API";
-      license = licenses.gpl3Plus;
-      maintainers = with maintainers; [ nckx ];
-    };
-  };
-
   gateone = buildPythonPackage rec {
     name = "gateone-1.2-0d57c3";
     disabled = ! isPy27;