diff --git a/pkgs/tools/typesetting/satysfi/default.nix b/pkgs/by-name/sa/satysfi/package.nix similarity index 84% rename from pkgs/tools/typesetting/satysfi/default.nix rename to pkgs/by-name/sa/satysfi/package.nix index cfc6ef704b03..4b0c4ddab839 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,15 +29,18 @@ let propagatedBuildInputs = [ ocamlPackages.biniou ]; inherit (ocamlPackages.yojson) meta; }; + ocamlPackages = ocaml-ng.ocamlPackages_4_14; + version = "0.0.11"; in -ocamlPackages.buildDunePackage rec { +ocamlPackages.buildDunePackage { pname = "satysfi"; - version = "0.0.10"; + inherit version; + 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; }; @@ -82,13 +85,16 @@ 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 + momeemt + ]; + platforms = lib.platforms.all; mainProgram = "satysfi"; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2cc711799a86..45f755bcc1c6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18005,10 +18005,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. };