summary refs log tree commit diff
diff options
context:
space:
mode:
authorJörg Thalheim <Mic92@users.noreply.github.com>2018-12-18 19:26:03 +0000
committerGitHub <noreply@github.com>2018-12-18 19:26:03 +0000
commite116aa1d4b2d52b12f9d810f45b80eebbbd0a2c9 (patch)
tree855f39ab4d8ce3eb9da9dbb9c12d04cb24b25096
parentceb89f042ebecf50331a68231016483f41d88e5f (diff)
parent04e2dd4c4fd16cbf6bb58540363340347df940ef (diff)
downloadnixpkgs-e116aa1d4b2d52b12f9d810f45b80eebbbd0a2c9.tar
nixpkgs-e116aa1d4b2d52b12f9d810f45b80eebbbd0a2c9.tar.gz
nixpkgs-e116aa1d4b2d52b12f9d810f45b80eebbbd0a2c9.tar.bz2
nixpkgs-e116aa1d4b2d52b12f9d810f45b80eebbbd0a2c9.tar.lz
nixpkgs-e116aa1d4b2d52b12f9d810f45b80eebbbd0a2c9.tar.xz
nixpkgs-e116aa1d4b2d52b12f9d810f45b80eebbbd0a2c9.tar.zst
nixpkgs-e116aa1d4b2d52b12f9d810f45b80eebbbd0a2c9.zip
Merge pull request #52128 from tilpner/add-mkdocs
mkdocs: 0.17.5 -> 1.0.4
-rw-r--r--pkgs/development/tools/documentation/mkdocs/default.nix16
1 files changed, 8 insertions, 8 deletions
diff --git a/pkgs/development/tools/documentation/mkdocs/default.nix b/pkgs/development/tools/documentation/mkdocs/default.nix
index 925d0a786af..5f3dff95e35 100644
--- a/pkgs/development/tools/documentation/mkdocs/default.nix
+++ b/pkgs/development/tools/documentation/mkdocs/default.nix
@@ -4,25 +4,24 @@ with python.pkgs;
 
 buildPythonApplication rec {
   pname = "mkdocs";
-  version = "0.17.5";
+  version = "1.0.4";
 
   src = fetchFromGitHub {
     owner = "mkdocs";
     repo = "mkdocs";
     rev = version;
-    sha256 = "1l1dahpwqikmww3yx2m6j2134npk8vcikg9klsmpqjpza8nigwzw";
+    sha256 = "1x35vgiskgz4wwrvi4m1mri5wlphf15p90fr3rxsy5bf19v3s9hs";
   };
 
-  postPatch = ''
-    substituteInPlace setup.py \
-      --replace "tornado>=4.1,<5.0" "tornado>=4.1"
-  '';
-
   checkInputs = [
     nose nose-exclude mock
   ];
 
-  NOSE_EXCLUDE_TESTS="mkdocs.tests.gh_deploy_tests.TestGitHubDeploy;mkdocs.tests.config.config_tests.ConfigTests";
+  NOSE_EXCLUDE_TESTS = lib.concatStringsSep ";" [
+    "mkdocs.tests.gh_deploy_tests.TestGitHubDeploy"
+    "mkdocs.tests.config.config_tests.ConfigTests"
+    "mkdocs.tests.config.config_options_tests.DirTest"
+  ];
 
   checkPhase = "nosetests mkdocs";
 
@@ -33,6 +32,7 @@ buildPythonApplication rec {
     pyyaml
     markdown
     jinja2
+    backports_tempfile
   ];
 
   meta = {