Merge master into staging-next (32be7227) · Commits · nix / nixpkgs

pkgs/applications/graphics/vkdt/Cargo.lock

0 → 100644

+1353 −0

File added.

Preview size limit exceeded, changes collapsed.

pkgs/applications/graphics/vkdt/default.nix

+18 −2

Original line number	Diff line number	Diff line
		@@ -21,20 +21,33 @@
		, libmad
		, testers
		, vkdt
		, xxd
		, alsa-lib
		, cargo
		, rustPlatform
		}:

		stdenv.mkDerivation rec {
		pname = "vkdt";
		version = "0.7.0";
		version = "0.9.0";

		src = fetchurl {
		url = "https://github.com/hanatos/${pname}/releases/download/${version}/${pname}-${version}.tar.xz";
		hash = "sha256-Sk/K+EWvJBkwwD5R1gH9ZQHetojrJTTJrKW9Dvr+lHA=";
		hash = "sha256-LXUTDwUjlfyhtXkYW4Zivqt8vyctoz+ID5AQ7gg+d9A=";
		};

		strictDeps = true;

		cargoDeps = rustPlatform.importCargoLock {
		lockFile = ./Cargo.lock;
		outputHashes = {
		"rawler-0.6.3" = "sha256-EJ0uWc3pp7ixRxDIdTIVVaT2ph3P2IvuK+ecBSB5HYw=";
		};
		};
		cargoRoot = "src/pipe/modules/i-raw/rawloader-c";

		nativeBuildInputs = [
		cargo
		clang
		cmake
		glslang
		@@ -42,9 +55,12 @@ stdenv.mkDerivation rec {
		llvmPackages.openmp
		pkg-config
		rsync
		rustPlatform.cargoSetupHook
		xxd
		];

		buildInputs = [
		alsa-lib
		exiv2
		ffmpeg
		freetype

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

+10 −10

Original line number	Diff line number	Diff line
		@@ -10,15 +10,15 @@ let
		if stdenv.hostPlatform.isLinux then
		{
		stable = "0.0.72";
		ptb = "0.0.112";
		canary = "0.0.508";
		development = "0.0.32";
		ptb = "0.0.113";
		canary = "0.0.509";
		development = "0.0.33";
		}
		else
		{
		stable = "0.0.323";
		ptb = "0.0.142";
		canary = "0.0.617";
		ptb = "0.0.143";
		canary = "0.0.618";
		development = "0.0.55";
		};
		version = versions.${branch};
		@@ -30,15 +30,15 @@ let
		};
		ptb = fetchurl {
		url = "https://ptb.dl2.discordapp.net/apps/linux/${version}/discord-ptb-${version}.tar.gz";
		hash = "sha256-wJIVKrP+F6IKeE7rT8vAmWRTtvWj9h3vKJDsPu8x2kQ=";
		hash = "sha256-1Rhn6pH6KvuhGNTymBK01tA78it7JXekG48XvRZQOiA=";
		};
		canary = fetchurl {
		url = "https://canary.dl2.discordapp.net/apps/linux/${version}/discord-canary-${version}.tar.gz";
		hash = "sha256-zvjIVXZtYl9GdDCvKyuU+9+rNhRX4fGLpw9jPKEpFCs=";
		hash = "sha256-jLAeix6IQ6rqOM8NKNryEeswB5VSzc1lIEI7X7Nrc68=";
		};
		development = fetchurl {
		url = "https://development.dl2.discordapp.net/apps/linux/${version}/discord-development-${version}.tar.gz";
		hash = "sha256-Ec2kdoVA5NImT4afXi4GZ9GQF8NjT+h7qM7K3w3qrjU=";
		hash = "sha256-A87sVmaYRjRi0Q9IrXuQBr+yC+FtGgZA2L/9V4WuYbU=";
		};
		};
		x86_64-darwin = {
		@@ -48,11 +48,11 @@ let
		};
		ptb = fetchurl {
		url = "https://ptb.dl2.discordapp.net/apps/osx/${version}/DiscordPTB.dmg";
		hash = "sha256-69ioQKRoQ1RTO39BdVppOuwQb/6ylnSy1luMAX5TCeQ=";
		hash = "sha256-ZbHz0OR7p873U7YpwsHxa3Uuf3uPsmVOQF9exARQzdI=";
		};
		canary = fetchurl {
		url = "https://canary.dl2.discordapp.net/apps/osx/${version}/DiscordCanary.dmg";
		hash = "sha256-L/nnwHNPni93axBvXS4MH/NuoQbl7Ugva2sozVg6GEk=";
		hash = "sha256-UsJRw7gforZ1OAA6GNtXuTe/y95mIr7R6MRa+qe44tk=";
		};
		development = fetchurl {
		url = "https://development.dl2.discordapp.net/apps/osx/${version}/DiscordDevelopment.dmg";

pkgs/by-name/at/atproto-goat/package.nix

0 → 100644

+43 −0

Original line number	Diff line number	Diff line
		{
		lib,
		buildGoModule,
		fetchFromGitHub,
		unstableGitUpdater,
		}:

		buildGoModule rec {
		pname = "atproto-goat";
		version = "0-unstable-2024-10-08";

		src = fetchFromGitHub {
		owner = "bluesky-social";
		repo = "indigo";
		rev = "06bacb465af714feb77609566aba15ab1ed41e24";
		hash = "sha256-wWsE3sAGZQmOBVqTgy4RjoU8zmtuvyQIj9DjwSbtmKw=";
		};

		postPatch = ''
		substituteInPlace cmd/goat/main.go \
		--replace-fail "versioninfo.Short()" '"${version}"' \
		--replace-fail '"github.com/carlmjohnson/versioninfo"' ""
		'';

		vendorHash = "sha256-T+jtxubVKskrLGTUa4RI24o/WTSFCBk60HhyCFujPOI=";

		subPackages = [ "cmd/goat" ];

		passthru.updateScript = unstableGitUpdater {
		hardcodeZeroVersion = true;
		};

		meta = {
		description = "Go AT protocol CLI tool";
		homepage = "https://github.com/bluesky-social/indigo/blob/main/cmd/goat/README.md";
		license = with lib.licenses; [
		mit
		asl20
		];
		maintainers = with lib.maintainers; [ pyrox0 ];
		mainProgram = "goat";
		};
		}

pkgs/by-name/ea/earthlyls/package.nix

0 → 100644

+38 −0

Original line number	Diff line number	Diff line
		{
		lib,
		fetchFromGitHub,
		rustPlatform,

		earthlyls,
		nix-update-script,
		testers,
		}:

		rustPlatform.buildRustPackage rec {
		pname = "earthlyls";
		version = "0.5.3";

		src = fetchFromGitHub {
		owner = "glehmann";
		repo = "earthlyls";
		rev = version;
		hash = "sha256-wn+6Aa4xTC5o4S+N7snB/vlyw0i23XkmaXUmrhfXuaA=";
		};

		cargoHash = "sha256-eKBNZiFvIBuNPqDzMOa6J0UR4CIgi9OUowRaFSgi7Fg=";

		passthru = {
		updateScript = nix-update-script { };
		tests.version = testers.testVersion { package = earthlyls; };
		};

		meta = {
		description = "Earthly language server";
		homepage = "https://github.com/glehmann/earthlyls";
		changelog = "https://github.com/glehmann/earthlyls/releases/tag/${version}";
		license = lib.licenses.mit;
		mainProgram = "earthlyls";
		maintainers = with lib.maintainers; [ paveloom ];
		platforms = lib.platforms.linux ++ lib.platforms.darwin;
		};
		}