From 758c8b613efbc0d64284797b3d5c9c9f2c318802 Mon Sep 17 00:00:00 2001 From: Mutsuha Asada Date: Thu, 9 Jan 2025 17:24:51 +0900 Subject: [PATCH] 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. };