From dd4cf940e60a3b65cd69b9b297f0bd0e6d45f8e2 Mon Sep 17 00:00:00 2001 From: GraysonTinker Date: Thu, 7 May 2026 22:40:16 -0700 Subject: [PATCH] gplates: migrate to by-name --- .../default.nix => by-name/gp/gplates/package.nix} | 10 ++++------ pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 4 insertions(+), 8 deletions(-) rename pkgs/{applications/science/misc/gplates/default.nix => by-name/gp/gplates/package.nix} (94%) diff --git a/pkgs/applications/science/misc/gplates/default.nix b/pkgs/by-name/gp/gplates/package.nix similarity index 94% rename from pkgs/applications/science/misc/gplates/default.nix rename to pkgs/by-name/gp/gplates/package.nix index 353600b8cc90..ba6fcc3ff565 100644 --- a/pkgs/applications/science/misc/gplates/default.nix +++ b/pkgs/by-name/gp/gplates/package.nix @@ -17,9 +17,7 @@ mpfr, proj, python3, - qtxmlpatterns, - qwt, - wrapQtAppsHook, + libsForQt5, }: let @@ -59,7 +57,7 @@ stdenv.mkDerivation (finalAttrs: { cmake doxygen graphviz - wrapQtAppsHook + libsForQt5.wrapQtAppsHook ]; buildInputs = [ @@ -74,8 +72,8 @@ stdenv.mkDerivation (finalAttrs: { mpfr proj python - qtxmlpatterns - qwt + libsForQt5.qtxmlpatterns + libsForQt5.qwt ]; meta = { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e04af46a5ff5..f547448adeaa 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11619,8 +11619,6 @@ with pkgs; cudaSupport = true; }; - gplates = libsForQt5.callPackage ../applications/science/misc/gplates { }; - megam = callPackage ../applications/science/misc/megam { inherit (ocaml-ng.ocamlPackages_4_14) ocaml; };