about summary refs log tree commit diff
path: root/users/wpcarro/website
diff options
context:
space:
mode:
authorsterni <sternenseemann@systemli.org>2022-09-26T17·33+0200
committersterni <sternenseemann@systemli.org>2022-09-28T08·02+0000
commit0c178a0ef61d2f5f4d6169c7a951663c62509cd7 (patch)
tree08d4b97e5d423f9624211f92700e8bd1cf27fcbc /users/wpcarro/website
parentf40283e0985b5e16a7d67e018a16b0d52f09b90c (diff)
chore(3p/sources): Bump channels & overlays r/4980
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 <sternenseemann@systemli.org>
Tested-by: BuildkiteCI
Reviewed-by: grfn <grfn@gws.fyi>
Reviewed-by: flokli <flokli@flokli.de>
Reviewed-by: tazjin <tazjin@tvl.su>
Reviewed-by: wpcarro <wpcarro@gmail.com>
Diffstat (limited to 'users/wpcarro/website')
-rw-r--r--users/wpcarro/website/blog/default.nix6
-rw-r--r--users/wpcarro/website/default.nix2
2 files changed, 4 insertions, 4 deletions
diff --git a/users/wpcarro/website/blog/default.nix b/users/wpcarro/website/blog/default.nix
index d87b714b6fe1..31b1c7df9c79 100644
--- a/users/wpcarro/website/blog/default.nix
+++ b/users/wpcarro/website/blog/default.nix
@@ -17,7 +17,7 @@ let
   posts = sort (x: y: x.date > y.date)
     (filter includePost (list post (import ./posts.nix)));
 
-  rendered = pkgs.runCommandNoCC "blog-posts" { } ''
+  rendered = pkgs.runCommand "blog-posts" { } ''
     mkdir -p $out
 
     ${lib.concatStringsSep "\n" (map (post:
@@ -25,7 +25,7 @@ let
     ) posts)}
   '';
 
-  formatDate = date: readFile (pkgs.runCommandNoCC "date" { } ''
+  formatDate = date: readFile (pkgs.runCommand "date" { } ''
     date --date='@${toString date}' '+%B %e, %Y' > $out
   '');
 
@@ -39,7 +39,7 @@ let
     postDate = formatDate post.date;
   });
 in
-pkgs.runCommandNoCC "blog" { } ''
+pkgs.runCommand "blog" { } ''
   mkdir -p $out
   cp ${withBrand (readFile postsHtml)} $out/index.html
   cp -r ${rendered} $out/posts
diff --git a/users/wpcarro/website/default.nix b/users/wpcarro/website/default.nix
index 19229aab5a35..047b783e3049 100644
--- a/users/wpcarro/website/default.nix
+++ b/users/wpcarro/website/default.nix
@@ -27,7 +27,7 @@ in
 {
   inherit domain renderTemplate withBrand;
 
-  root = pkgs.runCommandNoCC "wpcarro.dev" { } ''
+  root = pkgs.runCommand "wpcarro.dev" { } ''
     mkdir -p $out
 
     # /