Merge pull request #60509 from manveru/ledger-web-update

ledger-web: use bundlerApp
This commit is contained in:
Alyssa Ross 2019-05-04 13:18:37 +00:00 committed by GitHub
commit b896b267de
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 119 additions and 82 deletions

View File

@ -1,9 +1,9 @@
GEM GEM
remote: https://rubygems.org/ remote: https://rubygems.org/
specs: specs:
backports (3.6.8) backports (3.14.0)
database_cleaner (1.5.3) database_cleaner (1.7.0)
diff-lcs (1.2.5) diff-lcs (1.3)
directory_watcher (1.5.1) directory_watcher (1.5.1)
ledger_web (1.5.2) ledger_web (1.5.2)
database_cleaner database_cleaner
@ -15,41 +15,41 @@ GEM
sinatra sinatra
sinatra-contrib sinatra-contrib
sinatra-session sinatra-session
multi_json (1.12.1) multi_json (1.13.1)
pg (0.18.4) mustermann (1.0.3)
rack (1.6.11) pg (1.1.4)
rack-protection (1.5.3) rack (2.0.7)
rack-protection (2.0.5)
rack rack
rack-test (0.6.3) rspec (3.8.0)
rack (>= 1.0) rspec-core (~> 3.8.0)
rspec (3.5.0) rspec-expectations (~> 3.8.0)
rspec-core (~> 3.5.0) rspec-mocks (~> 3.8.0)
rspec-expectations (~> 3.5.0) rspec-core (3.8.0)
rspec-mocks (~> 3.5.0) rspec-support (~> 3.8.0)
rspec-core (3.5.2) rspec-expectations (3.8.3)
rspec-support (~> 3.5.0)
rspec-expectations (3.5.0)
diff-lcs (>= 1.2.0, < 2.0) diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.5.0) rspec-support (~> 3.8.0)
rspec-mocks (3.5.0) rspec-mocks (3.8.0)
diff-lcs (>= 1.2.0, < 2.0) diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.5.0) rspec-support (~> 3.8.0)
rspec-support (3.5.0) rspec-support (3.8.0)
sequel (4.37.0) sequel (5.19.0)
sinatra (1.4.7) sinatra (2.0.5)
rack (~> 1.5) mustermann (~> 1.0)
rack-protection (~> 1.4) rack (~> 2.0)
tilt (>= 1.3, < 3) rack-protection (= 2.0.5)
sinatra-contrib (1.4.7) tilt (~> 2.0)
backports (>= 2.0) sinatra-contrib (2.0.5)
backports (>= 2.8.2)
multi_json multi_json
rack-protection mustermann (~> 1.0)
rack-test rack-protection (= 2.0.5)
sinatra (~> 1.4.0) sinatra (= 2.0.5)
tilt (>= 1.3, < 3) tilt (>= 1.3, < 3)
sinatra-session (1.0.0) sinatra-session (1.0.0)
sinatra (>= 1.0) sinatra (>= 1.0)
tilt (2.0.5) tilt (2.0.9)
PLATFORMS PLATFORMS
ruby ruby
@ -58,4 +58,4 @@ DEPENDENCIES
ledger_web ledger_web
BUNDLED WITH BUNDLED WITH
1.16.4 1.17.2

View File

@ -1,14 +1,12 @@
{ lib, bundlerEnv, ruby { lib, bundlerApp
, withPostgresql ? true, postgresql , withPostgresql ? true, postgresql
, withSqlite ? false, sqlite , withSqlite ? false, sqlite
}: }:
bundlerEnv rec { bundlerApp rec {
name = "ledger-web-${version}"; pname = "ledger_web";
version = (import ./gemset.nix).ledger_web.version;
inherit ruby;
gemdir = ./.; gemdir = ./.;
exes = [ "ledger_web" ];
buildInputs = lib.optional withPostgresql postgresql buildInputs = lib.optional withPostgresql postgresql
++ lib.optional withSqlite sqlite; ++ lib.optional withSqlite sqlite;
@ -17,7 +15,7 @@ bundlerEnv rec {
description = "A web frontend to the Ledger CLI tool"; description = "A web frontend to the Ledger CLI tool";
homepage = https://github.com/peterkeen/ledger-web; homepage = https://github.com/peterkeen/ledger-web;
license = licenses.mit; license = licenses.mit;
maintainers = with maintainers; [ peterhoeg ]; maintainers = with maintainers; [ peterhoeg manveru ];
platforms = platforms.linux; platforms = platforms.linux;
}; };
} }

View File

@ -1,29 +1,37 @@
{ {
backports = { backports = {
groups = ["default"];
platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "1zcgqw7m7jb8n7b2jwla5cq0nw9wsgddxfmn0a9v89ihzd4i1a5k"; sha256 = "17j5pf0b69bkn043wi4xd530ky53jbbnljr4bsjzlm4k8bzlknfn";
type = "gem"; type = "gem";
}; };
version = "3.6.8"; version = "3.14.0";
}; };
database_cleaner = { database_cleaner = {
groups = ["default"];
platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "0fx6zmqznklmkbjl6f713jyl11d4g9q220rcl86m2jp82r8kfwjj"; sha256 = "05i0nf2aj70m61y3fspypdkc6d1qgibf5kav05a71b5gjz0k7y5x";
type = "gem"; type = "gem";
}; };
version = "1.5.3"; version = "1.7.0";
}; };
diff-lcs = { diff-lcs = {
groups = ["default"];
platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "1vf9civd41bnqi6brr5d9jifdw73j9khc6fkhfl1f8r9cpkdvlx1"; sha256 = "18w22bjz424gzafv6nzv98h0aqkwz3d9xhm7cbr1wfbyas8zayza";
type = "gem"; type = "gem";
}; };
version = "1.2.5"; version = "1.3";
}; };
directory_watcher = { directory_watcher = {
groups = ["default"];
platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "0fwc2shba7vks262ind74y3g76qp7znjq5q8b2dvza0yidgywhcq"; sha256 = "0fwc2shba7vks262ind74y3g76qp7znjq5q8b2dvza0yidgywhcq";
@ -33,6 +41,8 @@
}; };
ledger_web = { ledger_web = {
dependencies = ["database_cleaner" "directory_watcher" "pg" "rack" "rspec" "sequel" "sinatra" "sinatra-contrib" "sinatra-session"]; dependencies = ["database_cleaner" "directory_watcher" "pg" "rack" "rspec" "sequel" "sinatra" "sinatra-contrib" "sinatra-session"];
groups = ["default"];
platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "0i4vagaiyayymlr41rsy4lg2cl1r011ib0ql9dgjadfy6imb4kqh"; sha256 = "0i4vagaiyayymlr41rsy4lg2cl1r011ib0ql9dgjadfy6imb4kqh";
@ -41,119 +51,146 @@
version = "1.5.2"; version = "1.5.2";
}; };
multi_json = { multi_json = {
groups = ["default"];
platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "1wpc23ls6v2xbk3l1qncsbz16npvmw8p0b38l8czdzri18mp51xk"; sha256 = "1rl0qy4inf1mp8mybfk56dfga0mvx97zwpmq5xmiwl5r770171nv";
type = "gem"; type = "gem";
}; };
version = "1.12.1"; version = "1.13.1";
};
mustermann = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0lycgkmnyy0bf29nnd2zql5a6pcf8sp69g9v4xw0gcfcxgpwp7i1";
type = "gem";
};
version = "1.0.3";
}; };
pg = { pg = {
groups = ["default"];
platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "07dv4ma9xd75xpsnnwwg1yrpwpji7ydy0q1d9dl0yfqbzpidrw32"; sha256 = "0fmnyxcyrvgdbgq7m09whgn9i8rwfybk0w8aii1nc4g5kqw0k2jy";
type = "gem"; type = "gem";
}; };
version = "0.18.4"; version = "1.1.4";
}; };
rack = { rack = {
groups = ["default"];
platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "1g9926ln2lw12lfxm4ylq1h6nl0rafl10za3xvjzc87qvnqic87f"; sha256 = "0z90vflxbgjy2n84r7mbyax3i2vyvvrxxrf86ljzn5rw65jgnn2i";
type = "gem"; type = "gem";
}; };
version = "1.6.11"; version = "2.0.7";
}; };
rack-protection = { rack-protection = {
dependencies = ["rack"]; dependencies = ["rack"];
groups = ["default"];
platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "0cvb21zz7p9wy23wdav63z5qzfn4nialik22yqp6gihkgfqqrh5r"; sha256 = "15167q25rmxipqwi6hjqj3i1byi9iwl3xq9b7mdar7qiz39pmjsk";
type = "gem"; type = "gem";
}; };
version = "1.5.3"; version = "2.0.5";
};
rack-test = {
dependencies = ["rack"];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0h6x5jq24makgv2fq5qqgjlrk74dxfy62jif9blk43llw8ib2q7z";
type = "gem";
};
version = "0.6.3";
}; };
rspec = { rspec = {
dependencies = ["rspec-core" "rspec-expectations" "rspec-mocks"]; dependencies = ["rspec-core" "rspec-expectations" "rspec-mocks"];
groups = ["default"];
platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "16g3mmih999f0b6vcz2c3qsc7ks5zy4lj1rzjh8hf6wk531nvc6s"; sha256 = "15ppasvb9qrscwlyjz67ppw1lnxiqnkzx5vkx1bd8x5n3dhikxc3";
type = "gem"; type = "gem";
}; };
version = "3.5.0"; version = "3.8.0";
}; };
rspec-core = { rspec-core = {
dependencies = ["rspec-support"]; dependencies = ["rspec-support"];
groups = ["default"];
platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "12yndf7y6g3s1306bv1aycsmd0gjy5m172spdhx54svca2fcpzy1"; sha256 = "1p1s5bnbqp3sxk67y0fh0x884jjym527r0vgmhbm81w7aq6b7l4p";
type = "gem"; type = "gem";
}; };
version = "3.5.2"; version = "3.8.0";
}; };
rspec-expectations = { rspec-expectations = {
dependencies = ["diff-lcs" "rspec-support"]; dependencies = ["diff-lcs" "rspec-support"];
groups = ["default"];
platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "0bbqfrb1x8gmwf8x2xhhwvvlhwbbafq4isbvlibxi6jk602f09gs"; sha256 = "1c4gs5ybf7km0qshdm92p38zvg32n1j2kr5fgs2icacz7xf2y6fy";
type = "gem"; type = "gem";
}; };
version = "3.5.0"; version = "3.8.3";
}; };
rspec-mocks = { rspec-mocks = {
dependencies = ["diff-lcs" "rspec-support"]; dependencies = ["diff-lcs" "rspec-support"];
groups = ["default"];
platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "0nl3ksivh9wwrjjd47z5dggrwx40v6gpb3a0gzbp1gs06a5dmk24"; sha256 = "06y508cjqycb4yfhxmb3nxn0v9xqf17qbd46l1dh4xhncinr4fyp";
type = "gem"; type = "gem";
}; };
version = "3.5.0"; version = "3.8.0";
}; };
rspec-support = { rspec-support = {
groups = ["default"];
platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "10vf3k3d472y573mag2kzfsfrf6rv355s13kadnpryk8d36yq5r0"; sha256 = "0p3m7drixrlhvj2zpc38b11x145bvm311x6f33jjcxmvcm0wq609";
type = "gem"; type = "gem";
}; };
version = "3.5.0"; version = "3.8.0";
}; };
sequel = { sequel = {
groups = ["default"];
platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "11vdpr3r4dwhcan16gs4gjm2k21y9qz7ri5w2zz54pmnxp499cjw"; sha256 = "0lwkc9kf4jn1x1ph4mgy4saiw2dirq6fhnkpyd0zq8rj1d0nay9a";
type = "gem"; type = "gem";
}; };
version = "4.37.0"; version = "5.19.0";
}; };
sinatra = { sinatra = {
dependencies = ["rack" "rack-protection" "tilt"]; dependencies = ["mustermann" "rack" "rack-protection" "tilt"];
groups = ["default"];
platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "1b81kbr65mmcl9cdq2r6yc16wklyp798rxkgmm5pr9fvsj7jwmxp"; sha256 = "1gasgn5f15myv08k10i16p326pchxjsy37pgqfw0xm66kcc5d7ry";
type = "gem"; type = "gem";
}; };
version = "1.4.7"; version = "2.0.5";
}; };
sinatra-contrib = { sinatra-contrib = {
dependencies = ["backports" "multi_json" "rack-protection" "rack-test" "sinatra" "tilt"]; dependencies = ["backports" "multi_json" "mustermann" "rack-protection" "sinatra" "tilt"];
groups = ["default"];
platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "0vi3i0icbi2figiayxpvxbqpbn1syma7w4p4zw5mav1ln4c7jnfr"; sha256 = "093blvpfy5n7s8knaav9a4pm4j7kck9zidwz942qqd4g99fnk443";
type = "gem"; type = "gem";
}; };
version = "1.4.7"; version = "2.0.5";
}; };
sinatra-session = { sinatra-session = {
dependencies = ["sinatra"]; dependencies = ["sinatra"];
groups = ["default"];
platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "183xl8i4d2hc03afd1i52gwn2xi3vzrv02g22llhfy5wkmm44gmq"; sha256 = "183xl8i4d2hc03afd1i52gwn2xi3vzrv02g22llhfy5wkmm44gmq";
@ -162,11 +199,13 @@
version = "1.0.0"; version = "1.0.0";
}; };
tilt = { tilt = {
groups = ["default"];
platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "0lgk8bfx24959yq1cn55php3321wddw947mgj07bxfnwyipy9hqf"; sha256 = "0ca4k0clwf0rkvy7726x4nxpjxkpv67w043i39saxgldxd97zmwz";
type = "gem"; type = "gem";
}; };
version = "2.0.5"; version = "2.0.9";
}; };
} }