summary refs log tree commit diff
diff options
context:
space:
mode:
authorKosyrev Serge <serge.kosyrev@iohk.io>2018-03-12 04:56:05 +0300
committerPeter Simons <simons@cryp.to>2018-03-12 14:30:58 +0100
commit1278dba2bc5b12ceb47e3b7ec2629b4bc188c3fb (patch)
tree33f1b0174a4702d16f6ff597725bdd3e3af7efe6
parent86058acb2fa8a8392a84183599044ce9640cabd0 (diff)
downloadnixpkgs-1278dba2bc5b12ceb47e3b7ec2629b4bc188c3fb.tar
nixpkgs-1278dba2bc5b12ceb47e3b7ec2629b4bc188c3fb.tar.gz
nixpkgs-1278dba2bc5b12ceb47e3b7ec2629b4bc188c3fb.tar.bz2
nixpkgs-1278dba2bc5b12ceb47e3b7ec2629b4bc188c3fb.tar.lz
nixpkgs-1278dba2bc5b12ceb47e3b7ec2629b4bc188c3fb.tar.xz
nixpkgs-1278dba2bc5b12ceb47e3b7ec2629b4bc188c3fb.tar.zst
nixpkgs-1278dba2bc5b12ceb47e3b7ec2629b4bc188c3fb.zip
ghc841: bv fix released
-rw-r--r--pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix21
1 files changed, 6 insertions, 15 deletions
diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
index db531f4795d..ea0af92460a 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
@@ -50,9 +50,12 @@ self: super: {
   ## Shadowed:
 
   ## Needs bump to a versioned attribute
-  ##     • Could not deduce (Semigroup (Dict a))
+  ##     • No instance for (GHC.Base.Semigroup BV)
   ##         arising from the superclasses of an instance declaration
-  ##       from the context: a
+  ##     • In the instance declaration for ‘Monoid BV’
+  bv = super.bv_0_5;
+
+  ## Needs bump to a versioned attribute
   constraints = super.constraints_0_10;
 
   ## Needs bump to a versioned attribute
@@ -209,20 +212,8 @@ self: super: {
   });
 
 
-  ## Upstreamed
 
-  ## Upstreamed, awaiting a Hackage release
-  bv = overrideCabal super.bv (drv: {
-    ##     • No instance for (GHC.Base.Semigroup BV)
-    ##         arising from the superclasses of an instance declaration
-    ##     • In the instance declaration for ‘Monoid BV’
-    src = pkgs.fetchFromGitHub {
-      owner  = "iagoabal";
-      repo   = "haskell-bv";
-      rev    = "92932a75719020d6a8ac55c455e5c03a4304043f";
-      sha256 = "0fi4v9mpw5y9q1pm7lqhm2zazfyy921wpaa28125misix0frasfw";
-    };
-  });
+  ## Upstreamed
 
   ## Upstreamed, awaiting a Hackage release
   cabal2nix = (overrideCabal super.cabal2nix (drv: {