From 7dc1d2713ffb765f162e66abdf0c6c4d0f48c793 Mon Sep 17 00:00:00 2001 From: Matt Nish-Lapidus Date: Wed, 18 Jun 2025 10:16:20 -0400 Subject: [PATCH] updates and fixing scad --- flake.lock | 18 +++++++++--------- hosts/eddie/configuration.nix | 22 ++++++++++++---------- 2 files changed, 21 insertions(+), 19 deletions(-) diff --git a/flake.lock b/flake.lock index ee28354..e54bca4 100644 --- a/flake.lock +++ b/flake.lock @@ -1144,11 +1144,11 @@ }, "nixpkgs-stable_3": { "locked": { - "lastModified": 1749995256, - "narHash": "sha256-LEGfcombb0otUf23oAmYCXR4+lMQKa49XmU0G5HItGI=", + "lastModified": 1750151854, + "narHash": "sha256-3za+1J9FifMetO7E/kwgyW+dp+8pPBNlWKfcBovnn6M=", "owner": "nixos", "repo": "nixpkgs", - "rev": "daa45f10955cc2207ac9c5f0206774d2f757c162", + "rev": "ad5c70bcc5cc5178205161b7a7d61a6e80f6d244", "type": "github" }, "original": { @@ -1224,11 +1224,11 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1749794982, - "narHash": "sha256-Kh9K4taXbVuaLC0IL+9HcfvxsSUx8dPB5s5weJcc9pc=", + "lastModified": 1750134718, + "narHash": "sha256-v263g4GbxXv87hMXMCpjkIxd/viIF7p3JpJrwgKdNiI=", "owner": "nixos", "repo": "nixpkgs", - "rev": "ee930f9755f58096ac6e8ca94a1887e0534e2d81", + "rev": "9e83b64f727c88a7711a2c463a7b16eedb69a84c", "type": "github" }, "original": { @@ -1776,11 +1776,11 @@ "rust-overlay": "rust-overlay_3" }, "locked": { - "lastModified": 1750214791, - "narHash": "sha256-A9oPoZaS9aaN9yGiqtoT8k1NOz9TU1j1PZ2GUa0LWsY=", + "lastModified": 1750246231, + "narHash": "sha256-BaWLTwrVXbHMliR5Ko2d36XMM4r5vZ6nz/jFB0QjliU=", "owner": "sxyazi", "repo": "yazi", - "rev": "002b742cd9c4abe51e12112382c2837ca20339b2", + "rev": "750ca0c0d40af099a46d340df47af87eec267d4a", "type": "github" }, "original": { diff --git a/hosts/eddie/configuration.nix b/hosts/eddie/configuration.nix index 66b7146..404a5e2 100644 --- a/hosts/eddie/configuration.nix +++ b/hosts/eddie/configuration.nix @@ -43,16 +43,18 @@ }); }) - # (final: prev: { - # manifold = prev.manifold.overrideAttrs (old: { - # cmakeFlags = [ - # "-DBUILD_SHARED_LIBS=ON" - # "-DMANIFOLD_TEST=ON" - # "-DMANIFOLD_CROSS_SECTION=OFF" - # "-DMANIFOLD_PAR=TBB" - # ]; - # }); - # }) + (final: prev: { + manifold = prev.manifold.overrideAttrs (old: { + cmakeFlags = [ + "-DBUILD_SHARED_LIBS=ON" + "-DMANIFOLD_TEST=OFF" + "-DMANIFOLD_CROSS_SECTION=ON" + "-DMANIFOLD_PAR=TBB" + ]; + + doCheck = false; + }); + }) # adds wine patch that makes softube plugin ui work (final: prev: {