chore(3p/sources): Bump channels & overlays r/3992

* //3p/farmhash: drop, as it is unused and started to fail

* //3p/overlays/tvl:

  - patch barrier to work with gcc 11

  - disable outdated test suite for python38Packages.backports-zoneinfo
    which still assumes zoneinfo 2020a.

* //3p/overlays/haskell: patch generic-arbitrary to avoid neg resizes

* //users/grfn/achilles: disable CI due to linking trouble (ugh).

* //users/grfn/system/home/games: Disable DFHack for dwarf fortress as
  it's now failing to build

Refs: ENG-328
Change-Id: I4e1ee8fd9525d4868b82f9bad8ca5f09e7fdb9d0
Reviewed-on: https://cl.tvl.fyi/c/depot/+/5506
Tested-by: BuildkiteCI
Reviewed-by: grfn <grfn@gws.fyi>

6 files changed, 53 insertions, 30 deletions

diff --git a/third_party/farmhash/default.nix b/third_party/farmhash/default.nix
deleted file mode 100644
index d7431dbd0108..000000000000
--- a/third_party/farmhash/default.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-# Google's farmhash family of hash functions
-{ pkgs, ... }:
-
-pkgs.stdenv.mkDerivation {
-  name = "farmhash";
-
-  src = pkgs.fetchFromGitHub {
-    owner = "google";
-    repo = "farmhash";
-    rev = "0d859a811870d10f53a594927d0d0b97573ad06d";
-    sha256 = "1w2583m5289hby0r91gds5yia6l8qpmzkl5b9bv58g5gacfj2h17";
-  };
-}
diff --git a/third_party/overlays/haskell/default.nix b/third_party/overlays/haskell/default.nix
index 6e18752f5270..2d01042f31de 100644
--- a/third_party/overlays/haskell/default.nix
+++ b/third_party/overlays/haskell/default.nix
@@ -9,6 +9,14 @@ self: super: # overlay parameters for the nixpkgs overlay
 let
   overrides = hsSelf: hsSuper: with self.haskell.lib.compose; {
     # No overrides for the default package set necessary at the moment
+    # TODO(sterni): upstreamable?
+    generic-arbitrary = appendPatch
+      (self.fetchpatch {
+        name = "generic-arbitrary-no-negative-resize.patch";
+        url = "https://github.com/typeable/generic-arbitrary/commit/c13d119d8ad0d43860ecdb93b357b0239e366a6c.patch";
+        sha256 = "1jgbd2jn575icqw9nfdzh57nacm3pn8n53ka52129pnfjqfzyhsi";
+      })
+      hsSuper.generic-arbitrary;
   };
 in
 {
@@ -18,15 +26,17 @@ in
 
   haskell = lib.recursiveUpdate super.haskell {
     packages.ghc8107 = super.haskell.packages.ghc8107.override {
-      overrides = hsSelf: hsSuper: with self.haskell.lib.compose; {
-        # TODO(sterni): TODO(grfn): patch xanthous to work with random-fu 0.3.*,
-        # so we can use GHC 9.0.2 and benefit from upstream binary cache.
-        random-fu = hsSelf.callPackage ./extra-pkgs/random-fu-0.2.nix { };
-        rvar = hsSelf.callPackage ./extra-pkgs/rvar-0.2.nix { };
+      overrides = lib.composeExtensions overrides (
+        hsSelf: hsSuper: with self.haskell.lib.compose; {
+          # TODO(sterni): TODO(grfn): patch xanthous to work with random-fu 0.3.*,
+          # so we can use GHC 9.0.2 and benefit from upstream binary cache.
+          random-fu = hsSelf.callPackage ./extra-pkgs/random-fu-0.2.nix { };
+          rvar = hsSelf.callPackage ./extra-pkgs/rvar-0.2.nix { };
 
-        # TODO(sterni): upstream this
-        universe-base = addBuildDepend hsSelf.OneTuple hsSuper.universe-base;
-      };
+          # TODO(sterni): upstream this
+          universe-base = addBuildDepend hsSelf.OneTuple hsSuper.universe-base;
+        }
+      );
     };
   };
 }
diff --git a/third_party/overlays/tvl.nix b/third_party/overlays/tvl.nix
index 9dee001ba801..9b4bc2db393d 100644
--- a/third_party/overlays/tvl.nix
+++ b/third_party/overlays/tvl.nix
@@ -98,4 +98,26 @@ in
       sha256 = "07qa2qkbjczj3d0m03jpw85hfj35cbjm48xhifz3viy4khjw88vl";
     };
   });
+
+  # Fix compilation with GCC 11. Can be removed when
+  # https://github.com/NixOS/nixpkgs/pull/170157 lands in channels.
+  barrier = super.barrier.overrideAttrs (old: {
+    patches = old.patches or [ ] ++ [
+      (self.fetchpatch {
+        name = "barrier-gcc-11.patch";
+        url = "https://github.com/debauchee/barrier/commit/4b12265ae5d324b942698a3177e1d8b1749414d7.patch";
+        sha256 = "02a1hm07xgbs4d3529r2yj9vgxn1mix4y367hyw5h11kpczk2cva";
+      })
+    ];
+  });
+
+  python38 = super.python38.override {
+    packageOverrides = pySelf: pySuper: {
+      backports-zoneinfo = pySuper.backports-zoneinfo.overridePythonAttrs (_: {
+        # Outdated test-data, see https://github.com/pganssle/zoneinfo/pull/115
+        # Can be dropped when https://github.com/NixOS/nixpkgs/pull/170450 lands.
+        doCheck = false;
+      });
+    };
+  };
 }
diff --git a/third_party/sources/sources.json b/third_party/sources/sources.json
index 441a88048d7c..ce111666a136 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": "34d35051f15a98eddc78378e31ebbf9a82fc1f47",
-        "sha256": "083j3nc0slzblmgaw89bmz3498gc9ixqlrmv0vry7z5z49cwk337",
+        "rev": "5f258dfdab8e58abe2e44b78a3ccf262041f7b74",
+        "sha256": "186rvjsf0q2m9gd45hy3p0wyzyflz1yalhbkwwywagbzav88zbqm",
         "type": "tarball",
-        "url": "https://github.com/nix-community/emacs-overlay/archive/34d35051f15a98eddc78378e31ebbf9a82fc1f47.tar.gz",
+        "url": "https://github.com/nix-community/emacs-overlay/archive/5f258dfdab8e58abe2e44b78a3ccf262041f7b74.tar.gz",
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     },
     "nixpkgs": {
@@ -17,10 +17,10 @@
         "homepage": "",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "1ffba9f2f683063c2b14c9f4d12c55ad5f4ed887",
-        "sha256": "1zx5zvpvqrgk5mfxzmwf8gd270lz7dkfk563sccp1xlhac15cipg",
+        "rev": "87d34a6b8982e901b8e50096b8e79ebc0e66cda0",
+        "sha256": "0dqjw05vbdf6ahy71zag8gsbfcgrf7fxz3xkwqqwapl0qk9xk47a",
         "type": "tarball",
-        "url": "https://github.com/NixOS/nixpkgs/archive/1ffba9f2f683063c2b14c9f4d12c55ad5f4ed887.tar.gz",
+        "url": "https://github.com/NixOS/nixpkgs/archive/87d34a6b8982e901b8e50096b8e79ebc0e66cda0.tar.gz",
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     },
     "nixpkgs-stable": {
@@ -29,10 +29,10 @@
         "homepage": "",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "9887f024766aa27704d1f89f623efd1d063da92a",
-        "sha256": "07fgr087sir8ra1v9icp2011f1s2iqlclyinxy0jrlawyz9rz4h2",
+        "rev": "c254b8c915ac912ae9ee9dc74eac555ccbf33795",
+        "sha256": "10z9zfsj22knf92fm77nw9m5z0h3j0by0va2an3xgmsjfyqcdfrz",
         "type": "tarball",
-        "url": "https://github.com/NixOS/nixpkgs/archive/9887f024766aa27704d1f89f623efd1d063da92a.tar.gz",
+        "url": "https://github.com/NixOS/nixpkgs/archive/c254b8c915ac912ae9ee9dc74eac555ccbf33795.tar.gz",
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     },
     "rustsec-advisory-db": {
diff --git a/users/grfn/achilles/default.nix b/users/grfn/achilles/default.nix
index 5245049d4a32..6dab0a5a62f7 100644
--- a/users/grfn/achilles/default.nix
+++ b/users/grfn/achilles/default.nix
@@ -21,4 +21,7 @@ depot.third_party.naersk.buildPackage {
   ]);
 
   doCheck = true;
+
+  # Trouble linking against LLVM, maybe since rustc's llvmPackages got bumped?
+  meta.ci.skip = true;
 }
diff --git a/users/grfn/system/home/modules/games.nix b/users/grfn/system/home/modules/games.nix
index 8067caf65fb1..5272ac9330fc 100644
--- a/users/grfn/system/home/modules/games.nix
+++ b/users/grfn/system/home/modules/games.nix
@@ -11,6 +11,7 @@ let
     theme = null;
     enableIntro = false;
     enableFPS = true;
+    enableDFHack = false; # Fails to build currently
   });
 
   init = runCommand "init.txt" { } ''