From 20a19eb202a6b5dfdb424c582861b71de2b29a08 Mon Sep 17 00:00:00 2001 From: Michael Fellinger Date: Tue, 30 Apr 2019 17:23:38 +0200 Subject: [PATCH] hue-cli: use bundlerApp --- pkgs/tools/networking/hue-cli/Gemfile.lock | 4 ++-- pkgs/tools/networking/hue-cli/default.nix | 19 ++++++++++++------- pkgs/tools/networking/hue-cli/gemset.nix | 10 ++++++++-- 3 files changed, 22 insertions(+), 11 deletions(-) diff --git a/pkgs/tools/networking/hue-cli/Gemfile.lock b/pkgs/tools/networking/hue-cli/Gemfile.lock index 3b1f65707008..8109cd96ac23 100644 --- a/pkgs/tools/networking/hue-cli/Gemfile.lock +++ b/pkgs/tools/networking/hue-cli/Gemfile.lock @@ -6,7 +6,7 @@ GEM json hue-lib (0.7.4) json - json (2.1.0) + json (2.2.0) PLATFORMS ruby @@ -15,4 +15,4 @@ DEPENDENCIES hue-cli BUNDLED WITH - 1.15.1 + 1.17.2 diff --git a/pkgs/tools/networking/hue-cli/default.nix b/pkgs/tools/networking/hue-cli/default.nix index 4f8d1039e5ea..ae51bb69bda1 100644 --- a/pkgs/tools/networking/hue-cli/default.nix +++ b/pkgs/tools/networking/hue-cli/default.nix @@ -1,10 +1,15 @@ -{ bundlerEnv, ruby }: +{ lib, bundlerApp }: -bundlerEnv rec { - name = "hue-cli-${version}"; - - version = (import gemset).hue-cli.version; - inherit ruby; +bundlerApp { + pname = "hue-cli"; gemdir = ./.; - gemset = ./gemset.nix; + exes = [ "hue" ]; + + meta = with lib; { + description = "Command line interface for controlling Philips Hue system's lights and bridge"; + homepage = https://github.com/birkirb/hue-cli; + license = licenses.mit; + platforms = platforms.unix; + maintainers = with maintainers; [ manveru ]; + }; } diff --git a/pkgs/tools/networking/hue-cli/gemset.nix b/pkgs/tools/networking/hue-cli/gemset.nix index d1af93ff154c..69d12f25a80e 100644 --- a/pkgs/tools/networking/hue-cli/gemset.nix +++ b/pkgs/tools/networking/hue-cli/gemset.nix @@ -1,6 +1,8 @@ { hue-cli = { dependencies = ["hue-lib" "json"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "10gjf59pamfy2m17fs271d9ffrg1194b1m6vxzn6p7smzry52h9z"; @@ -10,6 +12,8 @@ }; hue-lib = { dependencies = ["json"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "1pyl8g8gisdhl79gbzvnddqrsbq0lmflzg7n6yi6xrp5b5290shz"; @@ -18,11 +22,13 @@ version = "0.7.4"; }; json = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "01v6jjpvh3gnq6sgllpfqahlgxzj50ailwhj9b3cd20hi2dx0vxp"; + sha256 = "0sx97bm9by389rbzv8r1f43h06xcz8vwi3h5jv074gvparql7lcx"; type = "gem"; }; - version = "2.1.0"; + version = "2.2.0"; }; } \ No newline at end of file