From cc4f861f8263b0a1ad6c947f0db58e781c7f6391 Mon Sep 17 00:00:00 2001 From: Chris Hodapp Date: Fri, 21 Apr 2017 20:21:31 -0400 Subject: [PATCH 1/2] cloud-print-connector: init at unstable-2017-01-19 This adds a fairly basic build for just the binaries for the Google Cloud Print CUPS connector (gcp-cups-connector), and gcp-connector-util to set it up in the first place. In the future I would like to streamline the configuration more and make gcp-cups-connector a proper NixOS service - as right now it must be run by hand. --- lib/maintainers.nix | 1 + .../go-modules/generic/default.nix | 8 ++- .../servers/cloud-print-connector/default.nix | 34 +++++++++++ pkgs/servers/cloud-print-connector/deps.nix | 57 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 5 files changed, 100 insertions(+), 2 deletions(-) create mode 100644 pkgs/servers/cloud-print-connector/default.nix create mode 100644 pkgs/servers/cloud-print-connector/deps.nix diff --git a/lib/maintainers.nix b/lib/maintainers.nix index 9f24d1836256..ea9c36c801c1 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -215,6 +215,7 @@ heel = "Sergii Paryzhskyi "; henrytill = "Henry Till "; hinton = "Tom Hinton "; + hodapp = "Chris Hodapp "; hrdinka = "Christoph Hrdinka "; iand675 = "Ian Duncan "; ianwookim = "Ian-Woo Kim "; diff --git a/pkgs/development/go-modules/generic/default.nix b/pkgs/development/go-modules/generic/default.nix index adac53f78282..731196d31a1c 100644 --- a/pkgs/development/go-modules/generic/default.nix +++ b/pkgs/development/go-modules/generic/default.nix @@ -1,4 +1,4 @@ -{ go, govers, parallel, lib, fetchgit, fetchhg, rsync, removeReferencesTo }: +{ go, govers, parallel, lib, fetchgit, fetchhg, fetchbzr, rsync, removeReferencesTo }: { name, buildInputs ? [], nativeBuildInputs ? [], passthru ? {}, preFixup ? "" @@ -54,7 +54,11 @@ let fetchhg { inherit (goDep.fetch) url rev sha256; } - else abort "Unrecognized package fetch type"; + else if goDep.fetch.type == "bzr" then + fetchbzr { + inherit (goDep.fetch) url rev sha256; + } + else abort "Unrecognized package fetch type: ${goDep.fetch.type}"; }; importGodeps = { depsFile }: diff --git a/pkgs/servers/cloud-print-connector/default.nix b/pkgs/servers/cloud-print-connector/default.nix new file mode 100644 index 000000000000..634eeda298bc --- /dev/null +++ b/pkgs/servers/cloud-print-connector/default.nix @@ -0,0 +1,34 @@ +# This file was generated by https://github.com/kamilchm/go2nix v1.2.0 +{ pkgs ? import {}, stdenv, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }: + +# TODO: Add a service for gcp-cups-connector and perhaps some other +# kind of configuration for the same thing that gcp-connector-util +# provides. + +buildGoPackage rec { + name = "cloud-print-connector-unstable-${version}"; + version = "2017-01-19"; + rev = "481ad139cc023a3ba65e769f08f277368fa8a5de"; + + goPackagePath = "github.com/google/cloud-print-connector"; + + src = fetchgit { + inherit rev; + url = "https://github.com/google/cloud-print-connector"; + sha256 = "0syq7s8qjspq33qd9ibvz0kwc1zxyh9jkhk7khdvgfv6n0dvql86"; + }; + + goDeps = ./deps.nix; + + buildInputs = [ pkgs.avahi pkgs.cups ]; + + meta = with stdenv.lib; { + description = "Share printers from your Windows, Linux, FreeBSD or OS X 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 OS X. The GitHub presently lists the + # FreeBSD build as broken too, but this may change in the future. + platforms = platforms.linux; + }; +} diff --git a/pkgs/servers/cloud-print-connector/deps.nix b/pkgs/servers/cloud-print-connector/deps.nix new file mode 100644 index 000000000000..53a8f4779332 --- /dev/null +++ b/pkgs/servers/cloud-print-connector/deps.nix @@ -0,0 +1,57 @@ +# This file was generated by https://github.com/kamilchm/go2nix v1.2.0 +[ + { + goPackagePath = "github.com/coreos/go-systemd"; + fetch = { + type = "git"; + url = "https://github.com/coreos/go-systemd"; + rev = "c4308da792903734bd95f877255249cef0862886"; + sha256 = "1gcy548s9vvyjwh80yx5fi35abmbxksgn8xzhgx9rfy2i7jfg7yy"; + }; + } + { + goPackagePath = "github.com/urfave/cli"; + fetch = { + type = "git"; + url = "https://github.com/urfave/cli"; + rev = "9e5b04886c4bfee2ceba1465b8121057355c4e53"; + sha256 = "18jx6ypc1w02ha37rsx6hhmdwqmnybajd6l54qm07bdb850ip9db"; + }; + } + { + goPackagePath = "golang.org/x/net"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/net"; + rev = "a6577fac2d73be281a500b310739095313165611"; + sha256 = "00wks377dp0ws47dvc9f6y4sin1mwdk649v5jfz047ik1jh1nq5h"; + }; + } + { + goPackagePath = "golang.org/x/oauth2"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/oauth2"; + rev = "30fcca6531eb4bb278493c9fb299295b3b145934"; + sha256 = "01x5rfaafhwzbbf7266a71y0ffjikyrbl7waf5scv92frp78py69"; + }; + } + { + goPackagePath = "launchpad.net/go-xdg/v0"; + fetch = { + type = "bzr"; + url = "http://bazaar.launchpad.net/~chipaca/go-xdg/v0/"; + rev = "10"; + sha256 = "0fd68kkxzxjanpgannpys962bxzqdf8c1qvzk687hv504a3dp76f"; + }; + } + { + goPackagePath = "github.com/satori/go.uuid"; + fetch = { + type = "git"; + url = "https://github.com/satori/go.uuid"; + rev = "879c5887cd475cd7864858769793b2ceb0d44feb"; + sha256 = "1nbydsmjr60904kz5d46nib0zid5kcv4gk9wayi44gn5wlzz80zp"; + }; + } + ] diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 836eb3695c79..4d43e6160ec5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13156,6 +13156,8 @@ with pkgs; clipit = callPackage ../applications/misc/clipit { }; + cloud-print-connector = callPackage ../servers/cloud-print-connector { }; + cmatrix = callPackage ../applications/misc/cmatrix { }; cmus = callPackage ../applications/audio/cmus { From f3dce2cbda6e62940c606055d5fcb46b17fb436b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sat, 20 May 2017 18:21:25 +0100 Subject: [PATCH 2/2] cloud-print-connector: 2017-01-19 -> 1.11 --- .../servers/cloud-print-connector/default.nix | 19 ++++++++++--------- pkgs/servers/cloud-print-connector/deps.nix | 16 ++++++++-------- 2 files changed, 18 insertions(+), 17 deletions(-) diff --git a/pkgs/servers/cloud-print-connector/default.nix b/pkgs/servers/cloud-print-connector/default.nix index 634eeda298bc..3a28368cc81c 100644 --- a/pkgs/servers/cloud-print-connector/default.nix +++ b/pkgs/servers/cloud-print-connector/default.nix @@ -1,5 +1,5 @@ # This file was generated by https://github.com/kamilchm/go2nix v1.2.0 -{ pkgs ? import {}, stdenv, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }: +{ 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 @@ -7,21 +7,22 @@ buildGoPackage rec { name = "cloud-print-connector-unstable-${version}"; - version = "2017-01-19"; + version = "1.11"; rev = "481ad139cc023a3ba65e769f08f277368fa8a5de"; goPackagePath = "github.com/google/cloud-print-connector"; - src = fetchgit { - inherit rev; - url = "https://github.com/google/cloud-print-connector"; - sha256 = "0syq7s8qjspq33qd9ibvz0kwc1zxyh9jkhk7khdvgfv6n0dvql86"; + src = fetchFromGitHub { + owner = "google"; + repo = "cloud-print-connector"; + sha256 = "1vryhhv92bsncy1bsx9j4graz3sz9ddmizakv2fdrns09mmcgchm"; + rev = "v${version}"; }; goDeps = ./deps.nix; - buildInputs = [ pkgs.avahi pkgs.cups ]; - + buildInputs = [ avahi cups ]; + meta = with stdenv.lib; { description = "Share printers from your Windows, Linux, FreeBSD or OS X computer with ChromeOS and Android devices, using the Cloud Print Connector"; homepage = https://github.com/google/cloud-print-connector; @@ -30,5 +31,5 @@ buildGoPackage rec { # TODO: Fix broken build on OS X. The GitHub presently lists the # FreeBSD build as broken too, but this may change in the future. platforms = platforms.linux; - }; + }; } diff --git a/pkgs/servers/cloud-print-connector/deps.nix b/pkgs/servers/cloud-print-connector/deps.nix index 53a8f4779332..67901bdffeef 100644 --- a/pkgs/servers/cloud-print-connector/deps.nix +++ b/pkgs/servers/cloud-print-connector/deps.nix @@ -5,8 +5,8 @@ fetch = { type = "git"; url = "https://github.com/coreos/go-systemd"; - rev = "c4308da792903734bd95f877255249cef0862886"; - sha256 = "1gcy548s9vvyjwh80yx5fi35abmbxksgn8xzhgx9rfy2i7jfg7yy"; + rev = "1f9909e51b2dab2487c26d64c8f2e7e580e4c9f5"; + sha256 = "1cc76wcmnyhhhi03dsc11lmxjwkzy09k3zx3h78bg05z8lhry4vn"; }; } { @@ -14,8 +14,8 @@ fetch = { type = "git"; url = "https://github.com/urfave/cli"; - rev = "9e5b04886c4bfee2ceba1465b8121057355c4e53"; - sha256 = "18jx6ypc1w02ha37rsx6hhmdwqmnybajd6l54qm07bdb850ip9db"; + rev = "d70f47eeca3afd795160003bc6e28b001d60c67c"; + sha256 = "1xm203qp4sdlvffcbag7v6mc2d6q61i25iiz3y9yqpy25jpcpgif"; }; } { @@ -23,8 +23,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/net"; - rev = "a6577fac2d73be281a500b310739095313165611"; - sha256 = "00wks377dp0ws47dvc9f6y4sin1mwdk649v5jfz047ik1jh1nq5h"; + rev = "513929065c19401a1c7b76ecd942f9f86a0c061b"; + sha256 = "19ziin0k3n45nccjbk094f61hr198wzqnas93cmcxdja8f8fz27q"; }; } { @@ -32,8 +32,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/oauth2"; - rev = "30fcca6531eb4bb278493c9fb299295b3b145934"; - sha256 = "01x5rfaafhwzbbf7266a71y0ffjikyrbl7waf5scv92frp78py69"; + rev = "f047394b6d14284165300fd82dad67edb3a4d7f6"; + sha256 = "1l1a2iz1nmfmzzbjj1h8066prag4jvjqh13iv1jdlh05fgv6769i"; }; } {