diff --git a/pkgs/development/python-modules/astroquery/default.nix b/pkgs/development/python-modules/astroquery/default.nix
new file mode 100644
index 000000000000..50312d5e343a
--- /dev/null
+++ b/pkgs/development/python-modules/astroquery/default.nix
@@ -0,0 +1,30 @@
+{ pkgs
+, buildPythonPackage
+, fetchPypi
+, astropy
+, requests
+, keyring
+, beautifulsoup4
+, html5lib
+}:
+
+buildPythonPackage rec {
+  pname = "astroquery";
+  version = "0.3.8";
+
+  doCheck = false; # Tests require the pytest-astropy package
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "800d9730c9e2bd299f14c29b4d709d1605c82833223a2e4f784fea7ad805c168";
+  };
+
+  propagatedBuildInputs = [ astropy requests keyring beautifulsoup4 html5lib ];
+
+  meta = with pkgs.lib; {
+    description = "Functions and classes to access online data resources";
+    homepage = "https://astroquery.readthedocs.io/";
+    license = licenses.bsd3;
+    maintainers = [ maintainers.smaret ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index cbb69c702699..c413ae1b47e5 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -196,6 +196,8 @@ in {
 
   astropy = callPackage ../development/python-modules/astropy { };
 
+  astroquery = callPackage ../development/python-modules/astroquery { }; 
+
   atom = callPackage ../development/python-modules/atom { };
 
   augeas = callPackage ../development/python-modules/augeas {