From 0c2ed51f134f45a377c19eeb324f19d9258b0e2b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Fri, 4 Jan 2019 23:30:13 +0100
Subject: [PATCH] cloud-print-connector: 1.11 -> 1.16

---
 .../servers/cloud-print-connector/default.nix | 27 +++++-
 pkgs/servers/cloud-print-connector/deps.nix   | 85 ++++++++++---------
 2 files changed, 67 insertions(+), 45 deletions(-)

diff --git a/pkgs/servers/cloud-print-connector/default.nix b/pkgs/servers/cloud-print-connector/default.nix
index 3db3d9327031..76d925418550 100644
--- a/pkgs/servers/cloud-print-connector/default.nix
+++ b/pkgs/servers/cloud-print-connector/default.nix
@@ -1,24 +1,45 @@
-# This file was generated by https://github.com/kamilchm/go2nix v1.2.0
 { stdenv, buildGoPackage, fetchFromGitHub, avahi, cups }:
 
 # TODO: Add a service for gcp-cups-connector and perhaps some other
 # kind of configuration for the same thing that gcp-connector-util
 # provides.
 
+# Mic92 has an example module:
+# - https://github.com/Mic92/dotfiles/blob/ba2a01144cfdc71c829d872a3fc816c64663ad7f/nixos/vms/matchbox/modules/cloud-print-connector.nix
+
 buildGoPackage rec {
   name = "cloud-print-connector-unstable-${version}";
-  version = "1.11";
+  version = "1.16";
   rev = "481ad139cc023a3ba65e769f08f277368fa8a5de";
 
   goPackagePath = "github.com/google/cloud-print-connector";
 
+  subPackages = [
+    "gcp-connector-util"
+    "gcp-cups-connector"
+  ];
+
   src = fetchFromGitHub {
     owner = "google";
     repo = "cloud-print-connector";
-    sha256 = "1vryhhv92bsncy1bsx9j4graz3sz9ddmizakv2fdrns09mmcgchm";
+    sha256 = "0z2xad4wsv962rc1rspghfcfkz4nj2j5l5cm7xyn6qmsag0m8y2x";
     rev = "v${version}";
   };
 
+  # To compute a new go2nix deps.go file,
+  # change to the gcp-connector-util directory and create a nix-shell with avahi and
+  # cups in it.
+
+  # manually mirrored from launchpad because cloning failed due insecure http protocol
+  # {
+  #   goPackagePath = "launchpad.net/go-xdg/v0";
+  #   fetch = {
+  #     type = "git";
+  #     url = "https://github.com/Mic92/go-xdg";
+  #     rev = "b3fc6b3106d78701853b0caf62ebedae42769af2";
+  #     sha256 = "0fd68kkxzxjanpgannpys962bxzqdf8c1qvzk687hv504a3dp76f";
+  #   };
+  # }
   goDeps = ./deps.nix;
 
   buildInputs = [ avahi cups ];
diff --git a/pkgs/servers/cloud-print-connector/deps.nix b/pkgs/servers/cloud-print-connector/deps.nix
index 67901bdffeef..0547d48ea87e 100644
--- a/pkgs/servers/cloud-print-connector/deps.nix
+++ b/pkgs/servers/cloud-print-connector/deps.nix
@@ -1,48 +1,12 @@
-# This file was generated by https://github.com/kamilchm/go2nix v1.2.0
+# This file was generated by https://github.com/kamilchm/go2nix v1.3.0
 [
   {
     goPackagePath = "github.com/coreos/go-systemd";
     fetch = {
       type = "git";
       url = "https://github.com/coreos/go-systemd";
-      rev = "1f9909e51b2dab2487c26d64c8f2e7e580e4c9f5";
-      sha256 = "1cc76wcmnyhhhi03dsc11lmxjwkzy09k3zx3h78bg05z8lhry4vn";
-    };
-  }
-  {
-    goPackagePath = "github.com/urfave/cli";
-    fetch = {
-      type = "git";
-      url = "https://github.com/urfave/cli";
-      rev = "d70f47eeca3afd795160003bc6e28b001d60c67c";
-      sha256 = "1xm203qp4sdlvffcbag7v6mc2d6q61i25iiz3y9yqpy25jpcpgif";
-    };
-  }
-  {
-    goPackagePath = "golang.org/x/net";
-    fetch = {
-      type = "git";
-      url = "https://go.googlesource.com/net";
-      rev = "513929065c19401a1c7b76ecd942f9f86a0c061b";
-      sha256 = "19ziin0k3n45nccjbk094f61hr198wzqnas93cmcxdja8f8fz27q";
-    };
-  }
-  {
-    goPackagePath = "golang.org/x/oauth2";
-    fetch = {
-      type = "git";
-      url = "https://go.googlesource.com/oauth2";
-      rev = "f047394b6d14284165300fd82dad67edb3a4d7f6";
-      sha256 = "1l1a2iz1nmfmzzbjj1h8066prag4jvjqh13iv1jdlh05fgv6769i";
-    };
-  }
-  {
-    goPackagePath = "launchpad.net/go-xdg/v0";
-    fetch = {
-      type = "bzr";
-      url = "http://bazaar.launchpad.net/~chipaca/go-xdg/v0/";
-      rev = "10";
-      sha256 = "0fd68kkxzxjanpgannpys962bxzqdf8c1qvzk687hv504a3dp76f";
+      rev = "9002847aa1425fb6ac49077c0a630b3b67e0fbfd";
+      sha256 = "0d7xpcinzj18qc91rb6fjjrf9jnlzn775dqhp0n00n0gjg5rfksj";
     };
   }
   {
@@ -50,8 +14,45 @@
     fetch = {
       type = "git";
       url = "https://github.com/satori/go.uuid";
-      rev = "879c5887cd475cd7864858769793b2ceb0d44feb";
-      sha256 = "1nbydsmjr60904kz5d46nib0zid5kcv4gk9wayi44gn5wlzz80zp";
+      rev = "b2ce2384e17bbe0c6d34077efa39dbab3e09123b";
+      sha256 = "1yz4cx02377ijlf8mnn84j1dcmlwh8ncx7y3kw1zg2qw0z4x119c";
     };
   }
- ]
+  {
+    goPackagePath = "github.com/urfave/cli";
+    fetch = {
+      type = "git";
+      url = "https://github.com/urfave/cli";
+      rev = "b67dcf995b6a7b7f14fad5fcb7cc5441b05e814b";
+      sha256 = "0n5vq4nydlhb7w12jiwphvxqdy4jwpxc3zwlxyhf05lq1nxfb56h";
+    };
+  }
+  {
+    goPackagePath = "golang.org/x/net";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/net";
+      rev = "927f97764cc334a6575f4b7a1584a147864d5723";
+      sha256 = "0np7b766gb92vbm514yhdl7cjmqvn0dxdxskd84aas2ri1fkpgw5";
+    };
+  }
+  {
+    goPackagePath = "golang.org/x/oauth2";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/oauth2";
+      rev = "d668ce993890a79bda886613ee587a69dd5da7a6";
+      sha256 = "17m8d02fazil0dwvk33vpwvsb91asgbmmpqy05751csrfqhhdqna";
+    };
+  }
+  # manually mirrored from launchpad because cloning failed due insecure http protocol
+  {
+    goPackagePath = "launchpad.net/go-xdg/v0";
+    fetch = {
+      type = "git";
+      url = "https://github.com/Mic92/go-xdg";
+      rev = "b3fc6b3106d78701853b0caf62ebedae42769af2";
+      sha256 = "0fd68kkxzxjanpgannpys962bxzqdf8c1qvzk687hv504a3dp76f";
+    };
+  }
+]