github-actions[bot]
2 years ago
committed by
GitHub
commit
6bab56cd98
@ -1,37 +1,64 @@ |
||||
{ lib, buildPythonPackage, fetchPypi |
||||
, requests, cryptography, pybrowserid, hawkauthlib, six |
||||
, grequests, mock, responses, pytest, pyjwt }: |
||||
{ lib |
||||
, buildPythonPackage |
||||
, cryptography |
||||
, fetchPypi |
||||
, grequests |
||||
, hawkauthlib |
||||
, mock |
||||
, pybrowserid |
||||
, pyjwt |
||||
, pytestCheckHook |
||||
, pythonOlder |
||||
, requests |
||||
, responses |
||||
, setuptools |
||||
, six |
||||
}: |
||||
|
||||
buildPythonPackage rec { |
||||
pname = "PyFxA"; |
||||
pname = "pyfxa"; |
||||
version = "0.7.7"; |
||||
format = "setuptools"; |
||||
|
||||
disabled = pythonOlder "3.7"; |
||||
|
||||
src = fetchPypi { |
||||
inherit pname version; |
||||
sha256 = "6c85cd08cf05f7138dee1cf2a8a1d68fd428b7b5ad488917c70a2a763d651cdb"; |
||||
pname = "PyFxA"; |
||||
inherit version; |
||||
hash = "sha256-bIXNCM8F9xON7hzyqKHWj9Qot7WtSIkXxwoqdj1lHNs="; |
||||
}; |
||||
|
||||
postPatch = '' |
||||
# Requires network access |
||||
rm fxa/tests/test_core.py |
||||
''; |
||||
|
||||
propagatedBuildInputs = [ |
||||
pyjwt requests cryptography pybrowserid hawkauthlib six |
||||
cryptography |
||||
hawkauthlib |
||||
pybrowserid |
||||
pyjwt |
||||
requests |
||||
setuptools # imports pkg_resources |
||||
six |
||||
]; |
||||
|
||||
checkInputs = [ |
||||
grequests mock responses pytest |
||||
grequests |
||||
mock |
||||
responses |
||||
pytestCheckHook |
||||
]; |
||||
|
||||
# test_oath is mostly network calls |
||||
checkPhase = '' |
||||
pytest --ignore=fxa/tests/test_oauth.py |
||||
''; |
||||
pythonImportsCheck = [ |
||||
"fxa" |
||||
]; |
||||
|
||||
disabledTestPaths = [ |
||||
# Requires network access |
||||
"fxa/tests/test_core.py" |
||||
"fxa/tests/test_oauth.py" |
||||
]; |
||||
|
||||
meta = with lib; { |
||||
description = "Firefox Accounts client library for Python"; |
||||
description = "Firefox Accounts client library"; |
||||
homepage = "https://github.com/mozilla/PyFxA"; |
||||
license = licenses.mpl20; |
||||
maintainers = with maintainers; [ ]; |
||||
}; |
||||
} |
||||
|
||||
@ -1,37 +0,0 @@ |
||||
{ lib, buildGoModule, fetchFromGitHub }: |
||||
|
||||
buildGoModule rec { |
||||
pname = "vend"; |
||||
|
||||
/* |
||||
This package is used to generate vendor folders for |
||||
packages that use the `runVend` option with `buildGoModule`. |
||||
|
||||
Do not update this package without checking that the vendorSha256 |
||||
hashes of packages using the `runVend` option are unchanged |
||||
or updating their vendorSha256 hashes if necessary. |
||||
*/ |
||||
version = "1.0.2"; |
||||
# Disable the bot |
||||
# nixpkgs-update: no auto update |
||||
|
||||
# Disable `mod tidy`, patch was refused upstream |
||||
# https://github.com/nomad-software/vend/pull/9 |
||||
patches = [ ./remove_tidy.patch ]; |
||||
|
||||
src = fetchFromGitHub { |
||||
owner = "nomad-software"; |
||||
repo = "vend"; |
||||
rev = "v${version}"; |
||||
sha256 = "0h9rwwb56nzs46xsvl92af71i8b3wz3pf9ngi8v0i2bpk7p3p89d"; |
||||
}; |
||||
|
||||
vendorSha256 = null; |
||||
|
||||
meta = with lib; { |
||||
homepage = "https://github.com/nomad-software/vend"; |
||||
description = "A utility which vendors go code including c dependencies"; |
||||
maintainers = with maintainers; [ c00w mic92 zowoq ]; |
||||
license = licenses.mit; |
||||
}; |
||||
} |
||||
@ -1,13 +0,0 @@ |
||||
diff --git a/cli/cmd.go b/cli/cmd.go
|
||||
index c766559..3a133fd 100644
|
||||
--- a/cli/cmd.go
|
||||
+++ b/cli/cmd.go
|
||||
@@ -12,7 +12,7 @@ import (
|
||||
// UpdateModule makes sure the module is updated ready to vendor the
|
||||
// dependencies.
|
||||
func UpdateModule() {
|
||||
- var commands = []string{"tidy", "download", "vendor"}
|
||||
+ var commands = []string{"download", "vendor"}
|
||||
|
||||
for _, command := range commands {
|
||||
cmd := exec.Command("go", "mod", command)
|
||||
Loading…
Reference in new issue