curv: 0.5-unstable-2025-01-06 -> 0.5-unstable-2025-01-20 (#386478)
This commit is contained in:
@@ -2,6 +2,8 @@
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitea,
|
||||
fetchFromGitLab,
|
||||
fetchpatch,
|
||||
cmake,
|
||||
git,
|
||||
pkg-config,
|
||||
@@ -15,18 +17,19 @@
|
||||
xorg,
|
||||
ilmbase,
|
||||
llvmPackages,
|
||||
unstableGitUpdater,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "curv";
|
||||
version = "0.5-unstable-2025-01-06";
|
||||
version = "0.5-unstable-2025-01-20";
|
||||
|
||||
src = fetchFromGitea {
|
||||
domain = "codeberg.org";
|
||||
owner = "doug-moen";
|
||||
repo = "curv";
|
||||
rev = "a496d98459b65d15feae8e69036944dafb7ec26e";
|
||||
hash = "sha256-2pe76fBU78xRvHxol8O1xv0bBVwbpKDVPLQqqUCTO0Y=";
|
||||
rev = "ef082c6612407dd8abce06015f9a16b1ebf661b8";
|
||||
hash = "sha256-BGL07ZBA+ao3fg3qp56sVTe+3tM2SOp8TGu/jF7SVlM=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
@@ -40,7 +43,33 @@ stdenv.mkDerivation rec {
|
||||
buildInputs =
|
||||
[
|
||||
boost
|
||||
eigen
|
||||
# https://codeberg.org/doug-moen/curv/issues/228
|
||||
# reverts 'eigen: 3.4.0 -> 3.4.0-unstable-2022-05-19'
|
||||
# https://github.com/nixos/nixpkgs/commit/d298f046edabc84b56bd788e11eaf7ed72f8171c
|
||||
(eigen.overrideAttrs (old: rec {
|
||||
version = "3.4.0";
|
||||
src = fetchFromGitLab {
|
||||
owner = "libeigen";
|
||||
repo = "eigen";
|
||||
rev = version;
|
||||
hash = "sha256-1/4xMetKMDOgZgzz3WMxfHUEpmdAm52RqZvz6i0mLEw=";
|
||||
};
|
||||
patches = (old.patches or [ ]) ++ [
|
||||
# Fixes e.g. onnxruntime on aarch64-darwin:
|
||||
# https://hydra.nixos.org/build/248915128/nixlog/1,
|
||||
# originally suggested in https://github.com/NixOS/nixpkgs/pull/258392.
|
||||
#
|
||||
# The patch is from
|
||||
# ["Fix vectorized reductions for Eigen::half"](https://gitlab.com/libeigen/eigen/-/merge_requests/699)
|
||||
# which is two years old,
|
||||
# but Eigen hasn't had a release in two years either:
|
||||
# https://gitlab.com/libeigen/eigen/-/issues/2699.
|
||||
(fetchpatch {
|
||||
url = "https://gitlab.com/libeigen/eigen/-/commit/d0e3791b1a0e2db9edd5f1d1befdb2ac5a40efe0.patch";
|
||||
hash = "sha256-8qiNpuYehnoiGiqy0c3Mcb45pwrmc6W4rzCxoLDSvj0=";
|
||||
})
|
||||
];
|
||||
}))
|
||||
glm
|
||||
libGL
|
||||
libpng
|
||||
@@ -70,6 +99,8 @@ stdenv.mkDerivation rec {
|
||||
runHook postInstallCheck
|
||||
'';
|
||||
|
||||
passthru.updateScript = unstableGitUpdater { };
|
||||
|
||||
meta = with lib; {
|
||||
description = "2D and 3D geometric modelling programming language for creating art with maths";
|
||||
homepage = "https://codeberg.org/doug-moen/curv";
|
||||
|
||||
Reference in New Issue
Block a user