diff options
author | Robin Gloster <mail@glob.in> | 2019-05-18 09:32:05 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-05-18 09:32:05 +0000 |
commit | d40443ba6de52faf08bb33198c6e501f46b85a89 (patch) | |
tree | 950d85bca882afe322f5b2e4684ef30c22ae54d9 | |
parent | 784562980c738b841cd3f0f3f586858694588c75 (diff) | |
parent | 44a554792d58f8bf1239ab3cd8892ac9f1e693ff (diff) | |
download | nixlib-d40443ba6de52faf08bb33198c6e501f46b85a89.tar nixlib-d40443ba6de52faf08bb33198c6e501f46b85a89.tar.gz nixlib-d40443ba6de52faf08bb33198c6e501f46b85a89.tar.bz2 nixlib-d40443ba6de52faf08bb33198c6e501f46b85a89.tar.lz nixlib-d40443ba6de52faf08bb33198c6e501f46b85a89.tar.xz nixlib-d40443ba6de52faf08bb33198c6e501f46b85a89.tar.zst nixlib-d40443ba6de52faf08bb33198c6e501f46b85a89.zip |
Merge pull request #60517 from manveru/timetrap-update
timetrap: use bundlerApp
-rw-r--r-- | pkgs/applications/office/timetrap/Gemfile.lock | 2 | ||||
-rw-r--r-- | pkgs/applications/office/timetrap/default.nix | 18 | ||||
-rw-r--r-- | pkgs/applications/office/timetrap/gemset.nix | 8 |
3 files changed, 17 insertions, 11 deletions
diff --git a/pkgs/applications/office/timetrap/Gemfile.lock b/pkgs/applications/office/timetrap/Gemfile.lock index f71f4eaa4085..9f2ea82cee05 100644 --- a/pkgs/applications/office/timetrap/Gemfile.lock +++ b/pkgs/applications/office/timetrap/Gemfile.lock @@ -16,4 +16,4 @@ DEPENDENCIES timetrap BUNDLED WITH - 1.10.6 + 1.17.2 diff --git a/pkgs/applications/office/timetrap/default.nix b/pkgs/applications/office/timetrap/default.nix index 20dd27fa2873..ad0d5c636f36 100644 --- a/pkgs/applications/office/timetrap/default.nix +++ b/pkgs/applications/office/timetrap/default.nix @@ -1,17 +1,15 @@ -{ lib, bundlerEnv, ruby }: +{ lib, bundlerApp }: -bundlerEnv rec { - name = "timetrap-${version}"; - - version = (import gemset).timetrap.version; - inherit ruby; +bundlerApp { + pname = "timetrap"; gemdir = ./.; - gemset = ./gemset.nix; + exes = [ "timetrap" ]; meta = with lib; { description = "A simple command line time tracker written in ruby"; - homepage = https://github.com/samg/timetrap; - license = licenses.mit; - maintainers = [ maintainers.jerith666 ]; + homepage = https://github.com/samg/timetrap; + license = licenses.mit; + maintainers = with maintainers; [ jerith666 manveru ]; + platforms = platforms.unix; }; } diff --git a/pkgs/applications/office/timetrap/gemset.nix b/pkgs/applications/office/timetrap/gemset.nix index 5764016573fc..1ea489b92c3f 100644 --- a/pkgs/applications/office/timetrap/gemset.nix +++ b/pkgs/applications/office/timetrap/gemset.nix @@ -1,5 +1,7 @@ { chronic = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "1hrdkn4g8x7dlzxwb1rfgr8kw3bp4ywg5l4y4i9c2g5cwv62yvvn"; @@ -8,6 +10,8 @@ version = "0.10.2"; }; sequel = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "121z4sq2m4vsgxwy8hs6d12cc1i4xa5rjiv0nbviyj87jldxapw0"; @@ -16,6 +20,8 @@ version = "4.43.0"; }; sqlite3 = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "01ifzp8nwzqppda419c9wcvr8n82ysmisrs0hph9pdmv1lpa4f5i"; @@ -25,6 +31,8 @@ }; timetrap = { dependencies = ["chronic" "sequel" "sqlite3"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "0ylaz9q99hbxnw6h1df6wphmh68fj847d1l4f9jylcx3nzzp5cyd"; |