From 6e0c30afbfc22b5d441731233447e1982faaaa04 Mon Sep 17 00:00:00 2001
From: Brian McKenna <brian@simpleenergy.com>
Date: Tue, 20 Jan 2015 19:42:42 -0700
Subject: [PATCH 1/2] Fix Docker SQLite and setgid problems

Docker doesn't support Go 1.4 yet. It compiles but it causes multiple
bugs. We should use Go 1.3 to build until the next release.

This seems to fix the following two problems I've been having:

https://github.com/docker/docker/issues/9649

https://bugzilla.redhat.com/show_bug.cgi?id=1169151
---
 pkgs/top-level/all-packages.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e2cdbf6b060..b6688d687f0 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9594,7 +9594,9 @@ let
   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 { };
 

From a26b8bcb5de587e622b2309484263805a1e9c6a5 Mon Sep 17 00:00:00 2001
From: Brian McKenna <brian@simpleenergy.com>
Date: Tue, 20 Jan 2015 19:49:10 -0700
Subject: [PATCH 2/2] Upgrade to Docker 1.4

---
 pkgs/applications/virtualization/docker/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix
index 3483b0ac6d2..d0fabb0d3c9 100644
--- a/pkgs/applications/virtualization/docker/default.nix
+++ b/pkgs/applications/virtualization/docker/default.nix
@@ -3,11 +3,11 @@ btrfsProgs, iptables, bash, e2fsprogs, xz}:
 
 stdenv.mkDerivation rec {
   name = "docker-${version}";
-  version = "1.3.3";
+  version = "1.4.1";
 
   src = fetchurl {
     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];