diff --git a/pkgs/development/python-modules/mesa/default.nix b/pkgs/development/python-modules/mesa/default.nix
index aaf13a76530d..2398551b0daa 100644
--- a/pkgs/development/python-modules/mesa/default.nix
+++ b/pkgs/development/python-modules/mesa/default.nix
@@ -1,29 +1,46 @@
-{ lib, buildPythonPackage, fetchFromGitHub, isPy27
-, cookiecutter, networkx , pandas, tornado, tqdm
-, pytest }:
+{ lib
+, buildPythonPackage
+, fetchPypi
+, isPy27
+, cookiecutter
+, networkx
+, pandas
+, tornado
+, tqdm
+, pytestCheckHook
+}:
 
 buildPythonPackage rec {
   pname = "mesa";
-  version = "0.8.7";
+  version = "1.1.1";
+  format = "setuptools";
 
   # According to their docs, this library is for Python 3+.
   disabled = isPy27;
 
-  src = fetchFromGitHub {
-    owner = "projectmesa";
-    repo = "mesa";
-    rev = "v${version}";
-    sha256 = "0i1bpdqjrx4avgrzyqxpwxx86j11yhrq1j4kca854xahvhmwis19";
+  src = fetchPypi {
+    pname = "Mesa";
+    inherit version;
+    hash = "sha256-FPQLPClI8CKVsacZs4DLFnaikVSwrevU5TfUMevXgSY=";
   };
 
-  checkInputs = [ pytest ];
+  propagatedBuildInputs = [
+    cookiecutter
+    networkx
+    pandas
+    tornado
+    tqdm
+  ];
 
-  # Ignore test which tries to mkdir in unreachable location.
-  checkPhase = ''
-    pytest tests -k "not scaffold"
-  '';
+  checkInputs = [
+    pytestCheckHook
+  ];
 
-  propagatedBuildInputs = [ cookiecutter networkx pandas tornado tqdm ];
+  disabledTests = [
+    "test_examples"
+    "test_run"
+    "test_scaffold_creates_project_dir"
+  ];
 
   meta = with lib; {
     homepage = "https://github.com/projectmesa/mesa";