From 8aa4d13f1029854877feb3575ba92defa896035e Mon Sep 17 00:00:00 2001 From: Aliaksandr Date: Sat, 27 Dec 2025 00:39:48 +0200 Subject: [PATCH] sile: remove top-level override --- pkgs/by-name/si/sile/package.nix | 12 ++++++------ pkgs/top-level/all-packages.nix | 4 ---- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/pkgs/by-name/si/sile/package.nix b/pkgs/by-name/si/sile/package.nix index 493a14a14fde..cc8254927814 100644 --- a/pkgs/by-name/si/sile/package.nix +++ b/pkgs/by-name/si/sile/package.nix @@ -13,7 +13,7 @@ luarocks, # buildInputs - lua, + luajit, harfbuzz, icu, fontconfig, @@ -80,7 +80,7 @@ stdenv.mkDerivation (finalAttrs: { # build time we would fail to build since we only provide it at test time. "PDFINFO=false" ] - ++ lib.optionals (!lua.pkgs.isLuaJIT) [ + ++ lib.optionals (!luajit.pkgs.isLuaJIT) [ "--without-luajit" ]; @@ -111,7 +111,7 @@ stdenv.mkDerivation (finalAttrs: { # Use this passthru variable to add packages to your lua environment. Use # something like this in your development environment: # - # myLuaEnv = lua.withPackages ( + # myLuaEnv = luajit.withPackages ( # ps: lib.attrVals (sile.passthru.luaPackages ++ [ # "lua-cjson" # "lua-resty-http" @@ -142,13 +142,13 @@ stdenv.mkDerivation (finalAttrs: { "ldoc" # NOTE: Add lua packages here, to change the luaEnv also read by `flake.nix` ] - ++ lib.optionals (lib.versionOlder lua.luaversion "5.2") [ + ++ lib.optionals (lib.versionOlder luajit.luaversion "5.2") [ "bit32" ] - ++ lib.optionals (lib.versionOlder lua.luaversion "5.3") [ + ++ lib.optionals (lib.versionOlder luajit.luaversion "5.3") [ "compat53" ]; - luaEnv = lua.withPackages (ps: lib.attrVals finalAttrs.finalPackage.passthru.luaPackages ps); + luaEnv = luajit.withPackages (ps: lib.attrVals finalAttrs.finalPackage.passthru.luaPackages ps); # Copied from Makefile.am tests.test = lib.optionalAttrs (!(stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64)) ( diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 25fa1f6b9e6e..2a7465385691 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -780,10 +780,6 @@ with pkgs; propagatedBuildInputs = [ dieHook ]; } ../build-support/setup-hooks/shorten-perl-shebang.sh; - sile = callPackage ../by-name/si/sile/package.nix { - lua = luajit; - }; - singularity-tools = callPackage ../build-support/singularity-tools { }; srcOnly = callPackage ../build-support/src-only { };