diff options
| -rw-r--r-- | lib/maintainers.nix | 1 | ||||
| -rw-r--r-- | pkgs/development/go-modules/generic/default.nix | 8 | ||||
| -rw-r--r-- | pkgs/servers/cloud-print-connector/default.nix | 34 | ||||
| -rw-r--r-- | pkgs/servers/cloud-print-connector/deps.nix | 57 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
5 files changed, 100 insertions, 2 deletions
diff --git a/lib/maintainers.nix b/lib/maintainers.nix index 9f24d183625..ea9c36c801c 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -215,6 +215,7 @@ heel = "Sergii Paryzhskyi <parizhskiy@gmail.com>"; henrytill = "Henry Till <henrytill@gmail.com>"; hinton = "Tom Hinton <t@larkery.com>"; + hodapp = "Chris Hodapp <hodapp87@gmail.com>"; hrdinka = "Christoph Hrdinka <c.nix@hrdinka.at>"; iand675 = "Ian Duncan <ian@iankduncan.com>"; ianwookim = "Ian-Woo Kim <ianwookim@gmail.com>"; diff --git a/pkgs/development/go-modules/generic/default.nix b/pkgs/development/go-modules/generic/default.nix index adac53f7828..731196d31a1 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 00000000000..634eeda298b --- /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 <nixpkgs> {}, 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 00000000000..53a8f477933 --- /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 836eb3695c7..4d43e6160ec 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 { |