commit d2f5c28d0dfc25cc78454bb996bec36a0722901b · pyrox.dev/nixpkgs

nixos/doc/manual/release-notes/rl-2505.section.md

···

       55
       55
        
       

     

       56
       56
        
       - `gkraken` software and `hardware.gkraken.enable` option have been removed, use `coolercontrol` via `programs.coolercontrol.enable` option instead.

     

       57
       57
        
       

     

       58
       58
       +
       - `containerd` has been updated to v2, which contains breaking changes. See the [containerd

     

       59
       59
       +
         2.0](https://github.com/containerd/containerd/blob/main/docs/containerd-2.0.md) documentation for more

     

       60
       60
       +
         details.

     

       61
       61
       +
       

     

       58
       62
        
       - the notmuch vim plugin now lives in a separate output of the `notmuch`

     

       59
       63
        
         package. Installing `notmuch` will not bring the notmuch vim package anymore,

     

       60
       64
        
         add `vimPlugins.notmuch-vim` to your (Neo)vim configuration if you want the

+1 -1

nixos/modules/virtualisation/containerd.nix

···

       67
       67
        
           systemd.services.containerd = {

     

       68
       68
        
             description = "containerd - container runtime";

     

       69
       69
        
             wantedBy = [ "multi-user.target" ];

     

       70
       70
       -
             after = [ "network.target" ];

     

       70
       70
       +
             after = [ "network.target" "local-fs.target" "dbus.service" ];

     

       71
       71
        
             path = with pkgs; [

     

       72
       72
        
               containerd

     

       73
       73
        
               runc

pkgs/applications/virtualization/docker/default.nix

···

       53
       53
        
             pname = "docker-containerd";

     

       54
       54
        
             inherit version;

     

       55
       55
        
       

     

       56
       56
       +
             # We only need binaries

     

       57
       57
       +
             outputs = [ "out" ];

     

       58
       58
       +
       

     

       56
       59
        
             src = fetchFromGitHub {

     

       57
       60
        
               owner = "containerd";

     

       58
       61
        
               repo = "containerd";

     
···

       62
       65
        
       

     

       63
       66
        
             buildInputs = oldAttrs.buildInputs

     

       64
       67
        
               ++ lib.optionals withSeccomp [ libseccomp ];

     

       68
       68
       +
       

     

       69
       69
       +
             # See above

     

       70
       70
       +
             installTargets = "install";

     

       65
       71
        
           });

     

       66
       72
        
       

     

       67
       73
        
           docker-tini = tini.overrideAttrs {

+73 -27

pkgs/by-name/co/containerd/package.nix

···

       1
       1
       -
       { lib

     

       2
       2
       -
       , fetchFromGitHub

     

       3
       3
       -
       , buildGoModule

     

       4
       4
       -
       , btrfs-progs

     

       5
       5
       -
       , go-md2man

     

       6
       6
       -
       , installShellFiles

     

       7
       7
       -
       , util-linux

     

       8
       8
       -
       , nixosTests

     

       9
       9
       -
       , kubernetes

     

       1
       1
       +
       {

     

       2
       2
       +
         lib,

     

       3
       3
       +
         stdenv,

     

       4
       4
       +
         pkgsCross,

     

       5
       5
       +
         btrfs-progs,

     

       6
       6
       +
         buildGoModule,

     

       7
       7
       +
         fetchFromGitHub,

     

       8
       8
       +
         go-md2man,

     

       9
       9
       +
         kubernetes,

     

       10
       10
       +
         nix-update-script,

     

       11
       11
       +
         nixosTests,

     

       12
       12
       +
         util-linux,

     

       13
       13
       +
         btrfsSupport ? btrfs-progs != null,

     

       14
       14
       +
         withMan ? stdenv.buildPlatform.canExecute stdenv.hostPlatform,

     

       10
       15
        
       }:

     

       11
       16
        
       

     

       12
       17
        
       buildGoModule rec {

     

       13
       18
        
         pname = "containerd";

     

       14
       14
       -
         version = "1.7.23";

     

       19
       19
       +
         version = "2.0.0";

     

       20
       20
       +
       

     

       21
       21
       +
         outputs = [

     

       22
       22
       +
           "out"

     

       23
       23
       +
           "doc"

     

       24
       24
       +
         ] ++ lib.optional withMan "man";

     

       15
       25
        
       

     

       16
       26
        
         src = fetchFromGitHub {

     

       17
       27
        
           owner = "containerd";

     

       18
       28
        
           repo = "containerd";

     

       19
       19
       -
           rev = "v${version}";

     

       20
       20
       -
           hash = "sha256-vuOefU1cZr1pKCYHKyDBx/ohghgPlXhK3a38PQKH0pc=";

     

       29
       29
       +
           rev = "refs/tags/v${version}";

     

       30
       30
       +
           hash = "sha256-DFAP+zjBYP2SpyD8KXGvI3i/PUZ6d4jdzGyFfr1lzj4=";

     

       21
       31
        
         };

     

       22
       32
        
       

     

       33
       33
       +
         postPatch = "patchShebangs .";

     

       34
       34
       +
       

     

       23
       35
        
         vendorHash = null;

     

       24
       36
        
       

     

       25
       25
       -
         nativeBuildInputs = [ go-md2man installShellFiles util-linux ];

     

       37
       37
       +
         strictDeps = true;

     

       38
       38
       +
       

     

       39
       39
       +
         nativeBuildInputs = [

     

       40
       40
       +
           util-linux

     

       41
       41
       +
         ] ++ lib.optional withMan go-md2man;

     

       26
       42
        
       

     

       27
       27
       -
         buildInputs = [ btrfs-progs ];

     

       43
       43
       +
         buildInputs = lib.optional btrfsSupport btrfs-progs;

     

       28
       44
        
       

     

       29
       29
       -
         BUILDTAGS = lib.optionals (btrfs-progs == null) [ "no_btrfs" ];

     

       45
       45
       +
         tags = lib.optional (!btrfsSupport) "no_btrfs";

     

       46
       46
       +
       

     

       47
       47
       +
         makeFlags = [

     

       48
       48
       +
           "PREFIX=${placeholder "out"}"

     

       49
       49
       +
       

     

       50
       50
       +
           "BUILDTAGS=${toString tags}"

     

       51
       51
       +
           "REVISION=${src.rev}"

     

       52
       52
       +
           "VERSION=v${version}"

     

       53
       53
       +
         ];

     

       54
       54
       +
       

     

       55
       55
       +
         installTargets = [

     

       56
       56
       +
           "install"

     

       57
       57
       +
           "install-doc"

     

       58
       58
       +
         ] ++ lib.optional withMan "install-man";

     

       30
       59
        
       

     

       31
       60
        
         buildPhase = ''

     

       32
       61
        
           runHook preBuild

     

       33
       33
       -
           patchShebangs .

     

       34
       34
       -
           make binaries "VERSION=v${version}" "REVISION=${src.rev}"

     

       62
       62
       +
           make $makeFlags

     

       35
       63
        
           runHook postBuild

     

       36
       64
        
         '';

     

       37
       65
        
       

     

       38
       66
        
         installPhase = ''

     

       39
       67
        
           runHook preInstall

     

       40
       40
       -
           install -Dm555 bin/* -t $out/bin

     

       41
       41
       -
           installShellCompletion --bash contrib/autocomplete/ctr

     

       42
       42
       -
           installShellCompletion --zsh --name _ctr contrib/autocomplete/zsh_autocomplete

     

       68
       68
       +
           make $makeFlags $installTargets

     

       43
       69
        
           runHook postInstall

     

       44
       70
        
         '';

     

       45
       71
        
       

     

       46
       46
       -
         passthru.tests = { inherit (nixosTests) docker; } // kubernetes.tests;

     

       72
       72
       +
         passthru = {

     

       73
       73
       +
           tests = lib.optionalAttrs stdenv.hostPlatform.isLinux (

     

       74
       74
       +
             {

     

       75
       75
       +
               cross =

     

       76
       76
       +
                 let

     

       77
       77
       +
                   systemString = if stdenv.buildPlatform.isAarch64 then "gnu64" else "aarch64-multiplatform";

     

       78
       78
       +
                 in

     

       79
       79
       +
                 pkgsCross.${systemString}.containerd;

     

       47
       80
        
       

     

       48
       48
       -
         meta = with lib; {

     

       49
       49
       -
           changelog = "https://github.com/containerd/containerd/releases/tag/${src.rev}";

     

       81
       81
       +
               inherit (nixosTests) docker;

     

       82
       82
       +
             }

     

       83
       83
       +
             // kubernetes.tests

     

       84
       84
       +
           );

     

       85
       85
       +
       

     

       86
       86
       +
           updateScript = nix-update-script { };

     

       87
       87
       +
         };

     

       88
       88
       +
       

     

       89
       89
       +
         meta = {

     

       90
       90
       +
           description = "Daemon to control runC";

     

       50
       91
        
           homepage = "https://containerd.io/";

     

       51
       51
       -
           description = "Daemon to control runC";

     

       52
       52
       -
           license = licenses.asl20;

     

       53
       53
       -
           maintainers = with maintainers; [ offline vdemeester ];

     

       54
       54
       -
           platforms = platforms.linux;

     

       92
       92
       +
           changelog = "https://github.com/containerd/containerd/releases/tag/${version}";

     

       93
       93
       +
           license = lib.licenses.asl20;

     

       94
       94
       +
           maintainers = with lib.maintainers; [

     

       95
       95
       +
             offline

     

       96
       96
       +
             vdemeester

     

       97
       97
       +
             getchoo

     

       98
       98
       +
           ];

     

       99
       99
       +
           mainProgram = "containerd";

     

       100
       100
       +
           platforms = lib.platforms.linux;

     

       55
       101
        
         };

     

       56
       102
        
       }