diff options
| author | Jaka Hudoklin <jakahudoklin@gmail.com> | 2015-08-29 18:25:39 +0200 |
|---|---|---|
| committer | Jaka Hudoklin <jakahudoklin@gmail.com> | 2015-08-29 18:25:39 +0200 |
| commit | ff0575a2f1538ec07425637f4dea7cb0c6306d02 (patch) | |
| tree | a6d93636dbe2b0d10bec8b457e11b3d240b7a5cc /pkgs/applications/virtualization | |
| parent | 46203a790da3d4953f7830c281441a84aa4916ee (diff) | |
| download | nixlib-ff0575a2f1538ec07425637f4dea7cb0c6306d02.tar nixlib-ff0575a2f1538ec07425637f4dea7cb0c6306d02.tar.gz nixlib-ff0575a2f1538ec07425637f4dea7cb0c6306d02.tar.bz2 nixlib-ff0575a2f1538ec07425637f4dea7cb0c6306d02.tar.lz nixlib-ff0575a2f1538ec07425637f4dea7cb0c6306d02.tar.xz nixlib-ff0575a2f1538ec07425637f4dea7cb0c6306d02.tar.zst nixlib-ff0575a2f1538ec07425637f4dea7cb0c6306d02.zip | |
docker: add blkid from utillinux to path
Diffstat (limited to 'pkgs/applications/virtualization')
| -rw-r--r-- | pkgs/applications/virtualization/docker/default.nix | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix index c3b141cba818..223d31751799 100644 --- a/pkgs/applications/virtualization/docker/default.nix +++ b/pkgs/applications/virtualization/docker/default.nix @@ -1,15 +1,15 @@ { stdenv, fetchFromGitHub, makeWrapper, go, lxc, sqlite, iproute, bridge-utils, devicemapper, -btrfsProgs, iptables, bash, e2fsprogs, xz}: +btrfsProgs, iptables, bash, e2fsprogs, xz, utillinux}: stdenv.mkDerivation rec { name = "docker-${version}"; - version = "1.7.1"; + version = "1.8.1"; src = fetchFromGitHub { owner = "docker"; repo = "docker"; rev = "v${version}"; - sha256 = "0r0j8aj1a7lbnc9piznp02h5n2gdw3v3n4q2ipmapi9ax0wj82lz"; + sha256 = "0nwd5wsw9f50jh4s5c5sfd6hnyh3g2kmxcrid36y1phabh30yrcz"; }; buildInputs = [ makeWrapper go sqlite lxc iproute bridge-utils devicemapper btrfsProgs iptables e2fsprogs ]; @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { installPhase = '' install -Dm755 ./bundles/${version}/dynbinary/docker-${version} $out/libexec/docker/docker install -Dm755 ./bundles/${version}/dynbinary/dockerinit-${version} $out/libexec/docker/dockerinit - makeWrapper $out/libexec/docker/docker $out/bin/docker --prefix PATH : "${iproute}/sbin:sbin:${lxc}/bin:${iptables}/sbin:${e2fsprogs}/sbin:${xz}/bin" + makeWrapper $out/libexec/docker/docker $out/bin/docker --prefix PATH : "${iproute}/sbin:sbin:${lxc}/bin:${iptables}/sbin:${e2fsprogs}/sbin:${xz}/bin:${utillinux}/bin" # systemd install -Dm644 ./contrib/init/systemd/docker.service $out/etc/systemd/system/docker.service |