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: 418ad571c3ec
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 7f2e8f636704
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Dec 13, 2019

  1. pythonPackages.aws-adfs: 1.19.1 -> 1.20.0; fix build

    cko authored and Jon committed Dec 13, 2019
    Copy the full SHA
    7f2e8f6 View commit details
Showing with 6 additions and 4 deletions.
  1. +6 −4 pkgs/development/python-modules/aws-adfs/default.nix
10 changes: 6 additions & 4 deletions pkgs/development/python-modules/aws-adfs/default.nix
Original file line number Diff line number Diff line change
@@ -1,13 +1,15 @@
{ lib, buildPythonPackage, fetchPypi
, pytest, pytestrunner, pytestcov, mock, glibcLocales, lxml, boto3, requests, click, configparser }:
, pytest, pytestrunner, pytestcov, mock, glibcLocales, lxml, boto3
, requests, click, configparser, fido2, isPy27 }:

buildPythonPackage rec {
pname = "aws-adfs";
version = "1.19.1";
version = "1.20.0";
disabled = isPy27;

src = fetchPypi {
inherit pname version;
sha256 = "20b2ad44d19aa494fa11cb2d1290359b3a7a0c6c8908179b4af0c9367d83e370";
sha256 = "1j18ffq5z8bcajavnlpbfhxrcadld5iv5gsfxg543yvdsp6hn2dg";
};

# Relax version constraint
@@ -22,7 +24,7 @@ buildPythonPackage rec {
LC_ALL = "en_US.UTF-8";

checkInputs = [ glibcLocales pytest pytestrunner pytestcov mock ];
propagatedBuildInputs = [ lxml boto3 requests click configparser ];
propagatedBuildInputs = [ lxml boto3 requests click configparser fido2 ];

meta = with lib; {
description = "Command line tool to ease aws cli authentication against ADFS";