commit
51a899bdc1
File diff suppressed because it is too large
Load Diff
@ -1,14 +1,14 @@ |
|||||||
{ |
{ |
||||||
"version": "14.10.0", |
"version": "14.10.1", |
||||||
"repo_hash": "0j4dx32d4i8b44zfmqshkc19g3g9a2c2rg1r8mifjv67p7hvacnx", |
"repo_hash": "13868wb0zr862xaxapp8nxh16gjsawklw66rlxx95bhhm3r81nrp", |
||||||
"yarn_hash": "17wxqvig34namf8kvh8bwci3y0f3k2nl4zs99jcvskdad9p45rlc", |
"yarn_hash": "17wxqvig34namf8kvh8bwci3y0f3k2nl4zs99jcvskdad9p45rlc", |
||||||
"owner": "gitlab-org", |
"owner": "gitlab-org", |
||||||
"repo": "gitlab", |
"repo": "gitlab", |
||||||
"rev": "v14.10.0-ee", |
"rev": "v14.10.1-ee", |
||||||
"passthru": { |
"passthru": { |
||||||
"GITALY_SERVER_VERSION": "14.10.0", |
"GITALY_SERVER_VERSION": "14.10.1", |
||||||
"GITLAB_PAGES_VERSION": "1.56.1", |
"GITLAB_PAGES_VERSION": "1.56.1", |
||||||
"GITLAB_SHELL_VERSION": "13.25.1", |
"GITLAB_SHELL_VERSION": "13.25.1", |
||||||
"GITLAB_WORKHORSE_VERSION": "14.10.0" |
"GITLAB_WORKHORSE_VERSION": "14.10.1" |
||||||
} |
} |
||||||
} |
} |
||||||
|
@ -0,0 +1,76 @@ |
|||||||
|
diff --git nss/cmd/shlibsign/shlibsign.c nss/cmd/shlibsign/shlibsign.c
|
||||||
|
index ad8f3b84e..74676d039 100644
|
||||||
|
--- nss/cmd/shlibsign/shlibsign.c
|
||||||
|
+++ nss/cmd/shlibsign/shlibsign.c
|
||||||
|
@@ -875,6 +875,8 @@ main(int argc, char **argv)
|
||||||
|
goto cleanup;
|
||||||
|
}
|
||||||
|
lib = PR_LoadLibrary(libname);
|
||||||
|
+ if (!lib)
|
||||||
|
+ lib = PR_LoadLibrary(NIX_NSS_LIBDIR"libsoftokn3.so");
|
||||||
|
assert(lib != NULL);
|
||||||
|
if (!lib) {
|
||||||
|
PR_fprintf(PR_STDERR, "loading softokn3 failed");
|
||||||
|
diff --git nss/lib/pk11wrap/pk11load.c nss/lib/pk11wrap/pk11load.c
|
||||||
|
index 119c8c512..720d39ccc 100644
|
||||||
|
--- nss/lib/pk11wrap/pk11load.c
|
||||||
|
+++ nss/lib/pk11wrap/pk11load.c
|
||||||
|
@@ -486,6 +486,15 @@ secmod_LoadPKCS11Module(SECMODModule *mod, SECMODModule **oldModule)
|
||||||
|
#else
|
||||||
|
library = PR_LoadLibrary(mod->dllName);
|
||||||
|
#endif // defined(_WIN32)
|
||||||
|
+#ifndef NSS_STATIC_SOFTOKEN
|
||||||
|
+ if ((library == NULL) &&
|
||||||
|
+ !rindex(mod->dllName, PR_GetDirectorySeparator())) {
|
||||||
|
+ library = PORT_LoadLibraryFromOrigin(my_shlib_name,
|
||||||
|
+ (PRFuncPtr) &softoken_LoadDSO,
|
||||||
|
+ mod->dllName);
|
||||||
|
+ }
|
||||||
|
+#endif
|
||||||
|
+
|
||||||
|
mod->library = (void *)library;
|
||||||
|
|
||||||
|
if (library == NULL) {
|
||||||
|
diff --git nss/lib/util/secload.c nss/lib/util/secload.c
|
||||||
|
index 12efd2f75..8b74478f6 100644
|
||||||
|
--- nss/lib/util/secload.c
|
||||||
|
+++ nss/lib/util/secload.c
|
||||||
|
@@ -70,9 +70,14 @@ loader_LoadLibInReferenceDir(const char* referencePath, const char* name)
|
||||||
|
|
||||||
|
/* Remove the trailing filename from referencePath and add the new one */
|
||||||
|
c = strrchr(referencePath, PR_GetDirectorySeparator());
|
||||||
|
+ if (!c) { /* referencePath doesn't contain a / means that dladdr gave us argv[0]
|
||||||
|
+ * and program was called from $PATH. Hack to get libs from NIX_NSS_LIBDIR */
|
||||||
|
+ referencePath = NIX_NSS_LIBDIR;
|
||||||
|
+ c = (char*) &referencePath[sizeof(NIX_NSS_LIBDIR) - 1]; /* last / */
|
||||||
|
+ }
|
||||||
|
if (c) {
|
||||||
|
size_t referencePathSize = 1 + c - referencePath;
|
||||||
|
- fullName = (char*)PORT_Alloc(strlen(name) + referencePathSize + 1);
|
||||||
|
+ fullName = (char*) PORT_Alloc(strlen(name) + referencePathSize + 5);
|
||||||
|
if (fullName) {
|
||||||
|
memcpy(fullName, referencePath, referencePathSize);
|
||||||
|
strcpy(fullName + referencePathSize, name);
|
||||||
|
@@ -82,6 +87,11 @@ loader_LoadLibInReferenceDir(const char* referencePath, const char* name)
|
||||||
|
#endif
|
||||||
|
libSpec.type = PR_LibSpec_Pathname;
|
||||||
|
libSpec.value.pathname = fullName;
|
||||||
|
+ if ((referencePathSize >= 4) &&
|
||||||
|
+ (strncmp(fullName + referencePathSize - 4, "bin", 3) == 0)) {
|
||||||
|
+ memcpy(fullName + referencePathSize -4, "lib", 3);
|
||||||
|
+ }
|
||||||
|
+ strcpy(fullName + referencePathSize, name);
|
||||||
|
dlh = PR_LoadLibraryWithFlags(libSpec, PR_LD_NOW | PR_LD_LOCAL
|
||||||
|
#ifdef PR_LD_ALT_SEARCH_PATH
|
||||||
|
/* allow library's dependencies to be found in the same directory
|
||||||
|
@@ -89,6 +99,10 @@ loader_LoadLibInReferenceDir(const char* referencePath, const char* name)
|
||||||
|
| PR_LD_ALT_SEARCH_PATH
|
||||||
|
#endif
|
||||||
|
);
|
||||||
|
+ if (! dlh) {
|
||||||
|
+ strcpy(fullName + referencePathSize, name);
|
||||||
|
+ dlh = PR_LoadLibraryWithFlags(libSpec, PR_LD_NOW | PR_LD_LOCAL);
|
||||||
|
+ }
|
||||||
|
PORT_Free(fullName);
|
||||||
|
}
|
||||||
|
}
|
@ -1,33 +1,46 @@ |
|||||||
{ lib, buildPythonPackage, fetchPypi, nose, numpy |
{ lib |
||||||
, bottle, pyyaml, redis, six |
, bottle |
||||||
, zlib |
, buildPythonPackage |
||||||
, pytestCheckHook }: |
, fetchPypi |
||||||
|
, numpy |
||||||
|
, pytestCheckHook |
||||||
|
, pythonOlder |
||||||
|
, pyyaml |
||||||
|
, redis |
||||||
|
}: |
||||||
|
|
||||||
buildPythonPackage rec { |
buildPythonPackage rec { |
||||||
pname = "Jug"; |
pname = "jug"; |
||||||
version = "2.1.1"; |
version = "2.2.0"; |
||||||
buildInputs = [ nose numpy ]; |
format = "setuptools"; |
||||||
|
|
||||||
|
disabled = pythonOlder "3.7"; |
||||||
|
|
||||||
|
src = fetchPypi { |
||||||
|
pname = "Jug"; |
||||||
|
inherit version; |
||||||
|
hash = "sha256-2Y9xRr5DyV9UqG6tiq9rYET2Z7LaPXfzwYKKGwR3OSs="; |
||||||
|
}; |
||||||
|
|
||||||
propagatedBuildInputs = [ |
propagatedBuildInputs = [ |
||||||
bottle |
bottle |
||||||
|
]; |
||||||
|
|
||||||
|
checkInputs = [ |
||||||
|
numpy |
||||||
|
pytestCheckHook |
||||||
pyyaml |
pyyaml |
||||||
redis |
redis |
||||||
six |
|
||||||
|
|
||||||
zlib |
|
||||||
]; |
]; |
||||||
|
|
||||||
src = fetchPypi { |
pythonImportsCheck = [ |
||||||
inherit pname version; |
"jug" |
||||||
sha256 = "8ae7bb45d4495cf3d0dc5dd9df104a35bba2ca83eb4576732cadf8469e7cf1a1"; |
]; |
||||||
}; |
|
||||||
|
|
||||||
checkInputs = [ pytestCheckHook ]; |
|
||||||
pythonImportsCheck = [ "jug" ]; |
|
||||||
|
|
||||||
meta = with lib; { |
meta = with lib; { |
||||||
description = "A Task-Based Parallelization Framework"; |
description = "A Task-Based Parallelization Framework"; |
||||||
license = licenses.mit; |
|
||||||
homepage = "https://jug.readthedocs.io/"; |
homepage = "https://jug.readthedocs.io/"; |
||||||
|
license = licenses.mit; |
||||||
maintainers = with maintainers; [ luispedro ]; |
maintainers = with maintainers; [ luispedro ]; |
||||||
}; |
}; |
||||||
} |
} |
||||||
|
@ -1,33 +1,54 @@ |
|||||||
{ lib |
{ lib |
||||||
, buildPythonPackage |
, buildPythonPackage |
||||||
, fetchPypi |
, fetchPypi |
||||||
, pytest |
, fetchpatch |
||||||
|
, pytestCheckHook |
||||||
|
, pythonOlder |
||||||
}: |
}: |
||||||
|
|
||||||
buildPythonPackage rec { |
buildPythonPackage rec { |
||||||
pname = "namedlist"; |
pname = "namedlist"; |
||||||
version = "1.8"; |
version = "1.8"; |
||||||
|
format = "setuptools"; |
||||||
|
|
||||||
|
disabled = pythonOlder "3.7"; |
||||||
|
|
||||||
src = fetchPypi { |
src = fetchPypi { |
||||||
inherit pname version; |
inherit pname version; |
||||||
sha256 = "34f89fc992592c80b39a709e136edcf41ea17f24ba31eaf84a314a02c8b9bcef"; |
hash = "sha256-NPifyZJZLICzmnCeE27c9B6hfyS6Mer4SjFKAsi5vO8="; |
||||||
}; |
}; |
||||||
|
|
||||||
|
checkInputs = [ |
||||||
|
pytestCheckHook |
||||||
|
]; |
||||||
|
|
||||||
|
patches = [ |
||||||
|
# Deprecation warning using collections.abc, https://gitlab.com/ericvsmith/namedlist/-/merge_requests/1 |
||||||
|
(fetchpatch { |
||||||
|
url = "https://gitlab.com/ericvsmith/namedlist/-/commit/102d15b455e6f058b9c95fe135167be82b34c14a.patch"; |
||||||
|
sha256 = "sha256-IfDgiObFFSOUnAlXR/+ye8uutGaFJ/AyQvCb76iNaMM="; |
||||||
|
}) |
||||||
|
]; |
||||||
|
|
||||||
# Test file has a `unittest.main()` at the bottom that fails the tests; |
# Test file has a `unittest.main()` at the bottom that fails the tests; |
||||||
# py.test can run the tests without it. |
# py.test can run the tests without it. |
||||||
postPatch = '' |
postPatch = '' |
||||||
substituteInPlace test/test_namedlist.py --replace "unittest.main()" "" |
substituteInPlace test/test_namedlist.py --replace "unittest.main()" "" |
||||||
''; |
''; |
||||||
|
|
||||||
checkInputs = [ pytest ]; |
pythonImportsCheck = [ |
||||||
checkPhase = '' |
"namedlist" |
||||||
py.test |
]; |
||||||
''; |
|
||||||
|
disabledTests = [ |
||||||
|
# AttributeError: module 'collections' has no attribute 'Container' |
||||||
|
"test_ABC" |
||||||
|
]; |
||||||
|
|
||||||
meta = { |
meta = with lib; { |
||||||
description = "Similar to namedtuple, but instances are mutable"; |
description = "Similar to namedtuple, but instances are mutable"; |
||||||
homepage = "https://gitlab.com/ericvsmith/namedlist"; |
homepage = "https://gitlab.com/ericvsmith/namedlist"; |
||||||
license = lib.licenses.asl20; |
license = licenses.asl20; |
||||||
maintainers = with lib.maintainers; [ ivan ]; |
maintainers = with maintainers; [ ivan ]; |
||||||
}; |
}; |
||||||
} |
} |
||||||
|
@ -1,48 +1,60 @@ |
|||||||
{ lib |
{ lib |
||||||
, buildPythonPackage |
, buildPythonPackage |
||||||
, fetchFromGitHub |
, fetchFromGitHub |
||||||
, isPy27 |
, parameterized |
||||||
, pyutilib |
|
||||||
, appdirs |
|
||||||
, ply |
, ply |
||||||
, six |
, pytestCheckHook |
||||||
, nose |
, pythonOlder |
||||||
, glpk |
|
||||||
}: |
}: |
||||||
|
|
||||||
buildPythonPackage rec { |
buildPythonPackage rec { |
||||||
pname = "pyomo"; |
pname = "pyomo"; |
||||||
version = "6.3.0"; |
version = "6.4.0"; |
||||||
disabled = isPy27; # unable to import pyutilib.th |
format = "setuptools"; |
||||||
|
|
||||||
|
disabled = pythonOlder "3.7"; |
||||||
|
|
||||||
src = fetchFromGitHub { |
src = fetchFromGitHub { |
||||||
repo = "pyomo"; |
repo = "pyomo"; |
||||||
owner = "pyomo"; |
owner = "pyomo"; |
||||||
rev = version; |
rev = version; |
||||||
sha256 = "sha256-xyjiB5fDRf5y9Av5Cr+8wtU4pHzMHsM45mcmJEOaTWs="; |
hash = "sha256-FdUhne5Dn5hTIXMce1G6Zu6nx+AuP/JdK0a5fCE3hg8="; |
||||||
}; |
}; |
||||||
|
|
||||||
checkInputs = [ nose glpk ]; |
|
||||||
propagatedBuildInputs = [ |
propagatedBuildInputs = [ |
||||||
pyutilib |
|
||||||
appdirs |
|
||||||
ply |
ply |
||||||
six |
|
||||||
]; |
]; |
||||||
|
|
||||||
checkPhase = '' |
checkInputs = [ |
||||||
rm pyomo/bilevel/tests/test_blp.py \ |
parameterized |
||||||
pyomo/version/tests/test_installer.py \ |
pytestCheckHook |
||||||
pyomo/common/tests/test_download.py \ |
]; |
||||||
pyomo/core/tests/examples/test_pyomo.py |
|
||||||
export HOME=$TMPDIR |
pythonImportsCheck = [ |
||||||
nosetests |
"pyomo" |
||||||
|
]; |
||||||
|
|
||||||
|
preCheck = '' |
||||||
|
export HOME=$(mktemp -d); |
||||||
''; |
''; |
||||||
|
|
||||||
|
disabledTestPaths = [ |
||||||
|
# Don't test the documentation and the examples |
||||||
|
"doc/" |
||||||
|
"examples/" |
||||||
|
# Tests don't work properly in the sandbox |
||||||
|
"pyomo/environ/tests/test_environ.py" |
||||||
|
]; |
||||||
|
|
||||||
|
disabledTests = [ |
||||||
|
# Test requires lsb_release |
||||||
|
"test_get_os_version" |
||||||
|
]; |
||||||
|
|
||||||
meta = with lib; { |
meta = with lib; { |
||||||
description = "Pyomo: Python Optimization Modeling Objects"; |
description = "Python Optimization Modeling Objects"; |
||||||
homepage = "http://pyomo.org"; |
homepage = "http://pyomo.org"; |
||||||
license = licenses.bsd3; |
license = licenses.bsd3; |
||||||
maintainers = [ maintainers.costrouc ]; |
maintainers = with maintainers; [ costrouc ]; |
||||||
}; |
}; |
||||||
} |
} |
||||||
|
Loading…
Reference in new issue