diff --git a/_sources/generated.json b/_sources/generated.json index 7dbb035..0a79905 100644 --- a/_sources/generated.json +++ b/_sources/generated.json @@ -1,24 +1,4 @@ { - "curl": { - "cargoLocks": null, - "date": null, - "extract": null, - "name": "curl", - "passthru": null, - "pinned": false, - "src": { - "deepClone": false, - "fetchSubmodules": false, - "leaveDotGit": false, - "name": null, - "owner": "curl", - "repo": "curl", - "rev": "curl-8_9_1", - "sha256": "sha256-b+Giv6n3LCjOIvUeQawR9qrMBTuz8emRRdhbb2XO5ZU=", - "type": "github" - }, - "version": "curl-8_9_1" - }, "fmt": { "cargoLocks": null, "date": null, @@ -33,11 +13,12 @@ "name": null, "owner": "fmtlib", "repo": "fmt", - "rev": "11.0.2", - "sha256": "sha256-IKNt4xUoVi750zBti5iJJcCk3zivTt7nU12RIf8pM+0=", + "rev": "11.1.3", + "sha256": "sha256-6r9D/csVSgS+T/H0J8cSR+YszxnH/h2V2odi2s6VYN8=", + "sparseCheckout": [], "type": "github" }, - "version": "11.0.2" + "version": "11.1.3" }, "reflect-cpp": { "cargoLocks": null, @@ -53,11 +34,12 @@ "name": null, "owner": "getml", "repo": "reflect-cpp", - "rev": "v0.13.0", - "sha256": "sha256-dEqdPk5ixnNILxTcdSAOhzP8fzeefMu6pqrL/WgnPlE=", + "rev": "v0.17.0", + "sha256": "sha256-ugMop4Gsw46zFA7mESNzDTAZVzIg3szAX8ND1kUiF2A=", + "sparseCheckout": [], "type": "github" }, - "version": "v0.13.0" + "version": "v0.17.0" }, "sdbus-cpp": { "cargoLocks": null, @@ -73,11 +55,12 @@ "name": null, "owner": "kistler-group", "repo": "sdbus-cpp", - "rev": "v2.0.0", - "sha256": "sha256-W8V5FRhV3jtERMFrZ4gf30OpIQLYoj2yYGpnYOmH2+g=", + "rev": "v2.1.0", + "sha256": "sha256-JnjabBr7oELLsUV9a+dAAaRyUzaMIriu90vkaVJg2eY=", + "sparseCheckout": [], "type": "github" }, - "version": "v2.0.0" + "version": "v2.1.0" }, "tomlplusplus": { "cargoLocks": null, @@ -95,6 +78,7 @@ "repo": "tomlplusplus", "rev": "v3.4.0", "sha256": "sha256-h5tbO0Rv2tZezY58yUbyRVpsfRjY3i+5TPkkxr6La8M=", + "sparseCheckout": [], "type": "github" }, "version": "v3.4.0" @@ -115,6 +99,7 @@ "repo": "yyjson", "rev": "0.10.0", "sha256": "sha256-mp9Oz08qTyhj3P6F1d81SX96vamUY/JWpD2DTYR+v04=", + "sparseCheckout": [], "type": "github" }, "version": "0.10.0" diff --git a/_sources/generated.nix b/_sources/generated.nix index 738696d..41e2033 100644 --- a/_sources/generated.nix +++ b/_sources/generated.nix @@ -1,48 +1,37 @@ # This file was generated by nvfetcher, please do not modify it manually. { fetchgit, fetchurl, fetchFromGitHub, dockerTools }: { - curl = { - pname = "curl"; - version = "curl-8_9_1"; - src = fetchFromGitHub { - owner = "curl"; - repo = "curl"; - rev = "curl-8_9_1"; - fetchSubmodules = false; - sha256 = "sha256-b+Giv6n3LCjOIvUeQawR9qrMBTuz8emRRdhbb2XO5ZU="; - }; - }; fmt = { pname = "fmt"; - version = "11.0.2"; + version = "11.1.3"; src = fetchFromGitHub { owner = "fmtlib"; repo = "fmt"; - rev = "11.0.2"; + rev = "11.1.3"; fetchSubmodules = false; - sha256 = "sha256-IKNt4xUoVi750zBti5iJJcCk3zivTt7nU12RIf8pM+0="; + sha256 = "sha256-6r9D/csVSgS+T/H0J8cSR+YszxnH/h2V2odi2s6VYN8="; }; }; reflect-cpp = { pname = "reflect-cpp"; - version = "v0.13.0"; + version = "v0.17.0"; src = fetchFromGitHub { owner = "getml"; repo = "reflect-cpp"; - rev = "v0.13.0"; + rev = "v0.17.0"; fetchSubmodules = false; - sha256 = "sha256-dEqdPk5ixnNILxTcdSAOhzP8fzeefMu6pqrL/WgnPlE="; + sha256 = "sha256-ugMop4Gsw46zFA7mESNzDTAZVzIg3szAX8ND1kUiF2A="; }; }; sdbus-cpp = { pname = "sdbus-cpp"; - version = "v2.0.0"; + version = "v2.1.0"; src = fetchFromGitHub { owner = "kistler-group"; repo = "sdbus-cpp"; - rev = "v2.0.0"; + rev = "v2.1.0"; fetchSubmodules = false; - sha256 = "sha256-W8V5FRhV3jtERMFrZ4gf30OpIQLYoj2yYGpnYOmH2+g="; + sha256 = "sha256-JnjabBr7oELLsUV9a+dAAaRyUzaMIriu90vkaVJg2eY="; }; }; tomlplusplus = { diff --git a/flake.lock b/flake.lock index 0c576c8..7bae913 100644 --- a/flake.lock +++ b/flake.lock @@ -6,11 +6,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1727497393, - "narHash": "sha256-AHL2qezvAAZtOP61cHtnB0RtqPej4LqtGkvXNOAESNw=", + "lastModified": 1733165974, + "narHash": "sha256-ijRHGhvvfp7dfkb2/8iT5i2SsdZJzH/r1uh4GnoDz5Y=", "owner": "jcdickinson", "repo": "codeium.nvim", - "rev": "17bbefff02be8fd66931f366bd4ed76a76e4a57e", + "rev": "27d2b1ce8c7ba14dbf6e4504bdea8e5548be5476", "type": "github" }, "original": { @@ -28,11 +28,11 @@ ] }, "locked": { - "lastModified": 1722113426, - "narHash": "sha256-Yo/3loq572A8Su6aY5GP56knpuKYRvM2a1meP9oJZCw=", + "lastModified": 1728330715, + "narHash": "sha256-xRJ2nPOXb//u1jaBnDP56M7v5ldavjbtR6lfGqSvcKg=", "owner": "numtide", "repo": "devshell", - "rev": "67cce7359e4cd3c45296fb4aaf6a19e2a9c757ae", + "rev": "dd6b80932022cea34a019e2bb32f6fa9e494dfef", "type": "github" }, "original": { @@ -64,11 +64,11 @@ ] }, "locked": { - "lastModified": 1726153070, - "narHash": "sha256-HO4zgY0ekfwO5bX0QH/3kJ/h4KvUDFZg8YpkNwIbg1U=", + "lastModified": 1733312601, + "narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "bcef6817a8b2aa20a5a6dbb19b43e63c5bf8619a", + "rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9", "type": "github" }, "original": { @@ -100,11 +100,11 @@ "systems": "systems_2" }, "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": { @@ -118,11 +118,11 @@ "systems": "systems_3" }, "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": { @@ -151,11 +151,11 @@ ] }, "locked": { - "lastModified": 1727514110, - "narHash": "sha256-0YRcOxJG12VGDFH8iS8pJ0aYQQUAgo/r3ZAL+cSh9nk=", + "lastModified": 1734279981, + "narHash": "sha256-NdaCraHPp8iYMWzdXAt5Nv6sA3MUzlCiGiR586TCwo0=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "85f7a7177c678de68224af3402ab8ee1bcee25c8", + "rev": "aa9f40c906904ebd83da78e7f328cd8aeaeae785", "type": "github" }, "original": { @@ -196,11 +196,11 @@ ] }, "locked": { - "lastModified": 1727383923, - "narHash": "sha256-4/vacp3CwdGoPf8U4e/N8OsGYtO09WTcQK5FqYfJbKs=", + "lastModified": 1734093295, + "narHash": "sha256-hSwgGpcZtdDsk1dnzA0xj5cNaHgN9A99hRF/mxMtwS4=", "owner": "nix-community", "repo": "home-manager", - "rev": "ffe2d07e771580a005e675108212597e5b367d2d", + "rev": "66c5d8b62818ec4c1edb3e941f55ef78df8141a8", "type": "github" }, "original": { @@ -209,6 +209,36 @@ "type": "github" } }, + "ixx": { + "inputs": { + "flake-utils": [ + "nixvim", + "nixvim", + "nuschtosSearch", + "flake-utils" + ], + "nixpkgs": [ + "nixvim", + "nixvim", + "nuschtosSearch", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1729958008, + "narHash": "sha256-EiOq8jF4Z/zQe0QYVc3+qSKxRK//CFHMB84aYrYGwEs=", + "owner": "NuschtOS", + "repo": "ixx", + "rev": "9fd01aad037f345350eab2cd45e1946cc66da4eb", + "type": "github" + }, + "original": { + "owner": "NuschtOS", + "ref": "v0.0.6", + "repo": "ixx", + "type": "github" + } + }, "nix-darwin": { "inputs": { "nixpkgs": [ @@ -218,11 +248,11 @@ ] }, "locked": { - "lastModified": 1727507295, - "narHash": "sha256-I/FrX1peu4URoj5T5odfuKR2rm4GjYJJpCGF9c0/lDA=", + "lastModified": 1733570843, + "narHash": "sha256-sQJAxY1TYWD1UyibN/FnN97paTFuwBw3Vp3DNCyKsMk=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "f2e1c4aa29fc211947c3a7113cba1dd707433b70", + "rev": "a35b08d09efda83625bef267eb24347b446c80b8", "type": "github" }, "original": { @@ -233,11 +263,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1729311994, - "narHash": "sha256-qbXHPupmSGjSJkPmmaOSRd6b2kRgAk+CH/FMRWiYdUM=", + "lastModified": 1737937590, + "narHash": "sha256-DLkqOLlEaS9xdGzSimNQcMlhjbbY6APSxwc0ukJRmCU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "7e2eb4642f7ca9c4ee2c069d65a48575068b4f57", + "rev": "a7a2612e4ad654e7573ea0b988019f91b8d0df10", "type": "github" }, "original": { @@ -264,11 +294,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1727742380, - "narHash": "sha256-5lFzlmiwrl3OHrw7QhZn/ZpZtygzx1UspKOaZqpxXSQ=", + "lastModified": 1734474063, + "narHash": "sha256-Yk7+G3aWZpl9dnPBbZievN3htxiONcLXcxwdE9n0mX4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9dc3c339a2aecbd61ab2549248d8b64ba1c28af5", + "rev": "86dd3715b283806e773b3cde008baf18dd8a5bf8", "type": "github" }, "original": { @@ -279,11 +309,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1727348695, - "narHash": "sha256-J+PeFKSDV+pHL7ukkfpVzCOO7mBSrrpJ3svwBFABbhI=", + "lastModified": 1734119587, + "narHash": "sha256-AKU6qqskl0yf2+JdRdD0cfxX4b9x3KKV5RqA6wijmPM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "1925c603f17fc89f4c8f6bf6f631a802ad85d784", + "rev": "3566ab7246670a43abd2ffa913cc62dad9cdf7d5", "type": "github" }, "original": { @@ -295,11 +325,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1726871744, - "narHash": "sha256-V5LpfdHyQkUF7RfOaDPrZDP+oqz88lTJrMT1+stXNwo=", + "lastModified": 1733097829, + "narHash": "sha256-9hbb1rqGelllb4kVUCZ307G2k3/UhmA8PPGBoyuWaSw=", "owner": "nixos", "repo": "nixpkgs", - "rev": "a1d92660c6b3b7c26fb883500a80ea9d33321be2", + "rev": "2c15aa59df0017ca140d9ba302412298ab4bf22a", "type": "github" }, "original": { @@ -311,11 +341,11 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1726871744, - "narHash": "sha256-V5LpfdHyQkUF7RfOaDPrZDP+oqz88lTJrMT1+stXNwo=", + "lastModified": 1735554305, + "narHash": "sha256-zExSA1i/b+1NMRhGGLtNfFGXgLtgo+dcuzHzaWA6w3Q=", "owner": "nixos", "repo": "nixpkgs", - "rev": "a1d92660c6b3b7c26fb883500a80ea9d33321be2", + "rev": "0e82ab234249d8eee3e8c91437802b32c74bb3fd", "type": "github" }, "original": { @@ -334,11 +364,11 @@ "treefmt-nix": "treefmt-nix_2" }, "locked": { - "lastModified": 1728515236, - "narHash": "sha256-gYObAkD39KbYdeSxOxPFaVVgfbRPPgG470E8sFMaQDM=", + "lastModified": 1734505002, + "narHash": "sha256-oH0HhXrLmDb4Q+twZOSgduU9ABzdfcEzVaSePHw4lTk=", "owner": "pupbrained", "repo": "nvim-config", - "rev": "584a15c6dcf5bea4a9ab3c804b86324b128d3b67", + "rev": "d4ece42d394b92ec5fbea5e6a80c2a81a2091a63", "type": "github" }, "original": { @@ -360,11 +390,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1727645871, - "narHash": "sha256-Os3PAThU5XliKkKa+SHsFyV/EsCHogHcYONmpzb6500=", + "lastModified": 1734472356, + "narHash": "sha256-RIoG3zXarfuHfzM/z/NPjoHHxl3sqYrtEatSLA1/bIk=", "owner": "nix-community", "repo": "nixvim", - "rev": "5f4a4b47597d3b9ac26c41ff4e8da28fa662f200", + "rev": "4f1fe403b18c45614d6b81423038a34cff371244", "type": "github" }, "original": { @@ -376,6 +406,7 @@ "nuschtosSearch": { "inputs": { "flake-utils": "flake-utils_3", + "ixx": "ixx", "nixpkgs": [ "nixvim", "nixvim", @@ -383,11 +414,11 @@ ] }, "locked": { - "lastModified": 1727452028, - "narHash": "sha256-ehl/A4HQFRyqj1Fk7cl+dgSf/2Fb1jLwWJtZaMU6RfU=", + "lastModified": 1733773348, + "narHash": "sha256-Y47y+LesOCkJaLvj+dI/Oa6FAKj/T9sKVKDXLNsViPw=", "owner": "NuschtOS", "repo": "search", - "rev": "9f7426e532ef8dfc839c4a3fcc567b13a20a70d3", + "rev": "3051be7f403bff1d1d380e4612f0c70675b44fc9", "type": "github" }, "original": { @@ -473,11 +504,11 @@ ] }, "locked": { - "lastModified": 1727431250, - "narHash": "sha256-uGRlRT47ecicF9iLD1G3g43jn2e+b5KaMptb59LHnvM=", + "lastModified": 1733761991, + "narHash": "sha256-s4DalCDepD22jtKL5Nw6f4LP5UwoMcPzPZgHWjAfqbQ=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "879b29ae9a0378904fbbefe0dadaed43c8905754", + "rev": "0ce9d149d99bc383d1f2d85f31f6ebd146e46085", "type": "github" }, "original": { @@ -491,11 +522,11 @@ "nixpkgs": "nixpkgs_5" }, "locked": { - "lastModified": 1727431250, - "narHash": "sha256-uGRlRT47ecicF9iLD1G3g43jn2e+b5KaMptb59LHnvM=", + "lastModified": 1733761991, + "narHash": "sha256-s4DalCDepD22jtKL5Nw6f4LP5UwoMcPzPZgHWjAfqbQ=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "879b29ae9a0378904fbbefe0dadaed43c8905754", + "rev": "0ce9d149d99bc383d1f2d85f31f6ebd146e46085", "type": "github" }, "original": { @@ -509,11 +540,11 @@ "nixpkgs": "nixpkgs_6" }, "locked": { - "lastModified": 1729242555, - "narHash": "sha256-6jWSWxv2crIXmYSEb3LEVsFkCkyVHNllk61X4uhqfCs=", + "lastModified": 1737483750, + "narHash": "sha256-5An1wq5U8sNycOBBg3nsDDgpwBmR9liOpDGlhliA6Xo=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "d986489c1c757f6921a48c1439f19bfb9b8ecab5", + "rev": "f2cc121df15418d028a59c9737d38e3a90fbaf8f", "type": "github" }, "original": { @@ -527,11 +558,11 @@ "systems": "systems_4" }, "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": { diff --git a/flake.nix b/flake.nix index 19797ae..ed9e2e7 100644 --- a/flake.nix +++ b/flake.nix @@ -22,8 +22,8 @@ stdenv = if pkgs.hostPlatform.isLinux - then pkgs.stdenvAdapters.useMoldLinker pkgs.llvmPackages_18.stdenv - else pkgs.llvmPackages_18.stdenv; + then pkgs.stdenvAdapters.useMoldLinker pkgs.llvmPackages_19.stdenv + else pkgs.llvmPackages_19.stdenv; sources = import ./_sources/generated.nix { inherit (pkgs) fetchFromGitHub fetchgit fetchurl dockerTools; @@ -35,22 +35,27 @@ }; fmt = mkPkg "fmt"; - tomlplusplus = mkPkg "tomlplusplus"; yyjson = mkPkg "yyjson"; + tomlplusplus = pkgs.pkgsStatic.tomlplusplus.overrideAttrs { + inherit (sources.tomlplusplus) pname version src; + doCheck = false; + }; + sdbus-cpp = pkgs.sdbus-cpp.overrideAttrs { inherit (sources.sdbus-cpp) pname version src; }; - reflect-cpp = stdenv.mkDerivation { + reflect-cpp = stdenv.mkDerivation rec { inherit (sources.reflect-cpp) pname version src; - nativeBuildInputs = with pkgs; [cmake ninja pkg-config]; + buildInputs = [tomlplusplus yyjson]; + nativeBuildInputs = buildInputs ++ (with pkgs; [cmake ninja pkg-config]); cmakeFlags = [ "-DCMAKE_TOOLCHAIN_FILE=OFF" - "-DCMAKE_BUILD_TYPE=Release" "-DREFLECTCPP_TOML=ON" + "-DREFLECTCPP_JSON=ON" ]; }; @@ -119,7 +124,7 @@ clang-format = { enable = true; - package = pkgs.clang-tools_18; + package = pkgs.clang-tools_19; }; }; }; @@ -129,7 +134,8 @@ [ alejandra bear - clang-tools_18 + clang-tools_19 + cmake lldb meson ninja @@ -137,6 +143,7 @@ pkg-config unzip nixvim.packages.${system}.default + linuxKernel.packages.linux_zen.perf.out (writeScriptBin "build" "meson compile -C build") (writeScriptBin "clean" "meson setup build --wipe") diff --git a/meson.build b/meson.build index 12c2790..c44659e 100644 --- a/meson.build +++ b/meson.build @@ -5,7 +5,7 @@ project( 'cpp_std=c++20', 'default_library=static', 'warning_level=everything', - 'buildtype=release' + 'buildtype=debug', ] ) @@ -84,7 +84,8 @@ deps = [ dependency('fmt'), dependency('libcurl'), dependency('tomlplusplus'), - dependency('yyjson') + dependency('yyjson'), + dependency('reflectcpp') ] if host_machine.system() == 'darwin' @@ -94,7 +95,6 @@ if host_machine.system() == 'darwin' deps += dependency('iconv') elif host_machine.system() == 'linux' or host_machine.system() == 'freebsd' deps += dependency('sdbus-c++') - deps += dependency('x11') endif objc_args = []