Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: f172a19e7981
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 0d0a4f160e33
Choose a head ref
  • 15 commits
  • 15 files changed
  • 2 contributors

Commits on Jan 3, 2020

  1. Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    alyssais Alyssa Ross
    Copy the full SHA
    61ed97d View commit details
  2. Copy the full SHA
    78d619c View commit details
  3. Copy the full SHA
    ea7fa57 View commit details
  4. Copy the full SHA
    0634484 View commit details
  5. Copy the full SHA
    3af635e View commit details
  6. Copy the full SHA
    46a3045 View commit details
  7. Copy the full SHA
    8b2b1d1 View commit details
  8. Copy the full SHA
    4f8eba1 View commit details
  9. Copy the full SHA
    8f08c1b View commit details
  10. Copy the full SHA
    b4f81b9 View commit details
  11. Copy the full SHA
    58717e6 View commit details
  12. Copy the full SHA
    37148a8 View commit details
  13. Copy the full SHA
    1da8594 View commit details
  14. Copy the full SHA
    ff892ee View commit details

Commits on Jan 5, 2020

  1. Merge pull request #76631 from kamadorueda/pythonPackages

    Add many new pythonPackages
    FRidh authored Jan 5, 2020
    Copy the full SHA
    0d0a4f1 View commit details
10 changes: 10 additions & 0 deletions maintainers/maintainer-list.nix
Original file line number Diff line number Diff line change
@@ -3560,6 +3560,16 @@
githubId = 87115;
name = "Wael Nasreddine";
};
kamadorueda = {
name = "Kevin Amado";
email = "kamadorueda@gmail.com";
github = "kamadorueda";
githubId = 47480384;
keys = [{
longkeyid = "rsa4096/0x04D0CEAF916A9A40";
fingerprint = "2BE3 BAFD 793E A349 ED1F F00F 04D0 CEAF 916A 9A40";
}];
};
kamilchm = {
email = "kamil.chm@gmail.com";
github = "kamilchm";
53 changes: 53 additions & 0 deletions pkgs/development/python-modules/azure-identity/default.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
{ buildPythonPackage
, fetchPypi
, isPy38
, lib

# pythonPackages
, azure-common
, azure-core
, azure-nspkg
, cryptography
, mock
, msal
, msal-extensions
, msrest
, msrestazure
}:

buildPythonPackage rec {
pname = "azure-identity";
version = "1.1.0";
disabled = isPy38;

src = fetchPypi {
inherit pname version;
extension = "zip";
sha256 = "1xn4nwi4vly8n3mmphv0wbdg9k55gsgmk3fdwma8rm3m3c7593hc";
};

propagatedBuildInputs = [
azure-common
azure-core
azure-nspkg
cryptography
mock
msal
msal-extensions
msrest
msrestazure
];

# Requires checkout from mono-repo and a mock account:
# https://github.com/Azure/azure-sdk-for-python/blob/master/sdk/identity/tests.yml
doCheck = false;

meta = with lib; {
description = "Microsoft Azure Identity Library for Python";
homepage = "https://github.com/Azure/azure-sdk-for-python";
license = licenses.mit;
maintainers = with maintainers; [
kamadorueda
];
};
}
35 changes: 35 additions & 0 deletions pkgs/development/python-modules/azure-keyvault-nspkg/default.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
{ buildPythonPackage
, fetchPypi
, lib

# pythonPackages
, azure-nspkg
}:

buildPythonPackage rec {
pname = "azure-keyvault-nspkg";
version = "1.0.0";

src = fetchPypi {
inherit pname version;
extension = "zip";
sha256 = "0hdnd6124hx7s16z1pssmq5m5mqqqz8s38ixl9aayv4wmf5bhs5c";
};

propagatedBuildInputs = [
azure-nspkg
];

# Just a namespace package, no tests exist:
# https://github.com/Azure/azure-sdk-for-python/blob/master/sdk/keyvault/tests.yml
doCheck = false;

meta = with lib; {
description = "Microsoft Azure Key Vault Namespace Package [Internal]";
homepage = "https://github.com/Azure/azure-sdk-for-python";
license = licenses.mit;
maintainers = with maintainers; [
kamadorueda
];
};
}
44 changes: 44 additions & 0 deletions pkgs/development/python-modules/bandit/default.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
{ buildPythonPackage
, fetchPypi
, lib
, isPy3k

# pythonPackages
, GitPython
, pbr
, pyyaml
, six
, stevedore
}:

buildPythonPackage rec {
pname = "bandit";
version = "1.6.2";
disabled = !isPy3k;

src = fetchPypi {
inherit pname version;
sha256 = "0rb034c99pyhb4a60z7f2kz40cjydhm8m9v2blaal1rmhlam7rs1";
};

propagatedBuildInputs = [
GitPython
pbr
pyyaml
six
stevedore
];

# Framework is Tox, tox performs 'pip install' inside the virtual-env
# and this requires Network Connectivity
doCheck = false;

meta = {
description = "Security oriented static analyser for python code";
homepage = "https://bandit.readthedocs.io/en/latest/";
license = lib.licenses.asl20;
maintainers = with lib.maintainers; [
kamadorueda
];
};
}
26 changes: 26 additions & 0 deletions pkgs/development/python-modules/javaobj-py3/default.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
{ buildPythonPackage
, fetchPypi
, lib
}:

buildPythonPackage rec {
pname = "javaobj-py3";
version = "0.3.0";

src = fetchPypi {
inherit pname version;
sha256 = "0j9532i7bnjd0v4a8c36mjj9rsdnbmckk65dh9sbmvnhy3j6jx55";
};

# Tests assume network connectivity
doCheck = false;

meta = {
description = "Module for serializing and de-serializing Java objects";
homepage = "https://github.com/tcalmant/python-javaobj";
license = lib.licenses.asl20;
maintainers = with lib.maintainers; [
kamadorueda
];
};
}
35 changes: 35 additions & 0 deletions pkgs/development/python-modules/msal-extensions/default.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
{ buildPythonPackage
, fetchPypi
, lib

# pythonPackages
, msal
, portalocker
}:

buildPythonPackage rec {
pname = "msal-extensions";
version = "0.1.3";

src = fetchPypi {
inherit pname version;
sha256 = "1p05cbfksnhijx1il7s24js2ydzgxbpiasf607qdpb5sljlp3qar";
};

propagatedBuildInputs = [
msal
portalocker
];

# No tests found
doCheck = false;

meta = with lib; {
description = "The Microsoft Authentication Library Extensions (MSAL-Extensions) for Python";
homepage = "https://github.com/AzureAD/microsoft-authentication-library-for-python";
license = licenses.mit;
maintainers = with maintainers; [
kamadorueda
];
};
}
36 changes: 36 additions & 0 deletions pkgs/development/python-modules/msal/default.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
{ buildPythonPackage
, fetchPypi
, lib

# pythonPackages
, pyjwt
, requests
}:

buildPythonPackage rec {
pname = "msal";
version = "1.0.0";

src = fetchPypi {
inherit pname version;
sha256 = "0h33wayvakggr684spdyhiqvrwraavcbk3phmcbavb3zqxd3zgpc";
};

propagatedBuildInputs = [
pyjwt
requests
];

# Tests assume Network Connectivity:
# https://github.com/AzureAD/microsoft-authentication-library-for-python/blob/e2958961e8ec16d0af4199f60c36c3f913497e48/tests/test_authority.py#L73
doCheck = false;

meta = with lib; {
description = "The Microsoft Authentication Library (MSAL) for Python library enables your app to access the Microsoft Cloud by supporting authentication of users with Microsoft Azure Active Directory accounts (AAD) and Microsoft Accounts (MSA) using industry standard OAuth2 and OpenID Connect";
homepage = "https://github.com/AzureAD/microsoft-authentication-library-for-python";
license = licenses.mit;
maintainers = with maintainers; [
kamadorueda
];
};
}
36 changes: 36 additions & 0 deletions pkgs/development/python-modules/names/default.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
{ buildPythonPackage
, fetchFromGitHub
, lib

# pythonPackages
, pytest
}:

buildPythonPackage rec {
pname = "names";
version = "0.3.0";

src = fetchFromGitHub {
owner = "treyhunner";
repo = pname;
rev = version;
sha256 = "0jfn11bl05k3qkqw0f4vi2i2lhllxdrbb1732qiisdy9fbvv8611";
};

checkInputs = [
pytest
];

checkPhase = ''
pytest
'';

meta = {
description = "Generate random names";
homepage = "https://github.com/treyhunner/names";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [
kamadorueda
];
};
}
41 changes: 41 additions & 0 deletions pkgs/development/python-modules/oyaml/default.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
{ buildPythonPackage
, fetchFromGitHub
, lib

# pythonPackages
, pytest
, pyyaml
}:

buildPythonPackage rec {
pname = "oyaml";
version = "0.9";

src = fetchFromGitHub {
owner = "wimglenn";
repo = "oyaml";
rev = "v${version}";
sha256 = "13xjdym0p0jh9bvyjsbhi4yznlp68bamy3xi4w5wpcrzlcq6cfh9";
};

propagatedBuildInputs = [
pyyaml
];

checkInputs = [
pytest
];

checkPhase = ''
pytest test_oyaml.py
'';

meta = {
description = "Ordered YAML: drop-in replacement for PyYAML which preserves dict ordering";
homepage = "https://github.com/wimglenn/oyaml";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [
kamadorueda
];
};
}
37 changes: 37 additions & 0 deletions pkgs/development/python-modules/pyjks/default.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
{ buildPythonPackage
, fetchPypi
, lib

# pythonPackages
, pyasn1-modules
, pycryptodomex
, twofish
}:

buildPythonPackage rec {
pname = "pyjks";
version = "19.0.0";

src = fetchPypi {
inherit pname version;
sha256 = "06h1cybsdj2wi0jf7igbr722xfm87crqn4g7m3bgrpxwi41b9rcw";
};

propagatedBuildInputs = [
pyasn1-modules
pycryptodomex
twofish
];

# Tests assume network connectivity
doCheck = false;

meta = {
description = "Pure-Python Java Keystore (JKS) library";
homepage = "https://github.com/kurtbrose/pyjks";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [
kamadorueda
];
};
}
Loading