b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #245758 from gador/pgadmin-7.5

Browse source 
pgadmin4: 7.4 -> 7.5
This commit is contained in:
Pol Dellaiera 2023-07-28 16:40:57 +02:00 committed by GitHub
parent 4d1b4229d7 75d8c49cd6
commit a29fa7b706
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
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

@ -14,14 +14,14 @@
let
pname = "pgadmin";
version = "7.4";
version = "7.5";
yarnSha256 = "sha256-rEKMUZksmR2jPwtXy6drNwAJktK/3Dee6EZVFHPngWs=";
src = fetchFromGitHub {
owner = "pgadmin-org";
repo = "pgadmin4";
rev = "REL-${lib.versions.major version}_${lib.versions.minor version}";
hash = "sha256-ksvSDySutTB9QX0Gh9jBjGlDyG/vEMhgadu91iNvznw=";
hash = "sha256-o8jPqp4jLF/lZ0frCzPDCSxCy51Nt0mbdeNB44ZwNHI=";
};
# keep the scope, as it is used throughout the derivation and tests
@ -63,9 +63,13 @@ pythonPackages.buildPythonApplication rec {
# relax dependencies
sed 's|==|>=|g' -i requirements.txt
#TODO: Can be removed once cryptography>=40 has been merged to master
#TODO: Can be removed once boto3>=1.28.0 and cryptography>=41 has been merged to master
substituteInPlace requirements.txt \
--replace "cryptography>=40.0.*" "cryptography>=39.0.*"
--replace "boto3>=1.28.*" "boto3>=1.26.*"
substituteInPlace requirements.txt \
--replace "botocore>=1.31.*" "botocore>=1.29.*"
substituteInPlace requirements.txt \
--replace "cryptography>=41.0.*" "cryptography>=40.0.*"
# fix extra_require error with "*" in match
sed 's|*|0|g' -i requirements.txt
substituteInPlace pkg/pip/setup_pip.py \