about summary refs log tree commit diff
path: root/third_party
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
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')
-rw-r--r--third_party/nixpkgs/default.nix5
-rw-r--r--third_party/overlays/tvl.nix12
-rw-r--r--third_party/sources/sources.json42
3 files changed, 30 insertions, 29 deletions
diff --git a/third_party/nixpkgs/default.nix b/third_party/nixpkgs/default.nix
index 747cf5a11480..0db42f154090 100644
--- a/third_party/nixpkgs/default.nix
+++ b/third_party/nixpkgs/default.nix
@@ -49,10 +49,7 @@ let
   # Overlay for packages that should come from the stable channel
   # instead (e.g. because something is broken in unstable).
   # Use `stableNixpkgs` from above.
-  stableOverlay = _unstableSelf: unstableSuper: {
-    # weird memory access issues in SBCL on AMD; 2024-02-01
-    sbcl = stableNixpkgs.sbcl;
-  };
+  stableOverlay = _unstableSelf: unstableSuper: { };
 
   # Overlay to expose the nixpkgs commits we are using to other Nix code.
   commitsOverlay = _: _: {
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
diff --git a/third_party/sources/sources.json b/third_party/sources/sources.json
index 0c5a4a0893cb..bfeeff3b76cf 100644
--- a/third_party/sources/sources.json
+++ b/third_party/sources/sources.json
@@ -17,10 +17,10 @@
         "homepage": "",
         "owner": "nix-community",
         "repo": "emacs-overlay",
-        "rev": "eb3071f959d2c4bd6eccd2176d43f33ccfbfb3b1",
-        "sha256": "0y0rk07yliak02mcis10caabz7dbd0wr2jf8sfdr40ar2dks84cl",
+        "rev": "0f7f3b39157419f3035a2dad39fbaf8a4ba0448d",
+        "sha256": "1njsp4mkj97mraaf5hqqmmxznm7r9pkbgvhx83h1hxlg0rg06njq",
         "type": "tarball",
-        "url": "https://github.com/nix-community/emacs-overlay/archive/eb3071f959d2c4bd6eccd2176d43f33ccfbfb3b1.tar.gz",
+        "url": "https://github.com/nix-community/emacs-overlay/archive/0f7f3b39157419f3035a2dad39fbaf8a4ba0448d.tar.gz",
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     },
     "home-manager": {
@@ -29,10 +29,10 @@
         "homepage": "https://nix-community.github.io/home-manager/",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "d634c3abafa454551f2083b054cd95c3f287be61",
-        "sha256": "0mxrylbycywi8qh6zb1il5yfb5apbjsd7avhvfpavclkjaz80awb",
+        "rev": "21b078306a2ab68748abf72650db313d646cf2ca",
+        "sha256": "0dv0xq65nbpdkgnpawdx9jsasz1w52n0f55z6iz9qpmm8gfqkkv5",
         "type": "tarball",
-        "url": "https://github.com/nix-community/home-manager/archive/d634c3abafa454551f2083b054cd95c3f287be61.tar.gz",
+        "url": "https://github.com/nix-community/home-manager/archive/21b078306a2ab68748abf72650db313d646cf2ca.tar.gz",
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     },
     "impermanence": {
@@ -41,10 +41,10 @@
         "homepage": "",
         "owner": "nix-community",
         "repo": "impermanence",
-        "rev": "033643a45a4a920660ef91caa391fbffb14da466",
-        "sha256": "16x067nv146igqfxq8b3a0rf6715z5vpl0hz27dp2a29s6lr8944",
+        "rev": "cd13c2917eaa68e4c49fea0ff9cada45440d7045",
+        "sha256": "1pdsiwynmyxhkmh4d8wj56fsh8zb529vqwbwibgi1h4lvy7vi889",
         "type": "tarball",
-        "url": "https://github.com/nix-community/impermanence/archive/033643a45a4a920660ef91caa391fbffb14da466.tar.gz",
+        "url": "https://github.com/nix-community/impermanence/archive/cd13c2917eaa68e4c49fea0ff9cada45440d7045.tar.gz",
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     },
     "naersk": {
@@ -77,10 +77,10 @@
         "homepage": "",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "c002c6aa977ad22c60398daaa9be52f2203d0006",
-        "sha256": "1jzkx82rim9lqklfbjnf826r071avjlw60pgr8h2dad6m2nah2vp",
+        "rev": "f9d39fb9aff0efee4a3d5f4a6d7c17701d38a1d8",
+        "sha256": "08zzqp8aadgqr1sbdw46wlydmv2h8i068mlx37lr2r1qmx2schai",
         "type": "tarball",
-        "url": "https://github.com/NixOS/nixpkgs/archive/c002c6aa977ad22c60398daaa9be52f2203d0006.tar.gz",
+        "url": "https://github.com/NixOS/nixpkgs/archive/f9d39fb9aff0efee4a3d5f4a6d7c17701d38a1d8.tar.gz",
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     },
     "nixpkgs-stable": {
@@ -89,10 +89,10 @@
         "homepage": "",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "56911ef3403a9318b7621ce745f5452fb9ef6867",
-        "sha256": "0jf6pnz4s5w9p35wd584hy7p6r5aaq1khfdxv2c1nqnmss05nn2b",
+        "rev": "809cca784b9f72a5ad4b991e0e7bcf8890f9c3a6",
+        "sha256": "174d7cbgjyhlin2lm71chgdqs2cprqphnka9w33nlc1qh226ks3l",
         "type": "tarball",
-        "url": "https://github.com/NixOS/nixpkgs/archive/56911ef3403a9318b7621ce745f5452fb9ef6867.tar.gz",
+        "url": "https://github.com/NixOS/nixpkgs/archive/809cca784b9f72a5ad4b991e0e7bcf8890f9c3a6.tar.gz",
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     },
     "rust-overlay": {
@@ -101,10 +101,10 @@
         "homepage": "",
         "owner": "oxalica",
         "repo": "rust-overlay",
-        "rev": "883b84c426107a8ec020e7124f263d7c35a5bb9f",
-        "sha256": "0njzqw4agbn8xsavibf8dqg99yrpm12g1vbjgf0i309wy4cfazn6",
+        "rev": "8dfbe2dffc28c1a18a29ffa34d5d0b269622b158",
+        "sha256": "0ddii9h5bwbihn4lwijbzknkbzdb11nglwdwrxdx8bf1blvcy199",
         "type": "tarball",
-        "url": "https://github.com/oxalica/rust-overlay/archive/883b84c426107a8ec020e7124f263d7c35a5bb9f.tar.gz",
+        "url": "https://github.com/oxalica/rust-overlay/archive/8dfbe2dffc28c1a18a29ffa34d5d0b269622b158.tar.gz",
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     },
     "rustsec-advisory-db": {
@@ -113,10 +113,10 @@
         "homepage": "https://rustsec.org",
         "owner": "RustSec",
         "repo": "advisory-db",
-        "rev": "1d2202ea2b32fabd3307641010301bfe187ef11a",
-        "sha256": "154njsibggh08v5n3aazc4a5x693dm1g1qxhfh2insc6ibkrpfj2",
+        "rev": "91879311167598acb41181e0080707adb6aa9292",
+        "sha256": "1pzgak9cwm7iravcjplkajfmppjrs4mc8xbarxx5rw0bsmqwppfi",
         "type": "tarball",
-        "url": "https://github.com/RustSec/advisory-db/archive/1d2202ea2b32fabd3307641010301bfe187ef11a.tar.gz",
+        "url": "https://github.com/RustSec/advisory-db/archive/91879311167598acb41181e0080707adb6aa9292.tar.gz",
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     }
 }