0eee1eaf51
nixpkgs has upgraded to SBCL 2.1.9 in the meantime, so dropping the override will ensure that we keep pace with upstream going forward, instead of ending up with an out-of-date SBCL. Change-Id: I5e04532d5ef653de4ec083deee9c9a72522daaf1 Reviewed-on: https://cl.tvl.fyi/c/depot/+/3881 Tested-by: BuildkiteCI Reviewed-by: tazjin <mail@tazj.in>
59 lines
1.8 KiB
Nix
59 lines
1.8 KiB
Nix
# This overlay is used to make TVL-specific modifications in the
|
|
# nixpkgs tree, where required.
|
|
{ depot, ... }:
|
|
|
|
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";
|
|
};
|
|
};
|
|
|
|
clang-tools_11 = self.clang-tools.override {
|
|
llvmPackages = self.llvmPackages_11;
|
|
};
|
|
|
|
# stdenv which uses clang, lld and libc++; full is a slight exaggeration,
|
|
# we for example don't use LLVM's libunwind
|
|
fullLlvm11Stdenv = self.overrideCC self.stdenv
|
|
(self.llvmPackages_11.libcxxStdenv.cc.override {
|
|
inherit (self.llvmPackages_11) bintools;
|
|
});
|
|
|
|
# Add our Emacs packages to the fixpoint
|
|
emacsPackagesFor = emacs: (
|
|
(super.emacsPackagesFor emacs).overrideScope' (eself: esuper: {
|
|
tvlPackages = depot.tools.emacs-pkgs // depot.third_party.emacs;
|
|
|
|
# Use the notmuch from nixpkgs instead of from the Emacs
|
|
# overlay, to avoid versions being out of sync.
|
|
notmuch = super.notmuch.emacs;
|
|
|
|
# Build EXWM with the depot sources instead.
|
|
exwm = esuper.exwm.overrideAttrs(_: {
|
|
src = "${depot.path + "/third_party/exwm"}";
|
|
});
|
|
})
|
|
);
|
|
|
|
# dottime support for notmuch
|
|
notmuch = super.notmuch.overrideAttrs(old: {
|
|
passthru = old.passthru // {
|
|
patches = old.patches ++ [ ./patches/notmuch-dottime.patch ];
|
|
};
|
|
});
|
|
|
|
# Fix Steam issues with web views (nixpkgs#137279)
|
|
steam = super.steam.override {
|
|
extraPkgs = pkgs: with pkgs; [ pango harfbuzz libthai ];
|
|
};
|
|
}
|