From e46f7b3ec86dbfd1d51842c7f049283b0f2a22b8 Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Sun, 2 Mar 2025 21:37:54 +0100 Subject: [PATCH 1/2] curv: 0.5-unstable-2025-01-06 -> 0.5-unstable-2025-01-20 --- pkgs/by-name/cu/curv/package.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/cu/curv/package.nix b/pkgs/by-name/cu/curv/package.nix index ae6d0b8f3ac7..bb1d3bc3ca4e 100644 --- a/pkgs/by-name/cu/curv/package.nix +++ b/pkgs/by-name/cu/curv/package.nix @@ -15,18 +15,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; }; @@ -70,6 +71,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"; From a3148686626e3fd81c1e4854e8ea4e891a9cf9ed Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Sun, 2 Mar 2025 22:07:57 +0100 Subject: [PATCH 2/2] curv: downgrade eigen --- pkgs/by-name/cu/curv/package.nix | 30 +++++++++++++++++++++++++++++- 1 file changed, 29 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/cu/curv/package.nix b/pkgs/by-name/cu/curv/package.nix index bb1d3bc3ca4e..c32254a94890 100644 --- a/pkgs/by-name/cu/curv/package.nix +++ b/pkgs/by-name/cu/curv/package.nix @@ -2,6 +2,8 @@ lib, stdenv, fetchFromGitea, + fetchFromGitLab, + fetchpatch, cmake, git, pkg-config, @@ -41,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