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

Commits on Jun 23, 2017

  1. openldap: 2.4.44 -> 2.4.45

    @NeQuissimus
    NeQuissimus committed Jun 23, 2017

    Verified

    This commit was signed with the committer’s verified signature.
    NeQuissimus Tim Steinbach
    GPG key ID: 472BFCCA96BD0EDA
    Verified
    Learn about vigilant mode
    Copy the full SHA
    0737359 View commit details

  2. minikube: 0.19.1 -> 0.20.0

    @NeQuissimus
    NeQuissimus committed Jun 23, 2017

    Verified

    This commit was signed with the committer’s verified signature.
    fpletz Franz Pletz
    GPG key ID: 846FDED7792617B4
    Verified
    Learn about vigilant mode
    Copy the full SHA
    56761c9 View commit details
Showing with 6 additions and 6 deletions.
  1. +4 −4 pkgs/applications/networking/cluster/minikube/default.nix
  2. +2 −2 pkgs/development/libraries/openldap/default.nix
8 changes: 4 additions & 4 deletions pkgs/applications/networking/cluster/minikube/default.nix
View file
Original file line number Diff line number Diff line change
@@ -14,23 +14,23 @@ let
# instead, we download localkube ourselves and shove it into the minikube binary. The versions URL that minikube uses is
# currently https://storage.googleapis.com/minikube/k8s_releases.json

localkube-version = "1.6.0";
localkube-version = "1.6.3";
localkube-binary = fetchurl {
url = "https://storage.googleapis.com/minikube/k8sReleases/v${localkube-version}/localkube-linux-amd64";
sha256 = "0zx0c9fwairvga1g1112l5g5pspm2m9wxb42qgfxfgyidywvirha";
sha256 = "1fmxxjv1bxrfngc4ykfgg76b79dh8pq0k1gsbzhiy3hhrppfqylm";
};
in buildGoPackage rec {
pname = "minikube";
name = "${pname}-${version}";
version = "0.19.1";
version = "0.20.0";

goPackagePath = "k8s.io/minikube";

src = fetchFromGitHub {
owner = "kubernetes";
repo = "minikube";
rev = "v${version}";
sha256 = "19kw2xhpcbyh32im0lnvajcjf1f8p357vhggk0jl342a23vr3rxl";
sha256 = "0bly2phy67x4ckcg46g6r4kqfdpjfs1cb3588a900m8b4xyavvvb";
};

# kubernetes is here only to shut up a loud warning when generating the completions below. minikube checks very eagerly
4 changes: 2 additions & 2 deletions pkgs/development/libraries/openldap/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, openssl, cyrus_sasl, db, groff, libtool }:

stdenv.mkDerivation rec {
name = "openldap-2.4.44";
name = "openldap-2.4.45";

src = fetchurl {
url = "http://www.openldap.org/software/download/OpenLDAP/openldap-release/${name}.tgz";
sha256 = "0044p20hx07fwgw2mbwj1fkx04615hhs1qyx4mawj2bhqvrnppnp";
sha256 = "091qvwk5dkcpp17ziabcnh3rg3m7qwzw2pihfcd1d5fdxgywzmnd";
};

# TODO: separate "out" and "bin"