public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #5880 from puffnfresh/feature/fix-upgrade-docker

Browse Source 
Fix and upgrade Docker
This commit is contained in:
Austin Seipp 2015-01-21 01:35:41 -06:00
commit 4b76c1f897
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/applications/virtualization/docker/default.nix
View File

@ -3,11 +3,11 @@ btrfsProgs, iptables, bash, e2fsprogs, xz}:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "docker-${version}"; name = "docker-${version}";
version = "1.3.3"; version = "1.4.1";
src = fetchurl { src = fetchurl {
url = "https://github.com/dotcloud/docker/archive/v${version}.tar.gz"; 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]; buildInputs = [ makeWrapper go sqlite lxc iproute bridge_utils devicemapper btrfsProgs iptables e2fsprogs];

4
pkgs/top-level/all-packages.nix
View File

@ -9594,7 +9594,9 @@ let
dmtx-utils = callPackage (import ../tools/graphics/dmtx-utils) { dmtx-utils = callPackage (import ../tools/graphics/dmtx-utils) {
}; };
docker = callPackage ../applications/virtualization/docker { }; docker = callPackage ../applications/virtualization/docker {
go = go_1_3;
};
doodle = callPackage ../applications/search/doodle { }; doodle = callPackage ../applications/search/doodle { };