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

Commits on Mar 2, 2019

  1. Revert "python: boto3: 1.9.96 -> 1.9.101" 

    This reverts commit 35f4087.

Forgot to remove this from my list of upgrades.

(cherry picked from commit cf1d44a)
    @FRidh
    FRidh committed Mar 2, 2019

    Verified

    This commit was signed with the committer’s verified signature.
    prusnak Pavol Rusnak
    GPG key ID: 91F3B339B9A02A3D
    Verified
    Learn about vigilant mode
    Copy the full SHA
    8c9e42e View commit details

  2. Revert "python: botocore: 1.12.96 -> 1.12.101" 

    This reverts commit f328c30.

Forgot to remove this from my list of updates.

(cherry picked from commit e81595e)
    @FRidh
    FRidh committed Mar 2, 2019
    Copy the full SHA
    51f048c View commit details
Showing with 4 additions and 4 deletions.
  1. +2 −2 pkgs/development/python-modules/boto3/default.nix
  2. +2 −2 pkgs/development/python-modules/botocore/default.nix
4 changes: 2 additions & 2 deletions pkgs/development/python-modules/boto3/default.nix
View file
Original file line number Diff line number Diff line change
@@ -13,11 +13,11 @@

buildPythonPackage rec {
pname = "boto3";
version = "1.9.101"; # N.B: if you change this, change botocore too
version = "1.9.96"; # N.B: if you change this, change botocore too

src = fetchPypi {
inherit pname version;
sha256 = "bc25b83405cede6025fd7de0240fa8ade910f445da46f267c1dd13409d19ad64";
sha256 = "c103241394d396ee08548b03d5d1f0f89a7ad1dfa7ccca88a47131f329cca093";
};

propagatedBuildInputs = [ botocore jmespath s3transfer ] ++ lib.optionals (!isPy3k) [ futures ];
4 changes: 2 additions & 2 deletions pkgs/development/python-modules/botocore/default.nix
View file
Original file line number Diff line number Diff line change
@@ -12,11 +12,11 @@

buildPythonPackage rec {
pname = "botocore";
version = "1.12.101"; # N.B: if you change this, change boto3 and awscli to a matching version
version = "1.12.96"; # N.B: if you change this, change boto3 and awscli to a matching version

src = fetchPypi {
inherit pname version;
sha256 = "46e4daaa7c8cb29237802b63699c16a116f96f301ad2fcfef800574333b58b98";
sha256 = "55c1594041e6716847d5a8b38181e3cc44e245edbf4598ae2b99e3040073b2cf";
};

propagatedBuildInputs = [