diff options
author | sterni <sternenseemann@systemli.org> | 2022-10-30T21·28+0100 |
---|---|---|
committer | sterni <sternenseemann@systemli.org> | 2022-11-03T15·10+0000 |
commit | 57cf952ea98db70fcf50ec31e1c1057562b0a1df (patch) | |
tree | 7326a01bde77134004755a74ca93bc7a89e1b697 /third_party/overlays/tvl.nix | |
parent | 64afe59bbec316536fb4ade4f031ed31bf9226fc (diff) |
chore(3p/sources): Bump channels & overlays (OpenSSL edition) r/5232
* //ops/machines/whitby: Disable grafana, since the grafana module was changed upstream in a way that our configuration no longer works. Since the OpenSSL security update is relatively pressing, adapting the grafana configuration beforehand is not a hard requirement. See https://github.com/NixOS/nixpkgs/pull/191768. * //tools/depotfmt: keep Go at version 1.18 to forgo a reformat of the tree. * //nix/buildGo: keep Go at version 1.18, as 1.19 changed the CLI interface (?) in a way that breaks buildGo. * //3p/overlays/tvl: drop upstreamed tdlib upgrade. * //3p/overlays/tvl: patch buf to work around breakage due to git 2.38.1 TODO items for Go are tracked in b/215. Change-Id: Ie08fef49cf3db12e6b5225a8b992a990ddc5b642 Reviewed-on: https://cl.tvl.fyi/c/depot/+/7141 Tested-by: BuildkiteCI Autosubmit: sterni <sternenseemann@systemli.org> Reviewed-by: grfn <grfn@gws.fyi> Reviewed-by: tazjin <tazjin@tvl.su>
Diffstat (limited to 'third_party/overlays/tvl.nix')
-rw-r--r-- | third_party/overlays/tvl.nix | 20 |
1 files changed, 7 insertions, 13 deletions
diff --git a/third_party/overlays/tvl.nix b/third_party/overlays/tvl.nix index db2b63cc7dd6..4683bce9db37 100644 --- a/third_party/overlays/tvl.nix +++ b/third_party/overlays/tvl.nix @@ -20,6 +20,13 @@ let } // { revCount = 0; shortRev = builtins.substring 0 7 rev; }; in { + buf = super.buf.overrideAttrs (old: { + patches = [ + # Rebased on 1.9.0: https://github.com/bufbuild/buf/commit/bcaa77f8bbb8f6c198154c7c8d53596da4506dab + ./patches/buf-tests-dont-use-file-transport.patch + ] ++ old.patches or [ ]; + }); + nix = (import "${nixSrc}/release.nix" { nix = nixSrc; nixpkgs = super.path; @@ -68,19 +75,6 @@ in }) ); - # 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.7"; - src = self.fetchFromGitHub { - owner = "tdlib"; - repo = "td"; - rev = "a7a17b34b3c8fd3f7f6295f152746beb68f34d83"; - sha256 = "sha256:0a5609knn7rmiiblz315yrvc9f2r207l2nl6brjy5bnhjdspmzs6"; - }; - }); - # dottime support for notmuch notmuch = super.notmuch.overrideAttrs (old: { passthru = old.passthru // { |