diff options
author | Paul Colomiets <paul@colomiets.name> | 2014-07-28 01:00:59 +0300 |
---|---|---|
committer | Jaka Hudoklin <jakahudoklin@gmail.com> | 2014-07-28 21:45:49 +0200 |
commit | 9bc1676e5ab6900697e7b34c50a3ca7b48f6a258 (patch) | |
tree | 38acdb2ae7ffd262c50538028a29ef13730ff44e /pkgs/applications/virtualization/docker/default.nix | |
parent | 88a8b004c6cd8aa4e67cf4400077452df9b260ec (diff) | |
download | nixpkgs-9bc1676e5ab6900697e7b34c50a3ca7b48f6a258.tar nixpkgs-9bc1676e5ab6900697e7b34c50a3ca7b48f6a258.tar.gz nixpkgs-9bc1676e5ab6900697e7b34c50a3ca7b48f6a258.tar.bz2 nixpkgs-9bc1676e5ab6900697e7b34c50a3ca7b48f6a258.tar.lz nixpkgs-9bc1676e5ab6900697e7b34c50a3ca7b48f6a258.tar.xz nixpkgs-9bc1676e5ab6900697e7b34c50a3ca7b48f6a258.tar.zst nixpkgs-9bc1676e5ab6900697e7b34c50a3ca7b48f6a258.zip |
Upgrade docker to 1.1.2 and add docker module
This version of module has disabled socketActivation, because until nixos upgrade systemd to at least 214, systemd does not support SocketGroup. So socket is created with "root" group when socketActivation enabled. Should be fixed as soon as systemd upgraded. Includes changes from #3015 and supersedes #3028
Diffstat (limited to 'pkgs/applications/virtualization/docker/default.nix')
-rw-r--r-- | pkgs/applications/virtualization/docker/default.nix | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix index d951fe124c9..4a488a381ab 100644 --- a/pkgs/applications/virtualization/docker/default.nix +++ b/pkgs/applications/virtualization/docker/default.nix @@ -3,24 +3,21 @@ btrfsProgs, iptables, bash}: stdenv.mkDerivation rec { name = "docker-${version}"; - version = "0.10.0"; + version = "1.1.2"; src = fetchurl { url = "https://github.com/dotcloud/docker/archive/v${version}.tar.gz"; - sha256 = "14gmx119hd3j0c6rbks2mm83hk46s5wnnyvj8rhn25h0yp39pm5q"; + sha256 = "1pa6k3gx940ap3r96xdry6apzkm0ymqra92b2mrp25b25264cqcy"; }; - phases = ["unpackPhase" "preBuild" "buildPhase" "installPhase"]; - buildInputs = [ makeWrapper go sqlite lxc iproute bridge_utils devicemapper btrfsProgs iptables ]; - preBuild = '' - patchShebangs ./hack - ''; + dontStrip = true; buildPhase = '' + patchShebangs ./hack export AUTO_GOPATH=1 - export DOCKER_GITCOMMIT="867b2a90c228f62cdcd44907ceef279a2d8f1ac5" + export DOCKER_GITCOMMIT="d84a070" ./hack/make.sh dynbinary ''; @@ -41,7 +38,7 @@ stdenv.mkDerivation rec { homepage = http://www.docker.io/; description = "An open source project to pack, ship and run any application as a lightweight container"; license = licenses.asl20; - maintainers = with maintainers; [ offline ]; + maintainers = with maintainers; [ offline tailhook ]; platforms = platforms.linux; }; } |