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

Commits on Oct 25, 2018

  1. containerd: 1.1.4 -> 1.2.0

    Signed-off-by: Vincent Demeester <vincent@sbr.pm>
    vdemeester committed Oct 25, 2018
    Copy the full SHA
    a9c0329 View commit details

Commits on Oct 27, 2018

  1. Merge pull request #49101 from vdemeester/update-containerd

    containerd: 1.1.4 -> 1.2.0
    adisbladis authored Oct 27, 2018
    Copy the full SHA
    549b61c View commit details
Showing with 2 additions and 2 deletions.
  1. +2 −2 pkgs/applications/virtualization/containerd/default.nix
4 changes: 2 additions & 2 deletions pkgs/applications/virtualization/containerd/default.nix
Original file line number Diff line number Diff line change
@@ -5,13 +5,13 @@ with lib;

stdenv.mkDerivation rec {
name = "containerd-${version}";
version = "1.1.4";
version = "1.2.0";

src = fetchFromGitHub {
owner = "containerd";
repo = "containerd";
rev = "v${version}";
sha256 = "1d4qnviv20zi3zk17zz8271mlfqqgfrxblw86izwwfvj3cvsyrah";
sha256 = "03d244v85975bavmlg66kd283jdb22yyvwkwcgy91n63jhvvbadk";
};

hardeningDisable = [ "fortify" ];