Merge: postgresql: 16.4 -> 17.0 (#345260)
This commit is contained in:
@@ -1,8 +1,9 @@
|
||||
{ lib, stdenv, fetchFromGitHub, openssl, curl, postgresql, yajl }:
|
||||
{ lib, stdenv, fetchFromGitHub, openssl, curl, postgresql_16, yajl }:
|
||||
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "kore";
|
||||
# TODO: Check on next update whether postgresql 17 is supported.
|
||||
version = "4.2.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
@@ -12,7 +13,7 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "sha256-p0M2P02xwww5EnT28VnEtj5b+/jkPW3YkJMuK79vp4k=";
|
||||
};
|
||||
|
||||
buildInputs = [ openssl curl postgresql yajl ];
|
||||
buildInputs = [ openssl curl postgresql_16 yajl ];
|
||||
|
||||
makeFlags = [
|
||||
"PREFIX=${placeholder "out"}"
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ lib, fetchFromGitLab, buildGoModule, nixosTests, postgresql_17, makeWrapper }:
|
||||
{ lib, fetchFromGitLab, buildGoModule, nixosTests, postgresql, makeWrapper }:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "pg-dump-anon";
|
||||
@@ -19,7 +19,7 @@ buildGoModule rec {
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
postInstall = ''
|
||||
wrapProgram $out/bin/pg_dump_anon \
|
||||
--prefix PATH : ${lib.makeBinPath [ postgresql_17 ]}
|
||||
--prefix PATH : ${lib.makeBinPath [ postgresql ]}
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
|
||||
@@ -8,18 +8,19 @@
|
||||
pythonOlder,
|
||||
pytest-xdist,
|
||||
pytestCheckHook,
|
||||
distro,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "asyncpg";
|
||||
version = "0.29.0";
|
||||
version = "0.30.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-0cSeH0T/+v2aVeGpsQFZCFnYgdY56ikiUW9dnFEtNU4=";
|
||||
hash = "sha256-xVHpkoq2cHYC9EgRgX+CujxEbgGL/h06vsyLpfPqyFE=";
|
||||
};
|
||||
|
||||
# sandboxing issues on aarch64-darwin, see https://github.com/NixOS/nixpkgs/issues/198495
|
||||
@@ -34,6 +35,7 @@ buildPythonPackage rec {
|
||||
postgresql
|
||||
pytest-xdist
|
||||
pytestCheckHook
|
||||
distro
|
||||
];
|
||||
|
||||
preCheck = ''
|
||||
|
||||
@@ -12156,8 +12156,8 @@ with pkgs;
|
||||
postgresql_16_jit
|
||||
postgresql_17_jit
|
||||
;
|
||||
postgresql = postgresql_16;
|
||||
postgresql_jit = postgresql_16_jit;
|
||||
postgresql = postgresql_17;
|
||||
postgresql_jit = postgresql_17_jit;
|
||||
postgresqlPackages = recurseIntoAttrs postgresql.pkgs;
|
||||
postgresqlJitPackages = recurseIntoAttrs postgresql_jit.pkgs;
|
||||
postgresql12Packages = recurseIntoAttrs postgresql_12.pkgs;
|
||||
|
||||
Reference in New Issue
Block a user