Merge pull request #362 from commercialhaskell/b/update-cabal

Update LTS; get Cabal-3.12

.github/workflows/build.yml

@@ -1,27 +1,54 @@
-name: build
+name: check and push
 on:
   push:
     branches:
       - master
   pull_request:
-    branches:
-      - master
 jobs:
-  build:
+  stack-test:
+    name: stack test
     runs-on: ubuntu-latest
-    name: Haskell GHC
     steps:
       - uses: actions/checkout@v4
-      - uses: haskell-actions/setup@v2
-        with:
-          enable-stack: true
-          stack-no-global: true
       - uses: actions/cache@v4
         with:
           path: |
+            ~/.ghcup
             ~/.stack
-            .stack-work
           key: ${{ runner.os }}-${{ hashFiles('**/*.cabal','**/stack.yaml') }}
+          # If there's no match for key, fall back to these:
           restore-keys: |
             ${{ runner.os }}-
-      - run: stack build
+      - uses: haskell/ghcup-setup@v1
+        with:
+          stack-hook: true
+      - run: |
+          ghcup install stack
+      - run: stack test
+
+  flake-no-push:
+    name: flake check (no push)
+    if: github.event_name != 'push'
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: cachix/install-nix-action@v31
+      - uses: cachix/cachix-action@v15
+        with:
+          name: stackage-infrastructure
+      - run: nix build
+      - run: nix flake check
+
+  flake-push:
+    name: flake check and push
+    if: github.event_name == 'push'
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: cachix/install-nix-action@v31
+      - uses: cachix/cachix-action@v31
+        with:
+          name: stackage-infrastructure
+          authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}'
+      - run: nix build
+      - run: nix flake check

flake.lock

@@ -20,11 +20,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1738136902,
+        "lastModified": 1770843696,
-        "narHash": "sha256-pUvLijVGARw4u793APze3j6mU1Zwdtz7hGkGGkD87qw=",
+        "narHash": "sha256-LovWTGDwXhkfCOmbgLVA10bvsi/P8eDDpRudgk68HA8=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "9a5db3142ce450045840cc8d832b13b8a2018e0c",
+        "rev": "2343bbb58f99267223bc2aac4fc9ea301a155a16",
         "type": "github"
       },
       "original": {

nix/amazonka-core.nix

@@ -1,26 +1,27 @@
-# Generated by ./gen-package-nix.sh
+# Generated by ./gen-packages.sh
 { mkDerivation, aeson, attoparsec, base, bytestring
 , case-insensitive, conduit, conduit-extra, containers, crypton
 , data-ordlist, deepseq, fetchzip, hashable, http-client
-, http-conduit, http-types, lens, lib, memory, QuickCheck
+, http-conduit, http-types, lib, memory, microlens
-, quickcheck-unicode, regex-posix, resourcet, scientific, tasty
+, microlens-contra, microlens-pro, QuickCheck, quickcheck-unicode
-, tasty-hunit, tasty-quickcheck, template-haskell, text, time
+, regex-posix, resourcet, scientific, tasty, tasty-hunit
-, transformers, unordered-containers, xml-conduit, xml-types
+, tasty-quickcheck, template-haskell, text, time, transformers
+, unordered-containers, xml-conduit, xml-types
 }:
 mkDerivation {
   pname = "amazonka-core";
   version = "2.0";
   src = fetchzip {
-    url = "https://github.com/brendanhay/amazonka/archive/85e0289f8dc23c54b00f7f1a09845be7e032a1eb.zip";
+    url = "https://github.com/brendanhay/amazonka/archive/a7d699be1076e2aad05a1930ca3937ffea954ad8.zip";
-    sha256 = "1mgdz9b7wwc05xksczvzp2hllp7nzl4nr6as5q2fafkgxqzwwx53";
+    sha256 = "034d9rni0n95qmbc6fr13b7kbrs5s9s5qarg7znwx068gwf6293h";
   };
   postUnpack = "sourceRoot+=/lib/amazonka-core; echo source root reset to $sourceRoot";
   libraryHaskellDepends = [
     aeson attoparsec base bytestring case-insensitive conduit
     conduit-extra containers crypton deepseq hashable http-client
-    http-conduit http-types lens memory regex-posix resourcet
+    http-conduit http-types memory microlens microlens-contra
-    scientific text time transformers unordered-containers xml-conduit
+    microlens-pro regex-posix resourcet scientific text time
-    xml-types
+    transformers unordered-containers xml-conduit xml-types
   ];
   testHaskellDepends = [
     aeson base bytestring case-insensitive conduit data-ordlist

nix/amazonka-s3.nix

@@ -0,0 +1,22 @@
+# Generated by ./gen-packages.sh
+{ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+, case-insensitive, fetchzip, lib, tasty, tasty-hunit, text, time
+, unordered-containers
+}:
+mkDerivation {
+  pname = "amazonka-s3";
+  version = "2.0";
+  src = fetchzip {
+    url = "https://github.com/brendanhay/amazonka/archive/a7d699be1076e2aad05a1930ca3937ffea954ad8.zip";
+    sha256 = "034d9rni0n95qmbc6fr13b7kbrs5s9s5qarg7znwx068gwf6293h";
+  };
+  postUnpack = "sourceRoot+=/lib/services/amazonka-s3; echo source root reset to $sourceRoot";
+  libraryHaskellDepends = [ amazonka-core base text ];
+  testHaskellDepends = [
+    amazonka-core amazonka-test base bytestring case-insensitive tasty
+    tasty-hunit text time unordered-containers
+  ];
+  homepage = "https://github.com/brendanhay/amazonka";
+  description = "Amazon Simple Storage Service SDK";
+  license = lib.licenses.mpl20;
+}

nix/barrier.nix

@@ -0,0 +1,24 @@
+# Generated by ./gen-packages.sh
+{ mkDerivation, base, blaze-svg, bytestring, lens-family-core, lib
+, tasty, tasty-golden, template-haskell, text, unordered-containers
+}:
+mkDerivation {
+  pname = "barrier";
+  version = "0.1.1";
+  sha256 = "6395da01eea1984c7bcc85c624b1b5dfbe0b6b764adeed7b04c9fa4d8de91ed9";
+  revision = "2";
+  editedCabalFile = "0b0va208hc9blny6pbzk2a7mc834xkafaza07a5liaccniach3m3";
+  isLibrary = true;
+  isExecutable = true;
+  enableSeparateDataOutput = true;
+  libraryHaskellDepends = [
+    base blaze-svg bytestring template-haskell text
+    unordered-containers
+  ];
+  testHaskellDepends = [
+    base bytestring lens-family-core tasty tasty-golden
+  ];
+  homepage = "https://github.com/philopon/barrier";
+  description = "Shields.io style badge generator";
+  license = lib.licenses.mit;
+}

nix/gen-packages.sh

@@ -23,8 +23,10 @@ cd "$(dirname "$0")"
 gen stackage-server --hpack ../.
 
 # Has my R2 patch, which is still unreleased on 2025-01-24
-#echo "...please ignore useless error below..."
+amazonka_version=a7d699be1076e2aad05a1930ca3937ffea954ad8
-2>/dev/null gen amazonka-core https://github.com/brendanhay/amazonka/archive/85e0289f8dc23c54b00f7f1a09845be7e032a1eb.zip --subpath lib/amazonka-core
+
+2>/dev/null gen amazonka-core "https://github.com/brendanhay/amazonka/archive/${amazonka_version}.zip" --subpath lib/amazonka-core
+gen amazonka-s3 "https://github.com/brendanhay/amazonka/archive/${amazonka_version}.zip" --subpath lib/services/amazonka-s3
 
 # Pinned to 5.0.18.4 to avoid accidentally regenerating hoogle files. See
 # warning in stack.yaml!

nix/hoogle.nix

@@ -1,4 +1,4 @@
-# Generated by ./gen-package-nix.sh
+# Generated by ./gen-packages.sh
 { mkDerivation, aeson, base, binary, blaze-html, blaze-markup
 , bytestring, cmdargs, conduit, conduit-extra, containers
 , crypton-connection, deepseq, directory, extra, filepath
@@ -27,7 +27,7 @@ mkDerivation {
     wai wai-logger warp warp-tls zlib
   ];
   executableHaskellDepends = [ base ];
-  testTarget = "--test-option=--no-net";
+  testFlags = [ "--no-net" ];
   homepage = "https://hoogle.haskell.org/";
   description = "Haskell API Search";
   license = lib.licenses.bsd3;

nix/pantry.nix

@@ -1,4 +1,4 @@
-# Generated by ./gen-package-nix.sh
+# Generated by ./gen-packages.sh
 { mkDerivation, aeson, ansi-terminal, base, bytestring, Cabal
 , casa-client, casa-types, conduit, conduit-extra, containers
 , cryptonite, cryptonite-conduit, digest, exceptions, fetchzip

nix/stackage-server.nix

@@ -1,21 +1,21 @@
 # Generated by ./gen-packages.sh
 { mkDerivation, aeson, amazonka, amazonka-core, amazonka-s3
-, auto-update, barrier, base, blaze-html, blaze-markup, bytestring
+, attoparsec-aeson, auto-update, barrier, base, blaze-html
-, Cabal, casa-client, classy-prelude, classy-prelude-conduit
+, blaze-markup, bytestring, Cabal, casa-client, classy-prelude
-, classy-prelude-yesod, cmark-gfm, conduit, conduit-extra
+, classy-prelude-conduit, classy-prelude-yesod, cmark-gfm, conduit
-, containers, deepseq, directory, email-validate, esqueleto
+, conduit-extra, containers, deepseq, directory, email-validate
-, exceptions, fast-logger, file-embed, filepath, formatting, gauge
+, esqueleto, exceptions, fast-logger, file-embed, filepath
-, ghc-prim, haddock-library, hashable, hoogle, hpack, html-conduit
+, formatting, gauge, ghc-prim, haddock-library, hashable, hoogle
-, http-client, http-conduit, http-types, lens, lib, monad-logger
+, hpack, html-conduit, http-client, http-conduit, http-types, lens
-, mono-traversable, mtl, optparse-applicative, pantry, path
+, lib, monad-logger, mono-traversable, mtl, optparse-applicative
-, path-io, path-pieces, persistent, persistent-postgresql
+, pantry, path, path-io, path-pieces, persistent
-, persistent-sqlite, persistent-template, process, resource-pool
+, persistent-postgresql, persistent-sqlite, persistent-template
-, resourcet, retry, rio, shakespeare, streaming-commons
+, process, resource-pool, resourcet, retry, rio, shakespeare
-, tar-conduit, template-haskell, text, these, transformers
+, streaming-commons, tar-conduit, template-haskell, text, these
-, unliftio, unordered-containers, wai, wai-extra, wai-logger, warp
+, transformers, unliftio, unordered-containers, wai, wai-extra
-, xml-conduit, xml-types, yaml, yesod, yesod-auth, yesod-core
+, wai-logger, warp, xml-conduit, xml-types, yaml, yesod, yesod-auth
-, yesod-form, yesod-gitrepo, yesod-gitrev, yesod-newsfeed
+, yesod-core, yesod-form, yesod-gitrepo, yesod-gitrev
-, yesod-sitemap, yesod-static, zlib
+, yesod-newsfeed, yesod-sitemap, yesod-static, zlib
 }:
 mkDerivation {
   pname = "stackage-server";
@@ -24,31 +24,14 @@ mkDerivation {
   isLibrary = true;
   isExecutable = true;
   libraryHaskellDepends = [
-    aeson amazonka amazonka-core amazonka-s3 auto-update barrier base
+    aeson amazonka amazonka-core amazonka-s3 attoparsec-aeson
-    blaze-html blaze-markup bytestring Cabal classy-prelude
+    auto-update barrier base blaze-html blaze-markup bytestring Cabal
-    classy-prelude-conduit classy-prelude-yesod cmark-gfm conduit
+    classy-prelude classy-prelude-conduit classy-prelude-yesod
-    conduit-extra containers deepseq directory email-validate esqueleto
+    cmark-gfm conduit conduit-extra containers deepseq directory
-    exceptions fast-logger file-embed filepath formatting ghc-prim
+    email-validate esqueleto exceptions fast-logger file-embed filepath
-    haddock-library hashable hoogle html-conduit http-client
+    formatting ghc-prim haddock-library hashable hoogle html-conduit
-    http-conduit http-types lens monad-logger mono-traversable mtl
+    http-client http-conduit http-types lens monad-logger
-    pantry path path-pieces persistent persistent-postgresql
+    mono-traversable mtl pantry path path-pieces persistent
-    persistent-sqlite persistent-template process resource-pool
-    resourcet retry rio shakespeare streaming-commons tar-conduit
-    template-haskell text these transformers unliftio
-    unordered-containers wai wai-extra wai-logger warp xml-conduit
-    xml-types yaml yesod yesod-auth yesod-core yesod-form yesod-gitrepo
-    yesod-gitrev yesod-newsfeed yesod-sitemap yesod-static zlib
-  ];
-  libraryToolDepends = [ hpack ];
-  executableHaskellDepends = [
-    aeson amazonka amazonka-core amazonka-s3 auto-update barrier base
-    blaze-html blaze-markup bytestring Cabal classy-prelude
-    classy-prelude-conduit classy-prelude-yesod cmark-gfm conduit
-    conduit-extra containers deepseq directory email-validate esqueleto
-    exceptions fast-logger file-embed filepath formatting ghc-prim
-    haddock-library hashable hoogle html-conduit http-client
-    http-conduit http-types lens monad-logger mono-traversable mtl
-    optparse-applicative pantry path path-pieces persistent
     persistent-postgresql persistent-sqlite persistent-template process
     resource-pool resourcet retry rio shakespeare streaming-commons
     tar-conduit template-haskell text these transformers unliftio
@@ -56,21 +39,40 @@ mkDerivation {
     xml-types yaml yesod yesod-auth yesod-core yesod-form yesod-gitrepo
     yesod-gitrev yesod-newsfeed yesod-sitemap yesod-static zlib
   ];
+  libraryToolDepends = [ hpack ];
+  executableHaskellDepends = [
+    aeson amazonka amazonka-core amazonka-s3 attoparsec-aeson
+    auto-update barrier base blaze-html blaze-markup bytestring Cabal
+    classy-prelude classy-prelude-conduit classy-prelude-yesod
+    cmark-gfm conduit conduit-extra containers deepseq directory
+    email-validate esqueleto exceptions fast-logger file-embed filepath
+    formatting ghc-prim haddock-library hashable hoogle html-conduit
+    http-client http-conduit http-types lens monad-logger
+    mono-traversable mtl optparse-applicative pantry path path-pieces
+    persistent persistent-postgresql persistent-sqlite
+    persistent-template process resource-pool resourcet retry rio
+    shakespeare streaming-commons tar-conduit template-haskell text
+    these transformers unliftio unordered-containers wai wai-extra
+    wai-logger warp xml-conduit xml-types yaml yesod yesod-auth
+    yesod-core yesod-form yesod-gitrepo yesod-gitrev yesod-newsfeed
+    yesod-sitemap yesod-static zlib
+  ];
   benchmarkHaskellDepends = [
-    aeson amazonka amazonka-core amazonka-s3 auto-update barrier base
+    aeson amazonka amazonka-core amazonka-s3 attoparsec-aeson
-    blaze-html blaze-markup bytestring Cabal casa-client classy-prelude
+    auto-update barrier base blaze-html blaze-markup bytestring Cabal
-    classy-prelude-conduit classy-prelude-yesod cmark-gfm conduit
+    casa-client classy-prelude classy-prelude-conduit
-    conduit-extra containers deepseq directory email-validate esqueleto
+    classy-prelude-yesod cmark-gfm conduit conduit-extra containers
-    exceptions fast-logger file-embed filepath formatting gauge
+    deepseq directory email-validate esqueleto exceptions fast-logger
-    ghc-prim haddock-library hashable hoogle html-conduit http-client
+    file-embed filepath formatting gauge ghc-prim haddock-library
-    http-conduit http-types lens monad-logger mono-traversable mtl
+    hashable hoogle html-conduit http-client http-conduit http-types
-    pantry path path-io path-pieces persistent persistent-postgresql
+    lens monad-logger mono-traversable mtl pantry path path-io
-    persistent-sqlite persistent-template process resource-pool
+    path-pieces persistent persistent-postgresql persistent-sqlite
-    resourcet retry rio shakespeare streaming-commons tar-conduit
+    persistent-template process resource-pool resourcet retry rio
-    template-haskell text these transformers unliftio
+    shakespeare streaming-commons tar-conduit template-haskell text
-    unordered-containers wai wai-extra wai-logger warp xml-conduit
+    these transformers unliftio unordered-containers wai wai-extra
-    xml-types yaml yesod yesod-auth yesod-core yesod-form yesod-gitrepo
+    wai-logger warp xml-conduit xml-types yaml yesod yesod-auth
-    yesod-gitrev yesod-newsfeed yesod-sitemap yesod-static zlib
+    yesod-core yesod-form yesod-gitrepo yesod-gitrev yesod-newsfeed
+    yesod-sitemap yesod-static zlib
   ];
   prePatch = "hpack";
   license = lib.licenses.mit;

package.nix

@@ -19,17 +19,18 @@ let
       });
 
       # patched, see gen-package-nix.sh
-      amazonka-core = self.callPackage nix/amazonka-core.nix { };
+      amazonka-core = hlib.doJailbreak (self.callPackage nix/amazonka-core.nix { });
+      amazonka-s3 = hlib.doJailbreak (self.callPackage nix/amazonka-s3.nix { });
 
       # We have this old dependency for unexplored reasons.
       # Tests fail from attempted network access.
       pantry = pkgs.lib.pipe (self.callPackage nix/pantry.nix { }) [hlib.dontCheck hlib.doJailbreak];
 
       # Changing this has operational impacts.
-      hoogle = self.callPackage nix/hoogle.nix { };
+      hoogle = hlib.doJailbreak (self.callPackage nix/hoogle.nix { });
 
       # Outdated breakage? (TODO: upstream)
-      barrier = hlib.markUnbroken super.barrier;
+      barrier = pkgs.lib.pipe super.barrier [hlib.doJailbreak hlib.markUnbroken];
 
       # Tests fail from attempted network access (TODO: upstream)
       yesod-gitrev = hlib.markUnbroken (hlib.dontCheck super.yesod-gitrev);

package.yaml

@@ -11,6 +11,7 @@ flags:
     default: false
 
 dependencies:
+- attoparsec-aeson
 - base
 - yesod
 - aeson

src/Stackage/Database/Cron.hs

@@ -19,6 +19,7 @@ import Conduit
 import Control.DeepSeq
 import Control.SingleRun
 import Control.Lens ((?~))
+import Control.Exception.Lens (trying)
 import qualified Data.ByteString.Char8 as BS8
 import qualified Data.Conduit.Binary as CB
 import Data.Conduit.Tar (FileInfo(..), FileType(..), untar)

stack.yaml

@@ -1,8 +1,7 @@
 # As this is built on NixOS stable, it has to stay on a GHC that exists on the
 # OS.
-# I.e. changes here need to be synced with changes to
+# I.e. changes here need to be synced with changes to flake.nix and package.nix.
-# https://github.com/haskellfoundation/hf-infrastructure
+resolver: lts-24.26
-resolver: lts-22.43
 extra-deps:
 # WARNING: Changing the hoogle version causes stackage-server-cron to regenerate
 # Hoogle databases FOR EVERY SNAPSHOT, EVER. Usually, that's ok! But don't
@@ -17,17 +16,33 @@ extra-deps:
 # waste. (4) Stackage's Hoogle search will be unavailable until the new
 # databases have been generated.
 - hoogle-5.0.18.4@sha256:1372458e97dff541fcda099236af7936bf93ee6b8c5d15695ee6d9426dff5eed,3171
+# FIXME: This version of pantry differs from upstream in a way that has not been explored yet.
 - git: https://github.com/commercialhaskell/pantry.git
   commit: 5df643cc1deb561d9c52a9cb6f593aba2bc4c08e
 # This amazonka includes the unreleased patch to support Cloudflare, which kinda
 # has a bug. See https://github.com/brendanhay/amazonka/issues/975 for details.
 - github: brendanhay/amazonka
-  commit: '85e0289f8dc23c54b00f7f1a09845be7e032a1eb'
+  commit: 'a7d699be1076e2aad05a1930ca3937ffea954ad8'
-  subdirs: [lib/amazonka-core]
+  subdirs:
-
+    - lib/amazonka-core
+    - lib/services/amazonka-s3
+    - lib/amazonka
+    - lib/services/amazonka-sso
+    - lib/services/amazonka-sts
+- barrier-0.1.1
+- microlens-pro-0.2.0.3
 allow-newer: true
 allow-newer-deps:
   - pantry
+  - barrier
 
+# Minimum nix setup for running stack on NixOS.
+# Do NOT use the included shell.nix. It can create invalid successful builds on
+# NixOS that fail on other systems. This happens because Haskell packages are
+# injected into "GHC"'s package database. Packages that *should* be listed here
+# as extra-deps are silently picked up on NixOS, but missing on other systems.
 nix:
-  shell-file: shell.nix
+  packages:
+    - pkg-config
+    - zlib
+    - postgresql

stack.yaml.lock

@@ -1,7 +1,7 @@
 # This file was autogenerated by Stack.
 # You should not edit this file by hand.
 # For more information, please see the documentation at:
-#   https://docs.haskellstack.org/en/stable/lock_files
+#   https://docs.haskellstack.org/en/stable/topics/lock_files
 
 packages:
 - completed:
@@ -25,19 +25,85 @@ packages:
 - completed:
     name: amazonka-core
     pantry-tree:
-      sha256: 236fcc48e8d6cdedc31800c40c853aa6cb8c640ae3d93686a584d513679a5181
+      sha256: 37df1b595ccff0c36abdf11635320dc7feb481872197cd2984c7b9176c3bd9d4
       size: 3222
-    sha256: 39038d8934ad8ba164e3d21aa227a80a12fbdd4cf371a6311ea8cc95a6265385
+    sha256: 1ee25eb283c2d95fe89c5f559abe0049f6cd0a3b36d768947b85d64ca74d87e0
-    size: 34733906
+    size: 34859547
     subdir: lib/amazonka-core
-    url: https://github.com/brendanhay/amazonka/archive/85e0289f8dc23c54b00f7f1a09845be7e032a1eb.tar.gz
+    url: https://github.com/brendanhay/amazonka/archive/a7d699be1076e2aad05a1930ca3937ffea954ad8.tar.gz
     version: '2.0'
   original:
     subdir: lib/amazonka-core
-    url: https://github.com/brendanhay/amazonka/archive/85e0289f8dc23c54b00f7f1a09845be7e032a1eb.tar.gz
+    url: https://github.com/brendanhay/amazonka/archive/a7d699be1076e2aad05a1930ca3937ffea954ad8.tar.gz
+- completed:
+    name: amazonka-s3
+    pantry-tree:
+      sha256: cab10723dc7e2a3d7096ddd5253e4fc30044ff9a158da24e42bd6be2c4060cdc
+      size: 38690
+    sha256: 1ee25eb283c2d95fe89c5f559abe0049f6cd0a3b36d768947b85d64ca74d87e0
+    size: 34859547
+    subdir: lib/services/amazonka-s3
+    url: https://github.com/brendanhay/amazonka/archive/a7d699be1076e2aad05a1930ca3937ffea954ad8.tar.gz
+    version: '2.0'
+  original:
+    subdir: lib/services/amazonka-s3
+    url: https://github.com/brendanhay/amazonka/archive/a7d699be1076e2aad05a1930ca3937ffea954ad8.tar.gz
+- completed:
+    name: amazonka
+    pantry-tree:
+      sha256: 4a71ab03d46bcb9841aaf17cf2473276c91412deae9b4b511a5842059f102d7a
+      size: 1659
+    sha256: 1ee25eb283c2d95fe89c5f559abe0049f6cd0a3b36d768947b85d64ca74d87e0
+    size: 34859547
+    subdir: lib/amazonka
+    url: https://github.com/brendanhay/amazonka/archive/a7d699be1076e2aad05a1930ca3937ffea954ad8.tar.gz
+    version: '2.0'
+  original:
+    subdir: lib/amazonka
+    url: https://github.com/brendanhay/amazonka/archive/a7d699be1076e2aad05a1930ca3937ffea954ad8.tar.gz
+- completed:
+    name: amazonka-sso
+    pantry-tree:
+      sha256: c4575f7b7cf61c3de65e43d0d77a14dfa14c47ebff5f1a3dcd2f6e1313aaaf0a
+      size: 1817
+    sha256: 1ee25eb283c2d95fe89c5f559abe0049f6cd0a3b36d768947b85d64ca74d87e0
+    size: 34859547
+    subdir: lib/services/amazonka-sso
+    url: https://github.com/brendanhay/amazonka/archive/a7d699be1076e2aad05a1930ca3937ffea954ad8.tar.gz
+    version: '2.0'
+  original:
+    subdir: lib/services/amazonka-sso
+    url: https://github.com/brendanhay/amazonka/archive/a7d699be1076e2aad05a1930ca3937ffea954ad8.tar.gz
+- completed:
+    name: amazonka-sts
+    pantry-tree:
+      sha256: e0cb89013938230d257a2e546a78170dfdb6d507f37c6cb763a6cdf6290edb66
+      size: 2880
+    sha256: 1ee25eb283c2d95fe89c5f559abe0049f6cd0a3b36d768947b85d64ca74d87e0
+    size: 34859547
+    subdir: lib/services/amazonka-sts
+    url: https://github.com/brendanhay/amazonka/archive/a7d699be1076e2aad05a1930ca3937ffea954ad8.tar.gz
+    version: '2.0'
+  original:
+    subdir: lib/services/amazonka-sts
+    url: https://github.com/brendanhay/amazonka/archive/a7d699be1076e2aad05a1930ca3937ffea954ad8.tar.gz
+- completed:
+    hackage: barrier-0.1.1@sha256:a30ec854b48ca9488b3a407de5d4ec6420568f12f3af6bbca52b318880501b2c,4149
+    pantry-tree:
+      sha256: 841bad60210962a31d34adc3872791ba00b7264f8d6a91f13ef04ffd395412da
+      size: 1695
+  original:
+    hackage: barrier-0.1.1
+- completed:
+    hackage: microlens-pro-0.2.0.3@sha256:02b37be781ce31a336420e71cc9c7ab25cdf93c62293cf8f6b62dc8e0c61b21c,3377
+    pantry-tree:
+      sha256: 6ce501822e3dc9174dd615b3219aa3bef11d52801376bc75a15407877d5c854c
+      size: 430
+  original:
+    hackage: microlens-pro-0.2.0.3
 snapshots:
 - completed:
-    sha256: 08bd13ce621b41a8f5e51456b38d5b46d7783ce114a50ab604d6bbab0d002146
+    sha256: d90eb1418667a225998b173817300e5ae2e1500ed03c0a9457cc2a0e78a0122a
-    size: 720271
+    size: 726337
-    url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/22/43.yaml
+    url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/24/26.yaml
-  original: lts-22.43
+  original: lts-24.26