diff options
author | sterni <sternenseemann@systemli.org> | 2022-09-26T17·33+0200 |
---|---|---|
committer | sterni <sternenseemann@systemli.org> | 2022-09-28T08·02+0000 |
commit | 0c178a0ef61d2f5f4d6169c7a951663c62509cd7 (patch) | |
tree | 08d4b97e5d423f9624211f92700e8bd1cf27fcbc /users/tazjin | |
parent | f40283e0985b5e16a7d67e018a16b0d52f09b90c (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/tazjin')
-rw-r--r-- | users/tazjin/blog/default.nix | 2 | ||||
-rw-r--r-- | users/tazjin/dns/default.nix | 2 | ||||
-rw-r--r-- | users/tazjin/emacs/default.nix | 2 | ||||
-rw-r--r-- | users/tazjin/homepage/default.nix | 6 | ||||
-rw-r--r-- | users/tazjin/tgsa/default.nix | 2 |
5 files changed, 7 insertions, 7 deletions
diff --git a/users/tazjin/blog/default.nix b/users/tazjin/blog/default.nix index c8b3c318995b..4f1ddc5ea5ed 100644 --- a/users/tazjin/blog/default.nix +++ b/users/tazjin/blog/default.nix @@ -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: diff --git a/users/tazjin/dns/default.nix b/users/tazjin/dns/default.nix index 6c51cb5de4f5..6ff6cc06e249 100644 --- a/users/tazjin/dns/default.nix +++ b/users/tazjin/dns/default.nix @@ -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 ''; diff --git a/users/tazjin/emacs/default.nix b/users/tazjin/emacs/default.nix index 5b778be1d9b6..6069e8c7fe0f 100644 --- a/users/tazjin/emacs/default.nix +++ b/users/tazjin/emacs/default.nix @@ -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 ''; diff --git a/users/tazjin/homepage/default.nix b/users/tazjin/homepage/default.nix index 0edb75d60933..15f4d787c0b5 100644 --- a/users/tazjin/homepage/default.nix +++ b/users/tazjin/homepage/default.nix @@ -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 diff --git a/users/tazjin/tgsa/default.nix b/users/tazjin/tgsa/default.nix index ef8842ea26be..3a0ffab28495 100644 --- a/users/tazjin/tgsa/default.nix +++ b/users/tazjin/tgsa/default.nix @@ -4,7 +4,7 @@ depot.third_party.naersk.buildPackage { src = ./.; buildInputs = with pkgs; [ - pkgconfig + pkg-config openssl ]; } |