From 712b8275ae20304de67980f3b52ac0afc9855dde Mon Sep 17 00:00:00 2001 From: Florian Nagel Date: Mon, 5 Feb 2024 15:32:47 +0100 Subject: [PATCH 1/3] tectonic: 0.14.1 -> 0.15.0 Release notes: https://github.com/tectonic-typesetting/tectonic/releases/tag/tectonic%400.15.0 --- pkgs/tools/typesetting/tectonic/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/typesetting/tectonic/default.nix b/pkgs/tools/typesetting/tectonic/default.nix index 6b98a5db6343..016ed39978e0 100644 --- a/pkgs/tools/typesetting/tectonic/default.nix +++ b/pkgs/tools/typesetting/tectonic/default.nix @@ -21,17 +21,17 @@ rustPlatform.buildRustPackage rec { pname = "tectonic"; - version = "0.14.1"; + version = "0.15.0"; src = fetchFromGitHub { owner = "tectonic-typesetting"; repo = "tectonic"; rev = "tectonic@${version}"; fetchSubmodules = true; - sha256 = "sha256-Cd8YzjU5mCA5DmgLBjg8eVRc87chVVIXinJuf8cNw3o="; + sha256 = "sha256-xZHYiaQ8ASUwu0ieHIXcjRaH06SQoB6OR1y7Ok+FjAs="; }; - cargoHash = "sha256-1WjZbmZFPB1+QYpjqq5Y+fDkMZNmWJYIxmMFWg7Tiac="; + cargoHash = "sha256-niMgb4zsTWHw5yaa4kJOZzpOzO5gMG4k3cTHwSV+wmY="; nativeBuildInputs = [ pkg-config ]; From 771e06e9eedbcb25664563fdec5592bcf9cad707 Mon Sep 17 00:00:00 2001 From: Bryan Lai Date: Mon, 1 Jan 2024 16:28:12 +0800 Subject: [PATCH 2/3] tectonic: wrap with a correct `--web-bundle` Co-authored-by: Doron Behar --- pkgs/tools/typesetting/tectonic/default.nix | 1 - pkgs/tools/typesetting/tectonic/wrapper.nix | 37 ++++++++++----------- 2 files changed, 18 insertions(+), 20 deletions(-) diff --git a/pkgs/tools/typesetting/tectonic/default.nix b/pkgs/tools/typesetting/tectonic/default.nix index 016ed39978e0..e7172e608746 100644 --- a/pkgs/tools/typesetting/tectonic/default.nix +++ b/pkgs/tools/typesetting/tectonic/default.nix @@ -15,7 +15,6 @@ , harfbuzz , openssl , pkg-config -, makeBinaryWrapper , icu }: diff --git a/pkgs/tools/typesetting/tectonic/wrapper.nix b/pkgs/tools/typesetting/tectonic/wrapper.nix index f9e2f7eb59eb..42125e7855d8 100644 --- a/pkgs/tools/typesetting/tectonic/wrapper.nix +++ b/pkgs/tools/typesetting/tectonic/wrapper.nix @@ -1,8 +1,9 @@ { lib , symlinkJoin +, tectonic , tectonic-unwrapped , biber-for-tectonic -, makeWrapper +, makeBinaryWrapper , callPackage }: @@ -10,35 +11,32 @@ symlinkJoin { name = "${tectonic-unwrapped.pname}-wrapped-${tectonic-unwrapped.version}"; paths = [ tectonic-unwrapped ]; - nativeBuildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeBinaryWrapper ]; passthru = { unwrapped = tectonic-unwrapped; biber = biber-for-tectonic; tests = callPackage ./tests.nix { }; + + # The version locked tectonic web bundle, redirected from: + # https://relay.fullyjustified.net/default_bundle_v33.tar + # To check for updates, see: + # https://github.com/tectonic-typesetting/tectonic/blob/master/crates/bundles/src/lib.rs + # ... and look up `get_fallback_bundle_url`. + bundleUrl = "https://data1.fullyjustified.net/tlextras-2022.0r0.tar"; }; # Replace the unwrapped tectonic with the one wrapping it with biber postBuild = '' rm $out/bin/{tectonic,nextonic} '' - # Ideally, we would have liked to also pin the version of the online TeX - # bundle that Tectonic's developer distribute, so that the `biber` version - # and the `biblatex` version distributed from there are compatible. - # However, that is not currently possible, due to lack of upstream support - # for specifying this in runtime, there were 2 suggestions sent upstream - # that suggested a way of improving the situation: + # Pin the version of the online TeX bundle that Tectonic's developer + # distribute, so that the `biber` version and the `biblatex` version + # distributed from there are compatible. # - # - https://github.com/tectonic-typesetting/tectonic/pull/1132 - # - https://github.com/tectonic-typesetting/tectonic/pull/1131 - # - # The 1st suggestion seems more promising as it'd allow us to simply use - # makeWrapper's --add-flags option. However, the PR linked above is not - # complete, and as of currently, upstream hasn't even reviewed it, or - # commented on the idea. - # - # Note also that upstream has announced that they will put less time and - # energy for the project: + # Upstream is updating it's online TeX bundle slower then + # https://github.com/plk/biber. That's why we match here the `bundleURL` + # version with that of `biber-for-tectonic`. See also upstream discussion: # # https://github.com/tectonic-typesetting/tectonic/discussions/1122 # @@ -47,7 +45,8 @@ symlinkJoin { # won't require a higher version of biber. + '' makeWrapper ${lib.getBin tectonic-unwrapped}/bin/tectonic $out/bin/tectonic \ - --prefix PATH : "${lib.getBin biber-for-tectonic}/bin" + --prefix PATH : "${lib.getBin biber-for-tectonic}/bin" \ + --add-flags "--web-bundle ${tectonic.passthru.bundleUrl}" ln -s $out/bin/tectonic $out/bin/nextonic ''; From 98a319b7c7e98a9bbf9cd02018a879e450fbfe04 Mon Sep 17 00:00:00 2001 From: Bryan Lai Date: Mon, 1 Jan 2024 16:27:55 +0800 Subject: [PATCH 3/3] tectonic: add passthru.tests.workspace Also, replace `builtins.toFile` with `pkgs.writeText` because the former blocks the evaluation loop just like an import from derivation (IFD). Although it is _technically_ not an IFD, it has very similar effects, and thus we should prefer the nixpkgs `pkgs.writeText` instead. --- pkgs/tools/typesetting/tectonic/tests.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/typesetting/tectonic/tests.nix b/pkgs/tools/typesetting/tectonic/tests.nix index 0ecf47bf1977..da1961c8e42d 100644 --- a/pkgs/tools/typesetting/tectonic/tests.nix +++ b/pkgs/tools/typesetting/tectonic/tests.nix @@ -3,6 +3,7 @@ { lib , fetchFromGitHub +, writeText , runCommand , tectonic , curl @@ -26,7 +27,7 @@ let }; testfiles = "${biber-dev-source}/testfiles"; - noNetNotice = builtins.toFile "tectonic-offline-notice" '' + noNetNotice = writeText "tectonic-offline-notice" '' # To fetch tectonic's web bundle, the tests require internet access, # which is not available in the current environment. ''; @@ -84,4 +85,9 @@ lib.mapAttrs networkRequiringTestPkg { export HOME=$PWD tectonic -X compile ./test.tex ''; + + workspace = '' + tectonic -X new + cat Tectonic.toml | grep "${tectonic.bundleUrl}" + ''; }