diff options
Diffstat (limited to 'pkgs/applications/virtualization')
5 files changed, 28 insertions, 69 deletions
diff --git a/pkgs/applications/virtualization/containerd/1.4.nix b/pkgs/applications/virtualization/containerd/1.4.nix deleted file mode 100644 index 92c7ab0b2fd..00000000000 --- a/pkgs/applications/virtualization/containerd/1.4.nix +++ /dev/null @@ -1,51 +0,0 @@ -{ lib -, fetchFromGitHub -, buildGoPackage -, btrfs-progs -, go-md2man -, installShellFiles -, util-linux -, nixosTests -}: - -buildGoPackage rec { - pname = "containerd"; - version = "1.4.11"; - - src = fetchFromGitHub { - owner = "containerd"; - repo = "containerd"; - rev = "v${version}"; - sha256 = "sha256-mUagr1/LqTCFvshWuiSMxsqdRqjzogt2tZ0uwR7ZVAs="; - }; - - goPackagePath = "github.com/containerd/containerd"; - outputs = [ "out" "man" ]; - - nativeBuildInputs = [ go-md2man installShellFiles util-linux ]; - - buildInputs = [ btrfs-progs ]; - - buildPhase = '' - cd go/src/${goPackagePath} - patchShebangs . - make binaries man "VERSION=v${version}" "REVISION=${src.rev}" - ''; - - installPhase = '' - install -Dm555 bin/* -t $out/bin - installManPage man/*.[1-9] - installShellCompletion --bash contrib/autocomplete/ctr - installShellCompletion --zsh --name _ctr contrib/autocomplete/zsh_autocomplete - ''; - - passthru.tests = { inherit (nixosTests) docker; }; - - meta = with lib; { - homepage = "https://containerd.io/"; - description = "A daemon to control runC"; - license = licenses.asl20; - maintainers = with maintainers; [ ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/applications/virtualization/cri-o/default.nix b/pkgs/applications/virtualization/cri-o/default.nix index 87b91196f88..b6d238d599e 100644 --- a/pkgs/applications/virtualization/cri-o/default.nix +++ b/pkgs/applications/virtualization/cri-o/default.nix @@ -15,13 +15,13 @@ buildGoModule rec { pname = "cri-o"; - version = "1.23.1"; + version = "1.23.2"; src = fetchFromGitHub { owner = "cri-o"; repo = "cri-o"; rev = "v${version}"; - sha256 = "sha256-A59Bgt0u8jzpTijT5vcO8JREL7Elx1mWnwddAuRHn5c="; + sha256 = "sha256-sjeYWBcal6RtoUZd6orQ+237Fz80vQKx5vocFMq4l7U="; }; vendorSha256 = null; diff --git a/pkgs/applications/virtualization/distrobox/default.nix b/pkgs/applications/virtualization/distrobox/default.nix index 8e9ea890a9b..e67509c54f8 100644 --- a/pkgs/applications/virtualization/distrobox/default.nix +++ b/pkgs/applications/virtualization/distrobox/default.nix @@ -2,13 +2,13 @@ stdenvNoCC.mkDerivation rec { pname = "distrobox"; - version = "1.2.13"; + version = "1.2.14"; src = fetchFromGitHub { owner = "89luca89"; repo = pname; rev = version; - sha256 = "047mrhsfi88mgwylnnyxg6xa7hjjrajn2pf7vfmb6161myqybvfy"; + sha256 = "sha256-gHKyuIL4K/SLBJw8xNuPdNifDcHI91AFTiHaiv38gus="; }; dontConfigure = true; diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix index 462ebb556f1..87bb16ab833 100644 --- a/pkgs/applications/virtualization/docker/default.nix +++ b/pkgs/applications/virtualization/docker/default.nix @@ -10,9 +10,9 @@ rec { , containerdRev, containerdSha256 , tiniRev, tiniSha256, buildxSupport ? true, composeSupport ? true # package dependencies - , stdenv, fetchFromGitHub, buildGoPackage + , stdenv, fetchFromGitHub, fetchpatch, buildGoPackage , makeWrapper, installShellFiles, pkg-config, glibc - , go-md2man, go, containerd_1_4, runc, docker-proxy, tini, libtool + , go-md2man, go, containerd, runc, docker-proxy, tini, libtool , sqlite, iproute2, lvm2, systemd, docker-buildx, docker-compose_2 , btrfs-progs, iptables, e2fsprogs, xz, util-linux, xfsprogs, git , procps, libseccomp, rootlesskit, slirp4netns, fuse-overlayfs @@ -33,7 +33,7 @@ rec { patches = []; }); - docker-containerd = containerd_1_4.overrideAttrs (oldAttrs: { + docker-containerd = containerd.overrideAttrs (oldAttrs: { name = "docker-containerd-${version}"; inherit version; src = fetchFromGitHub { @@ -79,6 +79,16 @@ rec { extraUserPath = optionals (stdenv.isLinux && !clientOnly) (makeBinPath [ rootlesskit slirp4netns fuse-overlayfs ]); + patches = [ + # This patch incorporates code from a PR fixing using buildkit with the ZFS graph driver. + # It could be removed when a version incorporating this patch is released. + (fetchpatch { + name = "buildkit-zfs.patch"; + url = "https://github.com/moby/moby/pull/43136.patch"; + sha256 = "1WZfpVnnqFwLMYqaHLploOodls0gHF8OCp7MrM26iX8="; + }) + ]; + postPatch = '' patchShebangs hack/make.sh hack/make/ ''; @@ -233,20 +243,20 @@ rec { # Get revisions from # https://github.com/moby/moby/tree/${version}/hack/dockerfile/install/* docker_20_10 = callPackage dockerGen rec { - version = "20.10.12"; + version = "20.10.13"; rev = "v${version}"; - sha256 = "sha256-nU6grb2lSW7BY7w9aAXwVbGp9TyO2ZxnJaxAi0wbk/c="; + sha256 = "sha256-eDwgqFx4io++SMOjhxMxVzqzcOgOnv6Xe/qmmPCvZts="; moby-src = fetchFromGitHub { owner = "moby"; repo = "moby"; rev = "v${version}"; - sha256 = "sha256-qizzK1qJNRGFisahE3iAzZTNW/HmledlMNxcJCMQSJ4="; + sha256 = "sha256-ajceIdMM8yAa+bvTjRwZ/zF7yTLF2LhGmbrweWni7hM="; }; - runcRev = "v1.0.2"; - runcSha256 = "1bpckghjah0rczciw1a1ab8z718lb2d3k4mjm4zb45lpm3njmrcp"; - containerdRev = "v1.4.12"; - containerdSha256 = "sha256-g30kshXyGVew5tVaXFAOQUOYvvo0JBqIj1YaC5nTiS8="; - tiniRev = "v0.19.0"; # v0.19.0 - tiniSha256 = "1h20i3wwlbd8x4jr2gz68hgklh0lb0jj7y5xk1wvr8y58fip1rdn"; + runcRev = "v1.0.3"; + runcSha256 = "sha256-Tl/JKbIpao+FCjngPzaVkxse50zo3XQ9Mg/AdkblMcI="; + containerdRev = "v1.5.10"; + containerdSha256 = "sha256-ee0dwWSGedo08omKOmZtW5qQ1J5M9Mm+kZHq7a+zyT4="; + tiniRev = "v0.19.0"; + tiniSha256 = "sha256-ZDKu/8yE5G0RYFJdhgmCdN3obJNyRWv6K/Gd17zc1sI="; }; } diff --git a/pkgs/applications/virtualization/singularity/default.nix b/pkgs/applications/virtualization/singularity/default.nix index 6589cccfe2f..5ec5b19ce04 100644 --- a/pkgs/applications/virtualization/singularity/default.nix +++ b/pkgs/applications/virtualization/singularity/default.nix @@ -15,11 +15,11 @@ with lib; buildGoPackage rec { pname = "singularity"; - version = "3.8.6"; + version = "3.8.7"; src = fetchurl { url = "https://github.com/hpcng/singularity/releases/download/v${version}/singularity-${version}.tar.gz"; - sha256 = "sha256-u1o7dnCsnHpLPOWyyfPWtb5g4hsI0zjJ39q7eyqZ9Sg="; + sha256 = "sha256-Myny5YP4SoNDyywDgKHWy86vrn0eYztcvK33FD6shZs="; }; goPackagePath = "github.com/sylabs/singularity"; |