Unverified Commit 913d0dba authored by maralorn's avatar maralorn Committed by GitHub
Browse files

Merge pull request #311547 from alexfmpe/aeson-gadt-th 

 haskellPackages.aeson-gadt-th: fix build
parents a19ebddb 5da3c0c3

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

+13 −0
Original line number Diff line number Diff line
@@ -2619,6 +2619,19 @@ self: super: { 
    hash = "sha256-Pzjl2yp01XsYWcyhpLnsuccg7bOACgv+RpafauUox8c=";

  }) super.dependent-sum-aeson-orphans;



  # https://github.com/obsidiansystems/dependent-sum/pull/73

  dependent-sum-template = appendPatch (fetchpatch {

    url = "https://github.com/obsidiansystems/dependent-sum/commit/619727ba1792e39a68d23c62e75a923672e87a54.patch";

    hash = "sha256-SyD1/KrX1KUjrR82fvI+BRcqLC2Q3AbvSeKNrdGstjg=";

    relative = "dependent-sum-template";

  }) super.dependent-sum-template;



  aeson-gadt-th = appendPatch (fetchpatch {

    url = "https://github.com/obsidiansystems/aeson-gadt-th/commit/8f6922a6440019dece637d73d70766c473bcd6c0.patch";

    hash = "sha256-564DhfiubwNV8nAj8L5DzsWn4MdzqqaYYNmOSPUa7ys=";

    excludes = [ ".github/**" ];

  }) super.aeson-gadt-th;



  # Too strict bounds on chell: https://github.com/fpco/haskell-filesystem/issues/24

  system-fileio = doJailbreak super.system-fileio;

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

+1 −1
Original line number Diff line number Diff line
@@ -88,7 +88,7 @@ self: super: { 
  #

  blaze-svg = doJailbreak super.blaze-svg; # base <4.19

  commutative-semigroups = doJailbreak super.commutative-semigroups; # base < 4.19

  dependent-sum-template_0_2_0_1 = doJailbreak super.dependent-sum-template_0_2_0_1; # template-haskell < 2.21

  dependent-sum-template = doJailbreak super.dependent-sum-template_0_2_0_1; # template-haskell < 2.21

  diagrams-lib = doJailbreak super.diagrams-lib; # base <4.19, text <2.1

  diagrams-postscript = doJailbreak super.diagrams-postscript;  # base <4.19, bytestring <0.12

  diagrams-svg = doJailbreak super.diagrams-svg;  # base <4.19, text <2.1

pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml

+0 −1
Original line number Diff line number Diff line
@@ -83,7 +83,6 @@ broken-packages: 
  - aeson-flat # failure in job https://hydra.nixos.org/build/233220787 at 2023-09-02

  - aeson-flatten # failure in job https://hydra.nixos.org/build/233242954 at 2023-09-02

  - aeson-flowtyped # failure in job https://hydra.nixos.org/build/233245878 at 2023-09-02

  - aeson-gadt-th # failure in job https://hydra.nixos.org/build/233247060 at 2023-09-02

  - aeson-generics-typescript # failure in job https://hydra.nixos.org/build/245703304 at 2024-01-07

  - aeson-injector # failure in job https://hydra.nixos.org/build/233200351 at 2023-09-02

  - aeson-json-ast # failure in job https://hydra.nixos.org/build/233249406 at 2023-09-02

pkgs/development/haskell-modules/hackage-packages.nix

+0 −2
Original line number Diff line number Diff line
@@ -26539,9 +26539,7 @@ self: { 
       ];

       description = "Derivation of Aeson instances for GADTs";

       license = lib.licenses.bsd3;

       hydraPlatforms = lib.platforms.none;

       mainProgram = "readme";

       broken = true;

     }) {};















  "aeson-generic-compat" = callPackage