From 20bdcdb8f5249d1441254555e9ded5453671ff59 Mon Sep 17 00:00:00 2001 From: sterni Date: Sat, 26 Feb 2022 12:35:45 +0100 Subject: chore(3p/sources): Bump channels & overlays * //3p/overlays/tvl: propagate git as a native build input from magit, because magit checks the version of git at load time ever since a recent commit [1]. This check been escalated to a failure in a subsequent commit [2]. The result is that anything require-ing magit will fail with an error if git is not in PATH (or a path to git provided) which is basically what happens in byte compilation of all packages that depend on magit. For now the easiest way to work around it is letting magit have its way and provide git which easy enough for it. Upstream should probably think about this behaviour or emacs-overlay address it somehow. For now I've opened an issue with magit [3]. [1]: https://github.com/magit/magit/commit/6c4ff54a0836985fac6d72c7e4bfeff964775efe [2]: https://github.com/magit/magit/commit/8394f0d4ea5ffa6858db314efabe91d99f78e67a [3]: https://github.com/magit/magit/issues/4614 Change-Id: I6aaf8258c3798b76cdaa6eef066c6224e374e02e Reviewed-on: https://cl.tvl.fyi/c/depot/+/5326 Autosubmit: sterni Tested-by: BuildkiteCI Reviewed-by: tazjin --- third_party/sources/sources.json | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) (limited to 'third_party/sources') diff --git a/third_party/sources/sources.json b/third_party/sources/sources.json index 992928f22b..af1c350e9c 100644 --- a/third_party/sources/sources.json +++ b/third_party/sources/sources.json @@ -5,10 +5,10 @@ "homepage": "", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "1a2382410521ef30343c5e7fca090517691883c4", - "sha256": "00kv9gfmi621hgwn83pr4cwv328v6jjh100hsy7i0ip0gpanw1wj", + "rev": "9a35488970b3f33a6df6a0d9387a0c8c4c555c1d", + "sha256": "0akpaw2j5b2jfil9jgyisl5w72np3jm0a3amq2xr5wss8fpnqgxl", "type": "tarball", - "url": "https://github.com/nix-community/emacs-overlay/archive/1a2382410521ef30343c5e7fca090517691883c4.tar.gz", + "url": "https://github.com/nix-community/emacs-overlay/archive/9a35488970b3f33a6df6a0d9387a0c8c4c555c1d.tar.gz", "url_template": "https://github.com///archive/.tar.gz" }, "nixpkgs": { @@ -17,10 +17,10 @@ "homepage": "", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d5f237872975e6fb6f76eef1368b5634ffcd266f", - "sha256": "0fsjwhqgxyd2v86glr2560gr3zx9mb6fhllydmrxi5i04c549vsr", + "rev": "7f9b6e2babf232412682c09e57ed666d8f84ac2d", + "sha256": "03nb8sbzgc3c0qdr1jbsn852zi3qp74z4qcy7vrabvvly8rbixp2", "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/d5f237872975e6fb6f76eef1368b5634ffcd266f.tar.gz", + "url": "https://github.com/NixOS/nixpkgs/archive/7f9b6e2babf232412682c09e57ed666d8f84ac2d.tar.gz", "url_template": "https://github.com///archive/.tar.gz" }, "nixpkgs-stable": { @@ -29,10 +29,10 @@ "homepage": "", "owner": "NixOS", "repo": "nixpkgs", - "rev": "2128d0aa28edef51fd8fef38b132ffc0155595df", - "sha256": "1slxx8rc7kfm61826cjbz2wz18xc9sxhg1ki8b6254gizgh5gvw4", + "rev": "4275a321beab5a71872fb7a5fe5da511bb2bec73", + "sha256": "1p3pn7767ifbg08nmgjd93iqk0z87z4lv29ypalj9idwd3chsm69", "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/2128d0aa28edef51fd8fef38b132ffc0155595df.tar.gz", + "url": "https://github.com/NixOS/nixpkgs/archive/4275a321beab5a71872fb7a5fe5da511bb2bec73.tar.gz", "url_template": "https://github.com///archive/.tar.gz" }, "rustsec-advisory-db": { @@ -41,10 +41,10 @@ "homepage": "https://rustsec.org", "owner": "RustSec", "repo": "advisory-db", - "rev": "6627556189f71ab09aa6c74e8663ea225bbdb66c", - "sha256": "0y3phnvijb3mdzg6a2sg8ykdb0dbwnvrg1sc6nmh0m59c5z7y96i", + "rev": "0ff38eb722fac2ef0f0f353b4775580bfd2067db", + "sha256": "1xqlgc8fyv927v4khxbhmv5391r02a0zk3jnmrm1g30lsdhvxs69", "type": "tarball", - "url": "https://github.com/RustSec/advisory-db/archive/6627556189f71ab09aa6c74e8663ea225bbdb66c.tar.gz", + "url": "https://github.com/RustSec/advisory-db/archive/0ff38eb722fac2ef0f0f353b4775580bfd2067db.tar.gz", "url_template": "https://github.com///archive/.tar.gz" } } -- cgit 1.4.1