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

Commits on Sep 10, 2020

  1. kops_1_17: 1.17.1 -> 1.17.2

    @kampka
    kampka committed Sep 10, 2020
    Copy the full SHA
    422f3f2 View commit details

  2. kops_1_18: 1.18.0 -> 1.18.1

    @kampka
    kampka committed Sep 10, 2020

    Unverified

    This commit is not signed, but one or more authors requires that any commit attributed to them is signed.
    Learn about vigilant mode
    Copy the full SHA
    c524f8b View commit details

  3. kops: Add meta.changelog

    @kampka
    kampka committed Sep 10, 2020

    Unverified

    This commit is not signed, but one or more authors requires that any commit attributed to them is signed.
    Learn about vigilant mode
    Copy the full SHA
    656915d View commit details

Commits on Sep 11, 2020

  1. Merge pull request #97643 from kampka/kops 

    Kops
    @offlinehacker
    offlinehacker authored Sep 11, 2020

    Unverified

    This commit is not signed, but one or more authors requires that any commit attributed to them is signed.
    Learn about vigilant mode
    Copy the full SHA
    a4754ca View commit details
Showing with 11 additions and 9 deletions.
  1. +11 −9 pkgs/applications/networking/cluster/kops/default.nix
20 changes: 11 additions & 9 deletions pkgs/applications/networking/cluster/kops/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{ stdenv, lib, buildGoPackage, fetchFromGitHub, go-bindata, installShellFiles }:

let
goPackagePath = "k8s.io/kops";

generic = { version, sha256, rev ? version, ...}@attrs:
let attrs' = builtins.removeAttrs attrs ["version" "sha256" "rev"] ; in
buildGoPackage {
generic = { version, sha256, rev ? version, ... }@attrs:
let attrs' = builtins.removeAttrs attrs [ "version" "sha256" "rev" ]; in
buildGoPackage
{
pname = "kops";
inherit version;

@@ -42,12 +42,14 @@ let
meta = with stdenv.lib; {
description = "Easiest way to get a production Kubernetes up and running";
homepage = "https://github.com/kubernetes/kops";
changelog = "https://github.com/kubernetes/kops/tree/master/docs/releases";
license = licenses.asl20;
maintainers = with maintainers; [ offline zimbatm kampka ];
platforms = platforms.unix;
};
} // attrs';
in rec {
in
rec {

mkKops = generic;

@@ -57,13 +59,13 @@ in rec {
};

kops_1_17 = mkKops {
version = "1.17.1";
sha256 = "1km6nwanmhfx8rl1wp445z9ib50jr2f86rd92vilm3q4rs9kig1h";
version = "1.17.2";
sha256 = "0fmrzjz163hda6sl1jkl7cmg8fw6mmqb9953048jnhmd3w428xlz";
};

kops_1_18 = mkKops rec {
version = "1.18.0";
sha256 = "16zbjxxv08j31y7lhkqx2bnx0pc3r0vpfrlhdjs26z22p5rc4rrh";
version = "1.18.1";
sha256 = "0jw23vmq2v9czxyansggq4fapz1bcaclmxpw6na4dsn8zcssz320";
rev = "v${version}";
};
}