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

* //3p/overlays/haskell: upstream has the correct version of graphmod
  now, but the updated meta set is not yet in the channel.

Change-Id: I55f23c6145d71346ced77d3c349e712f29752b9d
Reviewed-on: https://cl.tvl.fyi/c/depot/+/7730
Reviewed-by: tazjin <tazjin@tvl.su>
Tested-by: BuildkiteCI
Autosubmit: sterni <sternenseemann@systemli.org>

3 files changed, 15 insertions, 48 deletions

diff --git a/third_party/overlays/haskell/default.nix b/third_party/overlays/haskell/default.nix
index c08932c74def..d80f377db866 100644
--- a/third_party/overlays/haskell/default.nix
+++ b/third_party/overlays/haskell/default.nix
@@ -30,9 +30,9 @@ in
       dhall = dhall-source "dhall" hsSuper.dhall;
       dhall-nix = dhall-source "dhall-nix" hsSuper.dhall-nix;
 
-      # Use recently-released version that has 9.2 support
-      graphmod = assert hsSuper.graphmod != "1.4.5.1";
-        hsSelf.callPackage ./extra-pkgs/graphmod-1.4.5.1.nix { };
+      # Wait for upstream to remove the broken flag
+      graphmod = assert hsSuper.graphmod.meta.broken;
+        haskellLib.markUnbroken hsSuper.graphmod;
     };
   };
 
diff --git a/third_party/overlays/haskell/extra-pkgs/graphmod-1.4.5.1.nix b/third_party/overlays/haskell/extra-pkgs/graphmod-1.4.5.1.nix
deleted file mode 100644
index d11e739cdd4b..000000000000
--- a/third_party/overlays/haskell/extra-pkgs/graphmod-1.4.5.1.nix
+++ /dev/null
@@ -1,33 +0,0 @@
-{ mkDerivation
-, base
-, Cabal
-, containers
-, directory
-, dotgen
-, filepath
-, haskell-lexer
-, lib
-, pretty
-}:
-mkDerivation {
-  pname = "graphmod";
-  version = "1.4.5.1";
-  sha256 = "d72b70dd47ba85756e963681307d8dcf341e9d1f0c3b50bd34c33a4e429436cc";
-  isLibrary = true;
-  isExecutable = true;
-  libraryHaskellDepends = [
-    base
-    Cabal
-    containers
-    directory
-    dotgen
-    filepath
-    haskell-lexer
-    pretty
-  ];
-  executableHaskellDepends = [ base ];
-  homepage = "http://github.com/yav/graphmod/wiki";
-  description = "Present the module dependencies of a program as a \"dot\" graph";
-  license = lib.licenses.bsd3;
-  mainProgram = "graphmod";
-}
diff --git a/third_party/sources/sources.json b/third_party/sources/sources.json
index 679e92526ab2..ccb9c0380127 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": "d9ddea546f88f021ee6ab6a587eea9fa7c185b0c",
-        "sha256": "03vbvb8zjysdm5arb7d6sww6zs0zq26mrmncssyyn028xcjqb397",
+        "rev": "ba6ca0397eee6d322755d9128495010b70db790e",
+        "sha256": "17qnic8bz5grrlczw8q3gjw16gykx01g7p81ngnzi8a5y8as3c44",
         "type": "tarball",
-        "url": "https://github.com/nix-community/emacs-overlay/archive/d9ddea546f88f021ee6ab6a587eea9fa7c185b0c.tar.gz",
+        "url": "https://github.com/nix-community/emacs-overlay/archive/ba6ca0397eee6d322755d9128495010b70db790e.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": "cbacdaba3c7b361defb36e1cdfa03ae4e74eb4a8",
-        "sha256": "158z8cyac98f4m0g69i62fgkff5igkr2wdcrl4dlxd0pi8b1a58c",
+        "rev": "dd99675ee81fef051809bc87d67eb07f5ba022e8",
+        "sha256": "0wxnhz7q9dhzw9xb9ibab8gm2fbr1nmkdn2dh7hpb015d14fapaj",
         "type": "tarball",
-        "url": "https://github.com/nix-community/home-manager/archive/cbacdaba3c7b361defb36e1cdfa03ae4e74eb4a8.tar.gz",
+        "url": "https://github.com/nix-community/home-manager/archive/dd99675ee81fef051809bc87d67eb07f5ba022e8.tar.gz",
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     },
     "impermanence": {
@@ -77,10 +77,10 @@
         "homepage": "",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "e182da8622a354d44c39b3d7a542dc12cd7baa5f",
-        "sha256": "1cm7lv3kgscbp3bbs2ha0gchkdsc99dssajh71nqsqkhv5gymmb4",
+        "rev": "677ed08a50931e38382dbef01cba08a8f7eac8f6",
+        "sha256": "02739yp2wpsi401hdvpnq58938xaqrqjkvp6vikl0vcs429b73lf",
         "type": "tarball",
-        "url": "https://github.com/NixOS/nixpkgs/archive/e182da8622a354d44c39b3d7a542dc12cd7baa5f.tar.gz",
+        "url": "https://github.com/NixOS/nixpkgs/archive/677ed08a50931e38382dbef01cba08a8f7eac8f6.tar.gz",
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     },
     "nixpkgs-stable": {
@@ -101,10 +101,10 @@
         "homepage": "",
         "owner": "oxalica",
         "repo": "rust-overlay",
-        "rev": "ede977678e5d0164316998487e686d0790744cd7",
-        "sha256": "05sk61p3a5dhqfiaz7w01fc5fphxhl9d1aizwbvgiw7g0hrbc4v8",
+        "rev": "c8bf9c162bb3f734cf357846e995eb70b94e2bcd",
+        "sha256": "12mrh4pfb0ldb1w3mlfbzhabhas3q41w4daj0ccaxadiran4pxq5",
         "type": "tarball",
-        "url": "https://github.com/oxalica/rust-overlay/archive/ede977678e5d0164316998487e686d0790744cd7.tar.gz",
+        "url": "https://github.com/oxalica/rust-overlay/archive/c8bf9c162bb3f734cf357846e995eb70b94e2bcd.tar.gz",
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     },
     "rustsec-advisory-db": {