From 5492d23dcce90112af6b9265122fff8d59865870 Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Mon, 23 Mar 2026 10:49:34 -0500 Subject: [PATCH 1/2] lp_solve: migrate to by-name --- .../lp}/lp_solve/0001-fix-cross-compilation.patch | 0 .../lp_solve/default.nix => by-name/lp/lp_solve/package.nix} | 4 ++-- pkgs/top-level/all-packages.nix | 4 ---- 3 files changed, 2 insertions(+), 6 deletions(-) rename pkgs/{applications/science/math => by-name/lp}/lp_solve/0001-fix-cross-compilation.patch (100%) rename pkgs/{applications/science/math/lp_solve/default.nix => by-name/lp/lp_solve/package.nix} (96%) diff --git a/pkgs/applications/science/math/lp_solve/0001-fix-cross-compilation.patch b/pkgs/by-name/lp/lp_solve/0001-fix-cross-compilation.patch similarity index 100% rename from pkgs/applications/science/math/lp_solve/0001-fix-cross-compilation.patch rename to pkgs/by-name/lp/lp_solve/0001-fix-cross-compilation.patch diff --git a/pkgs/applications/science/math/lp_solve/default.nix b/pkgs/by-name/lp/lp_solve/package.nix similarity index 96% rename from pkgs/applications/science/math/lp_solve/default.nix rename to pkgs/by-name/lp/lp_solve/package.nix index 35bd657e7ad3..195c3ac3bcd8 100644 --- a/pkgs/applications/science/math/lp_solve/default.nix +++ b/pkgs/by-name/lp/lp_solve/package.nix @@ -4,7 +4,7 @@ fetchurl, cctools, fixDarwinDylibNames, - autoSignDarwinBinariesHook, + darwin, replaceVars, buildPackages, binutils, @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { fixDarwinDylibNames ] ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [ - autoSignDarwinBinariesHook + darwin.autoSignDarwinBinariesHook ]; env = { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9732092816f4..052e57970a40 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2343,10 +2343,6 @@ with pkgs; fluentd = callPackage ../tools/misc/fluentd { }; - lp_solve = callPackage ../applications/science/math/lp_solve { - inherit (darwin) autoSignDarwinBinariesHook; - }; - fpm = callPackage ../tools/package-management/fpm { }; ferdium = callPackage ../applications/networking/instant-messengers/ferdium { From 09a85412e03fd08839a38a6aa2d5da1e6e026d13 Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Mon, 23 Mar 2026 10:50:29 -0500 Subject: [PATCH 2/2] lp_solve: refactor --- pkgs/by-name/lp/lp_solve/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/lp/lp_solve/package.nix b/pkgs/by-name/lp/lp_solve/package.nix index 195c3ac3bcd8..cadd82feb7f0 100644 --- a/pkgs/by-name/lp/lp_solve/package.nix +++ b/pkgs/by-name/lp/lp_solve/package.nix @@ -10,13 +10,13 @@ binutils, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "lp_solve"; version = "5.5.2.11"; src = fetchurl { - url = "mirror://sourceforge/project/lpsolve/lpsolve/${version}/lp_solve_${version}_source.tar.gz"; - sha256 = "sha256-bUq/9cxqqpM66ObBeiJt8PwLZxxDj2lxXUHQn+gfkC8="; + url = "mirror://sourceforge/project/lpsolve/lpsolve/${finalAttrs.version}/lp_solve_${finalAttrs.version}_source.tar.gz"; + hash = "sha256-bUq/9cxqqpM66ObBeiJt8PwLZxxDj2lxXUHQn+gfkC8="; }; nativeBuildInputs = @@ -81,4 +81,4 @@ stdenv.mkDerivation rec { maintainers = [ ]; platforms = lib.platforms.unix; }; -} +})