Merge branch 'master' into staging

4 files changed, 178 insertions, 178 deletions

diff --git a/pkgs/tools/admin/gtk-vnc/default.nix b/pkgs/tools/admin/gtk-vnc/default.nix
index 9ef9755d6bcb..cf58f75aaccc 100644
--- a/pkgs/tools/admin/gtk-vnc/default.nix
+++ b/pkgs/tools/admin/gtk-vnc/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, gobjectIntrospection
-, python, gtk, pygtk, gnutls, cairo, libtool, glib, pkgconfig, libtasn1
+, python, gtk2, pygtk, gnutls, cairo, libtool, glib, pkgconfig, libtasn1
 , libffi, cyrus_sasl, intltool, perl, perlPackages, libpulseaudio
-, kbproto, libX11, libXext, xextproto, pygobject, libgcrypt, gtk3, vala_0_23
+, kbproto, libX11, libXext, xextproto, pygobject2, libgcrypt, gtk3, vala_0_23
 , pygobject3, libogg, enableGTK3 ? false, libgpgerror }:
 
 stdenv.mkDerivation rec {
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
     python gnutls cairo libtool pkgconfig glib libffi libgcrypt
     intltool cyrus_sasl libpulseaudio perl perlPackages.TextCSV
     gobjectIntrospection libogg libgpgerror
-  ] ++ (if enableGTK3 then [ gtk3 vala_0_23 pygobject3 ] else [ gtk pygtk pygobject ]);
+  ] ++ (if enableGTK3 then [ gtk3 vala_0_23 pygobject3 ] else [ gtk2 pygtk pygobject2 ]);
 
   NIX_CFLAGS_COMPILE = "-fstack-protector-all";
   configureFlags = [
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
   ];
 
   makeFlags = stdenv.lib.optionalString (!enableGTK3)
-    "CODEGENDIR=${pygobject}/share/pygobject/2.0/codegen/ DEFSDIR=${pygtk}/share/pygtk/2.0/defs/";
+    "CODEGENDIR=${pygobject2}/share/pygobject/2.0/codegen/ DEFSDIR=${pygtk}/share/pygtk/2.0/defs/";
 
   # Fix broken .la files
   preFixup = ''
diff --git a/pkgs/tools/admin/lxd/default.nix b/pkgs/tools/admin/lxd/default.nix
index be7d534b3d6e..40647f73379b 100644
--- a/pkgs/tools/admin/lxd/default.nix
+++ b/pkgs/tools/admin/lxd/default.nix
@@ -14,7 +14,7 @@ buildGoPackage rec {
     sha256 = "1rs9g1snjymg6pjz5bj77zk5wbs0w8xmrfxzqs32w6zr1dxhf9hs";
   };
 
-  goDeps = ./deps.json;
+  goDeps = ./deps.nix;
 
   nativeBuildInputs = [ pkgconfig ];
   buildInputs = [ lxc ];
diff --git a/pkgs/tools/admin/lxd/deps.json b/pkgs/tools/admin/lxd/deps.json
deleted file mode 100644
index 1a0e2d3245f5..000000000000
--- a/pkgs/tools/admin/lxd/deps.json
+++ /dev/null
@@ -1,173 +0,0 @@
-[
-    {
-        "goPackagePath": "gopkg.in/yaml.v2",
-        "fetch": {
-            "type": "git",
-            "url": "https://gopkg.in/yaml.v2",
-            "rev": "a83829b6f1293c91addabc89d0571c246397bbf4",
-            "sha256": "1m4dsmk90sbi17571h6pld44zxz7jc4lrnl4f27dpd1l8g5xvjhh"
-        }
-    },
-    {
-        "goPackagePath": "golang.org/x/crypto",
-        "fetch": {
-            "type": "git",
-            "url": "https://go.googlesource.com/crypto",
-            "rev": "575fdbe86e5dd89229707ebec0575ce7d088a4a6",
-            "sha256": "1kgv1mkw9y404pk3lcwbs0vgl133mwyp294i18jg9hp10s5d56xa"
-        }
-    },
-    {
-        "goPackagePath": "github.com/golang/protobuf",
-        "fetch": {
-            "type": "git",
-            "url": "https://github.com/golang/protobuf",
-            "rev": "59b73b37c1e45995477aae817e4a653c89a858db",
-            "sha256": "1dx22jvhvj34ivpr7gw01fncg9yyx35mbpal4mpgnqka7ajmgjsa"
-        }
-    },
-    {
-        "goPackagePath": "gopkg.in/tomb.v2",
-        "fetch": {
-            "type": "git",
-            "url": "https://gopkg.in/tomb.v2",
-            "rev": "14b3d72120e8d10ea6e6b7f87f7175734b1faab8",
-            "sha256": "1nza31jvkpka5431c4bdbirvjdy36b1b55sbzljqhqih25jrcjx5"
-        }
-    },
-    {
-        "goPackagePath": "github.com/gorilla/websocket",
-        "fetch": {
-            "type": "git",
-            "url": "https://github.com/gorilla/websocket",
-            "rev": "a622679ebd7a3b813862379232f645f8e690e43f",
-            "sha256": "1nc9jbcmgya1i6dmf6sbcqsnxi9hbjg6dz1z0k7zmc6xdwlq0y4q"
-        }
-    },
-    {
-        "goPackagePath": "github.com/syndtr/gocapability",
-        "fetch": {
-            "type": "git",
-            "url": "https://github.com/syndtr/gocapability",
-            "rev": "2c00daeb6c3b45114c80ac44119e7b8801fdd852",
-            "sha256": "1x7jdcg2r5pakjf20q7bdiidfmv7vcjiyg682186rkp2wz0yws0l"
-        }
-    },
-    {
-        "goPackagePath": "gopkg.in/inconshreveable/log15.v2",
-        "fetch": {
-            "type": "git",
-            "url": "https://gopkg.in/inconshreveable/log15.v2",
-            "rev": "b105bd37f74e5d9dc7b6ad7806715c7a2b83fd3f",
-            "sha256": "18rldvi60i7b3lljfrsqgcc24gdkw2pcixxydznyggaqhh96l6a8"
-        }
-    },
-    {
-        "goPackagePath": "github.com/gorilla/mux",
-        "fetch": {
-            "type": "git",
-            "url": "https://github.com/gorilla/mux",
-            "rev": "8096f47503459bcc74d1f4c487b7e6e42e5746b5",
-            "sha256": "0163fm9jsh54df471mx9kfhdg0070klqhw9ja0qwdzqibxq791b9"
-        }
-    },
-    {
-        "goPackagePath": "github.com/pborman/uuid",
-        "fetch": {
-            "type": "git",
-            "url": "https://github.com/pborman/uuid",
-            "rev": "ca53cad383cad2479bbba7f7a1a05797ec1386e4",
-            "sha256": "0rcx669bbjkkwdlw81spnra4ffgzd4rbpywnrj3w41m9vq6mk1gn"
-        }
-    },
-    {
-        "goPackagePath": "gopkg.in/flosch/pongo2.v3",
-        "fetch": {
-            "type": "git",
-            "url": "https://gopkg.in/flosch/pongo2.v3",
-            "rev": "5e81b817a0c48c1c57cdf1a9056cf76bdee02ca9",
-            "sha256": "0fd7d79644zmcirsb1gvhmh0l5vb5nyxmkzkvqpmzzcg6yfczph8"
-        }
-    },
-    {
-        "goPackagePath": "github.com/olekukonko/tablewriter",
-        "fetch": {
-            "type": "git",
-            "url": "https://github.com/olekukonko/tablewriter",
-            "rev": "cca8bbc0798408af109aaaa239cbd2634846b340",
-            "sha256": "0f9ph3z7lh6p6gihbl1461j9yq5qiaqxr9mzdkp512n18v89ml48"
-        }
-    },
-    {
-        "goPackagePath": "github.com/mattn/go-sqlite3",
-        "fetch": {
-            "type": "git",
-            "url": "https://github.com/mattn/go-sqlite3",
-            "rev": "b4142c444a8941d0d92b0b7103a24df9cd815e42",
-            "sha256": "0xq2y4am8dz9w9aaq24s1npg1sn8pf2gn4nki73ylz2fpjwq9vla"
-        }
-    },
-    {
-        "goPackagePath": "gopkg.in/lxc/go-lxc.v2",
-        "fetch": {
-            "type": "git",
-            "url": "https://gopkg.in/lxc/go-lxc.v2",
-            "rev": "8f9e220b36393c03854c2d224c5a55644b13e205",
-            "sha256": "1dc1n2561k3pxbm2zzh3qwlh30bcb2k9v22ghvr7ps2j9lmhs0ip"
-        }
-    },
-    {
-        "goPackagePath": "github.com/mattn/go-runewidth",
-        "fetch": {
-            "type": "git",
-            "url": "https://github.com/mattn/go-runewidth",
-            "rev": "d6bea18f789704b5f83375793155289da36a3c7f",
-            "sha256": "1hnigpn7rjbwd1ircxkyx9hvi0xmxr32b2jdy2jzw6b3jmcnz1fs"
-        }
-    },
-    {
-        "goPackagePath": "github.com/coreos/go-systemd",
-        "fetch": {
-            "type": "git",
-            "url": "https://github.com/coreos/go-systemd",
-            "rev": "a606a1e936df81b70d85448221c7b1c6d8a74ef1",
-            "sha256": "0fhan564swp982dnzzspb6jzfdl453489c0qavh65g3shy5x8x28"
-        }
-    },
-    {
-        "goPackagePath": "github.com/dustinkirkland/golang-petname",
-        "fetch": {
-            "type": "git",
-            "url": "https://github.com/dustinkirkland/golang-petname",
-            "rev": "2182cecef7f257230fc998bc351a08a5505f5e6c",
-            "sha256": "1xagj34y5rxl7rykhil8iqxlls9rbgcxgdvgfp7kg39pinw83arl"
-        }
-    },
-    {
-        "goPackagePath": "github.com/gorilla/context",
-        "fetch": {
-            "type": "git",
-            "url": "https://github.com/gorilla/context",
-            "rev": "215affda49addc4c8ef7e2534915df2c8c35c6cd",
-            "sha256": "1ybvjknncyx1f112mv28870n0l7yrymsr0861vzw10gc4yn1h97g"
-        }
-    },
-    {
-        "goPackagePath": "github.com/mattn/go-colorable",
-        "fetch": {
-            "type": "git",
-            "url": "https://github.com/mattn/go-colorable",
-            "rev": "3dac7b4f76f6e17fb39b768b89e3783d16e237fe",
-            "sha256": "08680mba8hh2rghymqbzd4m40r9k765w5kbzvrif9ngd6h85qnw6"
-        }
-    },
-    {
-        "goPackagePath": "github.com/gosexy/gettext",
-        "fetch": {
-            "type": "git",
-            "url": "https://github.com/gosexy/gettext",
-            "rev": "305f360aee30243660f32600b87c3c1eaa947187",
-            "sha256": "0sm7ziv56ms0lrk30ipbl6i17azar3a44dd2xvr011442zs5ym09"
-        }
-    }
-]
diff --git a/pkgs/tools/admin/lxd/deps.nix b/pkgs/tools/admin/lxd/deps.nix
new file mode 100644
index 000000000000..7325100bb3ad
--- /dev/null
+++ b/pkgs/tools/admin/lxd/deps.nix
@@ -0,0 +1,173 @@
+[
+  {
+    goPackagePath = "gopkg.in/yaml.v2";
+    fetch = {
+      type = "git";
+      url = "https://gopkg.in/yaml.v2";
+      rev = "a83829b6f1293c91addabc89d0571c246397bbf4";
+      sha256 = "1m4dsmk90sbi17571h6pld44zxz7jc4lrnl4f27dpd1l8g5xvjhh";
+    };
+  }
+  {
+    goPackagePath = "golang.org/x/crypto";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/crypto";
+      rev = "575fdbe86e5dd89229707ebec0575ce7d088a4a6";
+      sha256 = "1kgv1mkw9y404pk3lcwbs0vgl133mwyp294i18jg9hp10s5d56xa";
+    };
+  }
+  {
+    goPackagePath = "github.com/golang/protobuf";
+    fetch = {
+      type = "git";
+      url = "https://github.com/golang/protobuf";
+      rev = "59b73b37c1e45995477aae817e4a653c89a858db";
+      sha256 = "1dx22jvhvj34ivpr7gw01fncg9yyx35mbpal4mpgnqka7ajmgjsa";
+    };
+  }
+  {
+    goPackagePath = "gopkg.in/tomb.v2";
+    fetch = {
+      type = "git";
+      url = "https://gopkg.in/tomb.v2";
+      rev = "14b3d72120e8d10ea6e6b7f87f7175734b1faab8";
+      sha256 = "1nza31jvkpka5431c4bdbirvjdy36b1b55sbzljqhqih25jrcjx5";
+    };
+  }
+  {
+    goPackagePath = "github.com/gorilla/websocket";
+    fetch = {
+      type = "git";
+      url = "https://github.com/gorilla/websocket";
+      rev = "a622679ebd7a3b813862379232f645f8e690e43f";
+      sha256 = "1nc9jbcmgya1i6dmf6sbcqsnxi9hbjg6dz1z0k7zmc6xdwlq0y4q";
+    };
+  }
+  {
+    goPackagePath = "github.com/syndtr/gocapability";
+    fetch = {
+      type = "git";
+      url = "https://github.com/syndtr/gocapability";
+      rev = "2c00daeb6c3b45114c80ac44119e7b8801fdd852";
+      sha256 = "1x7jdcg2r5pakjf20q7bdiidfmv7vcjiyg682186rkp2wz0yws0l";
+    };
+  }
+  {
+    goPackagePath = "gopkg.in/inconshreveable/log15.v2";
+    fetch = {
+      type = "git";
+      url = "https://gopkg.in/inconshreveable/log15.v2";
+      rev = "b105bd37f74e5d9dc7b6ad7806715c7a2b83fd3f";
+      sha256 = "18rldvi60i7b3lljfrsqgcc24gdkw2pcixxydznyggaqhh96l6a8";
+    };
+  }
+  {
+    goPackagePath = "github.com/gorilla/mux";
+    fetch = {
+      type = "git";
+      url = "https://github.com/gorilla/mux";
+      rev = "8096f47503459bcc74d1f4c487b7e6e42e5746b5";
+      sha256 = "0163fm9jsh54df471mx9kfhdg0070klqhw9ja0qwdzqibxq791b9";
+    };
+  }
+  {
+    goPackagePath = "github.com/pborman/uuid";
+    fetch = {
+      type = "git";
+      url = "https://github.com/pborman/uuid";
+      rev = "ca53cad383cad2479bbba7f7a1a05797ec1386e4";
+      sha256 = "0rcx669bbjkkwdlw81spnra4ffgzd4rbpywnrj3w41m9vq6mk1gn";
+    };
+  }
+  {
+    goPackagePath = "gopkg.in/flosch/pongo2.v3";
+    fetch = {
+      type = "git";
+      url = "https://gopkg.in/flosch/pongo2.v3";
+      rev = "5e81b817a0c48c1c57cdf1a9056cf76bdee02ca9";
+      sha256 = "0fd7d79644zmcirsb1gvhmh0l5vb5nyxmkzkvqpmzzcg6yfczph8";
+    };
+  }
+  {
+    goPackagePath = "github.com/olekukonko/tablewriter";
+    fetch = {
+      type = "git";
+      url = "https://github.com/olekukonko/tablewriter";
+      rev = "cca8bbc0798408af109aaaa239cbd2634846b340";
+      sha256 = "0f9ph3z7lh6p6gihbl1461j9yq5qiaqxr9mzdkp512n18v89ml48";
+    };
+  }
+  {
+    goPackagePath = "github.com/mattn/go-sqlite3";
+    fetch = {
+      type = "git";
+      url = "https://github.com/mattn/go-sqlite3";
+      rev = "b4142c444a8941d0d92b0b7103a24df9cd815e42";
+      sha256 = "0xq2y4am8dz9w9aaq24s1npg1sn8pf2gn4nki73ylz2fpjwq9vla";
+    };
+  }
+  {
+    goPackagePath = "gopkg.in/lxc/go-lxc.v2";
+    fetch = {
+      type = "git";
+      url = "https://gopkg.in/lxc/go-lxc.v2";
+      rev = "8f9e220b36393c03854c2d224c5a55644b13e205";
+      sha256 = "1dc1n2561k3pxbm2zzh3qwlh30bcb2k9v22ghvr7ps2j9lmhs0ip";
+    };
+  }
+  {
+    goPackagePath = "github.com/mattn/go-runewidth";
+    fetch = {
+      type = "git";
+      url = "https://github.com/mattn/go-runewidth";
+      rev = "d6bea18f789704b5f83375793155289da36a3c7f";
+      sha256 = "1hnigpn7rjbwd1ircxkyx9hvi0xmxr32b2jdy2jzw6b3jmcnz1fs";
+    };
+  }
+  {
+    goPackagePath = "github.com/coreos/go-systemd";
+    fetch = {
+      type = "git";
+      url = "https://github.com/coreos/go-systemd";
+      rev = "a606a1e936df81b70d85448221c7b1c6d8a74ef1";
+      sha256 = "0fhan564swp982dnzzspb6jzfdl453489c0qavh65g3shy5x8x28";
+    };
+  }
+  {
+    goPackagePath = "github.com/dustinkirkland/golang-petname";
+    fetch = {
+      type = "git";
+      url = "https://github.com/dustinkirkland/golang-petname";
+      rev = "2182cecef7f257230fc998bc351a08a5505f5e6c";
+      sha256 = "1xagj34y5rxl7rykhil8iqxlls9rbgcxgdvgfp7kg39pinw83arl";
+    };
+  }
+  {
+    goPackagePath = "github.com/gorilla/context";
+    fetch = {
+      type = "git";
+      url = "https://github.com/gorilla/context";
+      rev = "215affda49addc4c8ef7e2534915df2c8c35c6cd";
+      sha256 = "1ybvjknncyx1f112mv28870n0l7yrymsr0861vzw10gc4yn1h97g";
+    };
+  }
+  {
+    goPackagePath = "github.com/mattn/go-colorable";
+    fetch = {
+      type = "git";
+      url = "https://github.com/mattn/go-colorable";
+      rev = "3dac7b4f76f6e17fb39b768b89e3783d16e237fe";
+      sha256 = "08680mba8hh2rghymqbzd4m40r9k765w5kbzvrif9ngd6h85qnw6";
+    };
+  }
+  {
+    goPackagePath = "github.com/gosexy/gettext";
+    fetch = {
+      type = "git";
+      url = "https://github.com/gosexy/gettext";
+      rev = "305f360aee30243660f32600b87c3c1eaa947187";
+      sha256 = "0sm7ziv56ms0lrk30ipbl6i17azar3a44dd2xvr011442zs5ym09";
+    };
+  }
+]