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 <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
parent
f40283e098
commit
0c178a0ef6
58 changed files with 100 additions and 95 deletions
|
|
@ -17,7 +17,7 @@ depot.third_party.naersk.buildPackage {
|
|||
ncurses
|
||||
libxml2
|
||||
libffi
|
||||
pkgconfig
|
||||
pkg-config
|
||||
]);
|
||||
|
||||
doCheck = true;
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@ let
|
|||
};
|
||||
|
||||
in
|
||||
pkgs.runCommandNoCC "notmuch-extract-patch"
|
||||
pkgs.runCommand "notmuch-extract-patch"
|
||||
{
|
||||
buildInputs = [ pkgs.python3 ];
|
||||
} ''
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
with pkgs.lib;
|
||||
|
||||
pkgs.runCommandNoCC "resume.pdf"
|
||||
pkgs.runCommand "resume.pdf"
|
||||
{
|
||||
buildInputs = [
|
||||
(pkgs.texlive.combine {
|
||||
|
|
|
|||
|
|
@ -26,7 +26,7 @@ in
|
|||
home.packages = with pkgs; [
|
||||
zoom-us
|
||||
slack
|
||||
mysql
|
||||
mariadb
|
||||
graphviz
|
||||
gnuplot
|
||||
mypaint
|
||||
|
|
|
|||
|
|
@ -36,7 +36,7 @@ in
|
|||
# Nix things
|
||||
nixfmt
|
||||
nix-prefetch-github
|
||||
nix-review
|
||||
nixpkgs-review
|
||||
cachix
|
||||
|
||||
# ReadySet stuff
|
||||
|
|
|
|||
|
|
@ -26,7 +26,7 @@ in
|
|||
home.packages = with pkgs; [
|
||||
zoom-us
|
||||
slack
|
||||
mysql
|
||||
mariadb
|
||||
graphviz
|
||||
gnuplot
|
||||
mypaint
|
||||
|
|
|
|||
|
|
@ -45,7 +45,7 @@
|
|||
# Nix things
|
||||
nixfmt
|
||||
nix-prefetch-github
|
||||
nix-review
|
||||
nixpkgs-review
|
||||
cachix
|
||||
(writeShellScriptBin "rebuild-mugwump" ''
|
||||
set -eo pipefail
|
||||
|
|
|
|||
|
|
@ -22,7 +22,7 @@ let
|
|||
sha256 = "1an4h8jjbj3r618ykjwk9brii4h9cxjqy47c4c8rivnvhimgf4wm";
|
||||
};
|
||||
|
||||
vendorSha256 = "1a5fx6mrv30cl46kswicd8lf5i5shn1fykchvbnbhdpgxhbz6qi4";
|
||||
vendorHash = "sha256:1a5fx6mrv30cl46kswicd8lf5i5shn1fykchvbnbhdpgxhbz6qi4";
|
||||
};
|
||||
|
||||
in
|
||||
|
|
|
|||
|
|
@ -22,7 +22,7 @@
|
|||
sha256 = "168gkchshl5f1awqi1cgvdkm6q707702rnn0v4i5djqxmg5rk0p9";
|
||||
};
|
||||
|
||||
vendorSha256 = "16bx7cjh5cq9zlis8lf28i016avgqf3j9fmcvkqzd8db2vxpqx3v";
|
||||
vendorHash = "sha256:16bx7cjh5cq9zlis8lf28i016avgqf3j9fmcvkqzd8db2vxpqx3v";
|
||||
})
|
||||
|
||||
awscli2
|
||||
|
|
|
|||
|
|
@ -29,6 +29,10 @@ let
|
|||
|
||||
in
|
||||
{
|
||||
# 2022-09-26: workaround for home-manager defaulting to removed pkgs.gmailieer
|
||||
# attribute, can likely be removed soon
|
||||
programs.lieer.package = pkgs.lieer;
|
||||
|
||||
programs.lieer.enable = true;
|
||||
programs.notmuch.enable = true;
|
||||
services.lieer.enable = true;
|
||||
|
|
@ -45,7 +49,7 @@ in
|
|||
name = escapeUnitName "lieer-${name}";
|
||||
value.Service = {
|
||||
ExecStart = mkForce "${pkgs.writeShellScript "sync-${name}" ''
|
||||
${pkgs.gmailieer}/bin/gmi sync --path ~/mail/${name}
|
||||
${pkgs.lieer}/bin/gmi sync --path ~/mail/${name}
|
||||
''}";
|
||||
Environment = "NOTMUCH_CONFIG=${config.home.sessionVariables.NOTMUCH_CONFIG}";
|
||||
};
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@ name: { plugins }: module_tf:
|
|||
|
||||
let
|
||||
|
||||
inherit (pkgs) lib runCommandNoCC writeText writeScript;
|
||||
inherit (pkgs) lib runCommand writeText writeScript;
|
||||
inherit (lib) filterAttrsRecursive;
|
||||
|
||||
allPlugins = (p: plugins p ++ (with p; [
|
||||
|
|
@ -38,7 +38,7 @@ let
|
|||
plugins = plugins_tf;
|
||||
};
|
||||
|
||||
module = runCommandNoCC "module" { } ''
|
||||
module = runCommand "module" { } ''
|
||||
mkdir $out
|
||||
${lib.concatStrings (lib.mapAttrsToList (k: config_tf:
|
||||
(let
|
||||
|
|
@ -72,7 +72,7 @@ let
|
|||
'';
|
||||
|
||||
# TODO: import (-config)
|
||||
tfcmds = runCommandNoCC "${name}-tfcmds" { } ''
|
||||
tfcmds = runCommand "${name}-tfcmds" { } ''
|
||||
mkdir -p $out/bin
|
||||
ln -s ${init} $out/bin/init
|
||||
ln -s ${tfcmd} $out/bin/validate
|
||||
|
|
@ -95,7 +95,7 @@ in
|
|||
# destroy = depot.nix.nixRunWrapper "destroy" tfcmds;
|
||||
# };
|
||||
|
||||
test = runCommandNoCC "${name}-test" { } ''
|
||||
test = runCommand "${name}-test" { } ''
|
||||
set -e
|
||||
export TF_STATE_ROOT=$(pwd)
|
||||
${tfcmds}/bin/init
|
||||
|
|
|
|||
|
|
@ -75,7 +75,7 @@ let
|
|||
]);
|
||||
in
|
||||
|
||||
pkgs.runCommandNoCC "html.nix.html"
|
||||
pkgs.runCommand "html.nix.html"
|
||||
{
|
||||
passAsFile = [ "exampleDocument" ];
|
||||
inherit exampleDocument;
|
||||
|
|
|
|||
|
|
@ -56,7 +56,7 @@ let
|
|||
if !(drv ? cargoDeps.outPath)
|
||||
then null
|
||||
else
|
||||
pkgs.runCommandNoCC "${drv.name}-Cargo.lock" { } ''
|
||||
pkgs.runCommand "${drv.name}-Cargo.lock" { } ''
|
||||
if test -d "${drv.cargoDeps}"; then
|
||||
cp "${drv.cargoDeps}/Cargo.lock" "$out"
|
||||
fi
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@ let
|
|||
|
||||
posts = filter includePost (list post (import ./posts.nix));
|
||||
|
||||
rendered = pkgs.runCommandNoCC "tazjins-blog" { } ''
|
||||
rendered = pkgs.runCommand "tazjins-blog" { } ''
|
||||
mkdir -p $out
|
||||
|
||||
${lib.concatStringsSep "\n" (map (post:
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
{ depot, pkgs, ... }:
|
||||
|
||||
let
|
||||
checkZone = zone: file: pkgs.runCommandNoCC "${zone}-check" { } ''
|
||||
checkZone = zone: file: pkgs.runCommand "${zone}-check" { } ''
|
||||
${pkgs.bind}/bin/named-checkzone -i local ${zone} ${file} | tee $out
|
||||
'';
|
||||
|
||||
|
|
|
|||
|
|
@ -124,7 +124,7 @@ pkgs.makeOverridable
|
|||
(kill-emacs 1))
|
||||
'';
|
||||
in
|
||||
pkgs.runCommandNoCC "tdlibCheck" { } ''
|
||||
pkgs.runCommand "tdlibCheck" { } ''
|
||||
export PATH="${emacsBinPath}:$PATH"
|
||||
${tgEmacs}/bin/emacs --script ${verifyTdlibVersion} && touch $out
|
||||
'';
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@ depot.third_party.naersk.buildPackage {
|
|||
src = ./.;
|
||||
|
||||
buildInputs = with pkgs; [
|
||||
pkgconfig
|
||||
pkg-config
|
||||
openssl
|
||||
];
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -27,7 +27,7 @@ in
|
|||
{
|
||||
inherit domain renderTemplate withBrand;
|
||||
|
||||
root = pkgs.runCommandNoCC "wpcarro.dev" { } ''
|
||||
root = pkgs.runCommand "wpcarro.dev" { } ''
|
||||
mkdir -p $out
|
||||
|
||||
# /
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue