Skip to content

Commit 34a774e

Browse files
committed
chore: reduce warnings related to system
Current system value has been moved into `pkgs.stdenv.hostPlatform` by NixOS/nixpkgs#456527
1 parent 10a4602 commit 34a774e

File tree

4 files changed

+6
-5
lines changed

4 files changed

+6
-5
lines changed

nix/cargo-pgrx/mkPgrxExtension.nix

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
pgrxVersion,
55
makeRustPlatform,
66
rust-bin,
7+
stdenv,
78
system,
89
}:
910
let
@@ -42,7 +43,7 @@ let
4243
import (builtins.fetchTarball {
4344
url = "https://channels.nixos.org/nixos-22.11/nixexprs.tar.xz";
4445
sha256 = "1j7h75a9hwkkm97jicky5rhvzkdwxsv5v46473rl6agvq2sj97y1";
45-
}) { inherit system; }
46+
}) { inherit (stdenv.hostPlatform) system; }
4647
);
4748
in
4849
rustPlatform.bindgenHook.overrideAttrs {

nix/overlays/default.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
# want to have an arbitrary order, since it might matter. being
77
# explicit is better.
88

9-
inherit (self.packages.${final.system})
9+
inherit (self.packages.${final.stdenv.hostPlatform.system})
1010
postgresql_15
1111
postgresql_17
1212
postgresql_orioledb-17

nix/packages/default.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
migrate-tool = pkgs.callPackage ./migrate-tool.nix { psql_15 = self'.packages."psql_15/bin"; };
4949
overlayfs-on-package = pkgs.callPackage ./overlayfs-on-package.nix { };
5050
packer = pkgs.callPackage ./packer.nix { inherit inputs; };
51-
pg-backrest = inputs.nixpkgs.legacyPackages.${pkgs.system}.pgbackrest;
51+
pg-backrest = inputs.nixpkgs.legacyPackages.${pkgs.stdenv.hostPlatform.system}.pgbackrest;
5252
pg-restore = pkgs.callPackage ./pg-restore.nix { psql_15 = self'.packages."psql_15/bin"; };
5353
pg_prove = pkgs.perlPackages.TAPParserSourceHandlerpgTAP;
5454
pg_regress = makePgRegress activeVersion;

nix/postgresql/generic.nix

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -322,15 +322,15 @@ let
322322

323323
tests = {
324324
postgresql-wal-receiver = import ../../../../nixos/tests/postgresql-wal-receiver.nix {
325-
inherit (stdenv) system;
325+
inherit (stdenv.hostPlatform) system;
326326
pkgs = self;
327327
package = this;
328328
};
329329
pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
330330
}
331331
// lib.optionalAttrs jitSupport {
332332
postgresql-jit = import ../../../../nixos/tests/postgresql-jit.nix {
333-
inherit (stdenv) system;
333+
inherit (stdenv.hostPlatform) system;
334334
pkgs = self;
335335
package = this;
336336
};

0 commit comments

Comments
 (0)