maurice/snix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
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>
This commit is contained in:
sterni 2022-09-26 19:33:05 +02:00
parent f40283e098
commit 0c178a0ef6
58 changed files with 100 additions and 95 deletions
Download patch file Download diff file Expand all files Collapse all files

4
web/atom-feed/default.nix
View file

@ -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
''));

4
web/blog/fragments.nix
View file

@ -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

2
web/converse/default.nix
View file

@ -3,5 +3,5 @@
depot.third_party.naersk.buildPackage {
src = ./.;
buildInputs = with pkgs; [ openssl postgresql.lib ];
nativeBuildInputs = [ pkgs.pkgconfig ];
nativeBuildInputs = [ pkgs.pkg-config ];
}

4
web/todolist/default.nix
View file

@ -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
''));

6
web/tvl/default.nix
View file

@ -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}

2
web/tvl/logo/default.nix
View file

@ -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 \

4
web/tvl/template/default.nix
View file

@ -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>