Merge pull request #217866 from glittershark/add-back-rails
rubyPackages: Add back rails Closes https://github.com/NixOS/nixpkgs/issues/193615 Closes https://github.com/NixOS/nixpkgs/issues/217691
This commit is contained in:
commit
595dcdcb47
3 changed files with 494 additions and 332 deletions
|
@ -229,6 +229,7 @@ in
|
||||||
|
|
||||||
gpgme = attrs: {
|
gpgme = attrs: {
|
||||||
buildInputs = [ gpgme ];
|
buildInputs = [ gpgme ];
|
||||||
|
nativeBuildInputs = [ pkg-config ];
|
||||||
buildFlags = [ "--use-system-libraries" ];
|
buildFlags = [ "--use-system-libraries" ];
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -110,7 +110,7 @@ gem 'pry-byebug'
|
||||||
gem 'pry-doc'
|
gem 'pry-doc'
|
||||||
gem 'public_suffix'
|
gem 'public_suffix'
|
||||||
gem 'puma'
|
gem 'puma'
|
||||||
# gem 'rails' # causes the Bundler resolver to explode, probably due conflict with CocoaPods activesupport requirement
|
gem 'rails'
|
||||||
gem 'rainbow'
|
gem 'rainbow'
|
||||||
# gem 'rbczmq' deprecated
|
# gem 'rbczmq' deprecated
|
||||||
gem 'rbnacl'
|
gem 'rbnacl'
|
||||||
|
|
File diff suppressed because it is too large
Load diff
Loading…
Reference in a new issue