about summary refs log tree commit diff
path: root/third_party/nixpkgs-exposed/haskell_overlay
diff options
context:
space:
mode:
authorVincent Ambo <mail@tazj.in>2021-04-10T12·12+0200
committertazjin <mail@tazj.in>2021-04-10T15·23+0000
commite6d1e68f4add807b94173788b9e53da98b4e255b (patch)
treefa2bbb6eccc0d1b09e12d8772129c21d7a04bce0 /third_party/nixpkgs-exposed/haskell_overlay
parent6489d94ad60c431d27836a0bc65953e44175b262 (diff)
refactor(3p/overlays): Move haskell overlay to new tree location r/2466
nixpkgs_exposed is going away, and the haskell overlay is independent
from that.

See also b/108, cl/2910

Change-Id: I3aea6dfc427a914f3f88146fd0b45d60dfd45a1a
Reviewed-on: https://cl.tvl.fyi/c/depot/+/2918
Tested-by: BuildkiteCI
Reviewed-by: sterni <sternenseemann@systemli.org>
Diffstat (limited to 'third_party/nixpkgs-exposed/haskell_overlay')
-rw-r--r--third_party/nixpkgs-exposed/haskell_overlay/default.nix30
-rw-r--r--third_party/nixpkgs-exposed/haskell_overlay/patches/generic-arbitrary-export-garbitrary.patch12
2 files changed, 0 insertions, 42 deletions
diff --git a/third_party/nixpkgs-exposed/haskell_overlay/default.nix b/third_party/nixpkgs-exposed/haskell_overlay/default.nix
deleted file mode 100644
index 9b025d7d2828..000000000000
--- a/third_party/nixpkgs-exposed/haskell_overlay/default.nix
+++ /dev/null
@@ -1,30 +0,0 @@
-{ pkgs }:
-
-self: super: with pkgs.haskell.lib; rec {
-  generic-arbitrary = appendPatch
-    super.generic-arbitrary
-    [ ./patches/generic-arbitrary-export-garbitrary.patch ];
-
-  random = dontCheck (self.callHackageDirect {
-    pkg = "random";
-    ver = "1.2.0";
-    sha256 = "06s3mmqbsfwv09j2s45qnd66nrxfp9280gnl9ng8yh128pfr7bjh";
-  } {});
-
-  # random <1.2
-  test-framework = doJailbreak super.test-framework;
-  hashable = doJailbreak super.hashable;
-  test-framework-quickcheck2 = doJailbreak super.test-framework-quickcheck2;
-
-  # can be removed if we have the following PR or equivalent
-  # https://github.com/NixOS/nixpkgs/pull/116931
-  hedgehog-classes = overrideCabal super.hedgehog-classes (attrs: {
-    # remove version bound on semirings which is inside a
-    # conditional, so doJailbreak doesn't work
-    prePatch = ''
-      sed -i 's|semirings.*0.6|semirings|g' hedgehog-classes.cabal
-    '';
-  });
-
-  hgeometry-combinatorial = dontCheck super.hgeometry-combinatorial;
-}
diff --git a/third_party/nixpkgs-exposed/haskell_overlay/patches/generic-arbitrary-export-garbitrary.patch b/third_party/nixpkgs-exposed/haskell_overlay/patches/generic-arbitrary-export-garbitrary.patch
deleted file mode 100644
index f0c936bfca18..000000000000
--- a/third_party/nixpkgs-exposed/haskell_overlay/patches/generic-arbitrary-export-garbitrary.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/src/Test/QuickCheck/Arbitrary/Generic.hs b/src/Test/QuickCheck/Arbitrary/Generic.hs
-index fed6ab3..91f59f1 100644
---- a/src/Test/QuickCheck/Arbitrary/Generic.hs
-+++ b/src/Test/QuickCheck/Arbitrary/Generic.hs
-@@ -23,6 +23,7 @@ The generated 'arbitrary' method is equivalent to
- 
- module Test.QuickCheck.Arbitrary.Generic
-   ( Arbitrary(..)
-+  , GArbitrary
-   , genericArbitrary
-   , genericShrink
-   ) where