about summary refs log tree commit diff
path: root/third_party/overlays/haskell
diff options
context:
space:
mode:
authorVincent Ambo <mail@tazj.in>2021-06-02T20·32+0200
committertazjin <mail@tazj.in>2021-06-05T16·54+0000
commitb4ae6893e4e9d6c809e83a1934a8feea5d6adf5b (patch)
treed18365d6474d7794bb40ede5477ac1fd66c1a80b /third_party/overlays/haskell
parent4e90a38875f51f9f264e0355c6084083b768e7e7 (diff)
chore(3p/nixpkgs): Bump channels to 2021-06-05 r/2648
Includes the following depot changes & fixes:

* stable moves to NixOS 21.05
* stable isn't used anymore (but we'll keep the mechanism)
* haskell overlay's `random` override is removed (YAY!)
* grfn/iso: Switch to regular kernel rather than
  latest kernel, as latest kernel is currently marked as broken due to zfs
* grfn/home: Use julia_16-bin temporarily
  julia 1.5 (current julia-stable, source built release in nixpkgs)
  doesn't pass its own test suite. Julia 1.6 doesn't have a source built
  package in nixpkgs yet, so julia_16-bin appears to be the only working
  julia derivation currently.
* tazjin/tverskoy: Use zfs unstable, as stable zfs doesn't work with the
  latest kernel

Co-Authored-By: Griffin Smith <grfn@gws.fyi>
Co-Authored-By: sterni <sternenseemann@systemli.org>
Change-Id: I6f2e3d9f75077e4755de6bde9104d44b584cbe4c
Reviewed-on: https://cl.tvl.fyi/c/depot/+/3174
Tested-by: BuildkiteCI
Reviewed-by: sterni <sternenseemann@systemli.org>
Reviewed-by: tazjin <mail@tazj.in>
Reviewed-by: grfn <grfn@gws.fyi>
Diffstat (limited to 'third_party/overlays/haskell')
-rw-r--r--third_party/overlays/haskell/default.nix10
1 files changed, 0 insertions, 10 deletions
diff --git a/third_party/overlays/haskell/default.nix b/third_party/overlays/haskell/default.nix
index 45681194acc6..d6a178a1e0bb 100644
--- a/third_party/overlays/haskell/default.nix
+++ b/third_party/overlays/haskell/default.nix
@@ -10,16 +10,6 @@ let
   overrides = hsSelf: hsSuper: with super.haskell.lib; rec {
     generic-arbitrary = appendPatch hsSuper.generic-arbitrary
       [ ./patches/generic-arbitrary-export-garbitrary.patch ];
-
-    # check dependencies cause circular dependency on itself
-    # and thus an infinite recursion
-    random = dontCheck hsSuper.random_1_2_0;
-
-    # random <1.2
-    test-framework = doJailbreak hsSuper.test-framework;
-    hashable = doJailbreak hsSuper.hashable;
-    test-framework-quickcheck2 = doJailbreak hsSuper.test-framework-quickcheck2;
-    pandoc = doJailbreak hsSuper.pandoc;
   };
 in {
   haskellPackages = super.haskellPackages.override {