From 489c423de3c2b9f88302938c02fd08e777faac40 Mon Sep 17 00:00:00 2001 From: Angus Dippenaar Date: Wed, 18 Dec 2024 21:51:42 +0100 Subject: [PATCH] add oreoledb --- flake.lock | 8 ++++---- flake.nix | 32 +++++++++++++++++++++++++++++++- 2 files changed, 35 insertions(+), 5 deletions(-) diff --git a/flake.lock b/flake.lock index 30e517f..170f2ef 100644 --- a/flake.lock +++ b/flake.lock @@ -196,16 +196,16 @@ "xc": "xc" }, "locked": { - "lastModified": 1716625173, - "narHash": "sha256-4TkK8zeoWWGmcBg8YwALo2EyKfOyq5ut/3TjG81a+8M=", + "lastModified": 1730278073, + "narHash": "sha256-0KGht5IMbJV8KkXgT5qJxA9bcmWevzXXAVPMQTm0ccw=", "owner": "a-h", "repo": "templ", - "rev": "0d42d67413c2a0fa357018d1b1c0301231f3b359", + "rev": "d9eefff2eeea5c78c938baf556d7ded6880e2fca", "type": "github" }, "original": { "owner": "a-h", - "ref": "v0.2.707", + "ref": "v0.2.793", "repo": "templ", "type": "github" } diff --git a/flake.nix b/flake.nix index e3f5dff..6111a79 100644 --- a/flake.nix +++ b/flake.nix @@ -16,7 +16,7 @@ inputs.nixpkgs.follows = "nixpkgs"; }; templ = { - url = "github:a-h/templ?ref=v0.2.707"; + url = "github:a-h/templ?ref=v0.2.793"; inputs.nixpkgs.follows = "nixpkgs"; }; }; @@ -46,6 +46,35 @@ inherit (gitignore.lib) gitignoreSource; templ = inputs.templ.packages.${system}.templ; in { + _module.args.pkgs = import inputs.nixpkgs { + inherit system; + overlays = [ + (final: prev: { + postgresql_16 = prev.postgresql_16.overrideAttrs(old: { + src = prev.fetchFromGitHub { + owner = "orioledb"; + repo = "postgres"; + rev = "patches16_32"; + sha256 = "sha256-lDvALs9HH4nn2GOVFNn4QRHE/je8SmMnmQ35k8CKGjc="; + }; + }); + orioledb = final.buildPostgresqlExtension rec { + pname = "orioledb"; + version = "beta8"; + + src = prev.fetchFromGitHub { + owner = "orioledb"; + repo = "orioledb"; + rev = version; + sha256 = ""; + }; + + makeFlags = [ "USE_PGXS=1" ]; + }; + }) + ]; + }; + # Attrs for easyOverlay overlayAttrs = { inherit (config.packages) @@ -109,6 +138,7 @@ postgresql_16 sqlite-interactive templ + # orioledb ]; }; };