From dc388874e2c998c34d6e86107b74926502b28532 Mon Sep 17 00:00:00 2001 From: Adam Stephens Date: Fri, 18 Oct 2024 23:38:00 -0400 Subject: [PATCH 1/2] patroni: move to by-name and add updateScript --- .../pa/patroni/package.nix} | 15 +++++++++------ pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 9 insertions(+), 8 deletions(-) rename pkgs/{servers/sql/patroni/default.nix => by-name/pa/patroni/package.nix} (77%) diff --git a/pkgs/servers/sql/patroni/default.nix b/pkgs/by-name/pa/patroni/package.nix similarity index 77% rename from pkgs/servers/sql/patroni/default.nix rename to pkgs/by-name/pa/patroni/package.nix index 19739f2bcca2..526ba2aa87f7 100644 --- a/pkgs/servers/sql/patroni/default.nix +++ b/pkgs/by-name/pa/patroni/package.nix @@ -1,10 +1,11 @@ { lib -, pythonPackages +, python3Packages , fetchFromGitHub , nixosTests +, nix-update-script }: -pythonPackages.buildPythonApplication rec { +python3Packages.buildPythonApplication rec { pname = "patroni"; version = "4.0.2"; @@ -15,7 +16,7 @@ pythonPackages.buildPythonApplication rec { sha256 = "sha256-ykTg5Zd4dU1D6dnj6QbNfGUXrSteKrQjV2hpIPhXGLU="; }; - propagatedBuildInputs = with pythonPackages; [ + propagatedBuildInputs = with python3Packages; [ boto3 click consul @@ -34,7 +35,7 @@ pythonPackages.buildPythonApplication rec { ydiff ]; - nativeCheckInputs = with pythonPackages; [ + nativeCheckInputs = with python3Packages; [ flake8 mock pytestCheckHook @@ -47,8 +48,10 @@ pythonPackages.buildPythonApplication rec { pythonImportsCheck = [ "patroni" ]; - passthru.tests = { - patroni = nixosTests.patroni; + passthru = { + tests.patroni = nixosTests.patroni; + + updateScript = nix-update-script { }; }; meta = with lib; { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 274e605967cb..5ce611d530dd 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -24865,8 +24865,6 @@ with pkgs; vmfs-tools = callPackage ../tools/filesystems/vmfs-tools { }; - patroni = callPackage ../servers/sql/patroni { pythonPackages = python3Packages; }; - pgbouncer = callPackage ../servers/sql/pgbouncer { }; pgcat = callPackage ../servers/sql/pgcat {}; From c6127e5a171571a1746c5ce04cb517103daaf19e Mon Sep 17 00:00:00 2001 From: Adam Stephens Date: Sat, 19 Oct 2024 03:38:39 +0000 Subject: [PATCH 2/2] patroni: 4.0.2 -> 4.0.3 https://github.com/patroni/patroni/blob/v4.0.3/docs/releases.rst#version-403 --- pkgs/by-name/pa/patroni/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/pa/patroni/package.nix b/pkgs/by-name/pa/patroni/package.nix index 526ba2aa87f7..f0628394addb 100644 --- a/pkgs/by-name/pa/patroni/package.nix +++ b/pkgs/by-name/pa/patroni/package.nix @@ -7,13 +7,13 @@ python3Packages.buildPythonApplication rec { pname = "patroni"; - version = "4.0.2"; + version = "4.0.3"; src = fetchFromGitHub { owner = "zalando"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-ykTg5Zd4dU1D6dnj6QbNfGUXrSteKrQjV2hpIPhXGLU="; + sha256 = "sha256-urNTxaipM4wD+1fp7EFdT7/FGLq86O1nOfst7JyX0fc="; }; propagatedBuildInputs = with python3Packages; [