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

Commits on Aug 30, 2018

  1. pythonPackages.boto3: 1.7.84 -> 1.8.4

    @FRidh
    FRidh committed Aug 30, 2018
    Copy the full SHA
    06b3789 View commit details

  2. awscli: 1.16.1 -> 1.16.4

    @FRidh
    FRidh committed Aug 30, 2018
    Copy the full SHA
    4880df9 View commit details

  3. pythonPackages.cement: disable Python 2

    @FRidh
    FRidh committed Aug 30, 2018

    Verified

    This commit was signed with the committer’s verified signature.
    vcunat Vladimír Čunát
    GPG key ID: E747DF1F9575A3AA
    Verified
    Learn about vigilant mode
    Copy the full SHA
    36a4df6 View commit details

  4. Revert "python: shippai: 0.2.3 -> 0.3.1" 

    This broke vdirsyncer.

This reverts commit 0bca28c.
    @FRidh
    FRidh committed Aug 30, 2018
    Copy the full SHA
    f26e5b5 View commit details
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,13 +13,13 @@

buildPythonPackage rec {
pname = "boto3";
version = "1.7.84";
version = "1.8.4";

src = fetchFromGitHub {
owner = "boto";
repo = "boto3";
rev = version;
sha256 = "0d9kqjqmnn53p1xpmdbbjxcxv2482yx3vjhxw8izp0mpq58i5c14";
sha256 = "1ja71r7xsijfy0qqqqxanhhg5fk4ad0mgvxyjg7ag0z3z04s1169";
};

propagatedBuildInputs = [ botocore jmespath s3transfer ] ++ lib.optionals (!isPy3k) [ futures ];
4 changes: 3 additions & 1 deletion pkgs/development/python-modules/cement/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ stdenv, buildPythonPackage, fetchPypi }:
{ stdenv, buildPythonPackage, fetchPypi, isPy3k }:

buildPythonPackage rec {
pname = "cement";
@@ -13,6 +13,8 @@ buildPythonPackage rec {
# 127.0.0.1:11211.
doCheck = false;

disabled = !isPy3k;

meta = with stdenv.lib; {
homepage = http://builtoncement.com/;
description = "A CLI Application Framework for Python.";
4 changes: 2 additions & 2 deletions pkgs/development/python-modules/shippai/default.nix
View file
Original file line number Diff line number Diff line change
@@ -3,11 +3,11 @@
buildPythonPackage rec {
pname = "shippai";
# Please make sure that vdirsyncer still builds if you update this package.
version = "0.3.1";
version = "0.2.3";

src = fetchPypi {
inherit pname version;
sha256 = "9e8d1ca5a742a7ea175cebda3090497d42348517e8d2f05f9854d0f30f1a48ad";
sha256 = "1ppwywzg4d12h658682ssmingm6ls6a96p4ak26i2w9d4lf8pfsc";
};

meta = with stdenv.lib; {
14 changes: 7 additions & 7 deletions pkgs/tools/admin/awscli/default.nix
View file
Original file line number Diff line number Diff line change
@@ -19,11 +19,11 @@ let

in py.pkgs.buildPythonApplication rec {
pname = "awscli";
version = "1.16.1";
version = "1.16.4";

src = py.pkgs.fetchPypi {
inherit pname version;
sha256 = "5068efde694e24462646d271335fdef3dde8a0fbbfb986fab0ce7e5368a7df8d";
sha256 = "036cad15f7a551f3d1281b305deb04c6cf05aa3c23fa6d2bba7a0dc4eb5256de";
};

# No tests included
@@ -42,11 +42,11 @@ in py.pkgs.buildPythonApplication rec {
less
];

postPatch = ''
for i in {py,cfg}; do
substituteInPlace setup.$i --replace "botocore==1.10.10" "botocore>=1.10.9,<=1.11"
done
'';
# postPatch = ''
# for i in {py,cfg}; do
# substituteInPlace setup.$i --replace "botocore==1.10.10" "botocore>=1.10.9,<=1.11"
# done
# '';

postInstall = ''
mkdir -p $out/etc/bash_completion.d