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:
parent
f40283e098
commit
0c178a0ef6
58 changed files with 100 additions and 95 deletions
|
|
@ -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
|
||||
];
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue