tvl-depot/third_party/overlays/tvl.nix

123 lines
3.9 KiB
Nix
Raw Normal View History

# This overlay is used to make TVL-specific modifications in the
# nixpkgs tree, where required.
{ depot, ... }:
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 = "abdc60f49f1104696bac723331d3ed0296d5a784";
in
self.fetchFromGitHub
{
owner = "tvlfyi";
repo = "nix";
inherit rev;
hash = "sha256:0c1pmg8y0yafdkliz970k52s92z3qin3xrz3g0n2ss7xcfbg8nzy";
} // { revCount = 0; shortRev = builtins.substring 0 7 rev; };
in
{
nix = (import "${nixSrc}/release.nix" {
nix = nixSrc;
nixpkgs = super.path;
systems = [ builtins.currentSystem ];
}).build."${builtins.currentSystem}";
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.origSrc + "/third_party/exwm";
});
# Workaround for magit checking the git version at load time
magit = esuper.magit.overrideAttrs (_: {
propagatedNativeBuildInputs = [
self.git
];
});
})
);
# Upgrade to match telega in emacs-overlay
# TODO(tazjin): ugrade tdlib (+ telega?!) in nixpkgs
tdlib = assert super.tdlib.version == "1.8.3";
super.tdlib.overrideAttrs (old: {
version = "1.8.4";
src = self.fetchFromGitHub {
owner = "tdlib";
repo = "td";
rev = "7eabd8ca60de025e45e99d4e5edd39f4ebd9467e";
sha256 = "1chs0ibghjj275v9arsn3k68ppblpm7ysqk0za9kya5vdnldlld5";
};
});
# 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 = super.nix_2_3; };
# Workaround for srcOnly with separateDebugInfo until
# https://github.com/NixOS/nixpkgs/pull/179170 is merged.
srcOnly = args: (super.srcOnly args).overrideAttrs (_: {
outputs = [ "out" ];
separateDebugInfo = false;
});
# Avoid builds of mkShell derivations in CI.
mkShell = super.lib.makeOverridable (args: (super.mkShell args).overrideAttrs (_: {
passthru = {
meta.ci.skip = true;
};
}));
chore(3p/sources): Bump channels & overlays Use nixos-unstable-small which fixes CVE-2018-25032 (out of bounds write while compressing). * //users/grfn/xanthous: - Supporting random-fu 0.3 requires considerable changes and patching random-extras (https://github.com/aristidb/random-extras/pull/5). For now we downgrade random-fu and its dependency rvar to 0.2.*, forcing us to build xanthous with GHC 8.10.7, due to random-fu 0.2.* not supporting that version. Nix expressions for the downgraded packages are checked in to avoid the potential need to compile Haskell at pipeline eval time. - generic-arbitrary exposes a GenericArbitrary newtype now. This means we no longer have to implement it in xanthous downstream and patch generic-arbitrary to expose the GArbitrary type class. - Minor adjustments for lens 5.0: Xanthous.Game.Memo: clear needs to use ASetter' instead of Lens' Xanthous.Data.EntityMap: TraversableWithIndex no longer has an itraversed function. - Xanthous.Orphans: adjust for aeson's KeyMap, use KM.size explicitly instead of relying on MonoTraversable's length * //nix/buildLisp: the CCL issue has resurfaced, disabling the implementation once again. * //3p/arion: remove, as depot uses the nixpkgs package of it anyways. * //users/wpcarro: accomodate GHC 9.0.1's stricter parsing of operators. * //users/tazjin: disable rustfmt as it stopped respecting settings * //3p/overlays: upgrade home-manager until fix for serivce generation has landed upstream * //users/grfn/system: remove rr override, as the pinned commit is part of the 5.5.0 release shipped by nixpkgs. Change-Id: If229e7317ba48498f85170b57ee9053f6997ff8a Reviewed-on: https://cl.tvl.fyi/c/depot/+/5428 Tested-by: BuildkiteCI Autosubmit: sterni <sternenseemann@systemli.org> Reviewed-by: grfn <grfn@gws.fyi> Reviewed-by: tazjin <tazjin@tvl.su> Reviewed-by: wpcarro <wpcarro@gmail.com>
2022-03-31 18:40:08 +02:00
# upgrade home-manager until the service-generation fix has landed upstream
# https://github.com/nix-community/home-manager/issues/2846
home-manager = super.home-manager.overrideAttrs (old: rec {
version = assert super.home-manager.version == "2021-12-25"; "2022-04-08";
src = self.fetchFromGitHub {
owner = "nix-community";
repo = "home-manager";
rev = "f911ebbec927e8e9b582f2e32e2b35f730074cfc";
sha256 = "07qa2qkbjczj3d0m03jpw85hfj35cbjm48xhifz3viy4khjw88vl";
};
});
python38 = super.python38.override {
packageOverrides = pySelf: pySuper: {
backports-zoneinfo = pySuper.backports-zoneinfo.overridePythonAttrs (_: {
# Outdated test-data, see https://github.com/pganssle/zoneinfo/pull/115
# Can be dropped when https://github.com/NixOS/nixpkgs/pull/170450 lands.
doCheck = false;
});
};
};
}