chore(3p): Bump channels to 2021-04-09

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
This commit is contained in:
Vincent Ambo 2021-04-07 14:34:13 +02:00 committed by tazjin
parent 9073ac18c4
commit 7deabb8c8d
11 changed files with 25 additions and 389 deletions

View file

@ -3,17 +3,8 @@
(pkgs.grpc.override {
protobuf = depot.third_party.protobuf;
stdenv = pkgs.llvmPackages.libcxxStdenv;
abseil-cpp = depot.third_party.abseil_cpp;
}).overrideAttrs(orig: rec {
version = "1.30.0";
src = pkgs.fetchFromGitHub {
owner = "grpc";
repo = "grpc";
rev = "v${version}";
sha256 = "01w5jdp318i7ncxbkfv75q0mf0rd3qwfr1ycdd3850nv6mprv7n0";
fetchSubmodules = true;
};
cmakeFlags = orig.cmakeFlags ++ [
"-DCMAKE_CXX_STANDARD=17"
"-DCMAKE_CXX_STANDARD_REQUIRED=ON"

View file

@ -27,7 +27,7 @@ ABSL_FLAG(bool, pipe, false, "Use pipes for daemon communication");
namespace nix::daemon {
using grpc::Server;
using grpc_impl::ServerBuilder;
using grpc::ServerBuilder;
namespace {

View file

@ -13,16 +13,16 @@ let
# nixos-unstable, and the current stable channel of the latest NixOS
# release.
# Tracking nixos-unstable as of 2021-03-25.
# Tracking nixos-unstable as of 2021-04-09.
unstableHashes = {
commit = "60dd94fb7e01a8288f6638eee71d7cb354c49327";
sha256 = "0skdwk9bdld295kzrymirs8xrzycqmhsclaz8s18jhcz75hb8sk3";
commit = "9e377a6ce42dccd9b624ae4ce8f978dc892ba0e2";
sha256 = "1r3ll77hyqn28d9i4cf3vqd9v48fmaa1j8ps8c4fm4f8gqf4kpl1";
};
# Tracking nixos-20.09 as of 2021-03-25.
# Tracking nixos-20.09 as of 2021-04-09.
stableHashes = {
commit = "223d0d733a66b46504ea6b4c15f88b7cc4db58fb";
sha256 = "073327ris0frqa3kpid3nsjr9w8yx2z83xpsc24w898mrs9r7d5v";
commit = "d6f63659a7021051a46035373ed50fbea7e4e924";
sha256 = "0vblhzg57sfzqpdm24lgs08vjv2204lzcp6hv4cbjd20rz0mxs4y";
};
# import the nixos-unstable package set, or optionally use the

View file

@ -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 {

View file

@ -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;
}