From 91d7056e9e0442e5e571107f430b44a006b526ac Mon Sep 17 00:00:00 2001 From: pancaek <20342389+pancaek@users.noreply.github.com> Date: Wed, 8 Jul 2026 14:12:33 -0700 Subject: [PATCH] shogun: move to by-name/ --- .../machine-learning => by-name/sh}/shogun/eigen-3.4.patch | 0 .../sh}/shogun/fix-virtual-destruction.patch | 0 .../shogun/default.nix => by-name/sh/shogun/package.nix} | 4 ++-- .../sh}/shogun/svmlight-scrubber.patch | 0 pkgs/top-level/all-packages.nix | 4 ---- 5 files changed, 2 insertions(+), 6 deletions(-) rename pkgs/{applications/science/machine-learning => by-name/sh}/shogun/eigen-3.4.patch (100%) rename pkgs/{applications/science/machine-learning => by-name/sh}/shogun/fix-virtual-destruction.patch (100%) rename pkgs/{applications/science/machine-learning/shogun/default.nix => by-name/sh/shogun/package.nix} (99%) rename pkgs/{applications/science/machine-learning => by-name/sh}/shogun/svmlight-scrubber.patch (100%) diff --git a/pkgs/applications/science/machine-learning/shogun/eigen-3.4.patch b/pkgs/by-name/sh/shogun/eigen-3.4.patch similarity index 100% rename from pkgs/applications/science/machine-learning/shogun/eigen-3.4.patch rename to pkgs/by-name/sh/shogun/eigen-3.4.patch diff --git a/pkgs/applications/science/machine-learning/shogun/fix-virtual-destruction.patch b/pkgs/by-name/sh/shogun/fix-virtual-destruction.patch similarity index 100% rename from pkgs/applications/science/machine-learning/shogun/fix-virtual-destruction.patch rename to pkgs/by-name/sh/shogun/fix-virtual-destruction.patch diff --git a/pkgs/applications/science/machine-learning/shogun/default.nix b/pkgs/by-name/sh/shogun/package.nix similarity index 99% rename from pkgs/applications/science/machine-learning/shogun/default.nix rename to pkgs/by-name/sh/shogun/package.nix index fae5f8a00782..e7ad0d79e559 100644 --- a/pkgs/applications/science/machine-learning/shogun/default.nix +++ b/pkgs/by-name/sh/shogun/package.nix @@ -15,7 +15,7 @@ lapack, glpk, # data - protobuf, + protobuf_21, json_c, libxml2, hdf5, @@ -130,7 +130,7 @@ stdenv.mkDerivation (finalAttrs: { blas lapack glpk - protobuf + protobuf_21 json_c libxml2 hdf5 diff --git a/pkgs/applications/science/machine-learning/shogun/svmlight-scrubber.patch b/pkgs/by-name/sh/shogun/svmlight-scrubber.patch similarity index 100% rename from pkgs/applications/science/machine-learning/shogun/svmlight-scrubber.patch rename to pkgs/by-name/sh/shogun/svmlight-scrubber.patch diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index dc70e4476e16..18917a22d016 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9245,10 +9245,6 @@ with pkgs; scx = recurseIntoAttrs (callPackage ../os-specific/linux/scx { }); - shogun = callPackage ../applications/science/machine-learning/shogun { - protobuf = protobuf_21; - }; - inherit ({ softmaker-office = callPackage ../applications/office/softmaker/softmaker-office.nix { };