2 files changed, 29 insertions, 3 deletions
diff --git a/gnu/packages/openstack.scm b/gnu/packages/openstack.scm
index c339cd5178..2a55a80842 100644
--- a/gnu/packages/openstack.scm
+++ b/gnu/packages/openstack.scm
@@ -118,17 +118,17 @@ manner.")
 (define-public python-hacking
   (package
     (name "python-hacking")
-    (version "0.13.0")
+    (version "1.0.0")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "hacking" version))
        (sha256
         (base32
-         "1s1wq2sds6fjp8rwz31vkp33kjl9nyk5y2g2pri8shic75dr00h4"))))
+         "0s9l99s64jsyvm28fa4hzllbdi21sb7jn4gzdf1pd5ckvy7p4b0k"))))
     (build-system python-build-system)
     (propagated-inputs
-     `(("python-flake8" ,python-flake8)
+     `(("python-flake8" ,python-flake8-2.5)
        ("python-mccabe-0.2.1" ,python-mccabe-0.2.1)
        ("python-pbr" ,python-pbr)
        ("python-pep8-1.5.7" ,python-pep8-1.5.7)
diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index 257489d09b..5bbe472da6 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -5468,6 +5468,32 @@ complexity of Python source code.")
          ("python2-enum" ,python2-enum)
           ,@(package-propagated-inputs base))))))
 
+;; python-hacking requires flake8 <2.6.0.
+(define-public python-flake8-2.5
+  (package
+    (inherit python-flake8)
+    (version "2.5.5")
+    (source (origin
+              (method url-fetch)
+              (uri (pypi-uri "flake8" version))
+              (sha256
+               (base32
+                "1snylqwbmrylbx3r1wpz8ggk98f6bcag4441ag8mm2l7wyn58sij"))))
+    (propagated-inputs
+     `(("python-pep8" ,python-pep8)
+       ,@(package-propagated-inputs python-flake8)))
+    (properties `((python2-variant . ,(delay python2-flake8-2.5))))))
+
+(define-public python2-flake8-2.5
+  (package
+    (inherit python2-flake8)
+    (version (package-version python-flake8-2.5))
+    (source (origin
+              (inherit (package-source python-flake8-2.5))))
+    (propagated-inputs
+     `(("python2-pep8" ,python2-pep8)
+       ,@(package-propagated-inputs python2-flake8)))))
+
 (define-public python-flake8-polyfill
   (package
     (name "python-flake8-polyfill")