From bb76e51b07481ae8aa9daa05807d80c36b2ef468 Mon Sep 17 00:00:00 2001 From: Sam Rose Date: Tue, 25 Nov 2025 10:07:23 -0500 Subject: [PATCH] fix: removing dead nix code --- nix/overlays/cargo-pgrx-0-11-3.nix | 7 ------ nix/overlays/default.nix | 36 +----------------------------- nix/overlays/psql_16-oriole.nix | 21 ----------------- 3 files changed, 1 insertion(+), 63 deletions(-) delete mode 100644 nix/overlays/cargo-pgrx-0-11-3.nix delete mode 100644 nix/overlays/psql_16-oriole.nix diff --git a/nix/overlays/cargo-pgrx-0-11-3.nix b/nix/overlays/cargo-pgrx-0-11-3.nix deleted file mode 100644 index 41ba97d4c..000000000 --- a/nix/overlays/cargo-pgrx-0-11-3.nix +++ /dev/null @@ -1,7 +0,0 @@ -final: prev: { - #cargo-pgrx_0_11_3 = cargo-pgrx.cargo-pgrx_0_11_3; - - buildPgrxExtension_0_11_3 = prev.buildPgrxExtension.override { - cargo-pgrx = final.cargo-pgrx_0_11_3; - }; -} diff --git a/nix/overlays/default.nix b/nix/overlays/default.nix index 26beece08..9c28c1082 100644 --- a/nix/overlays/default.nix +++ b/nix/overlays/default.nix @@ -1,6 +1,6 @@ { self, ... }: { - flake.overlays.default = final: prev: { + flake.overlays.default = final: _prev: { # NOTE: add any needed overlays here. in theory we could # pull them from the overlays/ directory automatically, but we don't # want to have an arbitrary order, since it might matter. being @@ -27,39 +27,5 @@ inherit (final) stdenv; inherit (final) rust-bin; }; - - buildPgrxExtension = final.callPackage ../cargo-pgrx/buildPgrxExtension.nix { - inherit (final) cargo-pgrx; - inherit (final) lib; - inherit (final) Security; - inherit (final) pkg-config; - inherit (final) makeRustPlatform; - inherit (final) stdenv; - inherit (final) writeShellScriptBin; - }; - - buildPgrxExtension_0_10_2 = prev.buildPgrxExtension.override { - cargo-pgrx = final.cargo-pgrx.cargo-pgrx_0_10_2; - }; - - buildPgrxExtension_0_11_2 = prev.buildPgrxExtension.override { - cargo-pgrx = final.cargo-pgrx.cargo-pgrx_0_11_2; - }; - - buildPgrxExtension_0_11_3 = prev.buildPgrxExtension.override { - cargo-pgrx = final.cargo-pgrx.cargo-pgrx_0_11_3; - }; - - buildPgrxExtension_0_12_6 = prev.buildPgrxExtension.override { - cargo-pgrx = final.cargo-pgrx.cargo-pgrx_0_12_6; - }; - - buildPgrxExtension_0_12_9 = prev.buildPgrxExtension.override { - cargo-pgrx = final.cargo-pgrx.cargo-pgrx_0_12_9; - }; - - buildPgrxExtension_0_14_3 = prev.buildPgrxExtension.override { - cargo-pgrx = final.cargo-pgrx.cargo-pgrx_0_14_3; - }; }; } diff --git a/nix/overlays/psql_16-oriole.nix b/nix/overlays/psql_16-oriole.nix deleted file mode 100644 index 309129f1f..000000000 --- a/nix/overlays/psql_16-oriole.nix +++ /dev/null @@ -1,21 +0,0 @@ -final: prev: { - pg_orioledb = prev.postgresql_16.overrideAttrs (old: { - pname = "postgresql_orioledb"; - version = "16_31"; - src = prev.fetchurl { - url = "https://github.com/orioledb/postgres/archive/refs/tags/patches16_31.tar.gz"; - sha256 = "sha256-29uHUACwZKh8e4zJ9tWzEhLNjEuh6P31KbpxnMEhtuI="; - }; - buildInputs = old.buildInputs ++ [ - prev.bison - prev.docbook5 - prev.docbook_xsl - prev.docbook_xsl_ns - prev.docbook_xml_dtd_45 - prev.flex - prev.libxslt - prev.perl - ]; - }); - postgresql_orioledb = final.pg_orioledb; -}