nlopt: 2.10.0 -> 2.10.1
All `patches` can be removed as they are integrated into this release. Python bindings continue to function, and luksan solver exclusion also works.
This commit is contained in:
@@ -37,13 +37,13 @@ let
|
||||
in
|
||||
clangStdenv.mkDerivation (finalAttrs: {
|
||||
pname = "nlopt";
|
||||
version = "2.10.0";
|
||||
version = "2.10.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "stevengj";
|
||||
repo = "nlopt";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-mZRmhXrApxfiJedk+L/poIP2DR/BkV04c5fiwPGAyjI=";
|
||||
hash = "sha256-i+Cd2VLMbI4PUSXennR8jgF+/ZkzKX9WkVTPtayr8vs=";
|
||||
};
|
||||
|
||||
outputs = [
|
||||
@@ -51,36 +51,6 @@ clangStdenv.mkDerivation (finalAttrs: {
|
||||
"doc"
|
||||
];
|
||||
|
||||
patches = [
|
||||
# 26-03-2025: `mkdocs.yml` is missing a link for the subpage related to the Java bindings.
|
||||
# 26-03-2025: This commit was merged after v2.10.0 was released, and has not been made
|
||||
# 26-03-2025: part of a release.
|
||||
(fetchpatch {
|
||||
name = "missing-java-reference-mkdocs";
|
||||
url = "https://github.com/stevengj/nlopt/commit/7e34f1a6fe82ed27daa6111d83c4d5629555454b.patch";
|
||||
hash = "sha256-XivfZtgIGLyTtU+Zo2jSQAx2mVdGLJ8PD7VSSvGR/5Q=";
|
||||
})
|
||||
|
||||
# 26-03-2025: The docs pages still list v2.7.1 as the newest version.
|
||||
# 26-03-2025: This commit was merged after v2.10.0 was released, and has not been made
|
||||
# 26-03-2025: part of a release.
|
||||
(fetchpatch {
|
||||
name = "update-index-md";
|
||||
url = "https://github.com/stevengj/nlopt/commit/2c4147832eff7ea15d0536c82351a9e169f85e43.patch";
|
||||
hash = "sha256-BXcbNUyu20f3N146v6v9cpjSj5CwuDtesp6lAqOK2KY=";
|
||||
})
|
||||
|
||||
# 26-03-2025: There is an off-by-one error in the test/CMakeLists.txt
|
||||
# 26-03-2025: that causes the tests to attempt to run disabled Luksan solver code,
|
||||
# 26-03-2025: which in turn causes the test suite to fail.
|
||||
# 26-03-2025: See https://github.com/stevengj/nlopt/pull/605
|
||||
(fetchpatch {
|
||||
name = "fix-nondisabled-luksan-algorithm";
|
||||
url = "https://github.com/stevengj/nlopt/commit/7817ec19f21be6877a4b79777fc5315a52c6850b.patch";
|
||||
hash = "sha256-KgdAMSYKOQuraun4HNr9GOx48yjyeQk6W3IgWRA44oo=";
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace nlopt.pc.in \
|
||||
--replace-fail 'libdir=''${exec_prefix}/@NLOPT_INSTALL_LIBDIR@' 'libdir=@NLOPT_INSTALL_LIBDIR@'
|
||||
|
||||
Reference in New Issue
Block a user