Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions ansible/playbook.yml
Original file line number Diff line number Diff line change
Expand Up @@ -206,3 +206,9 @@
shell: |
sudo -u ubuntu bash -c ". /nix/var/nix/profiles/default/etc/profile.d/nix-daemon.sh && nix profile remove osquery"
when: stage2_nix

- name: nix collect garbage
become: yes
shell: |
sudo -u ubuntu bash -c ". /nix/var/nix/profiles/default/etc/profile.d/nix-daemon.sh && nix-collect-garbage -d"
when: stage2_nix
2 changes: 1 addition & 1 deletion common-nix.vars.pkr.hcl
Original file line number Diff line number Diff line change
@@ -1 +1 @@
postgres-version = "15.6.1.108"
postgres-version = "15.6.1.109-rc2"
1 change: 0 additions & 1 deletion flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
ourSystems = with flake-utils.lib; [
system.x86_64-linux
system.aarch64-linux
system.aarch64-darwin
];
in
flake-utils.lib.eachSystem ourSystems (system:
Expand Down
12 changes: 1 addition & 11 deletions nix/ext/plv8.nix
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
, runCommand
, coreutils
, gnugrep
, gcc
}:

stdenv.mkDerivation (finalAttrs: {
Expand All @@ -33,8 +32,6 @@ stdenv.mkDerivation (finalAttrs: {

nativeBuildInputs = [
perl
] ++ lib.optionals stdenv.isDarwin [
gcc
];

buildInputs = [
Expand All @@ -50,13 +47,6 @@ stdenv.mkDerivation (finalAttrs: {
"SHLIB_LINK=-lv8"
"V8_OUTDIR=${v8}/lib"
];
NIX_LDFLAGS = lib.optionalString (stdenv.isDarwin && stdenv.isAarch64)
"-undefined dynamic_lookup";

NIX_CFLAGS_COMPILE = lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [
"-I${v8}/include"
"-I${postgresql}/include"
];
installFlags = [
# PGXS only supports installing to postgresql prefix so we need to redirect this
"DESTDIR=${placeholder "out"}"
Expand Down Expand Up @@ -149,7 +139,7 @@ stdenv.mkDerivation (finalAttrs: {
description = "V8 Engine Javascript Procedural Language add-on for PostgreSQL";
homepage = "https://plv8.github.io/";
maintainers = with maintainers; [ samrose ];
platforms = [ "x86_64-linux" "aarch64-linux" "aarch64-darwin" ];
platforms = [ "x86_64-linux" "aarch64-linux" ];
license = licenses.postgresql;
#broken = postgresql.jitSupport;
};
Expand Down
Loading