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: 7be7f6f64435
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: 5051f5435eab
Choose a head ref
  • 6 commits
  • 3 files changed
  • 6 contributors

Commits on Sep 18, 2019

  1. kubernetes: 1.13.9 -> 1.13.11

    Johan Thomsen committed Sep 18, 2019

    Verified

    This commit was signed with the committer’s verified signature.
    eadwu Edmund Wu
    GPG key ID: 43C9E53FFCF51DEC
    Verified
    Learn about vigilant mode
    Copy the full SHA
    2614327 View commit details

Commits on Sep 22, 2019

  1. daemon: init at 0.6.4 

    (cherry picked from commit 96ffba1)
    @svanderburg
    svanderburg committed Sep 22, 2019

    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
    5e845ac View commit details

  2. nixFlakes: 2.4pre20190913_a25c022 -> 2.4pre20190922_382aa05 

    (cherry picked from commit 8109be4)
    @edolstra
    edolstra committed Sep 22, 2019
    Copy the full SHA
    d988090 View commit details

Commits on Sep 23, 2019

  1. nixos/gitlab: Add gnutar and gzip to gitlab-sidekiq's path 

    Tar and gzip are needed when importing GitLab project exports.

(cherry picked from commit aceac9d)
    @talyz @flokli
    talyz authored and flokli committed Sep 23, 2019
    Copy the full SHA
    4d53b8e View commit details

  2. Merge pull request #69042 from johanot/kubernetes-1.13.11 

    kubernetes: 1.13.9 -> 1.13.11
    @globin
    globin authored Sep 23, 2019
    Copy the full SHA
    dd8cc8f View commit details

  3. Revert "daemon: init at 0.6.4" 

    This reverts commit 5e845ac.
    @matthewbauer
    matthewbauer committed Sep 23, 2019
    Copy the full SHA
    5051f54 View commit details
Showing with 9 additions and 5 deletions.
  1. +4 −0 nixos/modules/services/misc/gitlab.nix
  2. +2 −2 pkgs/applications/networking/cluster/kubernetes/default.nix
  3. +3 −3 pkgs/tools/package-management/nix/default.nix
4 changes: 4 additions & 0 deletions nixos/modules/services/misc/gitlab.nix
View file
Original file line number Diff line number Diff line change
@@ -547,6 +547,10 @@ in {
openssh
nodejs
gnupg

# Needed for GitLab project imports
gnutar
gzip
];
serviceConfig = {
Type = "simple";
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.9";
version = "1.13.11";

src = fetchFromGitHub {
owner = "kubernetes";
repo = "kubernetes";
rev = "v${version}";
sha256 = "0dnwxd38ixl5czv2g1qix3gfxmyh2ig0zbalgvc3lq9c57wd0yg8";
sha256 = "10rl11xmj2mx7g29lxr8r7safjnz89wrp8pdfhf8pxzvjpb9b7ws";
};

buildInputs = [ removeReferencesTo makeWrapper which go rsync go-bindata ];
6 changes: 3 additions & 3 deletions pkgs/tools/package-management/nix/default.nix
View file
Original file line number Diff line number Diff line change
@@ -192,12 +192,12 @@ in rec {

nixFlakes = lib.lowPrio (callPackage common rec {
name = "nix-2.4${suffix}";
suffix = "pre20190913_a25c022";
suffix = "pre20190922_382aa05";
src = fetchFromGitHub {
owner = "NixOS";
repo = "nix";
rev = "a25c022af3fa0a35be406942869edae1bdff2cf8";
sha256 = "163n03vj4cinszd0a2yfhlrz684i9xzsdxn77p9rwhzi8npf12qw";
rev = "382aa05ff71b61379f5c2792eaf517bdf4a5c5bf";
sha256 = "0y23pjc9wsr0yxfwgsn372jasrs8xhwi2h4gzgfn4mjq1pfxb2wk";
};
fromGit = true;