aboutsummaryrefslogtreecommitdiff
path: root/nixops/modules/websites
diff options
context:
space:
mode:
Diffstat (limited to 'nixops/modules/websites')
-rw-r--r--nixops/modules/websites/tools/diaspora/Gemfile318
-rw-r--r--nixops/modules/websites/tools/diaspora/Gemfile.lock909
-rw-r--r--nixops/modules/websites/tools/diaspora/diaspora.json8
-rw-r--r--nixops/modules/websites/tools/diaspora/diaspora.nix26
-rw-r--r--nixops/modules/websites/tools/diaspora/gemset.nix17
5 files changed, 34 insertions, 1244 deletions
diff --git a/nixops/modules/websites/tools/diaspora/Gemfile b/nixops/modules/websites/tools/diaspora/Gemfile
deleted file mode 100644
index e279514..0000000
--- a/nixops/modules/websites/tools/diaspora/Gemfile
+++ /dev/null
@@ -1,318 +0,0 @@
1# frozen_string_literal: true
2
3source "https://rubygems.org"
4
5gem "rails", "5.1.6"
6
7# Legacy Rails features, remove me!
8# responders (class level)
9gem "responders", "2.4.0"
10
11# Appserver
12
13gem "unicorn", "5.4.1", require: false
14gem "unicorn-worker-killer", "0.4.4"
15
16# Federation
17
18gem "diaspora_federation-json_schema", "0.2.5"
19gem "diaspora_federation-rails", "0.2.5"
20
21# API and JSON
22
23gem "acts_as_api", "1.0.1"
24gem "json", "2.1.0"
25gem "json-schema", "2.8.1"
26
27# Authentication
28
29gem "devise", "4.5.0"
30gem "devise_lastseenable", "0.0.6"
31
32# Captcha
33
34gem "simple_captcha2", "0.4.3", require: "simple_captcha"
35
36# Background processing
37
38gem "redis", "3.3.5" # Pinned to 3.3.x because of https://github.com/antirez/redis/issues/4272
39gem "sidekiq", "5.2.3"
40
41# Scheduled processing
42
43gem "sidekiq-cron", "1.0.4"
44
45# Compression
46
47gem "uglifier", "4.1.19"
48
49# Configuration
50
51gem "configurate", "0.3.1"
52
53# Cross-origin resource sharing
54
55gem "rack-cors", "1.0.2", require: "rack/cors"
56
57# CSS
58
59gem "autoprefixer-rails", "8.6.5"
60gem "bootstrap-sass", "3.3.7"
61gem "bootstrap-switch-rails", "3.3.4"
62gem "compass-rails", "3.1.0"
63gem "sass-rails", "5.0.7"
64gem "sprockets-rails", "3.2.1"
65
66# Database
67
68group :mysql, optional: true do
69 gem "mysql2", "0.5.2"
70end
71gem "pg", "1.1.3"
72
73
74gem "activerecord-import", "0.27.0"
75
76# File uploading
77
78gem "carrierwave", "1.2.3"
79gem "fog-aws", "3.3.0"
80gem "mini_magick", "4.9.2"
81
82# GUID generation
83gem "uuid", "2.3.9"
84
85# Icons
86
87gem "entypo-rails", "3.0.0"
88
89# JavaScript
90
91gem "handlebars_assets", "0.23.2"
92gem "jquery-rails", "4.3.3"
93gem "js-routes", "1.4.4"
94gem "js_image_paths", "0.1.1"
95
96source "https://rails-assets.org" do
97 gem "rails-assets-jquery", "3.3.1" # Should be kept in sync with jquery-rails
98 gem "rails-assets-jquery.ui", "1.11.4"
99
100 gem "rails-assets-highlightjs", "9.12.0"
101 gem "rails-assets-markdown-it", "8.4.2"
102 gem "rails-assets-markdown-it-hashtag", "0.4.0"
103 gem "rails-assets-markdown-it-diaspora-mention", "1.2.0"
104 gem "rails-assets-markdown-it-sanitizer", "0.4.3"
105 gem "rails-assets-markdown-it--markdown-it-for-inline", "0.1.1"
106 gem "rails-assets-markdown-it-sub", "1.0.0"
107 gem "rails-assets-markdown-it-sup", "1.0.0"
108
109 gem "rails-assets-backbone", "1.3.3"
110 gem "rails-assets-bootstrap-markdown", "2.10.0"
111 gem "rails-assets-corejs-typeahead", "1.2.1"
112 gem "rails-assets-fine-uploader", "5.13.0"
113
114 # jQuery plugins
115
116 gem "rails-assets-autosize", "4.0.2"
117 gem "rails-assets-blueimp-gallery", "2.33.0"
118 gem "rails-assets-jquery.are-you-sure", "1.9.0"
119 gem "rails-assets-jquery-placeholder", "2.3.1"
120 gem "rails-assets-jquery-textchange", "0.2.3"
121 gem "rails-assets-utatti-perfect-scrollbar", "1.4.0"
122end
123
124gem "markdown-it-html5-embed", "1.0.0"
125
126# Localization
127
128gem "http_accept_language", "2.1.1"
129gem "i18n-inflector-rails", "1.0.7"
130gem "rails-i18n", "5.1.2"
131
132# Mail
133
134gem "markerb", "1.1.0"
135
136# Map
137gem "leaflet-rails", "1.3.1"
138
139# Parsing
140
141gem "nokogiri", "1.8.5"
142gem "open_graph_reader", "0.6.2" # also update User-Agent in features/support/webmock.rb
143gem "redcarpet", "3.4.0"
144gem "ruby-oembed", "0.12.0"
145gem "twitter-text", "1.14.7"
146
147# RTL support
148
149gem "string-direction", "1.2.1"
150
151# Security Headers
152
153gem "secure_headers", "6.0.0"
154
155# Services
156
157gem "omniauth", "1.8.1"
158gem "omniauth-tumblr", "1.2"
159gem "omniauth-twitter", "1.4.0"
160gem "omniauth-wordpress", "0.2.2"
161gem "twitter", "6.2.0"
162
163# OpenID Connect
164gem "openid_connect", "1.1.6"
165
166# Serializers
167
168gem "active_model_serializers", "0.9.7"
169
170# XMPP chat dependencies
171gem "diaspora-prosody-config", "0.0.7"
172gem "rails-assets-diaspora_jsxc", "0.1.5.develop.7", source: "https://rails-assets.org"
173
174# Tags
175
176gem "acts-as-taggable-on", "6.0.0"
177
178# URIs and HTTP
179
180gem "addressable", "2.5.2", require: "addressable/uri"
181gem "faraday", "0.15.3"
182gem "faraday_middleware", "0.12.2"
183gem "faraday-cookie_jar", "0.0.6"
184gem "typhoeus", "1.3.1"
185
186# Views
187
188gem "gon", "6.2.1"
189gem "hamlit", "2.9.1"
190gem "mobile-fu", "1.4.0"
191gem "rails-timeago", "2.16.0"
192gem "will_paginate", "3.1.6"
193
194# Logging
195
196gem "logging-rails", "0.6.0", require: "logging/rails"
197
198# Reading and writing zip files
199
200gem "rubyzip", "1.2.2", require: "zip"
201
202# Prevent occasions where minitest is not bundled in
203# packaged versions of ruby. See following issues/prs:
204# https://github.com/gitlabhq/gitlabhq/issues/3826
205# https://github.com/gitlabhq/gitlabhq/pull/3852
206# https://github.com/discourse/discourse/pull/238
207gem "minitest"
208
209gem "versionist", "1.7.0"
210
211# Windows and OSX have an execjs compatible runtime built-in, Linux users should
212# install Node.js or use "therubyracer".
213#
214# See https://github.com/sstephenson/execjs#readme for more supported runtimes
215
216# gem "therubyracer", :platform => :ruby
217
218# LDAP
219gem 'net-ldap', '~> 0.16'
220
221group :production do # we don"t install these on travis to speed up test runs
222 # Analytics
223
224 gem "rack-google-analytics", "1.2.0"
225 gem "rack-piwik", "0.3.0", require: "rack/piwik"
226
227 # Process management
228
229 gem "eye", "0.10.0"
230
231 # Redirects
232
233 gem "rack-rewrite", "1.5.1", require: false
234 gem "rack-ssl", "1.4.1", require: "rack/ssl"
235
236 # Third party asset hosting
237
238 gem "asset_sync", "2.5.0", require: false
239end
240
241group :development do
242 # Automatic test runs
243 gem "guard", "2.15.0", require: false
244 gem "guard-rspec", "4.7.3", require: false
245 gem "guard-rubocop", "1.3.0", require: false
246 gem "rb-fsevent", "0.10.3", require: false
247 gem "rb-inotify", "0.9.10", require: false
248
249 # Linters
250 gem "haml_lint", "0.28.0", require: false
251 gem "pronto", "0.9.5", require: false
252 gem "pronto-eslint", "0.9.1", require: false
253 gem "pronto-haml", "0.9.0", require: false
254 gem "pronto-rubocop", "0.9.1", require: false
255 gem "pronto-scss", "0.9.1", require: false
256 gem "rubocop", "0.60.0", require: false
257
258 # Preloading environment
259
260 gem "spring", "2.0.2"
261 gem "spring-commands-rspec", "1.0.4"
262 gem "spring-commands-cucumber", "1.0.1"
263
264 # Debugging
265 gem "pry"
266 gem "pry-byebug"
267
268 # test coverage
269 gem "simplecov", "0.16.1", require: false
270
271 gem "turbo_dev_assets", "0.0.2"
272end
273
274group :test do
275 # RSpec (unit tests, some integration tests)
276
277 gem "fixture_builder", "0.5.2.rc3"
278 gem "fuubar", "2.3.2"
279 gem "json-schema-rspec", "0.0.4"
280 gem "rspec-json_expectations", "~> 2.1"
281
282 # Cucumber (integration tests)
283
284 gem "capybara", "3.11.1"
285 gem "database_cleaner", "1.7.0"
286 gem "poltergeist", "1.18.1"
287
288 gem "cucumber-api-steps", "0.14", require: false
289
290 # General helpers
291
292 gem "factory_girl_rails", "4.8.0"
293 gem "shoulda-matchers", "3.1.2"
294 gem "timecop", "0.9.1"
295 gem "webmock", "3.4.2", require: false
296
297 gem "diaspora_federation-test", "0.2.5"
298
299 # Coverage
300 gem "coveralls", "0.8.22", require: false
301end
302
303group :development, :test do
304 # RSpec (unit tests, some integration tests)
305 gem "rspec-rails", "3.8.1"
306
307 # Cucumber (integration tests)
308 gem "cucumber-rails", "1.6.0", require: false
309
310 # Jasmine (client side application tests (JS))
311 gem "jasmine", "3.3.0"
312 gem "jasmine-jquery-rails", "2.0.3"
313 gem "rails-assets-jasmine-ajax", "3.4.0", source: "https://rails-assets.org"
314 gem "sinon-rails", "1.15.0"
315
316 # For `assigns` in controller specs
317 gem "rails-controller-testing", "1.0.2"
318end
diff --git a/nixops/modules/websites/tools/diaspora/Gemfile.lock b/nixops/modules/websites/tools/diaspora/Gemfile.lock
deleted file mode 100644
index ceb08c1..0000000
--- a/nixops/modules/websites/tools/diaspora/Gemfile.lock
+++ /dev/null
@@ -1,909 +0,0 @@
1GEM
2 remote: https://rubygems.org/
3 remote: https://rails-assets.org/
4 specs:
5 actioncable (5.1.6)
6 actionpack (= 5.1.6)
7 nio4r (~> 2.0)
8 websocket-driver (~> 0.6.1)
9 actionmailer (5.1.6)
10 actionpack (= 5.1.6)
11 actionview (= 5.1.6)
12 activejob (= 5.1.6)
13 mail (~> 2.5, >= 2.5.4)
14 rails-dom-testing (~> 2.0)
15 actionpack (5.1.6)
16 actionview (= 5.1.6)
17 activesupport (= 5.1.6)
18 rack (~> 2.0)
19 rack-test (>= 0.6.3)
20 rails-dom-testing (~> 2.0)
21 rails-html-sanitizer (~> 1.0, >= 1.0.2)
22 actionview (5.1.6)
23 activesupport (= 5.1.6)
24 builder (~> 3.1)
25 erubi (~> 1.4)
26 rails-dom-testing (~> 2.0)
27 rails-html-sanitizer (~> 1.0, >= 1.0.3)
28 active_model_serializers (0.9.7)
29 activemodel (>= 3.2)
30 concurrent-ruby (~> 1.0)
31 activejob (5.1.6)
32 activesupport (= 5.1.6)
33 globalid (>= 0.3.6)
34 activemodel (5.1.6)
35 activesupport (= 5.1.6)
36 activerecord (5.1.6)
37 activemodel (= 5.1.6)
38 activesupport (= 5.1.6)
39 arel (~> 8.0)
40 activerecord-import (0.27.0)
41 activerecord (>= 3.2)
42 activesupport (5.1.6)
43 concurrent-ruby (~> 1.0, >= 1.0.2)
44 i18n (>= 0.7, < 2)
45 minitest (~> 5.1)
46 tzinfo (~> 1.1)
47 acts-as-taggable-on (6.0.0)
48 activerecord (~> 5.0)
49 acts_as_api (1.0.1)
50 activemodel (>= 3.0.0)
51 activesupport (>= 3.0.0)
52 rack (>= 1.1.0)
53 addressable (2.5.2)
54 public_suffix (>= 2.0.2, < 4.0)
55 aes_key_wrap (1.0.1)
56 arel (8.0.0)
57 asset_sync (2.5.0)
58 activemodel (>= 4.1.0)
59 fog-core
60 mime-types (>= 2.99)
61 unf
62 ast (2.4.0)
63 attr_required (1.0.1)
64 autoprefixer-rails (8.6.5)
65 execjs
66 backports (3.11.4)
67 bcrypt (3.1.12)
68 bindata (2.4.4)
69 bootstrap-sass (3.3.7)
70 autoprefixer-rails (>= 5.2.1)
71 sass (>= 3.3.4)
72 bootstrap-switch-rails (3.3.4)
73 buftok (0.2.0)
74 builder (3.2.3)
75 byebug (10.0.2)
76 capybara (3.11.1)
77 addressable
78 mini_mime (>= 0.1.3)
79 nokogiri (~> 1.8)
80 rack (>= 1.6.0)
81 rack-test (>= 0.6.3)
82 regexp_parser (~> 1.2)
83 xpath (~> 3.2)
84 carrierwave (1.2.3)
85 activemodel (>= 4.0.0)
86 activesupport (>= 4.0.0)
87 mime-types (>= 1.16)
88 celluloid (0.17.3)
89 celluloid-essentials
90 celluloid-extras
91 celluloid-fsm
92 celluloid-pool
93 celluloid-supervision
94 timers (>= 4.1.1)
95 celluloid-essentials (0.20.5)
96 timers (>= 4.1.1)
97 celluloid-extras (0.20.5)
98 timers (>= 4.1.1)
99 celluloid-fsm (0.20.5)
100 timers (>= 4.1.1)
101 celluloid-io (0.17.3)
102 celluloid (>= 0.17.2)
103 nio4r (>= 1.1)
104 timers (>= 4.1.1)
105 celluloid-pool (0.20.5)
106 timers (>= 4.1.1)
107 celluloid-supervision (0.20.6)
108 timers (>= 4.1.1)
109 chunky_png (1.3.10)
110 cliver (0.3.2)
111 coderay (1.1.2)
112 compass (1.0.3)
113 chunky_png (~> 1.2)
114 compass-core (~> 1.0.2)
115 compass-import-once (~> 1.0.5)
116 rb-fsevent (>= 0.9.3)
117 rb-inotify (>= 0.9)
118 sass (>= 3.3.13, < 3.5)
119 compass-core (1.0.3)
120 multi_json (~> 1.0)
121 sass (>= 3.3.0, < 3.5)
122 compass-import-once (1.0.5)
123 sass (>= 3.2, < 3.5)
124 compass-rails (3.1.0)
125 compass (~> 1.0.0)
126 sass-rails (< 5.1)
127 sprockets (< 4.0)
128 concurrent-ruby (1.1.3)
129 configurate (0.3.1)
130 connection_pool (2.2.2)
131 coveralls (0.8.22)
132 json (>= 1.8, < 3)
133 simplecov (~> 0.16.1)
134 term-ansicolor (~> 1.3)
135 thor (~> 0.19.4)
136 tins (~> 1.6)
137 crack (0.4.3)
138 safe_yaml (~> 1.0.0)
139 crass (1.0.4)
140 cucumber (3.1.2)
141 builder (>= 2.1.2)
142 cucumber-core (~> 3.2.0)
143 cucumber-expressions (~> 6.0.1)
144 cucumber-wire (~> 0.0.1)
145 diff-lcs (~> 1.3)
146 gherkin (~> 5.1.0)
147 multi_json (>= 1.7.5, < 2.0)
148 multi_test (>= 0.1.2)
149 cucumber-api-steps (0.14.0)
150 cucumber (>= 2.0.2)
151 jsonpath (>= 0.1.2)
152 cucumber-core (3.2.1)
153 backports (>= 3.8.0)
154 cucumber-tag_expressions (~> 1.1.0)
155 gherkin (~> 5.0)
156 cucumber-expressions (6.0.1)
157 cucumber-rails (1.6.0)
158 capybara (>= 1.1.2, < 4)
159 cucumber (>= 3.0.2, < 4)
160 mime-types (>= 1.17, < 4)
161 nokogiri (~> 1.8)
162 railties (>= 4, < 6)
163 cucumber-tag_expressions (1.1.1)
164 cucumber-wire (0.0.1)
165 database_cleaner (1.7.0)
166 devise (4.5.0)
167 bcrypt (~> 3.0)
168 orm_adapter (~> 0.1)
169 railties (>= 4.1.0, < 6.0)
170 responders
171 warden (~> 1.2.3)
172 devise_lastseenable (0.0.6)
173 devise
174 rails (>= 3.0.4)
175 diaspora-prosody-config (0.0.7)
176 diaspora_federation (0.2.5)
177 faraday (>= 0.9.0, < 0.16.0)
178 faraday_middleware (>= 0.10.0, < 0.13.0)
179 nokogiri (~> 1.6, >= 1.6.8)
180 typhoeus (~> 1.0)
181 valid (~> 1.0)
182 diaspora_federation-json_schema (0.2.5)
183 diaspora_federation-rails (0.2.5)
184 actionpack (>= 4.2, < 6)
185 diaspora_federation (= 0.2.5)
186 diaspora_federation-test (0.2.5)
187 diaspora_federation (= 0.2.5)
188 fabrication (~> 2.16)
189 uuid (~> 2.3, >= 2.3.8)
190 diff-lcs (1.3)
191 docile (1.3.1)
192 domain_name (0.5.20180417)
193 unf (>= 0.0.5, < 1.0.0)
194 entypo-rails (3.0.0)
195 railties (>= 4.1, < 6)
196 equalizer (0.0.11)
197 erubi (1.7.1)
198 eslintrb (2.1.0)
199 execjs
200 multi_json (>= 1.3)
201 rake
202 et-orbi (1.1.6)
203 tzinfo
204 ethon (0.11.0)
205 ffi (>= 1.3.0)
206 excon (0.62.0)
207 execjs (2.7.0)
208 eye (0.10.0)
209 celluloid (~> 0.17.3)
210 celluloid-io (~> 0.17.0)
211 kostya-sigar (~> 2.0.0)
212 state_machines
213 thor
214 fabrication (2.20.1)
215 factory_girl (4.8.0)
216 activesupport (>= 3.0.0)
217 factory_girl_rails (4.8.0)
218 factory_girl (~> 4.8.0)
219 railties (>= 3.0.0)
220 faraday (0.15.3)
221 multipart-post (>= 1.2, < 3)
222 faraday-cookie_jar (0.0.6)
223 faraday (>= 0.7.4)
224 http-cookie (~> 1.0.0)
225 faraday_middleware (0.12.2)
226 faraday (>= 0.7.4, < 1.0)
227 ffi (1.9.25)
228 fixture_builder (0.5.2.rc3)
229 activerecord (>= 2)
230 activesupport (>= 2)
231 hashdiff
232 fog-aws (3.3.0)
233 fog-core (~> 2.1)
234 fog-json (~> 1.1)
235 fog-xml (~> 0.1)
236 ipaddress (~> 0.8)
237 fog-core (2.1.2)
238 builder
239 excon (~> 0.58)
240 formatador (~> 0.2)
241 mime-types
242 fog-json (1.2.0)
243 fog-core
244 multi_json (~> 1.10)
245 fog-xml (0.1.3)
246 fog-core
247 nokogiri (>= 1.5.11, < 2.0.0)
248 formatador (0.2.5)
249 fugit (1.1.6)
250 et-orbi (~> 1.1, >= 1.1.6)
251 raabro (~> 1.1)
252 fuubar (2.3.2)
253 rspec-core (~> 3.0)
254 ruby-progressbar (~> 1.4)
255 get_process_mem (0.2.3)
256 gherkin (5.1.0)
257 gitlab (4.7.0)
258 httparty (>= 0.14.0)
259 terminal-table (>= 1.5.1)
260 globalid (0.4.1)
261 activesupport (>= 4.2.0)
262 gon (6.2.1)
263 actionpack (>= 3.0)
264 multi_json
265 request_store (>= 1.0)
266 guard (2.15.0)
267 formatador (>= 0.2.4)
268 listen (>= 2.7, < 4.0)
269 lumberjack (>= 1.0.12, < 2.0)
270 nenv (~> 0.1)
271 notiffany (~> 0.0)
272 pry (>= 0.9.12)
273 shellany (~> 0.0)
274 thor (>= 0.18.1)
275 guard-compat (1.2.1)
276 guard-rspec (4.7.3)
277 guard (~> 2.1)
278 guard-compat (~> 1.1)
279 rspec (>= 2.99.0, < 4.0)
280 guard-rubocop (1.3.0)
281 guard (~> 2.0)
282 rubocop (~> 0.20)
283 haml (5.0.4)
284 temple (>= 0.8.0)
285 tilt
286 haml_lint (0.28.0)
287 haml (>= 4.0, < 5.1)
288 rainbow
289 rake (>= 10, < 13)
290 rubocop (>= 0.50.0)
291 sysexits (~> 1.1)
292 hamlit (2.9.1)
293 temple (>= 0.8.0)
294 thor
295 tilt
296 handlebars_assets (0.23.2)
297 execjs (~> 2.0)
298 sprockets (>= 2.0.0)
299 tilt (>= 1.2)
300 hashdiff (0.3.7)
301 hashie (3.5.7)
302 http (3.3.0)
303 addressable (~> 2.3)
304 http-cookie (~> 1.0)
305 http-form_data (~> 2.0)
306 http_parser.rb (~> 0.6.0)
307 http-cookie (1.0.3)
308 domain_name (~> 0.5)
309 http-form_data (2.1.1)
310 http_accept_language (2.1.1)
311 http_parser.rb (0.6.0)
312 httparty (0.16.3)
313 mime-types (~> 3.0)
314 multi_xml (>= 0.5.2)
315 httpclient (2.8.3)
316 i18n (1.1.1)
317 concurrent-ruby (~> 1.0)
318 i18n-inflector (2.6.7)
319 i18n (>= 0.4.1)
320 i18n-inflector-rails (1.0.7)
321 actionpack (>= 3.0.0)
322 i18n-inflector (~> 2.6)
323 railties (>= 3.0.0)
324 ipaddress (0.8.3)
325 jaro_winkler (1.5.1)
326 jasmine (3.3.0)
327 jasmine-core (~> 3.3.0)
328 phantomjs
329 rack (>= 1.2.1)
330 rake
331 jasmine-core (3.3.0)
332 jasmine-jquery-rails (2.0.3)
333 jquery-rails (4.3.3)
334 rails-dom-testing (>= 1, < 3)
335 railties (>= 4.2.0)
336 thor (>= 0.14, < 2.0)
337 js-routes (1.4.4)
338 railties (>= 3.2)
339 sprockets-rails
340 js_image_paths (0.1.1)
341 rails (>= 4.0, < 6.0)
342 sprockets (>= 3.0.0)
343 json (2.1.0)
344 json-jwt (1.9.4)
345 activesupport
346 aes_key_wrap
347 bindata
348 json-schema (2.8.1)
349 addressable (>= 2.4)
350 json-schema-rspec (0.0.4)
351 json-schema (~> 2.5)
352 rspec
353 jsonpath (0.9.6)
354 multi_json
355 to_regexp (~> 0.2.1)
356 jwt (2.1.0)
357 kgio (2.11.2)
358 kostya-sigar (2.0.4)
359 leaflet-rails (1.3.1)
360 rails (>= 4.2.0)
361 listen (3.1.5)
362 rb-fsevent (~> 0.9, >= 0.9.4)
363 rb-inotify (~> 0.9, >= 0.9.7)
364 ruby_dep (~> 1.2)
365 little-plugger (1.1.4)
366 logging (2.2.2)
367 little-plugger (~> 1.1)
368 multi_json (~> 1.10)
369 logging-rails (0.6.0)
370 logging (>= 1.8)
371 loofah (2.2.3)
372 crass (~> 1.0.2)
373 nokogiri (>= 1.5.9)
374 lumberjack (1.0.13)
375 macaddr (1.7.1)
376 systemu (~> 2.6.2)
377 mail (2.7.1)
378 mini_mime (>= 0.1.1)
379 markdown-it-html5-embed (1.0.0)
380 markerb (1.1.0)
381 memoizable (0.4.2)
382 thread_safe (~> 0.3, >= 0.3.1)
383 method_source (0.9.2)
384 mime-types (3.2.2)
385 mime-types-data (~> 3.2015)
386 mime-types-data (3.2018.0812)
387 mini_magick (4.9.2)
388 mini_mime (1.0.1)
389 mini_portile2 (2.3.0)
390 minitest (5.11.3)
391 mobile-fu (1.4.0)
392 rack-mobile-detect
393 rails
394 multi_json (1.13.1)
395 multi_test (0.1.2)
396 multi_xml (0.6.0)
397 multipart-post (2.0.0)
398 mysql2 (0.5.2)
399 naught (1.1.0)
400 nenv (0.3.0)
401 net-ldap (0.16.1)
402 nio4r (2.3.1)
403 nokogiri (1.8.5)
404 mini_portile2 (~> 2.3.0)
405 notiffany (0.1.1)
406 nenv (~> 0.1)
407 shellany (~> 0.0)
408 oauth (0.5.4)
409 oauth2 (1.4.1)
410 faraday (>= 0.8, < 0.16.0)
411 jwt (>= 1.0, < 3.0)
412 multi_json (~> 1.3)
413 multi_xml (~> 0.5)
414 rack (>= 1.2, < 3)
415 octokit (4.13.0)
416 sawyer (~> 0.8.0, >= 0.5.3)
417 omniauth (1.8.1)
418 hashie (>= 3.4.6, < 3.6.0)
419 rack (>= 1.6.2, < 3)
420 omniauth-oauth (1.1.0)
421 oauth
422 omniauth (~> 1.0)
423 omniauth-oauth2 (1.5.0)
424 oauth2 (~> 1.1)
425 omniauth (~> 1.2)
426 omniauth-tumblr (1.2)
427 multi_json
428 omniauth-oauth (~> 1.0)
429 omniauth-twitter (1.4.0)
430 omniauth-oauth (~> 1.1)
431 rack
432 omniauth-wordpress (0.2.2)
433 omniauth-oauth2 (>= 1.1.0)
434 open_graph_reader (0.6.2)
435 faraday (>= 0.9.0)
436 nokogiri (~> 1.6)
437 openid_connect (1.1.6)
438 activemodel
439 attr_required (>= 1.0.0)
440 json-jwt (>= 1.5.0)
441 rack-oauth2 (>= 1.6.1)
442 swd (>= 1.0.0)
443 tzinfo
444 validate_email
445 validate_url
446 webfinger (>= 1.0.1)
447 orm_adapter (0.5.0)
448 parallel (1.12.1)
449 parser (2.5.3.0)
450 ast (~> 2.4.0)
451 pg (1.1.3)
452 phantomjs (2.1.1.0)
453 poltergeist (1.18.1)
454 capybara (>= 2.1, < 4)
455 cliver (~> 0.3.1)
456 websocket-driver (>= 0.2.0)
457 powerpack (0.1.2)
458 pronto (0.9.5)
459 gitlab (~> 4.0, >= 4.0.0)
460 httparty (>= 0.13.7)
461 octokit (~> 4.7, >= 4.7.0)
462 rainbow (~> 2.1)
463 rugged (~> 0.24, >= 0.23.0)
464 thor (~> 0.19.0)
465 pronto-eslint (0.9.1)
466 eslintrb (~> 2.0, >= 2.0.0)
467 pronto (~> 0.9.0)
468 pronto-haml (0.9.0)
469 haml_lint (~> 0.23)
470 pronto (~> 0.9.0)
471 pronto-rubocop (0.9.1)
472 pronto (~> 0.9.0)
473 rubocop (~> 0.50, >= 0.49.1)
474 pronto-scss (0.9.1)
475 pronto (~> 0.9.0)
476 scss_lint (~> 0.43, >= 0.43.0)
477 pry (0.12.2)
478 coderay (~> 1.1.0)
479 method_source (~> 0.9.0)
480 pry-byebug (3.6.0)
481 byebug (~> 10.0)
482 pry (~> 0.10)
483 public_suffix (3.0.3)
484 raabro (1.1.6)
485 rack (2.0.6)
486 rack-cors (1.0.2)
487 rack-google-analytics (1.2.0)
488 actionpack
489 activesupport
490 rack-mobile-detect (0.4.0)
491 rack
492 rack-oauth2 (1.9.3)
493 activesupport
494 attr_required
495 httpclient
496 json-jwt (>= 1.9.0)
497 rack
498 rack-piwik (0.3.0)
499 rack-protection (2.0.4)
500 rack
501 rack-rewrite (1.5.1)
502 rack-ssl (1.4.1)
503 rack
504 rack-test (1.1.0)
505 rack (>= 1.0, < 3)
506 rails (5.1.6)
507 actioncable (= 5.1.6)
508 actionmailer (= 5.1.6)
509 actionpack (= 5.1.6)
510 actionview (= 5.1.6)
511 activejob (= 5.1.6)
512 activemodel (= 5.1.6)
513 activerecord (= 5.1.6)
514 activesupport (= 5.1.6)
515 bundler (>= 1.3.0)
516 railties (= 5.1.6)
517 sprockets-rails (>= 2.0.0)
518 rails-assets-autosize (4.0.2)
519 rails-assets-backbone (1.3.3)
520 rails-assets-underscore (>= 1.8.3)
521 rails-assets-blueimp-gallery (2.33.0)
522 rails-assets-bootstrap (3.3.7)
523 rails-assets-jquery (>= 1.9.1, < 4)
524 rails-assets-bootstrap-markdown (2.10.0)
525 rails-assets-bootstrap (~> 3)
526 rails-assets-corejs-typeahead (1.2.1)
527 rails-assets-jquery (>= 1.11)
528 rails-assets-diaspora_jsxc (0.1.5.develop.7)
529 rails-assets-emojione (~> 2.0.1)
530 rails-assets-favico.js (>= 0.3.10, < 0.4)
531 rails-assets-jquery-colorbox (~> 1.6.3)
532 rails-assets-jquery-fullscreen-plugin (~> 0.5.0)
533 rails-assets-jquery.slimscroll (~> 1.3.6)
534 rails-assets-jquery.ui (~> 1.11.4)
535 rails-assets-emojione (2.0.1)
536 rails-assets-favico.js (0.3.10)
537 rails-assets-fine-uploader (5.13.0)
538 rails-assets-highlightjs (9.12.0)
539 rails-assets-jasmine (3.3.0)
540 rails-assets-jasmine-ajax (3.4.0)
541 rails-assets-jasmine (~> 3)
542 rails-assets-jquery (3.3.1)
543 rails-assets-jquery-colorbox (1.6.4)
544 rails-assets-jquery (>= 1.3.2)
545 rails-assets-jquery-fullscreen-plugin (0.5.0)
546 rails-assets-jquery-placeholder (2.3.1)
547 rails-assets-jquery (>= 1.6)
548 rails-assets-jquery-textchange (0.2.3)
549 rails-assets-jquery
550 rails-assets-jquery.are-you-sure (1.9.0)
551 rails-assets-jquery (>= 1.4.2)
552 rails-assets-jquery.slimscroll (1.3.8)
553 rails-assets-jquery.ui (1.11.4)
554 rails-assets-jquery (>= 1.6)
555 rails-assets-markdown-it--markdown-it-for-inline (0.1.1)
556 rails-assets-markdown-it (8.4.2)
557 rails-assets-markdown-it-diaspora-mention (1.2.0)
558 rails-assets-markdown-it-hashtag (0.4.0)
559 rails-assets-markdown-it-sanitizer (0.4.3)
560 rails-assets-markdown-it-sub (1.0.0)
561 rails-assets-markdown-it-sup (1.0.0)
562 rails-assets-underscore (1.9.1)
563 rails-assets-utatti-perfect-scrollbar (1.4.0)
564 rails-controller-testing (1.0.2)
565 actionpack (~> 5.x, >= 5.0.1)
566 actionview (~> 5.x, >= 5.0.1)
567 activesupport (~> 5.x)
568 rails-dom-testing (2.0.3)
569 activesupport (>= 4.2.0)
570 nokogiri (>= 1.6)
571 rails-html-sanitizer (1.0.4)
572 loofah (~> 2.2, >= 2.2.2)
573 rails-i18n (5.1.2)
574 i18n (>= 0.7, < 2)
575 railties (>= 5.0, < 6)
576 rails-timeago (2.16.0)
577 actionpack (>= 3.1)
578 activesupport (>= 3.1)
579 railties (5.1.6)
580 actionpack (= 5.1.6)
581 activesupport (= 5.1.6)
582 method_source
583 rake (>= 0.8.7)
584 thor (>= 0.18.1, < 2.0)
585 rainbow (2.2.2)
586 rake
587 raindrops (0.19.0)
588 rake (12.3.1)
589 rb-fsevent (0.10.3)
590 rb-inotify (0.9.10)
591 ffi (>= 0.5.0, < 2)
592 redcarpet (3.4.0)
593 redis (3.3.5)
594 regexp_parser (1.3.0)
595 request_store (1.4.1)
596 rack (>= 1.4)
597 responders (2.4.0)
598 actionpack (>= 4.2.0, < 5.3)
599 railties (>= 4.2.0, < 5.3)
600 rspec (3.8.0)
601 rspec-core (~> 3.8.0)
602 rspec-expectations (~> 3.8.0)
603 rspec-mocks (~> 3.8.0)
604 rspec-core (3.8.0)
605 rspec-support (~> 3.8.0)
606 rspec-expectations (3.8.2)
607 diff-lcs (>= 1.2.0, < 2.0)
608 rspec-support (~> 3.8.0)
609 rspec-json_expectations (2.1.0)
610 rspec-mocks (3.8.0)
611 diff-lcs (>= 1.2.0, < 2.0)
612 rspec-support (~> 3.8.0)
613 rspec-rails (3.8.1)
614 actionpack (>= 3.0)
615 activesupport (>= 3.0)
616 railties (>= 3.0)
617 rspec-core (~> 3.8.0)
618 rspec-expectations (~> 3.8.0)
619 rspec-mocks (~> 3.8.0)
620 rspec-support (~> 3.8.0)
621 rspec-support (3.8.0)
622 rubocop (0.60.0)
623 jaro_winkler (~> 1.5.1)
624 parallel (~> 1.10)
625 parser (>= 2.5, != 2.5.1.1)
626 powerpack (~> 0.1)
627 rainbow (>= 2.2.2, < 4.0)
628 ruby-progressbar (~> 1.7)
629 unicode-display_width (~> 1.4.0)
630 ruby-oembed (0.12.0)
631 ruby-progressbar (1.10.0)
632 ruby_dep (1.5.0)
633 rubyzip (1.2.2)
634 rugged (0.27.5)
635 safe_yaml (1.0.4)
636 sass (3.4.25)
637 sass-rails (5.0.7)
638 railties (>= 4.0.0, < 6)
639 sass (~> 3.1)
640 sprockets (>= 2.8, < 4.0)
641 sprockets-rails (>= 2.0, < 4.0)
642 tilt (>= 1.1, < 3)
643 sawyer (0.8.1)
644 addressable (>= 2.3.5, < 2.6)
645 faraday (~> 0.8, < 1.0)
646 scss_lint (0.55.0)
647 rake (>= 0.9, < 13)
648 sass (~> 3.4.20)
649 secure_headers (6.0.0)
650 shellany (0.0.1)
651 shoulda-matchers (3.1.2)
652 activesupport (>= 4.0.0)
653 sidekiq (5.2.3)
654 connection_pool (~> 2.2, >= 2.2.2)
655 rack-protection (>= 1.5.0)
656 redis (>= 3.3.5, < 5)
657 sidekiq-cron (1.0.4)
658 fugit (~> 1.1)
659 sidekiq (>= 4.2.1)
660 simple_captcha2 (0.4.3)
661 rails (>= 4.1)
662 simple_oauth (0.3.1)
663 simplecov (0.16.1)
664 docile (~> 1.1)
665 json (>= 1.8, < 3)
666 simplecov-html (~> 0.10.0)
667 simplecov-html (0.10.2)
668 sinon-rails (1.15.0)
669 railties (>= 3.1)
670 spring (2.0.2)
671 activesupport (>= 4.2)
672 spring-commands-cucumber (1.0.1)
673 spring (>= 0.9.1)
674 spring-commands-rspec (1.0.4)
675 spring (>= 0.9.1)
676 sprockets (3.7.2)
677 concurrent-ruby (~> 1.0)
678 rack (> 1, < 3)
679 sprockets-rails (3.2.1)
680 actionpack (>= 4.0)
681 activesupport (>= 4.0)
682 sprockets (>= 3.0.0)
683 state_machines (0.5.0)
684 string-direction (1.2.1)
685 swd (1.1.2)
686 activesupport (>= 3)
687 attr_required (>= 0.0.5)
688 httpclient (>= 2.4)
689 sysexits (1.2.0)
690 systemu (2.6.5)
691 temple (0.8.0)
692 term-ansicolor (1.7.0)
693 tins (~> 1.0)
694 terminal-table (1.8.0)
695 unicode-display_width (~> 1.1, >= 1.1.1)
696 thor (0.19.4)
697 thread_safe (0.3.6)
698 tilt (2.0.8)
699 timecop (0.9.1)
700 timers (4.2.0)
701 tins (1.20.2)
702 to_regexp (0.2.1)
703 turbo_dev_assets (0.0.2)
704 twitter (6.2.0)
705 addressable (~> 2.3)
706 buftok (~> 0.2.0)
707 equalizer (~> 0.0.11)
708 http (~> 3.0)
709 http-form_data (~> 2.0)
710 http_parser.rb (~> 0.6.0)
711 memoizable (~> 0.4.0)
712 multipart-post (~> 2.0)
713 naught (~> 1.0)
714 simple_oauth (~> 0.3.0)
715 twitter-text (1.14.7)
716 unf (~> 0.1.0)
717 typhoeus (1.3.1)
718 ethon (>= 0.9.0)
719 tzinfo (1.2.5)
720 thread_safe (~> 0.1)
721 uglifier (4.1.19)
722 execjs (>= 0.3.0, < 3)
723 unf (0.1.4)
724 unf_ext
725 unf_ext (0.0.7.5)
726 unicode-display_width (1.4.0)
727 unicorn (5.4.1)
728 kgio (~> 2.6)
729 raindrops (~> 0.7)
730 unicorn-worker-killer (0.4.4)
731 get_process_mem (~> 0)
732 unicorn (>= 4, < 6)
733 uuid (2.3.9)
734 macaddr (~> 1.0)
735 valid (1.2.0)
736 validate_email (0.1.6)
737 activemodel (>= 3.0)
738 mail (>= 2.2.5)
739 validate_url (1.0.2)
740 activemodel (>= 3.0.0)
741 addressable
742 versionist (1.7.0)
743 activesupport (>= 3)
744 railties (>= 3)
745 yard (~> 0.9.11)
746 warden (1.2.8)
747 rack (>= 2.0.6)
748 webfinger (1.1.0)
749 activesupport
750 httpclient (>= 2.4)
751 webmock (3.4.2)
752 addressable (>= 2.3.6)
753 crack (>= 0.3.2)
754 hashdiff
755 websocket-driver (0.6.5)
756 websocket-extensions (>= 0.1.0)
757 websocket-extensions (0.1.3)
758 will_paginate (3.1.6)
759 xpath (3.2.0)
760 nokogiri (~> 1.8)
761 yard (0.9.16)
762
763PLATFORMS
764 ruby
765
766DEPENDENCIES
767 active_model_serializers (= 0.9.7)
768 activerecord-import (= 0.27.0)
769 acts-as-taggable-on (= 6.0.0)
770 acts_as_api (= 1.0.1)
771 addressable (= 2.5.2)
772 asset_sync (= 2.5.0)
773 autoprefixer-rails (= 8.6.5)
774 bootstrap-sass (= 3.3.7)
775 bootstrap-switch-rails (= 3.3.4)
776 capybara (= 3.11.1)
777 carrierwave (= 1.2.3)
778 compass-rails (= 3.1.0)
779 configurate (= 0.3.1)
780 coveralls (= 0.8.22)
781 cucumber-api-steps (= 0.14)
782 cucumber-rails (= 1.6.0)
783 database_cleaner (= 1.7.0)
784 devise (= 4.5.0)
785 devise_lastseenable (= 0.0.6)
786 diaspora-prosody-config (= 0.0.7)
787 diaspora_federation-json_schema (= 0.2.5)
788 diaspora_federation-rails (= 0.2.5)
789 diaspora_federation-test (= 0.2.5)
790 entypo-rails (= 3.0.0)
791 eye (= 0.10.0)
792 factory_girl_rails (= 4.8.0)
793 faraday (= 0.15.3)
794 faraday-cookie_jar (= 0.0.6)
795 faraday_middleware (= 0.12.2)
796 fixture_builder (= 0.5.2.rc3)
797 fog-aws (= 3.3.0)
798 fuubar (= 2.3.2)
799 gon (= 6.2.1)
800 guard (= 2.15.0)
801 guard-rspec (= 4.7.3)
802 guard-rubocop (= 1.3.0)
803 haml_lint (= 0.28.0)
804 hamlit (= 2.9.1)
805 handlebars_assets (= 0.23.2)
806 http_accept_language (= 2.1.1)
807 i18n-inflector-rails (= 1.0.7)
808 jasmine (= 3.3.0)
809 jasmine-jquery-rails (= 2.0.3)
810 jquery-rails (= 4.3.3)
811 js-routes (= 1.4.4)
812 js_image_paths (= 0.1.1)
813 json (= 2.1.0)
814 json-schema (= 2.8.1)
815 json-schema-rspec (= 0.0.4)
816 leaflet-rails (= 1.3.1)
817 logging-rails (= 0.6.0)
818 markdown-it-html5-embed (= 1.0.0)
819 markerb (= 1.1.0)
820 mini_magick (= 4.9.2)
821 minitest
822 mobile-fu (= 1.4.0)
823 mysql2 (= 0.5.2)
824 net-ldap (~> 0.16)
825 nokogiri (= 1.8.5)
826 omniauth (= 1.8.1)
827 omniauth-tumblr (= 1.2)
828 omniauth-twitter (= 1.4.0)
829 omniauth-wordpress (= 0.2.2)
830 open_graph_reader (= 0.6.2)
831 openid_connect (= 1.1.6)
832 pg (= 1.1.3)
833 poltergeist (= 1.18.1)
834 pronto (= 0.9.5)
835 pronto-eslint (= 0.9.1)
836 pronto-haml (= 0.9.0)
837 pronto-rubocop (= 0.9.1)
838 pronto-scss (= 0.9.1)
839 pry
840 pry-byebug
841 rack-cors (= 1.0.2)
842 rack-google-analytics (= 1.2.0)
843 rack-piwik (= 0.3.0)
844 rack-rewrite (= 1.5.1)
845 rack-ssl (= 1.4.1)
846 rails (= 5.1.6)
847 rails-assets-autosize (= 4.0.2)!
848 rails-assets-backbone (= 1.3.3)!
849 rails-assets-blueimp-gallery (= 2.33.0)!
850 rails-assets-bootstrap-markdown (= 2.10.0)!
851 rails-assets-corejs-typeahead (= 1.2.1)!
852 rails-assets-diaspora_jsxc (= 0.1.5.develop.7)!
853 rails-assets-fine-uploader (= 5.13.0)!
854 rails-assets-highlightjs (= 9.12.0)!
855 rails-assets-jasmine-ajax (= 3.4.0)!
856 rails-assets-jquery (= 3.3.1)!
857 rails-assets-jquery-placeholder (= 2.3.1)!
858 rails-assets-jquery-textchange (= 0.2.3)!
859 rails-assets-jquery.are-you-sure (= 1.9.0)!
860 rails-assets-jquery.ui (= 1.11.4)!
861 rails-assets-markdown-it (= 8.4.2)!
862 rails-assets-markdown-it--markdown-it-for-inline (= 0.1.1)!
863 rails-assets-markdown-it-diaspora-mention (= 1.2.0)!
864 rails-assets-markdown-it-hashtag (= 0.4.0)!
865 rails-assets-markdown-it-sanitizer (= 0.4.3)!
866 rails-assets-markdown-it-sub (= 1.0.0)!
867 rails-assets-markdown-it-sup (= 1.0.0)!
868 rails-assets-utatti-perfect-scrollbar (= 1.4.0)!
869 rails-controller-testing (= 1.0.2)
870 rails-i18n (= 5.1.2)
871 rails-timeago (= 2.16.0)
872 rb-fsevent (= 0.10.3)
873 rb-inotify (= 0.9.10)
874 redcarpet (= 3.4.0)
875 redis (= 3.3.5)
876 responders (= 2.4.0)
877 rspec-json_expectations (~> 2.1)
878 rspec-rails (= 3.8.1)
879 rubocop (= 0.60.0)
880 ruby-oembed (= 0.12.0)
881 rubyzip (= 1.2.2)
882 sass-rails (= 5.0.7)
883 secure_headers (= 6.0.0)
884 shoulda-matchers (= 3.1.2)
885 sidekiq (= 5.2.3)
886 sidekiq-cron (= 1.0.4)
887 simple_captcha2 (= 0.4.3)
888 simplecov (= 0.16.1)
889 sinon-rails (= 1.15.0)
890 spring (= 2.0.2)
891 spring-commands-cucumber (= 1.0.1)
892 spring-commands-rspec (= 1.0.4)
893 sprockets-rails (= 3.2.1)
894 string-direction (= 1.2.1)
895 timecop (= 0.9.1)
896 turbo_dev_assets (= 0.0.2)
897 twitter (= 6.2.0)
898 twitter-text (= 1.14.7)
899 typhoeus (= 1.3.1)
900 uglifier (= 4.1.19)
901 unicorn (= 5.4.1)
902 unicorn-worker-killer (= 0.4.4)
903 uuid (= 2.3.9)
904 versionist (= 1.7.0)
905 webmock (= 3.4.2)
906 will_paginate (= 3.1.6)
907
908BUNDLED WITH
909 1.17.1
diff --git a/nixops/modules/websites/tools/diaspora/diaspora.json b/nixops/modules/websites/tools/diaspora/diaspora.json
index d5891c1..e6795aa 100644
--- a/nixops/modules/websites/tools/diaspora/diaspora.json
+++ b/nixops/modules/websites/tools/diaspora/diaspora.json
@@ -1,15 +1,15 @@
1{ 1{
2 "tag": "v0.7.8.0", 2 "tag": "v0.7.10.0",
3 "meta": { 3 "meta": {
4 "name": "diaspora", 4 "name": "diaspora",
5 "url": "https://github.com/diaspora/diaspora", 5 "url": "https://github.com/diaspora/diaspora",
6 "branch": "refs/tags/v0.7.8.0" 6 "branch": "refs/tags/v0.7.10.0"
7 }, 7 },
8 "github": { 8 "github": {
9 "owner": "diaspora", 9 "owner": "diaspora",
10 "repo": "diaspora", 10 "repo": "diaspora",
11 "rev": "e1b66f3c7cb72bd2cc9cf51475b31b005a547556", 11 "rev": "f0085cf5bb1c45bdfba866f628153d299e56eca8",
12 "sha256": "1cgyb878zhdnkh7qa9qj8lwaf0jlb1prg1qnqasf7j5kgh9wn0nn", 12 "sha256": "02mnb40rdkk6jlnvpy61fad59gbpgnlwz1k35w4wfqdwzq0znaqp",
13 "fetchSubmodules": true 13 "fetchSubmodules": true
14 } 14 }
15} 15}
diff --git a/nixops/modules/websites/tools/diaspora/diaspora.nix b/nixops/modules/websites/tools/diaspora/diaspora.nix
index 778fe26..616c5cc 100644
--- a/nixops/modules/websites/tools/diaspora/diaspora.nix
+++ b/nixops/modules/websites/tools/diaspora/diaspora.nix
@@ -1,25 +1,31 @@
1{ env, fetchedGithub, stdenv, defaultGemConfig, writeText, bundlerEnv, ruby_2_4, pkgs, cacert }: 1{ env, fetchedGithub, stdenv, defaultGemConfig, writeText, bundlerEnv, ruby_2_4, pkgs, cacert }:
2let 2let
3 gems = bundlerEnv {
4 name = "diaspora-env";
5 ruby = ruby_2_4;
6 gemdir = ./.;
7 gemConfig = defaultGemConfig // {
8 kostya-sigar = attrs: {
9 buildInputs = with pkgs; [ pkgs.perl ];
10 };
11 };
12 };
13 varDir = "/var/lib/diaspora_immae"; 3 varDir = "/var/lib/diaspora_immae";
14 socketsDir = "/run/diaspora"; 4 socketsDir = "/run/diaspora";
15 diaspora = stdenv.mkDerivation (fetchedGithub ./diaspora.json // rec { 5 diaspora = stdenv.mkDerivation (fetchedGithub ./diaspora.json // rec {
16 buildPhase = '' 6 buildPhase = ''
17 patch -p1 < ${./ldap.patch} 7 patch -p1 < ${./ldap.patch}
8 # FIXME: bundlerEnv below doesn't take postgresql group for some
9 # reason
10 echo 'gem "pg", "1.1.3"' >> Gemfile
18 ''; 11 '';
19 installPhase = '' 12 installPhase = ''
20 cp -a . $out 13 cp -a . $out
21 ''; 14 '';
22 }); 15 });
16 gems = bundlerEnv {
17 name = "diaspora-env";
18 ruby = ruby_2_4;
19 gemfile = "${diaspora}/Gemfile";
20 lockfile = "${diaspora}/Gemfile.lock";
21 gemset = ./gemset.nix;
22 groups = [ "postgresql" "default" "production" ];
23 gemConfig = defaultGemConfig // {
24 kostya-sigar = attrs: {
25 buildInputs = [ pkgs.perl ];
26 };
27 };
28 };
23 secret_token = writeText "secret_token.rb" '' 29 secret_token = writeText "secret_token.rb" ''
24 Diaspora::Application.config.secret_key_base = '${env.secret_token}' 30 Diaspora::Application.config.secret_key_base = '${env.secret_token}'
25 ''; 31 '';
diff --git a/nixops/modules/websites/tools/diaspora/gemset.nix b/nixops/modules/websites/tools/diaspora/gemset.nix
index 66482f0..f946088 100644
--- a/nixops/modules/websites/tools/diaspora/gemset.nix
+++ b/nixops/modules/websites/tools/diaspora/gemset.nix
@@ -223,13 +223,14 @@
223 version = "3.3.7"; 223 version = "3.3.7";
224 }; 224 };
225 bootstrap-switch-rails = { 225 bootstrap-switch-rails = {
226 groups = ["default"];
226 platforms = []; 227 platforms = [];
227 source = { 228 source = {
228 remotes = ["https://rubygems.org"]; 229 remotes = ["https://rubygems.org"];
229 sha256 = "0qdk7xx0zlv4l49s2mwg4jd8a5ms3cy43n9l3217bknagcjyjfjx"; 230 sha256 = "1zkwc1hfmihnm0n9lkva5zk0cmqpfcpnrwnmaniyvgx7rac2r14l";
230 type = "gem"; 231 type = "gem";
231 }; 232 };
232 version = "3.3.4"; 233 version = "3.3.3";
233 }; 234 };
234 buftok = { 235 buftok = {
235 platforms = []; 236 platforms = [];
@@ -1495,6 +1496,16 @@
1495 }; 1496 };
1496 version = "2.0.0"; 1497 version = "2.0.0";
1497 }; 1498 };
1499 mysql2 = {
1500 groups = ["mysql"];
1501 platforms = [];
1502 source = {
1503 remotes = ["https://rubygems.org"];
1504 sha256 = "1a2kdjgzwh1p2rkcmxaawy6ibi32b04wbdd5d4wr8i342pq76di4";
1505 type = "gem";
1506 };
1507 version = "0.5.2";
1508 };
1498 naught = { 1509 naught = {
1499 platforms = []; 1510 platforms = [];
1500 source = { 1511 source = {
@@ -3042,4 +3053,4 @@
3042 }; 3053 };
3043 version = "0.9.16"; 3054 version = "0.9.16";
3044 }; 3055 };
3045} 3056} \ No newline at end of file
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-23 01:12:06 +0000