about summary refs log tree commit diff
path: root/third_party/overlays
diff options
context:
space:
mode:
authorVincent Ambo <mail@tazj.in>2021-04-07T12·34+0200
committertazjin <mail@tazj.in>2021-04-11T22·13+0000
commit7deabb8c8d6f4c7e58e2b16548b8a1895795963b (patch)
treec7b55b5ec32d9c1e45ca3b4f33ef14d2cf82265f /third_party/overlays
parent9073ac18c48f2bcefc736839d6faf76a462bf433 (diff)
chore(3p): Bump channels to 2021-04-09 r/2481
Fixes included:

* exposed gtest in the package set, required for protobuf
* pinned SBCL to version 2.0.8: The channel moved it to >2.1, and a
  bunch of warnings seemed to be killing our builds - we should
  investigate this later.
* removed kernel patches from //users/tazjin/frog: this machine is
  currently out of service anyways, not worth fixing while it's offline
* removed steam & lutris from frog (they're currently broken)
* removed Haskell overrides for hedgehog-classes & hgeometry-combinatorial
* use gRPC sources from upstream and inject Abseil via Nix instead
* fix for renamed grpc import in //third_party/nix
* use libfprint-tod from upstream nixpkgs in glittershark/yeren and
  delete glittershark/pkgs/fprintd entirely, since all of the patches used
  there are available and working from upstream now (and stopped working
  here after the bump)

Change-Id: Ia90e6f774f7b88bc9e60d28351b900ca43ee2695
Reviewed-on: https://cl.tvl.fyi/c/depot/+/2901
Reviewed-by: glittershark <grfn@gws.fyi>
Reviewed-by: tazjin <mail@tazj.in>
Reviewed-by: sterni <sternenseemann@systemli.org>
Reviewed-by: lukegb <lukegb@tvl.fyi>
Tested-by: BuildkiteCI
Diffstat (limited to 'third_party/overlays')
-rw-r--r--third_party/overlays/haskell/default.nix12
-rw-r--r--third_party/overlays/tvl.nix4
2 files changed, 4 insertions, 12 deletions
diff --git a/third_party/overlays/haskell/default.nix b/third_party/overlays/haskell/default.nix
index 16c250f82004..45681194acc6 100644
--- a/third_party/overlays/haskell/default.nix
+++ b/third_party/overlays/haskell/default.nix
@@ -20,18 +20,6 @@ let
     hashable = doJailbreak hsSuper.hashable;
     test-framework-quickcheck2 = doJailbreak hsSuper.test-framework-quickcheck2;
     pandoc = doJailbreak hsSuper.pandoc;
-
-    # can be removed if we have the following PR or equivalent
-    # https://github.com/NixOS/nixpkgs/pull/116931
-    hedgehog-classes = overrideCabal hsSuper.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 hsSuper.hgeometry-combinatorial;
   };
 in {
   haskellPackages = super.haskellPackages.override {
diff --git a/third_party/overlays/tvl.nix b/third_party/overlays/tvl.nix
index 01f7156ff19b..6c182df7d481 100644
--- a/third_party/overlays/tvl.nix
+++ b/third_party/overlays/tvl.nix
@@ -24,4 +24,8 @@ self: super: {
   clang-tools = (super.clang-tools.override {
     llvmPackages = self.llvmPackages_11;
   });
+
+  # Pick an older version of SBCL as the default, to avoid issues with
+  # warnings in newer SBCL.
+  sbcl = super.sbcl_2_0_8;
 }