From a4eda814365afaec15f3d002ead6d99e4c200ebf Mon Sep 17 00:00:00 2001 From: Sarah Vaupel Date: Fri, 15 Mar 2024 10:40:07 +0100 Subject: [PATCH] chore: work on flakey oauth2 yesod plugin input for v0.7.2 specifically --- flake.lock | 17 +++++++++++++++++ flake.nix | 5 +++++ stack.yaml | 6 +++--- stack.yaml.lock | 18 +++++++----------- 4 files changed, 32 insertions(+), 14 deletions(-) diff --git a/flake.lock b/flake.lock index 149583a7c..c5bd78ccf 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,22 @@ "url": "https://gitlab.uniworx.de/haskell/yesod.git" } }, + "yesod-auth-oauth2": { + "flake": false, + "locked": { + "lastModified": 1709302944, + "narHash": "sha256-6YPPNMe5oc+58gfzMixmmkJ0htwCI5/KSpWcsUpFcto=", + "ref": "refs/heads/main", + "rev": "acb69f8da40b9c91b4020296ce105119e76fdf1d", + "revCount": 415, + "type": "git", + "url": "https://github.com/freckle/yesod-auth-oauth2.git?tag=v0.7.2.0" + }, + "original": { + "type": "git", + "url": "https://github.com/freckle/yesod-auth-oauth2.git?tag=v0.7.2.0" + } + }, "zip-stream": { "flake": false, "locked": { diff --git a/flake.nix b/flake.nix index 3202c7087..64b18fbe2 100644 --- a/flake.nix +++ b/flake.nix @@ -84,6 +84,11 @@ url = "git+https://gitlab.uniworx.de/haskell/esqueleto.git?ref=uni2work"; flake = false; }; + + yesod-auth-oauth2 = { + url = "git+https://github.com/freckle/yesod-auth-oauth2.git?tag=v0.7.2.0"; + flake = false; + }; }; outputs = inputs@{ self, nixpkgs, nixpkgs-recent, flake-utils, haskell-nix, ... }: flake-utils.lib.eachSystem ["x86_64-linux"] diff --git a/stack.yaml b/stack.yaml index e5b66c6db..9a8c947b4 100644 --- a/stack.yaml +++ b/stack.yaml @@ -88,9 +88,6 @@ extra-deps: - yesod-eventsource - yesod-websockets - - git: https://github.com/freckle/yesod-auth-oauth2 - commit: 11948a65c405f1a99ccb327d328d416e492542a1 - - git: https://gitlab.ifi.lmu.de/uni2work/haskell/cryptonite.git commit: 71a630edaf5f22c464e24fac8d9d310f4055ea1f @@ -123,5 +120,8 @@ extra-deps: - saltine-0.2.0.0@sha256:2232a285ef326b0942bbcbfa6f465933a020f27e19552213e688fe371d66dddd,5198 - persistent-postgresql-2.13.0.3@sha256:43384bf8ed9c931c673e6abb763c8811113d1b7004095faaae1eb42e2cd52d8f,3601 + - yesod-auth-oauth2-0.7.2.0@sha256:7203cdcde371093b0d74ffbcf974bbd385ef6da84225b25f990459914ab7aae3,3437 + + resolver: lts-18.0 allow-newer: true diff --git a/stack.yaml.lock b/stack.yaml.lock index d6c9f21c4..07c5ec982 100644 --- a/stack.yaml.lock +++ b/stack.yaml.lock @@ -415,17 +415,6 @@ packages: commit: aa671eb41fdad360f2f7cb844f8de03479efe3f7 git: https://gitlab.ifi.lmu.de/uni2work/haskell/yesod.git subdir: yesod-websockets -- completed: - commit: 11948a65c405f1a99ccb327d328d416e492542a1 - git: https://github.com/freckle/yesod-auth-oauth2 - name: yesod-auth-oauth2 - pantry-tree: - sha256: a68ec51e1008c315dd15e81cc3ac1f4e2adfd3db623259395757ecae2787cef2 - size: 4277 - version: 0.7.1.3 - original: - commit: 11948a65c405f1a99ccb327d328d416e492542a1 - git: https://github.com/freckle/yesod-auth-oauth2 - completed: commit: 71a630edaf5f22c464e24fac8d9d310f4055ea1f git: https://gitlab.ifi.lmu.de/uni2work/haskell/cryptonite.git @@ -546,6 +535,13 @@ packages: size: 1059 original: hackage: persistent-postgresql-2.13.0.3@sha256:43384bf8ed9c931c673e6abb763c8811113d1b7004095faaae1eb42e2cd52d8f,3601 +- completed: + hackage: yesod-auth-oauth2-0.7.2.0@sha256:7203cdcde371093b0d74ffbcf974bbd385ef6da84225b25f990459914ab7aae3,3437 + pantry-tree: + sha256: 67fd933ca8d25705b39d9aaaadf6329d686b4b743374999996053243d6a33e68 + size: 2425 + original: + hackage: yesod-auth-oauth2-0.7.2.0@sha256:7203cdcde371093b0d74ffbcf974bbd385ef6da84225b25f990459914ab7aae3,3437 snapshots: - completed: sha256: c632012da648385b9fa3c29f4e0afd56ead299f1c5528ee789058be410e883c0