about summary refs log tree commit diff
path: root/web
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 /web
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 'web')
-rw-r--r--web/atom-feed/default.nix4
-rw-r--r--web/blog/fragments.nix4
-rw-r--r--web/converse/default.nix2
-rw-r--r--web/todolist/default.nix4
-rw-r--r--web/tvl/default.nix6
-rw-r--r--web/tvl/logo/default.nix2
-rw-r--r--web/tvl/template/default.nix4
7 files changed, 13 insertions, 13 deletions
diff --git a/web/atom-feed/default.nix b/web/atom-feed/default.nix
index fca69e20fa..27c90a7b91 100644
--- a/web/atom-feed/default.nix
+++ b/web/atom-feed/default.nix
@@ -7,7 +7,7 @@ with depot.nix.yants;
 let
   inherit (builtins) foldl' map readFile replaceStrings sort;
   inherit (lib) concatStrings concatStringsSep max removeSuffix;
-  inherit (pkgs) runCommandNoCC;
+  inherit (pkgs) runCommand;
 
   # 'link' describes a related link to a feed, or feed element.
   #
@@ -90,7 +90,7 @@ let
 
   # Feed generation functions:
 
-  renderEpoch = epoch: removeSuffix "\n" (readFile (runCommandNoCC "date-${toString epoch}" { } ''
+  renderEpoch = epoch: removeSuffix "\n" (readFile (runCommand "date-${toString epoch}" { } ''
     date --date='@${toString epoch}' --utc --iso-8601='seconds' > $out
   ''));
 
diff --git a/web/blog/fragments.nix b/web/blog/fragments.nix
index 8126278270..4d08a76b84 100644
--- a/web/blog/fragments.nix
+++ b/web/blog/fragments.nix
@@ -8,7 +8,7 @@
 
 let
   inherit (builtins) filter map hasAttr replaceStrings;
-  inherit (pkgs) runCommandNoCC writeText;
+  inherit (pkgs) runCommand writeText;
   inherit (depot.nix) renderMarkdown;
 
   staticUrl = "https://static.tvl.fyi/${depot.web.static.drvHash}";
@@ -61,7 +61,7 @@ let
     <hr>
   '';
 
-  renderPost = { name, footer, ... }: post: runCommandNoCC "${post.key}.html" { } ''
+  renderPost = { name, footer, ... }: post: runCommand "${post.key}.html" { } ''
     cat ${writeText "header.html" (header name post.title)} > $out
 
     # Write the post title & date
diff --git a/web/converse/default.nix b/web/converse/default.nix
index cc2dab7f88..7a6583d31e 100644
--- a/web/converse/default.nix
+++ b/web/converse/default.nix
@@ -3,5 +3,5 @@
 depot.third_party.naersk.buildPackage {
   src = ./.;
   buildInputs = with pkgs; [ openssl postgresql.lib ];
-  nativeBuildInputs = [ pkgs.pkgconfig ];
+  nativeBuildInputs = [ pkgs.pkg-config ];
 }
diff --git a/web/todolist/default.nix b/web/todolist/default.nix
index c37a655559..4712ad21ba 100644
--- a/web/todolist/default.nix
+++ b/web/todolist/default.nix
@@ -8,7 +8,7 @@ let
   inherit (pkgs)
     jq
     ripgrep
-    runCommandNoCC
+    runCommand
     writeTextFile
     ;
 
@@ -39,7 +39,7 @@ let
     user = string;
   };
 
-  allTodos = fromJSON (readFile (runCommandNoCC "depot-todos.json" { } ''
+  allTodos = fromJSON (readFile (runCommand "depot-todos.json" { } ''
     ${ripgrep}/bin/rg --json 'TODO\(\w+\):.*$' ${depot.path} | \
       ${jq}/bin/jq -s -f ${./extract-todos.jq} > $out
   ''));
diff --git a/web/tvl/default.nix b/web/tvl/default.nix
index 262be54c0e..044d2791d6 100644
--- a/web/tvl/default.nix
+++ b/web/tvl/default.nix
@@ -4,7 +4,7 @@ with depot.nix.yants;
 
 let
   inherit (builtins) filter;
-  inherit (pkgs) graphviz runCommandNoCC writeText;
+  inherit (pkgs) graphviz runCommand writeText;
   inherit (depot.web) atom-feed blog tvl;
 
   listPosts = defun [ (list blog.post) string ] (posts:
@@ -16,7 +16,7 @@ let
       (map (p: "cp ${blog.renderPost tvl.blog.config p} $out/blog/${p.key}.html") posts)
   );
 
-  tvlGraph = runCommandNoCC "tvl.svg"
+  tvlGraph = runCommand "tvl.svg"
     {
       nativeBuildInputs = with pkgs; [ fontconfig freetype cairo jetbrains-mono ];
     } ''
@@ -123,7 +123,7 @@ let
     '';
   };
 in
-runCommandNoCC "website" { } ''
+runCommand "website" { } ''
   mkdir -p $out/blog
   cp ${homepage} $out/index.html
   ${postRenderingCommands tvl.blog.posts}
diff --git a/web/tvl/logo/default.nix b/web/tvl/logo/default.nix
index d9e023946a..8084135492 100644
--- a/web/tvl/logo/default.nix
+++ b/web/tvl/logo/default.nix
@@ -78,7 +78,7 @@ depot.nix.readTree.drvTargets (lib.fix (self: {
   logoSvg = style: pkgs.writeText "logo.svg" (logoSvg style);
 
   # Create a PNG of the TVL logo with the specified style and DPI.
-  logoPng = style: dpi: pkgs.runCommandNoCC "logo.png" { } ''
+  logoPng = style: dpi: pkgs.runCommand "logo.png" { } ''
     ${pkgs.inkscape}/bin/inkscape \
       --export-area-drawing \
       --export-background-opacity 0 \
diff --git a/web/tvl/template/default.nix b/web/tvl/template/default.nix
index 6b6a5b0303..50ddc31e73 100644
--- a/web/tvl/template/default.nix
+++ b/web/tvl/template/default.nix
@@ -14,11 +14,11 @@
 }@args:
 
 let
-  inherit (pkgs) runCommandNoCC lib;
+  inherit (pkgs) runCommand lib;
   inherit (depot.tools) cheddar;
 in
 
-runCommandNoCC "${lib.strings.sanitizeDerivationName title}-index.html"
+runCommand "${lib.strings.sanitizeDerivationName title}-index.html"
 {
   headerPart = ''
     <!DOCTYPE html>