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 --- corp/website/default.nix | 2 +- fun/gemma/default.nix | 4 +-- fun/paroxysm/default.nix | 2 +- fun/tvl-ebooks/default.nix | 2 +- net/alcoholic_jwt/default.nix | 2 +- net/crimp/default.nix | 2 +- nix/buildLisp/default.nix | 10 ++++---- nix/buildkite/default.nix | 4 +-- nix/renderMarkdown/default.nix | 2 +- nix/sparseTree/default.nix | 2 +- ops/dns/default.nix | 2 +- ops/journaldriver/default.nix | 2 +- ops/modules/clbot.nix | 4 +-- ops/modules/monorepo-gerrit.nix | 2 +- ops/modules/oauth2_proxy.nix | 2 +- ops/modules/tvl-buildkite.nix | 2 +- ops/modules/tvl-users.nix | 2 +- ops/pipelines/depot.nix | 2 +- third_party/bat_syntaxes/default.nix | 4 +-- third_party/bufbuild/default.nix | 2 +- third_party/buzz/default.nix | 2 +- third_party/gerrit-queue/default.nix | 2 +- third_party/irccat/default.nix | 2 +- third_party/josh/default.nix | 2 +- third_party/overlays/tvl.nix | 5 ++-- .../prometheus-fail2ban-exporter/default.nix | 2 +- third_party/smtprelay/default.nix | 2 +- third_party/sources/sources.json | 30 +++++++++++----------- third_party/terraform-provider-glesys/default.nix | 4 +-- tools/nixery/default.nix | 2 +- tvix/proto/default.nix | 2 +- 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 +- .../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 +- web/atom-feed/default.nix | 4 +-- web/blog/fragments.nix | 4 +-- web/converse/default.nix | 2 +- web/todolist/default.nix | 4 +-- web/tvl/default.nix | 6 ++--- web/tvl/logo/default.nix | 2 +- web/tvl/template/default.nix | 4 +-- 58 files changed, 100 insertions(+), 95 deletions(-) diff --git a/corp/website/default.nix b/corp/website/default.nix index 2011e2a376..f226c19f74 100644 --- a/corp/website/default.nix +++ b/corp/website/default.nix @@ -31,7 +31,7 @@ let ''; }; in -pkgs.runCommandNoCC "corp-website" { } '' +pkgs.runCommand "corp-website" { } '' mkdir $out cp ${index} $out/index.html '' diff --git a/fun/gemma/default.nix b/fun/gemma/default.nix index 4a26005852..f3fedad17b 100644 --- a/fun/gemma/default.nix +++ b/fun/gemma/default.nix @@ -1,7 +1,7 @@ { depot, pkgs, ... }: let - inherit (pkgs) cacert iana-etc libredirect stdenv runCommandNoCC writeText; + inherit (pkgs) cacert iana-etc libredirect stdenv runCommand writeText; elmPackages = depot.third_party.elmPackages_0_18; frontend = stdenv.mkDerivation { @@ -28,7 +28,7 @@ let injectFrontend = writeText "gemma-frontend.lisp" '' (in-package :gemma) - (setq *static-file-location* "${runCommandNoCC "frontend" {} '' + (setq *static-file-location* "${runCommand "frontend" {} '' mkdir -p $out cp ${frontend} $out/index.html ''}/") diff --git a/fun/paroxysm/default.nix b/fun/paroxysm/default.nix index e4ce4df1ae..1aeaeb9912 100644 --- a/fun/paroxysm/default.nix +++ b/fun/paroxysm/default.nix @@ -7,7 +7,7 @@ depot.third_party.naersk.buildPackage { buildInputs = with pkgs; [ openssl - pkgconfig + pkg-config postgresql.lib curl ]; diff --git a/fun/tvl-ebooks/default.nix b/fun/tvl-ebooks/default.nix index fde6e05822..68e61c2525 100644 --- a/fun/tvl-ebooks/default.nix +++ b/fun/tvl-ebooks/default.nix @@ -2,6 +2,6 @@ pkgs.buildGoModule { name = "tvl-ebooks"; - vendorSha256 = "1p7bazh2vbhvvm559bcvfff9s4yy4q9jmklxr3sfp97inwpv6hzy"; + vendorHash = "sha256:1p7bazh2vbhvvm559bcvfff9s4yy4q9jmklxr3sfp97inwpv6hzy"; src = ./.; } diff --git a/net/alcoholic_jwt/default.nix b/net/alcoholic_jwt/default.nix index c6b84fb7ab..aa1df10c8b 100644 --- a/net/alcoholic_jwt/default.nix +++ b/net/alcoholic_jwt/default.nix @@ -4,6 +4,6 @@ depot.third_party.naersk.buildPackage { src = ./.; buildInputs = with pkgs; [ openssl - pkgconfig + pkg-config ]; } diff --git a/net/crimp/default.nix b/net/crimp/default.nix index c6b84fb7ab..aa1df10c8b 100644 --- a/net/crimp/default.nix +++ b/net/crimp/default.nix @@ -4,6 +4,6 @@ depot.third_party.naersk.buildPackage { src = ./.; buildInputs = with pkgs; [ openssl - pkgconfig + pkg-config ]; } diff --git a/nix/buildLisp/default.nix b/nix/buildLisp/default.nix index 4266fa18d0..eb85f0ff51 100644 --- a/nix/buildLisp/default.nix +++ b/nix/buildLisp/default.nix @@ -8,7 +8,7 @@ let inherit (builtins) map elemAt match filter; - inherit (pkgs) lib runCommandNoCC makeWrapper writeText writeShellScriptBin sbcl ecl-static ccl; + inherit (pkgs) lib runCommand makeWrapper writeText writeShellScriptBin sbcl ecl-static ccl; inherit (pkgs.stdenv) targetPlatform; # @@ -187,7 +187,7 @@ let lispNativeDeps = allNative native lispDeps; filteredSrcs = implFilter implementation srcs; in - runCommandNoCC name + runCommand name { LD_LIBRARY_PATH = lib.makeLibraryPath lispNativeDeps; LANG = "C.UTF-8"; @@ -475,7 +475,7 @@ let } $@ ''; - bundled = name: runCommandNoCC "${name}-cllib" + bundled = name: runCommand "${name}-cllib" { passthru = { lispName = name; @@ -640,7 +640,7 @@ let } else null; in - lib.fix (self: runCommandNoCC "${name}-cllib" + lib.fix (self: runCommand "${name}-cllib" { LD_LIBRARY_PATH = lib.makeLibraryPath lispNativeDeps; LANG = "C.UTF-8"; @@ -707,7 +707,7 @@ let } else null; in - lib.fix (self: runCommandNoCC "${name}" + lib.fix (self: runCommand "${name}" { nativeBuildInputs = [ makeWrapper ]; LD_LIBRARY_PATH = libPath; diff --git a/nix/buildkite/default.nix b/nix/buildkite/default.nix index 898c4f5cb8..f588b27b52 100644 --- a/nix/buildkite/default.nix +++ b/nix/buildkite/default.nix @@ -25,7 +25,7 @@ let toJSON unsafeDiscardStringContext; - inherit (pkgs) lib runCommandNoCC writeText; + inherit (pkgs) lib runCommand writeText; inherit (depot.nix.readTree) mkLabel; in rec { @@ -225,7 +225,7 @@ rec { phases; in - runCommandNoCC "buildkite-pipeline" { } '' + runCommand "buildkite-pipeline" { } '' mkdir $out echo "Generated ${toString (length chunks)} pipeline chunks" ${ diff --git a/nix/renderMarkdown/default.nix b/nix/renderMarkdown/default.nix index 8d6b31cfcc..c5e830c834 100644 --- a/nix/renderMarkdown/default.nix +++ b/nix/renderMarkdown/default.nix @@ -3,6 +3,6 @@ with depot.nix.yants; -defun [ path drv ] (file: pkgs.runCommandNoCC "${file}.rendered.html" { } '' +defun [ path drv ] (file: pkgs.runCommand "${file}.rendered.html" { } '' cat ${file} | ${depot.tools.cheddar}/bin/cheddar --about-filter ${file} > $out '') diff --git a/nix/sparseTree/default.nix b/nix/sparseTree/default.nix index 16fc9b6103..bf56a5348c 100644 --- a/nix/sparseTree/default.nix +++ b/nix/sparseTree/default.nix @@ -64,7 +64,7 @@ in # TODO(sterni): teach readTree to also read symlinked directories, # so we ln -sT instead of cp -aT. -pkgs.runCommandNoCC "sparse-${builtins.baseNameOf root}" { } ( +pkgs.runCommand "sparse-${builtins.baseNameOf root}" { } ( lib.concatMapStrings ({ src, dst }: '' mkdir -p "$(dirname "$out${dst}")" diff --git a/ops/dns/default.nix b/ops/dns/default.nix index ad6e136f27..33fe6d6fe7 100644 --- a/ops/dns/default.nix +++ b/ops/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/ops/journaldriver/default.nix b/ops/journaldriver/default.nix index a06a858fa1..2a3836c358 100644 --- a/ops/journaldriver/default.nix +++ b/ops/journaldriver/default.nix @@ -4,7 +4,7 @@ depot.third_party.naersk.buildPackage { src = ./.; buildInputs = with pkgs; [ - pkgconfig + pkg-config openssl systemd.dev ]; diff --git a/ops/modules/clbot.nix b/ops/modules/clbot.nix index 84575ed072..bdddff6c81 100644 --- a/ops/modules/clbot.nix +++ b/ops/modules/clbot.nix @@ -3,7 +3,7 @@ let inherit (builtins) attrValues concatStringsSep mapAttrs readFile; - inherit (pkgs) runCommandNoCC; + inherit (pkgs) runCommand; inherit (lib) listToAttrs @@ -21,7 +21,7 @@ let (attrValues (mapAttrs (key: value: "-${key} \"${toString value}\"") flags)); # Escapes a unit name for use in systemd - systemdEscape = name: removeSuffix "\n" (readFile (runCommandNoCC "unit-name" { } '' + systemdEscape = name: removeSuffix "\n" (readFile (runCommand "unit-name" { } '' ${pkgs.systemd}/bin/systemd-escape '${name}' >> $out '')); diff --git a/ops/modules/monorepo-gerrit.nix b/ops/modules/monorepo-gerrit.nix index d41e02764c..059dee5794 100644 --- a/ops/modules/monorepo-gerrit.nix +++ b/ops/modules/monorepo-gerrit.nix @@ -9,7 +9,7 @@ let exec -a ${name} ${depot.ops.besadii}/bin/besadii "$@" ''; - gerritHooks = pkgs.runCommandNoCC "gerrit-hooks" { } '' + gerritHooks = pkgs.runCommand "gerrit-hooks" { } '' mkdir -p $out ln -s ${besadiiWithConfig "change-merged"} $out/change-merged ln -s ${besadiiWithConfig "patchset-created"} $out/patchset-created diff --git a/ops/modules/oauth2_proxy.nix b/ops/modules/oauth2_proxy.nix index 23afa7bce0..53dec452ec 100644 --- a/ops/modules/oauth2_proxy.nix +++ b/ops/modules/oauth2_proxy.nix @@ -53,7 +53,7 @@ in RestartSec = "5s"; DynamicUser = true; EnvironmentFile = cfg.secretsFile; - ExecStart = "${pkgs.oauth2_proxy}/bin/oauth2-proxy --config ${configFile}"; + ExecStart = "${pkgs.oauth2-proxy}/bin/oauth2-proxy --config ${configFile}"; }; }; }; diff --git a/ops/modules/tvl-buildkite.nix b/ops/modules/tvl-buildkite.nix index 4341ef01d7..8787956554 100644 --- a/ops/modules/tvl-buildkite.nix +++ b/ops/modules/tvl-buildkite.nix @@ -13,7 +13,7 @@ let # All Buildkite hooks are actually besadii, but it's being invoked # with different names. - buildkiteHooks = pkgs.runCommandNoCC "buildkite-hooks" { } '' + buildkiteHooks = pkgs.runCommand "buildkite-hooks" { } '' mkdir -p $out/bin ln -s ${besadiiWithConfig "post-command"} $out/bin/post-command ''; diff --git a/ops/modules/tvl-users.nix b/ops/modules/tvl-users.nix index 988b9eed8a..c01809e0e6 100644 --- a/ops/modules/tvl-users.nix +++ b/ops/modules/tvl-users.nix @@ -86,7 +86,7 @@ environment.systemPackages = with pkgs; [ alacritty.terminfo foot.terminfo - rxvt_unicode.terminfo + rxvt-unicode-unwrapped.terminfo # TODO(sterni): re-enable when the kitty build is fixed upstreams # kitty.terminfo diff --git a/ops/pipelines/depot.nix b/ops/pipelines/depot.nix index 6d9e625e04..3a7788baed 100644 --- a/ops/pipelines/depot.nix +++ b/ops/pipelines/depot.nix @@ -42,7 +42,7 @@ let drvmap = depot.nix.buildkite.mkDrvmap depot.ci.targets; in -pkgs.runCommandNoCC "depot-pipeline" { } '' +pkgs.runCommand "depot-pipeline" { } '' mkdir $out cp -r ${pipeline}/* $out cp ${drvmap} $out/drvmap.json diff --git a/third_party/bat_syntaxes/default.nix b/third_party/bat_syntaxes/default.nix index a48962dd36..15af130916 100644 --- a/third_party/bat_syntaxes/default.nix +++ b/third_party/bat_syntaxes/default.nix @@ -7,9 +7,9 @@ { pkgs, ... }: let - inherit (pkgs) bat runCommandNoCC; + inherit (pkgs) bat runCommand; in -runCommandNoCC "bat-syntaxes.bin" { } '' +runCommand "bat-syntaxes.bin" { } '' export HOME=$PWD mkdir -p .config/bat/syntaxes cp ${./Prolog.sublime-syntax} .config/bat/syntaxes diff --git a/third_party/bufbuild/default.nix b/third_party/bufbuild/default.nix index 12683b1062..38d84b24bc 100644 --- a/third_party/bufbuild/default.nix +++ b/third_party/bufbuild/default.nix @@ -5,7 +5,7 @@ pkgs.buildGoModule { pname = "buf"; version = "v0.20.1"; - vendorSha256 = "1gg5c7aiqb4w1zxwsraxxpln33xkmkzlp1h69xgi9i08zvrfipqs"; + vendorHash = "sha256:1gg5c7aiqb4w1zxwsraxxpln33xkmkzlp1h69xgi9i08zvrfipqs"; src = pkgs.fetchFromGitHub { owner = "bufbuild"; diff --git a/third_party/buzz/default.nix b/third_party/buzz/default.nix index f1080bcd45..801eed29f5 100644 --- a/third_party/buzz/default.nix +++ b/third_party/buzz/default.nix @@ -9,7 +9,7 @@ depot.third_party.naersk.buildPackage { }; buildInputs = with pkgs; [ - pkgconfig + pkg-config dbus glib openssl_1_1 diff --git a/third_party/gerrit-queue/default.nix b/third_party/gerrit-queue/default.nix index 427e312183..d3988f59d1 100644 --- a/third_party/gerrit-queue/default.nix +++ b/third_party/gerrit-queue/default.nix @@ -3,7 +3,7 @@ pkgs.buildGoModule { pname = "gerrit-queue"; version = "master"; - vendorSha256 = "0n5h7j416yb2mwic9c3rhqza64jlvl7iw507r9mkw3jadn4whm7a"; + vendorHash = "sha256:0n5h7j416yb2mwic9c3rhqza64jlvl7iw507r9mkw3jadn4whm7a"; src = ./.; meta = with lib; { diff --git a/third_party/irccat/default.nix b/third_party/irccat/default.nix index 3181fd2067..c5d7a5f6df 100644 --- a/third_party/irccat/default.nix +++ b/third_party/irccat/default.nix @@ -5,7 +5,7 @@ pkgs.buildGoModule rec { pname = "irccat"; version = "20201108"; meta.license = lib.licenses.gpl3; - vendorSha256 = "06a985y4alw1rsghgmhfyczns6klz7bbkfn5mnqc9fdfclgg4s3r"; + vendorHash = "sha256:06a985y4alw1rsghgmhfyczns6klz7bbkfn5mnqc9fdfclgg4s3r"; src = pkgs.fetchFromGitHub { owner = "irccloud"; diff --git a/third_party/josh/default.nix b/third_party/josh/default.nix index c82f91f80c..8900c6ad45 100644 --- a/third_party/josh/default.nix +++ b/third_party/josh/default.nix @@ -15,7 +15,7 @@ depot.third_party.naersk.buildPackage { buildInputs = with pkgs; [ libgit2 openssl - pkgconfig + pkg-config ]; cargoBuildOptions = x: x ++ [ diff --git a/third_party/overlays/tvl.nix b/third_party/overlays/tvl.nix index ca9be65f5c..2e2ed549b4 100644 --- a/third_party/overlays/tvl.nix +++ b/third_party/overlays/tvl.nix @@ -9,14 +9,15 @@ let nixSrc = let # branch 2.3-backport-await-users - rev = "abdc60f49f1104696bac723331d3ed0296d5a784"; + # XXX(tazjin): merge https://github.com/tvlfyi/nix/pull/3 + rev = "22efe1ed25dff2fa15345a0f187e5ad450552599"; in self.fetchFromGitHub { owner = "tvlfyi"; repo = "nix"; inherit rev; - hash = "sha256:0c1pmg8y0yafdkliz970k52s92z3qin3xrz3g0n2ss7xcfbg8nzy"; + hash = "sha256:0rwyrh471c5y64axyd8vzzzmzlscg97fsrjbgbm1a93wnzxcvnvk"; } // { revCount = 0; shortRev = builtins.substring 0 7 rev; }; in { diff --git a/third_party/prometheus-fail2ban-exporter/default.nix b/third_party/prometheus-fail2ban-exporter/default.nix index 818839e48c..42ba0a14db 100644 --- a/third_party/prometheus-fail2ban-exporter/default.nix +++ b/third_party/prometheus-fail2ban-exporter/default.nix @@ -7,7 +7,7 @@ let }; python = pkgs.python3.withPackages (p: [ - p.prometheus_client + p.prometheus-client ]); in diff --git a/third_party/smtprelay/default.nix b/third_party/smtprelay/default.nix index b2d730a667..1a68245e92 100644 --- a/third_party/smtprelay/default.nix +++ b/third_party/smtprelay/default.nix @@ -4,7 +4,7 @@ pkgs.buildGoModule rec { pname = "smtprelay"; version = "1.7.0"; - vendorSha256 = "00nb81hdg5pv5l0q7w5lv08dv4v72vml7jha351frani0gpg27pn"; + vendorHash = "sha256:00nb81hdg5pv5l0q7w5lv08dv4v72vml7jha351frani0gpg27pn"; src = pkgs.fetchFromGitHub { owner = "decke"; diff --git a/third_party/sources/sources.json b/third_party/sources/sources.json index f7923e58a1..578d854d47 100644 --- a/third_party/sources/sources.json +++ b/third_party/sources/sources.json @@ -5,10 +5,10 @@ "homepage": "https://matrix.to/#/#agenix:nixos.org", "owner": "ryantm", "repo": "agenix", - "rev": "c96da5835b76d3d8e8d99a0fec6fe32f8539ee2e", - "sha256": "05b504v6jn8kk3ihfv5crisfqn9p7i1cbhrlqdj4h6gg5fyqzfms", + "rev": "6acb1fe5f8597d5ce63fc82bc7fcac7774b1cdf0", + "sha256": "0k6aggy3lhqv6j11cvi4gr0i3jps8hlf262xl9ji3ffxwas46p54", "type": "tarball", - "url": "https://github.com/ryantm/agenix/archive/c96da5835b76d3d8e8d99a0fec6fe32f8539ee2e.tar.gz", + "url": "https://github.com/ryantm/agenix/archive/6acb1fe5f8597d5ce63fc82bc7fcac7774b1cdf0.tar.gz", "url_template": "https://github.com///archive/.tar.gz" }, "emacs-overlay": { @@ -17,10 +17,10 @@ "homepage": "", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "6346fa5aa82fd663d340fe1e16e213128cad7542", - "sha256": "1yj28if5l4gg6h4sg3ffmdfarlnyqx09gqzspdxjvf2l18kli47a", + "rev": "117975b8082f22730778f9ad4529ff001b01b6cf", + "sha256": "0w8djx0z8h349ak0a1l7z7959bjfdkrardnpcdp31hlknff73azk", "type": "tarball", - "url": "https://github.com/nix-community/emacs-overlay/archive/6346fa5aa82fd663d340fe1e16e213128cad7542.tar.gz", + "url": "https://github.com/nix-community/emacs-overlay/archive/117975b8082f22730778f9ad4529ff001b01b6cf.tar.gz", "url_template": "https://github.com///archive/.tar.gz" }, "impermanence": { @@ -53,10 +53,10 @@ "homepage": "", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d6490a0bd9dfb298fcd8382d3363b86870dc7340", - "sha256": "1wf0vgzfkpa1famz1fxx2758nm13k7dhkz1z8f4bgasmc2bxfckc", + "rev": "79d3ca08920364759c63fd3eb562e99c0c17044a", + "sha256": "1zz72k161yl9dxs5nxgy5p6nh8zsz4fbpclm99r12jw39zrlzhhw", "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/d6490a0bd9dfb298fcd8382d3363b86870dc7340.tar.gz", + "url": "https://github.com/NixOS/nixpkgs/archive/79d3ca08920364759c63fd3eb562e99c0c17044a.tar.gz", "url_template": "https://github.com///archive/.tar.gz" }, "nixpkgs-stable": { @@ -77,10 +77,10 @@ "homepage": "", "owner": "oxalica", "repo": "rust-overlay", - "rev": "f45f856ae5a9fe2c48d756fa17bb9c5b3b8070c5", - "sha256": "152pw4a1vs4kiwfmncsc9d4zgd3v1li09adqm9ssq62jmxvzz217", + "rev": "e6c6adb0438a46baaf820d3f52ca587b44437d34", + "sha256": "0kcq4q8g5xc7iyj39523p1zkj5hjs403q1cykc78mcq4l20k702a", "type": "tarball", - "url": "https://github.com/oxalica/rust-overlay/archive/f45f856ae5a9fe2c48d756fa17bb9c5b3b8070c5.tar.gz", + "url": "https://github.com/oxalica/rust-overlay/archive/e6c6adb0438a46baaf820d3f52ca587b44437d34.tar.gz", "url_template": "https://github.com///archive/.tar.gz" }, "rustsec-advisory-db": { @@ -89,10 +89,10 @@ "homepage": "https://rustsec.org", "owner": "RustSec", "repo": "advisory-db", - "rev": "a25cb0b593af26eeb7823a407163ec130028d62f", - "sha256": "19bc3qik3599nv1h89phq0k6miapgfvpkza3y52d80gnrn2zfma4", + "rev": "c83c210200de080c359cac76ea5abb9af003f4e4", + "sha256": "0lfhir3f1cr8bcik0fm1vq31vrlxbxwlm6ngq752650yyfxfw6rn", "type": "tarball", - "url": "https://github.com/RustSec/advisory-db/archive/a25cb0b593af26eeb7823a407163ec130028d62f.tar.gz", + "url": "https://github.com/RustSec/advisory-db/archive/c83c210200de080c359cac76ea5abb9af003f4e4.tar.gz", "url_template": "https://github.com///archive/.tar.gz" } } diff --git a/third_party/terraform-provider-glesys/default.nix b/third_party/terraform-provider-glesys/default.nix index 85a9fd6480..f798244d10 100644 --- a/third_party/terraform-provider-glesys/default.nix +++ b/third_party/terraform-provider-glesys/default.nix @@ -9,9 +9,9 @@ pkgs.terraform-providers.mkProvider rec { owner = "glesys"; repo = "terraform-provider-glesys"; rev = "v${version}"; - sha256 = "1hlqa4f9d44hq614ff8ivg8a6fwg48jwz11zsrlghjzky82cfraq"; + hash = "sha256:1hlqa4f9d44hq614ff8ivg8a6fwg48jwz11zsrlghjzky82cfraq"; - vendorSha256 = "0g5g69absf0vmin0ff0anrxcgfq0bzx4iz3qci90p9xkvyph4nlw"; + vendorHash = "sha256:0g5g69absf0vmin0ff0anrxcgfq0bzx4iz3qci90p9xkvyph4nlw"; # This provider is not officially published in the TF registry, so # we're giving it a fake source here. diff --git a/tools/nixery/default.nix b/tools/nixery/default.nix index 657f110395..c8e037594c 100644 --- a/tools/nixery/default.nix +++ b/tools/nixery/default.nix @@ -72,7 +72,7 @@ depot.nix.readTree.drvTargets rec { doCheck = true; # Needs to be updated after every modification of go.mod/go.sum - vendorSha256 = "sha256-io9NCeZmjCZPLmII3ajXIsBWbT40XiW8ncXOuUDabbo="; + vendorHash = "sha256-io9NCeZmjCZPLmII3ajXIsBWbT40XiW8ncXOuUDabbo="; buildFlagsArray = [ "-ldflags=-s -w -X main.version=${nixery-commit-hash}" diff --git a/tvix/proto/default.nix b/tvix/proto/default.nix index ac0ee66e87..35e2eba7fe 100644 --- a/tvix/proto/default.nix +++ b/tvix/proto/default.nix @@ -3,7 +3,7 @@ # anywhere, it just functions as a CI check for now. { pkgs, ... }: -pkgs.runCommandNoCC "tvix-cc-proto" { } '' +pkgs.runCommand "tvix-cc-proto" { } '' mkdir $out ${pkgs.protobuf}/bin/protoc -I ${./.} evaluator.proto --cpp_out=$out '' diff --git a/users/grfn/achilles/default.nix b/users/grfn/achilles/default.nix index 6dab0a5a62..714be60728 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 54dad260a0..7f00f925ec 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 21801ad9e7..4454e74c82 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 e4144e7980..d8150658a1 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 a5a32fa586..135477b12d 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 d1edaacc14..6ffa02a57c 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 ce2f9788b8..ab0a2d925d 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 3420fd6522..75af94bd40 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 4b6edb4380..5c566c1060 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 4d5f3df695..55dd70529b 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 92bf6e4ec1..114105642a 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 0d80f2f1cd..ed520675c5 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 c24200ff10..1630ecb8f1 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 c8b3c31899..4f1ddc5ea5 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 6c51cb5de4..6ff6cc06e2 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 5b778be1d9..6069e8c7fe 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 0edb75d609..15f4d787c0 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 ef8842ea26..3a0ffab284 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 d87b714b6f..31b1c7df9c 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 19229aab5a..047b783e30 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 # / diff --git a/web/atom-feed/default.nix b/web/atom-feed/default.nix index fca69e20fa..27c90a7b91 100644 --- a/web/atom-feed/default.nix +++ b/web/atom-feed/default.nix @@ -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 '')); diff --git a/web/blog/fragments.nix b/web/blog/fragments.nix index 8126278270..4d08a76b84 100644 --- a/web/blog/fragments.nix +++ b/web/blog/fragments.nix @@ -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
''; - 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 diff --git a/web/converse/default.nix b/web/converse/default.nix index cc2dab7f88..7a6583d31e 100644 --- a/web/converse/default.nix +++ b/web/converse/default.nix @@ -3,5 +3,5 @@ depot.third_party.naersk.buildPackage { src = ./.; buildInputs = with pkgs; [ openssl postgresql.lib ]; - nativeBuildInputs = [ pkgs.pkgconfig ]; + nativeBuildInputs = [ pkgs.pkg-config ]; } diff --git a/web/todolist/default.nix b/web/todolist/default.nix index c37a655559..4712ad21ba 100644 --- a/web/todolist/default.nix +++ b/web/todolist/default.nix @@ -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 '')); diff --git a/web/tvl/default.nix b/web/tvl/default.nix index 262be54c0e..044d2791d6 100644 --- a/web/tvl/default.nix +++ b/web/tvl/default.nix @@ -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} diff --git a/web/tvl/logo/default.nix b/web/tvl/logo/default.nix index d9e023946a..8084135492 100644 --- a/web/tvl/logo/default.nix +++ b/web/tvl/logo/default.nix @@ -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 \ diff --git a/web/tvl/template/default.nix b/web/tvl/template/default.nix index 6b6a5b0303..50ddc31e73 100644 --- a/web/tvl/template/default.nix +++ b/web/tvl/template/default.nix @@ -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 = '' -- cgit 1.4.1