Skip to content
This repository was archived by the owner on Apr 12, 2021. It is now read-only.
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-channels
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: dabbc5a56039
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 76adfc180c0e
Choose a head ref
  • 3 commits
  • 2 files changed
  • 3 contributors

Commits on Jul 16, 2020

  1. kubernetes: 1.17.8 -> 1.17.9

    @srhb
    srhb committed Jul 16, 2020
    Copy the full SHA
    86cbcb3 View commit details

  2. Merge pull request #93224 from srhb/k8s-1.17.9 

    kubernetes: 1.17.8 -> 1.17.9
    @srhb
    srhb authored Jul 16, 2020
    Copy the full SHA
    6c3e37e View commit details

  3. pythonPackages.django: 2.2.13 -> 2.2.14 

    See https://docs.djangoproject.com/en/2.2/releases/2.2.14/ for release
information

(cherry picked from commit 9db7544)
Signed-off-by: Lancelot SIX <lsix@lancelotsix.com>
    @lsix
    lsix committed Jul 16, 2020
    Copy the full SHA
    76adfc1 View commit details
Showing with 4 additions and 4 deletions.
  1. +2 −2 pkgs/applications/networking/cluster/kubernetes/default.nix
  2. +2 −2 pkgs/development/python-modules/django/2_2.nix
4 changes: 2 additions & 2 deletions pkgs/applications/networking/cluster/kubernetes/default.nix
View file
Original file line number Diff line number Diff line change
@@ -15,13 +15,13 @@ with lib;

stdenv.mkDerivation rec {
pname = "kubernetes";
version = "1.17.8";
version = "1.17.9";

src = fetchFromGitHub {
owner = "kubernetes";
repo = "kubernetes";
rev = "v${version}";
sha256 = "0j28m98kgmwhnnw0j1xakprdh62qq2d9yq72ab7p7rhc4v119yqh";
sha256 = "0h2cbrip2bk1vjavc1lwqgpbxqwlbwdhqjb9kvc687b5na2cm2hc";
};

buildInputs = [ removeReferencesTo makeWrapper which go rsync go-bindata ];
4 changes: 2 additions & 2 deletions pkgs/development/python-modules/django/2_2.nix
View file
Original file line number Diff line number Diff line change
@@ -6,13 +6,13 @@

buildPythonPackage rec {
pname = "Django";
version = "2.2.13";
version = "2.2.14";

disabled = !isPy3k;

src = fetchPypi {
inherit pname version;
sha256 = "103db5gmny6bkq9jgr2m6gdfy1n29bj2v87184y1zgpdmkv71ww4";
sha256 = "14b1w00hrf4n7hla6d6nf2p5r4k6jh3fcmv7bd1v04vpcpvfrw7d";
};

patches = stdenv.lib.optional withGdal