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: d69e98a425d4
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: b8e8c7d5b95b
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Oct 28, 2020

  1. aws-google-auth: 0.0.34 -> 0.0.36

    @benley
    benley committed Oct 28, 2020
    Copy the full SHA
    7502d0e View commit details

Commits on Oct 29, 2020

  1. Merge pull request #101962 from benley/aws-google-auth 

    aws-google-auth: 0.0.34 -> 0.0.36
    @marsam
    marsam authored Oct 29, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    b8e8c7d View commit details
Showing with 8 additions and 6 deletions.
  1. +8 −6 pkgs/tools/admin/aws-google-auth/default.nix
14 changes: 8 additions & 6 deletions pkgs/tools/admin/aws-google-auth/default.nix
View file
Original file line number Diff line number Diff line change
@@ -4,6 +4,7 @@
, beautifulsoup4
, boto3
, configparser
, filelock
, keyring
, keyrings-alt
, lxml
@@ -19,21 +20,22 @@

buildPythonApplication rec {
pname = "aws-google-auth";
version = "0.0.34";
version = "0.0.36";

# Pypi doesn't ship the tests, so we fetch directly from GitHub
# https://github.com/cevoaustralia/aws-google-auth/issues/120
src = fetchFromGitHub {
owner = "cevoaustralia";
repo = "aws-google-auth";
rev = version;
sha256 = "12c5ssdy870szrizhs4d7dzcpq3hvszjvl8ba60qf1ak5jsr1ay4";
sha256 = "099r020v33sij2b3816cjp4fpy35c886l559szfxqx6kgy19y9z7";
};

propagatedBuildInputs = [
propagatedBuildInputs = [
beautifulsoup4
boto3
configparser
filelock
keyring
keyrings-alt
lxml
@@ -43,10 +45,10 @@ buildPythonApplication rec {
tabulate
tzlocal
] ++ lib.optional withU2F python-u2flib-host;
checkInputs = [

checkInputs = [
mock
nose
nose
];

preCheck = ''