diff options
Diffstat (limited to 'pkgs/applications/virtualization')
4 files changed, 21 insertions, 19 deletions
diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix index da414cd5546..e9fc96986a8 100644 --- a/pkgs/applications/virtualization/docker/default.nix +++ b/pkgs/applications/virtualization/docker/default.nix @@ -184,9 +184,9 @@ rec { # Get revisions from # https://github.com/docker/docker-ce/tree/${version}/components/engine/hack/dockerfile/install/* - docker_18_09 = makeOverridable dockerGen { + docker_18_09 = makeOverridable dockerGen rec { version = "18.09.9"; - rev = "039a7df9ba8097dd987370782fcdd6ea79b26016"; + rev = "v${version}"; sha256 = "0wqhjx9qs96q2jd091wffn3cyv2aslqn2cvpdpgljk8yr9s0yg7h"; runcRev = "3e425f80a8c931f88e6d94a8c831b9d5aa481657"; runcSha256 = "18psc830b2rkwml1x6vxngam5b5wi3pj14mw817rshpzy87prspj"; @@ -196,10 +196,10 @@ rec { tiniSha256 = "1h20i3wwlbd8x4jr2gz68hgklh0lb0jj7y5xk1wvr8y58fip1rdn"; }; - docker_19_03 = makeOverridable dockerGen { - version = "19.03.11"; - rev = "42e35e61f352e527082521280d5ea3761f0dee50"; - sha256 = "0q4l4z2bg269hj1dqaq02f84zgp3p8idw1cxczw383cjl0ra8xgq"; + docker_19_03 = makeOverridable dockerGen rec { + version = "19.03.12"; + rev = "v${version}"; + sha256 = "0i5xr8q3yjrz5zsjcq63v4g1mzqpingjr1hbf9amk14484i2wkw7"; runcRev = "dc9208a3303feef5b3839f4323d9beb36df0a9dd"; # v1.0.0-rc10 runcSha256 = "0pi3rvj585997m4z9ljkxz2z9yxf9p2jr0pmqbqrc7bc95f5hagk"; containerdRev = "7ad184331fa3e55e52b890ea95e65ba581ae3429"; # v1.2.13 diff --git a/pkgs/applications/virtualization/gvisor/default.nix b/pkgs/applications/virtualization/gvisor/default.nix index 7d3b8021229..576f2d9e6f2 100644 --- a/pkgs/applications/virtualization/gvisor/default.nix +++ b/pkgs/applications/virtualization/gvisor/default.nix @@ -76,7 +76,7 @@ in buildBazelPackage rec { rm -f "$bazelOut"/java.log "$bazelOut"/java.log.* ''; - sha256 = "0mkgbw08f6kgklvjmlfpyld35q7dvxm9pvrhaf7m7nx69sich6jq"; + sha256 = "0myffqywbvqhax995z55jymwnwyxmp13r27kpbc7wb5fk9s4skvr"; }; buildAttrs = { diff --git a/pkgs/applications/virtualization/podman/default.nix b/pkgs/applications/virtualization/podman/default.nix index 3ed029e55fb..6d277562065 100644 --- a/pkgs/applications/virtualization/podman/default.nix +++ b/pkgs/applications/virtualization/podman/default.nix @@ -16,13 +16,13 @@ buildGoModule rec { pname = "podman"; - version = "1.9.3"; + version = "2.0.1"; src = fetchFromGitHub { owner = "containers"; repo = "libpod"; rev = "v${version}"; - sha256 = "0gbp12xn1vliyawkw2w2bpn6b5h2cm41g3nj72vk4jyhis0igq1s"; + sha256 = "11avj4q3xh7qbcbs8h4jis0bdfkvvh193sflwiz8hcp41qjvinz4"; }; vendorSha256 = null; @@ -44,15 +44,18 @@ buildGoModule rec { buildPhase = '' patchShebangs . ${if stdenv.isDarwin - then "make CGO_ENABLED=0 BUILDTAGS='remoteclient containers_image_openpgp exclude_graphdriver_devicemapper' varlink_generate all" - else "make podman docs"} + then "make podman-remote" + else "make podman"} + make docs ''; - installPhase = '' + installPhase = stdenv.lib.optionalString stdenv.isDarwin '' + mv bin/{podman-remote,podman} + '' + '' install -Dm555 bin/podman $out/bin/podman installShellCompletion --bash completions/bash/podman installShellCompletion --zsh completions/zsh/_podman - MANDIR=$man/share/man make install.man + MANDIR=$man/share/man make install.man-nobuild ''; passthru.tests.podman = nixosTests.podman; @@ -63,6 +66,5 @@ buildGoModule rec { license = licenses.asl20; maintainers = with maintainers; [ marsam ] ++ teams.podman.members; platforms = platforms.unix; - broken = stdenv.isDarwin; }; } diff --git a/pkgs/applications/virtualization/umoci/default.nix b/pkgs/applications/virtualization/umoci/default.nix index d8a1f36dd5d..0b9668b701a 100644 --- a/pkgs/applications/virtualization/umoci/default.nix +++ b/pkgs/applications/virtualization/umoci/default.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "umoci"; - version = "0.4.5"; + version = "0.4.6"; src = fetchFromGitHub { - owner = "openSUSE"; + owner = "opencontainers"; repo = "umoci"; rev = "v${version}"; - sha256 = "1gzj4nnys73wajdwjn5jsskvnhzh8s2vmyl76ax8drpvw19bd5g3"; + sha256 = "0jaar26l940yh77cs31c3zndiycp85m3fz4zivcibzi68g6n6yzg"; }; vendorSha256 = null; @@ -24,7 +24,7 @@ buildGoModule rec { postInstall = '' sed -i '/SHELL =/d' Makefile - make local-doc + make docs installManPage doc/man/*.[1-9] ''; @@ -33,6 +33,6 @@ buildGoModule rec { homepage = "https://umo.ci"; license = licenses.asl20; maintainers = with maintainers; [ zokrezyl ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } |