about summary refs log tree commit diff
path: root/third_party/overlays/tvl.nix
diff options
context:
space:
mode:
authorsterni <sternenseemann@systemli.org>2024-02-12T16·12+0100
committerclbot <clbot@tvl.fyi>2024-02-13T20·45+0000
commit0ba476a4266015f278f18d74094299de74a5a111 (patch)
tree1bbe90383ab081e0340034d076c13d29546ba79d /third_party/overlays/tvl.nix
parent98b89e53e248e4b8cb6f4be042b9826a57d43e42 (diff)
chore(3p/sources): Bump channels & overlays r/7510
* SBCL issue resolved in 2.4.1 which is included in channel.

* Need to disable the tests of libgit2 1.5 (needed by cargo-audit).
  Before this bump they weren't executed either.

* Adjust to rename of overrideScope' -> overrideScope (lib.makeScope).

* tdlib: 1.8.23 -> 1.8.24

Change-Id: I2e1e23c8f20c26c4f9daa01c4d278b4f0e80da92
Reviewed-on: https://cl.tvl.fyi/c/depot/+/10810
Reviewed-by: aspen <root@gws.fyi>
Autosubmit: sterni <sternenseemann@systemli.org>
Tested-by: BuildkiteCI
Diffstat (limited to 'third_party/overlays/tvl.nix')
-rw-r--r--third_party/overlays/tvl.nix12
1 files changed, 8 insertions, 4 deletions
diff --git a/third_party/overlays/tvl.nix b/third_party/overlays/tvl.nix
index 861c66694a85..fd6b35163ebc 100644
--- a/third_party/overlays/tvl.nix
+++ b/third_party/overlays/tvl.nix
@@ -16,12 +16,12 @@ depot.nix.readTree.drvTargets {
 
   # To match telega in emacs-overlay or wherever
   tdlib = super.tdlib.overrideAttrs (_: {
-    version = "1.8.23";
+    version = "1.8.24";
     src = self.fetchFromGitHub {
       owner = "tdlib";
       repo = "td";
-      rev = "27c3eaeb4964bd5f18d8488e354abde1a4383e49";
-      sha256 = "14f65dfmg2p5hyvi3lffvvazwcd3i3jrrw3c2pwrc5yfgxk3662g";
+      rev = "d79bd4b69403868897496da39b773ab25c69f6af";
+      sha256 = "0bc5akzw12qwj45rzqkrhw65qlrn9q8pzmvc5aiqv4bvhkb1ghl0";
     };
   });
 
@@ -33,7 +33,7 @@ depot.nix.readTree.drvTargets {
 
   # Add our Emacs packages to the fixpoint
   emacsPackagesFor = emacs: (
-    (super.emacsPackagesFor emacs).overrideScope' (eself: esuper: {
+    (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
@@ -119,6 +119,10 @@ depot.nix.readTree.drvTargets {
     '';
   };
 
+  # Disable tests which fail and weren't executed before the bump that
+  # introduced this problem: https://github.com/NixOS/nixpkgs/issues/288064
+  libgit2_1_5 = super.libgit2_1_5.overrideAttrs (_: { doCheck = false; });
+
   evans = super.evans.overrideAttrs (old: {
     patches = old.patches or [ ] ++ [
       # add support for unix domain sockets