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

Commits on Feb 10, 2021

  1. python3Packages.botocore: 1.20.4 -> 1.20.5

    @NeQuissimus
    NeQuissimus committed Feb 10, 2021
    Copy the full SHA
    f1ecf61 View commit details

  2. python3Packages.boto3: 1.17.4 -> 1.17.5

    @NeQuissimus
    NeQuissimus committed Feb 10, 2021
    Copy the full SHA
    aa66f4b View commit details

  3. awscli: 1.19.4 -> 1.19.5

    @NeQuissimus
    NeQuissimus committed Feb 10, 2021
    Copy the full SHA
    cf49e44 View commit details

  4. oh-my-zsh: 2021-01-31 → 2021-02-09

    @NeQuissimus
    NeQuissimus committed Feb 10, 2021
    Copy the full SHA
    f72648d 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,11 +13,11 @@

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

src = fetchPypi {
inherit pname version;
sha256 = "sha256-ZVFEJ/X4SSRcmicvoGpaAUrjlFMz9PQHSJ0DT7mdxh8=";
sha256 = "sha256-1qr7gE/KK2fGXdp4rYtK/tkB4AQHEgi4TIBNNFrZ67o=";
};

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.20.4"; # N.B: if you change this, change boto3 and awscli to a matching version
version = "1.20.5"; # N.B: if you change this, change boto3 and awscli to a matching version

src = fetchPypi {
inherit pname version;
sha256 = "sha256-YWV6Hks83alicIQYS9+dykY3wVI9rq0xo2l0vg1RaG0=";
sha256 = "sha256-BKHfdZaB9fFxrMs1TYY7/tB3TWSk6O41/0mDV1VmCk4=";
};

propagatedBuildInputs = [
6 changes: 3 additions & 3 deletions pkgs/shells/zsh/oh-my-zsh/default.nix
View file
Original file line number Diff line number Diff line change
@@ -5,15 +5,15 @@
, git, nix, nixfmt, jq, coreutils, gnused, curl, cacert }:

stdenv.mkDerivation rec {
version = "2021-01-31";
version = "2021-02-09";
pname = "oh-my-zsh";
rev = "c52e646bb7b109e15f6dc4047b29ca8c8e029433";
rev = "f21e646ce6c09198f7f625c597f08af49551fdb0";

src = fetchFromGitHub {
inherit rev;
owner = "ohmyzsh";
repo = "ohmyzsh";
sha256 = "0yfpahn9a6aby8ym1slcn8kvric26xy14fk1jjj3f07xvh7xg2y9";
sha256 = "14m932zbzdbwyfqkn882jarpw4dbmxkfna5pakd4n5b123drjz46";
};

installPhase = ''
4 changes: 2 additions & 2 deletions pkgs/tools/admin/awscli/default.nix
View file
Original file line number Diff line number Diff line change
@@ -28,11 +28,11 @@ let

in with py.pkgs; buildPythonApplication rec {
pname = "awscli";
version = "1.19.4"; # N.B: if you change this, change botocore to a matching version too
version = "1.19.5"; # N.B: if you change this, change botocore to a matching version too

src = fetchPypi {
inherit pname version;
sha256 = "sha256-fXQ6In3BBMvy1Jz6+OO8CXYVefIVrsVAUQHbNEroSII=";
sha256 = "sha256-SwYL2ViwazP2MDZbW9cRThvg6jVOMlkfsbpY6QDsjQY=";
};

postPatch = ''