From 9428bc05cc28808b190b21d3971a5baa8e86a81c Mon Sep 17 00:00:00 2001 From: Sarah Vaupel Date: Mon, 18 Mar 2024 15:28:02 +0100 Subject: [PATCH] chore: revert to previous flake inputs --- flake.lock | 80 ++++++++++---------- flake.nix | 30 ++++---- nix/uniworx/backend.nix | 5 +- package.yaml | 1 - src/Application.hs | 6 +- src/Auth/OAuth2.hs | 10 +-- stack-flake.yaml | 4 - stack.yaml | 37 +++++----- stack.yaml.lock | 160 +++++++++++++++++++--------------------- 9 files changed, 158 insertions(+), 175 deletions(-) diff --git a/flake.lock b/flake.lock index 149583a7c..427561469 100644 --- a/flake.lock +++ b/flake.lock @@ -25,12 +25,12 @@ "rev": "40393c938111ac78232dc2c7eec5edb4a22d03e8", "revCount": 62, "type": "git", - "url": "https://gitlab.uniworx.de/haskell/HaskellNet-SSL.git" + "url": "https://gitlab.ifi.lmu.de/uni2work/haskell/HaskellNet-SSL.git" }, "original": { "ref": "uni2work", "type": "git", - "url": "https://gitlab.uniworx.de/haskell/HaskellNet-SSL.git" + "url": "https://gitlab.ifi.lmu.de/uni2work/haskell/HaskellNet-SSL.git" } }, "cabal-32": { @@ -92,12 +92,12 @@ "rev": "f8170266ab25b533576e96715bedffc5aa4f19fa", "revCount": 153, "type": "git", - "url": "https://gitlab.uniworx.de/haskell/colonnade.git" + "url": "https://gitlab.ifi.lmu.de/uni2work/haskell/colonnade.git" }, "original": { "ref": "uni2work", "type": "git", - "url": "https://gitlab.uniworx.de/haskell/colonnade.git" + "url": "https://gitlab.ifi.lmu.de/uni2work/haskell/colonnade.git" } }, "conduit-resumablesink": { @@ -109,12 +109,12 @@ "rev": "cbea6159c2975d42f948525e03e12fc390da53c5", "revCount": 10, "type": "git", - "url": "https://gitlab.uniworx.de/haskell/conduit-resumablesink.git" + "url": "https://gitlab.ifi.lmu.de/uni2work/haskell/conduit-resumablesink.git" }, "original": { "ref": "uni2work", "type": "git", - "url": "https://gitlab.uniworx.de/haskell/conduit-resumablesink.git" + "url": "https://gitlab.ifi.lmu.de/uni2work/haskell/conduit-resumablesink.git" } }, "cryptoids": { @@ -126,29 +126,29 @@ "rev": "130b0dcbf2b09ccdf387b50262f1efbbbf1819e3", "revCount": 44, "type": "git", - "url": "https://gitlab.uniworx.de/haskell/cryptoids.git" + "url": "https://gitlab.ifi.lmu.de/uni2work/haskell/cryptoids.git" }, "original": { "ref": "uni2work", "type": "git", - "url": "https://gitlab.uniworx.de/haskell/cryptoids.git" + "url": "https://gitlab.ifi.lmu.de/uni2work/haskell/cryptoids.git" } }, "cryptonite": { "flake": false, "locked": { - "lastModified": 1704764911, - "narHash": "sha256-VuEWT2Bd4aSJyRcXpB+lsGDqxrTHB/uRvILzYWLNfxk=", + "lastModified": 1624444174, + "narHash": "sha256-sDMA4ej1NIModAt7PQvcgIknI3KwfzcAp9YQUSe4CWw=", "ref": "uni2work", - "rev": "f78fca2504bb767d632a3bac8dbbc23367eff0e9", - "revCount": 1220, + "rev": "71a630edaf5f22c464e24fac8d9d310f4055ea1f", + "revCount": 1202, "type": "git", - "url": "https://gitlab.uniworx.de/haskell/cryptonite.git" + "url": "https://gitlab.ifi.lmu.de/uni2work/haskell/cryptonite.git" }, "original": { "ref": "uni2work", "type": "git", - "url": "https://gitlab.uniworx.de/haskell/cryptonite.git" + "url": "https://gitlab.ifi.lmu.de/uni2work/haskell/cryptonite.git" } }, "encoding": { @@ -160,12 +160,12 @@ "rev": "22fc3bb14841d8d50997aa47f1be3852e666f787", "revCount": 162, "type": "git", - "url": "https://gitlab.uniworx.de/haskell/encoding.git" + "url": "https://gitlab.ifi.lmu.de/uni2work/haskell/encoding.git" }, "original": { "ref": "uni2work", "type": "git", - "url": "https://gitlab.uniworx.de/haskell/encoding.git" + "url": "https://gitlab.ifi.lmu.de/uni2work/haskell/encoding.git" } }, "esqueleto": { @@ -177,12 +177,12 @@ "rev": "e18dd125c5ea26fa4e88bed079b61d8c1365ee37", "revCount": 708, "type": "git", - "url": "https://gitlab.uniworx.de/haskell/esqueleto.git" + "url": "https://gitlab.ifi.lmu.de/uni2work/haskell/esqueleto.git" }, "original": { "ref": "uni2work", "type": "git", - "url": "https://gitlab.uniworx.de/haskell/esqueleto.git" + "url": "https://gitlab.ifi.lmu.de/uni2work/haskell/esqueleto.git" } }, "flake-utils": { @@ -310,12 +310,12 @@ "rev": "01afaf599ba6f8a9d804c269e91d3190b249d3f0", "revCount": 61, "type": "git", - "url": "https://gitlab.uniworx.de/haskell/ldap-client.git" + "url": "https://gitlab.ifi.lmu.de/uni2work/haskell/ldap-client.git" }, "original": { "ref": "uni2work", "type": "git", - "url": "https://gitlab.uniworx.de/haskell/ldap-client.git" + "url": "https://gitlab.ifi.lmu.de/uni2work/haskell/ldap-client.git" } }, "memcached-binary": { @@ -327,29 +327,29 @@ "rev": "b7071df50bad3a251a544b984e4bf98fa09b8fae", "revCount": 28, "type": "git", - "url": "https://gitlab.uniworx.de/haskell/memcached-binary.git" + "url": "https://gitlab.ifi.lmu.de/uni2work/haskell/memcached-binary.git" }, "original": { "ref": "uni2work", "type": "git", - "url": "https://gitlab.uniworx.de/haskell/memcached-binary.git" + "url": "https://gitlab.ifi.lmu.de/uni2work/haskell/memcached-binary.git" } }, "minio-hs": { "flake": false, "locked": { - "lastModified": 1705548354, - "narHash": "sha256-wuJYScDu1hGlasE4rzUEi9ouvEiQYWcHF9jRngiQ3Z4=", + "lastModified": 1597069863, + "narHash": "sha256-JmMajaLT4+zt+w2koDkaloFL8ugmrQBlcYKj+78qn9M=", "ref": "uni2work", - "rev": "fafc203e1bace1998264d1ce4340fb801e877b51", - "revCount": 223, + "rev": "42103ab247057c04c8ce7a83d9d4c160713a3df1", + "revCount": 197, "type": "git", - "url": "https://gitlab.uniworx.de/haskell/minio-hs.git" + "url": "https://gitlab.ifi.lmu.de/uni2work/haskell/minio-hs.git" }, "original": { "ref": "uni2work", "type": "git", - "url": "https://gitlab.uniworx.de/haskell/minio-hs.git" + "url": "https://gitlab.ifi.lmu.de/uni2work/haskell/minio-hs.git" } }, "nix-tools": { @@ -528,12 +528,12 @@ "rev": "b9d76def10da1260c7f6aa82bda32111f37a952b", "revCount": 174, "type": "git", - "url": "https://gitlab.uniworx.de/haskell/serversession.git" + "url": "https://gitlab.ifi.lmu.de/uni2work/haskell/serversession.git" }, "original": { "ref": "uni2work", "type": "git", - "url": "https://gitlab.uniworx.de/haskell/serversession.git" + "url": "https://gitlab.ifi.lmu.de/uni2work/haskell/serversession.git" } }, "stackage": { @@ -576,29 +576,29 @@ "rev": "dc928c3a456074b8777603bea20e81937321777f", "revCount": 114, "type": "git", - "url": "https://gitlab.uniworx.de/haskell/xss-sanitize.git" + "url": "https://gitlab.ifi.lmu.de/uni2work/haskell/xss-sanitize.git" }, "original": { "ref": "uni2work", "type": "git", - "url": "https://gitlab.uniworx.de/haskell/xss-sanitize.git" + "url": "https://gitlab.ifi.lmu.de/uni2work/haskell/xss-sanitize.git" } }, "yesod": { "flake": false, "locked": { - "lastModified": 1705542497, - "narHash": "sha256-DYri6G3LeL3Gu11K0gAcUOxMwyKrLVkNnb5oTjHKRro=", + "lastModified": 1625061191, + "narHash": "sha256-K0X2MwUStChml1DlJ7t4yBMDwrMe6j/780nJtSy9Hss=", "ref": "uni2work", - "rev": "9f8d26371d4760f8985e7bbe00c3ac16be1301bc", - "revCount": 5208, + "rev": "a59f63e0336ee61f7a90b8778e9147305d3127bb", + "revCount": 5053, "type": "git", - "url": "https://gitlab.uniworx.de/haskell/yesod.git" + "url": "https://gitlab.ifi.lmu.de/uni2work/haskell/yesod.git" }, "original": { "ref": "uni2work", "type": "git", - "url": "https://gitlab.uniworx.de/haskell/yesod.git" + "url": "https://gitlab.ifi.lmu.de/uni2work/haskell/yesod.git" } }, "zip-stream": { @@ -610,12 +610,12 @@ "rev": "843683d024f767de236f74d24a3348f69181a720", "revCount": 39, "type": "git", - "url": "https://gitlab.uniworx.de/haskell/zip-stream.git" + "url": "https://gitlab.ifi.lmu.de/uni2work/haskell/zip-stream.git" }, "original": { "ref": "uni2work", "type": "git", - "url": "https://gitlab.uniworx.de/haskell/zip-stream.git" + "url": "https://gitlab.ifi.lmu.de/uni2work/haskell/zip-stream.git" } } }, diff --git a/flake.nix b/flake.nix index 70f4146ef..2ecc482e0 100644 --- a/flake.nix +++ b/flake.nix @@ -1,4 +1,4 @@ -# SPDX-FileCopyrightText: 2022-2024 Sarah Vaupel , Gregor Kleen +# SPDX-FileCopyrightText: 2022-2023 Sarah Vaupel , Gregor Kleen # # SPDX-License-Identifier: AGPL-3.0-or-later @@ -29,59 +29,59 @@ }; encoding = { - url = "git+https://gitlab.uniworx.de/haskell/encoding.git?ref=uni2work"; + url = "git+https://gitlab.ifi.lmu.de/uni2work/haskell/encoding.git?ref=uni2work"; flake = false; }; memcached-binary = { - url = "git+https://gitlab.uniworx.de/haskell/memcached-binary.git?ref=uni2work"; + url = "git+https://gitlab.ifi.lmu.de/uni2work/haskell/memcached-binary.git?ref=uni2work"; flake = false; }; conduit-resumablesink = { - url = "git+https://gitlab.uniworx.de/haskell/conduit-resumablesink.git?ref=uni2work"; + url = "git+https://gitlab.ifi.lmu.de/uni2work/haskell/conduit-resumablesink.git?ref=uni2work"; flake = false; }; HaskellNet-SSL = { - url = "git+https://gitlab.uniworx.de/haskell/HaskellNet-SSL.git?ref=uni2work"; + url = "git+https://gitlab.ifi.lmu.de/uni2work/haskell/HaskellNet-SSL.git?ref=uni2work"; flake = false; }; ldap-client = { - url = "git+https://gitlab.uniworx.de/haskell/ldap-client.git?ref=uni2work"; + url = "git+https://gitlab.ifi.lmu.de/uni2work/haskell/ldap-client.git?ref=uni2work"; flake = false; }; serversession = { - url = "git+https://gitlab.uniworx.de/haskell/serversession.git?ref=uni2work"; + url = "git+https://gitlab.ifi.lmu.de/uni2work/haskell/serversession.git?ref=uni2work"; flake = false; }; xss-sanitize = { - url = "git+https://gitlab.uniworx.de/haskell/xss-sanitize.git?ref=uni2work"; + url = "git+https://gitlab.ifi.lmu.de/uni2work/haskell/xss-sanitize.git?ref=uni2work"; flake = false; }; colonnade = { - url = "git+https://gitlab.uniworx.de/haskell/colonnade.git?ref=uni2work"; + url = "git+https://gitlab.ifi.lmu.de/uni2work/haskell/colonnade.git?ref=uni2work"; flake = false; }; minio-hs = { - url = "git+https://gitlab.uniworx.de/haskell/minio-hs.git?ref=uni2work"; + url = "git+https://gitlab.ifi.lmu.de/uni2work/haskell/minio-hs.git?ref=uni2work"; flake = false; }; cryptoids = { - url = "git+https://gitlab.uniworx.de/haskell/cryptoids.git?ref=uni2work"; + url = "git+https://gitlab.ifi.lmu.de/uni2work/haskell/cryptoids.git?ref=uni2work"; flake = false; }; zip-stream = { - url = "git+https://gitlab.uniworx.de/haskell/zip-stream.git?ref=uni2work"; + url = "git+https://gitlab.ifi.lmu.de/uni2work/haskell/zip-stream.git?ref=uni2work"; flake = false; }; yesod = { - url = "git+https://gitlab.uniworx.de/haskell/yesod.git?ref=uni2work"; + url = "git+https://gitlab.ifi.lmu.de/uni2work/haskell/yesod.git?ref=uni2work"; flake = false; }; cryptonite = { - url = "git+https://gitlab.uniworx.de/haskell/cryptonite.git?ref=uni2work"; + url = "git+https://gitlab.ifi.lmu.de/uni2work/haskell/cryptonite.git?ref=uni2work"; flake = false; }; esqueleto = { - url = "git+https://gitlab.uniworx.de/haskell/esqueleto.git?ref=uni2work"; + url = "git+https://gitlab.ifi.lmu.de/uni2work/haskell/esqueleto.git?ref=uni2work"; flake = false; }; }; diff --git a/nix/uniworx/backend.nix b/nix/uniworx/backend.nix index 3cc0bcd19..03fdb8431 100644 --- a/nix/uniworx/backend.nix +++ b/nix/uniworx/backend.nix @@ -1,4 +1,4 @@ -# SPDX-FileCopyrightText: 2022-2024 Sarah Vaupel , Gregor Kleen , Steffen Jost +# SPDX-FileCopyrightText: 2022-2023 Gregor Kleen , Steffen Jost # # SPDX-License-Identifier: AGPL-3.0-or-later @@ -7,7 +7,7 @@ with prev.lib; let - haskellInputs = ["encoding" "memcached-binary" "conduit-resumablesink" "HaskellNet-SSL" "ldap-client" "serversession" "xss-sanitize" "colonnade" "minio-hs" "cryptoids" "zip-stream" "yesod" "yesod-auth-oauth2" "cryptonite" "esqueleto"]; + haskellInputs = ["encoding" "memcached-binary" "conduit-resumablesink" "HaskellNet-SSL" "ldap-client" "serversession" "xss-sanitize" "colonnade" "minio-hs" "cryptoids" "zip-stream" "yesod" "cryptonite" "esqueleto"]; in { uniworx = final.haskell-nix.stackProject { src = prev.stdenv.mkDerivation { @@ -53,7 +53,6 @@ in { yesod-persistent.src = "${inputs.yesod}/yesod-persistent"; yesod-form.src = "${inputs.yesod}/yesod-form"; yesod-auth.src = "${inputs.yesod}/yesod-auth"; - yesod-auth-oauth2.src = inputs.yesod-auth-oauth2; yesod-test.src = "${inputs.yesod}/yesod-test"; cryptonite.src = inputs.cryptonite; esqueleto.src = inputs.esqueleto; diff --git a/package.yaml b/package.yaml index 4ca561014..809c0cb4b 100644 --- a/package.yaml +++ b/package.yaml @@ -127,7 +127,6 @@ dependencies: - mono-traversable - mono-traversable-keys - lens-aeson - - attoparsec-aeson - systemd - streaming-commons - unix diff --git a/src/Application.hs b/src/Application.hs index 271d09068..bc1ea2bec 100644 --- a/src/Application.hs +++ b/src/Application.hs @@ -61,7 +61,7 @@ import Jobs import qualified Data.Text.Encoding as Text -import Yesod.Auth.OAuth2.AzureAD (oauth2AzureADScoped) +import Yesod.Auth.OAuth2.AzureADv2 (oauth2AzureADv2Scoped) import Yesod.Auth.Util.PasswordStore import qualified Data.ByteString.Lazy as LBS @@ -349,7 +349,7 @@ makeFoundation appSettings''@AppSettings{..} = do #ifdef DEVELOPMENT oauth2Plugins <- liftIO $ sequence [ (azureMockServer . fromJust) <$> lookupEnv "OAUTH2_SERVER_PORT" - , return $ oauth2AzureADScoped ["openid", "profile", "offline_access"] "42" "shhh" + , return $ oauth2AzureADv2Scoped ["openid", "profile", "offline_access"] "42" "42" "shhh" ] #else let -- Auth Plugins @@ -366,7 +366,7 @@ makeFoundation appSettings''@AppSettings{..} = do -> error "Tenant ID missing!" oauth2Plugins | UserAuthConfSingleSource (AuthSourceConfAzure AzureConf{..}) appUserAuthConf - -> singleton $ oauth2AzureADScoped (Set.toList azureConfScopes) azureConfTenantId azureConfClientId azureConfClientSecret + -> singleton $ oauth2AzureADv2Scoped (Set.toList azureConfScopes) azureConfTenantId azureConfClientId azureConfClientSecret | otherwise -> mempty #endif diff --git a/src/Auth/OAuth2.hs b/src/Auth/OAuth2.hs index 88bcff790..97495c1d7 100644 --- a/src/Auth/OAuth2.hs +++ b/src/Auth/OAuth2.hs @@ -118,15 +118,15 @@ instance FromJSON UserID where azureMockServer :: YesodAuth m => String -> AuthPlugin m azureMockServer port = let oa = OAuth2 - { oauthClientId = "42" - , oauthClientSecret = Just "shhh" - , oauthOAuthorizeEndpoint = fromString (mockServerURL <> "/auth") + { oauth2ClientId = "42" + , oauth2ClientSecret = Just "shhh" + , oauth2AuthorizeEndpoint = fromString (mockServerURL <> "/auth") `withQuery` [ scopeParam " " ["openid", "profile", "email", "offline_access"] -- TODO read scopes from config , ("response_type", "code id_token") , ("nonce", "Foo") -- TODO generate meaningful value ] - , oauthAccessTokenEndpoint = fromString $ mockServerURL <> "/token" - , oauthCallback = Nothing + , oauth2TokenEndpoint = fromString $ mockServerURL <> "/token" + , oauth2RedirectUri = Nothing } mockServerURL = "http://localhost:" <> fromString port profileSrc = fromString $ mockServerURL <> "/users/me" diff --git a/stack-flake.yaml b/stack-flake.yaml index 7618a4e36..09e2dd321 100644 --- a/stack-flake.yaml +++ b/stack-flake.yaml @@ -82,9 +82,5 @@ extra-deps: - servant-quickcheck-0.0.10.0@sha256:1d5849d703c2487752f8fc7391cca7c998ee24f54ca0bb72d238bf99b64ac667,3755 - - yesod-auth-oauth2-0.6.2.0@sha256:3301232a6ffdf095710dd25e0da9b948d5a4f5c3aaee1e2d5adfadfe395c2c89,3389 - - attoparsec-aeson-2.1.0.0@sha256:fa83aba43bfa58490de8f274d19b9d58b6403a207b12cac5f93922102b084c52,1154 - - integer-conversion-0.1.0.1@sha256:0e57a82635323f015b5d6c242bcfbbeeaa9854fe9c8058e57052254dbb24bb14,2250 - resolver: lts-18.0 allow-newer: true diff --git a/stack.yaml b/stack.yaml index 2c7784d47..e5b66c6db 100644 --- a/stack.yaml +++ b/stack.yaml @@ -1,4 +1,4 @@ -# SPDX-FileCopyrightText: 2022-2024 Sarah Vaupel , Gregor Kleen ,Sarah Vaupel ,Steffen Jost +# SPDX-FileCopyrightText: 2022 Gregor Kleen ,Sarah Vaupel ,Steffen Jost # # SPDX-License-Identifier: AGPL-3.0-or-later @@ -26,33 +26,33 @@ packages: - . extra-deps: - - git: https://gitlab.uniworx.de/haskell/encoding.git + - git: https://gitlab.ifi.lmu.de/uni2work/haskell/encoding.git commit: 22fc3bb14841d8d50997aa47f1be3852e666f787 - - git: https://gitlab.uniworx.de/haskell/memcached-binary.git + - git: https://gitlab.ifi.lmu.de/uni2work/haskell/memcached-binary.git commit: b7071df50bad3a251a544b984e4bf98fa09b8fae - - git: https://gitlab.uniworx.de/haskell/conduit-resumablesink.git + - git: https://gitlab.ifi.lmu.de/uni2work/haskell/conduit-resumablesink.git commit: cbea6159c2975d42f948525e03e12fc390da53c5 - git: https://github.com/jtdaugherty/HaskellNet.git commit: 5aa1f3b009253b02c4822005ac59ee208a10a347 - - git: https://gitlab.uniworx.de/haskell/HaskellNet-SSL.git + - git: https://gitlab.ifi.lmu.de/uni2work/haskell/HaskellNet-SSL.git commit: 40393c938111ac78232dc2c7eec5edb4a22d03e8 - - git: https://gitlab.uniworx.de/haskell/ldap-client.git + - git: https://gitlab.ifi.lmu.de/uni2work/haskell/ldap-client.git commit: 01afaf599ba6f8a9d804c269e91d3190b249d3f0 - - git: https://gitlab.uniworx.de/haskell/serversession.git + - git: https://gitlab.ifi.lmu.de/uni2work/haskell/serversession.git commit: fda3a000f9039e35e76e28f8e88c4942fac9fd69 subdirs: - serversession - serversession-backend-acid-state - - git: https://gitlab.uniworx.de/haskell/xss-sanitize.git + - git: https://gitlab.ifi.lmu.de/uni2work/haskell/xss-sanitize.git commit: dc928c3a456074b8777603bea20e81937321777f - - git: https://gitlab.uniworx.de/haskell/colonnade.git + - git: https://gitlab.ifi.lmu.de/uni2work/haskell/colonnade.git commit: f8170266ab25b533576e96715bedffc5aa4f19fa subdirs: - colonnade - - git: https://gitlab.uniworx.de/haskell/minio-hs.git + - git: https://gitlab.ifi.lmu.de/uni2work/haskell/minio-hs.git commit: 42103ab247057c04c8ce7a83d9d4c160713a3df1 - - git: https://gitlab.uniworx.de/haskell/cryptoids.git + - git: https://gitlab.ifi.lmu.de/uni2work/haskell/cryptoids.git commit: 130b0dcbf2b09ccdf387b50262f1efbbbf1819e3 subdirs: - cryptoids-class @@ -67,10 +67,10 @@ extra-deps: - gearhash - fastcdc - - git: https://gitlab.uniworx.de/haskell/zip-stream.git + - git: https://gitlab.ifi.lmu.de/uni2work/haskell/zip-stream.git commit: 843683d024f767de236f74d24a3348f69181a720 - - git: https://gitlab.uniworx.de/haskell/yesod.git + - git: https://gitlab.ifi.lmu.de/uni2work/haskell/yesod.git commit: aa671eb41fdad360f2f7cb844f8de03479efe3f7 # <- references debug with traceStack; master ref: cb75191e0c5490246ae2cbcc2a00e7985cf2aadb subdirs: - yesod-core @@ -88,10 +88,13 @@ extra-deps: - yesod-eventsource - yesod-websockets - - git: https://gitlab.uniworx.de/haskell/cryptonite.git + - git: https://github.com/freckle/yesod-auth-oauth2 + commit: 11948a65c405f1a99ccb327d328d416e492542a1 + + - git: https://gitlab.ifi.lmu.de/uni2work/haskell/cryptonite.git commit: 71a630edaf5f22c464e24fac8d9d310f4055ea1f - - git: https://gitlab.uniworx.de/haskell/esqueleto.git + - git: https://gitlab.ifi.lmu.de/uni2work/haskell/esqueleto.git commit: e18dd125c5ea26fa4e88bed079b61d8c1365ee37 - classy-prelude-yesod-1.5.0@sha256:8f7e183bdfd6d2ea9674284c4f285294ab086aff60d9be4e5d7d2f3c1a2b05b7,1330 @@ -120,9 +123,5 @@ extra-deps: - saltine-0.2.0.0@sha256:2232a285ef326b0942bbcbfa6f465933a020f27e19552213e688fe371d66dddd,5198 - persistent-postgresql-2.13.0.3@sha256:43384bf8ed9c931c673e6abb763c8811113d1b7004095faaae1eb42e2cd52d8f,3601 - - yesod-auth-oauth2-0.6.2.0@sha256:3301232a6ffdf095710dd25e0da9b948d5a4f5c3aaee1e2d5adfadfe395c2c89,3389 - - attoparsec-aeson-2.1.0.0@sha256:fa83aba43bfa58490de8f274d19b9d58b6403a207b12cac5f93922102b084c52,1154 - - integer-conversion-0.1.0.1@sha256:0e57a82635323f015b5d6c242bcfbbeeaa9854fe9c8058e57052254dbb24bb14,2250 - resolver: lts-18.0 allow-newer: true diff --git a/stack.yaml.lock b/stack.yaml.lock index 366f7b609..d6c9f21c4 100644 --- a/stack.yaml.lock +++ b/stack.yaml.lock @@ -6,7 +6,7 @@ packages: - completed: commit: 22fc3bb14841d8d50997aa47f1be3852e666f787 - git: https://gitlab.uniworx.de/haskell/encoding.git + git: https://gitlab.ifi.lmu.de/uni2work/haskell/encoding.git name: encoding pantry-tree: sha256: fec12328951021bb4d9326ae0b35f0c459e65f28442366efd4366cd1e18abe19 @@ -14,10 +14,10 @@ packages: version: 0.8.2 original: commit: 22fc3bb14841d8d50997aa47f1be3852e666f787 - git: https://gitlab.uniworx.de/haskell/encoding.git + git: https://gitlab.ifi.lmu.de/uni2work/haskell/encoding.git - completed: commit: b7071df50bad3a251a544b984e4bf98fa09b8fae - git: https://gitlab.uniworx.de/haskell/memcached-binary.git + git: https://gitlab.ifi.lmu.de/uni2work/haskell/memcached-binary.git name: memcached-binary pantry-tree: sha256: 0da0539b7b9a56d03a116dcd666bc1bbbef085659910420849484d1418aa0857 @@ -25,10 +25,10 @@ packages: version: 0.2.0 original: commit: b7071df50bad3a251a544b984e4bf98fa09b8fae - git: https://gitlab.uniworx.de/haskell/memcached-binary.git + git: https://gitlab.ifi.lmu.de/uni2work/haskell/memcached-binary.git - completed: commit: cbea6159c2975d42f948525e03e12fc390da53c5 - git: https://gitlab.uniworx.de/haskell/conduit-resumablesink.git + git: https://gitlab.ifi.lmu.de/uni2work/haskell/conduit-resumablesink.git name: conduit-resumablesink pantry-tree: sha256: 0cccf4684bbd84f81d2d3d53dd81c46cb103b5322f1d8e89e9b222211281e1b7 @@ -36,7 +36,7 @@ packages: version: '0.3' original: commit: cbea6159c2975d42f948525e03e12fc390da53c5 - git: https://gitlab.uniworx.de/haskell/conduit-resumablesink.git + git: https://gitlab.ifi.lmu.de/uni2work/haskell/conduit-resumablesink.git - completed: commit: 5aa1f3b009253b02c4822005ac59ee208a10a347 git: https://github.com/jtdaugherty/HaskellNet.git @@ -50,7 +50,7 @@ packages: git: https://github.com/jtdaugherty/HaskellNet.git - completed: commit: 40393c938111ac78232dc2c7eec5edb4a22d03e8 - git: https://gitlab.uniworx.de/haskell/HaskellNet-SSL.git + git: https://gitlab.ifi.lmu.de/uni2work/haskell/HaskellNet-SSL.git name: HaskellNet-SSL pantry-tree: sha256: 95dcec22fdb8af986e59f0f60aa76d4a48f34a546dca799bd571e1d183f773e0 @@ -58,10 +58,10 @@ packages: version: 0.3.4.1 original: commit: 40393c938111ac78232dc2c7eec5edb4a22d03e8 - git: https://gitlab.uniworx.de/haskell/HaskellNet-SSL.git + git: https://gitlab.ifi.lmu.de/uni2work/haskell/HaskellNet-SSL.git - completed: commit: 01afaf599ba6f8a9d804c269e91d3190b249d3f0 - git: https://gitlab.uniworx.de/haskell/ldap-client.git + git: https://gitlab.ifi.lmu.de/uni2work/haskell/ldap-client.git name: ldap-client pantry-tree: sha256: 3fa8f102427b437b2baaec15cf884e88b47a1621b1c3fd4d8919f0263fde8656 @@ -69,10 +69,10 @@ packages: version: 0.4.0 original: commit: 01afaf599ba6f8a9d804c269e91d3190b249d3f0 - git: https://gitlab.uniworx.de/haskell/ldap-client.git + git: https://gitlab.ifi.lmu.de/uni2work/haskell/ldap-client.git - completed: commit: fda3a000f9039e35e76e28f8e88c4942fac9fd69 - git: https://gitlab.uniworx.de/haskell/serversession.git + git: https://gitlab.ifi.lmu.de/uni2work/haskell/serversession.git name: serversession pantry-tree: sha256: 83ac78a987399db3da62f84bbd335fead11aadebd57251d0688127fca984db23 @@ -81,11 +81,11 @@ packages: version: 1.0.2 original: commit: fda3a000f9039e35e76e28f8e88c4942fac9fd69 - git: https://gitlab.uniworx.de/haskell/serversession.git + git: https://gitlab.ifi.lmu.de/uni2work/haskell/serversession.git subdir: serversession - completed: commit: fda3a000f9039e35e76e28f8e88c4942fac9fd69 - git: https://gitlab.uniworx.de/haskell/serversession.git + git: https://gitlab.ifi.lmu.de/uni2work/haskell/serversession.git name: serversession-backend-acid-state pantry-tree: sha256: 4804260c6245c12e1728c78dd33bf16e95b7f2b69b38b6900a4e65b1ef3e04b7 @@ -94,11 +94,11 @@ packages: version: 1.0.4 original: commit: fda3a000f9039e35e76e28f8e88c4942fac9fd69 - git: https://gitlab.uniworx.de/haskell/serversession.git + git: https://gitlab.ifi.lmu.de/uni2work/haskell/serversession.git subdir: serversession-backend-acid-state - completed: commit: dc928c3a456074b8777603bea20e81937321777f - git: https://gitlab.uniworx.de/haskell/xss-sanitize.git + git: https://gitlab.ifi.lmu.de/uni2work/haskell/xss-sanitize.git name: xss-sanitize pantry-tree: sha256: f567a1c834448daaa164f2029fad164e6c8df2d4c92b51f811bae19cc0c95975 @@ -106,10 +106,10 @@ packages: version: 0.3.6 original: commit: dc928c3a456074b8777603bea20e81937321777f - git: https://gitlab.uniworx.de/haskell/xss-sanitize.git + git: https://gitlab.ifi.lmu.de/uni2work/haskell/xss-sanitize.git - completed: commit: f8170266ab25b533576e96715bedffc5aa4f19fa - git: https://gitlab.uniworx.de/haskell/colonnade.git + git: https://gitlab.ifi.lmu.de/uni2work/haskell/colonnade.git name: colonnade pantry-tree: sha256: 392393652cc0f354d351482557b9385c8e6122e706359b030373656565f2e045 @@ -118,11 +118,11 @@ packages: version: 1.2.0.2 original: commit: f8170266ab25b533576e96715bedffc5aa4f19fa - git: https://gitlab.uniworx.de/haskell/colonnade.git + git: https://gitlab.ifi.lmu.de/uni2work/haskell/colonnade.git subdir: colonnade - completed: commit: 42103ab247057c04c8ce7a83d9d4c160713a3df1 - git: https://gitlab.uniworx.de/haskell/minio-hs.git + git: https://gitlab.ifi.lmu.de/uni2work/haskell/minio-hs.git name: minio-hs pantry-tree: sha256: c5faff15fa22a7a63f45cd903c9bd11ae03f422c26f24750f5c44cb4d0db70fc @@ -130,10 +130,10 @@ packages: version: 1.5.2 original: commit: 42103ab247057c04c8ce7a83d9d4c160713a3df1 - git: https://gitlab.uniworx.de/haskell/minio-hs.git + git: https://gitlab.ifi.lmu.de/uni2work/haskell/minio-hs.git - completed: commit: 130b0dcbf2b09ccdf387b50262f1efbbbf1819e3 - git: https://gitlab.uniworx.de/haskell/cryptoids.git + git: https://gitlab.ifi.lmu.de/uni2work/haskell/cryptoids.git name: cryptoids-class pantry-tree: sha256: 30466648d273ffb1d580b7961188d67a0bedb3703d6d5f8cca3c15a45295f203 @@ -142,11 +142,11 @@ packages: version: 0.0.0 original: commit: 130b0dcbf2b09ccdf387b50262f1efbbbf1819e3 - git: https://gitlab.uniworx.de/haskell/cryptoids.git + git: https://gitlab.ifi.lmu.de/uni2work/haskell/cryptoids.git subdir: cryptoids-class - completed: commit: 130b0dcbf2b09ccdf387b50262f1efbbbf1819e3 - git: https://gitlab.uniworx.de/haskell/cryptoids.git + git: https://gitlab.ifi.lmu.de/uni2work/haskell/cryptoids.git name: cryptoids-types pantry-tree: sha256: 824ac5c55c2ad553bd401bb5a99731bbdccc828ecc5d71f174e9375c4e03c46e @@ -155,11 +155,11 @@ packages: version: 1.0.0 original: commit: 130b0dcbf2b09ccdf387b50262f1efbbbf1819e3 - git: https://gitlab.uniworx.de/haskell/cryptoids.git + git: https://gitlab.ifi.lmu.de/uni2work/haskell/cryptoids.git subdir: cryptoids-types - completed: commit: 130b0dcbf2b09ccdf387b50262f1efbbbf1819e3 - git: https://gitlab.uniworx.de/haskell/cryptoids.git + git: https://gitlab.ifi.lmu.de/uni2work/haskell/cryptoids.git name: cryptoids pantry-tree: sha256: b1f49dde76ff7e78b76e7f2f3b3f76c55e5e61555d1df5415ad3b6eb80dda2cb @@ -168,11 +168,11 @@ packages: version: 0.5.1.0 original: commit: 130b0dcbf2b09ccdf387b50262f1efbbbf1819e3 - git: https://gitlab.uniworx.de/haskell/cryptoids.git + git: https://gitlab.ifi.lmu.de/uni2work/haskell/cryptoids.git subdir: cryptoids - completed: commit: 130b0dcbf2b09ccdf387b50262f1efbbbf1819e3 - git: https://gitlab.uniworx.de/haskell/cryptoids.git + git: https://gitlab.ifi.lmu.de/uni2work/haskell/cryptoids.git name: filepath-crypto pantry-tree: sha256: 9c31a2ffb2b1c86f9ba34eb83529c7a5a7dc68a49f89813c9b553427474654d9 @@ -181,11 +181,11 @@ packages: version: 0.1.0.0 original: commit: 130b0dcbf2b09ccdf387b50262f1efbbbf1819e3 - git: https://gitlab.uniworx.de/haskell/cryptoids.git + git: https://gitlab.ifi.lmu.de/uni2work/haskell/cryptoids.git subdir: filepath-crypto - completed: commit: 130b0dcbf2b09ccdf387b50262f1efbbbf1819e3 - git: https://gitlab.uniworx.de/haskell/cryptoids.git + git: https://gitlab.ifi.lmu.de/uni2work/haskell/cryptoids.git name: uuid-crypto pantry-tree: sha256: 852e59807df1f2cf4b5a3748c46fa149d15a78651c93addfe5fc31d2d94c47f4 @@ -194,7 +194,7 @@ packages: version: 1.4.0.0 original: commit: 130b0dcbf2b09ccdf387b50262f1efbbbf1819e3 - git: https://gitlab.uniworx.de/haskell/cryptoids.git + git: https://gitlab.ifi.lmu.de/uni2work/haskell/cryptoids.git subdir: uuid-crypto - completed: commit: f216e3c0a1efa11a62fd4c9c2db38f7e2b7ac72d @@ -224,7 +224,7 @@ packages: subdir: fastcdc - completed: commit: 843683d024f767de236f74d24a3348f69181a720 - git: https://gitlab.uniworx.de/haskell/zip-stream.git + git: https://gitlab.ifi.lmu.de/uni2work/haskell/zip-stream.git name: zip-stream pantry-tree: sha256: 0da8bc38d73034962d2e2d1a7586b6dee848a629319fce9cbbf578348c61118c @@ -232,10 +232,10 @@ packages: version: 0.2.0.1 original: commit: 843683d024f767de236f74d24a3348f69181a720 - git: https://gitlab.uniworx.de/haskell/zip-stream.git + git: https://gitlab.ifi.lmu.de/uni2work/haskell/zip-stream.git - completed: commit: aa671eb41fdad360f2f7cb844f8de03479efe3f7 - git: https://gitlab.uniworx.de/haskell/yesod.git + git: https://gitlab.ifi.lmu.de/uni2work/haskell/yesod.git name: yesod-core pantry-tree: sha256: 08c8da10b32c8d9f784238fd87232bf90b752e82f81ef2c52c62210f9aadda9a @@ -244,11 +244,11 @@ packages: version: 1.6.20.2 original: commit: aa671eb41fdad360f2f7cb844f8de03479efe3f7 - git: https://gitlab.uniworx.de/haskell/yesod.git + git: https://gitlab.ifi.lmu.de/uni2work/haskell/yesod.git subdir: yesod-core - completed: commit: aa671eb41fdad360f2f7cb844f8de03479efe3f7 - git: https://gitlab.uniworx.de/haskell/yesod.git + git: https://gitlab.ifi.lmu.de/uni2work/haskell/yesod.git name: yesod-static pantry-tree: sha256: 32c1608243a5309005ce11e2aa379ac1d6f8c380c529785eb510770118f3da06 @@ -257,11 +257,11 @@ packages: version: 1.6.1.0 original: commit: aa671eb41fdad360f2f7cb844f8de03479efe3f7 - git: https://gitlab.uniworx.de/haskell/yesod.git + git: https://gitlab.ifi.lmu.de/uni2work/haskell/yesod.git subdir: yesod-static - completed: commit: aa671eb41fdad360f2f7cb844f8de03479efe3f7 - git: https://gitlab.uniworx.de/haskell/yesod.git + git: https://gitlab.ifi.lmu.de/uni2work/haskell/yesod.git name: yesod-persistent pantry-tree: sha256: 3778ef2964e1a3890afc22cc9124eacb40e64b62bed4983a85d3b99897f54c5c @@ -270,11 +270,11 @@ packages: version: 1.6.0.7 original: commit: aa671eb41fdad360f2f7cb844f8de03479efe3f7 - git: https://gitlab.uniworx.de/haskell/yesod.git + git: https://gitlab.ifi.lmu.de/uni2work/haskell/yesod.git subdir: yesod-persistent - completed: commit: aa671eb41fdad360f2f7cb844f8de03479efe3f7 - git: https://gitlab.uniworx.de/haskell/yesod.git + git: https://gitlab.ifi.lmu.de/uni2work/haskell/yesod.git name: yesod-newsfeed pantry-tree: sha256: 53ebad62655863a657dcf749ffd3de46f6af90dd71f55bc4d50805ac48ddb099 @@ -283,11 +283,11 @@ packages: version: 1.7.0.0 original: commit: aa671eb41fdad360f2f7cb844f8de03479efe3f7 - git: https://gitlab.uniworx.de/haskell/yesod.git + git: https://gitlab.ifi.lmu.de/uni2work/haskell/yesod.git subdir: yesod-newsfeed - completed: commit: aa671eb41fdad360f2f7cb844f8de03479efe3f7 - git: https://gitlab.uniworx.de/haskell/yesod.git + git: https://gitlab.ifi.lmu.de/uni2work/haskell/yesod.git name: yesod-form pantry-tree: sha256: 260b7f16a8e1d58da137eb91aeed3a11ccbe59ba3e614457a635b9dc3e71426f @@ -296,11 +296,11 @@ packages: version: 1.7.0 original: commit: aa671eb41fdad360f2f7cb844f8de03479efe3f7 - git: https://gitlab.uniworx.de/haskell/yesod.git + git: https://gitlab.ifi.lmu.de/uni2work/haskell/yesod.git subdir: yesod-form - completed: commit: aa671eb41fdad360f2f7cb844f8de03479efe3f7 - git: https://gitlab.uniworx.de/haskell/yesod.git + git: https://gitlab.ifi.lmu.de/uni2work/haskell/yesod.git name: yesod-form-multi pantry-tree: sha256: b21fc50db43733dfe6e285345856610ba4feb83329e9cf953bf8047ba18ecbd6 @@ -309,11 +309,11 @@ packages: version: 1.7.0.2 original: commit: aa671eb41fdad360f2f7cb844f8de03479efe3f7 - git: https://gitlab.uniworx.de/haskell/yesod.git + git: https://gitlab.ifi.lmu.de/uni2work/haskell/yesod.git subdir: yesod-form-multi - completed: commit: aa671eb41fdad360f2f7cb844f8de03479efe3f7 - git: https://gitlab.uniworx.de/haskell/yesod.git + git: https://gitlab.ifi.lmu.de/uni2work/haskell/yesod.git name: yesod-auth pantry-tree: sha256: d335b940a207f8155f421b7146746a72d20db6ad54412154f2c829a59bf21e08 @@ -322,11 +322,11 @@ packages: version: 1.6.10.3 original: commit: aa671eb41fdad360f2f7cb844f8de03479efe3f7 - git: https://gitlab.uniworx.de/haskell/yesod.git + git: https://gitlab.ifi.lmu.de/uni2work/haskell/yesod.git subdir: yesod-auth - completed: commit: aa671eb41fdad360f2f7cb844f8de03479efe3f7 - git: https://gitlab.uniworx.de/haskell/yesod.git + git: https://gitlab.ifi.lmu.de/uni2work/haskell/yesod.git name: yesod-auth-oauth pantry-tree: sha256: 39d2f7d5d1abb3a2953858c5f23880e60ecfcdad0549ddc2570204f9c47649f4 @@ -335,11 +335,11 @@ packages: version: 1.6.0.3 original: commit: aa671eb41fdad360f2f7cb844f8de03479efe3f7 - git: https://gitlab.uniworx.de/haskell/yesod.git + git: https://gitlab.ifi.lmu.de/uni2work/haskell/yesod.git subdir: yesod-auth-oauth - completed: commit: aa671eb41fdad360f2f7cb844f8de03479efe3f7 - git: https://gitlab.uniworx.de/haskell/yesod.git + git: https://gitlab.ifi.lmu.de/uni2work/haskell/yesod.git name: yesod-sitemap pantry-tree: sha256: 971f48af7011ff7816872d067e5de9cadafdd371bdf209170b77df36001abd27 @@ -348,11 +348,11 @@ packages: version: 1.6.0 original: commit: aa671eb41fdad360f2f7cb844f8de03479efe3f7 - git: https://gitlab.uniworx.de/haskell/yesod.git + git: https://gitlab.ifi.lmu.de/uni2work/haskell/yesod.git subdir: yesod-sitemap - completed: commit: aa671eb41fdad360f2f7cb844f8de03479efe3f7 - git: https://gitlab.uniworx.de/haskell/yesod.git + git: https://gitlab.ifi.lmu.de/uni2work/haskell/yesod.git name: yesod-test pantry-tree: sha256: 3d5022e8e3f8e77abcf075c42cf49efaa26f4951159bbb5ab50b69fdfeacb7c1 @@ -361,11 +361,11 @@ packages: version: 1.6.12 original: commit: aa671eb41fdad360f2f7cb844f8de03479efe3f7 - git: https://gitlab.uniworx.de/haskell/yesod.git + git: https://gitlab.ifi.lmu.de/uni2work/haskell/yesod.git subdir: yesod-test - completed: commit: aa671eb41fdad360f2f7cb844f8de03479efe3f7 - git: https://gitlab.uniworx.de/haskell/yesod.git + git: https://gitlab.ifi.lmu.de/uni2work/haskell/yesod.git name: yesod-bin pantry-tree: sha256: 422d7816965b79826c6c24582d76dadbacd1bfb3e9a8f31208867cd788f2a5b8 @@ -374,11 +374,11 @@ packages: version: 1.6.1 original: commit: aa671eb41fdad360f2f7cb844f8de03479efe3f7 - git: https://gitlab.uniworx.de/haskell/yesod.git + git: https://gitlab.ifi.lmu.de/uni2work/haskell/yesod.git subdir: yesod-bin - completed: commit: aa671eb41fdad360f2f7cb844f8de03479efe3f7 - git: https://gitlab.uniworx.de/haskell/yesod.git + git: https://gitlab.ifi.lmu.de/uni2work/haskell/yesod.git name: yesod pantry-tree: sha256: cb53ef3f2036185d2b4752d6fbc5d78470b4504e646e7eb4dd2397f2599daf42 @@ -387,11 +387,11 @@ packages: version: 1.6.1.1 original: commit: aa671eb41fdad360f2f7cb844f8de03479efe3f7 - git: https://gitlab.uniworx.de/haskell/yesod.git + git: https://gitlab.ifi.lmu.de/uni2work/haskell/yesod.git subdir: yesod - completed: commit: aa671eb41fdad360f2f7cb844f8de03479efe3f7 - git: https://gitlab.uniworx.de/haskell/yesod.git + git: https://gitlab.ifi.lmu.de/uni2work/haskell/yesod.git name: yesod-eventsource pantry-tree: sha256: 6d393201852cd024e377159ba836398e24d191563e08165430113d3c1384aff2 @@ -400,11 +400,11 @@ packages: version: 1.6.0.1 original: commit: aa671eb41fdad360f2f7cb844f8de03479efe3f7 - git: https://gitlab.uniworx.de/haskell/yesod.git + git: https://gitlab.ifi.lmu.de/uni2work/haskell/yesod.git subdir: yesod-eventsource - completed: commit: aa671eb41fdad360f2f7cb844f8de03479efe3f7 - git: https://gitlab.uniworx.de/haskell/yesod.git + git: https://gitlab.ifi.lmu.de/uni2work/haskell/yesod.git name: yesod-websockets pantry-tree: sha256: 02df6117e9b74a77879ea750130ba2d8ad8d3c99e14ca678320cb578984301e5 @@ -413,11 +413,22 @@ packages: version: 0.3.0.3 original: commit: aa671eb41fdad360f2f7cb844f8de03479efe3f7 - git: https://gitlab.uniworx.de/haskell/yesod.git + 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.uniworx.de/haskell/cryptonite.git + git: https://gitlab.ifi.lmu.de/uni2work/haskell/cryptonite.git name: cryptonite pantry-tree: sha256: 19e49259fa5e3c257495d72b3c7c3c49537aeafd508c780c2430ddca2ef71a91 @@ -425,10 +436,10 @@ packages: version: '0.29' original: commit: 71a630edaf5f22c464e24fac8d9d310f4055ea1f - git: https://gitlab.uniworx.de/haskell/cryptonite.git + git: https://gitlab.ifi.lmu.de/uni2work/haskell/cryptonite.git - completed: commit: e18dd125c5ea26fa4e88bed079b61d8c1365ee37 - git: https://gitlab.uniworx.de/haskell/esqueleto.git + git: https://gitlab.ifi.lmu.de/uni2work/haskell/esqueleto.git name: esqueleto pantry-tree: sha256: 8a93dc98eb4529ff64aa5bcdaa3c00dcdf0378033ad675864e2b0fc3d869d947 @@ -436,7 +447,7 @@ packages: version: 3.5.4.0 original: commit: e18dd125c5ea26fa4e88bed079b61d8c1365ee37 - git: https://gitlab.uniworx.de/haskell/esqueleto.git + git: https://gitlab.ifi.lmu.de/uni2work/haskell/esqueleto.git - completed: hackage: classy-prelude-yesod-1.5.0@sha256:8f7e183bdfd6d2ea9674284c4f285294ab086aff60d9be4e5d7d2f3c1a2b05b7,1330 pantry-tree: @@ -535,27 +546,6 @@ packages: size: 1059 original: hackage: persistent-postgresql-2.13.0.3@sha256:43384bf8ed9c931c673e6abb763c8811113d1b7004095faaae1eb42e2cd52d8f,3601 -- completed: - hackage: yesod-auth-oauth2-0.6.2.0@sha256:3301232a6ffdf095710dd25e0da9b948d5a4f5c3aaee1e2d5adfadfe395c2c89,3389 - pantry-tree: - sha256: 56094dc446a82f1c3abb1f7fa2a439855c5bbb7463c20a95d93673b27a90cbcc - size: 1919 - original: - hackage: yesod-auth-oauth2-0.6.2.0@sha256:3301232a6ffdf095710dd25e0da9b948d5a4f5c3aaee1e2d5adfadfe395c2c89,3389 -- completed: - hackage: attoparsec-aeson-2.1.0.0@sha256:fa83aba43bfa58490de8f274d19b9d58b6403a207b12cac5f93922102b084c52,1154 - pantry-tree: - sha256: 294c3a8a19a7ddad58097e18c624c6b34894b3c4a4cc490759cb31d842db242a - size: 114 - original: - hackage: attoparsec-aeson-2.1.0.0@sha256:fa83aba43bfa58490de8f274d19b9d58b6403a207b12cac5f93922102b084c52,1154 -- completed: - hackage: integer-conversion-0.1.0.1@sha256:0e57a82635323f015b5d6c242bcfbbeeaa9854fe9c8058e57052254dbb24bb14,2250 - pantry-tree: - sha256: 5684bd08f7edbadbff77d84075b37cdf41309bd8a0dc23bcea6ffbf4497adb7f - size: 509 - original: - hackage: integer-conversion-0.1.0.1@sha256:0e57a82635323f015b5d6c242bcfbbeeaa9854fe9c8058e57052254dbb24bb14,2250 snapshots: - completed: sha256: c632012da648385b9fa3c29f4e0afd56ead299f1c5528ee789058be410e883c0