From fcf20b1bd0180faee89b24b6853fb663702c9a6d Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Sun, 16 Feb 2025 10:39:48 +0200 Subject: [PATCH 1/4] tectonic: move to pkgs/by-name --- .../tectonic/wrapper.nix => by-name/te/tectonic/package.nix} | 0 pkgs/{tools/typesetting => by-name/te}/tectonic/tests.nix | 0 pkgs/tools/typesetting/tectonic/default.nix | 2 +- pkgs/top-level/all-packages.nix | 2 -- 4 files changed, 1 insertion(+), 3 deletions(-) rename pkgs/{tools/typesetting/tectonic/wrapper.nix => by-name/te/tectonic/package.nix} (100%) rename pkgs/{tools/typesetting => by-name/te}/tectonic/tests.nix (100%) diff --git a/pkgs/tools/typesetting/tectonic/wrapper.nix b/pkgs/by-name/te/tectonic/package.nix similarity index 100% rename from pkgs/tools/typesetting/tectonic/wrapper.nix rename to pkgs/by-name/te/tectonic/package.nix diff --git a/pkgs/tools/typesetting/tectonic/tests.nix b/pkgs/by-name/te/tectonic/tests.nix similarity index 100% rename from pkgs/tools/typesetting/tectonic/tests.nix rename to pkgs/by-name/te/tectonic/tests.nix diff --git a/pkgs/tools/typesetting/tectonic/default.nix b/pkgs/tools/typesetting/tectonic/default.nix index 58c92c1dc4af..92d3fa34f134 100644 --- a/pkgs/tools/typesetting/tectonic/default.nix +++ b/pkgs/tools/typesetting/tectonic/default.nix @@ -1,6 +1,6 @@ /* This file provides the `tectonic-unwrapped` package. On the other hand, - the `tectonic` package is defined in `./wrapper.nix`, by wrapping + the `tectonic` package is defined in `../tectonic/package.nix`, by wrapping - [`tectonic-unwrapped`](./default.nix) i.e. this package, and - [`biber-for-tectonic`](./biber.nix), which provides a compatible version of `biber`. diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 16ebad70b3ff..923f605b6edb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10683,8 +10683,6 @@ with pkgs; tclap_1_4 = callPackage ../development/libraries/tclap/1.4.nix { }; - tectonic = callPackage ../tools/typesetting/tectonic/wrapper.nix { }; - tectonic-unwrapped = callPackage ../tools/typesetting/tectonic { harfbuzz = harfbuzzFull; }; From 1d4d82c19bdfb56d5815e958faaae682d273332b Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Sun, 16 Feb 2025 10:41:11 +0200 Subject: [PATCH 2/4] biber-for-tectonic: move to pkgs/by-name --- .../biber.nix => by-name/bi/biber-for-tectonic/package.nix} | 0 pkgs/tools/typesetting/tectonic/default.nix | 2 +- pkgs/top-level/all-packages.nix | 2 -- 3 files changed, 1 insertion(+), 3 deletions(-) rename pkgs/{tools/typesetting/tectonic/biber.nix => by-name/bi/biber-for-tectonic/package.nix} (100%) diff --git a/pkgs/tools/typesetting/tectonic/biber.nix b/pkgs/by-name/bi/biber-for-tectonic/package.nix similarity index 100% rename from pkgs/tools/typesetting/tectonic/biber.nix rename to pkgs/by-name/bi/biber-for-tectonic/package.nix diff --git a/pkgs/tools/typesetting/tectonic/default.nix b/pkgs/tools/typesetting/tectonic/default.nix index 92d3fa34f134..dee6f4d59ea1 100644 --- a/pkgs/tools/typesetting/tectonic/default.nix +++ b/pkgs/tools/typesetting/tectonic/default.nix @@ -2,7 +2,7 @@ This file provides the `tectonic-unwrapped` package. On the other hand, the `tectonic` package is defined in `../tectonic/package.nix`, by wrapping - [`tectonic-unwrapped`](./default.nix) i.e. this package, and - - [`biber-for-tectonic`](./biber.nix), + - [`biber-for-tectonic`](../../bi/biber-for-tectonic/package.nix), which provides a compatible version of `biber`. */ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 923f605b6edb..ceb62d3cca09 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2677,8 +2677,6 @@ with pkgs; beetsPackages = lib.recurseIntoAttrs (callPackage ../tools/audio/beets { }); inherit (beetsPackages) beets beets-unstable; - biber-for-tectonic = callPackage ../tools/typesetting/tectonic/biber.nix { }; - binlore = callPackage ../development/tools/analysis/binlore { }; birdfont = callPackage ../tools/misc/birdfont { }; From b9f83c704711dc3bb8dc2cb09cbdf80db06d9e04 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Sun, 16 Feb 2025 10:43:19 +0200 Subject: [PATCH 3/4] tectonic-unwrapped: move to pkgs/by-name --- .../te/tectonic-unwrapped/package.nix} | 6 +++--- pkgs/top-level/all-packages.nix | 4 ---- 2 files changed, 3 insertions(+), 7 deletions(-) rename pkgs/{tools/typesetting/tectonic/default.nix => by-name/te/tectonic-unwrapped/package.nix} (96%) diff --git a/pkgs/tools/typesetting/tectonic/default.nix b/pkgs/by-name/te/tectonic-unwrapped/package.nix similarity index 96% rename from pkgs/tools/typesetting/tectonic/default.nix rename to pkgs/by-name/te/tectonic-unwrapped/package.nix index dee6f4d59ea1..630e351e71b7 100644 --- a/pkgs/tools/typesetting/tectonic/default.nix +++ b/pkgs/by-name/te/tectonic-unwrapped/package.nix @@ -1,7 +1,7 @@ /* This file provides the `tectonic-unwrapped` package. On the other hand, the `tectonic` package is defined in `../tectonic/package.nix`, by wrapping - - [`tectonic-unwrapped`](./default.nix) i.e. this package, and + - [`tectonic-unwrapped`](./package.nix) i.e. this package, and - [`biber-for-tectonic`](../../bi/biber-for-tectonic/package.nix), which provides a compatible version of `biber`. */ @@ -13,7 +13,7 @@ rustPlatform, darwin, fontconfig, - harfbuzz, + harfbuzzFull, openssl, pkg-config, icu, @@ -60,7 +60,7 @@ rustPlatform.buildRustPackage rec { [ icu fontconfig - harfbuzz + harfbuzzFull openssl ] ++ lib.optionals stdenv.hostPlatform.isDarwin ( diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ceb62d3cca09..51f20ece9e3a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10681,10 +10681,6 @@ with pkgs; tclap_1_4 = callPackage ../development/libraries/tclap/1.4.nix { }; - tectonic-unwrapped = callPackage ../tools/typesetting/tectonic { - harfbuzz = harfbuzzFull; - }; - termbench-pro = callPackage ../by-name/te/termbench-pro/package.nix { stdenv = if stdenv.hostPlatform.isDarwin then llvmPackages_17.stdenv else stdenv; fmt = fmt_11; From c1e1cbce963eeeffd85543872865ecd20fff5e16 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Sun, 16 Feb 2025 10:43:34 +0200 Subject: [PATCH 4/4] tectonic-unwrapped: no with lib; in meta --- pkgs/by-name/te/tectonic-unwrapped/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/te/tectonic-unwrapped/package.nix b/pkgs/by-name/te/tectonic-unwrapped/package.nix index 630e351e71b7..e9b9dcb2c815 100644 --- a/pkgs/by-name/te/tectonic-unwrapped/package.nix +++ b/pkgs/by-name/te/tectonic-unwrapped/package.nix @@ -86,13 +86,13 @@ rustPlatform.buildRustPackage rec { doCheck = true; - meta = with lib; { + meta = { description = "Modernized, complete, self-contained TeX/LaTeX engine, powered by XeTeX and TeXLive"; homepage = "https://tectonic-typesetting.github.io/"; changelog = "https://github.com/tectonic-typesetting/tectonic/blob/tectonic@${version}/CHANGELOG.md"; - license = with licenses; [ mit ]; + license = with lib.licenses; [ mit ]; mainProgram = "tectonic"; - maintainers = with maintainers; [ + maintainers = with lib.maintainers; [ lluchs doronbehar bryango