Unverified Commit f8012b80 authored by Naïm Favier's avatar Naïm Favier Committed by GitHub
Browse files

Merge pull request #268652 from NixOS/haskell-updates 

haskellPackages: update stackage and hackage
parents 216b111f 4e40a200

maintainers/scripts/haskell/hydra-report.hs

+18 −18
Original line number Diff line number Diff line
@@ -382,22 +382,22 @@ data BuildState 


icon :: BuildState -> Text

icon = \case

   Failed -> ":x:"

   DependencyFailed -> ":heavy_exclamation_mark:"

   OutputLimitExceeded -> ":warning:"

   Failed -> "❌"

   DependencyFailed -> "❗"

   OutputLimitExceeded -> "⚠️"

   Unknown x -> "unknown code " <> showT x

   TimedOut -> ":hourglass::no_entry_sign:"

   Canceled -> ":no_entry_sign:"

   Unfinished -> ":hourglass_flowing_sand:"

   HydraFailure -> ":construction:"

   Success -> ":heavy_check_mark:"

   TimedOut -> "⌛🚫"

   Canceled -> "🚫"

   Unfinished -> "⏳"

   HydraFailure -> "🚧"

   Success -> "✅"



platformIcon :: Platform -> Text

platformIcon (Platform x) = case x of

   "x86_64-linux" -> ":penguin:"

   "aarch64-linux" -> ":iphone:"

   "x86_64-darwin" -> ":apple:"

   "aarch64-darwin" -> ":green_apple:"

   "x86_64-linux" -> "🐧"

   "aarch64-linux" -> "📱"

   "x86_64-darwin" -> "🍎"

   "aarch64-darwin" -> "🍏"

   _ -> x



platformIsOS :: OS -> Platform -> Bool
@@ -626,7 +626,7 @@ printBuildSummary eval@Eval{id} fetchTime summary topBrokenRdeps = 
         <> optionalHideableList "#### Unmaintained packages with failed dependency" (unmaintainedList (failedDeps summary))

         <> optionalHideableList "#### Unmaintained packages with unknown error" (unmaintainedList (unknownErr summary))

         <> optionalHideableList "#### Top 50 broken packages, sorted by number of reverse dependencies" (brokenLine <$> topBrokenRdeps)

         <> ["","*:arrow_heading_up:: The number of packages that depend (directly or indirectly) on this package (if any). If two numbers are shown the first (lower) number considers only packages which currently have enabled hydra jobs, i.e. are not marked broken. The second (higher) number considers all packages.*",""]

         <> ["","*⤴️: The number of packages that depend (directly or indirectly) on this package (if any). If two numbers are shown the first (lower) number considers only packages which currently have enabled hydra jobs, i.e. are not marked broken. The second (higher) number considers all packages.*",""]

         <> 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)*"]
@@ -651,7 +651,7 @@ printBuildSummary eval@Eval{id} fetchTime summary topBrokenRdeps = 
   brokenLine :: (PkgName, Int) -> Text

   brokenLine (PkgName name, rdeps) =

      "[" <> name <> "](https://packdeps.haskellers.com/reverse/" <> name <>

      ") :arrow_heading_up: " <> Text.pack (show rdeps) <> "  "

      ") ⤴️ " <> Text.pack (show rdeps) <> "  "



   numSummary = statusToNumSummary summary
@@ -733,7 +733,7 @@ printBuildSummary eval@Eval{id} fetchTime summary topBrokenRdeps = 
         , Text.pack

            ( if summaryReverseDeps entry > 0

               then

                  " :arrow_heading_up: " <> show (summaryUnbrokenReverseDeps entry) <>

                  " ⤴️ " <> show (summaryUnbrokenReverseDeps entry) <>

                  " | " <> show (summaryReverseDeps entry)

               else ""

            )
@@ -750,9 +750,9 @@ printBuildSummary eval@Eval{id} fetchTime summary topBrokenRdeps = 
         )



   tldr = case (errors, warnings) of

            ([],[]) -> [":green_circle: **Ready to merge** (if there are no [evaluation errors](https://hydra.nixos.org/jobset/nixpkgs/haskell-updates))"]

            ([],_) -> [":yellow_circle: **Potential issues** (and possibly [evaluation errors](https://hydra.nixos.org/jobset/nixpkgs/haskell-updates))"]

            _ -> [":red_circle: **Branch not mergeable**"]

            ([],[]) -> ["🟢 **Ready to merge** (if there are no [evaluation errors](https://hydra.nixos.org/jobset/nixpkgs/haskell-updates))"]

            ([],_) -> ["🟡 **Potential issues** (and possibly [evaluation errors](https://hydra.nixos.org/jobset/nixpkgs/haskell-updates))"]

            _ -> ["🔴 **Branch not mergeable**"]

   warnings =

      if' (Unfinished > maybe Success worstState maintainedJob) "`maintained` jobset failed." <>

      if' (Unfinished == maybe Success worstState mergeableJob) "`mergeable` jobset is not finished." <>

pkgs/data/misc/hackage/pin.json

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

  "commit": "f4111a737432472002a38495b14b930255705d6a",

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

  "sha256": "0q1nhk821fdwxmidsd9mnd77ml4c05f7rnmd80g4s876s65ldi5q",

  "msg": "Update from Hackage at 2023-11-10T11:27:19Z"

  "commit": "def4ad933fb86415a9802d7833369d12520e7744",

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

  "sha256": "0nfqz1mwzgvkkk22igq5jxfwfcc0l8i1ihlgxaixf2ip1qqlqzs6",

  "msg": "Update from Hackage at 2023-11-20T05:37:18Z"

}

pkgs/development/compilers/ghc/common-hadrian.nix

+8 −0
Original line number Diff line number Diff line
@@ -477,6 +477,14 @@ stdenv.mkDerivation ({ 
  preInstall = ''

    pushd _build/bindist/*



  ''

  # the bindist configure script uses different env variables than the GHC configure script

  # see https://github.com/NixOS/nixpkgs/issues/267250 and https://gitlab.haskell.org/ghc/ghc/-/issues/24211

  + lib.optionalString (stdenv.targetPlatform.linker == "cctools") ''

    export InstallNameToolCmd=$INSTALL_NAME_TOOL

    export OtoolCmd=$OTOOL

  ''

  + ''

    $configureScript $configureFlags "''${configureFlagsArray[@]}"

  '';

pkgs/development/compilers/ghc/head.nix

+3 −3
Original line number Diff line number Diff line 
import ./common-hadrian.nix {

  version = "9.9.20231014";

  rev = "13d3c613c3c1e4942c698449bdf58a6a13b76695";

  sha256 = "13xp4ijnym2qbw2qbxkvfb79l7034vrcm9j2j9kirbhjxzdshvx9";

  version = "9.9.20231121";

  rev = "955520c6c4f07187b6d5e4770ecf681cc78374f2";

  sha256 = "0pv77khciv513aw64pfac5p60xn5z90rxl84dcalj6knmbhm8dqy";

}

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

+18 −17
Original line number Diff line number Diff line
@@ -121,22 +121,24 @@ self: super: { 
  # For -f-auto see cabal.project in haskell-language-server.

  ghc-lib-parser-ex = addBuildDepend self.ghc-lib-parser (disableCabalFlag "auto" super.ghc-lib-parser-ex);



  hiedb =

    lib.pipe

      super.hiedb

      [

        # hiedb-0.4.3.0 does not yet support algebraic-graphs-0.7.  This patch works

        # around the issue.

        # https://github.com/wz1000/HieDb/pull/44

        (appendPatch

          (pkgs.fetchpatch {

            name = "hiedb-algebraic-graphs-0.7.patch";

            url = "https://github.com/wz1000/HieDB/commit/4ac8e6735321872b9d5d15a9cac492add5555234.patch";

            hash = "sha256-Iu+M8r+DrpoxUCG6yekgbW+GffoNjjRksnwUJ6jojhE=";

          }))

        # Patch does not actually bump the bound in the .cabal file.

        doJailbreak

      ];

  # 2023-12-03: https://github.com/haskell/haskell-language-server/pull/3867

  hls-plugin-api = appendPatch (fetchpatch {

    url = "https://github.com/haskell/haskell-language-server/commit/1c884ea856cceeaa3254a2ef68c8ab3a3c353153.patch";

    relative = "hls-plugin-api";

    hash = "sha256-vlXPdEvmuIl+cM+u/GdHi8r72r4+Tqtsvx0CGbWEFCQ=";

  }) (doJailbreak super.hls-plugin-api);

  ghcide = appendPatch (fetchpatch {

    url = "https://github.com/haskell/haskell-language-server/commit/1c884ea856cceeaa3254a2ef68c8ab3a3c353153.patch";

    relative = "ghcide";

    hash = "sha256-1URXyQf88v3hjFGvNmcIjHxJ5vExH3iI92XktDrQs0U=";

  }) (doJailbreak super.ghcide);

  hls-test-utils = doJailbreak super.hls-test-utils;

  hls-alternate-number-format-plugin = doJailbreak super.hls-alternate-number-format-plugin;

  hls-cabal-plugin = doJailbreak super.hls-cabal-plugin;

  hls-call-hierarchy-plugin = doJailbreak super.hls-call-hierarchy-plugin;

  hls-explicit-fixity-plugin = doJailbreak super.hls-explicit-fixity-plugin;

  hls-floskell-plugin = doJailbreak super.hls-floskell-plugin;

  hls-gadt-plugin = doJailbreak super.hls-gadt-plugin;



  ###########################################

  ### END HASKELL-LANGUAGE-SERVER SECTION ###
@@ -484,7 +486,6 @@ self: super: { 
  # Too strict bounds on algebraic-graphs and bytestring

  # https://github.com/haskell-nix/hnix-store/issues/180

  hnix-store-core = doJailbreak super.hnix-store-core;

  hnix-store-core_0_6_1_0 = doDistribute (doJailbreak super.hnix-store-core_0_6_1_0);



  # Fails for non-obvious reasons while attempting to use doctest.

  focuslist = dontCheck super.focuslist;