updates and fixing scad

This commit is contained in:
Matt Nish-Lapidus 2025-06-18 10:16:20 -04:00
parent e054f9cac1
commit 7dc1d2713f
2 changed files with 21 additions and 19 deletions

18
flake.lock generated
View file

@ -1144,11 +1144,11 @@
}, },
"nixpkgs-stable_3": { "nixpkgs-stable_3": {
"locked": { "locked": {
"lastModified": 1749995256, "lastModified": 1750151854,
"narHash": "sha256-LEGfcombb0otUf23oAmYCXR4+lMQKa49XmU0G5HItGI=", "narHash": "sha256-3za+1J9FifMetO7E/kwgyW+dp+8pPBNlWKfcBovnn6M=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "daa45f10955cc2207ac9c5f0206774d2f757c162", "rev": "ad5c70bcc5cc5178205161b7a7d61a6e80f6d244",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1224,11 +1224,11 @@
}, },
"nixpkgs_6": { "nixpkgs_6": {
"locked": { "locked": {
"lastModified": 1749794982, "lastModified": 1750134718,
"narHash": "sha256-Kh9K4taXbVuaLC0IL+9HcfvxsSUx8dPB5s5weJcc9pc=", "narHash": "sha256-v263g4GbxXv87hMXMCpjkIxd/viIF7p3JpJrwgKdNiI=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "ee930f9755f58096ac6e8ca94a1887e0534e2d81", "rev": "9e83b64f727c88a7711a2c463a7b16eedb69a84c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1776,11 +1776,11 @@
"rust-overlay": "rust-overlay_3" "rust-overlay": "rust-overlay_3"
}, },
"locked": { "locked": {
"lastModified": 1750214791, "lastModified": 1750246231,
"narHash": "sha256-A9oPoZaS9aaN9yGiqtoT8k1NOz9TU1j1PZ2GUa0LWsY=", "narHash": "sha256-BaWLTwrVXbHMliR5Ko2d36XMM4r5vZ6nz/jFB0QjliU=",
"owner": "sxyazi", "owner": "sxyazi",
"repo": "yazi", "repo": "yazi",
"rev": "002b742cd9c4abe51e12112382c2837ca20339b2", "rev": "750ca0c0d40af099a46d340df47af87eec267d4a",
"type": "github" "type": "github"
}, },
"original": { "original": {

View file

@ -43,16 +43,18 @@
}); });
}) })
# (final: prev: { (final: prev: {
# manifold = prev.manifold.overrideAttrs (old: { manifold = prev.manifold.overrideAttrs (old: {
# cmakeFlags = [ cmakeFlags = [
# "-DBUILD_SHARED_LIBS=ON" "-DBUILD_SHARED_LIBS=ON"
# "-DMANIFOLD_TEST=ON" "-DMANIFOLD_TEST=OFF"
# "-DMANIFOLD_CROSS_SECTION=OFF" "-DMANIFOLD_CROSS_SECTION=ON"
# "-DMANIFOLD_PAR=TBB" "-DMANIFOLD_PAR=TBB"
# ]; ];
# });
# }) doCheck = false;
});
})
# adds wine patch that makes softube plugin ui work # adds wine patch that makes softube plugin ui work
(final: prev: { (final: prev: {