summary refs log tree commit diff
path: root/pkgs/applications/office
diff options
context:
space:
mode:
authorFranz Pletz <fpletz@fnordicwalking.de>2018-02-23 04:04:32 +0000
committerGitHub <noreply@github.com>2018-02-23 04:04:32 +0000
commitff56849151af4deb6065ab22f1a29149f843b88d (patch)
tree398b7adb178330a64ae24c65c147b699b003c05e /pkgs/applications/office
parent89aab8649e832ba7c97eea96630603882e295a45 (diff)
parent1bf7dfaabeaa37c8b84e1f173e39d4fd476b3b7a (diff)
downloadnixpkgs-ff56849151af4deb6065ab22f1a29149f843b88d.tar
nixpkgs-ff56849151af4deb6065ab22f1a29149f843b88d.tar.gz
nixpkgs-ff56849151af4deb6065ab22f1a29149f843b88d.tar.bz2
nixpkgs-ff56849151af4deb6065ab22f1a29149f843b88d.tar.lz
nixpkgs-ff56849151af4deb6065ab22f1a29149f843b88d.tar.xz
nixpkgs-ff56849151af4deb6065ab22f1a29149f843b88d.tar.zst
nixpkgs-ff56849151af4deb6065ab22f1a29149f843b88d.zip
Merge pull request #35341 from jerith666/timetrap-1-15-1
timetrap: 1.10.0 -> 1.15.1
Diffstat (limited to 'pkgs/applications/office')
-rw-r--r--pkgs/applications/office/timetrap/Gemfile.lock8
-rw-r--r--pkgs/applications/office/timetrap/default.nix11
-rw-r--r--pkgs/applications/office/timetrap/gemset.nix13
3 files changed, 18 insertions, 14 deletions
diff --git a/pkgs/applications/office/timetrap/Gemfile.lock b/pkgs/applications/office/timetrap/Gemfile.lock
index 5f451ca02b1..f71f4eaa408 100644
--- a/pkgs/applications/office/timetrap/Gemfile.lock
+++ b/pkgs/applications/office/timetrap/Gemfile.lock
@@ -2,11 +2,11 @@ GEM
   remote: https://rubygems.org/
   specs:
     chronic (0.10.2)
-    sequel (4.0.0)
-    sqlite3 (1.3.11)
-    timetrap (1.10.0)
+    sequel (4.43.0)
+    sqlite3 (1.3.13)
+    timetrap (1.15.1)
       chronic (~> 0.10.2)
-      sequel (~> 4.0.0)
+      sequel (~> 4.43.0)
       sqlite3 (~> 1.3.3)
 
 PLATFORMS
diff --git a/pkgs/applications/office/timetrap/default.nix b/pkgs/applications/office/timetrap/default.nix
index e68c753750f..3564454a674 100644
--- a/pkgs/applications/office/timetrap/default.nix
+++ b/pkgs/applications/office/timetrap/default.nix
@@ -1,14 +1,17 @@
 { stdenv, lib, bundlerEnv, ruby }:
 
-bundlerEnv {
-  name = "timetrap-1.10.0";
+bundlerEnv rec {
+  name = "timetrap-${version}";
 
+  version = (import gemset).timetrap.version;
   inherit ruby;
   gemdir = ./.;
+  gemset = ./gemset.nix;
 
-  meta = {
+  meta = with lib; {
     description = "A simple command line time tracker written in ruby";
     homepage = https://github.com/samg/timetrap;
-    license = lib.licenses.mit;
+    license = licenses.mit;
+    maintainers = [ maintainers.jerith666 ];
   };
 }
diff --git a/pkgs/applications/office/timetrap/gemset.nix b/pkgs/applications/office/timetrap/gemset.nix
index cbf90f8018c..5764016573f 100644
--- a/pkgs/applications/office/timetrap/gemset.nix
+++ b/pkgs/applications/office/timetrap/gemset.nix
@@ -10,25 +10,26 @@
   sequel = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "17kqm0vd15p9qxbgcysvmg6a046fd7zvxl3xzpsh00pg6v454svm";
+      sha256 = "121z4sq2m4vsgxwy8hs6d12cc1i4xa5rjiv0nbviyj87jldxapw0";
       type = "gem";
     };
-    version = "4.0.0";
+    version = "4.43.0";
   };
   sqlite3 = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "19r06wglnm6479ffj9dl0fa4p5j2wi6dj7k6k3d0rbx7036cv3ny";
+      sha256 = "01ifzp8nwzqppda419c9wcvr8n82ysmisrs0hph9pdmv1lpa4f5i";
       type = "gem";
     };
-    version = "1.3.11";
+    version = "1.3.13";
   };
   timetrap = {
+    dependencies = ["chronic" "sequel" "sqlite3"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1rdaa27zvdgmbsbwa59g3dvfwb95nz7x1wycmviby94j5lywyzfc";
+      sha256 = "0ylaz9q99hbxnw6h1df6wphmh68fj847d1l4f9jylcx3nzzp5cyd";
       type = "gem";
     };
-    version = "1.10.0";
+    version = "1.15.1";
   };
 }
\ No newline at end of file