Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
384b696
chore(deps): update nixpkgs but pin it for postgres
brainrake Oct 5, 2026
11c704e
refactor(nix): rename nixpkgs-pg, drop overlays from main nixpkgs
brainrake Oct 5, 2026
6ea1de1
Merge remote-tracking branch 'origin/develop' into chore/pin-postgres…
brainrake Oct 5, 2026
3c2a1fd
refactor(nix): build gatekeeper and pg_regress from main nixpkgs
brainrake Oct 5, 2026
8480983
refactor(nix): use one nixpkgs for postgres and everything else
brainrake Oct 6, 2026
aba52d3
Merge branch 'develop' into chore/pin-postgres-nixpkgs
brainrake Oct 16, 2026
a9ef86e
fix(nix): keep the portable cli bundle on pre-2.42 glibc hosts
brainrake Oct 16, 2026
189d740
Merge branch 'develop' into chore/pin-postgres-nixpkgs
brainrake Oct 27, 2026
a1a8c4c
chore(nix): bump glibc collation baseline to 2.42-84
brainrake Oct 27, 2026
2413c56
Merge remote-tracking branch 'origin/develop' into HEAD
brainrake Oct 31, 2026
f5db481
chore(deps): update flake inputs and glibc collation baseline
brainrake Oct 31, 2026
4a20372
fix(deps): keep nix-editor at its previous revision
brainrake Oct 31, 2026
95db85c
Merge branch 'develop' into chore/pin-postgres-nixpkgs
brainrake Nov 2, 2026
6eb3b19
Merge remote-tracking branch 'origin/develop' into HEAD
brainrake Nov 2, 2026
63676a3
fix(deps): keep multigres at the revision pgctld is vendored for
brainrake Nov 2, 2026
eacca66
chore(nix): drop cargo vendor workarounds fixed in nixos-26.05
brainrake Nov 2, 2026
d567c00
Merge branch 'develop' into chore/pin-postgres-nixpkgs
brainrake Nov 12, 2026
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
121 changes: 49 additions & 72 deletions flake.lock

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

7 changes: 3 additions & 4 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
multigres.url = "github:multigres/multigres";
multigres.flake = false;
nix-darwin.inputs.nixpkgs.follows = "nixpkgs";
nix-darwin.url = "github:nix-darwin/nix-darwin";
nix-darwin.url = "github:nix-darwin/nix-darwin/nix-darwin-26.05";
nix-editor.inputs.nixpkgs.follows = "nixpkgs";
nix-editor.inputs.utils.follows = "flake-utils";
nix-editor.url = "github:snowfallorg/nix-editor";
Expand All @@ -23,10 +23,9 @@
nix-eval-jobs.url = "github:nix-community/nix-eval-jobs";
nix2container.inputs.nixpkgs.follows = "nixpkgs";
nix2container.url = "github:nlewo/nix2container";
# Pin to a specific nixpkgs version that has compatible v8 and curl versions
# for extensions that require older package versions
# Pin to a specific nixpkgs version that still has the v8 version plv8 needs
nixpkgs-oldstable.url = "github:NixOS/nixpkgs/a76c4553d7e741e17f289224eda135423de0491d";
nixpkgs.url = "https://channels.nixos.org/nixos-unstable/nixexprs.tar.xz";
nixpkgs.url = "https://channels.nixos.org/nixos-26.05/nixexprs.tar.xz";
rust-overlay.inputs.nixpkgs.follows = "nixpkgs";
rust-overlay.url = "github:oxalica/rust-overlay";
treefmt-nix.inputs.nixpkgs.follows = "nixpkgs";
Expand Down
12 changes: 3 additions & 9 deletions nix/cargo-pgrx/default.nix
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
{
lib,
pkgs,
fetchCrate,
openssl,
pkg-config,
Expand All @@ -10,11 +9,10 @@
rustVersion ? "1.85.1",
}:
let
# TODO: remove once nixpkgs is bumped past NixOS/nixpkgs#512735
rustPlatform = import ./fix-cargo.nix { inherit pkgs; } (makeRustPlatform {
rustPlatform = makeRustPlatform {
cargo = rust-bin.stable.${rustVersion}.default;
rustc = rust-bin.stable.${rustVersion}.default;
});
};
in
{
mkCargoPgrx =
Expand All @@ -34,11 +32,7 @@ in
auditable = false;
inherit pname;
inherit version;
# TODO: remove once nixpkgs is bumped past NixOS/nixpkgs#512735
src = fetchCrate {
inherit version pname hash;
registryDl = "https://static.crates.io/crates";
};
src = fetchCrate { inherit version pname hash; };
inherit cargoHash;
nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ pkg-config ];
buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ openssl ];
Expand Down
60 changes: 0 additions & 60 deletions nix/cargo-pgrx/fix-cargo.nix

This file was deleted.

Loading
Loading