diff --git a/package.yaml b/package.yaml index 8c919dc..c6fd92c 100644 --- a/package.yaml +++ b/package.yaml @@ -14,6 +14,7 @@ dependencies: - base - yesod - aeson +- attoparsec-aeson - barrier - blaze-markup - bytestring @@ -34,6 +35,7 @@ dependencies: #- prometheus-client #- prometheus-metrics-ghc - pantry +- hpack - path - persistent - persistent-template diff --git a/src/Stackage/Database/Cron.hs b/src/Stackage/Database/Cron.hs index cf549dc..3cfe0c8 100644 --- a/src/Stackage/Database/Cron.hs +++ b/src/Stackage/Database/Cron.hs @@ -17,6 +17,7 @@ module Stackage.Database.Cron import Conduit import Control.DeepSeq +import Control.Exception.Lens(trying) import Control.SingleRun import Control.Lens ((?~)) import qualified Data.ByteString.Char8 as BS8 @@ -30,6 +31,7 @@ import Data.Yaml (decodeFileEither) import Database.Persist hiding (exists) import Database.Persist.Postgresql hiding (exists) import qualified Hoogle +import qualified Hpack import Amazonka hiding (Request, length, error) import Amazonka.Data.Text (toText) import Amazonka.S3 @@ -42,8 +44,9 @@ import Network.HTTP.Simple (getResponseBody, httpJSONEither) import Network.HTTP.Types (status200, status404) import Pantry (CabalFileInfo(..), DidUpdateOccur(..), HpackExecutable(HpackBundled), PackageIdentifierRevision(..), + defaultGlobalHintsLocation, defaultCasaMaxPerRequest, defaultCasaRepoPrefix, - defaultHackageSecurityConfig, defaultSnapshotLocation) + defaultPackageIndexConfig, defaultSnapshotLocation) import Pantry.Internal.Stackage (HackageTarballResult(..), PantryConfig(..), Storage(..), forceUpdateHackageIndex, getHackageTarball, packageTreeKey) @@ -187,17 +190,18 @@ stackageServerCron StackageCronOptions {..} = do withLogFunc (setLogMinLevel scoLogLevel lo) $ \logFunc -> do let pantryConfig = PantryConfig - { pcHackageSecurity = defaultHackageSecurityConfig + { pcPackageIndex = defaultPackageIndexConfig , pcHpackExecutable = HpackBundled + , pcHpackForce = Hpack.NoForce , pcRootDir = pantryRootDir , pcStorage = storage , pcUpdateRef = updateRef , pcParsedCabalFilesRawImmutable = cabalImmutable , pcParsedCabalFilesMutable = cabalMutable , pcConnectionCount = connectionCount - , pcCasaRepoPrefix = defaultCasaRepoPrefix - , pcCasaMaxPerRequest = defaultCasaMaxPerRequest + , pcCasaConfig = Just (defaultCasaRepoPrefix, defaultCasaMaxPerRequest) , pcSnapshotLocation = defaultSnapshotLocation + , pcGlobalHintsLocation = defaultGlobalHintsLocation } currentHoogleVersionId <- runRIO logFunc $ do runStackageMigrations' pantryConfig diff --git a/stack.yaml b/stack.yaml index fff6c83..b0b0837 100644 --- a/stack.yaml +++ b/stack.yaml @@ -2,7 +2,7 @@ # OS. # I.e. changes here need to be synced with changes to # https://github.com/haskellfoundation/hf-infrastructure -resolver: lts-22.43 +resolver: lts-24.29 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 +17,22 @@ 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 -- git: https://github.com/commercialhaskell/pantry.git - commit: 5df643cc1deb561d9c52a9cb6f593aba2bc4c08e +#- 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' - subdirs: [lib/amazonka-core] + commit: 'a7d699be1076e2aad05a1930ca3937ffea954ad8' + subdirs: [lib/amazonka-core, lib/amazonka, lib/services/amazonka-s3, lib/services/amazonka-sts, lib/services/amazonka-sso] +- barrier-0.1.1 +- microlens-pro-0.2.0.5 allow-newer: true allow-newer-deps: - - pantry + - amazonka + - amazonka-core + - barrier + - microlens-pro nix: shell-file: shell.nix diff --git a/stack.yaml.lock b/stack.yaml.lock index 115b33f..b55bdbf 100644 --- a/stack.yaml.lock +++ b/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: @@ -11,33 +11,88 @@ packages: size: 3414 original: hackage: hoogle-5.0.18.4@sha256:1372458e97dff541fcda099236af7936bf93ee6b8c5d15695ee6d9426dff5eed,3171 -- completed: - commit: 5df643cc1deb561d9c52a9cb6f593aba2bc4c08e - git: https://github.com/commercialhaskell/pantry.git - name: pantry - pantry-tree: - sha256: 12ecb7840d240ffedf3dcc04353d00a4676ffa73b37d537350c087af1ff38982 - size: 3618 - version: 0.5.7 - original: - commit: 5df643cc1deb561d9c52a9cb6f593aba2bc4c08e - git: https://github.com/commercialhaskell/pantry.git - completed: name: amazonka-core pantry-tree: - sha256: 236fcc48e8d6cdedc31800c40c853aa6cb8c640ae3d93686a584d513679a5181 + sha256: 37df1b595ccff0c36abdf11635320dc7feb481872197cd2984c7b9176c3bd9d4 size: 3222 - sha256: 39038d8934ad8ba164e3d21aa227a80a12fbdd4cf371a6311ea8cc95a6265385 - size: 34733906 + sha256: 1ee25eb283c2d95fe89c5f559abe0049f6cd0a3b36d768947b85d64ca74d87e0 + 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 + 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-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-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: + 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: + 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.5@sha256:8c4afe7a696682dadd042c1e323d43ae7361a443c29b4992984d54b374f254c3,3376 + pantry-tree: + sha256: 6e719bbe246f16168704ed33dc445510e2fedbee309cbf79614376f4aece35c1 + size: 430 + original: + hackage: microlens-pro-0.2.0.5 snapshots: - completed: - sha256: 08bd13ce621b41a8f5e51456b38d5b46d7783ce114a50ab604d6bbab0d002146 - size: 720271 - url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/22/43.yaml - original: lts-22.43 + sha256: b7dc388c75a62a8a2f1ac753f3bfc3f43a3a2cb58d8a920272cc9a049ff76c62 + size: 726792 + url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/24/29.yaml + original: lts-24.29