Merge staging-next-24.11 into staging-24.11 (3481d1ec) · Commits · nix / nixpkgs

pkgs/applications/networking/instant-messengers/discord/default.nix

+12 −12

Original line number	Diff line number	Diff line
		@@ -9,16 +9,16 @@ let
		versions =
		if stdenv.hostPlatform.isLinux then
		{
		stable = "0.0.81";
		ptb = "0.0.127";
		canary = "0.0.574";
		development = "0.0.67";
		stable = "0.0.82";
		ptb = "0.0.128";
		canary = "0.0.581";
		development = "0.0.68";
		}
		else
		{
		stable = "0.0.333";
		stable = "0.0.334";
		ptb = "0.0.157";
		canary = "0.0.686";
		canary = "0.0.692";
		development = "0.0.78";
		};
		version = versions.${branch};
		@@ -26,25 +26,25 @@ let
		x86_64-linux = {
		stable = fetchurl {
		url = "https://stable.dl2.discordapp.net/apps/linux/${version}/discord-${version}.tar.gz";
		hash = "sha256-V3xaBbCZX1TUaXxLbMOhJ8VFKMZBfCR/w5ajrAvu2kQ=";
		hash = "sha256-L8Lwe5UavmbW1s3gsSJiHjbiZnNtyEsEJzlrN0Fgc3w=";
		};
		ptb = fetchurl {
		url = "https://ptb.dl2.discordapp.net/apps/linux/${version}/discord-ptb-${version}.tar.gz";
		hash = "sha256-mgR2MDQ3ZtgBltQPOxT6773aNUx5hH2P6LvFJFEuUts=";
		hash = "sha256-ccmlOyzPu6aMqmC2+mRXMQh6OYIFLrlTNwKmBGE61ic=";
		};
		canary = fetchurl {
		url = "https://canary.dl2.discordapp.net/apps/linux/${version}/discord-canary-${version}.tar.gz";
		hash = "sha256-pZdHl7U3aNmxe6PtaK7JbQ7XdAPtlTAUuGcBRFkQI3s=";
		hash = "sha256-PUTu1eoq8lB+4rX0qACh3M8tOjR83Tgs3vaN5t70Mo8=";
		};
		development = fetchurl {
		url = "https://development.dl2.discordapp.net/apps/linux/${version}/discord-development-${version}.tar.gz";
		hash = "sha256-YwOhdNM6l+E/X6JX5ttyJsJmf3Pa+BN7N0mG7923xI4=";
		hash = "sha256-Vfsuz7/o2iVssOi4I9MmQc5T8ct8WTaCavvT9/OycPs=";
		};
		};
		x86_64-darwin = {
		stable = fetchurl {
		url = "https://stable.dl2.discordapp.net/apps/osx/${version}/Discord.dmg";
		hash = "sha256-ebPbTIiaZ2hMoJdVCax0hT2bLUFLj5fuIf2e74qLHns=";
		hash = "sha256-8zAwOh1waRAQwW/RnjUJsOQJmYcCK5dZ10Ib08F7U08=";
		};
		ptb = fetchurl {
		url = "https://ptb.dl2.discordapp.net/apps/osx/${version}/DiscordPTB.dmg";
		@@ -52,7 +52,7 @@ let
		};
		canary = fetchurl {
		url = "https://canary.dl2.discordapp.net/apps/osx/${version}/DiscordCanary.dmg";
		hash = "sha256-F3vLcLjNhYRGnOyuNziwtbBNxiUKgw6wZaa1LbVF5PU=";
		hash = "sha256-xA9TU6ODC6c8m+dLHxc5ZxD+SmTfXIjXl1wbA5JVay4=";
		};
		development = fetchurl {
		url = "https://development.dl2.discordapp.net/apps/osx/${version}/DiscordDevelopment.dmg";

pkgs/by-name/di/diebahn/package.nix

+4 −4

Original line number	Diff line number	Diff line
		@@ -24,18 +24,18 @@

		stdenv.mkDerivation rec {
		pname = "diebahn";
		version = "2.7.2";
		version = "2.7.3";

		src = fetchFromGitLab {
		owner = "schmiddi-on-mobile";
		repo = "railway";
		tag = version;
		hash = "sha256-jk2Pn/kqjMx5reMkIL8nLMWMZylwdoVq4FmnzaohnjU=";
		hash = "sha256-PD76zxgQJ332MVu5LL9SNDrf66xmE/td4uDv/FYq0aU=";
		};

		cargoDeps = rustPlatform.fetchCargoVendor {
		inherit pname version src;
		hash = "sha256-WiFW+xz5kxFKe9y8vHaFD9xW7f9iHc9hyCBWW4uMquU=";
		hash = "sha256-3+UTN0KKnbpPm948XW4NSZkMYJUv974VtTqtG8orR/E=";
		};

		nativeBuildInputs = [
		@@ -78,7 +78,7 @@ stdenv.mkDerivation rec {
		};

		meta = {
		changelog = "https://gitlab.com/schmiddi-on-mobile/railway/-/blob/${src.rev}/CHANGELOG.md";
		changelog = "https://gitlab.com/schmiddi-on-mobile/railway/-/blob/${src.tag}/CHANGELOG.md";
		description = "Travel with all your train information in one place. Also known as Railway";
		homepage = "https://gitlab.com/schmiddi-on-mobile/railway";
		license = lib.licenses.gpl3Plus;

pkgs/by-name/mo/mozillavpn/package.nix

+15 −23

Original line number	Diff line number	Diff line
		@@ -4,7 +4,6 @@
		cargo,
		cmake,
		fetchFromGitHub,
		fetchpatch,
		go,
		lib,
		libcap,
		@@ -23,27 +22,15 @@

		stdenv.mkDerivation (finalAttrs: {
		pname = "mozillavpn";
		version = "2.24.3";
		version = "2.25.0";
		src = fetchFromGitHub {
		owner = "mozilla-mobile";
		repo = "mozilla-vpn-client";
		rev = "v${finalAttrs.version}";
		tag = "v${finalAttrs.version}";
		fetchSubmodules = true;
		hash = "sha256-GRt0diDt8bEeMfDwiEtYyR+20/bJAVcDal9eGfvk340=";
		hash = "sha256-XunvADSdLA6jFVjXTAtmYvC1i5ZE7WYaCTvlAd8C1ko=";
		};
		patches = [
		# Fix build errors from deprecated `QByteArray::count()`, `QVariant::type()`, `QEventPoint::pos()` (#9961)
		(fetchpatch {
		url = "https://github.com/mozilla-mobile/mozilla-vpn-client/commit/b4077b9927d9208118e81694dce490dac2f0e76f.patch";
		hash = "sha256-Vx7aHEBxubthqsmH37ZZDJDPI9jE9vS/p+JNJP6eUlI=";
		})
		# Re:#9966 Fix Crash in MZFlickable
		(fetchpatch {
		url = "https://github.com/mozilla-mobile/mozilla-vpn-client/pull/9984/commits/485a2ad8feab6b1dee7c672ce03736d819fd9d37.patch";
		includes = [ "nebula/ui/components/MZFlickable.qml" ];
		hash = "sha256-fnOXBTsuQC3kqAvHgoJ7rRGX5ra0R/MO8M9Ysys/l7Q=";
		})
		];
		patches = [ ];

		netfilter = buildGoModule {
		pname = "${finalAttrs.pname}-netfilter";
		@@ -56,9 +43,9 @@ stdenv.mkDerivation (finalAttrs: {
		vendorHash = "sha256-Cmo0wnl0z5r1paaEf1MhCPbInWeoMhGjnxCxGh0cyO8=";
		};

		cargoDeps = rustPlatform.fetchCargoTarball {
		cargoDeps = rustPlatform.fetchCargoVendor {
		inherit (finalAttrs) src patches;
		hash = "sha256-ryJFvnJIiDKf2EqlzHj79hSPYrD+3UtZ5lT/QeFv6V0=";
		hash = "sha256-HaOqhjDodn9z0XQMsxJAMKrs1s7l2cJCIzHECjwnA5A=";
		};

		buildInputs = [
		@@ -89,13 +76,18 @@ stdenv.mkDerivation (finalAttrs: {
		];

		postPatch = ''
		substituteInPlace scripts/cmake/addons.cmake \
		--replace-fail 'set(ADDON_BUILD_ARGS ' 'set(ADDON_BUILD_ARGS -q ${qt6.qttools.dev}/bin '

		substituteInPlace src/cmake/linux.cmake \
		--replace '/etc/xdg/autostart' "$out/etc/xdg/autostart" \
		--replace '/usr/share/dbus-1' "$out/share/dbus-1" \
		--replace '${"$"}{SYSTEMD_UNIT_DIR}' "$out/lib/systemd/system"
		--replace-fail '/usr/share/dbus-1' "$out/share/dbus-1" \
		--replace-fail '${"$"}{SYSTEMD_UNIT_DIR}' "$out/lib/systemd/system"

		substituteInPlace extension/CMakeLists.txt \
		--replace '/etc' "$out/etc"
		--replace-fail '/etc' "$out/etc"

		substituteInPlace extension/socks5proxy/bin/CMakeLists.txt \
		--replace-fail '${"$"}{SYSTEMD_UNIT_DIR}' "$out/lib/systemd/system"

		ln -s '${finalAttrs.netfilter.goModules}' linux/netfilter/vendor
		'';

pkgs/by-name/ph/phpunit/package.nix

+3 −3

Original line number	Diff line number	Diff line
		@@ -9,16 +9,16 @@

		php.buildComposerProject2 (finalAttrs: {
		pname = "phpunit";
		version = "11.5.3";
		version = "11.5.6";

		src = fetchFromGitHub {
		owner = "sebastianbergmann";
		repo = "phpunit";
		tag = finalAttrs.version;
		hash = "sha256-+PF4ZeN53GckAV0NsWPVuuNpITacv+/AlwhP7zI5TiI=";
		hash = "sha256-D64FmqGalhhldMnYXD/IX6uF1a8pG/1PxLTKk6Uuapg=";
		};

		vendorHash = "sha256-nACtesZ67ZzFuqqKhuag8RVZhg9zQA0+iJQaX9iD9Ng=";
		vendorHash = "sha256-o/ApdPy/gqklwpTWbZh25HXh5sv4S9+xtOV3YNJ4lvs=";

		passthru = {
		updateScript = nix-update-script { };

pkgs/servers/matrix-synapse/default.nix

+3 −3

Original line number	Diff line number	Diff line
		@@ -18,20 +18,20 @@ let
		in
		python3.pkgs.buildPythonApplication rec {
		pname = "matrix-synapse";
		version = "1.122.0";
		version = "1.123.0";
		format = "pyproject";

		src = fetchFromGitHub {
		owner = "element-hq";
		repo = "synapse";
		rev = "v${version}";
		hash = "sha256-pucGVKEjQNihlHmFxhgJSiX7sxpQYrCpSwhZByBtbe8=";
		hash = "sha256-fbT0DMz6F76e/IRb0e1nFEOxmtIDQ53it8zi88jiUDU=";
		};

		cargoDeps = rustPlatform.fetchCargoVendor {
		inherit src;
		name = "${pname}-${version}";
		hash = "sha256-1BFVW89+1js5mn/EPxkuHaUfkFn/dNlMlH1pN2lDcwE=";
		hash = "sha256-Lfs7myNxWoPZI4USoK+aaTPLjT2EoEvnVnXFwdcKofE=";
		};

		postPatch = ''

Admin message