about summary refs log tree commit diff
path: root/views
diff options
context:
space:
mode:
authorsterni <sternenseemann@systemli.org>2023-02-18T20·04+0100
committersterni <sternenseemann@systemli.org>2023-03-02T14·35+0000
commit0b64577702ca7e412bb2af4af7af9e33efc5c0f5 (patch)
treef73b1e92647aeb0456c53e8d6f5534770886ac95 /views
parentde3eedff9be7e8bd1f6cc28ab51c7d54e0d59e9f (diff)
chore(3p/sources): Bump channels & overlays r/5866
* //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 <flokli@flokli.de>
Reviewed-by: tazjin <tazjin@tvl.su>
Autosubmit: sterni <sternenseemann@systemli.org>
Reviewed-by: grfn <grfn@gws.fyi>
Diffstat (limited to 'views')
-rw-r--r--views/tvix/default.nix14
1 files changed, 1 insertions, 13 deletions
diff --git a/views/tvix/default.nix b/views/tvix/default.nix
index 28e51c28b4c8..33d6b6368668 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
   ];
 }