public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge staging-next into staging

Browse Source
This commit is contained in:
Frederik Rietdijk
2020-03-06 07:09:30 +01:00
parent 43ccb035b9 05aeaea23d
commit 188c3a4d03
102 changed files with 1212 additions and 482 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
pkgs/applications/virtualization/conmon/default.nix
View File

@@ -1,31 +1,30 @@
{ stdenv
, fetchFromGitHub
, pkgconfig
, pkg-config
, glib
, glibc
, systemd
}:
stdenv.mkDerivation rec {
project = "conmon";
name = "${project}-${version}";
version = "2.0.10";
pname = "conmon";
version = "2.0.11";
src = fetchFromGitHub {
owner = "containers";
repo = project;
repo = pname;
rev = "v${version}";
sha256 = "194wach3yrkvll2xaj0x77hzlngk2016mflgnd5k8knjn2b9dgvl";
sha256 = "1mdnfkbbv41g590a1ja4rfw69z6kp03znyhikdmg6zqp4qsv32ib";
};
nativeBuildInputs = [ pkgconfig ];
nativeBuildInputs = [ pkg-config ];
buildInputs = [ glib systemd ] ++
stdenv.lib.optionals (!stdenv.hostPlatform.isMusl) [ glibc glibc.static ];
installPhase = "install -Dm755 bin/${project} $out/bin/${project}";
installPhase = "install -Dm755 bin/${pname} $out/bin/${pname}";
meta = with stdenv.lib; {
homepage = https://github.com/containers/conmon;
homepage = "https://github.com/containers/conmon";
description = "An OCI container runtime monitor";
license = licenses.asl20;
maintainers = with maintainers; [ vdemeester saschagrunert ];

14
pkgs/applications/virtualization/docker/default.nix
View File

@@ -206,14 +206,14 @@ rec {
};
docker_19_03 = makeOverridable dockerGen {
version = "19.03.6";
rev = "369ce74a3ce86a392e39e45d3960ce970fdfac97";
sha256 = "0myvh7p9h0j4xc35zhcvp8cqxd3r6p6jx5zxl5rzh14m6lgzmkh0";
runcRev = "dc9208a3303feef5b3839f4323d9beb36df0a9dd";
version = "19.03.7";
rev = "7141c199a2edb2a90b778175f836f9dd2a22c95a";
sha256 = "1h1hrp6cw3ah2gaq2vfdd1d9vh7gyf7rs6bdxwpxk9ixc19fxsm4";
runcRev = "dc9208a3303feef5b3839f4323d9beb36df0a9dd"; # v1.0.0-rc10
runcSha256 = "0pi3rvj585997m4z9ljkxz2z9yxf9p2jr0pmqbqrc7bc95f5hagk";
containerdRev = "35bd7a5f69c13e1563af8a93431411cd9ecf5021";
containerdSha256 = "076355bkbdsgsxryhhr9gbpyypdx8gg149lylyd6q5ig98p179ap";
tiniRev = "fec3683b971d9c3ef73f284f176672c44b448662";
containerdRev = "7ad184331fa3e55e52b890ea95e65ba581ae3429"; # v1.2.13
containerdSha256 = "1rac3iak3jpz57yarxc72bxgxvravwrl0j6s6w2nxrmh2m3kxqzn";
tiniRev = "fec3683b971d9c3ef73f284f176672c44b448662"; # v0.18.0
tiniSha256 = "1h20i3wwlbd8x4jr2gz68hgklh0lb0jj7y5xk1wvr8y58fip1rdn";
};
}