Unverified Commit 8689d82f authored by Leona Maroni's avatar Leona Maroni Committed by GitHub
Browse files

Merge pull request #310140 from gador/pgadmin-8.6 

Pgadmin 8.6
parents 479e2144 1ad23e24

pkgs/development/python-modules/libgravatar/default.nix

0 → 100644
+30 −0
Original line number Diff line number Diff line 
{

  lib,

  python3Packages,

  fetchFromGitHub,

}:



python3Packages.buildPythonApplication rec {

  pname = "libgravatar";

  version = "1.0.4";



  src = fetchFromGitHub {

    owner = "pabluk";

    repo = "libgravatar";

    rev = "refs/tags/${version}";

    hash = "sha256-rJv/jfdT+JldxR0kKtXQLOI5wXQYSQRWJnqwExwWjTA=";

  };



  nativeBuildInputs = with python3Packages; [ setuptools ];



  nativeCheckInputs = with python3Packages; [ pytestCheckHook ];



  pythonImportsCheck = [ "libgravatar" ];



  meta = with lib; {

    homepage = "https://github.com/pabluk/libgravatar";

    description = "A library that provides a Python 3 interface for the Gravatar API";

    license = licenses.gpl3Plus;

    maintainers = with maintainers; [ gador ];

  };

}

pkgs/tools/admin/pgadmin/default.nix

+5 −16
Original line number Diff line number Diff line
@@ -15,30 +15,19 @@ 


let

  pname = "pgadmin";

  version = "8.5";

  yarnHash = "sha256-VLf8GRJ2IIcrfBqdgT2uZG3kOEt0pd7Cksm+tdrQogA=";

  version = "8.6";

  yarnHash = "sha256-SDAU6goe5iu1SAcAsAEam2i+skZkG/hE9y3bGsKiFZ8=";



  src = fetchFromGitHub {

    owner = "pgadmin-org";

    repo = "pgadmin4";

    rev = "REL-${lib.versions.major version}_${lib.versions.minor version}";

    hash = "sha256-D/8tiVL2DwxvDiSqHeOF1P/yRRniZY39TyUfibrfAOo=";

    hash = "sha256-a370dh5IHInhcPA1LeveUIjalrymTsdyoXjBNNKwSTs=";

  };



  # keep the scope, as it is used throughout the derivation and tests

  # this also makes potential future overrides easier

  pythonPackages = python3.pkgs.overrideScope (final: prev: rec {

    # Flask 5.4.3 introduces an CSRF error which makes it impossible to login

    # So either we downgrade flask here or use "WTF_CSRF_ENABLED = false" in the

    # module config to disable CSRF.

    flask-security-too = prev.flask-security-too.overridePythonAttrs (oldAttrs: rec {

      version = "5.4.1";

      src = oldAttrs.src.override {

        inherit version;

        hash = "sha256-Ay7+gk+zuUlXtw0LDdsnvSa22z+yE6VR1guu9QmiFvw=";

      };

    });

  });

  pythonPackages = python3.pkgs.overrideScope (final: prev: rec { });



  offlineCache = fetchYarnDeps {

    yarnLock = ./yarn.lock;
@@ -159,7 +148,6 @@ pythonPackages.buildPythonApplication rec { 


  propagatedBuildInputs = with pythonPackages; [

    flask

    flask-gravatar

    flask-login

    flask-mail

    flask-migrate
@@ -209,6 +197,7 @@ pythonPackages.buildPythonApplication rec { 
    typer

    rich

    jsonformatter

    libgravatar

  ];



  passthru.tests = {

pkgs/tools/admin/pgadmin/yarn.lock

+3086 −3639

File changed.

Preview size limit exceeded, changes collapsed.

pkgs/top-level/python-packages.nix

+2 −0
Original line number Diff line number Diff line
@@ -6642,6 +6642,8 @@ self: super: with self; { 
    inherit (pkgs.config) cudaSupport;

  };













  libgravatar = callPackage ../development/python-modules/libgravatar { };



























  libiio = (toPythonModule (pkgs.libiio.override {















    pythonSupport = true;















    inherit python;