Merge remote-tracking branch 'origin/master' into staging-next (8b6975bc) · Commits · nix / nixpkgs

maintainers/maintainer-list.nix

+0 −6

Original line number	Diff line number	Diff line
		@@ -21112,12 +21112,6 @@
		github = "plebhash";
		githubId = 147345153;
		};
		pleshevskiy = {
		email = "dmitriy@pleshevski.ru";
		github = "pleshevskiy";
		githubId = 7839004;
		name = "Dmitriy Pleshevskiy";
		};
		pluiedev = {
		email = "hi@pluie.me";
		github = "pluiedev";

pkgs/applications/networking/instant-messengers/discord/sources.json

+18 −18

Original line number	Diff line number	Diff line
		{
		"linux-canary": {
		"hash": "sha256-ogiHH8HYrHGb4r6ADSJG3LHUs7VLjqWwQqKBfHamCyk=",
		"url": "https://canary.dl2.discordapp.net/apps/linux/0.0.871/discord-canary-0.0.871.tar.gz",
		"version": "0.0.871"
		"hash": "sha256-HL6QPiKDg8io8Uhb2u2wDi+5FvwkZzHh4cqBJ6t4qOg=",
		"url": "https://canary.dl2.discordapp.net/apps/linux/0.0.873/discord-canary-0.0.873.tar.gz",
		"version": "0.0.873"
		},
		"linux-development": {
		"hash": "sha256-EVkjWoqWl9Z+iHCLPOLu4PIUb2wC3HVcPVjOVz++IVw=",
		@@ -10,19 +10,19 @@
		"version": "0.0.94"
		},
		"linux-ptb": {
		"hash": "sha256-OlNU/DUQxjwAf6Qjqi6vUHfH6IhYJ9zSKp19hTuzVjk=",
		"url": "https://ptb.dl2.discordapp.net/apps/linux/0.0.177/discord-ptb-0.0.177.tar.gz",
		"version": "0.0.177"
		"hash": "sha256-X8PZkMhFYmWjeKPAvxtyBgrQAofkEpD1ow9gzm7v0LQ=",
		"url": "https://ptb.dl2.discordapp.net/apps/linux/0.0.178/discord-ptb-0.0.178.tar.gz",
		"version": "0.0.178"
		},
		"linux-stable": {
		"hash": "sha256-21ddAZveT1EXYr5cUoiIzD7uAbtF94EXW04VKGS5izM=",
		"url": "https://stable.dl2.discordapp.net/apps/linux/0.0.124/discord-0.0.124.tar.gz",
		"version": "0.0.124"
		"hash": "sha256-AyKUq2GJjMam2r7oQjdQBhBsTYbhVtnUaTeLP4emRIE=",
		"url": "https://stable.dl2.discordapp.net/apps/linux/0.0.125/discord-0.0.125.tar.gz",
		"version": "0.0.125"
		},
		"osx-canary": {
		"hash": "sha256-unXMbJ53+TFDtExOP13UdC4qA7mnu4z900gfEvN7Uys=",
		"url": "https://canary.dl2.discordapp.net/apps/osx/0.0.975/DiscordCanary.dmg",
		"version": "0.0.975"
		"hash": "sha256-MPE+EQEvvodFJy0kLT2VQUpMJh3wuh15nhena1LeDuI=",
		"url": "https://canary.dl2.discordapp.net/apps/osx/0.0.977/DiscordCanary.dmg",
		"version": "0.0.977"
		},
		"osx-development": {
		"hash": "sha256-B1//zMlTv2+RWHfWZSaaU8ubVOwWob+EYjNdtFRwlgg=",
		@@ -30,13 +30,13 @@
		"version": "0.0.107"
		},
		"osx-ptb": {
		"hash": "sha256-Ty6WSK5n+Gp/pEmmeayy+BgRz5rZFXuFTxcqCjzEkwY=",
		"url": "https://ptb.dl2.discordapp.net/apps/osx/0.0.209/DiscordPTB.dmg",
		"version": "0.0.209"
		"hash": "sha256-CbdKYcJE1Yn8s27f9QXHMVmF6U1URnUdmz5M8ilzZWU=",
		"url": "https://ptb.dl2.discordapp.net/apps/osx/0.0.210/DiscordPTB.dmg",
		"version": "0.0.210"
		},
		"osx-stable": {
		"hash": "sha256-AbgvI8VJ1uRGFwglL1mqOLESliAlbFQdP4gcJf+t1PY=",
		"url": "https://stable.dl2.discordapp.net/apps/osx/0.0.376/Discord.dmg",
		"version": "0.0.376"
		"hash": "sha256-AGFwdporeTx5D8zb7Gf5ECIM3jv4T6Z1W0BxHZ0NA8o=",
		"url": "https://stable.dl2.discordapp.net/apps/osx/0.0.377/Discord.dmg",
		"version": "0.0.377"
		}
		}

pkgs/by-name/ca/cargo-nextest/package.nix

+3 −3

Original line number	Diff line number	Diff line
		@@ -8,13 +8,13 @@

		rustPlatform.buildRustPackage (finalAttrs: {
		pname = "cargo-nextest";
		version = "0.9.127";
		version = "0.9.128";

		src = fetchFromGitHub {
		owner = "nextest-rs";
		repo = "nextest";
		tag = "cargo-nextest-${finalAttrs.version}";
		hash = "sha256-MLaRAzDj2mZzJF3vU47XvuK/n/tLCNhA1gz0JuOlF4Q=";
		hash = "sha256-aR00LKZpa8v77Sdh/sYX4cZbZUAmtRkcf7qn1DHVX4g=";
		};

		# FIXME: we don't support dtrace probe generation on macOS until we have a dtrace build: https://github.com/NixOS/nixpkgs/pull/392918
		@@ -22,7 +22,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
		./no-dtrace-macos.patch
		];

		cargoHash = "sha256-Lnlott0ecrdlkIggKArdh61UZRgI28hiXa5jNp3vWKc=";
		cargoHash = "sha256-UOauioFwXAvt5GJXMMcI+2R4RP9lt7mdclQ7bFe5AUY=";

		cargoBuildFlags = [
		"-p"

pkgs/by-name/da/dasm/package.nix

+10 −0

Original line number	Diff line number	Diff line
		@@ -2,6 +2,7 @@
		lib,
		stdenv,
		fetchFromGitHub,
		fetchpatch,
		}:

		stdenv.mkDerivation (finalAttrs: {
		@@ -15,6 +16,15 @@ stdenv.mkDerivation (finalAttrs: {
		sha256 = "1bna0bj503xyn5inwzzsrsgi9qg8p20by4dfk7azj91ynw56pl41";
		};

		patches = [
		# Pull upstream gcc-15 build fix.
		(fetchpatch {
		name = "gcc-15.patch";
		url = "https://github.com/dasm-assembler/dasm/commit/ed21db28a0e9693c455d6491cdc120a5936b007a.patch";
		hash = "sha256-CR5/Cs82JN63TmMRt398iWlMdt0QaLL7N2bbOiCAz9s=";
		})
		];

		configurePhase = false;
		installPhase = ''
		mkdir -p $out/bin

pkgs/by-name/dm/dms-shell/package.nix

+2 −2

Original line number	Diff line number	Diff line
		@@ -28,13 +28,13 @@ buildGoModule (
		in
		{
		pname = "dms-shell";
		version = "1.4.1";
		version = "1.4.2";

		src = fetchFromGitHub {
		owner = "AvengeMedia";
		repo = "DankMaterialShell";
		tag = "v${finalAttrs.version}";
		hash = "sha256-abNemkJQxp8E9bCNyTlAcFxKx+t1Wsc49J5NRZuyCgs=";
		hash = "sha256-qPm0HLKFIN8nBiTJwA4Jq5R3KPNoMHBxkpVJ4DQ9PBI=";
		};

		sourceRoot = "${finalAttrs.src.name}/core";

Admin message