diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2015-01-31 19:32:23 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2015-01-31 19:34:57 +0100 |
| commit | dbae4f109f0ab3f676c8aa104d1f9bebcee85324 (patch) | |
| tree | 18c61fd667b95bf3a3322e5f40161d2028b3e42c /pkgs/applications/virtualization | |
| parent | 5dab625862a5690a35c122f3749eee31879a2415 (diff) | |
| parent | b50cabf2d4c1175da48af4df3132b246aa1c8d12 (diff) | |
| download | nixpkgs-dbae4f109f0ab3f676c8aa104d1f9bebcee85324.tar nixpkgs-dbae4f109f0ab3f676c8aa104d1f9bebcee85324.tar.gz nixpkgs-dbae4f109f0ab3f676c8aa104d1f9bebcee85324.tar.bz2 nixpkgs-dbae4f109f0ab3f676c8aa104d1f9bebcee85324.tar.lz nixpkgs-dbae4f109f0ab3f676c8aa104d1f9bebcee85324.tar.xz nixpkgs-dbae4f109f0ab3f676c8aa104d1f9bebcee85324.tar.zst nixpkgs-dbae4f109f0ab3f676c8aa104d1f9bebcee85324.zip | |
Merge branch 'master' into staging
Conflicts (relatively simple): pkgs/applications/audio/spotify/default.nix pkgs/build-support/cc-wrapper/default.nix pkgs/development/compilers/cryptol/1.8.x.nix
Diffstat (limited to 'pkgs/applications/virtualization')
| -rw-r--r-- | pkgs/applications/virtualization/docker/default.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix index 3483b0ac6d2..d0fabb0d3c9 100644 --- a/pkgs/applications/virtualization/docker/default.nix +++ b/pkgs/applications/virtualization/docker/default.nix @@ -3,11 +3,11 @@ btrfsProgs, iptables, bash, e2fsprogs, xz}: stdenv.mkDerivation rec { name = "docker-${version}"; - version = "1.3.3"; + version = "1.4.1"; src = fetchurl { url = "https://github.com/dotcloud/docker/archive/v${version}.tar.gz"; - sha256 = "1jxvbm81zinh0achh8r2aac3x650aqiwn3w6iq1fg57fir1lw1cw"; + sha256 = "0d98c7dfzv1gj5ssbyln4pbkbml6rrmy22v5v4ricbsx9qhhwc1l"; }; buildInputs = [ makeWrapper go sqlite lxc iproute bridge_utils devicemapper btrfsProgs iptables e2fsprogs]; |