From c874882ef67b92df394f479443a7b887ae42fc71 Mon Sep 17 00:00:00 2001
From: Ben Wolsieffer <benwolsieffer@gmail.com>
Date: Sun, 6 Nov 2022 19:59:47 -0500
Subject: [PATCH] colcon: update extensions

---
 pkgs/colcon/cmake.nix           |  4 ++--
 pkgs/colcon/core.nix            | 28 ++++++++++++++++++++++------
 pkgs/colcon/notification.nix    |  4 ++--
 pkgs/colcon/python-setup-py.nix |  4 ++--
 pkgs/colcon/ros.nix             |  4 ++--
 5 files changed, 30 insertions(+), 14 deletions(-)

diff --git a/pkgs/colcon/cmake.nix b/pkgs/colcon/cmake.nix
index 7ef46900b8..fef2d2dc02 100644
--- a/pkgs/colcon/cmake.nix
+++ b/pkgs/colcon/cmake.nix
@@ -3,11 +3,11 @@
 
 buildPythonPackage rec {
   pname = "colcon-cmake";
-  version = "0.2.26";
+  version = "0.2.27";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "17rl4jsxc43kjri3kdsyqbl73xchj6zj3j4m73yfasvn2bl7y8js";
+    hash = "sha256-9XlFUMp/n/tFVd5FQiflZqC+tciIHXZQnbMze5k3DyY=";
   };
 
   postPatch = ''
diff --git a/pkgs/colcon/core.nix b/pkgs/colcon/core.nix
index 9c553d667b..dda07238c7 100644
--- a/pkgs/colcon/core.nix
+++ b/pkgs/colcon/core.nix
@@ -1,6 +1,8 @@
 { lib, buildPythonApplication, buildPythonPackage, makeWrapper, fetchPypi
 , isPy27, python, distlib, empy, pytest, pytest-cov, pytest-repeat
-, pytest-rerunfailures, pytest-runner }:
+, pytest-rerunfailures, setuptools, pytestCheckHook, flake8, flake8-blind-except
+, flake8-docstrings, flake8-import-order, pep8-naming, pylint
+}:
 
 let
   withExtensions = extensions: buildPythonApplication {
@@ -27,11 +29,11 @@ let
 
   package = buildPythonPackage rec {
     pname = "colcon-core";
-    version = "0.6.1";
+    version = "0.10.0";
 
     src = fetchPypi {
       inherit pname version;
-      sha256 = "1sfvkq5ppyqw8ywibnhmkkbdai9yvw6vph5g6b1zqig75i5m657w";
+      hash = "sha256-VOlHWEUdLYgdrF5ILDdE9dJzP71FmBwkwIQOuz56SqM=";
     };
 
     propagatedBuildInputs = [
@@ -41,14 +43,28 @@ let
       pytest-cov
       pytest-repeat
       pytest-rerunfailures
-      pytest-runner
+      setuptools
+    ];
+
+    checkInputs = [
+      pytestCheckHook
+      flake8
+      flake8-blind-except
+      # flake8-builtins
+      # flake8-class-newline
+      # flake8-comprehensions
+      # flake8-deprecated
+      flake8-docstrings
+      flake8-import-order
+      # flake8-quotes
+      pep8-naming
+      pylint
+      # scspell3k
     ];
 
     # Requires unpackaged dependencies
     doCheck = false;
 
-    disabled = isPy27;
-
     passthru = {
       inherit withExtensions;
     };
diff --git a/pkgs/colcon/notification.nix b/pkgs/colcon/notification.nix
index 41651f2918..32c99f89aa 100644
--- a/pkgs/colcon/notification.nix
+++ b/pkgs/colcon/notification.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "colcon-notification";
-  version = "0.2.13";
+  version = "0.2.14";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-aq4f/nOulWvLNuMwgizSMKKojJGBsxcKr9GkRmOOabM=";
+    hash = "sha256-aq4f/nOulWvLNuMwgizSMKKojJGBsxcKr8GkRmOOabM=";
   };
 
   propagatedBuildInputs = [ colcon-core notify2 ];
diff --git a/pkgs/colcon/python-setup-py.nix b/pkgs/colcon/python-setup-py.nix
index 6eed5da595..05892bbdac 100644
--- a/pkgs/colcon/python-setup-py.nix
+++ b/pkgs/colcon/python-setup-py.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "colcon-python-setup-py";
-  version = "0.2.7";
+  version = "0.2.8";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0ba1vq5sm2rbddasl85qx5mi7chcz8s1drnr0rvpj0a3bh497hpf";
+    hash = "sha256-g/cZ8je7hSVE3hJGNdQ3agrYYcFMdSgw+9//vTjNlao=";
   };
 
   propagatedBuildInputs = [ colcon-core setuptools ];
diff --git a/pkgs/colcon/ros.nix b/pkgs/colcon/ros.nix
index 1f2582399d..206b3db47c 100644
--- a/pkgs/colcon/ros.nix
+++ b/pkgs/colcon/ros.nix
@@ -4,11 +4,11 @@
 
 buildPythonPackage rec {
   pname = "colcon-ros";
-  version = "0.3.21";
+  version = "0.3.23";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "18zansl30s3ibv12dbskr2phf63y52m8kmfw3rpa060srr5zmk4x";
+    hash = "sha256-nXjNB1otTGTxwmbVFEyxWcYaoWHR9w6v2hVBw0+kRl4=";
   };
 
   propagatedBuildInputs = [