From 4e31be988b84020c558c3e25a39fd4c3e02060a4 Mon Sep 17 00:00:00 2001
From: Sarah Vaupel <sarah.vaupel@uniworx.de>
Date: Fri, 31 May 2024 21:16:37 +0200
Subject: [PATCH] chore(flake): add yesod-auth-oauth2 fork to flake inputs

---
 flake.lock       | 18 ++++++++++++++++++
 flake.nix        |  6 +++++-
 stack-flake.yaml | 10 +---------
 stack.yaml       |  4 ++--
 4 files changed, 26 insertions(+), 12 deletions(-)

diff --git a/flake.lock b/flake.lock
index 01ac3b175..b0296f5f3 100644
--- a/flake.lock
+++ b/flake.lock
@@ -516,6 +516,7 @@
         "serversession": "serversession",
         "xss-sanitize": "xss-sanitize",
         "yesod": "yesod",
+        "yesod-auth-oauth2": "yesod-auth-oauth2",
         "zip-stream": "zip-stream"
       }
     },
@@ -601,6 +602,23 @@
         "url": "https://gitlab.uniworx.de/haskell/yesod.git"
       }
     },
+    "yesod-auth-oauth2": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1717165233,
+        "narHash": "sha256-j12y/Tjqv6aqQDqjlXElECmormeAgnjZ8WIfnEGZHvU=",
+        "ref": "ghc-8.10.4",
+        "rev": "1a67089e5c075ca9474a647bbf26c3354c49036a",
+        "revCount": 416,
+        "type": "git",
+        "url": "https://gitlab.uniworx.de/haskell/yesod-auth-oauth2.git"
+      },
+      "original": {
+        "ref": "ghc-8.10.4",
+        "type": "git",
+        "url": "https://gitlab.uniworx.de/haskell/yesod-auth-oauth2.git"
+      }
+    },
     "zip-stream": {
       "flake": false,
       "locked": {
diff --git a/flake.nix b/flake.nix
index 3202c7087..ba356dbe0 100644
--- a/flake.nix
+++ b/flake.nix
@@ -1,4 +1,4 @@
-# SPDX-FileCopyrightText: 2022-2023 Sarah Vaupel <sarah.vaupel@uniworx.de>, Gregor Kleen <gregor@kleen.consulting>
+# SPDX-FileCopyrightText: 2022-2024 Sarah Vaupel <sarah.vaupel@uniworx.de>, Gregor Kleen <gregor@kleen.consulting>
 #
 # SPDX-License-Identifier: AGPL-3.0-or-later
 
@@ -76,6 +76,10 @@
       url = "git+https://gitlab.uniworx.de/haskell/yesod.git?ref=uni2work";
       flake = false;
     };
+    yesod-auth-oauth2 = {
+      url = "git+https://gitlab.uniworx.de/haskell/yesod-auth-oauth2.git?ref=ghc-8.10.4";
+      flake = false;
+    };
     cryptonite = {
       url = "git+https://gitlab.uniworx.de/haskell/cryptonite.git?ref=uni2work";
       flake = false;
diff --git a/stack-flake.yaml b/stack-flake.yaml
index b93e71a01..38c9f3c75 100644
--- a/stack-flake.yaml
+++ b/stack-flake.yaml
@@ -45,6 +45,7 @@ extra-deps:
   - @yesod@/yesod-auth
   - @yesod@/yesod-test
   - @yesod@/yesod
+  - @yesod-auth-oauth2@
   - @cryptonite@
   - @esqueleto@
   
@@ -55,15 +56,6 @@ extra-deps:
     subdirs:
       - gearhash
       - fastcdc
-  - git: https://github.com/freckle/yesod-auth-oauth2
-    commit: acb69f8da40b9c91b4020296ce105119e76fdf1d
-
-  - git: https://github.com/haskell/aeson.git
-    commit: fc5f5bb067613a273de358f09760b635d6f78c82
-    subdirs:
-      - attoparsec-aeson
-  - git: https://github.com/phadej/integer-conversion.git
-    commit: 63debf04ee147815ced227ab8c2a8409b2a14431
 
   - classy-prelude-yesod-1.5.0@sha256:8f7e183bdfd6d2ea9674284c4f285294ab086aff60d9be4e5d7d2f3c1a2b05b7,1330
   - acid-state-0.16.0.1@sha256:d43f6ee0b23338758156c500290c4405d769abefeb98e9bc112780dae09ece6f,6207
diff --git a/stack.yaml b/stack.yaml
index ebda3ffb3..177e24924 100644
--- a/stack.yaml
+++ b/stack.yaml
@@ -88,8 +88,8 @@ extra-deps:
       - yesod-eventsource
       - yesod-websockets
 
-  - git: https://github.com/freckle/yesod-auth-oauth2
-    commit: acb69f8da40b9c91b4020296ce105119e76fdf1d
+  - git: https://gitlab.uniworx.de/haskell/yesod-auth-oauth2.git
+    commit: 1a67089e5c075ca9474a647bbf26c3354c49036a
 
   - git: https://gitlab.uniworx.de/haskell/cryptonite.git
     commit: 71a630edaf5f22c464e24fac8d9d310f4055ea1f