diff --git a/pkgs/by-name/pg/pgadmin4/package.nix b/pkgs/by-name/pg/pgadmin4/package.nix index c2879c7040de..f54e0664e8ca 100644 --- a/pkgs/by-name/pg/pgadmin4/package.nix +++ b/pkgs/by-name/pg/pgadmin4/package.nix @@ -2,33 +2,26 @@ lib, python3, fetchFromGitHub, - fetchpatch2, zlib, nixosTests, postgresqlTestHook, postgresql, yarn-berry_4, nodejs, - autoconf, - automake, - libtool, - libpng, - nasm, - pkg-config, stdenv, server-mode ? true, }: let pname = "pgadmin"; - version = "9.13"; - yarnHash = "sha256-ViqjZ40M78EZ4ZOMuiAGJqx6Xyv4dqY9X7jMDbohaY8="; + version = "9.14"; + yarnHash = "sha256-j/5qoCrhC7xBPaS6NhZFFQtJ7ThL/wkFXoCtyreLHco="; src = fetchFromGitHub { owner = "pgadmin-org"; repo = "pgadmin4"; rev = "REL-${lib.versions.major version}_${lib.versions.minor version}"; - hash = "sha256-dG8oxE9g30Dz3K3PveoMjPa1/eY9RWEV2QBdx2Dz+Rg="; + hash = "sha256-NQe1ZN8jQEJE5qSpL5MjgLwWLGrGXCIHaCd8zLpsx3s="; }; # keep the scope, as it is used throughout the derivation and tests @@ -68,12 +61,6 @@ pythonPackages.buildPythonApplication rec { ./expose-setup.py.patch # check for permission of /etc/pgadmin/config_system and don't fail ./check-system-config-dir.patch - # fix session.py See https://github.com/pgadmin-org/pgadmin4/pull/9706 - (fetchpatch2 { - name = "session.patch"; - url = "https://github.com/pgadmin-org/pgadmin4/commit/7043587387c17635f62bab8414546bb8c0dbadf4.patch?full_index=1"; - hash = "sha256-gZrO0dBy5EklZf/dKr9j3RJ54rtzFrw53v91vqkRboY="; - }) ]; postPatch = ''