From 758c8b613efbc0d64284797b3d5c9c9f2c318802 Mon Sep 17 00:00:00 2001
From: Mutsuha Asada <me@momee.mt>
Date: Thu, 9 Jan 2025 17:24:51 +0900
Subject: [PATCH 1/4] satysfi: moved to by-name

---
 .../satysfi/default.nix => by-name/sa/satysfi/package.nix}    | 3 ++-
 pkgs/top-level/all-packages.nix                               | 4 ----
 2 files changed, 2 insertions(+), 5 deletions(-)
 rename pkgs/{tools/typesetting/satysfi/default.nix => by-name/sa/satysfi/package.nix} (97%)

diff --git a/pkgs/tools/typesetting/satysfi/default.nix b/pkgs/by-name/sa/satysfi/package.nix
similarity index 97%
rename from pkgs/tools/typesetting/satysfi/default.nix
rename to pkgs/by-name/sa/satysfi/package.nix
index cfc6ef704b03..324008b75e80 100644
--- a/pkgs/tools/typesetting/satysfi/default.nix
+++ b/pkgs/by-name/sa/satysfi/package.nix
@@ -1,7 +1,7 @@
 {
   lib,
   fetchFromGitHub,
-  ocamlPackages,
+  ocaml-ng,
   ipaexfont,
   junicode,
   lmodern,
@@ -29,6 +29,7 @@ let
     propagatedBuildInputs = [ ocamlPackages.biniou ];
     inherit (ocamlPackages.yojson) meta;
   };
+  ocamlPackages = ocaml-ng.ocamlPackages_4_14;
 in
 ocamlPackages.buildDunePackage rec {
   pname = "satysfi";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 678148fc1606..58f347938387 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -18065,10 +18065,6 @@ with pkgs;
 
   sane-frontends = callPackage ../applications/graphics/sane/frontends.nix { };
 
-  satysfi = callPackage ../tools/typesetting/satysfi {
-    ocamlPackages = ocaml-ng.ocamlPackages_4_14;
-  };
-
   sc-controller = python3Packages.callPackage ../misc/drivers/sc-controller {
     inherit libusb1; # Shadow python.pkgs.libusb1.
   };

From 3195e4ccf6c81c048321d828dc51b8215e6e4540 Mon Sep 17 00:00:00 2001
From: Mutsuha Asada <me@momee.mt>
Date: Thu, 9 Jan 2025 17:32:32 +0900
Subject: [PATCH 2/4] satysfi: 0.0.10 -> 0.0.11
 https://github.com/gfngfn/SATySFi/releases/tag/v0.0.11

---
 pkgs/by-name/sa/satysfi/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/sa/satysfi/package.nix b/pkgs/by-name/sa/satysfi/package.nix
index 324008b75e80..b9a67133a986 100644
--- a/pkgs/by-name/sa/satysfi/package.nix
+++ b/pkgs/by-name/sa/satysfi/package.nix
@@ -33,12 +33,12 @@ let
 in
 ocamlPackages.buildDunePackage rec {
   pname = "satysfi";
-  version = "0.0.10";
+  version = "0.0.11";
   src = fetchFromGitHub {
     owner = "gfngfn";
     repo = "SATySFi";
-    rev = "v${version}";
-    hash = "sha256-qgVM7ExsKtzNQkZO+I+rcWLj4LSvKL5uyitH7Jg+ns0=";
+    tag = "v${version}";
+    hash = "sha256-eeeoUVTGId56SQvrmmMc7nwH/blrXgwcw3+0FLbvc34=";
     fetchSubmodules = true;
   };
 

From 9e6e534c368abe1a374291700e73c68a2ffdf1f1 Mon Sep 17 00:00:00 2001
From: Mutsuha Asada <me@momee.mt>
Date: Thu, 9 Jan 2025 17:37:24 +0900
Subject: [PATCH 3/4] satysfi: modernized derivation - Removed rec - Removed
 with lib; - Formatted via nixfmt-rfc-style

---
 pkgs/by-name/sa/satysfi/package.nix | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/pkgs/by-name/sa/satysfi/package.nix b/pkgs/by-name/sa/satysfi/package.nix
index b9a67133a986..4b3afcf4a3a5 100644
--- a/pkgs/by-name/sa/satysfi/package.nix
+++ b/pkgs/by-name/sa/satysfi/package.nix
@@ -30,10 +30,12 @@ let
     inherit (ocamlPackages.yojson) meta;
   };
   ocamlPackages = ocaml-ng.ocamlPackages_4_14;
-in
-ocamlPackages.buildDunePackage rec {
-  pname = "satysfi";
   version = "0.0.11";
+in
+ocamlPackages.buildDunePackage {
+  pname = "satysfi";
+  inherit version;
+
   src = fetchFromGitHub {
     owner = "gfngfn";
     repo = "SATySFi";
@@ -83,13 +85,13 @@ ocamlPackages.buildDunePackage rec {
       $out/share/satysfi/dist/fonts/Junicode.ttf
   '';
 
-  meta = with lib; {
+  meta = {
     homepage = "https://github.com/gfngfn/SATySFi";
     description = "Statically-typed, functional typesetting system";
     changelog = "https://github.com/gfngfn/SATySFi/blob/v${version}/CHANGELOG.md";
-    license = licenses.lgpl3Only;
-    maintainers = [ maintainers.mt-caret ];
-    platforms = platforms.all;
+    license = lib.licenses.lgpl3Only;
+    maintainers = with lib.maintainers; [ mt-caret ];
+    platforms = lib.platforms.all;
     mainProgram = "satysfi";
   };
 }

From 4e5f21d4eaadc824878563ff9d87d4a05974d8bf Mon Sep 17 00:00:00 2001
From: Mutsuha Asada <me@momee.mt>
Date: Sun, 12 Jan 2025 22:20:04 +0900
Subject: [PATCH 4/4] satysfi: added @momeemt to maintainer

---
 pkgs/by-name/sa/satysfi/package.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/sa/satysfi/package.nix b/pkgs/by-name/sa/satysfi/package.nix
index 4b3afcf4a3a5..4b0c4ddab839 100644
--- a/pkgs/by-name/sa/satysfi/package.nix
+++ b/pkgs/by-name/sa/satysfi/package.nix
@@ -90,7 +90,10 @@ ocamlPackages.buildDunePackage {
     description = "Statically-typed, functional typesetting system";
     changelog = "https://github.com/gfngfn/SATySFi/blob/v${version}/CHANGELOG.md";
     license = lib.licenses.lgpl3Only;
-    maintainers = with lib.maintainers; [ mt-caret ];
+    maintainers = with lib.maintainers; [
+      mt-caret
+      momeemt
+    ];
     platforms = lib.platforms.all;
     mainProgram = "satysfi";
   };