From 6ed4c933fe3e587a8b939c5e4059ceb560ab38b7 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Thu, 10 Aug 2023 04:20:00 +0000 Subject: [PATCH 1/2] cminpack: 1.3.6 -> 1.3.8 Diff: https://github.com/devernay/cminpack/compare/v1.3.6...v1.3.8 Changelog: https://github.com/devernay/cminpack/blob/v1.3.8/README.md#history --- .../libraries/cminpack/default.nix | 47 ++++++++++++------- 1 file changed, 31 insertions(+), 16 deletions(-) diff --git a/pkgs/development/libraries/cminpack/default.nix b/pkgs/development/libraries/cminpack/default.nix index 02ad6acfbe2a..c011b64330fe 100644 --- a/pkgs/development/libraries/cminpack/default.nix +++ b/pkgs/development/libraries/cminpack/default.nix @@ -1,25 +1,41 @@ -{lib, stdenv, fetchurl}: +{ lib +, stdenv +, cmake +, darwin +, fetchFromGitHub +, fetchurl +, withBlas ? true, blas +}: stdenv.mkDerivation rec { pname = "cminpack"; - version = "1.3.6"; + version = "1.3.8"; - src = fetchurl { - url = "http://devernay.free.fr/hacks/cminpack/cminpack-${version}.tar.gz"; - sha256 = "17yh695aim508x1kn9zf6g13jxwk3pi3404h5ix4g5lc60hzs1rw"; + src = fetchFromGitHub { + owner = "devernay"; + repo = "cminpack"; + rev = "v${version}"; + hash = "sha256-eFJ43cHbSbWld+gPpMaNiBy1X5TIcN9aVxjh8PxvVDU="; }; - postPatch = '' - substituteInPlace Makefile \ - --replace '/usr/local' '${placeholder "out"}' \ - --replace 'gcc' '${stdenv.cc.targetPrefix}cc' \ - --replace 'ranlib -t' '${stdenv.cc.targetPrefix}ranlib' \ - --replace 'ranlib' '${stdenv.cc.targetPrefix}ranlib' - ''; + strictDeps = true; - preInstall = '' - mkdir -p $out/lib $out/include - ''; + nativeBuildInputs = [ + cmake + ]; + + buildInputs = lib.optionals withBlas [ + blas + ] ++ lib.optionals (withBlas && stdenv.isDarwin) [ + darwin.apple_sdk.frameworks.Accelerate + darwin.apple_sdk.frameworks.CoreGraphics + darwin.apple_sdk.frameworks.CoreVideo + ]; + + cmakeFlags = [ + "-DUSE_BLAS=${if withBlas then "ON" else "OFF"}" + "-DBUILD_SHARED_LIBS=${if stdenv.hostPlatform.isStatic then "OFF" else "ON"}" + ]; meta = { homepage = "http://devernay.free.fr/hacks/cminpack/cminpack.html"; @@ -27,5 +43,4 @@ stdenv.mkDerivation rec { description = "Software for solving nonlinear equations and nonlinear least squares problems"; platforms = lib.platforms.all; }; - } From fe8dd61d5c4544d4ac37acce773d2064e6f2bf78 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Thu, 10 Aug 2023 04:20:00 +0000 Subject: [PATCH 2/2] cminpack: update meta --- pkgs/development/libraries/cminpack/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/cminpack/default.nix b/pkgs/development/libraries/cminpack/default.nix index c011b64330fe..bebb59334f15 100644 --- a/pkgs/development/libraries/cminpack/default.nix +++ b/pkgs/development/libraries/cminpack/default.nix @@ -38,9 +38,11 @@ stdenv.mkDerivation rec { ]; meta = { - homepage = "http://devernay.free.fr/hacks/cminpack/cminpack.html"; - license = lib.licenses.bsd3; description = "Software for solving nonlinear equations and nonlinear least squares problems"; + homepage = "http://devernay.free.fr/hacks/cminpack/"; + changelog = "https://github.com/devernay/cminpack/blob/v${version}/README.md#history"; + license = lib.licenses.bsd3; platforms = lib.platforms.all; + maintainers = [ ]; }; }