Skip to content
This repository was archived by the owner on Apr 12, 2021. It is now read-only.
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-channels
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: bede9851a1c6
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 32c1c5cbe0df
Choose a head ref
  • 5 commits
  • 6 files changed
  • 3 contributors

Commits on Jul 24, 2019

  1. pythonPackages.sshpubkeys: init at 3.1.0

    @FRidh
    Jonathan Ringer authored and FRidh committed Jul 24, 2019

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    Ma27 Maximilian Bosch
    GPG key ID: 091DBF4D1FC46B8E
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    03d3ed3 View commit details

  2. pythonPackages.moto: 1.3.8 -> 1.3.10

    @FRidh
    Jonathan Ringer authored and FRidh committed Jul 24, 2019

    Verified

    This commit was signed with the committer’s verified signature.
    dywedir Vlad M.
    GPG key ID: 3B1AD98E3D65BD4D
    Verified
    Learn about vigilant mode
    Copy the full SHA
    d12733f View commit details

  3. python37Packages.zc_buildout: 2.13.1 -> 2.13.2 

    Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/python3.7-zc.buildout/versions
    @r-ryantm @FRidh
    r-ryantm authored and FRidh committed Jul 24, 2019
    Copy the full SHA
    5401315 View commit details

  4. python37Packages.pycountry: 18.12.8 -> 19.7.15 

    Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/python3.7-pycountry/versions
    @r-ryantm @FRidh
    r-ryantm authored and FRidh committed Jul 24, 2019

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    dtzWill Will Dietz
    GPG key ID: EBB0EA4124809D02
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    89a4e8d View commit details

  5. clojure: 1.10.1.462 -> 1.10.1.466

    @jlesquembre @FRidh
    jlesquembre authored and FRidh committed Jul 24, 2019

    Verified

    This commit was signed with the committer’s verified signature.
    costrouc Christopher Ostrouchov
    GPG key ID: 9ED59B0AB1EAF573
    Verified
    Learn about vigilant mode
    Copy the full SHA
    32c1c5c View commit details
4 changes: 2 additions & 2 deletions pkgs/development/interpreters/clojure/default.nix
View file
Original file line number Diff line number Diff line change
@@ -2,11 +2,11 @@

stdenv.mkDerivation rec {
pname = "clojure";
version = "1.10.1.462";
version = "1.10.1.466";

src = fetchurl {
url = "https://download.clojure.org/install/clojure-tools-${version}.tar.gz";
sha256 = "0mi7fzqvkg2ihigxkkamc742m1iba0yzy8ivciavzmpcnw128sc6";
sha256 = "1rh4isdac7l8k8p45cqim8lfccjzxw7z173xqnpgk3z307jj4n90";
};

buildInputs = [ makeWrapper ];
4 changes: 2 additions & 2 deletions pkgs/development/python-modules/buildout/default.nix
View file
Original file line number Diff line number Diff line change
@@ -2,11 +2,11 @@

buildPythonPackage rec {
pname = "zc.buildout";
version = "2.13.1";
version = "2.13.2";

src = fetchPypi {
inherit pname version;
sha256 = "3d14d07226963a517295dfad5879d2799e2e3b65b2c61c71b53cb80f5ab11484";
sha256 = "0a73s5q548l2vs2acqs3blkzd9sw6d7ci77fz1pc9156vn3dxm2x";
};

meta = with stdenv.lib; {
82 changes: 53 additions & 29 deletions pkgs/development/python-modules/moto/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,54 +1,78 @@
{ buildPythonPackage, fetchPypi, jinja2, werkzeug, flask, cfn-lint
, requests, pytz, backports_tempfile, cookies, jsondiff, botocore, aws-xray-sdk, docker, responses
, six, boto, httpretty, xmltodict, nose, sure, boto3, freezegun, dateutil, mock, pyaml, python-jose }:
{ lib, buildPythonPackage, fetchPypi, isPy27
, aws-xray-sdk
, backports_tempfile
, boto
, boto3
, botocore
, cfn-lint
, docker
, flask
, freezegun
, jinja2
, jsondiff
, mock
, nose
, pyaml
, python-jose
, pytz
, requests
, responses
, six
, sshpubkeys
, sure
, werkzeug
, xmltodict
}:

buildPythonPackage rec {
pname = "moto";
version = "1.3.8";
version = "1.3.10";

src = fetchPypi {
inherit pname version;
sha256 = "9cb02134148fbe3ed81f11d6ab9bd71bbd6bc2db7e59a45de77fb1d0fedb744e";
sha256 = "0vlq015irqqwdknk1an7qqkg1zjk18c7jd89r7zbxxfwy3bgzwwj";
};

postPatch = ''
# regarding aws-xray-sdk: https://github.com/spulec/moto/commit/31eac49e1555c5345021a252cb0c95043197ea16
# regarding python-jose: https://github.com/spulec/moto/pull/1927
substituteInPlace setup.py \
--replace "aws-xray-sdk<0.96," "aws-xray-sdk" \
--replace "jsondiff==1.1.1" "jsondiff>=1.1.1" \
--replace "python-jose<3.0.0" "python-jose<4.0.0"
--replace "jsondiff==1.1.2" "jsondiff~=1.1"
sed -i '/datetime/d' setup.py # should be taken care of by std library
'';

propagatedBuildInputs = [
aws-xray-sdk
boto
boto3
botocore
cfn-lint
dateutil
flask
httpretty
docker
flask # required for server
jinja2
pytz
werkzeug
requests
six
xmltodict
jsondiff
mock
pyaml
backports_tempfile
cookies
jsondiff
botocore
docker
responses
python-jose
];
pytz
six
requests
responses
sshpubkeys
werkzeug
xmltodict
] ++ lib.optionals isPy27 [ backports_tempfile ];

checkInputs = [ boto3 nose sure freezegun ];
checkInputs = [ boto3 freezegun nose sure ];

checkPhase = "nosetests";
checkPhase = ''nosetests -v ./tests/ \
-e test_invoke_function_from_sns \
-e test_invoke_requestresponse_function \
-e test_context_manager \
-e test_decorator_start_and_stop'';

# TODO: make this true; I think lots of the tests want network access but we can probably run the others
doCheck = false;
meta = with lib; {
description = "This project extends the Application Insights API surface to support Python";
homepage = https://github.com/spulec/moto;
license = licenses.asl20;
maintainers = [ ];
};
}
4 changes: 2 additions & 2 deletions pkgs/development/python-modules/pycountry/default.nix
View file
Original file line number Diff line number Diff line change
@@ -6,11 +6,11 @@

buildPythonPackage rec {
pname = "pycountry";
version = "18.12.8";
version = "19.7.15";

src = fetchPypi {
inherit pname version;
sha256 = "1phn1av57jbm166facjk6r8gw4pf886q4wymjc443k8m5c5h5i4f";
sha256 = "15lhv18za0zv36laksr86rszjhp0slmqzcylm6ds9vpd7gyqprb8";
};

meta = with stdenv.lib; {
25 changes: 25 additions & 0 deletions pkgs/development/python-modules/sshpubkeys/default.nix
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
{ lib, buildPythonPackage, fetchFromGitHub
, cryptography
, ecdsa
}:

buildPythonPackage rec {
version = "3.1.0";
pname = "sshpubkeys";

src = fetchFromGitHub {
owner = "ojarva";
repo = "python-${pname}";
rev = "v${version}";
sha256 = "1h4gwmcfn84kkqh83km1vfz8sc5kr2g4gzgzmr8gz704jmqiv7nq";
};

propagatedBuildInputs = [ cryptography ecdsa ];

meta = with lib; {
description = "OpenSSH Public Key Parser for Python";
homepage = https://github.com/ojarva/python-sshpubkeys;
license = licenses.bsd3;
maintainers = [ ];
};
}
2 changes: 2 additions & 0 deletions pkgs/top-level/python-packages.nix
View file
Original file line number Diff line number Diff line change
@@ -1121,6 +1121,8 @@ in {

spglib = callPackage ../development/python-modules/spglib { };

sshpubkeys = callPackage ../development/python-modules/sshpubkeys { };

sslib = callPackage ../development/python-modules/sslib { };

statistics = callPackage ../development/python-modules/statistics { };