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: 5c0f5759ba34
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: 0563e6c907ba
Choose a head ref
  • 3 commits
  • 2 files changed
  • 3 contributors

Commits on Jun 7, 2019

  1. kubernetes: 1.13.6 -> 1.13.7

    Johan Thomsen committed Jun 7, 2019
    Copy the full SHA
    2ce667c View commit details

  2. Merge pull request #62818 from johanot/kubernetes-1.13.7 

    kubernetes: 1.13.6 -> 1.13.7 (CVE-2019-11245)
    @fpletz
    fpletz authored Jun 7, 2019
    Copy the full SHA
    4f2244c View commit details

  3. esniper: update to latest git revision "Version_2_35_0-15-g91d2665" 

    The latest release no longer works.

(cherry picked from commit 3a64e98)
    @peti
    peti committed Jun 7, 2019
    Copy the full SHA
    0563e6c View commit details
Showing with 9 additions and 8 deletions.
  1. +2 −2 pkgs/applications/networking/cluster/kubernetes/default.nix
  2. +7 −6 pkgs/applications/networking/esniper/default.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 {
name = "kubernetes-${version}";
version = "1.13.6";
version = "1.13.7";

src = fetchFromGitHub {
owner = "kubernetes";
repo = "kubernetes";
rev = "v${version}";
sha256 = "02v12x241zkl11qfb8d472kzq3hvsgip1qvg179kf1xwd5cswlxq";
sha256 = "013bbnhxzv41hqnz98k5kyrvaxz39gk9ay7sw996sy3v60vwc3z3";
};

buildInputs = [ removeReferencesTo makeWrapper which go rsync go-bindata ];
13 changes: 7 additions & 6 deletions pkgs/applications/networking/esniper/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
{ stdenv, fetchurl, openssl, curl, coreutils, gawk, bash, which }:
{ stdenv, fetchgit, openssl, curl, coreutils, gawk, bash, which }:

stdenv.mkDerivation rec {
name = "esniper-2.35.0";
name = "esniper-2.35.0-15-g91d2665";

src = fetchurl {
url = "mirror://sourceforge/esniper/${stdenv.lib.replaceStrings ["."] ["-"] name}.tgz";
sha256 = "04iwjb42lw90c03125bjdpnm0fp78dmwf2j35r7mah0nwcrlagd9";
};
src = fetchgit {
url = "https://git.code.sf.net/p/esniper/git";
rev = "91d2665539beaeac21fb4c0cc2fd39c44e771ed7";
sha256 = "0dixcsvbcj9jbfjfv50nwvw7w90c4s6gnkrpilaan984i6y45rw0";
};

buildInputs = [ openssl curl ];