Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 38 additions & 0 deletions pkgs/development/python-modules/flask-gravatar/default.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
{ lib
, buildPythonPackage
, fetchPypi
, pythonAtLeast
, flask
, pytest-runner
}:

buildPythonPackage rec {
pname = "Flask-Gravatar";
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
pname = "Flask-Gravatar";
pname = "flask-gravatar";

version = "0.5.0";

src = fetchPypi {
inherit pname version;
sha256 = "YGZfMcLGEokdto/4Aek+06CIHGyOw0arxk0qmSP1YuE=";
};

# depends on pytest-pep8 which is abandoned, not going to bother
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Are there integration or just liting tests? pythonImportsCheck?

doCheck = false;

preBuild = ''
sed "s|tests_require=tests_require,||g" -i setup.py
sed "s|extras_require=extras_require,||g" -i setup.py
sed "s|setup_requires=setup_requires,||g" -i setup.py
'';
Comment on lines +21 to +25
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Use postPatch and substituteInPlace.


propagatedBuildInputs = [
flask
];

meta = with lib; {
homepage = "https://github.com/zzzsochi/Flask-Gravatar";
description = "Small and simple integration of gravatar into flask";
license = licenses.bsd3;
platforms = platforms.all;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
platforms = platforms.all;

maintainers = with maintainers; [ mkg20001 ];
};
}
37 changes: 37 additions & 0 deletions pkgs/development/python-modules/flask-paranoid/default.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
{ lib
, buildPythonPackage
, fetchPypi
, pythonAtLeast
, flask
, pytest
, pytest-runner
}:

buildPythonPackage rec {
pname = "Flask-Paranoid";
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
pname = "Flask-Paranoid";
pname = "flask-paranoid";

version = "0.2.0";

src = fetchPypi {
inherit pname version;
sha256 = "ou6SV2QuAlTxFXikqlShpyUWemQc+gh5Mw1HfsNwx0k=";
};

propagatedBuildInputs = [
flask
];

checkInputs = [
pytest
pytest-runner
Comment on lines +24 to +25
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please use pytestCheckHook and patchout pytest-runner.

];

doCheck = false;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why? pythonImportsCheck?


meta = with lib; {
homepage = "https://github.com/miguelgrinberg/flask-paranoid/";
description = "Simple user session protection";
license = licenses.mit;
platforms = platforms.all;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
platforms = platforms.all;

maintainers = with maintainers; [ mkg20001 ];
};
}
49 changes: 49 additions & 0 deletions pkgs/development/python-modules/flask-security-too/default.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
{ lib
, buildPythonPackage
, fetchPypi
, pythonAtLeast
, flask
, blinker
, itsdangerous
, flask_principal
, passlib
, email_validator
, flask_wtf
, flask_login
, pytest
}:

buildPythonPackage rec {
pname = "Flask-Security-Too";
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
pname = "Flask-Security-Too";
pname = "flask-security-too";

version = "4.0.1";

src = fetchPypi {
inherit pname version;
sha256 = "wpZ/zgjL4qHGrajqr8cXYm2Q8pbvp6F/hZwT9Gv+8eA=";
};

propagatedBuildInputs = [
flask
flask_login
flask_principal
flask_wtf
email_validator
itsdangerous
passlib
blinker
];

doCheck = false;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do an pythonImportsCheck?


checkInputs = [
pytest
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
pytest
pytestCheckHook

];

meta = with lib; {
homepage = "https://pypi.org/project/Flask-Security-Too/";
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
homepage = "https://pypi.org/project/Flask-Security-Too/";
homepage = "https://github.com/Flask-Middleware/flask-security";

description = "Simple security for Flask apps (fork)";
license = licenses.mit;
platforms = platforms.all;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
platforms = platforms.all;

maintainers = with maintainers; [ mkg20001 ];
};
}
30 changes: 30 additions & 0 deletions pkgs/development/python-modules/httpagentparser/default.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
{ lib
, buildPythonPackage
, fetchPypi
, pythonAtLeast
, tox
}:

buildPythonPackage rec {
pname = "httpagentparser";
version = "1.9.1";

src = fetchPypi {
inherit pname version;
sha256 = "73Y9MZk912GCWs7myLNL4yuVzxZ10cc8PNNfnlKDGyY=";
};

checkInputs = [
tox
];

doCheck = false;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why are tests disabled? Can we do a pythonImportsCheck?


meta = with lib; {
homepage = "https://pypi.org/project/httpagentparser/";
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
homepage = "https://pypi.org/project/httpagentparser/";
homepage = "https://shon.github.io/httpagentparser/";

description = "Extracts OS Browser etc information from http user agent string";
license = licenses.mit;
platforms = platforms.all;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
platforms = platforms.all;

maintainers = with maintainers; [ mkg20001 ];
};
}
22 changes: 22 additions & 0 deletions pkgs/development/python-modules/speaklater3/default.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
{ lib
, buildPythonPackage
, fetchPypi
}:

buildPythonPackage rec {
pname = "speaklater3";
version = "1.4";

src = fetchPypi {
inherit pname version;
sha256 = "ySYdS2taMEZyMS0esImb4Cj6yRdgGQqA/szTHTo7UEI=";
};

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Missing pythonImportsCheck and checkPhase.

meta = with lib; {
description = "Implements a lazy string for python useful for use with gettext";
homepage = "https://github.com/mitsuhiko/speaklater";
license = licenses.bsd0;
maintainers = with maintainers; [ mkg20001 ];
};

}
Comment on lines +20 to +22
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
};
}
};
}

73 changes: 73 additions & 0 deletions pkgs/tools/admin/pgadmin/default.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,73 @@
{ stdenv
, lib
, python3
, fetchurl
, zlib
, python3Packages
}:

python3Packages.buildPythonApplication rec {
pname = "pgadmin";
version = "5.4";
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
version = "5.4";
version = "5.4";
format = "other";


src = fetchurl {
url = "https://ftp.postgresql.org/pub/pgadmin/pgadmin4/v${version}/source/pgadmin4-${version}.tar.gz";
sha256 = "N0+fnS0ndH/bqwVMra6kSvKoxRCGPCvLs8aZ0PvWv0o=";
};

# from Dockerfile
CPPFLAGS="-DPNG_ARM_NEON_OPT=0";

format = "other";

Comment on lines +21 to +22
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
format = "other";

postPatch = ''
# sed -r 's|LC_ALL=en_US.UTF-8.* Makefile.sphinx .*$|true|g' -i Makefile
patchShebangs .
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please specify the files/directories that need patching?

'';

buildInputs = [
zlib
];

propagatedBuildInputs = with python3Packages; [
flask
flask-gravatar
flask_login
flask_mail
flask_migrate
flask_sqlalchemy
flask_wtf
flask-compress
passlib
pytz
simplejson
six
(lib.hiPrio speaklater3)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why does this need to be hiPrio?

sqlparse
wtforms
flask-paranoid
psutil
psycopg2
python-dateutil
sqlalchemy
itsdangerous
flask-security-too
bcrypt
cryptography
sshtunnel
ldap3
flask-babelex
gssapi
flask-socketio
eventlet
httpagentparser
user-agents
];

meta = with lib; {
description = "Administration and development platform for PostgreSQL";
homepage = "https://www.pgadmin.org/";
license = licenses.mit;
maintainers = with maintainers; [ mkg20001 ];
};
}
4 changes: 3 additions & 1 deletion pkgs/top-level/all-packages.nix
Original file line number Diff line number Diff line change
Expand Up @@ -31183,7 +31183,9 @@ in

pgmanage = callPackage ../applications/misc/pgmanage { };

pgadmin = callPackage ../applications/misc/pgadmin {
pgadmin4 = callPackage ../tools/admin/pgadmin { };

pgadmin3 = callPackage ../applications/misc/pgadmin {
Comment on lines +31186 to +31188
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please move the files to one place and append version numbers to the directories.

openssl = openssl_1_0_2;
};

Expand Down
10 changes: 10 additions & 0 deletions pkgs/top-level/python-packages.nix
Original file line number Diff line number Diff line change
Expand Up @@ -2577,6 +2577,8 @@ in {

flask_elastic = callPackage ../development/python-modules/flask-elastic { };

flask-gravatar = callPackage ../development/python-modules/flask-gravatar { };

flask-httpauth = callPackage ../development/python-modules/flask-httpauth { };

flask-jwt-extended = callPackage ../development/python-modules/flask-jwt-extended { };
Expand All @@ -2597,6 +2599,8 @@ in {

flask-paginate = callPackage ../development/python-modules/flask-paginate { };

flask-paranoid = callPackage ../development/python-modules/flask-paranoid { };

flask_principal = callPackage ../development/python-modules/flask-principal { };

flask-pymongo = callPackage ../development/python-modules/Flask-PyMongo { };
Expand All @@ -2613,6 +2617,8 @@ in {

flask-seasurf = callPackage ../development/python-modules/flask-seasurf { };

flask-security-too = callPackage ../development/python-modules/flask-security-too { };

flask-silk = callPackage ../development/python-modules/flask-silk { };

flask-socketio = callPackage ../development/python-modules/flask-socketio { };
Expand Down Expand Up @@ -3322,6 +3328,8 @@ in {

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

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

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

httpcore = callPackage ../development/python-modules/httpcore { };
Expand Down Expand Up @@ -8094,6 +8102,8 @@ in {

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

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

spectral-cube = callPackage ../development/python-modules/spectral-cube { };

speedtest-cli = callPackage ../development/python-modules/speedtest-cli { };
Expand Down