From 698a614ea07fa930355b2da52a001e6a0fcf9398 Mon Sep 17 00:00:00 2001 From: Malte Brandy Date: Fri, 24 Jul 2020 11:42:51 +0200 Subject: [PATCH] haskelllPackages.dependent-sum-aeson-orphans: apply patch to fix build --- pkgs/development/haskell-modules/configuration-common.nix | 7 +++++++ .../haskell-modules/configuration-hackage2nix.yaml | 1 - pkgs/development/haskell-modules/hackage-packages.nix | 2 -- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index a8d1d01f9540..92838d772d94 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1407,4 +1407,11 @@ self: super: { # The current LTS 15.x version has a bug in the test suite. streaming-commons = self.streaming-commons_0_2_2_1; + # Version bumps have not been merged by upstream yet. + # https://github.com/obsidiansystems/dependent-sum-aeson-orphans/pull/5 + dependent-sum-aeson-orphans = appendPatch super.dependent-sum-aeson-orphans (pkgs.fetchpatch { + url = "https://github.com/obsidiansystems/dependent-sum-aeson-orphans/commit/5a369e433ad7e3eef54c7c3725d34270f6aa48cc.patch"; + sha256 = "1lzrcicvdg77hd8j2fg37z19amp5yna5xmw1fc06zi0j95csll4r"; + }); + } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index 76e1b780f62c..9ac813052fd3 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -4355,7 +4355,6 @@ broken-packages: - dependent-hashmap - dependent-monoidal-map - dependent-state - - dependent-sum-aeson-orphans - depends - dephd - deptrack-core diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 15f0aeffc066..246c967e6677 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -70629,8 +70629,6 @@ self: { ]; description = "JSON instances for DSum, DMap, and Some"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "dependent-sum-template" = callPackage