From 0c178a0ef61d2f5f4d6169c7a951663c62509cd7 Mon Sep 17 00:00:00 2001 From: sterni Date: Mon, 26 Sep 2022 19:33:05 +0200 Subject: chore(3p/sources): Bump channels & overlays Upstream nixpkgs removed a lot of aliases this time, so we needed to do the following transformations. It's a real shame that aliases only really become discoverable easily when they are removed. * runCommandNoCC -> runCommand * gmailieer -> lieer We also need to work around the fact that home-manager hasn't catched on to this rename. * mysql -> mariadb * pkgconfig -> pkg-config This also affects our Nix fork which needs to be bumped. * prometheus_client -> prometheus-client * rxvt_unicode -> rxvt-unicode-unwrapped * nix-review -> nixpkgs-review * oauth2_proxy -> oauth2-proxy Additionally, some Go-related builders decided to drop support for passing the sha256 hash in directly, so we need to use the generic hash arguments. Change-Id: I84aaa225ef18962937f8616a9ff064822f0d5dc3 Reviewed-on: https://cl.tvl.fyi/c/depot/+/6792 Autosubmit: sterni Tested-by: BuildkiteCI Reviewed-by: grfn Reviewed-by: flokli Reviewed-by: tazjin Reviewed-by: wpcarro --- third_party/overlays/tvl.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'third_party/overlays') diff --git a/third_party/overlays/tvl.nix b/third_party/overlays/tvl.nix index ca9be65f5c..2e2ed549b4 100644 --- a/third_party/overlays/tvl.nix +++ b/third_party/overlays/tvl.nix @@ -9,14 +9,15 @@ let nixSrc = let # branch 2.3-backport-await-users - rev = "abdc60f49f1104696bac723331d3ed0296d5a784"; + # XXX(tazjin): merge https://github.com/tvlfyi/nix/pull/3 + rev = "22efe1ed25dff2fa15345a0f187e5ad450552599"; in self.fetchFromGitHub { owner = "tvlfyi"; repo = "nix"; inherit rev; - hash = "sha256:0c1pmg8y0yafdkliz970k52s92z3qin3xrz3g0n2ss7xcfbg8nzy"; + hash = "sha256:0rwyrh471c5y64axyd8vzzzmzlscg97fsrjbgbm1a93wnzxcvnvk"; } // { revCount = 0; shortRev = builtins.substring 0 7 rev; }; in { -- cgit 1.4.1