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

Commits on Jan 5, 2021

  1. python3Packages.botocore: 1.19.47 -> 1.19.48

    @NeQuissimus
    NeQuissimus committed Jan 5, 2021
    Copy the full SHA
    38a97a1 View commit details

  2. python3Packages.boto3: 1.16.47 -> 1.16.48

    @NeQuissimus
    NeQuissimus committed Jan 5, 2021
    Copy the full SHA
    62a95f8 View commit details

  3. awscli: 1.18.207 -> 1.18.208

    @NeQuissimus
    NeQuissimus committed Jan 5, 2021
    Copy the full SHA
    84df1a4 View commit details

  4. oh-my-zsh: 2021-01-02 → 2021-01-04

    @NeQuissimus
    NeQuissimus committed Jan 5, 2021
    Copy the full SHA
    02262c6 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.16.47"; # N.B: if you change this, change botocore too
version = "1.16.48"; # N.B: if you change this, change botocore too

src = fetchPypi {
inherit pname version;
sha256 = "sha256-BXlrpsZfeSFOphvsrlEm1ckk7tihGHS8VTbWEd6rvkc=";
sha256 = "sha256-5pFawWSgU2d4fbJBbuqoZirl4LnFOQLb8jtAdobvUCg=";
};

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

src = fetchPypi {
inherit pname version;
sha256 = "sha256-FVhKhtbLH5TqeF6NPJj67/jd0BBTVuHBBhGNmsEvqJE=";
sha256 = "sha256-uVTFlvi98x1f3x7/iiKWvegJTh4ilhp5uDu2Ld66ikk=";
};

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 @@
, nix, nixfmt, jq, coreutils, gnused, curl, cacert }:

stdenv.mkDerivation rec {
version = "2021-01-02";
version = "2021-01-04";
pname = "oh-my-zsh";
rev = "0e833b622ba43d38bd62227244d831f3c0e4a325";
rev = "2118d35e017eb8c599f3c25863c8263aca307541";

src = fetchFromGitHub {
inherit rev;
owner = "ohmyzsh";
repo = "ohmyzsh";
sha256 = "06bmlc8lzqxs37glwmv7j0yk73kccmrdb783kvqldski56004gba";
sha256 = "132wh37grxz19djnbgyihvgjacr6jqx8jjsxwzsknv7v49b6gp8z";
};

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.18.207"; # N.B: if you change this, change botocore to a matching version too
version = "1.18.208"; # N.B: if you change this, change botocore to a matching version too

src = fetchPypi {
inherit pname version;
sha256 = "sha256-E6emaaPxIgYk5Zwh3oBHUrbye43/mGjzvVeMx/Re33w=";
sha256 = "sha256-/YgXHSCteHPf/BVJmbeS7rAtxentCSqELAi+Wy2GmdA=";
};

postPatch = ''