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 --- users/tazjin/homepage/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'users/tazjin/homepage') diff --git a/users/tazjin/homepage/default.nix b/users/tazjin/homepage/default.nix index 0edb75d60933..15f4d787c0b5 100644 --- a/users/tazjin/homepage/default.nix +++ b/users/tazjin/homepage/default.nix @@ -12,7 +12,7 @@ with nix.yants; let inherit (builtins) readFile replaceStrings sort; - inherit (pkgs) writeFile runCommandNoCC; + inherit (pkgs) writeFile runCommand; # The different types of entries on the homepage. entryClass = enum "entryClass" [ "blog" "project" "misc" ]; @@ -35,7 +35,7 @@ let date = post.date; }); - formatDate = defun [ int string ] (date: readFile (runCommandNoCC "date" { } '' + formatDate = defun [ int string ] (date: readFile (runCommand "date" { } '' date --date='@${toString date}' '+%Y-%m-%d' > $out '')); @@ -68,7 +68,7 @@ let homepage = index ((map postToEntry users.tazjin.blog.posts) ++ pageEntries); atomFeed = import ./feed.nix (args // { inherit entry pageEntries; }); in -runCommandNoCC "website" { } '' +runCommand "website" { } '' mkdir $out cp ${homepage} $out/index.html cp ${atomFeed} $out/feed.atom -- cgit 1.4.1