From 1c74c67de65d4d739a816ef038459c1effde80cb Mon Sep 17 00:00:00 2001
From: Tom Hubrecht <tom.hubrecht@dgnum.eu>
Date: Sun, 15 Dec 2024 23:29:16 +0100
Subject: [PATCH] fix(compute01/librenms): Update patch and vendorHash

---
 machines/nixos/compute01/librenms/default.nix |  2 +-
 .../nixos/compute01/librenms/kanidm.patch     | 55 ++++++-------------
 2 files changed, 19 insertions(+), 38 deletions(-)

diff --git a/machines/nixos/compute01/librenms/default.nix b/machines/nixos/compute01/librenms/default.nix
index 07f2d2e..d07cfe4 100644
--- a/machines/nixos/compute01/librenms/default.nix
+++ b/machines/nixos/compute01/librenms/default.nix
@@ -18,7 +18,7 @@ in
       (pkgs.librenms.override { inherit (config.services.librenms) dataDir logDir; }).overrideAttrs
         (old: {
           patches = (old.patches or [ ]) ++ [ ./kanidm.patch ];
-          vendorHash = "sha256-2RgtMXQp4fTE+WloO36rtfytO4Sh2q0plt8WkWxEGHI=";
+          vendorHash = "sha256-J/whSL1keEZKkfOtHpkJ2vSrN/s+DpUGb6RBXpQZQXg=";
         });
 
     hostname = host;
diff --git a/machines/nixos/compute01/librenms/kanidm.patch b/machines/nixos/compute01/librenms/kanidm.patch
index 64edb4d..bbd69f4 100644
--- a/machines/nixos/compute01/librenms/kanidm.patch
+++ b/machines/nixos/compute01/librenms/kanidm.patch
@@ -1,63 +1,50 @@
 diff --git a/composer.json b/composer.json
-index 13571c07c..dbe810a57 100644
+index af8168f4c..1775f150e 100644
 --- a/composer.json
 +++ b/composer.json
-@@ -11,6 +11,12 @@
-         "snmp",
-         "distributed"
-     ],
-+    "repositories": [
-+        {
-+            "type": "vcs",
-+            "url": "https://github.com/Tom-Hubrecht/Kanidm"
-+        }
-+    ],
-     "homepage": "https://www.librenms.org/",
-     "license": "GPL-3.0-or-later",
-     "require": {
-@@ -49,6 +55,7 @@
+@@ -54,6 +54,7 @@
          "phpmailer/phpmailer": "~6.0",
          "predis/predis": "^2.0",
          "silber/bouncer": "^1.0",
-+        "socialiteproviders/kanidm": "^0.1.4",
++        "socialiteproviders/kanidm": "^5.0",
          "socialiteproviders/manager": "^4.3",
          "spatie/laravel-ignition": "^2.0",
          "symfony/yaml": "^6.2",
 diff --git a/composer.lock b/composer.lock
-index b26090101..aa1fd3cef 100644
+index 3d89a1530..a00c5f307 100644
 --- a/composer.lock
 +++ b/composer.lock
 @@ -4,7 +4,7 @@
          "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
          "This file is @generated automatically"
      ],
--    "content-hash": "21dbcfec63eafb1ae9172473314a57f8",
-+    "content-hash": "16c250180b65a1f71acd5653914d7037",
+-    "content-hash": "fee5d24447dced4397e26066f8c9ee59",
++    "content-hash": "b9316a47587c8e6f6b0adbe3d54777f3",
      "packages": [
          {
              "name": "amenadiel/jpgraph",
-@@ -5244,6 +5244,55 @@
+@@ -5906,6 +5906,56 @@
              },
              "time": "2023-02-10T16:47:25+00:00"
          },
 +        {
 +            "name": "socialiteproviders/kanidm",
-+            "version": "v0.1.4",
++            "version": "5.0.0",
 +            "source": {
 +                "type": "git",
-+                "url": "https://github.com/Tom-Hubrecht/Kanidm.git",
-+                "reference": "b87d75b8342e00c46ef1c29c42e92b629bb206b1"
++                "url": "https://github.com/SocialiteProviders/Kanidm.git",
++                "reference": "111ad45941e7150e3219ddfdeb8159f758bde2fd"
 +            },
 +            "dist": {
 +                "type": "zip",
-+                "url": "https://api.github.com/repos/Tom-Hubrecht/Kanidm/zipball/b87d75b8342e00c46ef1c29c42e92b629bb206b1",
-+                "reference": "b87d75b8342e00c46ef1c29c42e92b629bb206b1",
++                "url": "https://api.github.com/repos/SocialiteProviders/Kanidm/zipball/111ad45941e7150e3219ddfdeb8159f758bde2fd",
++                "reference": "111ad45941e7150e3219ddfdeb8159f758bde2fd",
 +                "shasum": ""
 +            },
 +            "require": {
 +                "ext-json": "*",
 +                "php": "^8.0",
-+                "socialiteproviders/manager": "^4.3"
++                "socialiteproviders/manager": "^4.4"
 +            },
 +            "type": "library",
 +            "autoload": {
@@ -65,6 +52,7 @@ index b26090101..aa1fd3cef 100644
 +                    "SocialiteProviders\\Kanidm\\": ""
 +                }
 +            },
++            "notification-url": "https://packagist.org/downloads/",
 +            "license": [
 +                "MIT"
 +            ],
@@ -83,19 +71,12 @@ index b26090101..aa1fd3cef 100644
 +                "socialite"
 +            ],
 +            "support": {
++                "docs": "https://socialiteproviders.com/kanidm",
 +                "issues": "https://github.com/socialiteproviders/providers/issues",
-+                "source": "https://github.com/socialiteproviders/providers",
-+                "docs": "https://socialiteproviders.com/kanidm"
++                "source": "https://github.com/socialiteproviders/providers"
 +            },
-+            "time": "2024-02-18T14:12:08+00:00"
++            "time": "2024-02-19T19:49:21+00:00"
 +        },
          {
              "name": "socialiteproviders/manager",
-             "version": "v4.3.0",
-@@ -13357,5 +13406,5 @@
-         "ext-zlib": "*"
-     },
-     "platform-dev": [],
--    "plugin-api-version": "2.3.0"
-+    "plugin-api-version": "2.6.0"
- }
+             "version": "v4.6.0",