diff options
| author | Domen Kožar <domen@dev.si> | 2015-08-26 13:55:57 +0200 |
|---|---|---|
| committer | Domen Kožar <domen@dev.si> | 2015-08-26 13:56:18 +0200 |
| commit | c2841a2221a14b00b43d4774a7353621792b0d5b (patch) | |
| tree | b2bc1c2f3884a7cfc2cab075f3ef5aa6e3e9a645 | |
| parent | 4825906186a7817f8b72bf83aa924fc46014fa68 (diff) | |
| download | nixpkgs-c2841a2221a14b00b43d4774a7353621792b0d5b.tar nixpkgs-c2841a2221a14b00b43d4774a7353621792b0d5b.tar.gz nixpkgs-c2841a2221a14b00b43d4774a7353621792b0d5b.tar.bz2 nixpkgs-c2841a2221a14b00b43d4774a7353621792b0d5b.tar.lz nixpkgs-c2841a2221a14b00b43d4774a7353621792b0d5b.tar.xz nixpkgs-c2841a2221a14b00b43d4774a7353621792b0d5b.tar.zst nixpkgs-c2841a2221a14b00b43d4774a7353621792b0d5b.zip | |
docker: 1.7 -> 1.8.1, fix build (go 1.4)
| -rw-r--r-- | pkgs/applications/virtualization/docker/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix index c3b141cba81..b915e744358 100644 --- a/pkgs/applications/virtualization/docker/default.nix +++ b/pkgs/applications/virtualization/docker/default.nix @@ -3,13 +3,13 @@ btrfsProgs, iptables, bash, e2fsprogs, xz}: 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 ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f699ebb7ff2..16b652d8ea0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11074,7 +11074,7 @@ let dmtx-utils = callPackage (import ../tools/graphics/dmtx-utils) { }; - docker = callPackage ../applications/virtualization/docker { }; + docker = callPackage ../applications/virtualization/docker { go = go_1_4; }; doodle = callPackage ../applications/search/doodle { }; |