Commit graph

253 commits

Author SHA1 Message Date
volth 7b8fb5c06c treewide: remove redundant quotes 2019-09-08 23:38:31 +00:00
Frederik Rietdijk 5f4734b1dd Merge remote-tracking branch 'upstream/gcc-8' into staging-next
Earlier the gcc8 branch was merged instead of the gcc-8 branch (note the dash)...
2019-09-08 20:44:26 +02:00
Jan Tojnar cdf426488b
Merge branch 'master' into staging-next
Fixed trivial conflicts caused by removing rec.
2019-09-06 03:20:09 +02:00
Michael Fellinger 683a7f0f34 bundix: 2.4.2 -> 2.5.0 2019-09-04 10:31:39 +00:00
Vladimír Čunát 4aad2947f8
Merge branch 'master' into staging-next 2019-09-04 11:00:56 +02:00
Franz Pletz de85797565
Merge remote-tracking branch 'origin/master' into gcc-8 2019-09-03 22:15:07 +02:00
Michael Fellinger 1f49035aca ruby.withPackages: init
Co-authored-by: Alyssa Ross <hi@alyssa.is>
2019-09-03 19:44:49 +00:00
volth 08f68313a4 treewide: remove redundant rec 2019-08-28 11:07:32 +00:00
Frederik Rietdijk 5061fe0c2c Merge staging-next into staging 2019-08-28 08:26:42 +02:00
volth 35d68ef143 treewide: remove redundant quotes 2019-08-26 21:40:19 +00:00
Robin Gloster 55022869eb
rubygems.grpc: fix build with gcc8 2019-08-26 21:31:26 +02:00
worldofpeace 741163efdb
Merge pull request #65370 from Ma27/package-3llo
_3llo: init at 0.3.0
2019-08-25 15:42:13 -04:00
Robin Gloster 616b8343c4
Merge remote-tracking branch 'upstream/master' into gcc-8 2019-08-25 18:55:46 +02:00
Maximilian Bosch ebc4a417d0
ruby/bundlerApp: ignore gemset in env attribute set
The `gemset` field can be an attribute set as well in `buildRubyGem`,
however attribute sets can't be coerced to strings for the environment
set.

The impact should be relatively small as the environment variables are
only used by the `runCommand` script for `bunlderApp` which doesn't
refer to `gemset` at all.
2019-08-19 13:46:52 +02:00
angristan c4397b4318 solargraph: 0.35.1 -> 0.35.2 2019-08-08 13:16:05 +02:00
Frederik Rietdijk 6f723b9bad Merge master into staging-next 2019-08-02 09:18:37 +02:00
angristan 27e3932097 solargraph: add angristan as maintainer 2019-08-01 20:11:31 +02:00
angristan 13758a68b0 solargraph: 0.34.2 -> 0.35.1 2019-08-01 13:40:01 +02:00
Nick Novitski ec3f7e3e54 bundlerApp: meta.platforms defaults to platforms of ruby dependency (#65697) 2019-08-01 08:44:30 +00:00
worldofpeace b1bc0645ea gdk-pixbuf: rename from gdk_pixbuf 2019-07-22 18:50:57 -04:00
Nick Novitski 7136e0d0a6 bundlerUpdateScript: init and use (#64822) 2019-07-22 12:02:47 +00:00
zimbatm a0f534865e
Merge pull request #64298 from michaelpj/imp/mathematical-epub3
asciidoctor: include the asciidoctor-epub3 gem
2019-07-04 20:34:06 +00:00
Michael Peyton Jones 5f0c43dea4
asciidoctor: move mathematical gem config to default gemset config
This has two benefits:
- Anyone else using the `mathematical` gem will benefit from the config.
- The gem config overrides the default one, so we were losing the fixes
for other gems.

I had to change how the update script works. Now it looks at the `gems`
passthru from `bundlerApp`.
2019-07-04 13:16:03 +01:00
Stanislas a53358e8a9 solargraph: 0.32.1 -> 0.34.2 (#64246) 2019-07-03 20:38:42 +00:00
Franz Pletz 62c60f471c
gem-config: fix grpc build with gcc8 2019-06-17 07:06:08 +02:00
volth f3282c8d1e treewide: remove unused variables (#63177)
* treewide: remove unused variables

* making ofborg happy
2019-06-16 19:59:05 +00:00
Lily Ballard 39eb49c9f0 bundlerApp: Set up passthru properly
The manual documents both bundlerEnv and bundlerApp as providing `env`
and `wrappedRuby` attributes on the resulting derivations. However only
bundlerEnv actually had these attributes. Update bundlerApp to provide
the same passthru that bundlerEnv does.
2019-06-10 14:13:04 -07:00
Erik Arvstedt 1e0694f7c9
gem-config: add zlib 2019-05-08 17:46:03 +02:00
Erik Arvstedt e3461b89fd
gem-config: fix formatting 2019-05-08 17:40:53 +02:00
Alyssa Ross 36d78305d3
Merge pull request #60502 from manveru/bundler-app-postbuild
bundlerApp: don't execute postBuild twice
2019-05-04 13:12:30 +00:00
Michael Fellinger 0552899ebd gem-config: rugged needs which 2019-05-03 18:52:36 +02:00
Michael Fellinger 9a0596ee97 mikutter: 3.5.13 -> 3.8.7 (#60808) 2019-05-03 12:48:13 +02:00
Milan Pässler bd81420cf5 gem-config: add idn-ruby, rpam2, cld3 2019-05-02 02:41:32 +02:00
Michael Fellinger 98e0f54b85 sup: use bundlerApp, cleanup (#60515) 2019-04-30 20:13:17 +02:00
Michael Fellinger 5e1e055817 bundlerApp: don't execute postBuild twice 2019-04-30 17:16:31 +02:00
angristan 11282ea623 solargraph: 0.29.1 -> 0.32.1 2019-04-29 23:56:52 +02:00
Alyssa Ross 27a22f0910
bundix: 2.4.1 -> 2.4.2 2019-04-17 17:28:11 +01:00
Alyssa Ross 69ec9bdf0d
Merge pull request #59252 from lilyball/cocoapods-beta
cocoapods-beta: init at 1.7.0.beta.3
2019-04-17 08:50:15 +00:00
Lily Ballard 8e9796cae2 Make gemdir optional for bundlerApp
Like `bundlerEnv`, the `gemdir` parameter to `bundlerApp` can be omitted
if all 3 of `gemfile`, `lockfile`, and `gemset` are provided.
2019-04-10 13:26:31 -07:00
Bas van Dijk ad41c1f1c0 fluentd: 1.2.3 -> 1.4.2 2019-04-10 12:46:06 +02:00
Ryan Mulligan 488ecd6636
Merge pull request #58940 from erictapen/ruby-gem-src-fix
ruby-modules/gem: fix path to git checkout
2019-04-07 14:53:37 -07:00
Michael Fellinger af44cf8bc5 gem-config: add opus-ruby (#59084) 2019-04-07 15:09:15 +02:00
Justin Humm eb9293e4d8
ruby-modules/gem: fix path to git checkout
In case of the gem type 'git', nix-bundle-install.rb was called with
wrong path to the git checkout.

${src} does contain the sources, but not the newly generated .git dir,
which is created in the buildPhase of pkgs/development/ruby-modules/gem/default.nix

In some rare cases, this .git dir is needed at installPhase.
2019-04-03 16:59:53 +02:00
Judson Lester 704d02053b (ruby-modules/gem): (refactor) (#53525)
* Changing leaveDotGit to git chacha on build

* Removing debugging cruft

* Simpler git handling

* Can't clobber index after `add`

* Update pkgs/development/ruby-modules/gem/default.nix

Useful comments

Co-Authored-By: nyarly <nyarly@users.noreply.github.com>

* Update pkgs/development/ruby-modules/gem/default.nix

Comments are useful

Co-Authored-By: nyarly <nyarly@users.noreply.github.com>
2019-03-29 14:36:04 +01:00
Lev Livnev c08b7460da gem-config: add native taglib dependency to taglib-ruby gem 2019-02-25 12:20:52 +00:00
Michael Fellinger fa5459a2ce defaultGemConfig.ovirt-engine-sdk: init 2019-02-06 23:51:56 +01:00
Sergei Maximov 58f6729e56 Use "${vips}" instead of "${vips.out}" 2019-01-31 18:42:05 +03:00
Sergei Maximov 5aaf8c0e15 gem-config: add ruby-vips 2019-01-31 10:21:55 +03:00
Alyssa Ross eaf0b5e595 defaultGemConfig.tzinfo: fix for >=2.0 (#54881) 2019-01-29 20:30:56 +00:00
Alyssa Ross b162eb92d3
defaultGemConfig.rbczmq: init
Fixes https://github.com/manveru/bundix/issues/42.
2019-01-26 21:13:57 +00:00