From 61ff55a08fdeffcc9d40a207ba0c17080ef4666b Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Sun, 22 Dec 2024 00:29:42 +0000 Subject: [PATCH 1/3] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'flake-utils': 'github:numtide/flake-utils/c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a?narHash=sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ%3D' (2024-09-17) → 'github:numtide/flake-utils/11707dc2f618dd54ca8739b309ec4fc024de578b?narHash=sha256-l0KFg5HjrsfsO/JpG%2Br7fRrqm12kzFHyUHqHCVpMMbI%3D' (2024-11-13) • Updated input 'nixpkgs': 'github:nixos/nixpkgs/2d2a9ddbe3f2c00747398f3dc9b05f7f2ebb0f53?narHash=sha256-B5WRZYsRlJgwVHIV6DvidFN7VX7Fg9uuwkRW9Ha8z%2Bw%3D' (2024-10-30) → 'github:nixos/nixpkgs/4989a246d7a390a859852baddb1013f825435cee?narHash=sha256-kMBQ5PRiFLagltK0sH%2B08aiNt3zGERC2297iB6vrvlU%3D' (2024-12-17) --- flake.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index 40ed931..ec9dac9 100644 --- a/flake.lock +++ b/flake.lock @@ -5,11 +5,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1726560853, - "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=", + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", "owner": "numtide", "repo": "flake-utils", - "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", "type": "github" }, "original": { @@ -69,11 +69,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1730272153, - "narHash": "sha256-B5WRZYsRlJgwVHIV6DvidFN7VX7Fg9uuwkRW9Ha8z+w=", + "lastModified": 1734435836, + "narHash": "sha256-kMBQ5PRiFLagltK0sH+08aiNt3zGERC2297iB6vrvlU=", "owner": "nixos", "repo": "nixpkgs", - "rev": "2d2a9ddbe3f2c00747398f3dc9b05f7f2ebb0f53", + "rev": "4989a246d7a390a859852baddb1013f825435cee", "type": "github" }, "original": { From 7b0842ec48987876596cf31075032110b000c5ac Mon Sep 17 00:00:00 2001 From: Tyler Mayoff Date: Sun, 22 Dec 2024 08:18:53 -0500 Subject: [PATCH 2/3] Fixed recursive templates --- flake.nix | 2 +- wren_utils/include/wren/utils/result.hpp | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/flake.nix b/flake.nix index 7ad58ea..9e8a62e 100644 --- a/flake.nix +++ b/flake.nix @@ -98,7 +98,7 @@ [ vulkan-tools llvmPackages_19.clang-tools - llvmPackages_17.libllvm + # llvmPackages_17.libllvm sccache just diff --git a/wren_utils/include/wren/utils/result.hpp b/wren_utils/include/wren/utils/result.hpp index 3822640..3445495 100644 --- a/wren_utils/include/wren/utils/result.hpp +++ b/wren_utils/include/wren/utils/result.hpp @@ -18,6 +18,7 @@ namespace wren { class Err { public: template + requires std::is_error_code_enum_v Err(T error) : error_code_(make_error_code(error)) {} Err(const std::error_code& ec) : error_code_(ec) {} Err(int32_t ec, const std::error_category& e_cat) : error_code_(ec, e_cat) {} From d630fce76b199485d8819d1a6ef9066e5209a58c Mon Sep 17 00:00:00 2001 From: Tyler Mayoff Date: Sun, 22 Dec 2024 08:23:09 -0500 Subject: [PATCH 3/3] Readded coverage tools --- flake.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flake.nix b/flake.nix index 9e8a62e..bec07e6 100644 --- a/flake.nix +++ b/flake.nix @@ -98,7 +98,7 @@ [ vulkan-tools llvmPackages_19.clang-tools - # llvmPackages_17.libllvm + llvmPackages_19.libllvm sccache just