7deabb8c8d
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
31 lines
866 B
Nix
31 lines
866 B
Nix
# This overlay is used to make TVL-specific modifications in the
|
|
# nixpkgs tree, where required.
|
|
{ ... }:
|
|
|
|
self: super: {
|
|
# Required for apereo-cas
|
|
# TODO(lukegb): Document why?
|
|
gradle_6 = (super.gradleGen.override {
|
|
java = self.jdk11;
|
|
jdk = self.jdk11;
|
|
}).gradleGen rec {
|
|
name = "gradle-6.5.1";
|
|
nativeVersion = "0.22-milestone-3";
|
|
|
|
src = builtins.fetchurl {
|
|
url = "https://services.gradle.org/distributions/${name}-bin.zip";
|
|
sha256 = "0jmmipjh4fbsn92zpifa5cqg5ws2a4ha0s4jzqhrg4zs542x79sh";
|
|
};
|
|
};
|
|
|
|
# Use LLVM 11
|
|
llvmPackages = self.llvmPackages_11;
|
|
clangStdenv = self.llvmPackages_11.stdenv;
|
|
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;
|
|
}
|