From 4bc7e6f8bc9cf0789a0e5549191cf77e0c1c8243 Mon Sep 17 00:00:00 2001 From: Guilhem Saurel Date: Sun, 4 May 2025 14:45:58 +0200 Subject: [PATCH 1/5] nix flake update --- flake.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index 444ac0938c..5011e1312f 100644 --- a/flake.lock +++ b/flake.lock @@ -5,11 +5,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1710146030, - "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", "owner": "numtide", "repo": "flake-utils", - "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", "type": "github" }, "original": { @@ -20,11 +20,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1716715802, - "narHash": "sha256-usk0vE7VlxPX8jOavrtpOqphdfqEQpf9lgedlY/r66c=", + "lastModified": 1746300365, + "narHash": "sha256-thYTdWqCRipwPRxWiTiH1vusLuAy0okjOyzRx4hLWh4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e2dd4e18cc1c7314e24154331bae07df76eb582f", + "rev": "f21e4546e3ede7ae34d12a84602a22246b31f7e0", "type": "github" }, "original": { From be12aabbd35cadd789a0603ca0ad6b379261c51d Mon Sep 17 00:00:00 2001 From: Guilhem Saurel Date: Sun, 4 May 2025 13:45:05 +0200 Subject: [PATCH 2/5] nix CI: arm/intel macos/ubuntu --- .github/workflows/nix.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/nix.yml b/.github/workflows/nix.yml index 41f5ca2636..2facb2650f 100644 --- a/.github/workflows/nix.yml +++ b/.github/workflows/nix.yml @@ -11,10 +11,10 @@ concurrency: jobs: tests: name: "Nix build on ${{ matrix.os }}" - runs-on: "${{ matrix.os }}-latest" + runs-on: "${{ matrix.os }}" strategy: matrix: - os: [ubuntu, macos] + os: ["ubuntu-24.04", "ubuntu-24.04-arm", "macos-13", "macos-14"] steps: - uses: actions/checkout@v4 - uses: DeterminateSystems/nix-installer-action@main From fcb8697db049b766d7c187508bcf5e494333e63a Mon Sep 17 00:00:00 2001 From: Guilhem Saurel Date: Fri, 9 May 2025 11:14:29 +0200 Subject: [PATCH 3/5] nix: test with clang 15 --- default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/default.nix b/default.nix index 405147b4ea..4f04d07aed 100644 --- a/default.nix +++ b/default.nix @@ -37,9 +37,10 @@ xorg, zbar, zlib, + llvmPackages_15, }: -stdenv.mkDerivation (finalAttrs: { +llvmPackages_15.stdenv.mkDerivation (finalAttrs: { pname = "visp"; version = "3.6.0"; From df1e480812016a0b30592d026f0f367fed615bf3 Mon Sep 17 00:00:00 2001 From: Fabien Spindler Date: Mon, 19 May 2025 08:16:50 +0200 Subject: [PATCH 4/5] Attempt to use atlas instead of lapack (openblas) to see if tests are passing on macos-13 without segfault --- default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/default.nix b/default.nix index 4f04d07aed..ac9ed9fe81 100644 --- a/default.nix +++ b/default.nix @@ -8,13 +8,14 @@ # visp> 315 | if (!mRoot->showConfigDialog()) { # visp> | ~~~~~~~~~~~~~~~~~~~~~~~^~ { + atlas, cmake, coin3d, darwin, doxygen, eigen, #fetchFromGitHub, - lapack, + #lapack, lib, libdc1394, libdmtx, From e5587eb33c91ee17785d7d69076b79d680afcb57 Mon Sep 17 00:00:00 2001 From: Guilhem Saurel Date: Mon, 19 May 2025 09:59:14 +0200 Subject: [PATCH 5/5] nix: lapack -> atlas --- default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/default.nix b/default.nix index ac9ed9fe81..ae518a5fb3 100644 --- a/default.nix +++ b/default.nix @@ -56,8 +56,9 @@ llvmPackages_15.stdenv.mkDerivation (finalAttrs: { buildInputs = [ + atlas eigen - lapack + #lapack libdc1394 libdmtx libglvnd