From 0c178a0ef61d2f5f4d6169c7a951663c62509cd7 Mon Sep 17 00:00:00 2001 From: sterni Date: Mon, 26 Sep 2022 19:33:05 +0200 Subject: 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 Tested-by: BuildkiteCI Reviewed-by: grfn Reviewed-by: flokli Reviewed-by: tazjin Reviewed-by: wpcarro --- users/grfn/achilles/default.nix | 2 +- users/grfn/pkgs/notmuch-extract-patch.nix | 2 +- users/grfn/resume/default.nix | 2 +- users/grfn/system/home/machines/ogopogo.nix | 2 +- users/grfn/system/home/machines/roswell.nix | 2 +- users/grfn/system/home/machines/yeren.nix | 2 +- users/grfn/system/home/modules/common.nix | 2 +- users/grfn/system/home/modules/development.nix | 2 +- users/grfn/system/home/modules/development/readyset.nix | 2 +- users/grfn/system/home/modules/email.nix | 6 +++++- users/grfn/terraform/workspace.nix | 8 ++++---- users/sterni/nix/html/tests/default.nix | 2 +- users/sterni/nixpkgs-crate-holes/default.nix | 2 +- users/tazjin/blog/default.nix | 2 +- users/tazjin/dns/default.nix | 2 +- users/tazjin/emacs/default.nix | 2 +- users/tazjin/homepage/default.nix | 6 +++--- users/tazjin/tgsa/default.nix | 2 +- users/wpcarro/website/blog/default.nix | 6 +++--- users/wpcarro/website/default.nix | 2 +- 20 files changed, 31 insertions(+), 27 deletions(-) (limited to 'users') diff --git a/users/grfn/achilles/default.nix b/users/grfn/achilles/default.nix index 6dab0a5a62f7..714be6072881 100644 --- a/users/grfn/achilles/default.nix +++ b/users/grfn/achilles/default.nix @@ -17,7 +17,7 @@ depot.third_party.naersk.buildPackage { ncurses libxml2 libffi - pkgconfig + pkg-config ]); doCheck = true; diff --git a/users/grfn/pkgs/notmuch-extract-patch.nix b/users/grfn/pkgs/notmuch-extract-patch.nix index 54dad260a041..7f00f925ec88 100644 --- a/users/grfn/pkgs/notmuch-extract-patch.nix +++ b/users/grfn/pkgs/notmuch-extract-patch.nix @@ -8,7 +8,7 @@ let }; in -pkgs.runCommandNoCC "notmuch-extract-patch" +pkgs.runCommand "notmuch-extract-patch" { buildInputs = [ pkgs.python3 ]; } '' diff --git a/users/grfn/resume/default.nix b/users/grfn/resume/default.nix index 21801ad9e7a8..4454e74c8261 100644 --- a/users/grfn/resume/default.nix +++ b/users/grfn/resume/default.nix @@ -2,7 +2,7 @@ with pkgs.lib; -pkgs.runCommandNoCC "resume.pdf" +pkgs.runCommand "resume.pdf" { buildInputs = [ (pkgs.texlive.combine { diff --git a/users/grfn/system/home/machines/ogopogo.nix b/users/grfn/system/home/machines/ogopogo.nix index e4144e79806e..d8150658a1ed 100644 --- a/users/grfn/system/home/machines/ogopogo.nix +++ b/users/grfn/system/home/machines/ogopogo.nix @@ -26,7 +26,7 @@ in home.packages = with pkgs; [ zoom-us slack - mysql + mariadb graphviz gnuplot mypaint diff --git a/users/grfn/system/home/machines/roswell.nix b/users/grfn/system/home/machines/roswell.nix index a5a32fa5867f..135477b12ddf 100644 --- a/users/grfn/system/home/machines/roswell.nix +++ b/users/grfn/system/home/machines/roswell.nix @@ -36,7 +36,7 @@ in # Nix things nixfmt nix-prefetch-github - nix-review + nixpkgs-review cachix # ReadySet stuff diff --git a/users/grfn/system/home/machines/yeren.nix b/users/grfn/system/home/machines/yeren.nix index d1edaacc146c..6ffa02a57c6a 100644 --- a/users/grfn/system/home/machines/yeren.nix +++ b/users/grfn/system/home/machines/yeren.nix @@ -26,7 +26,7 @@ in home.packages = with pkgs; [ zoom-us slack - mysql + mariadb graphviz gnuplot mypaint diff --git a/users/grfn/system/home/modules/common.nix b/users/grfn/system/home/modules/common.nix index ce2f9788b835..ab0a2d925d2c 100644 --- a/users/grfn/system/home/modules/common.nix +++ b/users/grfn/system/home/modules/common.nix @@ -45,7 +45,7 @@ # Nix things nixfmt nix-prefetch-github - nix-review + nixpkgs-review cachix (writeShellScriptBin "rebuild-mugwump" '' set -eo pipefail diff --git a/users/grfn/system/home/modules/development.nix b/users/grfn/system/home/modules/development.nix index 3420fd652231..75af94bd4002 100644 --- a/users/grfn/system/home/modules/development.nix +++ b/users/grfn/system/home/modules/development.nix @@ -22,7 +22,7 @@ let sha256 = "1an4h8jjbj3r618ykjwk9brii4h9cxjqy47c4c8rivnvhimgf4wm"; }; - vendorSha256 = "1a5fx6mrv30cl46kswicd8lf5i5shn1fykchvbnbhdpgxhbz6qi4"; + vendorHash = "sha256:1a5fx6mrv30cl46kswicd8lf5i5shn1fykchvbnbhdpgxhbz6qi4"; }; in diff --git a/users/grfn/system/home/modules/development/readyset.nix b/users/grfn/system/home/modules/development/readyset.nix index 4b6edb438039..5c566c1060dd 100644 --- a/users/grfn/system/home/modules/development/readyset.nix +++ b/users/grfn/system/home/modules/development/readyset.nix @@ -22,7 +22,7 @@ sha256 = "168gkchshl5f1awqi1cgvdkm6q707702rnn0v4i5djqxmg5rk0p9"; }; - vendorSha256 = "16bx7cjh5cq9zlis8lf28i016avgqf3j9fmcvkqzd8db2vxpqx3v"; + vendorHash = "sha256:16bx7cjh5cq9zlis8lf28i016avgqf3j9fmcvkqzd8db2vxpqx3v"; }) awscli2 diff --git a/users/grfn/system/home/modules/email.nix b/users/grfn/system/home/modules/email.nix index 4d5f3df69587..55dd70529b9b 100644 --- a/users/grfn/system/home/modules/email.nix +++ b/users/grfn/system/home/modules/email.nix @@ -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}"; }; diff --git a/users/grfn/terraform/workspace.nix b/users/grfn/terraform/workspace.nix index 92bf6e4ec1c5..114105642a3c 100644 --- a/users/grfn/terraform/workspace.nix +++ b/users/grfn/terraform/workspace.nix @@ -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 diff --git a/users/sterni/nix/html/tests/default.nix b/users/sterni/nix/html/tests/default.nix index 0d80f2f1cd70..ed520675c55a 100644 --- a/users/sterni/nix/html/tests/default.nix +++ b/users/sterni/nix/html/tests/default.nix @@ -75,7 +75,7 @@ let ]); in -pkgs.runCommandNoCC "html.nix.html" +pkgs.runCommand "html.nix.html" { passAsFile = [ "exampleDocument" ]; inherit exampleDocument; diff --git a/users/sterni/nixpkgs-crate-holes/default.nix b/users/sterni/nixpkgs-crate-holes/default.nix index c24200ff10f9..1630ecb8f1da 100644 --- a/users/sterni/nixpkgs-crate-holes/default.nix +++ b/users/sterni/nixpkgs-crate-holes/default.nix @@ -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 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 ]; } diff --git a/users/wpcarro/website/blog/default.nix b/users/wpcarro/website/blog/default.nix index d87b714b6fe1..31b1c7df9c79 100644 --- a/users/wpcarro/website/blog/default.nix +++ b/users/wpcarro/website/blog/default.nix @@ -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 diff --git a/users/wpcarro/website/default.nix b/users/wpcarro/website/default.nix index 19229aab5a35..047b783e3049 100644 --- a/users/wpcarro/website/default.nix +++ b/users/wpcarro/website/default.nix @@ -27,7 +27,7 @@ in { inherit domain renderTemplate withBrand; - root = pkgs.runCommandNoCC "wpcarro.dev" { } '' + root = pkgs.runCommand "wpcarro.dev" { } '' mkdir -p $out # / -- cgit 1.4.1