Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

chore(deps): bump postgis, nixpkgs, poetry2nix and quarto #10245

Merged
merged 5 commits into from
Sep 28, 2024
Merged

chore(deps): bump postgis, nixpkgs, poetry2nix and quarto #10245

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b293e1c
chore(deps): bump nixpkgs
cpcloud Sep 28, 2024
4d5717e
chore(deps): bump poetry2nix
cpcloud Sep 28, 2024
5e1c0bc
chore(postgres): bump postgis
cpcloud Sep 28, 2024
5f0c996
chore(deps): bump quarto
cpcloud Sep 28, 2024
78732dd
chore: bump poetry2nix
cpcloud Sep 28, 2024
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
16 changes: 6 additions & 10 deletions docker/postgres/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,12 @@
FROM postgis/postgis:15-3.3-alpine AS pgvector-builder
RUN apk add --no-cache git
RUN apk add --no-cache build-base
RUN apk add --no-cache clang15
RUN apk add --no-cache llvm15-dev llvm15
FROM postgis/postgis:16-3.5-alpine AS pgvector-builder
RUN apk add --no-cache git build-base clang15 llvm15-dev llvm15
WORKDIR /tmp
RUN git clone --branch v0.6.2 https://github.com/pgvector/pgvector.git
RUN git clone --branch v0.7.4 https://github.com/pgvector/pgvector.git
WORKDIR /tmp/pgvector
RUN make
RUN make install
RUN make && make install

FROM postgis/postgis:15-3.3-alpine
RUN apk add --no-cache postgresql15-plpython3
FROM postgis/postgis:16-3.5-alpine
RUN apk add --no-cache postgresql16-plpython3
COPY --from=pgvector-builder /usr/local/lib/postgresql/bitcode/vector.index.bc /usr/local/lib/postgresql/bitcode/vector.index.bc
COPY --from=pgvector-builder /usr/local/lib/postgresql/vector.so /usr/local/lib/postgresql/vector.so
COPY --from=pgvector-builder /usr/local/share/postgresql/extension /usr/local/share/postgresql/extension
24 changes: 12 additions & 12 deletions flake.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions nix/quarto/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,15 +17,15 @@ let
"aarch64-darwin" = "macos";
};
shas = {
"x86_64-linux" = "sha256-Ns3DLQ8V0gaxEJgStMJFat2kynRuAH1ysNypxNRTDsk=";
"aarch64-linux" = "sha256-3KjI7RRsFtrPNp7EJBlCACUQJukO9+CMf5UdkMMgqxU=";
"aarch64-darwin" = "sha256-9uX8CkZoQ7jgBoL3pp+NU73lN3RyzCGHbV0ag9vc+UY=";
"x86_64-linux" = "sha256-qSQc8Qw2ah0Kbrcb0kNuFTSQB3d7dnVPRRViA7//mgE=";
"aarch64-linux" = "sha256-PZfVCZf6XOUMaMOmIyBe1CrPTKQv53jf2RzunZN6RNk=";
"aarch64-darwin" = "sha256-LCROmrVuYBI4FE1K+c/mo8S7YEJ02puqlSHLcuRLEXc=";
};
inherit (stdenv.hostPlatform) system;
in
stdenv.mkDerivation rec {
pname = "quarto";
version = "1.6.9";
version = "1.6.15";
src = fetchurl {
url = "https://github.com/quarto-dev/quarto-cli/releases/download/v${version}/quarto-${version}-${platforms.${system}}.tar.gz";
sha256 = shas.${system};
Expand Down
Loading