Unverified Commit b756c485 authored by Dennis Gosnell's avatar Dennis Gosnell Committed by GitHub
Browse files

Merge pull request #262645 from NixOS/haskell-updates 

haskellPackages: update stackage and hackage
parents 292b9620 1713e1d0

maintainers/scripts/haskell/hydra-report.hs

+10 −9
Original line number Diff line number Diff line
@@ -187,7 +187,7 @@ getBuildReports opt = runReq defaultHttpConfig do 


getEvalBuilds :: HydraSlownessWorkaroundFlag -> Int -> Req (Seq Build)

getEvalBuilds NoHydraSlownessWorkaround id =

  hydraJSONQuery (responseTimeout 900000000) ["eval", showT id, "builds"]

  hydraJSONQuery mempty ["eval", showT id, "builds"]

getEvalBuilds HydraSlownessWorkaround id = do

  Eval{builds} <- hydraJSONQuery mempty [ "eval", showT id ]

  forM builds $ \buildId -> do
@@ -195,14 +195,15 @@ getEvalBuilds HydraSlownessWorkaround id = do 
    hydraJSONQuery mempty [ "build", showT buildId ]



hydraQuery :: HttpResponse a => Proxy a -> Option 'Https -> [Text] -> Req (HttpResponseBody a)

hydraQuery responseType option query =

   responseBody

      <$> req

         GET

         (foldl' (/:) (https "hydra.nixos.org") query)

         NoReqBody

         responseType

         (header "User-Agent" "hydra-report.hs/v1 (nixpkgs;maintainers/scripts/haskell) pls fix https://github.com/NixOS/nixos-org-configurations/issues/270" <> option)

hydraQuery responseType option query = do

  let customHeaderOpt =

        header

          "User-Agent"

          "hydra-report.hs/v1 (nixpkgs;maintainers/scripts/haskell) pls fix https://github.com/NixOS/nixos-org-configurations/issues/270"

      customTimeoutOpt = responseTimeout 900_000_000 -- 15 minutes

      opts = customHeaderOpt <> customTimeoutOpt <> option

      url = foldl' (/:) (https "hydra.nixos.org") query

  responseBody <$> req GET url NoReqBody responseType opts



hydraJSONQuery :: FromJSON a => Option 'Https -> [Text] -> Req a

hydraJSONQuery = hydraQuery jsonResponse

pkgs/build-support/agda/default.nix

+1 −0
Original line number Diff line number Diff line
@@ -47,6 +47,7 @@ let 
    "lagda.org"

    "lagda.rst"

    "lagda.tex"

    "lagda.typ"

  ];



  defaults =

pkgs/build-support/agda/lib.nix

+1 −1
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ 
  * interfaceFile "Everything.agda" == "Everything.agdai"

  * interfaceFile "src/Everything.lagda.tex" == "src/Everything.agdai"

  */

  interfaceFile = agdaFile: lib.head (builtins.match ''(.*\.)l?agda(\.(md|org|rst|tex))?'' agdaFile) + "agdai";

  interfaceFile = agdaFile: lib.head (builtins.match ''(.*\.)l?agda(\.(md|org|rst|tex|typ))?'' agdaFile) + "agdai";



  /* Takes an arbitrary derivation and says whether it is an agda library package

  *  that is not marked as broken.

pkgs/data/misc/hackage/pin.json

+4 −4
Original line number Diff line number Diff line 
{

  "commit": "d37311b9195c41b254b2d71c74c93e51f6ccebab",

  "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/d37311b9195c41b254b2d71c74c93e51f6ccebab.tar.gz",

  "sha256": "1m2xcnyz6y03m5l5qdxc0avi4gi53g82hq4ab9qcjbxi82g3qn4v",

  "msg": "Update from Hackage at 2023-10-04T18:27:12Z"

  "commit": "49d09494dd24eae895fe1260e2c26157f740e451",

  "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/49d09494dd24eae895fe1260e2c26157f740e451.tar.gz",

  "sha256": "1f0m4wni61v6679ya0mb9mw3vxhak9yvjxjm6wfs7wryayb4i5ba",

  "msg": "Update from Hackage at 2023-10-21T19:49:07Z"

}

pkgs/development/compilers/ghc/8.10.2-binary.nix

+1 −0
Original line number Diff line number Diff line
@@ -212,6 +212,7 @@ stdenv.mkDerivation rec { 
      (let buildExeGlob = ''ghc-${version}*/"${binDistUsed.exePathForLibraryCheck}"''; in

        lib.concatStringsSep "\n" [

          (''

            shopt -u nullglob

            echo "Checking that ghc binary exists in bindist at ${buildExeGlob}"

            if ! test -e ${buildExeGlob}; then

              echo >&2 "GHC binary ${binDistUsed.exePathForLibraryCheck} could not be found in the bindist build directory (at ${buildExeGlob}) for arch ${stdenv.hostPlatform.system}, please check that ghcBinDists correctly reflect the bindist dependencies!"; exit 1;