From 7fc032e5951b69de22b923e5bf64b0ca34c5b3e3 Mon Sep 17 00:00:00 2001 From: Dennis Gosnell Date: Mon, 11 Sep 2023 07:45:57 -0400 Subject: [PATCH] haskellPackages.aeson_2_2_0_0: get compiling Originally from https://github.com/NixOS/nixpkgs/pull/254189 --- .../haskell-modules/configuration-common.nix | 5 +++++ .../configuration-hackage2nix/main.yaml | 1 + .../haskell-modules/hackage-packages.nix | 15 +++++++++++++++ 3 files changed, 21 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 3411f2156150..6df27eaf6c57 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -201,6 +201,11 @@ self: super: { }) ] super.aeson); + # aeson 2.2.0.0 requires th-abstraction >= 0.5 & < 0.6 + aeson_2_2_0_0 = super.aeson_2_2_0_0.overrideScope (hfinal: hprev: { + th-abstraction = hfinal.th-abstraction_0_5_0_0; + }); + # 2023-06-28: Test error: https://hydra.nixos.org/build/225565149 orbits = dontCheck super.orbits; diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml index ca42d1227d4e..030ed98a6406 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml @@ -128,6 +128,7 @@ extra-packages: - sbv == 7.13 # required for pkgs.petrinizer - stylish-haskell == 0.14.3.0 # 2022-09-19: needed for hls on ghc 8.8 - tasty-hspec == 1.1.6 # 2022-04-07: Needed for elm-format + - th-abstraction < 0.6 # 2023-09-11: needed for aeson-2.2.0.0 - vty == 5.35.1 # 2022-07-08: needed for glirc-2.39.0.1 - weeder == 2.2.* # 2022-02-21: preserve for GHC 8.10.7 - weeder == 2.3.* # 2022-05-31: preserve for GHC 9.0.2 diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 1c5fa2c930f2..62521b8869e2 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -294881,6 +294881,21 @@ self: { license = lib.licenses.isc; }) {}; + "th-abstraction_0_5_0_0" = callPackage + ({ mkDerivation, base, containers, ghc-prim, template-haskell }: + mkDerivation { + pname = "th-abstraction"; + version = "0.5.0.0"; + sha256 = "0r4ri85283i1jjhd94wa9nps6cd9a8mh6rr4ds1gb2hqnwxdqn42"; + libraryHaskellDepends = [ + base containers ghc-prim template-haskell + ]; + testHaskellDepends = [ base containers template-haskell ]; + description = "Nicer interface for reified information about data types"; + license = lib.licenses.isc; + hydraPlatforms = lib.platforms.none; + }) {}; + "th-abstraction_0_6_0_0" = callPackage ({ mkDerivation, base, containers, ghc-prim, template-haskell }: mkDerivation {