summary refs log tree commit diff
path: root/nixos/tests
diff options
context:
space:
mode:
authorJaka Hudoklin <jakahudoklin@gmail.com>2016-09-13 15:59:18 +0200
committerGitHub <noreply@github.com>2016-09-13 15:59:18 +0200
commit7a9dd489d6200929c1f89c22441f286fc46b8170 (patch)
treeb2d5a060c2f30fd660a813bb22cadc5dd0231aff /nixos/tests
parent49ba0b7896a4e8f70c2c8e9571c814e5dd1d3931 (diff)
parent5d9c62541a3524fd2c035b75058a0cb412b61f95 (diff)
downloadnixpkgs-7a9dd489d6200929c1f89c22441f286fc46b8170.tar
nixpkgs-7a9dd489d6200929c1f89c22441f286fc46b8170.tar.gz
nixpkgs-7a9dd489d6200929c1f89c22441f286fc46b8170.tar.bz2
nixpkgs-7a9dd489d6200929c1f89c22441f286fc46b8170.tar.lz
nixpkgs-7a9dd489d6200929c1f89c22441f286fc46b8170.tar.xz
nixpkgs-7a9dd489d6200929c1f89c22441f286fc46b8170.tar.zst
nixpkgs-7a9dd489d6200929c1f89c22441f286fc46b8170.zip
Merge pull request #18481 from offlinehacker/pkgs/docker/1.12.1
docker: 1.10.3 -> 1.12.1
Diffstat (limited to 'nixos/tests')
-rw-r--r--nixos/tests/docker.nix3
1 files changed, 0 insertions, 3 deletions
diff --git a/nixos/tests/docker.nix b/nixos/tests/docker.nix
index 06e511d6e0b..1b57a94a05d 100644
--- a/nixos/tests/docker.nix
+++ b/nixos/tests/docker.nix
@@ -11,9 +11,6 @@ import ./make-test.nix ({ pkgs, ...} : {
       { config, pkgs, ... }:
         {
           virtualisation.docker.enable = true;
-          # FIXME: The default "devicemapper" storageDriver fails in NixOS VM
-          # tests.
-          virtualisation.docker.storageDriver = "overlay";
         };
     };