From d2f3dc913dce46afccbe7fb5f815e27bdddedac0 Mon Sep 17 00:00:00 2001 From: magicquark <198001825+magicquark@users.noreply.github.com> Date: Tue, 9 Dec 2025 03:28:32 +0000 Subject: [PATCH] asymptote: migrate to pkgs/by-name --- .../default.nix => by-name/as/asymptote/package.nix} | 10 ++++------ pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 4 insertions(+), 8 deletions(-) rename pkgs/{tools/graphics/asymptote/default.nix => by-name/as/asymptote/package.nix} (98%) diff --git a/pkgs/tools/graphics/asymptote/default.nix b/pkgs/by-name/as/asymptote/package.nix similarity index 98% rename from pkgs/tools/graphics/asymptote/default.nix rename to pkgs/by-name/as/asymptote/package.nix index c40eef77c647..e0608eb5d8f6 100644 --- a/pkgs/tools/graphics/asymptote/default.nix +++ b/pkgs/by-name/as/asymptote/package.nix @@ -6,7 +6,6 @@ bison, glm, flex, - wrapQtAppsHook, cmake, pkg-config, libglut, @@ -14,6 +13,7 @@ imagemagick, fftw, eigen, + libsForQt5, libtirpc, boehmgc, libGLU, @@ -24,8 +24,6 @@ gsl, libsigsegv, python3, - qtbase, - qtsvg, boost186, zlib, perl, @@ -61,7 +59,7 @@ stdenv.mkDerivation (finalAttrs: { flex bison texinfo - wrapQtAppsHook + libsForQt5.wrapQtAppsHook cmake ghostscriptX perl @@ -101,8 +99,8 @@ stdenv.mkDerivation (finalAttrs: { zlib perl curl - qtbase - qtsvg + libsForQt5.qtbase + libsForQt5.qtsvg # relies on removed asio::io_service # https://github.com/kuafuwang/LspCpp/issues/52 boost186 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6f1d1d9381d4..25ef040566e7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1490,8 +1490,6 @@ with pkgs; arpack-mpi = arpack.override { useMpi = true; }; - asymptote = libsForQt5.callPackage ../tools/graphics/asymptote { }; - authelia = callPackage ../servers/authelia { buildGoModule = buildGo124Module; pnpm = pnpm_10;