pgadmin4: 8.12 -> 9.0 (#380304)
This commit is contained in:
@@ -5,6 +5,7 @@
|
|||||||
msal,
|
msal,
|
||||||
portalocker,
|
portalocker,
|
||||||
setuptools,
|
setuptools,
|
||||||
|
stdenv,
|
||||||
pythonOlder,
|
pythonOlder,
|
||||||
pytestCheckHook,
|
pytestCheckHook,
|
||||||
}:
|
}:
|
||||||
@@ -34,11 +35,17 @@ buildPythonPackage rec {
|
|||||||
|
|
||||||
nativeCheckInputs = [ pytestCheckHook ];
|
nativeCheckInputs = [ pytestCheckHook ];
|
||||||
|
|
||||||
disabledTests = [
|
disabledTests =
|
||||||
|
[
|
||||||
# `from gi.repository import Secret` fails to find libsecret
|
# `from gi.repository import Secret` fails to find libsecret
|
||||||
"test_token_cache_roundtrip_with_persistence_builder"
|
"test_token_cache_roundtrip_with_persistence_builder"
|
||||||
"test_libsecret_persistence"
|
"test_libsecret_persistence"
|
||||||
"test_nonexistent_libsecret_persistence"
|
"test_nonexistent_libsecret_persistence"
|
||||||
|
]
|
||||||
|
++ lib.optionals stdenv.hostPlatform.isDarwin [
|
||||||
|
# msal_extensions.osx.KeychainError
|
||||||
|
"test_keychain_roundtrip"
|
||||||
|
"test_keychain_persistence"
|
||||||
];
|
];
|
||||||
|
|
||||||
pythonImportsCheck = [ "msal_extensions" ];
|
pythonImportsCheck = [ "msal_extensions" ];
|
||||||
|
|||||||
@@ -16,14 +16,14 @@
|
|||||||
|
|
||||||
let
|
let
|
||||||
pname = "pgadmin";
|
pname = "pgadmin";
|
||||||
version = "8.12";
|
version = "9.0";
|
||||||
yarnHash = "sha256-C5CI8oP9vEana3OEs1yAsSSTvO2uLEuCU1nHhC7LerY=";
|
yarnHash = "sha256-CVanJx4gmhtiCMpmDzViY/kw9cu9ey0S6r5SPZKzVxA=";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "pgadmin-org";
|
owner = "pgadmin-org";
|
||||||
repo = "pgadmin4";
|
repo = "pgadmin4";
|
||||||
rev = "REL-${lib.versions.major version}_${lib.versions.minor version}";
|
rev = "REL-${lib.versions.major version}_${lib.versions.minor version}";
|
||||||
hash = "sha256-OIFHaU+Ty0xJn42iqYhse8dfFJZpx8AV/10RNxp1Y4o=";
|
hash = "sha256-WscqFuxdy29SIaTfKgKu7pKcQrU0f6tNvC7BifaDnYQ=";
|
||||||
};
|
};
|
||||||
|
|
||||||
# keep the scope, as it is used throughout the derivation and tests
|
# keep the scope, as it is used throughout the derivation and tests
|
||||||
@@ -78,7 +78,7 @@ pythonPackages.buildPythonApplication rec {
|
|||||||
sed 's|*|0|g' -i requirements.txt
|
sed 's|*|0|g' -i requirements.txt
|
||||||
# remove packageManager from package.json so we can work without corepack
|
# remove packageManager from package.json so we can work without corepack
|
||||||
substituteInPlace web/package.json \
|
substituteInPlace web/package.json \
|
||||||
--replace-fail "\"packageManager\": \"yarn@3.8.3\"" "\"\": \"\""
|
--replace-fail "\"packageManager\": \"yarn@3.8.7\"" "\"\": \"\""
|
||||||
substituteInPlace pkg/pip/setup_pip.py \
|
substituteInPlace pkg/pip/setup_pip.py \
|
||||||
--replace-fail "req = req.replace('psycopg[c]', 'psycopg[binary]')" "req = req"
|
--replace-fail "req = req.replace('psycopg[c]', 'psycopg[binary]')" "req = req"
|
||||||
${lib.optionalString (!server-mode) ''
|
${lib.optionalString (!server-mode) ''
|
||||||
@@ -196,7 +196,6 @@ pythonPackages.buildPythonApplication rec {
|
|||||||
azure-identity
|
azure-identity
|
||||||
sphinxcontrib-youtube
|
sphinxcontrib-youtube
|
||||||
dnspython
|
dnspython
|
||||||
greenlet
|
|
||||||
speaklater3
|
speaklater3
|
||||||
google-auth-oauthlib
|
google-auth-oauthlib
|
||||||
google-api-python-client
|
google-api-python-client
|
||||||
|
|||||||
File diff suppressed because it is too large
Load Diff
Reference in New Issue
Block a user