diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2023-11-07 00:02:31 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-11-07 00:02:31 +0000 |
| commit | 38bc2a577e066ed5bac95162e64615be86402216 (patch) | |
| tree | a86c4435a02d3ea4b973ab1dc6eb725c7438be72 /pkgs/misc | |
| parent | 6a9ebf2ffed672e1920bc30cb9bcfca97995470b (diff) | |
| parent | fe3d292f2ce29cbc121d4aa6242545d56a5034bf (diff) | |
| download | nixpkgs-38bc2a577e066ed5bac95162e64615be86402216.tar nixpkgs-38bc2a577e066ed5bac95162e64615be86402216.tar.gz nixpkgs-38bc2a577e066ed5bac95162e64615be86402216.tar.bz2 nixpkgs-38bc2a577e066ed5bac95162e64615be86402216.tar.lz nixpkgs-38bc2a577e066ed5bac95162e64615be86402216.tar.xz nixpkgs-38bc2a577e066ed5bac95162e64615be86402216.tar.zst nixpkgs-38bc2a577e066ed5bac95162e64615be86402216.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/misc')
| -rw-r--r-- | pkgs/misc/lilypond/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/misc/sagetex/default.nix | 4 |
2 files changed, 3 insertions, 5 deletions
diff --git a/pkgs/misc/lilypond/default.nix b/pkgs/misc/lilypond/default.nix index 17c271793aa..5663e5dec92 100644 --- a/pkgs/misc/lilypond/default.nix +++ b/pkgs/misc/lilypond/default.nix @@ -3,9 +3,7 @@ , fontconfig, freetype, pango, fontforge, help2man, zip, netpbm, groff , freefont_ttf, makeFontsConf , makeWrapper, t1utils, boehmgc, rsync -, texlive, tex ? texlive.combine { - inherit (texlive) scheme-small lh metafont epsf fontinst; - } +, texliveSmall, tex ? texliveSmall.withPackages (ps: with ps; [ lh metafont epsf fontinst ]) }: stdenv.mkDerivation rec { diff --git a/pkgs/misc/sagetex/default.nix b/pkgs/misc/sagetex/default.nix index f1db705afdd..96513b4f9f3 100644 --- a/pkgs/misc/sagetex/default.nix +++ b/pkgs/misc/sagetex/default.nix @@ -2,7 +2,7 @@ , stdenv , fetchFromGitHub , writeShellScript -, texlive +, texliveBasic }: stdenv.mkDerivation rec { @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { outputs = [ "tex" ]; nativeBuildInputs = [ - texlive.combined.scheme-basic + texliveBasic # multiple-outputs.sh fails if $out is not defined (writeShellScript "force-tex-output.sh" '' out="''${tex-}" |