From 707ceb94d649fb535d873c91da63af5de8705f58 Mon Sep 17 00:00:00 2001
From: Julien Malka <julien@malka.sh>
Date: Thu, 15 Jun 2023 11:03:22 +0200
Subject: [PATCH] update buildbot package to follow the move in nixpkgs

---
 lib/default.nix                      |  1 -
 modules/buildbot/default.nix         |  6 +++---
 packages/buildbot-badges/default.nix | 26 --------------------------
 3 files changed, 3 insertions(+), 30 deletions(-)
 delete mode 100644 packages/buildbot-badges/default.nix

diff --git a/lib/default.nix b/lib/default.nix
index b31cab4..32d3629 100644
--- a/lib/default.nix
+++ b/lib/default.nix
@@ -52,7 +52,6 @@ in
               nodePackages = prev.unstable.nodePackages;
               hydrasect = prev.pkgs.callPackage ../packages/hydrasect { };
               uptime-kuma = prev.pkgs.callPackage ../packages/uptime-kuma { };
-              buildbot-badges = prev.pkgs.callPackage ../packages/buildbot-badges { };
               linkal = inputs.linkal.defaultPackage."${system}";
               mosh = prev.unstable.mosh;
               hyprpaper = inputs.hyprpaper.packages.${system}.default;
diff --git a/modules/buildbot/default.nix b/modules/buildbot/default.nix
index 769b78b..cacb19a 100644
--- a/modules/buildbot/default.nix
+++ b/modules/buildbot/default.nix
@@ -3,7 +3,7 @@ with lib;
 let
   cfg = config.luj.buildbot;
   port = "1810";
-  package = pkgs.python3Packages.buildbot-worker;
+  package = pkgs.buildbot-worker;
   python = package.pythonModule;
   home = "/var/lib/buildbot-worker";
   buildbotDir = "${home}/worker";
@@ -31,8 +31,8 @@ in
         ps.requests
         ps.treq
         ps.psycopg2
-        ps.buildbot-worker
-        pkgs.buildbot-badges
+        pkgs.buildbot-worker
+        pkgs.buildbot-plugins.badges
       ];
     };
 
diff --git a/packages/buildbot-badges/default.nix b/packages/buildbot-badges/default.nix
deleted file mode 100644
index d4f80e2..0000000
--- a/packages/buildbot-badges/default.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-{ pkgs, lib, python3 }:
-
-with python3.pkgs;
-
-python3.pkgs.buildPythonPackage rec {
-  pname = "buildbot-badges";
-  inherit (buildbot-pkg) version;
-
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "sha256-2hNf+IT5a+ZQ1186tCwahnpdjZjF3UCsyWWXtT+DuuU=";
-  };
-
-  buildInputs = [ buildbot-pkg ];
-  propagatedBuildInputs = [ cairosvg klein jinja2 ];
-
-  # No tests
-  doCheck = false;
-
-  meta = with lib; {
-    homepage = "https://buildbot.net/";
-    description = "Buildbot Badges Plugin";
-    maintainers = with maintainers; [ julienmalka ];
-    license = licenses.gpl2;
-  };
-}