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: 77d9ad1f2670
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: 4293f9f252be
Choose a head ref
  • 8 commits
  • 8 files changed
  • 6 contributors

Commits on Sep 13, 2018

  1. kubernetes: 1.10.5 -> 1.11.3 

    Fixed minor issue where kube-addon manager complaints about
/opt/namespace.yaml missing.

Added release notes with reference to Kubernetes 1.11 release notes.

closes #43882

(cherry picked from commit a49f56c)
    @srhb
    Johan Thomsen authored and srhb committed Sep 13, 2018
    Copy the full SHA
    0c84b5c View commit details

  2. Merge pull request #46598 from srhb/kube-1.11-backport-1809 

    18.09: kubernetes: 1.10.5 -> 1.11.3
    @samueldr
    samueldr authored Sep 13, 2018
    Copy the full SHA
    43a15a7 View commit details

  3. Revert "aliases: add nixos-rebuild" 

    This reverts commit 0b124c1. We
should really stop adding things that are not packages to
all-packages.nix. For example, having nixos-rebuild.nix in
all-packages.nix causes 'nix-env -qa' to evaluate a NixOS
configuration, which obviously is not good for performance. (We should
probably also remove the 'nixos' attribute from all-packages.nix, but
at least that's a function so nix-env will ignore it.)

(cherry picked from commit f1c978a)
    @edolstra @Mic92
    edolstra authored and Mic92 committed Sep 13, 2018
    Copy the full SHA
    51b62e6 View commit details

  4. grafana: 5.2.3 -> 5.2.4 

    (cherry picked from commit 68b2500)
    @WilliButz @globin
    WilliButz authored and globin committed Sep 13, 2018
    Copy the full SHA
    214e4e5 View commit details

  5. atlassian-confluence: 6.8.0 -> 6.11.1 

    (cherry picked from commit 4d962b6)
    @ciil @globin
    ciil authored and globin committed Sep 13, 2018

    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
    00ba14d View commit details

  6. atlassian-crowd: 3.1.2 -> 3.2.5 

    (cherry picked from commit f05e51a)
    @ciil @globin
    ciil authored and globin committed Sep 13, 2018

    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
    8ade355 View commit details

  7. atlassian-jira: 7.12.0 -> 7.12.1 

    (cherry picked from commit a431f3e)
    @ciil @globin
    ciil authored and globin committed Sep 13, 2018

    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
    8b5f311 View commit details

  8. google-compute-engine: 20180129 -> 20180510 (#46278) 

    Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
google-compute-engine

(cherry picked from commit 035b2f5)
    @r-ryantm @zimbatm
    r-ryantm authored and zimbatm committed Sep 13, 2018

    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
    4293f9f View commit details
Loading