Skip to content

Commit b1b43d3

Browse files
authored
tectonic: move to pkgs/by-name (#382520)
2 parents 1585820 + c1e1cbc commit b1b43d3

File tree

5 files changed

+8
-16
lines changed

5 files changed

+8
-16
lines changed

pkgs/tools/typesetting/tectonic/default.nix renamed to pkgs/by-name/te/tectonic-unwrapped/package.nix

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
/*
22
This file provides the `tectonic-unwrapped` package. On the other hand,
3-
the `tectonic` package is defined in `./wrapper.nix`, by wrapping
4-
- [`tectonic-unwrapped`](./default.nix) i.e. this package, and
5-
- [`biber-for-tectonic`](./biber.nix),
3+
the `tectonic` package is defined in `../tectonic/package.nix`, by wrapping
4+
- [`tectonic-unwrapped`](./package.nix) i.e. this package, and
5+
- [`biber-for-tectonic`](../../bi/biber-for-tectonic/package.nix),
66
which provides a compatible version of `biber`.
77
*/
88

@@ -13,7 +13,7 @@
1313
rustPlatform,
1414
darwin,
1515
fontconfig,
16-
harfbuzz,
16+
harfbuzzFull,
1717
openssl,
1818
pkg-config,
1919
icu,
@@ -60,7 +60,7 @@ rustPlatform.buildRustPackage rec {
6060
[
6161
icu
6262
fontconfig
63-
harfbuzz
63+
harfbuzzFull
6464
openssl
6565
]
6666
++ lib.optionals stdenv.hostPlatform.isDarwin (
@@ -86,13 +86,13 @@ rustPlatform.buildRustPackage rec {
8686

8787
doCheck = true;
8888

89-
meta = with lib; {
89+
meta = {
9090
description = "Modernized, complete, self-contained TeX/LaTeX engine, powered by XeTeX and TeXLive";
9191
homepage = "https://tectonic-typesetting.github.io/";
9292
changelog = "https://github.com/tectonic-typesetting/tectonic/blob/tectonic@${version}/CHANGELOG.md";
93-
license = with licenses; [ mit ];
93+
license = with lib.licenses; [ mit ];
9494
mainProgram = "tectonic";
95-
maintainers = with maintainers; [
95+
maintainers = with lib.maintainers; [
9696
lluchs
9797
doronbehar
9898
bryango
File renamed without changes.
File renamed without changes.

pkgs/top-level/all-packages.nix

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2677,8 +2677,6 @@ with pkgs;
26772677
beetsPackages = lib.recurseIntoAttrs (callPackage ../tools/audio/beets { });
26782678
inherit (beetsPackages) beets beets-unstable;
26792679

2680-
biber-for-tectonic = callPackage ../tools/typesetting/tectonic/biber.nix { };
2681-
26822680
binlore = callPackage ../development/tools/analysis/binlore { };
26832681

26842682
birdfont = callPackage ../tools/misc/birdfont { };
@@ -10683,12 +10681,6 @@ with pkgs;
1068310681

1068410682
tclap_1_4 = callPackage ../development/libraries/tclap/1.4.nix { };
1068510683

10686-
tectonic = callPackage ../tools/typesetting/tectonic/wrapper.nix { };
10687-
10688-
tectonic-unwrapped = callPackage ../tools/typesetting/tectonic {
10689-
harfbuzz = harfbuzzFull;
10690-
};
10691-
1069210684
termbench-pro = callPackage ../by-name/te/termbench-pro/package.nix {
1069310685
stdenv = if stdenv.hostPlatform.isDarwin then llvmPackages_17.stdenv else stdenv;
1069410686
fmt = fmt_11;

0 commit comments

Comments
 (0)