diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2016-02-14 08:33:51 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2016-02-14 08:33:51 +0100 |
| commit | d039c879845ddcde6108203781e4b001c409e2c2 (patch) | |
| tree | 1f9e2a99d95c8866ddbef81b4bfa6a49ce979451 /pkgs/applications/virtualization | |
| parent | 34922a3951a0ada7af4fe808250abaf5feb4e28e (diff) | |
| parent | 6a036d9fca013265b4109ffcaf6df62efa010fa3 (diff) | |
| download | nixlib-d039c879845ddcde6108203781e4b001c409e2c2.tar nixlib-d039c879845ddcde6108203781e4b001c409e2c2.tar.gz nixlib-d039c879845ddcde6108203781e4b001c409e2c2.tar.bz2 nixlib-d039c879845ddcde6108203781e4b001c409e2c2.tar.lz nixlib-d039c879845ddcde6108203781e4b001c409e2c2.tar.xz nixlib-d039c879845ddcde6108203781e4b001c409e2c2.tar.zst nixlib-d039c879845ddcde6108203781e4b001c409e2c2.zip | |
Merge branch 'master' into closure-size
Diffstat (limited to 'pkgs/applications/virtualization')
| -rw-r--r-- | pkgs/applications/virtualization/docker/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/applications/virtualization/rkt/default.nix | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix index 54c9ed7b1ab2..14d0fd566d85 100644 --- a/pkgs/applications/virtualization/docker/default.nix +++ b/pkgs/applications/virtualization/docker/default.nix @@ -11,13 +11,13 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "docker-${version}"; - version = "1.9.1"; + version = "1.10.0"; src = fetchFromGitHub { owner = "docker"; repo = "docker"; rev = "v${version}"; - sha256 = "1mhi4y820h2wxz6hqmr95c7yvklyw578dd9c83jr463w7rq0rgr6"; + sha256 = "0c3a504gjdh4mxvifi0wcppqhd786d1gxncf04dqlq3l5wisfbbw"; }; buildInputs = [ diff --git a/pkgs/applications/virtualization/rkt/default.nix b/pkgs/applications/virtualization/rkt/default.nix index 43228b255a24..ca7400c9f4a4 100644 --- a/pkgs/applications/virtualization/rkt/default.nix +++ b/pkgs/applications/virtualization/rkt/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, autoreconfHook, acl, go, file, git, wget, gnupg1, squashfsTools, +{ stdenv, lib, autoreconfHook, acl, go, file, git, wget, gnupg1, trousers, squashfsTools, cpio, fetchurl, fetchFromGitHub, iptables, systemd, makeWrapper }: let @@ -9,7 +9,7 @@ let stage1Flavours = [ "coreos" "fly" "host" ]; in stdenv.mkDerivation rec { - version = "0.15.0"; + version = "1.0.0"; name = "rkt-${version}"; BUILDDIR="build-${name}"; @@ -17,7 +17,7 @@ in stdenv.mkDerivation rec { rev = "v${version}"; owner = "coreos"; repo = "rkt"; - sha256 = "1pw14r38p8sdkma37xx0yy3zx5yxqc12zj35anmlbmrgw4vdgavf"; + sha256 = "1m76hzx550dh35jpb8m46ks04ac3dfy4rg054v035rpwgh50ac6h"; }; stage1BaseImage = fetchurl { @@ -26,7 +26,7 @@ in stdenv.mkDerivation rec { }; buildInputs = [ - autoreconfHook go file git wget gnupg1 squashfsTools cpio acl systemd + autoreconfHook go file git wget gnupg1 trousers squashfsTools cpio acl systemd makeWrapper ]; |