summary refs log tree commit diff
path: root/pkgs/development/haskell-modules
diff options
context:
space:
mode:
authorMalte Brandy <malte.brandy@maralorn.de>2020-07-24 11:42:51 +0200
committerMalte Brandy <malte.brandy@maralorn.de>2020-07-24 13:38:36 +0200
commit698a614ea07fa930355b2da52a001e6a0fcf9398 (patch)
tree569af1c14ca435c4f2e26ae21d6ba475d588600c /pkgs/development/haskell-modules
parent0351afda02afa77a509f6dff064b61d178c0e4ba (diff)
downloadnixpkgs-698a614ea07fa930355b2da52a001e6a0fcf9398.tar
nixpkgs-698a614ea07fa930355b2da52a001e6a0fcf9398.tar.gz
nixpkgs-698a614ea07fa930355b2da52a001e6a0fcf9398.tar.bz2
nixpkgs-698a614ea07fa930355b2da52a001e6a0fcf9398.tar.lz
nixpkgs-698a614ea07fa930355b2da52a001e6a0fcf9398.tar.xz
nixpkgs-698a614ea07fa930355b2da52a001e6a0fcf9398.tar.zst
nixpkgs-698a614ea07fa930355b2da52a001e6a0fcf9398.zip
haskelllPackages.dependent-sum-aeson-orphans: apply patch to fix build
Diffstat (limited to 'pkgs/development/haskell-modules')
-rw-r--r--pkgs/development/haskell-modules/configuration-common.nix7
-rw-r--r--pkgs/development/haskell-modules/configuration-hackage2nix.yaml1
-rw-r--r--pkgs/development/haskell-modules/hackage-packages.nix2
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 a8d1d01f954..92838d772d9 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 76e1b780f62..9ac813052fd 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 15f0aeffc06..246c967e667 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