Merge pull request #243760 from figsoda/typstfmt (3c6f228c) · Commits · nix / nixpkgs

pkgs/tools/typesetting/typst-fmt/Cargo.lock→pkgs/tools/typesetting/typstfmt/Cargo.lock

+414 −478

File changed and moved.

Preview size limit exceeded, changes collapsed.

+28 −0

Original line number	Diff line number	Diff line
		{ lib, rustPlatform, fetchFromGitHub }:
		rustPlatform.buildRustPackage rec {
		pname = "typst-fmt";
		version = "unstable-2023-04-26";

		rustPlatform.buildRustPackage {
		pname = "typstfmt";
		version = "unstable-2023-07-15";

		src = fetchFromGitHub {
		owner = "astrale-sharp";
		repo = pname;
		rev = "cb299645244551bfc91dc4579a2543a0d4cc84b0";
		hash = "sha256-/+m3HkOsBiOAhOqBfv+hPauvDKqfCrwOWGDtYfW5zJQ=";
		repo = "typstfmt";
		rev = "dd7715ee4bcb8637e207c21222f3168cfc384e9e";
		hash = "sha256-m5PN19JxMRKRVHzoxl5n6osz3bZlBNO1hxgfQMxJuok=";
		};

		cargoLock = {
		lockFile = ./Cargo.lock;
		outputHashes = {
		"typst-0.2.0" = "sha256-6Uezm3E/qGl9303auqjvfWe3KKsqwsHeXUrjWemjJKU=";
		"svg2pdf-0.5.0" = "sha256-yBQpvDAnJ7C0PWIM/o0PzOg9JlDZCEiVdCTDDPSwrmE=";
		"typst-0.6.0" = "sha256-igNAs3946Mq8GjOSrDnmcIxjrVMPbYGC86EUHIDAugM=";
		};
		};

		checkFlags = [
		# test_eof is ignored upstream
		"--skip=rules::tests_typst_format::test_eof"
		];

		meta = with lib; {
		description = "A formatter for the Typst language";
		homepage = "https://github.com/astrale-sharp/typst-fmt";
		homepage = "https://github.com/astrale-sharp/typstfmt";
		license = licenses.mit;
		maintainers = with maintainers; [ geri1701 ];
		maintainers = with maintainers; [ figsoda geri1701 ];
		};
		}

+1 −0

Original line number	Diff line number	Diff line
		@@ -1729,6 +1729,7 @@ mapAliases ({
		twister = throw "twister has been removed: abandoned by upstream and python2-only"; # Added 2022-04-26
		tychus = throw "tychus has been dropped due to the lack of maintenance from upstream since 2018"; # Added 2022-06-03
		typora = throw "Newer versions of typora use anti-user encryption and refuse to start. As such it has been removed"; # Added 2021-09-11
		typst-fmt = typstfmt; # Added 2023-07-15

		### U ###

+1 −1

Original line number	Diff line number	Diff line
		@@ -13689,7 +13689,7 @@ with pkgs;

		typst = callPackage ../tools/typesetting/typst { };

		typst-fmt = callPackage ../tools/typesetting/typst-fmt { };
		typstfmt = callPackage ../tools/typesetting/typstfmt { };

		typst-live = callPackage ../tools/typesetting/typst-live { };