tvl-depot/third_party/overlays/tvl.nix
Vincent Ambo b87af6ccaa chore(3p/overlays): remove unnecessary nixpkgs workarounds
These things were fixed upstream.

Change-Id: I027862aabd8239111c8e94aa5390af192386c4a1
Reviewed-on: https://cl.tvl.fyi/c/depot/+/9368
Tested-by: BuildkiteCI
Reviewed-by: Connor Brewster <cbrewster@hey.com>
Autosubmit: tazjin <tazjin@tvl.su>
2023-09-19 20:58:02 +00:00

128 lines
3.8 KiB
Nix

# This overlay is used to make TVL-specific modifications in the
# nixpkgs tree, where required.
{ depot, localSystem, ... }:
self: super:
let
# Rollback Nix to a stable version (2.3) with backports for
# build-user problems applied.
nixSrc =
let
# branch 2.3-backport-await-users
rev = "46a91f2abaee85135cbb447c13957d3c5e9091a9";
in
self.fetchFromGitHub
{
owner = "tvlfyi";
repo = "nix";
inherit rev;
hash = "sha256:0rwyrh471c5y64axyd8vzzzmzlscg97fsrjbgbm1a93wnzxcvnvk";
} // { revCount = 0; shortRev = builtins.substring 0 7 rev; };
nixTarball = (scopedImport
{
# The tarball job always uses currentSystem which we need to purify
builtins = builtins // { currentSystem = localSystem; };
}
"${nixSrc}/release.nix"
{
nix = nixSrc;
nixpkgs = self.path;
systems = [ ];
}
).tarball;
in
depot.nix.readTree.drvTargets {
nix_2_3 = super.nix_2_3.overrideAttrs (_: {
src = "${nixTarball}/tarballs/nix-${nixTarball.version}.tar.xz";
});
nix = self.nix_2_3;
nix_latest = super.nix;
# To match telega in emacs-overlay or wherever
tdlib = super.tdlib.overrideAttrs (_: {
version = "1.8.16";
src = self.fetchFromGitHub {
owner = "tdlib";
repo = "td";
rev = "cde095db6c75827fe4bd237039574aad373ad96b";
sha256 = "1zzacz2mhjmc36aqdc5v8a7zdi0mi7k8hnrnpj9gii061pm4vx4v";
};
});
home-manager = super.home-manager.overrideAttrs (_: {
src = depot.third_party.sources.home-manager;
version = "git-"
+ builtins.substring 0 7 depot.third_party.sources.home-manager.rev;
});
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.
depotExwm = esuper.exwm.overrideAttrs (_: {
src = depot.path.origSrc + "/third_party/exwm";
});
# Workaround for magit checking the git version at load time
magit = esuper.magit.overrideAttrs (_: {
propagatedNativeBuildInputs = [
self.git
];
});
})
);
# dottime support for notmuch
notmuch = super.notmuch.overrideAttrs (old: {
passthru = old.passthru // {
patches = old.patches ++ [ ./patches/notmuch-dottime.patch ];
};
});
# nix-serve does not work with nix 2.4
# https://github.com/edolstra/nix-serve/issues/28
nix-serve = super.nix-serve.override { nix = self.nix_2_3; };
# Avoid builds of mkShell derivations in CI.
mkShell = super.lib.makeOverridable (args: (super.mkShell args).overrideAttrs (_: {
passthru = {
meta.ci.skip = true;
};
}));
# Pin a newer version of crate2nix from git, which is not officially
# released but supports `dep:`
crate2nix = super.crate2nix.overrideAttrs (old: rec {
version = "0.11.0-rc.1";
src = self.fetchFromGitHub {
owner = "kolloch";
repo = "crate2nix";
rev = "v0.11.0-rc.1";
hash = "sha256:02yvn61w16sgkdxa019l5y9i2ybyk8h4516718gmarqxx5ws2kz8";
};
cargoDeps = old.cargoDeps.overrideAttrs (_: {
inherit src;
outputHash = "sha256:03yny9ikqzfpi2mr27r82g54an2s8k9lqi2i4fqalg7g0s2cr2yd";
});
});
}