From d47d113004cd22271319d102423279c2c9557e52 Mon Sep 17 00:00:00 2001
From: Ben Wolsieffer <benwolsieffer@gmail.com>
Date: Fri, 4 Dec 2020 19:26:10 -0500
Subject: [PATCH 1/8] pythonPackages.pypugjs: init at 5.9.6

The Jade language was renamed to Pug, and this is the new Python package to
support it. It is also better maintained than pyjade.
---
 .../python-modules/pypugjs/default.nix        | 39 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 41 insertions(+)
 create mode 100644 pkgs/development/python-modules/pypugjs/default.nix

diff --git a/pkgs/development/python-modules/pypugjs/default.nix b/pkgs/development/python-modules/pypugjs/default.nix
new file mode 100644
index 00000000000..7919b735f34
--- /dev/null
+++ b/pkgs/development/python-modules/pypugjs/default.nix
@@ -0,0 +1,39 @@
+{ stdenv, buildPythonPackage, fetchFromGitHub, fetchpatch, six, chardet, nose
+, django, jinja2, tornado, pyramid, pyramid_mako, Mako }:
+
+buildPythonPackage rec {
+  pname = "pypugjs";
+  version = "5.9.6";
+
+  # No source tarball on PyPI
+  # https://github.com/kakulukia/pypugjs/issues/68
+  src = fetchFromGitHub {
+    owner = "kakulukia";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "14hsl4jfzy5hf5qiwpjdy6vzzj9mvd2rvkcvjgciyz06vfccqd7y";
+  };
+
+  patches = [
+    # Allow newer pyramid versions
+    # https://github.com/kakulukia/pypugjs/pull/69
+    (fetchpatch {
+      url = "https://github.com/kakulukia/pypugjs/commit/2a77a59bee8526f7e3eb9d71c8241470dfff11f5.patch";
+      sha256 = "0d2bjh0f8hmbvmzi8ilj1xbpgszhhkapiql8yi0by2lrd525qspn";
+    })
+  ];
+
+  propagatedBuildInputs = [ six chardet ];
+  checkInputs = [ nose django jinja2 tornado pyramid pyramid_mako Mako ];
+
+  checkPhase = ''
+    nosetests pypugjs
+  '';
+
+  meta = with stdenv.lib; {
+    description = "PugJS syntax template adapter for Django, Jinja2, Mako and Tornado templates";
+    homepage = "https://github.com/kakulukia/pypugjs";
+    license = licenses.mit;
+    maintainers = with maintainers; [ lopsided98 ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 75d4245abe2..15607615d16 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -5414,6 +5414,8 @@ in {
 
   pypubsub = callPackage ../development/python-modules/pypubsub { };
 
+  pypugjs = callPackage ../development/python-modules/pypugjs { };
+
   pyqrcode = callPackage ../development/python-modules/pyqrcode { };
 
   pyqt4 = callPackage ../development/python-modules/pyqt/4.x.nix { inherit (pkgs) pkgconfig; };

From f44481ffbcc28cf06b1585d3ee7aa599d8f76212 Mon Sep 17 00:00:00 2001
From: Ben Wolsieffer <benwolsieffer@gmail.com>
Date: Fri, 4 Dec 2020 19:35:15 -0500
Subject: [PATCH 2/8] buildbot: 2.8.4 -> 2.9.0

---
 .../python-modules/buildbot/default.nix         | 17 +++++------------
 .../development/python-modules/buildbot/pkg.nix |  2 +-
 .../python-modules/buildbot/plugins.nix         | 10 +++++-----
 .../python-modules/buildbot/worker.nix          |  2 +-
 4 files changed, 12 insertions(+), 19 deletions(-)

diff --git a/pkgs/development/python-modules/buildbot/default.nix b/pkgs/development/python-modules/buildbot/default.nix
index 55ff34b2520..58998398055 100644
--- a/pkgs/development/python-modules/buildbot/default.nix
+++ b/pkgs/development/python-modules/buildbot/default.nix
@@ -1,7 +1,7 @@
-{ stdenv, lib, buildPythonPackage, fetchPypi, fetchpatch, makeWrapper, isPy3k,
+{ stdenv, lib, buildPythonPackage, fetchPypi, makeWrapper, isPy3k,
   python, twisted, jinja2, zope_interface, future, sqlalchemy,
   sqlalchemy_migrate, dateutil, txaio, autobahn, pyjwt, pyyaml, treq,
-  txrequests, pyjade, boto3, moto, mock, python-lz4, setuptoolsTrial,
+  txrequests, pypugjs, boto3, moto, mock, python-lz4, setuptoolsTrial,
   isort, pylint, flake8, buildbot-worker, buildbot-pkg, buildbot-plugins,
   parameterized, git, openssh, glibcLocales, nixosTests }:
 
@@ -25,11 +25,11 @@ let
 
   package = buildPythonPackage rec {
     pname = "buildbot";
-    version = "2.8.4";
+    version = "2.9.0";
 
     src = fetchPypi {
       inherit pname version;
-      sha256 = "0i2sbxhsqyk2yr234il0zsyp1rf2v1l5hmzvw0yrgds6jpr19cqv";
+      sha256 = "083aw1h35llx183n66a57565pphk28aqwvxk4hf7bxyjj8qq4k5j";
     };
 
     propagatedBuildInputs = [
@@ -51,7 +51,7 @@ let
     checkInputs = [
       treq
       txrequests
-      pyjade
+      pypugjs
       boto3
       moto
       mock
@@ -73,13 +73,6 @@ let
       # This patch disables the test that tries to read /etc/os-release which
       # is not accessible in sandboxed builds.
       ./skip_test_linux_distro.patch
-
-      # fix compatibility with the latest SQLAlchemy
-      (fetchpatch {
-        url = "https://github.com/buildbot/buildbot/commit/96f3cd1c5f5c82b733baecb133576366ecf544fc.patch";
-        sha256 = "0n1jm13h08j7ksbs8ixayn3wziq5hzyp3kscz9fpgxd8gl885y5n";
-        stripLen = 1;
-      })
     ];
 
     postPatch = ''
diff --git a/pkgs/development/python-modules/buildbot/pkg.nix b/pkgs/development/python-modules/buildbot/pkg.nix
index ff61f988109..5f9b4083bc3 100644
--- a/pkgs/development/python-modules/buildbot/pkg.nix
+++ b/pkgs/development/python-modules/buildbot/pkg.nix
@@ -6,7 +6,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1p9qnrqx72y4jrhawgbpwisgily7zg4rh39hpky4x56d5afvjgqc";
+    sha256 = "0f3rbg0xb58pmb60m4471qf45xd8y6g1s1vcng63y4yvac25600r";
   };
 
   postPatch = ''
diff --git a/pkgs/development/python-modules/buildbot/plugins.nix b/pkgs/development/python-modules/buildbot/plugins.nix
index 9a39cc90b69..7c11b487551 100644
--- a/pkgs/development/python-modules/buildbot/plugins.nix
+++ b/pkgs/development/python-modules/buildbot/plugins.nix
@@ -7,7 +7,7 @@
 
     src = fetchPypi {
       inherit pname version;
-      sha256 = "1hi44jbnafp7iqncad01hwr087aqmdszvc2if0d9gw6bm159zf4s";
+      sha256 = "01b9clm3lyfzhhr124x2x2wgc2q8v4zdvr339xhzflkspqhzckr6";
     };
 
     # Remove unneccessary circular dependency on buildbot
@@ -34,7 +34,7 @@
 
     src = fetchPypi {
       inherit pname version;
-      sha256 = "1vkh4kdlnm9z5r62b4vxx6qxc90g65gm1m4qxfc6xjk1265i1w6h";
+      sha256 = "0yzs3f185ijiaapcy7dznyr6191pixfy6l0qz3pkdbs5wdqgncdz";
     };
 
     buildInputs = [ buildbot-pkg ];
@@ -56,7 +56,7 @@
 
     src = fetchPypi {
       inherit pname version;
-      sha256 = "0v94p1m9fb6m6ik5xyi7bs4jrsgvnyf3sl7f4w1qmb24xc47k2gj";
+      sha256 = "1a8s0n5cava84nn45wjd35wnal86g2jhr6fbys0pp9ky7khhk5lb";
     };
 
     buildInputs = [ buildbot-pkg ];
@@ -78,7 +78,7 @@
 
     src = fetchPypi {
       inherit pname version;
-      sha256 = "13bg289al6dmyrin3l6ih3sk7hm660m69kls3kpagg6j6nmpa5wz";
+      sha256 = "00qwqg2wvf2gbq1dghwnck6y451a1635qs1xirag5vza19b9fy92";
     };
 
     buildInputs = [ buildbot-pkg ];
@@ -100,7 +100,7 @@
 
     src = fetchPypi {
       inherit pname version;
-      sha256 = "11cr7m7m8ah8qqjcqj7qvjjak62cx1sq41cazd4i3r07dyhc3ypn";
+      sha256 = "0lnr25ss54fqdikz05466w8nn2zp94myswh4n1gkysix0chmpxxd";
     };
 
     buildInputs = [ buildbot-pkg ];
diff --git a/pkgs/development/python-modules/buildbot/worker.nix b/pkgs/development/python-modules/buildbot/worker.nix
index f0eaa7e81ae..1961938c215 100644
--- a/pkgs/development/python-modules/buildbot/worker.nix
+++ b/pkgs/development/python-modules/buildbot/worker.nix
@@ -7,7 +7,7 @@ buildPythonPackage (rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1v1bcc2m4pz90rsh5pjb9m9agkvhqdk1viyf64gi1h85h191vkib";
+    sha256 = "07rn8qzrvv3ickrzd8rjyd9660x9hv1d16rndzi3a1kp8hw49ni0";
   };
 
   propagatedBuildInputs = [ twisted future ];

From 920f970a5a77f3f54aa595c5247c7d4ee0f196f0 Mon Sep 17 00:00:00 2001
From: Ben Wolsieffer <benwolsieffer@gmail.com>
Date: Fri, 4 Dec 2020 19:36:22 -0500
Subject: [PATCH 3/8] pythonPackages.pyjade: remove

pyjade is superseded by pypugjs and was only used by buildbot
---
 .../python-modules/pyjade/default.nix         | 29 -------------------
 pkgs/top-level/python-packages.nix            |  2 --
 2 files changed, 31 deletions(-)
 delete mode 100644 pkgs/development/python-modules/pyjade/default.nix

diff --git a/pkgs/development/python-modules/pyjade/default.nix b/pkgs/development/python-modules/pyjade/default.nix
deleted file mode 100644
index ad6742f5deb..00000000000
--- a/pkgs/development/python-modules/pyjade/default.nix
+++ /dev/null
@@ -1,29 +0,0 @@
-{ stdenv, buildPythonPackage, fetchPypi, pyramid_mako, nose, django, jinja2
-, tornado, pyramid, Mako, six }:
-
-buildPythonPackage rec {
-  pname = "pyjade";
-  version = "4.0.0";
-
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "1mycn5cc9cp4fb0i2vzgkkk6d0glnkbilggwb4i99i09vr0vg5cd";
-  };
-
-  buildInputs = [ pyramid_mako nose django jinja2 tornado pyramid Mako ];
-  propagatedBuildInputs = [ six ];
-  postPatch = ''
-    sed -i 's/1.4.99/1.99/' setup.py
-  '';
-  checkPhase = ''
-    nosetests pyjade
-  '';
-  # No tests distributed. https://github.com/syrusakbary/pyjade/issues/262
-  doCheck = false;
-  meta = with stdenv.lib; {
-    description = "Jade syntax template adapter for Django, Jinja2, Mako and Tornado templates";
-    homepage    = "https://github.com/syrusakbary/pyjade";
-    license     = licenses.mit;
-    maintainers = with maintainers; [ nand0p ];
-  };
-}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 15607615d16..ebba1c1803d 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -5181,8 +5181,6 @@ in {
 
   pyipp = callPackage ../development/python-modules/pyipp { };
 
-  pyjade = callPackage ../development/python-modules/pyjade { };
-
   pyjet = callPackage ../development/python-modules/pyjet { };
 
   pyjks = callPackage ../development/python-modules/pyjks { };

From efabdf3db98585a9bcb69a74956592af8668a33e Mon Sep 17 00:00:00 2001
From: Ben Wolsieffer <benwolsieffer@gmail.com>
Date: Sat, 5 Dec 2020 13:43:40 -0500
Subject: [PATCH 4/8] python3Packages.buildbot-pkg: use pythonImportsCheck

---
 pkgs/development/python-modules/buildbot/pkg.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/development/python-modules/buildbot/pkg.nix b/pkgs/development/python-modules/buildbot/pkg.nix
index 5f9b4083bc3..5f0a95eba8b 100644
--- a/pkgs/development/python-modules/buildbot/pkg.nix
+++ b/pkgs/development/python-modules/buildbot/pkg.nix
@@ -15,6 +15,11 @@ buildPythonPackage rec {
     substituteInPlace buildbot_pkg.py --replace "os.listdir = listdir" ""
   '';
 
+  # No tests
+  doCheck = false;
+
+  pythonImportsCheck = [ "buildbot_pkg" ];
+
   disabled = !isPy3k;
 
   meta = with lib; {

From 9f9b2a467718aeb293b5c1a13e7e31e4e936a8d8 Mon Sep 17 00:00:00 2001
From: Ben Wolsieffer <benwolsieffer@gmail.com>
Date: Sat, 5 Dec 2020 18:48:37 -0500
Subject: [PATCH 5/8] buildbot: 2.9.0 -> 2.9.1

---
 pkgs/development/python-modules/buildbot/default.nix |  4 ++--
 pkgs/development/python-modules/buildbot/pkg.nix     |  2 +-
 pkgs/development/python-modules/buildbot/plugins.nix | 10 +++++-----
 pkgs/development/python-modules/buildbot/worker.nix  |  2 +-
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/python-modules/buildbot/default.nix b/pkgs/development/python-modules/buildbot/default.nix
index 58998398055..de9d036dce1 100644
--- a/pkgs/development/python-modules/buildbot/default.nix
+++ b/pkgs/development/python-modules/buildbot/default.nix
@@ -25,11 +25,11 @@ let
 
   package = buildPythonPackage rec {
     pname = "buildbot";
-    version = "2.9.0";
+    version = "2.9.1";
 
     src = fetchPypi {
       inherit pname version;
-      sha256 = "083aw1h35llx183n66a57565pphk28aqwvxk4hf7bxyjj8qq4k5j";
+      sha256 = "0jh9haxh2mz41ksq86nmgh9xmrrklsjfsvxzymcjiafxnks7jywl";
     };
 
     propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/buildbot/pkg.nix b/pkgs/development/python-modules/buildbot/pkg.nix
index 5f0a95eba8b..2b6c0ecbf86 100644
--- a/pkgs/development/python-modules/buildbot/pkg.nix
+++ b/pkgs/development/python-modules/buildbot/pkg.nix
@@ -6,7 +6,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0f3rbg0xb58pmb60m4471qf45xd8y6g1s1vcng63y4yvac25600r";
+    sha256 = "1zp0p48gff5h2sz976vaj7nch1k99i9f6hh5w99yvw5a5ys70l5g";
   };
 
   postPatch = ''
diff --git a/pkgs/development/python-modules/buildbot/plugins.nix b/pkgs/development/python-modules/buildbot/plugins.nix
index 7c11b487551..3aa5084d834 100644
--- a/pkgs/development/python-modules/buildbot/plugins.nix
+++ b/pkgs/development/python-modules/buildbot/plugins.nix
@@ -7,7 +7,7 @@
 
     src = fetchPypi {
       inherit pname version;
-      sha256 = "01b9clm3lyfzhhr124x2x2wgc2q8v4zdvr339xhzflkspqhzckr6";
+      sha256 = "0p91x6qm7mnkjx1d5x0bp40kd89kc4dvnlsyflz5pp9walp480a6";
     };
 
     # Remove unneccessary circular dependency on buildbot
@@ -34,7 +34,7 @@
 
     src = fetchPypi {
       inherit pname version;
-      sha256 = "0yzs3f185ijiaapcy7dznyr6191pixfy6l0qz3pkdbs5wdqgncdz";
+      sha256 = "1fp3618c9sz4bw3776hszgsbd3lzpjq25vy9rkvlsj5hdna3cr1v";
     };
 
     buildInputs = [ buildbot-pkg ];
@@ -56,7 +56,7 @@
 
     src = fetchPypi {
       inherit pname version;
-      sha256 = "1a8s0n5cava84nn45wjd35wnal86g2jhr6fbys0pp9ky7khhk5lb";
+      sha256 = "0mal7p7y66mks6xzsmb29sc8z8d0kzpncj65zlqj4l4aj8zsvq81";
     };
 
     buildInputs = [ buildbot-pkg ];
@@ -78,7 +78,7 @@
 
     src = fetchPypi {
       inherit pname version;
-      sha256 = "00qwqg2wvf2gbq1dghwnck6y451a1635qs1xirag5vza19b9fy92";
+      sha256 = "1cfa9fd05qlaqkjb00rvar8146br06bh84by5miqnjldffir0w17";
     };
 
     buildInputs = [ buildbot-pkg ];
@@ -100,7 +100,7 @@
 
     src = fetchPypi {
       inherit pname version;
-      sha256 = "0lnr25ss54fqdikz05466w8nn2zp94myswh4n1gkysix0chmpxxd";
+      sha256 = "1fax6wb2bqb8ndshry8bx4lxv2w7ghq7zbx49icyjnj8y0j91wmg";
     };
 
     buildInputs = [ buildbot-pkg ];
diff --git a/pkgs/development/python-modules/buildbot/worker.nix b/pkgs/development/python-modules/buildbot/worker.nix
index 1961938c215..dc435885762 100644
--- a/pkgs/development/python-modules/buildbot/worker.nix
+++ b/pkgs/development/python-modules/buildbot/worker.nix
@@ -7,7 +7,7 @@ buildPythonPackage (rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "07rn8qzrvv3ickrzd8rjyd9660x9hv1d16rndzi3a1kp8hw49ni0";
+    sha256 = "0h8bwzs5lg6x8j7afl83zlah2hv5ra2znhvypw8vrv1dc48l2dsb";
   };
 
   propagatedBuildInputs = [ twisted future ];

From 2b8515d7706769d308326a74a734bb450f5f2310 Mon Sep 17 00:00:00 2001
From: Ben Wolsieffer <benwolsieffer@gmail.com>
Date: Tue, 8 Dec 2020 22:16:33 -0500
Subject: [PATCH 6/8] pythonPackages.pypugjs: 5.9.6 -> 5.9.7

---
 .../python-modules/pypugjs/default.nix            | 15 +++------------
 1 file changed, 3 insertions(+), 12 deletions(-)

diff --git a/pkgs/development/python-modules/pypugjs/default.nix b/pkgs/development/python-modules/pypugjs/default.nix
index 7919b735f34..9e4e5d1c993 100644
--- a/pkgs/development/python-modules/pypugjs/default.nix
+++ b/pkgs/development/python-modules/pypugjs/default.nix
@@ -3,26 +3,17 @@
 
 buildPythonPackage rec {
   pname = "pypugjs";
-  version = "5.9.6";
+  version = "5.9.7";
 
-  # No source tarball on PyPI
+  # PyPI source tarball is missing files
   # https://github.com/kakulukia/pypugjs/issues/68
   src = fetchFromGitHub {
     owner = "kakulukia";
     repo = pname;
     rev = "v${version}";
-    sha256 = "14hsl4jfzy5hf5qiwpjdy6vzzj9mvd2rvkcvjgciyz06vfccqd7y";
+    sha256 = "1wvl0n5c3xpani5yn1740f9yd72pjcqg7zy7sj4553m0mlwj9pvc";
   };
 
-  patches = [
-    # Allow newer pyramid versions
-    # https://github.com/kakulukia/pypugjs/pull/69
-    (fetchpatch {
-      url = "https://github.com/kakulukia/pypugjs/commit/2a77a59bee8526f7e3eb9d71c8241470dfff11f5.patch";
-      sha256 = "0d2bjh0f8hmbvmzi8ilj1xbpgszhhkapiql8yi0by2lrd525qspn";
-    })
-  ];
-
   propagatedBuildInputs = [ six chardet ];
   checkInputs = [ nose django jinja2 tornado pyramid pyramid_mako Mako ];
 

From ec7838747c7f3a1123179ea12b0f268be8e7d6fd Mon Sep 17 00:00:00 2001
From: Ben Wolsieffer <benwolsieffer@gmail.com>
Date: Tue, 8 Dec 2020 22:16:52 -0500
Subject: [PATCH 7/8] buildbot: 2.9.1 -> 2.9.2

---
 pkgs/development/python-modules/buildbot/default.nix |  4 ++--
 pkgs/development/python-modules/buildbot/pkg.nix     |  2 +-
 pkgs/development/python-modules/buildbot/plugins.nix | 10 +++++-----
 pkgs/development/python-modules/buildbot/worker.nix  |  2 +-
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/python-modules/buildbot/default.nix b/pkgs/development/python-modules/buildbot/default.nix
index de9d036dce1..31a342b7621 100644
--- a/pkgs/development/python-modules/buildbot/default.nix
+++ b/pkgs/development/python-modules/buildbot/default.nix
@@ -25,11 +25,11 @@ let
 
   package = buildPythonPackage rec {
     pname = "buildbot";
-    version = "2.9.1";
+    version = "2.9.2";
 
     src = fetchPypi {
       inherit pname version;
-      sha256 = "0jh9haxh2mz41ksq86nmgh9xmrrklsjfsvxzymcjiafxnks7jywl";
+      sha256 = "019xfxjnyfi69d5sm3alvib24g8giqlvc102p8hqg8mfm7hc9z2v";
     };
 
     propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/buildbot/pkg.nix b/pkgs/development/python-modules/buildbot/pkg.nix
index 2b6c0ecbf86..70073eb5c9a 100644
--- a/pkgs/development/python-modules/buildbot/pkg.nix
+++ b/pkgs/development/python-modules/buildbot/pkg.nix
@@ -6,7 +6,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1zp0p48gff5h2sz976vaj7nch1k99i9f6hh5w99yvw5a5ys70l5g";
+    sha256 = "01s58zi72drv4lwn6jg6i5mrpf3mpq74761z6iwx5hsdnqg1hxai";
   };
 
   postPatch = ''
diff --git a/pkgs/development/python-modules/buildbot/plugins.nix b/pkgs/development/python-modules/buildbot/plugins.nix
index 3aa5084d834..43bc8717e59 100644
--- a/pkgs/development/python-modules/buildbot/plugins.nix
+++ b/pkgs/development/python-modules/buildbot/plugins.nix
@@ -7,7 +7,7 @@
 
     src = fetchPypi {
       inherit pname version;
-      sha256 = "0p91x6qm7mnkjx1d5x0bp40kd89kc4dvnlsyflz5pp9walp480a6";
+      sha256 = "1z5sca2ksbr1j6p0kr8i9a61c46mdmbbd6hvc6407c3z5393mp30";
     };
 
     # Remove unneccessary circular dependency on buildbot
@@ -34,7 +34,7 @@
 
     src = fetchPypi {
       inherit pname version;
-      sha256 = "1fp3618c9sz4bw3776hszgsbd3lzpjq25vy9rkvlsj5hdna3cr1v";
+      sha256 = "1kz54zlc2yr9cjvw7rihcx7hfk245r6yh4mfyala38jby3hd68p0";
     };
 
     buildInputs = [ buildbot-pkg ];
@@ -56,7 +56,7 @@
 
     src = fetchPypi {
       inherit pname version;
-      sha256 = "0mal7p7y66mks6xzsmb29sc8z8d0kzpncj65zlqj4l4aj8zsvq81";
+      sha256 = "0ac0dzldxl4j9cb4kpmhjwf5m1zjjvcg0hx9kghallab0sk1198p";
     };
 
     buildInputs = [ buildbot-pkg ];
@@ -78,7 +78,7 @@
 
     src = fetchPypi {
       inherit pname version;
-      sha256 = "1cfa9fd05qlaqkjb00rvar8146br06bh84by5miqnjldffir0w17";
+      sha256 = "1m41l2d6yb4mbg1ybn7q6wmkfvwssmfb4inmpwyvy55bcvgyixcm";
     };
 
     buildInputs = [ buildbot-pkg ];
@@ -100,7 +100,7 @@
 
     src = fetchPypi {
       inherit pname version;
-      sha256 = "1fax6wb2bqb8ndshry8bx4lxv2w7ghq7zbx49icyjnj8y0j91wmg";
+      sha256 = "1g58kr2zc7k94k0avly0vyyryg18gpsbick8mj5cz81s2pfmmyfq";
     };
 
     buildInputs = [ buildbot-pkg ];
diff --git a/pkgs/development/python-modules/buildbot/worker.nix b/pkgs/development/python-modules/buildbot/worker.nix
index dc435885762..942c82f15a0 100644
--- a/pkgs/development/python-modules/buildbot/worker.nix
+++ b/pkgs/development/python-modules/buildbot/worker.nix
@@ -7,7 +7,7 @@ buildPythonPackage (rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0h8bwzs5lg6x8j7afl83zlah2hv5ra2znhvypw8vrv1dc48l2dsb";
+    sha256 = "1salrdirny1jpm53shb9dhzs1w7rbp5q7z2qpzrg1nmsh2kcd6ap";
   };
 
   propagatedBuildInputs = [ twisted future ];

From 16666a717718bbc64d486d387fe48602f7486c0f Mon Sep 17 00:00:00 2001
From: Ben Wolsieffer <benwolsieffer@gmail.com>
Date: Wed, 9 Dec 2020 01:17:16 -0500
Subject: [PATCH 8/8] pythonPackages.pypugjs: 5.9.7 -> 5.9.8

---
 .../development/python-modules/pypugjs/default.nix | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/python-modules/pypugjs/default.nix b/pkgs/development/python-modules/pypugjs/default.nix
index 9e4e5d1c993..e6bf3b9211a 100644
--- a/pkgs/development/python-modules/pypugjs/default.nix
+++ b/pkgs/development/python-modules/pypugjs/default.nix
@@ -1,17 +1,13 @@
-{ stdenv, buildPythonPackage, fetchFromGitHub, fetchpatch, six, chardet, nose
+{ stdenv, buildPythonPackage, fetchPypi, fetchpatch, six, chardet, nose
 , django, jinja2, tornado, pyramid, pyramid_mako, Mako }:
 
 buildPythonPackage rec {
   pname = "pypugjs";
-  version = "5.9.7";
+  version = "5.9.8";
 
-  # PyPI source tarball is missing files
-  # https://github.com/kakulukia/pypugjs/issues/68
-  src = fetchFromGitHub {
-    owner = "kakulukia";
-    repo = pname;
-    rev = "v${version}";
-    sha256 = "1wvl0n5c3xpani5yn1740f9yd72pjcqg7zy7sj4553m0mlwj9pvc";
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1iy8k56rbslxcylhamdik2bd6gqqirrix55mrdn29zz9gl6vg1xi";
   };
 
   propagatedBuildInputs = [ six chardet ];