JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

pgadmin: unpin eventlet dependency, cleanup

Browse Source
This commit is contained in:
Sandro Jäckel 2022-06-02 12:20:51 +02:00
parent d02db54662
commit 6b82550333
No known key found for this signature in database
GPG Key ID: B1763F8651144063
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkgs/tools/admin/pgadmin/default.nix
View File

@ -9,7 +9,6 @@
}: }:
let let
pname = "pgadmin"; pname = "pgadmin";
version = "6.9"; version = "6.9";
@ -112,12 +111,17 @@ pythonPackages.buildPythonApplication rec {
postPatch = '' postPatch = ''
# patching Makefile, so it doesn't try to build sphinx documentation here # patching Makefile, so it doesn't try to build sphinx documentation here
# (will do so later) # (will do so later)
substituteInPlace Makefile --replace 'LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 $(MAKE) -C docs/en_US -f Makefile.sphinx html' "true" substituteInPlace Makefile \
--replace 'LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 $(MAKE) -C docs/en_US -f Makefile.sphinx html' "true"
# fix document which refers a non-existing document and fails # fix document which refers a non-existing document and fails
substituteInPlace docs/en_US/contributions.rst --replace "code_snippets" "" substituteInPlace docs/en_US/contributions.rst \
--replace "code_snippets" ""
patchShebangs . patchShebangs .
# relax dependencies # relax dependencies
substituteInPlace requirements.txt \ substituteInPlace requirements.txt \
--replace "eventlet==0.33.0" "eventlet>=0.33.0" \
--replace "psycopg2==2.9.*" "psycopg2>=2.9" \ --replace "psycopg2==2.9.*" "psycopg2>=2.9" \
--replace "cryptography==3.*" "cryptography>=3.0" \ --replace "cryptography==3.*" "cryptography>=3.0" \
--replace "requests==2.25.*" "requests>=2.25.0" \ --replace "requests==2.25.*" "requests>=2.25.0" \
@ -188,7 +192,7 @@ pythonPackages.buildPythonApplication rec {
passthru.tests = { passthru.tests = {
standalone = nixosTests.pgadmin4-standalone; standalone = nixosTests.pgadmin4-standalone;
# regression and function tests of the package itself # regression and function tests of the package itself
package = (import ../../../../nixos/tests/pgadmin4.nix ({ inherit pkgs; buildDeps = buildDeps; pythonEnv = pythonPackages; })); package = import ../../../../nixos/tests/pgadmin4.nix { inherit pkgs buildDeps; pythonEnv = pythonPackages; };
}; };
meta = with lib; { meta = with lib; {