Merge branch 'nixos-unstable' of https://github.com/NixOS/nixpkgs

Conflicts:
	nixpkgs/nixos/modules/config/console.nix
	nixpkgs/nixos/modules/services/mail/mailman.nix
	nixpkgs/nixos/modules/services/mail/public-inbox.nix
	nixpkgs/nixos/modules/services/mail/rss2email.nix
	nixpkgs/nixos/modules/services/networking/ssh/sshd.nix
	nixpkgs/pkgs/applications/networking/instant-messengers/dino/default.nix
	nixpkgs/pkgs/applications/networking/irc/weechat/default.nix
	nixpkgs/pkgs/applications/window-managers/sway/default.nix
	nixpkgs/pkgs/build-support/go/module.nix
	nixpkgs/pkgs/build-support/rust/build-rust-package/default.nix
	nixpkgs/pkgs/development/interpreters/python/default.nix
	nixpkgs/pkgs/development/node-packages/overrides.nix
	nixpkgs/pkgs/development/tools/b4/default.nix
	nixpkgs/pkgs/servers/dict/dictd-db.nix
	nixpkgs/pkgs/servers/mail/public-inbox/default.nix
	nixpkgs/pkgs/tools/security/pinentry/default.nix
	nixpkgs/pkgs/tools/text/unoconv/default.nix
	nixpkgs/pkgs/top-level/all-packages.nix

1 files changed, 11 insertions, 11 deletions

diff --git a/nixpkgs/pkgs/development/web/deno/update/src.ts b/nixpkgs/pkgs/development/web/deno/update/src.ts
index 3bfae27c21c3..20793a7178fa 100644
--- a/nixpkgs/pkgs/development/web/deno/update/src.ts
+++ b/nixpkgs/pkgs/development/web/deno/update/src.ts
@@ -15,12 +15,12 @@ interface Replacer {
 
 const log = logger("src");
 
-const prefetchSha256 = (nixpkgs: string, version: string) =>
+const prefetchHash = (nixpkgs: string, version: string) =>
   run("nix-prefetch", ["-f", nixpkgs, "deno.src", "--rev", version]);
-const prefetchCargoSha256 = (nixpkgs: string) =>
+const prefetchCargoHash = (nixpkgs: string) =>
   run(
     "nix-prefetch",
-    [`{ sha256 }: (import ${nixpkgs} {}).deno.cargoDeps.overrideAttrs (_: { inherit sha256; })`],
+    [`{ sha256 }: (import ${nixpkgs} {}).deno.cargoDeps.overrideAttrs (_: { hash = sha256; })`],
   );
 
 const replace = (str: string, replacers: Replacer[]) =>
@@ -45,23 +45,23 @@ export async function updateSrc(
   denoVersion: string,
 ) {
   log("Starting src update");
-  const trimVersion = denoVersion.substr(1);
-  log("Fetching sha256 for:", trimVersion);
-  const sha256 = await prefetchSha256(nixpkgs, denoVersion);
+  const trimVersion = denoVersion.substring(1);
+  log("Fetching hash for:", trimVersion);
+  const sha256 = await prefetchHash(nixpkgs, denoVersion);
   log("sha256 to update:", sha256);
   await updateNix(
     filePath,
     [
       genVerReplacer("version", trimVersion),
-      genShaReplacer("sha256", sha256),
+      genShaReplacer("hash", sha256),
     ],
   );
-  log("Fetching cargoSha256 for:", sha256);
-  const cargoSha256 = await prefetchCargoSha256(nixpkgs);
-  log("cargoSha256 to update:", cargoSha256);
+  log("Fetching cargoHash for:", sha256);
+  const cargoHash = await prefetchCargoHash(nixpkgs);
+  log("cargoHash to update:", cargoHash);
   await updateNix(
     filePath,
-    [genShaReplacer("cargoSha256", cargoSha256)],
+    [genShaReplacer("cargoHash", cargoHash)],
   );
   log("Finished src update");
 }