Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

podman: 1.6.2 -> 1.6.3 #73016

Closed
wants to merge 3 commits into from
Closed

podman: 1.6.2 -> 1.6.3 #73016

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b3b1814
slirp4netns: 0.3.0 -> 0.4.2
peterhoeg Nov 8, 2019
35ba43f
podman: 1.6.2 -> 1.6.3
peterhoeg Nov 8, 2019
ea6da6a
WIP
peterhoeg Nov 8, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 4 additions & 4 deletions pkgs/applications/virtualization/podman/default.nix
View file
Open in desktop
Expand Up @@ -5,18 +5,18 @@

buildGoPackage rec {
pname = "podman";
version = "1.6.2";
version = "1.6.3";

src = fetchFromGitHub {
owner = "containers";
repo = "libpod";
rev = "v${version}";
sha256 = "0cwyrzjjgxclnzc1yx6vm2bvq73mldwxfwalkprzlg8vpqbxji8y";
sha256 = "0y87pylpff2xl796n5s2vrm90pspzqfw8h4a5gndn1mx18s09s69";
};

goPackagePath = "github.com/containers/libpod";

outputs = [ "bin" "out" "man" ];
outputs = [ "out" "man" ];

nativeBuildInputs = [ pkgconfig go-md2man ];

Expand All @@ -29,7 +29,7 @@ buildGoPackage rec {
'';

installPhase = ''
install -Dm555 bin/podman $bin/bin/podman
install -Dm555 -t $out/bin bin/podman
MANDIR=$man/share/man make install.man
'';

Expand Down
9 changes: 5 additions & 4 deletions pkgs/tools/networking/slirp4netns/default.nix
View file
Open in desktop
@@ -1,19 +1,20 @@
{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, glib }:
{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig
, glib, libcap, libseccomp }:

stdenv.mkDerivation rec {
pname = "slirp4netns";
version = "0.3.0";
version = "0.4.2";
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I hm as an update already in progress here: #67692

Which one do we want to pick?


src = fetchFromGitHub {
owner = "rootless-containers";
repo = "slirp4netns";
rev = "v${version}";
sha256 = "079m44l4l0p1c2sbkpzsy6zpv94glwmrc72ip2djcscnaq4b1763";
sha256 = "0i0rhb7n2i2nmbvdqdx83vi3kw4r17p7p099sr857cr3f3c221qx";
};

nativeBuildInputs = [ autoreconfHook pkgconfig ];

buildInputs = [ glib ];
buildInputs = [ glib libcap libseccomp ];

enableParallelBuilding = true;

Expand Down