diff options
author | Michael Weiss <dev.primeos@gmail.com> | 2017-06-03 22:50:33 +0200 |
---|---|---|
committer | Michael Weiss <dev.primeos@gmail.com> | 2017-06-03 22:52:37 +0200 |
commit | 62653064a0dee52810bc6c5b1d68dc55368d7115 (patch) | |
tree | de8b39304c49fa17157237e5a8e053aeaf6b9446 /pkgs/applications/misc/gollum | |
parent | 045515a54a25a30e98b4c1f8f7945473930be2dc (diff) | |
download | nixlib-62653064a0dee52810bc6c5b1d68dc55368d7115.tar nixlib-62653064a0dee52810bc6c5b1d68dc55368d7115.tar.gz nixlib-62653064a0dee52810bc6c5b1d68dc55368d7115.tar.bz2 nixlib-62653064a0dee52810bc6c5b1d68dc55368d7115.tar.lz nixlib-62653064a0dee52810bc6c5b1d68dc55368d7115.tar.xz nixlib-62653064a0dee52810bc6c5b1d68dc55368d7115.tar.zst nixlib-62653064a0dee52810bc6c5b1d68dc55368d7115.zip |
gollum: 4.0.1 -> 4.1.1
Diffstat (limited to 'pkgs/applications/misc/gollum')
-rw-r--r-- | pkgs/applications/misc/gollum/Gemfile.lock | 57 | ||||
-rw-r--r-- | pkgs/applications/misc/gollum/default.nix | 13 | ||||
-rw-r--r-- | pkgs/applications/misc/gollum/gemset.nix | 176 |
3 files changed, 136 insertions, 110 deletions
diff --git a/pkgs/applications/misc/gollum/Gemfile.lock b/pkgs/applications/misc/gollum/Gemfile.lock index 074a0c6fa43b..4322b4088436 100644 --- a/pkgs/applications/misc/gollum/Gemfile.lock +++ b/pkgs/applications/misc/gollum/Gemfile.lock @@ -2,48 +2,53 @@ GEM remote: https://rubygems.org/ specs: charlock_holmes (0.7.3) - diff-lcs (1.2.5) - github-markup (1.3.3) - gitlab-grit (2.7.3) + diff-lcs (1.3) + gemojione (3.2.0) + json + github-markup (1.6.0) + gitlab-grit (2.8.1) charlock_holmes (~> 0.6) diff-lcs (~> 1.1) - mime-types (~> 1.15) + mime-types (>= 1.16, < 3) posix-spawn (~> 0.3) - gollum (4.0.1) + gollum (4.1.1) + gemojione (~> 3.2) gollum-lib (~> 4.0, >= 4.0.1) - kramdown (~> 1.8.0) + kramdown (~> 1.9.0) mustache (>= 0.99.5, < 1.0.0) sinatra (~> 1.4, >= 1.4.4) - useragent (~> 0.14.0) - gollum-grit_adapter (1.0.0) + useragent (~> 0.16.2) + gollum-grit_adapter (1.0.1) gitlab-grit (~> 2.7, >= 2.7.1) - gollum-lib (4.1.0) - github-markup (~> 1.3.3) + gollum-lib (4.2.5) + gemojione (~> 3.2) + github-markup (~> 1.6) gollum-grit_adapter (~> 1.0) nokogiri (~> 1.6.4) - rouge (~> 1.9) - sanitize (~> 2.1.0) - stringex (~> 2.5.1) - kramdown (1.8.0) - mime-types (1.25.1) - mini_portile2 (2.0.0) + rouge (~> 2.0) + sanitize (~> 2.1) + stringex (~> 2.6) + json (2.1.0) + kramdown (1.9.0) + mime-types (2.99.3) + mini_portile2 (2.1.0) mustache (0.99.8) - nokogiri (1.6.7.2) - mini_portile2 (~> 2.0.0.rc2) - posix-spawn (0.3.11) - rack (1.6.4) + nokogiri (1.6.8.1) + mini_portile2 (~> 2.1.0) + posix-spawn (0.3.13) + rack (1.6.8) rack-protection (1.5.3) rack - rouge (1.10.1) + rouge (2.0.7) sanitize (2.1.0) nokogiri (>= 1.4.4) - sinatra (1.4.7) + sinatra (1.4.8) rack (~> 1.5) rack-protection (~> 1.4) tilt (>= 1.3, < 3) - stringex (2.5.2) - tilt (2.0.2) - useragent (0.14.0) + stringex (2.7.1) + tilt (2.0.7) + useragent (0.16.8) PLATFORMS ruby @@ -52,4 +57,4 @@ DEPENDENCIES gollum BUNDLED WITH - 1.10.6 + 1.15.0 diff --git a/pkgs/applications/misc/gollum/default.nix b/pkgs/applications/misc/gollum/default.nix index 1f3cc9e27c0c..db401a2dbdc3 100644 --- a/pkgs/applications/misc/gollum/default.nix +++ b/pkgs/applications/misc/gollum/default.nix @@ -1,16 +1,21 @@ -{ stdenv, lib, bundlerEnv, ruby_2_2, icu, zlib }: +{ stdenv, lib, bundlerEnv, ruby +, icu, zlib }: bundlerEnv rec { name = "gollum-${version}"; - version = "4.0.1"; + version = (import gemset).gollum.version; - ruby = ruby_2_2; + inherit ruby; gemdir = ./.; + gemset = ./gemset.nix; + + # FIXME: Add Git as runtime dependency. meta = with lib; { description = "A simple, Git-powered wiki"; + homepage = "https://github.com/gollum/gollum"; license = licenses.mit; - maintainers = with maintainers; [ jgillich ]; + maintainers = with maintainers; [ jgillich primeos ]; platforms = platforms.unix; }; } diff --git a/pkgs/applications/misc/gollum/gemset.nix b/pkgs/applications/misc/gollum/gemset.nix index f0c71fa455cf..2ad724b2bc7a 100644 --- a/pkgs/applications/misc/gollum/gemset.nix +++ b/pkgs/applications/misc/gollum/gemset.nix @@ -1,170 +1,186 @@ { - useragent = { - version = "0.14.0"; + charlock_holmes = { source = { - type = "gem"; remotes = ["https://rubygems.org"]; - sha256 = "124r3mgkw1zjymsqq9r25zh1vwjrjgiji5fm620z53lpmmryj22j"; + sha256 = "0jsl6k27wjmssxbwv9wpf7hgp9r0nvizcf6qpjnr7qs2nia53lf7"; + type = "gem"; }; + version = "0.7.3"; }; - tilt = { - version = "2.0.2"; + diff-lcs = { source = { - type = "gem"; remotes = ["https://rubygems.org"]; - sha256 = "0lkd40xfdqkp333vdfhrfjmi2y7k2hjs4azawfb62mrkfp7ivj84"; + sha256 = "18w22bjz424gzafv6nzv98h0aqkwz3d9xhm7cbr1wfbyas8zayza"; + type = "gem"; }; + version = "1.3"; }; - stringex = { - version = "2.5.2"; + gemojione = { source = { - type = "gem"; remotes = ["https://rubygems.org"]; - sha256 = "150adm7rfh6r9b5ra6vk75mswf9m3wwyslcf8f235a08m29fxa17"; + sha256 = "0svj3hsmwyr306vg75cd7p9i4bwnajrda60n2vhiav2cvhnkawik"; + type = "gem"; }; + version = "3.2.0"; }; - sinatra = { - version = "1.4.7"; + github-markup = { source = { - type = "gem"; remotes = ["https://rubygems.org"]; - sha256 = "1b81kbr65mmcl9cdq2r6yc16wklyp798rxkgmm5pr9fvsj7jwmxp"; + sha256 = "1g538d7kcj2iw4d9ll8266d8n526hz2fbx7zlx8z7gxg1gzwiki9"; + type = "gem"; }; + version = "1.6.0"; }; - sanitize = { - version = "2.1.0"; + gitlab-grit = { source = { - type = "gem"; remotes = ["https://rubygems.org"]; - sha256 = "0xsv6xqrlz91rd8wifjknadbl3z5h6qphmxy0hjb189qbdghggn3"; + sha256 = "0lf1cr6pzqrbnxiiwym6q74b1a2ihdi91dynajk8hi1p093hl66n"; + type = "gem"; }; + version = "2.8.1"; }; - rouge = { - version = "1.10.1"; + gollum = { source = { - type = "gem"; remotes = ["https://rubygems.org"]; - sha256 = "0wp8as9ypdy18kdj9h70kny1rdfq71mr8cj2bpahr9vxjjvjasqz"; + sha256 = "0jrafhy8p9pgvya0gj2g6knrpg58g65s7j9bcyfj6fp4n2dz2w7s"; + type = "gem"; }; + version = "4.1.1"; }; - rack-protection = { - version = "1.5.3"; + gollum-grit_adapter = { source = { - type = "gem"; remotes = ["https://rubygems.org"]; - sha256 = "0cvb21zz7p9wy23wdav63z5qzfn4nialik22yqp6gihkgfqqrh5r"; + sha256 = "0fcibm63v1afc0fj5rki0mm51m7nndil4cjcjjvkh3yigfn4nr4b"; + type = "gem"; }; + version = "1.0.1"; }; - rack = { - version = "1.6.4"; + gollum-lib = { source = { - type = "gem"; remotes = ["https://rubygems.org"]; - sha256 = "09bs295yq6csjnkzj7ncj50i6chfxrhmzg1pk6p0vd2lb9ac8pj5"; + sha256 = "0399lfqv3hbpr7v14p9snyimva440d2mb8y7xm2zlgwv7l0n9z0z"; + type = "gem"; }; + version = "4.2.5"; }; - posix-spawn = { - version = "0.3.11"; + json = { source = { + remotes = ["https://rubygems.org"]; + sha256 = "01v6jjpvh3gnq6sgllpfqahlgxzj50ailwhj9b3cd20hi2dx0vxp"; type = "gem"; + }; + version = "2.1.0"; + }; + kramdown = { + source = { remotes = ["https://rubygems.org"]; - sha256 = "052lnxbkvlnwfjw4qd7vn2xrlaaqiav6f5x5bcjin97bsrfq6cmr"; + sha256 = "12sral2xli39mnr4b9m2sxdlgam4ni0a1mkxawc5311z107zj3p0"; + type = "gem"; }; + version = "1.9.0"; }; - nokogiri = { - version = "1.6.7.2"; + mime-types = { source = { + remotes = ["https://rubygems.org"]; + sha256 = "03j98xr0qw2p2jkclpmk7pm29yvmmh0073d8d43ajmr0h3w7i5l9"; type = "gem"; + }; + version = "2.99.3"; + }; + mini_portile2 = { + source = { remotes = ["https://rubygems.org"]; - sha256 = "11sbmpy60ynak6s3794q32lc99hs448msjy8rkp84ay7mq7zqspv"; + sha256 = "1y25adxb1hgg1wb2rn20g3vl07qziq6fz364jc5694611zz863hb"; + type = "gem"; }; + version = "2.1.0"; }; mustache = { - version = "0.99.8"; source = { - type = "gem"; remotes = ["https://rubygems.org"]; sha256 = "1g5hplm0k06vwxwqzwn1mq5bd02yp0h3rym4zwzw26aqi7drcsl2"; + type = "gem"; }; + version = "0.99.8"; }; - mini_portile2 = { - version = "2.0.0"; + nokogiri = { source = { - type = "gem"; remotes = ["https://rubygems.org"]; - sha256 = "056drbn5m4khdxly1asmiik14nyllswr6sh3wallvsywwdiryz8l"; + sha256 = "045xdg0w7nnsr2f2gb7v7bgx53xbc9dxf0jwzmh2pr3jyrzlm0cj"; + type = "gem"; }; + version = "1.6.8.1"; }; - mime-types = { - version = "1.25.1"; + posix-spawn = { source = { - type = "gem"; remotes = ["https://rubygems.org"]; - sha256 = "0mhzsanmnzdshaba7gmsjwnv168r1yj8y0flzw88frw1cickrvw8"; + sha256 = "1pmxmpins57qrbr31bs3bm7gidhaacmrp4md6i962gvpq4gyfcjw"; + type = "gem"; }; + version = "0.3.13"; }; - kramdown = { - version = "1.8.0"; + rack = { source = { - type = "gem"; remotes = ["https://rubygems.org"]; - sha256 = "0ryqq055h5n10c1cfba6pxsssa907l2hkw29anp0d41ryh47ca2l"; + sha256 = "19m7aixb2ri7p1n0iqaqx8ldi97xdhvbxijbyrrcdcl6fv5prqza"; + type = "gem"; }; + version = "1.6.8"; }; - gollum-lib = { - version = "4.1.0"; + rack-protection = { source = { - type = "gem"; remotes = ["https://rubygems.org"]; - sha256 = "01s8pgzhc3cgcmsy6hh79wrcbn5vbadniq2a7d4qw87kpq7mzfdm"; + sha256 = "0cvb21zz7p9wy23wdav63z5qzfn4nialik22yqp6gihkgfqqrh5r"; + type = "gem"; }; + version = "1.5.3"; }; - gollum-grit_adapter = { - version = "1.0.0"; + rouge = { source = { - type = "gem"; remotes = ["https://rubygems.org"]; - sha256 = "02c5qfq0s0kx2ifnpbnbgz6258fl7rchzzzc7vpx72shi8gbpac7"; + sha256 = "0sfikq1q8xyqqx690iiz7ybhzx87am4w50w8f2nq36l3asw4x89d"; + type = "gem"; }; + version = "2.0.7"; }; - gollum = { - version = "4.0.1"; + sanitize = { source = { - type = "gem"; remotes = ["https://rubygems.org"]; - sha256 = "02pgx083sns75zgnqx94p5h5bpr7cfiw5mys4ayb4k33hcjm6ydg"; + sha256 = "0xsv6xqrlz91rd8wifjknadbl3z5h6qphmxy0hjb189qbdghggn3"; + type = "gem"; }; + version = "2.1.0"; }; - gitlab-grit = { - version = "2.7.3"; + sinatra = { source = { - type = "gem"; remotes = ["https://rubygems.org"]; - sha256 = "0nv8shx7w7fww8lf5a2rbvf7bq173rllm381m6x7g1i0qqc68q1b"; + sha256 = "0byxzl7rx3ki0xd7aiv1x8mbah7hzd8f81l65nq8857kmgzj1jqq"; + type = "gem"; }; + version = "1.4.8"; }; - github-markup = { - version = "1.3.3"; + stringex = { source = { - type = "gem"; remotes = ["https://rubygems.org"]; - sha256 = "01r901wcgn0gs0n9h684gs5n90y1vaj9lxnx4z5ig611jwa43ivq"; + sha256 = "1zc93v00av643lc6njl09wwki7h5yqayhh1din8zqfylw814l1dv"; + type = "gem"; }; + version = "2.7.1"; }; - diff-lcs = { - version = "1.2.5"; + tilt = { source = { - type = "gem"; remotes = ["https://rubygems.org"]; - sha256 = "1vf9civd41bnqi6brr5d9jifdw73j9khc6fkhfl1f8r9cpkdvlx1"; + sha256 = "1is1ayw5049z8pd7slsk870bddyy5g2imp4z78lnvl8qsl8l0s7b"; + type = "gem"; }; + version = "2.0.7"; }; - charlock_holmes = { - version = "0.7.3"; + useragent = { source = { - type = "gem"; remotes = ["https://rubygems.org"]; - sha256 = "0jsl6k27wjmssxbwv9wpf7hgp9r0nvizcf6qpjnr7qs2nia53lf7"; + sha256 = "1139cjqyv1hk1qcw89k81ajjkqyakqgbcyvmfrsmjqi8yn9kgqhq"; + type = "gem"; }; + version = "0.16.8"; }; } \ No newline at end of file |