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

Merge pull request #62701 from dtzWill/update/podman-cni-and-containers-oh-my

Browse Source 
podman, cni{,-plugins}, cri*: updates
This commit is contained in:
Franz Pletz 2019-06-07 11:54:52 +00:00 committed by GitHub
commit ff05703611
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 40 additions and 95 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
pkgs/applications/networking/cluster/cni/default.nix
View File

@ -1,28 +1,17 @@
{ stdenv, fetchFromGitHub, buildGoPackage }:
buildGoPackage rec {
name = "cni-${version}";
version = "0.6.0";
pname = "cni";
version = "0.7.0";
src = fetchFromGitHub {
owner = "containernetworking";
repo = "cni";
repo = pname;
rev = "v${version}";
sha256 = "00ajs2r5r2z3l0vqwxrcwhjfc9px12qbcv5vnvs2mdipvvls1y2y";
sha256 = "15ad323dw44k82bfx9r8w5q2kn7jix60p9v4ciyzx2p5pip36wp8";
};
goPackagePath = "github.com/containernetworking/cni";
buildPhase = ''
cd "go/src/${goPackagePath}"
patchShebangs build.sh
./build.sh
'';
installPhase = ''
install -Dm555 bin/cnitool $bin/bin/cnitool
'';
meta = with stdenv.lib; {
description = "Container Network Interface - networking for Linux containers";
license = licenses.asl20;

10
pkgs/applications/networking/cluster/cni/plugins.nix
View File

@ -1,22 +1,22 @@
{ stdenv, lib, fetchFromGitHub, go, removeReferencesTo }:
stdenv.mkDerivation rec {
name = "cni-plugins-${version}";
version = "0.7.5";
pname = "cni-plugins";
version = "0.8.0";
src = fetchFromGitHub {
owner = "containernetworking";
repo = "plugins";
rev = "v${version}";
sha256 = "1kfi0iz2hs4rq3cdkw12j8d47ac4f5vrpzcwcrs2yzmh2j4n5sz5";
sha256 = "1jmdjfwjgh6368wwdpfpjm708b0kl38cyc87wqp2f0y9mvvws8ni";
};
buildInputs = [ removeReferencesTo go ];
buildPhase = ''
patchShebangs build.sh
patchShebangs build_linux.sh
export "GOCACHE=$TMPDIR/go-cache"
./build.sh
./build_linux.sh
'';
installPhase = ''

4
pkgs/applications/virtualization/cri-o/default.nix
View File

@ -17,7 +17,7 @@
buildGoPackage rec {
project = "cri-o";
version = "1.14.1";
version = "1.14.2";
name = "${project}-${version}${flavor}";
goPackagePath = "github.com/${project}/${project}";
@ -26,7 +26,7 @@ buildGoPackage rec {
owner = "cri-o";
repo = "cri-o";
rev = "v${version}";
sha256 = "1cclxarwabk5zlqysm2dzgsm6qkxyzbnlylr0gs57ppn4ibky3nk";
sha256 = "1p3yzcjljbpwhnsa512rc3zgbrnibh2bflfg4bdjhnfpqzg18376";
};
outputs = [ "bin" "out" ];

8
pkgs/applications/virtualization/docker-compose/default.nix
View File

@ -3,15 +3,15 @@
, pyyaml, backports_ssl_match_hostname, colorama, docopt
, dockerpty, docker, ipaddress, jsonschema, requests
, six, texttable, websocket_client, cached-property
, enum34, functools32,
, enum34, functools32, paramiko
}:
buildPythonApplication rec {
version = "1.23.2";
version = "1.24.0";
pname = "docker-compose";
src = fetchPypi {
inherit pname version;
sha256 = "1x2jlh7z2znvyz2pqcpn0gigfiqnx8s59pc7xlvy9ryd76g9w1zz";
sha256 = "0sd3bwmz80a2rffviq9vvyxic41ya08yj41k8x1m4vv74wcab0jm";
};
# lots of networking and other fails
@ -20,7 +20,7 @@ buildPythonApplication rec {
propagatedBuildInputs = [
pyyaml backports_ssl_match_hostname colorama dockerpty docker
ipaddress jsonschema requests six texttable websocket_client
docopt cached-property
docopt cached-property paramiko
] ++
stdenv.lib.optional (pythonOlder "3.4") enum34 ++
stdenv.lib.optional (pythonOlder "3.2") functools32;

10
pkgs/applications/virtualization/podman/conmon.nix
View File

@ -4,14 +4,14 @@ with lib;
with builtins;
stdenv.mkDerivation rec {
name = "conmon-${version}";
version = "0.0.1pre52_${substring 0 7 src.rev}";
pname = "conmon";
version = "0.2.0";
src = fetchFromGitHub {
owner = "containers";
repo = "conmon";
rev = "6905a4dc47830fbd1110e937228057c0b073ebe1";
sha256 = "1igny1hr2q1zrhsaxcx7l8xkdr5ragl8pj18qbr1lpa2v5v2f6hs";
repo = pname;
rev = "v${version}";
sha256 = "08fgkbv7hq62lcq39za9pm2s2j92ismgrkvfm7acwbvajqh9syjb";
};
nativeBuildInputs = [ pkgconfig ];

4
pkgs/applications/virtualization/podman/default.nix
View File

@ -5,13 +5,13 @@
buildGoPackage rec {
name = "podman-${version}";
version = "1.3.1";
version = "1.3.2";
src = fetchFromGitHub {
owner = "containers";
repo = "libpod";
rev = "v${version}";
sha256 = "0x1md2w43mdfzp9dsz8vbgs72dlkwsvh16hkgq90596gwipcg36x";
sha256 = "1j5n08273igj6wm9rrwks9nnklv91060bn1yv3ak78csxc05whs3";
};
goPackagePath = "github.com/containers/libpod";

32
pkgs/tools/virtualization/cri-tools/default.nix
View File

@ -1,19 +1,23 @@
{ buildGoPackage, fetchurl, lib }:
{ buildGoPackage, fetchFromGitHub, lib }:
buildGoPackage
{ name = "cri-tools-1.0.0-alpha.0";
src = fetchurl
{ url = "https://github.com/kubernetes-incubator/cri-tools/archive/v1.0.0-alpha.0.tar.gz";
sha256 = "1la26f38xafb7g9hrppjq7gmajiyr8idcwbian7n412q9m0lb3ic";
};
rec {
pname = "cri-tools";
version = "1.14.0";
src = fetchFromGitHub {
owner = "kubernetes-incubator";
repo = pname;
rev = "v${version}";
sha256 = "0v5i7shbn7b6av1d2z6r5czyjdll9i7xim9975lpnz1136xb6li7";
};
goPackagePath = "github.com/kubernetes-incubator/cri-tools";
subPackages = [ "cmd/crictl" "cmd/critest" ];
goPackagePath = "github.com/kubernetes-incubator/cri-tools";
subPackages = [ "cmd/crictl" "cmd/critest" ];
meta = {
license = lib.licenses.asl20;
};
goDeps = ./deps.nix;
}
meta = {
description = "CLI and validation tools for Kubelet Container Runtime Interface (CRI)";
homepage = https://github.com/kubernetes-sigs/cri-tools;
license = lib.licenses.asl20;
};
}

48
pkgs/tools/virtualization/cri-tools/deps.nix generated
View File

@ -1,48 +0,0 @@
# This file was generated by https://github.com/kamilchm/go2nix v1.2.1
[
{
goPackagePath = "github.com/docker/docker";
fetch = {
type = "git";
url = "https://github.com/docker/docker";
rev = "94b8a116fbf1cd90e68d8f5361b520d326a66f9b";
sha256 = "0winmx2dx9chrv9ab4cl1i00z2vag2swy2lfwiy8jx73qhaf9g4d";
};
}
{
goPackagePath = "k8s.io/api";
fetch = {
type = "git";
url = "https://github.com/kubernetes/api";
rev = "57d7f151236665c12202a51c21bc939eb5d5ba91";
sha256 = "0sdpymjw6wqs1fc2q3h0v60slbd0p5qqr23ssff72wprn8520q37";
};
}
{
goPackagePath = "k8s.io/apimachinery";
fetch = {
type = "git";
url = "https://github.com/kubernetes/apimachinery";
rev = "91d8586aac31d9086939d077ba556d2c7fb157b4";
sha256 = "1672igw8c0hp8qkwns69n5k8qgr1rzjaah9gjh37am34v172vgl7";
};
}
{
goPackagePath = "k8s.io/client-go";
fetch = {
type = "git";
url = "https://github.com/kubernetes/client-go";
rev = "109fef42a850b1af9d332a4ba433f65436be66c7";
sha256 = "1yspxap56fgk0vh2n8jxl3j870yig7swpv8w4w7l92jawrfxv1zf";
};
}
{
goPackagePath = "k8s.io/kubernetes";
fetch = {
type = "git";
url = "https://github.com/kubernetes/kubernetes";
rev = "ea2fbd4de4b38aae93ec397cb5ea4d9eb6aefef8";
sha256 = "1108d2h7px0b4gqc9xrwb0w5dhs5kxxbbvbcr938ipgln250qrpz";
};
}
]