commit 46f37357bae070265605c2da2c20218b7eb26cb2 · pyrox.dev/nixpkgs

+19 -19

pkgs/by-name/te/tectonic-unwrapped/package.nix

···

       8
       8
        
       

     

       9
       9
        
       {

     

       10
       10
        
         lib,

     

       11
       11
       -
         stdenv,

     

       11
       11
       +
         clangStdenv,

     

       12
       12
        
         fetchFromGitHub,

     

       13
       13
        
         rustPlatform,

     

       14
       14
       -
         darwin,

     

       15
       14
        
         fontconfig,

     

       16
       15
        
         harfbuzzFull,

     

       17
       16
        
         openssl,

     
···

       20
       19
        
         fetchpatch2,

     

       21
       20
        
       }:

     

       22
       21
        
       

     

       23
       23
       -
       rustPlatform.buildRustPackage rec {

     

       22
       22
       +
       let

     

       23
       23
       +
       

     

       24
       24
       +
         buildRustPackage = rustPlatform.buildRustPackage.override {

     

       25
       25
       +
           # use clang to work around build failure with GCC 14

     

       26
       26
       +
           # see: https://github.com/tectonic-typesetting/tectonic/issues/1263

     

       27
       27
       +
           stdenv = clangStdenv;

     

       28
       28
       +
         };

     

       29
       29
       +
       

     

       30
       30
       +
       in

     

       31
       31
       +
       

     

       32
       32
       +
       buildRustPackage rec {

     

       24
       33
        
         pname = "tectonic";

     

       25
       34
        
         version = "0.15.0";

     

       26
       35
        
       

     
···

       56
       65
        
       

     

       57
       66
        
         buildFeatures = [ "external-harfbuzz" ];

     

       58
       67
        
       

     

       59
       59
       -
         buildInputs =

     

       60
       60
       -
           [

     

       61
       61
       -
             icu

     

       62
       62
       -
             fontconfig

     

       63
       63
       -
             harfbuzzFull

     

       64
       64
       -
             openssl

     

       65
       65
       -
           ]

     

       66
       66
       -
           ++ lib.optionals stdenv.hostPlatform.isDarwin (

     

       67
       67
       -
             with darwin.apple_sdk.frameworks;

     

       68
       68
       -
             [

     

       69
       69
       -
               ApplicationServices

     

       70
       70
       -
               Cocoa

     

       71
       71
       -
               Foundation

     

       72
       72
       -
             ]

     

       73
       73
       -
           );

     

       68
       68
       +
         buildInputs = [

     

       69
       69
       +
           icu

     

       70
       70
       +
           fontconfig

     

       71
       71
       +
           harfbuzzFull

     

       72
       72
       +
           openssl

     

       73
       73
       +
         ];

     

       74
       74
        
       

     

       75
       75
        
         postInstall =

     

       76
       76
        
           ''

     

       77
       77
        
             # Makes it possible to automatically use the V2 CLI API

     

       78
       78
        
             ln -s $out/bin/tectonic $out/bin/nextonic

     

       79
       79
        
           ''

     

       80
       80
       -
           + lib.optionalString stdenv.hostPlatform.isLinux ''

     

       80
       80
       +
           + lib.optionalString clangStdenv.hostPlatform.isLinux ''

     

       81
       81
        
             substituteInPlace dist/appimage/tectonic.desktop \

     

       82
       82
        
               --replace Exec=tectonic Exec=$out/bin/tectonic

     

       83
       83
        
             install -D dist/appimage/tectonic.desktop -t $out/share/applications/

+42

pkgs/by-name/te/texpresso/tectonic.nix

···

       1
       1
       +
       {

     

       2
       2
       +
         tectonic-unwrapped,

     

       3
       3
       +
         fetchFromGitHub,

     

       4
       4
       +
         rustPlatform,

     

       5
       5
       +
       }:

     

       6
       6
       +
       

     

       7
       7
       +
       tectonic-unwrapped.overrideAttrs (

     

       8
       8
       +
         finalAttrs: prevAttrs: {

     

       9
       9
       +
           pname = "texpresso-tonic";

     

       10
       10
       +
           version = "0.15.0-unstable-2024-04-19";

     

       11
       11
       +
           src = fetchFromGitHub {

     

       12
       12
       +
             owner = "let-def";

     

       13
       13
       +
             repo = "tectonic";

     

       14
       14
       +
             rev = "b38cb3b2529bba947d520ac29fbb7873409bd270";

     

       15
       15
       +
             hash = "sha256-ap7fEPHsASAphIQkjcvk1CC7egTdxaUh7IpSS5os4W8=";

     

       16
       16
       +
             fetchSubmodules = true;

     

       17
       17
       +
           };

     

       18
       18
       +
           useFetchCargoVendor = true;

     

       19
       19
       +
           cargoHash = "sha256-mqhbIv5r/5EDRDfP2BymXv9se2NCKxzRGqNqwqbD9A0=";

     

       20
       20
       +
           # rebuild cargoDeps by hand because `.overrideAttrs cargoHash`

     

       21
       21
       +
           # does not reconstruct cargoDeps (a known limitation):

     

       22
       22
       +
           cargoDeps = rustPlatform.fetchCargoVendor {

     

       23
       23
       +
             inherit (finalAttrs) src;

     

       24
       24
       +
             name = "${finalAttrs.pname}-${finalAttrs.version}";

     

       25
       25
       +
             hash = finalAttrs.cargoHash;

     

       26
       26
       +
             patches = finalAttrs.cargoPatches;

     

       27
       27
       +
           };

     

       28
       28
       +
           # binary has a different name, bundled tests won't work

     

       29
       29
       +
           doCheck = false;

     

       30
       30
       +
           postInstall = ''

     

       31
       31
       +
             ${prevAttrs.postInstall or ""}

     

       32
       32
       +
       

     

       33
       33
       +
             # Remove the broken `nextonic` symlink

     

       34
       34
       +
             # It points to `tectonic`, which doesn't exist because the exe is

     

       35
       35
       +
             # renamed to texpresso-tonic

     

       36
       36
       +
             rm $out/bin/nextonic

     

       37
       37
       +
           '';

     

       38
       38
       +
           meta = prevAttrs.meta // {

     

       39
       39
       +
             mainProgram = "texpresso-tonic";

     

       40
       40
       +
           };

     

       41
       41
       +
         }

     

       42
       42
       +
       )

+14 -14

pkgs/tools/typesetting/tex/texpresso/default.nix pkgs/by-name/te/texpresso/package.nix

···

       13
       13
        
         openjpeg,

     

       14
       14
        
         gumbo,

     

       15
       15
        
         libjpeg,

     

       16
       16
       -
         texpresso-tectonic,

     

       16
       16
       +
         callPackage,

     

       17
       17
        
       }:

     

       18
       18
        
       

     

       19
       19
       -
       stdenv.mkDerivation rec {

     

       19
       19
       +
       stdenv.mkDerivation (finalAttrs: {

     

       20
       20
        
         pname = "texpresso";

     

       21
       21
        
         version = "0-unstable-2025-01-29";

     

       22
       22
       +
       

     

       23
       23
       +
         src = fetchFromGitHub {

     

       24
       24
       +
           owner = "let-def";

     

       25
       25
       +
           repo = "texpresso";

     

       26
       26
       +
           rev = "c42a5912f501f180984840fa8adf9ffc09c5ac13";

     

       27
       27
       +
           hash = "sha256-T/vou7OcGtNoodCrznmjBLxg6ZAFDCjhpYgNyZaf44g=";

     

       28
       28
       +
         };

     

       22
       29
        
       

     

       23
       30
        
         postPatch = ''

     

       24
       31
        
           substituteInPlace Makefile \

     
···

       39
       46
        
           libjpeg

     

       40
       47
        
         ];

     

       41
       48
        
       

     

       42
       42
       -
         src = fetchFromGitHub {

     

       43
       43
       -
           owner = "let-def";

     

       44
       44
       -
           repo = "texpresso";

     

       45
       45
       -
           rev = "c42a5912f501f180984840fa8adf9ffc09c5ac13";

     

       46
       46
       -
           hash = "sha256-T/vou7OcGtNoodCrznmjBLxg6ZAFDCjhpYgNyZaf44g=";

     

       47
       47
       -
         };

     

       48
       48
       -
       

     

       49
       49
        
         buildFlags = [ "texpresso" ];

     

       50
       50
        
       

     

       51
       51
        
         env.NIX_CFLAGS_COMPILE = toString (

     
···

       56
       56
        
       

     

       57
       57
        
         installPhase = ''

     

       58
       58
        
           runHook preInstall

     

       59
       59
       -
           install -Dm0755 -t "$out/bin/" "build/${pname}"

     

       59
       59
       +
           install -Dm0755 -t "$out/bin/" "build/${finalAttrs.pname}"

     

       60
       60
        
           runHook postInstall

     

       61
       61
        
         '';

     

       62
       62
        
       

     

       63
       63
        
         # needs to have texpresso-tonic on its path

     

       64
       64
        
         postInstall = ''

     

       65
       65
        
           wrapProgram $out/bin/texpresso \

     

       66
       66
       -
             --prefix PATH : ${lib.makeBinPath [ texpresso-tectonic ]}

     

       66
       66
       +
             --prefix PATH : ${lib.makeBinPath [ finalAttrs.finalPackage.passthru.tectonic ]}

     

       67
       67
        
         '';

     

       68
       68
        
       

     

       69
       69
        
         passthru = {

     

       70
       70
       -
           tectonic = texpresso-tectonic;

     

       70
       70
       +
           tectonic = callPackage ./tectonic.nix { };

     

       71
       71
        
           updateScript = writeScript "update-texpresso" ''

     

       72
       72
        
             #!/usr/bin/env nix-shell

     

       73
       73
        
             #!nix-shell -i bash -p curl jq nix-update

     
···

       79
       79
        
         };

     

       80
       80
        
       

     

       81
       81
        
         meta = {

     

       82
       82
       -
           inherit (src.meta) homepage;

     

       82
       82
       +
           inherit (finalAttrs.src.meta) homepage;

     

       83
       83
        
           description = "Live rendering and error reporting for LaTeX";

     

       84
       84
        
           maintainers = with lib.maintainers; [ nickhu ];

     

       85
       85
        
           license = lib.licenses.mit;

     

       86
       86
        
           platforms = lib.platforms.unix;

     

       87
       87
        
         };

     

       88
       88
       -
       }

     

       88
       88
       +
       })

-33

pkgs/tools/typesetting/tex/texpresso/tectonic.nix

···

       1
       1
       -
       { tectonic-unwrapped, fetchFromGitHub }:

     

       2
       2
       -
       tectonic-unwrapped.override (old: {

     

       3
       3
       -
         rustPlatform = old.rustPlatform // {

     

       4
       4
       -
           buildRustPackage =

     

       5
       5
       -
             args:

     

       6
       6
       -
             old.rustPlatform.buildRustPackage (

     

       7
       7
       -
               args

     

       8
       8
       -
               // {

     

       9
       9
       -
                 pname = "texpresso-tonic";

     

       10
       10
       -
                 src = fetchFromGitHub {

     

       11
       11
       -
                   owner = "let-def";

     

       12
       12
       -
                   repo = "tectonic";

     

       13
       13
       -
                   rev = "b38cb3b2529bba947d520ac29fbb7873409bd270";

     

       14
       14
       -
                   hash = "sha256-ap7fEPHsASAphIQkjcvk1CC7egTdxaUh7IpSS5os4W8=";

     

       15
       15
       -
                   fetchSubmodules = true;

     

       16
       16
       -
                 };

     

       17
       17
       -
                 useFetchCargoVendor = true;

     

       18
       18
       -
                 cargoHash = "sha256-mqhbIv5r/5EDRDfP2BymXv9se2NCKxzRGqNqwqbD9A0=";

     

       19
       19
       -
                 # binary has a different name, bundled tests won't work

     

       20
       20
       -
                 doCheck = false;

     

       21
       21
       -
                 postInstall = ''

     

       22
       22
       -
                   ${args.postInstall or ""}

     

       23
       23
       -
       

     

       24
       24
       -
                   # Remove the broken `nextonic` symlink

     

       25
       25
       -
                   # It points to `tectonic`, which doesn't exist because the exe is

     

       26
       26
       -
                   # renamed to texpresso-tonic

     

       27
       27
       -
                   rm $out/bin/nextonic

     

       28
       28
       -
                 '';

     

       29
       29
       -
                 meta.mainProgram = "texpresso-tonic";

     

       30
       30
       -
               }

     

       31
       31
       -
             );

     

       32
       32
       -
         };

     

       33
       33
       -
       })

-4

pkgs/top-level/all-packages.nix

···

       10625
       10625
        
           fmt = fmt_11;

     

       10626
       10626
        
         };

     

       10627
       10627
        
       

     

       10628
       10628
       -
         texpresso = callPackage ../tools/typesetting/tex/texpresso {

     

       10629
       10629
       -
           texpresso-tectonic = callPackage ../tools/typesetting/tex/texpresso/tectonic.nix { };

     

       10630
       10630
       -
         };

     

       10631
       10631
       -
       

     

       10632
       10628
        
         tinyxml = tinyxml2;

     

       10633
       10629
        
       

     

       10634
       10630
        
         tinyxml2 = callPackage ../development/libraries/tinyxml/2.6.2.nix { };