Skip to content

Commit ee4ce32

Browse files
committed
fix: install and then remove git for clickhouse dep
1 parent 230c7c7 commit ee4ce32

File tree

2 files changed

+19
-1
lines changed

2 files changed

+19
-1
lines changed

ansible/tasks/stage2-setup-postgres.yml

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,15 @@
2626
when: is_psql_oriole and stage2_nix
2727
become: yes
2828

29+
- name: Install Git for Nix package management
30+
become: yes
31+
apt:
32+
name: git
33+
state: present
34+
update_cache: yes
35+
when: stage2_nix
36+
37+
2938
- name: Install Postgres from nix binary cache
3039
become: yes
3140
shell: |
@@ -56,6 +65,15 @@
5665
sudo -u postgres bash -c ". /nix/var/nix/profiles/default/etc/profile.d/nix-daemon.sh && nix profile install github:supabase/postgres/{{ git_commit_sha }}#{{postgresql_version}}_src"
5766
when: stage2_nix
5867

68+
- name: Remove Git after Nix package installations
69+
become: yes
70+
apt:
71+
name: git
72+
state: absent
73+
autoremove: yes
74+
purge: yes
75+
when: stage2_nix
76+
5977
- name: Set ownership and permissions for /etc/ssl/private
6078
become: yes
6179
file:

nix/ext/wrappers/default.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ buildPgrxExtension_0_12_6 rec {
3030
};
3131

3232
nativeBuildInputs = [ pkg-config cargo ];
33-
buildInputs = [ openssl postgresql git ] ++ lib.optionals (stdenv.isDarwin) [
33+
buildInputs = [ openssl postgresql ] ++ lib.optionals (stdenv.isDarwin) [
3434
darwin.apple_sdk.frameworks.CoreFoundation
3535
darwin.apple_sdk.frameworks.Security
3636
darwin.apple_sdk.frameworks.SystemConfiguration

0 commit comments

Comments
 (0)