Unverified Commit bb1921b1 authored by sternenseemann's avatar sternenseemann Committed by GitHub
Browse files

Merge pull request #209724 from NixOS/haskell-updates 

haskellPackages: update stackage and hackage
parents 92f9580a fe177468

maintainers/scripts/haskell/hydra-report.hs

+25 −20
Original line number Diff line number Diff line
@@ -112,7 +112,8 @@ main = do 
      ["get-report"] -> getBuildReports

      ["ping-maintainers"] -> printMaintainerPing

      ["mark-broken-list"] -> printMarkBrokenList

      _ -> putStrLn "Usage: get-report | ping-maintainers | mark-broken-list"

      ["eval-info"] -> printEvalInfo

      _ -> putStrLn "Usage: get-report | ping-maintainers | mark-broken-list | eval-info"



reportFileName :: IO FilePath

reportFileName = getXdgDirectory XdgCache "haskell-updates-build-report.json"
@@ -396,12 +397,22 @@ jobTotals (summaryBuilds -> Table mapping) = getSum <$> Table (Map.foldMapWithKe 
details :: Text -> [Text] -> [Text]

details summary content = ["<details><summary>" <> summary <> " </summary>", ""] <> content <> ["</details>", ""]



evalLine :: Eval -> UTCTime -> Text

evalLine Eval{id, jobsetevalinputs = JobsetEvalInputs{nixpkgs = Nixpkgs{revision}}} fetchTime =

  "*evaluation ["

   <> showT id

   <> "](https://hydra.nixos.org/eval/"

   <> showT id

   <> ") of nixpkgs commit ["

   <> Text.take 7 revision

   <> "](https://github.com/NixOS/nixpkgs/commits/"

   <> revision

   <> ") as of "

   <> Text.pack (formatTime defaultTimeLocale "%Y-%m-%d %H:%M UTC" fetchTime)

   <> "*"



printBuildSummary :: Eval -> UTCTime -> StatusSummary -> [(Text, Int)] -> Text

printBuildSummary

   Eval{id, jobsetevalinputs = JobsetEvalInputs{nixpkgs = Nixpkgs{revision}}}

   fetchTime

   summary

   topBrokenRdeps =

printBuildSummary eval@Eval{id} fetchTime summary topBrokenRdeps =

      Text.unlines $

         headline <> [""] <> tldr <> (("  * "<>) <$> (errors <> warnings)) <> [""]

            <> totals
@@ -416,25 +427,14 @@ printBuildSummary 
            <> footer

     where

      footer = ["*Report generated with [maintainers/scripts/haskell/hydra-report.hs](https://github.com/NixOS/nixpkgs/blob/haskell-updates/maintainers/scripts/haskell/hydra-report.hs)*"]

      headline =

        [ "### [haskell-updates build report from hydra](https://hydra.nixos.org/jobset/nixpkgs/haskell-updates)"

        , evalLine eval fetchTime ]

      totals =

         [ "#### Build summary"

         , ""

         ]

            <> printTable "Platform" (\x -> makeSearchLink id (platform x <> " " <> platformIcon x) ("." <> platform x)) (\x -> showT x <> " " <> icon x) showT numSummary

      headline =

         [ "### [haskell-updates build report from hydra](https://hydra.nixos.org/jobset/nixpkgs/haskell-updates)"

         , "*evaluation ["

            <> showT id

            <> "](https://hydra.nixos.org/eval/"

            <> showT id

            <> ") of nixpkgs commit ["

            <> Text.take 7 revision

            <> "](https://github.com/NixOS/nixpkgs/commits/"

            <> revision

            <> ") as of "

            <> Text.pack (formatTime defaultTimeLocale "%Y-%m-%d %H:%M UTC" fetchTime)

            <> "*"

         ]

      brokenLine (name, rdeps) = "[" <> name <> "](https://packdeps.haskellers.com/reverse/" <> name <> ") :arrow_heading_up: " <> Text.pack (show rdeps) <> "  "

      numSummary = statusToNumSummary summary

      jobsByState predicate = Map.filter (predicate . worstState) summary
@@ -469,6 +469,11 @@ printBuildSummary 
      maintainedJob = Map.lookup "maintained" summary

      mergeableJob = Map.lookup "mergeable" summary



printEvalInfo :: IO ()

printEvalInfo = do

   (eval, fetchTime, _) <- readBuildReports

   putStrLn (Text.unpack $ evalLine eval fetchTime)



printMaintainerPing :: IO ()

printMaintainerPing = do

   (maintainerMap, (reverseDependencyMap, topBrokenRdeps)) <- concurrently getMaintainerMap do

maintainers/scripts/haskell/mark-broken.sh

+4 −1
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ clear="env -u HOME -u NIXPKGS_CONFIG" 
$clear maintainers/scripts/haskell/regenerate-hackage-packages.sh

$clear maintainers/scripts/haskell/regenerate-transitive-broken-packages.sh

$clear maintainers/scripts/haskell/regenerate-hackage-packages.sh

evalline=$(maintainers/scripts/haskell/hydra-report.hs eval-info)



if [[ "${1:-}" == "--do-commit" ]]; then

git add $broken_config
@@ -42,6 +43,8 @@ git add pkgs/development/haskell-modules/hackage-packages.nix 
git commit -F - << EOF

haskellPackages: mark builds failing on hydra as broken



This commit has been generated by maintainers/scripts/haskell/mark-broken.sh

This commit has been generated by maintainers/scripts/haskell/mark-broken.sh based on

$evalline

from the haskell-updates jobset on hydra under https://hydra.nixos.org/jobset/nixpkgs/haskell-updates

EOF

fi

pkgs/data/misc/hackage/pin.json

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

  "commit": "9f677e1d2267621375d22e3f6c1a25246678be4c",

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

  "sha256": "0y2mbj8dwfgdz5pzdq682clab10xgnqlrfv1najx53yy5jf63pcv",

  "msg": "Update from Hackage at 2023-01-06T18:29:38Z"

  "commit": "39a6ef760cb2f514e170dc40e7ec1f7699722e7d",

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

  "sha256": "1s9w4g4dar9blr3vvy9pf18qxcgyvrrdnc65jrkx75gr9dr3247w",

  "msg": "Update from Hackage at 2023-01-08T15:35:40Z"

}

pkgs/development/haskell-modules/configuration-common.nix

+4 −4
Original line number Diff line number Diff line
@@ -2095,10 +2095,6 @@ self: super: { 
  # https://github.com/zellige/hs-geojson/issues/29

  geojson = dontCheck super.geojson;



  # Test suite doesn't compile

  # https://github.com/erebe/wstunnel/issues/145

  wstunnel = dontCheck super.wstunnel;



  # Test data missing from sdist

  # https://github.com/ngless-toolkit/ngless/issues/152

  NGLess = dontCheck super.NGLess;
@@ -2319,4 +2315,8 @@ self: super: { 
    revision = null;

    editedCabalFile = null;

  }) super.true-name);



  # posix-api has had broken tests since 2020 (until at least 2023-01-11)

  # raehik has a fix pending: https://github.com/andrewthad/posix-api/pull/14

  posix-api = dontCheck super.posix-api;

} // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super

pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix

+1 −1
Original line number Diff line number Diff line
@@ -181,7 +181,7 @@ in { 
  ghc-exactprint = overrideCabal (drv: {

    libraryHaskellDepends = with self; [ HUnit data-default fail filemanip free ghc-paths ordered-containers silently syb Diff ];

  })

    self.ghc-exactprint_1_6_1;

    self.ghc-exactprint_1_6_1_1;



  # 2022-10-06: plugins disabled for hls 1.8.0.0 based on

  # https://haskell-language-server.readthedocs.io/en/latest/support/plugin-support.html#current-plugin-support-tiers