From 0b64577702ca7e412bb2af4af7af9e33efc5c0f5 Mon Sep 17 00:00:00 2001 From: sterni Date: Sat, 18 Feb 2023 21:04:06 +0100 Subject: chore(3p/sources): Bump channels & overlays * //3p/sources: temporarily switch to nixos-unstable-small, since it includes: - evans update we are interested in, allowing us to drop our evans patches. - awscli2 update that unbreaks //users/grfn * //3p/overlays/tvl: - drop evans patches - update tdlib to 1.8.11 to make tazjin's emacs happy - drop obsolete mullvad workaround * //users/grfn/keyboard: disable -Werror for array-bounds warnings. Seems like a non-trivial job to resolve the warning properly, hopefully GCC 12 still generates the same working code as GCC 11 used to. * //users/grfn/system/home: remove yubikey-manager-qt. Yubico can't seem to keep that on pace with yubikey-manager. It requires a <5 version of the latter which is incompatible with the recently released cryptography >= 39. * //3p/gerrit: update changed FOD hash for the fetch step Change-Id: I590ab996247e69b0ab5059cd173840ef4ebfe939 Reviewed-on: https://cl.tvl.fyi/c/depot/+/8133 Tested-by: BuildkiteCI Reviewed-by: flokli Reviewed-by: tazjin Autosubmit: sterni Reviewed-by: grfn --- views/tvix/default.nix | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) (limited to 'views/tvix/default.nix') diff --git a/views/tvix/default.nix b/views/tvix/default.nix index 28e51c28b4..33d6b63686 100644 --- a/views/tvix/default.nix +++ b/views/tvix/default.nix @@ -9,17 +9,6 @@ , ... }: -let - # `Call $methodName --bytes-as-base64` support for evans - evans = pkgs.evans.overrideAttrs (old: { - patches = old.patches or [ ] ++ [ - (pkgs.fetchpatch { - url = "https://github.com/ktr0731/evans/pull/611/commits/f2109627c0d20588980fe6fd6348d223dbdf7c33.patch"; - hash = "sha256-ff8drvAYwQvHeymaHEruvwDYynClpzPM5lrB7IeQHBs="; - }) - ]; - }); -in pkgs.mkShell { name = "tvix-rust-dev-env"; packages = [ @@ -30,7 +19,6 @@ pkgs.mkShell { pkgs.rustc pkgs.rustfmt pkgs.protobuf - - evans + pkgs.evans ]; } -- cgit 1.4.1