Merge pull request #227322 from geri1701/master

typst-fmt: init at unstable-2023-04-16

maintainers/maintainer-list.nix

@@ -5592,6 +5592,12 @@
       fingerprint = "D0CF 440A A703 E0F9 73CB  A078 82BB 70D5 41AE 2DB4";
     }];
   };
+  geri1701 = {
+    email = "geri@sdf.org";
+    github = "geri1701";
+    githubId = 67984144;
+    name = "Gerhard Schwanzer";
+  };
   gerschtli = {
     email = "tobias.happ@gmx.de";
     github = "Gerschtli";

pkgs/tools/typesetting/typst-fmt/default.nix

@@ -0,0 +1,35 @@
+{ lib, rustPlatform, fetchFromGitHub }:
+rustPlatform.buildRustPackage rec {
+  pname = "typst-fmt";
+  version = "unstable-2023-04-16";
+
+  src = fetchFromGitHub {
+    owner = "astrale-sharp";
+    repo = pname;
+    rev = "9ed1fd1656f8e776b6c8d9d326c488f5ba1091eb";
+    hash = "sha256-yHR13n5yx5Yl2atteGQq+qqz21zsy37ZJfGllbvSZcQ=";
+  };
+
+  cargoLock = {
+    lockFile = ./Cargo.lock;
+    outputHashes = {
+      "typst-0.2.0" = "sha256-+YHyxZTzMG9zpzLV9NgJsMtrXG+/ymPQo5b26HDYJaQ=";
+    };
+  };
+
+  postPatch = ''
+    cp ${./Cargo.lock} Cargo.lock
+  '';
+
+  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";
+    license = licenses.mit;
+    maintainers = with maintainers; [ geri1701 ];
+  };
+}

pkgs/top-level/all-packages.nix

@@ -13141,6 +13141,8 @@ with pkgs;
 
   typst = callPackage ../tools/typesetting/typst { };
 
+  typst-fmt = callPackage ../tools/typesetting/typst-fmt { };
+
   tz = callPackage ../tools/misc/tz { };
 
   u9fs = callPackage ../servers/u9fs { };