From 1d3253a5111c32066ac4c1dcf77d0ba18894baed Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Tue, 14 Apr 2026 16:05:03 -0500 Subject: [PATCH] tulip: migrate to by-name --- .../default.nix => by-name/tu/tulip/package.nix} | 12 +++++++----- pkgs/top-level/all-packages.nix | 4 ---- 2 files changed, 7 insertions(+), 9 deletions(-) rename pkgs/{applications/science/misc/tulip/default.nix => by-name/tu/tulip/package.nix} (94%) diff --git a/pkgs/applications/science/misc/tulip/default.nix b/pkgs/by-name/tu/tulip/package.nix similarity index 94% rename from pkgs/applications/science/misc/tulip/default.nix rename to pkgs/by-name/tu/tulip/package.nix index e1e58f93e02f..07eb9781ad8d 100644 --- a/pkgs/applications/science/misc/tulip/default.nix +++ b/pkgs/by-name/tu/tulip/package.nix @@ -7,14 +7,16 @@ libGLU, libGL, glew, - qtbase, - wrapQtAppsHook, + qt5, autoPatchelfHook, - python3, + python312, cmake, libjpeg, llvmPackages, }: +let + python3 = python312; # fails to build otherwise +in stdenv.mkDerivation rec { pname = "tulip"; @@ -27,7 +29,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake - wrapQtAppsHook + qt5.wrapQtAppsHook ] ++ lib.optionals stdenv.hostPlatform.isLinux [ autoPatchelfHook ]; @@ -36,7 +38,7 @@ stdenv.mkDerivation rec { freetype glew libjpeg - qtbase + qt5.qtbase python3 ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ llvmPackages.openmp ] diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e057d28d0053..95edcf704802 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11251,10 +11251,6 @@ with pkgs; spyder = with python3.pkgs; toPythonApplication spyder; - tulip = libsForQt5.callPackage ../applications/science/misc/tulip { - python3 = python312; # fails to build otherwise - }; - ### SCIENCE / PHYSICS hepmc3 = callPackage ../development/libraries/physics/hepmc3 {