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: 96c24fa69ff7
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 6fffc4302d2a
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Nov 26, 2020

  1. minishift: 1.34.2 -> 1.34.3

    @r-ryantm @SuperSandro2000
    r-ryantm authored and SuperSandro2000 committed Nov 26, 2020

    Verified

    This commit was signed with the committer’s verified signature.
    SuperSandro2000 Sandro
    GPG key ID: 3AF5A43A3EECC2E5
    Verified
    Learn about vigilant mode
    Copy the full SHA
    02885ae View commit details

  2. Merge pull request #101698 from r-ryantm/auto-update/minishift 

    minishift: 1.34.2 -> 1.34.3
    @SuperSandro2000
    SuperSandro2000 authored Nov 26, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    6fffc43 View commit details
Showing with 3 additions and 3 deletions.
  1. +3 −3 pkgs/applications/networking/cluster/minishift/default.nix
6 changes: 3 additions & 3 deletions pkgs/applications/networking/cluster/minishift/default.nix
View file
Original file line number Diff line number Diff line change
@@ -4,10 +4,10 @@
}:

let
version = "1.34.2";
version = "1.34.3";

# Update these on version bumps according to Makefile
centOsIsoVersion = "v1.15.0";
centOsIsoVersion = "v1.17.0";
openshiftVersion = "v3.11.0";

in buildGoPackage rec {
@@ -18,7 +18,7 @@ in buildGoPackage rec {
owner = "minishift";
repo = "minishift";
rev = "v${version}";
sha256 = "1xzjzmjs2ijg7zzw53v02lgrg1j82jd7ljcn6lprg01hhvfrwgg7";
sha256 = "0yhln3kyc0098hbnjyxhbd915g6j7s692c0z8yrhh9gdpc5cr2aa";
};

nativeBuildInputs = [ pkgconfig go-bindata makeWrapper ];