# 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 = "4510dbc8a6802902cbab6444134659548fffb9b0"; in self.fetchFromGitHub { owner = "tvlfyi"; repo = "nix"; inherit rev; hash = "sha256:0vg2xzwc8q1sw20b26qbyd4flnws8668yhi1cg2h6z3jb3wamhr5"; } // { 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; }; })); # 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; }); }; }; }