Merge pull request #144330 from mkg20001/cloudprint

pkgs/servers/cloud-print-connector/default.nix

···
-{ lib, buildGoPackage, fetchFromGitHub, avahi, cups, fetchpatch }:
-
-# 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 {
-  pname = "cloud-print-connector-unstable";
-  version = "1.16";
-  rev = "481ad139cc023a3ba65e769f08f277368fa8a5de";
-
-  goPackagePath = "github.com/google/cloud-print-connector";
-
-  subPackages = [
-    "gcp-connector-util"
-    "gcp-cups-connector"
-  ];
-
-  patches = [
-    (fetchpatch {
-      # https://github.com/google/cloud-print-connector/pull/475
-      url = "https://github.com/google/cloud-print-connector/commit/6a77c7c283b83cbcc9cbfab59710023cd09da3ed.patch";
-      sha256 = "054pi9nz402va95z5k6wq3dalnv5rcya078wa99p1kdwb7cqmrcq";
-    })
-  ];
-
-  src = fetchFromGitHub {
-    owner = "google";
-    repo = "cloud-print-connector";
-    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 ];
-
-  meta = with lib; {
-    description = "Share printers from your Windows, Linux, FreeBSD or macOS computer with ChromeOS and Android devices, using the Cloud Print Connector";
-    homepage = "https://github.com/google/cloud-print-connector";
-    license = licenses.bsd3;
-    maintainers = with maintainers; [ hodapp ];
-    # TODO: Fix broken build on macOS.  The GitHub presently lists the
-    # FreeBSD build as broken too, but this may change in the future.
-    platforms = platforms.unix;
-  };
-}

pkgs/servers/cloud-print-connector/deps.nix

···
-# 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 = "9002847aa1425fb6ac49077c0a630b3b67e0fbfd";
-      sha256 = "0d7xpcinzj18qc91rb6fjjrf9jnlzn775dqhp0n00n0gjg5rfksj";
-    };
-  }
-  {
-    goPackagePath = "github.com/satori/go.uuid";
-    fetch = {
-      type = "git";
-      url = "https://github.com/satori/go.uuid";
-      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";
-    };
-  }
-]

pkgs/top-level/aliases.nix

···
   cupsBjnp = cups-bjnp; # added 2016-01-02
   cups_filters = cups-filters; # added 2016-08
   cups-googlecloudprint = throw "Google Cloudprint is officially discontinued since Jan 2021, more info https://support.google.com/chrome/a/answer/9633006";
+  cloud-print-connector = throw "Google Cloudprint is officially discontinued since Jan 2021, more info https://support.google.com/chrome/a/answer/9633006";
   curaLulzbot = throw "curaLulzbot has been removed due to insufficient upstream support for a modern dependency chain"; # added 2021-10-23
   cquery = throw "cquery has been removed because it is abandoned by upstream. Consider switching to clangd or ccls instead."; # added 2020-06-15
   cv = progress; # added 2015-09-06

pkgs/top-level/all-packages.nix

···
 
   clipit = callPackage ../applications/misc/clipit { };
 
-  cloud-print-connector = callPackage ../servers/cloud-print-connector { };
-
   cloud-hypervisor = callPackage ../applications/virtualization/cloud-hypervisor { };
 
   clp = callPackage ../applications/science/math/clp { };