From b87af6ccaa3b1f3e96ae75a7bc45e727bfd81af0 Mon Sep 17 00:00:00 2001 From: Vincent Ambo Date: Tue, 19 Sep 2023 23:41:41 +0300 Subject: 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 Autosubmit: tazjin --- third_party/overlays/tvl.nix | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/third_party/overlays/tvl.nix b/third_party/overlays/tvl.nix index 4cfdd846a6..69b119a489 100644 --- a/third_party/overlays/tvl.nix +++ b/third_party/overlays/tvl.nix @@ -39,12 +39,7 @@ depot.nix.readTree.drvTargets { nix = self.nix_2_3; nix_latest = super.nix; - # nixos-option only builds against Nix 2.15 - nixos-option = super.nixos-option.override { - nix = self.nixVersions.nix_2_15; - }; - - # Too match telega in emacs-overlay or wherever + # To match telega in emacs-overlay or wherever tdlib = super.tdlib.overrideAttrs (_: { version = "1.8.16"; src = self.fetchFromGitHub { @@ -113,10 +108,6 @@ depot.nix.readTree.drvTargets { }; })); - # nixpkgs-review added ZSH completions upstream, which collide with - # nix-zsh-completions. - nixpkgs-review = self.lib.hiPrio super.nixpkgs-review; - # Pin a newer version of crate2nix from git, which is not officially # released but supports `dep:` crate2nix = super.crate2nix.overrideAttrs (old: rec { -- cgit 1.4.1