commit fc565fb8efa4b5e7c156339ef821b71b6ec56f84 · pyrox.dev/nixpkgs

+15 -8

pkgs/applications/virtualization/docker/default.nix

···

       44
       44
        
               rev = containerdRev;

     

       45
       45
        
               sha256 = containerdSha256;

     

       46
       46
        
             };

     

       47
       47
       +
       

     

       48
       48
       +
             # This should go into the containerd derivation once 1.0.0 is out

     

       49
       49
       +
             preBuild = ''

     

       50
       50
       +
               mkdir $(pwd)/vendor/src

     

       51
       51
       +
               mv $(pwd)/vendor/{github.com,golang.org,google.golang.org} $(pwd)/vendor/src/

     

       52
       52
       +
               ln -s $(pwd) vendor/src/github.com/containerd/containerd

     

       53
       53
       +
             '';

     

       47
       54
        
           });

     

       48
       55
        
           docker-tini = tini.overrideAttrs  (oldAttrs: rec {

     

       49
       56
        
             name = "docker-init";

     
···

       188
       195
        
           tiniSha256 = "0zj4kdis1vvc6dwn4gplqna0bs7v6d1y2zc8v80s3zi018inhznw";

     

       189
       196
        
         };

     

       190
       197
        
       

     

       191
       191
       -
         docker_17_07 = dockerGen rec {

     

       192
       192
       -
           version = "17.07.0-ce";

     

       193
       193
       -
           rev = "87847530f7176a48348d196f7c23bbd058052af1"; # git commit

     

       194
       194
       -
           sha256 = "0zw9zlzbd7il33ch17ypwpa73gsb930sf2njnphg7ylvnqp8qzsp";

     

       195
       195
       -
           runcRev = "2d41c047c83e09a6d61d464906feb2a2f3c52aa4";

     

       196
       196
       -
           runcSha256 = "0v5iv29ck6lkxvxh7a56gfrlgfs0bjvjhrq3p6qqv9qjzv825byq";

     

       197
       197
       -
           containerdRev = "3addd840653146c90a254301d6c3a663c7fd6429";

     

       198
       198
       -
           containerdSha256 = "0as4s5wd57pdh1cyavkccpgs46kvlhr41v07qrv0phzffdhq3d5j";

     

       198
       198
       +
         docker_17_09 = dockerGen rec {

     

       199
       199
       +
           version = "17.09.0-ce";

     

       200
       200
       +
           rev = "afdb6d44a80f777069885a9ee0e0f86cf841b1bb"; # git commit

     

       201
       201
       +
           sha256 = "03g0imdcxqx9y4hhyymxqzvm8bqg4cqrmb7sjbxfdgrhzh9kcn1p";

     

       202
       202
       +
           runcRev = "3f2f8b84a77f73d38244dd690525642a72156c64";

     

       203
       203
       +
           runcSha256 = "0vaagmav8443kmyxac2y1y5l2ipcs1c7gdmsnvj48y9bafqx72rq";

     

       204
       204
       +
           containerdRev = "06b9cb35161009dcb7123345749fef02f7cea8e0";

     

       205
       205
       +
           containerdSha256 = "10hms8a2nn69nfnwly6923jzx40c3slpsdhjhff4bxh36flpf9gd";

     

       199
       206
        
           tiniRev = "949e6facb77383876aeff8a6944dde66b3089574";

     

       200
       207
        
           tiniSha256 = "0zj4kdis1vvc6dwn4gplqna0bs7v6d1y2zc8v80s3zi018inhznw";

     

       201
       208
        
         };

+5 -5

pkgs/top-level/all-packages.nix

···

       9281
       9281
        
       

     

       9282
       9282
        
         libminc = callPackage ../development/libraries/libminc { };

     

       9283
       9283
        
       

     

       9284
       9284
       -
         libmirage = callPackage ../misc/emulators/cdemu/libmirage.nix { }; 

     

       9285
       9285
       -
         

     

       9284
       9284
       +
         libmirage = callPackage ../misc/emulators/cdemu/libmirage.nix { };

     

       9285
       9285
       +
       

     

       9286
       9286
        
         libmkv = callPackage ../development/libraries/libmkv { };

     

       9287
       9287
        
       

     

       9288
       9288
        
         libmms = callPackage ../development/libraries/libmms { };

     
···

       13981
       13981
        
       

     

       13982
       13982
        
         inherit (callPackage ../applications/virtualization/docker { })

     

       13983
       13983
        
           docker_17_06

     

       13984
       13984
       -
           docker_17_07;

     

       13984
       13984
       +
           docker_17_09;

     

       13985
       13985
        
       

     

       13986
       13986
       -
         docker = docker_17_06;

     

       13987
       13987
       -
         docker-edge = docker_17_07;

     

       13986
       13986
       +
         docker = docker_17_09;

     

       13987
       13987
       +
         docker-edge = docker_17_09;

     

       13988
       13988
        
       

     

       13989
       13989
        
         docker-proxy = callPackage ../applications/virtualization/docker/proxy.nix { };

     

       13990
       13990