diff --git a/flake.lock b/flake.lock index d12772f6..da54ad95 100644 --- a/flake.lock +++ b/flake.lock @@ -1406,6 +1406,24 @@ "url": "https://git.outfoxxed.me/quickshell/quickshell" } }, + "reflectcpp": { + "flake": false, + "locked": { + "lastModified": 1766526407, + "narHash": "sha256-fUZTdojO/x5G7+MduY25nsO0WvED3LWIwf5hwsACVxA=", + "ref": "refs/heads/main", + "rev": "6fc8c9e81d24e8e9bcca0f4b01450181b1f98669", + "revCount": 748, + "submodules": true, + "type": "git", + "url": "https://github.com/getml/reflect-cpp" + }, + "original": { + "submodules": true, + "type": "git", + "url": "https://github.com/getml/reflect-cpp" + } + }, "root": { "inputs": { "aagl": "aagl", @@ -1450,10 +1468,12 @@ "pocketfft": "pocketfft", "py4vasp": "py4vasp", "pybinding": "pybinding", + "reflectcpp": "reflectcpp", "rsshub": "rsshub", "rycee": "rycee", "sops-nix": "sops-nix", "speedtest": "speedtest", + "sqlgen": "sqlgen", "sqlite-orm": "sqlite-orm", "sticker": "sticker", "stickerpicker": "stickerpicker", @@ -1551,6 +1571,24 @@ "type": "github" } }, + "sqlgen": { + "flake": false, + "locked": { + "lastModified": 1766749883, + "narHash": "sha256-pcEX2tWl8tHhKPxD1c1O1yeyue/ey0DleO8rCVYg5B4=", + "ref": "refs/heads/main", + "rev": "c8f4ad8d84e1e3f7adc775fa3cb7d65f1f5736b0", + "revCount": 224, + "submodules": true, + "type": "git", + "url": "https://github.com/getml/sqlgen" + }, + "original": { + "submodules": true, + "type": "git", + "url": "https://github.com/getml/sqlgen" + } + }, "sqlite-orm": { "flake": false, "locked": { diff --git a/flake.nix b/flake.nix index f9c64582..e7c84e3b 100644 --- a/flake.nix +++ b/flake.nix @@ -63,6 +63,8 @@ pybinding = { url = "git+https://github.com/dean0x7d/pybinding?submodules=1"; flake = false; }; brokenaxes = { url = "github:bendichter/brokenaxes"; flake = false; }; mirism-old = { url = "github:CHN-beta/mirism-old-public"; flake = false; }; + sqlgen = { url = "git+https://github.com/getml/sqlgen?submodules=1"; flake = false; }; + reflectcpp = { url = "git+https://github.com/getml/reflect-cpp?submodules=1"; flake = false; }; }; outputs = inputs: let localLib = import ./flake/lib inputs.nixpkgs.lib; in diff --git a/packages/default.nix b/packages/default.nix index 1eee4aea..82c8e1eb 100644 --- a/packages/default.nix +++ b/packages/default.nix @@ -145,6 +145,8 @@ inputs: rec }; brokenaxes = inputs.pkgs.python3Packages.callPackage ./brokenaxes.nix { src = inputs.topInputs.brokenaxes; }; missgram = inputs.pkgs.callPackage ./missgram { inherit biu; stdenv = inputs.pkgs.clang18Stdenv; }; + sqlgen = inputs.pkgs.callPackage ./sqlgen.nix { src = inputs.topInputs.sqlgen; inherit reflectcpp; }; + reflectcpp = inputs.pkgs.callPackage ./reflectcpp.nix { src = inputs.topInputs.reflectcpp; }; fromYaml = content: builtins.fromJSON (builtins.readFile (inputs.pkgs.runCommand "toJSON" {} diff --git a/packages/reflectcpp.nix b/packages/reflectcpp.nix new file mode 100644 index 00000000..96547883 --- /dev/null +++ b/packages/reflectcpp.nix @@ -0,0 +1,7 @@ +{ stdenv, src, cmake, pkg-config }: stdenv.mkDerivation +{ + name = "reflectcpp"; + inherit src; + nativeBuildInputs = [ cmake pkg-config ]; + cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" ]; +} diff --git a/packages/sqlgen.nix b/packages/sqlgen.nix new file mode 100644 index 00000000..574b0ac4 --- /dev/null +++ b/packages/sqlgen.nix @@ -0,0 +1,8 @@ +{ stdenv, src, cmake, pkg-config, postgresql, reflectcpp }: stdenv.mkDerivation +{ + name = "sqlgen"; + inherit src; + nativeBuildInputs = [ cmake pkg-config ]; + buildInputs = [ postgresql reflectcpp ]; + cmakeFlags = [ "-DSQLGEN_USE_VCPKG=OFF" "-DSQLGEN_SQLITE3=OFF" "-DBUILD_SHARED_LIBS=ON" ]; +}