Skip to content

Commit 06a2a3a

Browse files
authored
timetrap: migrate timetrap to by-name (#406189)
2 parents dcbe3f1 + 4eefc79 commit 06a2a3a

File tree

7 files changed

+105
-77
lines changed

7 files changed

+105
-77
lines changed

pkgs/applications/office/timetrap/Gemfile.lock

Lines changed: 0 additions & 19 deletions
This file was deleted.

pkgs/applications/office/timetrap/gemset.nix

Lines changed: 0 additions & 47 deletions
This file was deleted.
File renamed without changes.
Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
GEM
2+
remote: https://rubygems.org/
3+
specs:
4+
bigdecimal (3.1.9)
5+
chronic (0.10.2)
6+
mini_portile2 (2.8.8)
7+
sequel (5.90.0)
8+
bigdecimal
9+
sqlite3 (1.7.3)
10+
mini_portile2 (~> 2.8.0)
11+
timetrap (1.15.5)
12+
chronic (~> 0.10.2)
13+
sequel (~> 5.90.0)
14+
sqlite3 (~> 1.4)
15+
16+
PLATFORMS
17+
ruby
18+
19+
DEPENDENCIES
20+
timetrap
21+
22+
BUNDLED WITH
23+
2.6.6
Lines changed: 69 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,69 @@
1+
{
2+
bigdecimal = {
3+
groups = [ "default" ];
4+
platforms = [ ];
5+
source = {
6+
remotes = [ "https://rubygems.org" ];
7+
sha256 = "1k6qzammv9r6b2cw3siasaik18i6wjc5m0gw5nfdc6jj64h79z1g";
8+
type = "gem";
9+
};
10+
version = "3.1.9";
11+
};
12+
chronic = {
13+
groups = [ "default" ];
14+
platforms = [ ];
15+
source = {
16+
remotes = [ "https://rubygems.org" ];
17+
sha256 = "1hrdkn4g8x7dlzxwb1rfgr8kw3bp4ywg5l4y4i9c2g5cwv62yvvn";
18+
type = "gem";
19+
};
20+
version = "0.10.2";
21+
};
22+
mini_portile2 = {
23+
groups = [ "default" ];
24+
platforms = [ ];
25+
source = {
26+
remotes = [ "https://rubygems.org" ];
27+
sha256 = "0x8asxl83msn815lwmb2d7q5p29p7drhjv5va0byhk60v9n16iwf";
28+
type = "gem";
29+
};
30+
version = "2.8.8";
31+
};
32+
sequel = {
33+
dependencies = [ "bigdecimal" ];
34+
groups = [ "default" ];
35+
platforms = [ ];
36+
source = {
37+
remotes = [ "https://rubygems.org" ];
38+
sha256 = "1s5qhylirrmfbjhdjdfqaiksjlaqmgixl25sxd8znq8dqwqlrydz";
39+
type = "gem";
40+
};
41+
version = "5.90.0";
42+
};
43+
sqlite3 = {
44+
dependencies = [ "mini_portile2" ];
45+
groups = [ "default" ];
46+
platforms = [ ];
47+
source = {
48+
remotes = [ "https://rubygems.org" ];
49+
sha256 = "073hd24qwx9j26cqbk0jma0kiajjv9fb8swv9rnz8j4mf0ygcxzs";
50+
type = "gem";
51+
};
52+
version = "1.7.3";
53+
};
54+
timetrap = {
55+
dependencies = [
56+
"chronic"
57+
"sequel"
58+
"sqlite3"
59+
];
60+
groups = [ "default" ];
61+
platforms = [ ];
62+
source = {
63+
remotes = [ "https://rubygems.org" ];
64+
sha256 = "0gcs9vyg1i3nsiiwrkqza14qj7h3chlg6w5icbf0ggjzswz3rwd2";
65+
type = "gem";
66+
};
67+
version = "1.15.5";
68+
};
69+
}

pkgs/applications/office/timetrap/default.nix renamed to pkgs/by-name/ti/timetrap/package.nix

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -34,18 +34,18 @@ stdenv.mkDerivation {
3434
nativeBuildInputs = [ installShellFiles ];
3535

3636
installPhase = ''
37-
mkdir $out;
38-
cd $out;
37+
mkdir $out
38+
cd $out
3939
40-
mkdir bin; pushd bin;
41-
ln -vs ${ttBundlerApp}/bin/t;
42-
ln -vs ${ttBundlerApp}/bin/timetrap;
43-
popd;
40+
mkdir bin; pushd bin
41+
ln -vs ${ttBundlerApp}/bin/t
42+
ln -vs ${ttBundlerApp}/bin/timetrap
43+
popd
4444
4545
for c in t timetrap; do
46-
installShellCompletion --cmd $c --bash ${ttGem}/lib/ruby/gems/*/gems/timetrap*/completions/bash/*;
47-
installShellCompletion --cmd $c --zsh ${ttGem}/lib/ruby/gems/*/gems/timetrap*/completions/zsh/*;
48-
done;
46+
installShellCompletion --cmd $c --bash ${ttGem}/lib/ruby/gems/*/gems/timetrap*/completions/bash/*
47+
installShellCompletion --cmd $c --zsh ${ttGem}/lib/ruby/gems/*/gems/timetrap*/completions/zsh/*
48+
done
4949
'';
5050

5151
meta = with lib; {
@@ -59,4 +59,8 @@ stdenv.mkDerivation {
5959
];
6060
platforms = platforms.unix;
6161
};
62+
63+
passthru = {
64+
updateScript = ttBundlerApp.passthru.updateScript;
65+
};
6266
}

pkgs/top-level/all-packages.nix

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4574,8 +4574,6 @@ with pkgs;
45744574

45754575
tiled = libsForQt5.callPackage ../applications/editors/tiled { };
45764576

4577-
timetrap = callPackage ../applications/office/timetrap { };
4578-
45794577
tinc = callPackage ../tools/networking/tinc { };
45804578

45814579
tikzit = libsForQt5.callPackage ../tools/typesetting/tikzit { };

0 commit comments

Comments
 (0)