From 9527b262b09b56dc82484dfdf0226ae57ad26a21 Mon Sep 17 00:00:00 2001
From: Jennifer Graul <jgraul@relaix.net>
Date: Mon, 17 Feb 2025 14:14:19 +0100
Subject: [PATCH] peering-manager: 1.8.3 -> 1.9.6

---
 .../fix-pyixapi-0.2.3-compatibility.patch     | 30 -------------------
 pkgs/by-name/pe/peering-manager/package.nix   | 16 ++++------
 2 files changed, 6 insertions(+), 40 deletions(-)
 delete mode 100644 pkgs/by-name/pe/peering-manager/fix-pyixapi-0.2.3-compatibility.patch

diff --git a/pkgs/by-name/pe/peering-manager/fix-pyixapi-0.2.3-compatibility.patch b/pkgs/by-name/pe/peering-manager/fix-pyixapi-0.2.3-compatibility.patch
deleted file mode 100644
index c7df2eb46759..000000000000
--- a/pkgs/by-name/pe/peering-manager/fix-pyixapi-0.2.3-compatibility.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From ee558ff66e467412942559a8a92252e3fc009920 Mon Sep 17 00:00:00 2001
-From: Guillaume Mazoyer <guillaume@mazoyer.eu>
-Date: Wed, 21 Feb 2024 23:32:32 +0100
-Subject: [PATCH] Use pyixapi 0.2.3
-
----
-diff --git a/extras/models/ixapi.py b/extras/models/ixapi.py
-index 65572c971e065e3deed69465a71a54b4e1372851..637a004043e0a044c65a5e37fbb2b3bf82965436 100644
---- a/extras/models/ixapi.py
-+++ b/extras/models/ixapi.py
-@@ -7,7 +7,6 @@
- from django.db import models
- from django.db.models import Q
- from django.urls import reverse
--from django.utils.timezone import make_aware
- 
- from peering_manager.models import ChangeLoggedModel
- 
-@@ -117,9 +116,9 @@ def dial(self):
-         if auth:
-             # Save tokens if they've changed
-             self.access_token = api.access_token.encoded
--            self.access_token_expiration = make_aware(api.access_token.expires_at)
-+            self.access_token_expiration = api.access_token.expires_at
-             self.refresh_token = api.refresh_token.encoded
--            self.refresh_token_expiration = make_aware(api.refresh_token.expires_at)
-+            self.refresh_token_expiration = api.refresh_token.expires_at
-             self.save()
- 
-         return api
diff --git a/pkgs/by-name/pe/peering-manager/package.nix b/pkgs/by-name/pe/peering-manager/package.nix
index dc3d23069ccf..b6324e14f8d0 100644
--- a/pkgs/by-name/pe/peering-manager/package.nix
+++ b/pkgs/by-name/pe/peering-manager/package.nix
@@ -9,38 +9,33 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "peering-manager";
-  version = "1.8.3";
+  version = "1.9.6";
 
   src = fetchFromGitHub {
     owner = "peering-manager";
     repo = "peering-manager";
     tag = "v${version}";
-    sha256 = "sha256-UV1zSX9C9y5faOBUQ7bfj2DT6ffhMW28MIT7SaYjMgw=";
+    sha256 = "sha256-XPnov+pvO0H1ucMuSXs2tpYRE87jpfDiBDUFjnEhydA=";
   };
 
   format = "other";
 
-  patches = [
-    # Fix compatibility with pyixapi 0.2.3
-    # https://github.com/peering-manager/peering-manager/commit/ee558ff66e467412942559a8a92252e3fc009920
-    ./fix-pyixapi-0.2.3-compatibility.patch
-  ];
-
   propagatedBuildInputs =
     with python3.pkgs;
     [
       django
-      djangorestframework
-      django-redis
       django-debug-toolbar
       django-filter
       django-postgresql-netfields
       django-prometheus
+      django-redis
       django-rq
       django-tables2
       django-taggit
+      djangorestframework
       drf-spectacular
       drf-spectacular-sidecar
+      dulwich
       jinja2
       markdown
       napalm
@@ -50,6 +45,7 @@ python3.pkgs.buildPythonApplication rec {
       pynetbox
       pyyaml
       requests
+      social-auth-app-django
       tzdata
     ]
     ++ plugins python3.pkgs;