Commit Graph

158 Commits

Author SHA1 Message Date
Franz Pletz
2f48144d0e
gitlab: 9.4.5 -> 9.5.2 2017-09-03 15:50:52 +02:00
Robin Gloster
0156db2da5
Merge remote-tracking branch 'upstream/master' into HEAD 2017-09-02 23:29:04 +02:00
Robin Gloster
891a1662aa
bundler: 1.15.3 -> 1.14.6
bundler 1.15 breaks gitlab
2017-09-02 23:24:16 +02:00
Peter Hoeg
30c85e85ae bundler: 1.15.3 -> 1.15.4 2017-08-30 21:05:45 +08:00
Lancelot SIX
e34ce9d1c5 gnupg: 2.1.22 -> 2.1.23
This release in a RC for gnupg-2.2. The main difference as far as
nixpkgs is concerned is that the binary `gpg2` is now called `gpg` and
`gpgv2` is called `gpgv`.

This update fixed all explicit use of `gpg2` and `gpgv2` across nixpkgs,
but there might be some packaged software that internally use `gpg2`
not handeled by this commit.

See http://lists.gnu.org/archive/html/info-gnu/2017-08/msg00001.html
for full release information
2017-08-11 19:24:06 +02:00
roblabla
8975d153a0 gitlab: 9.3.4 -> 9.4.3 2017-08-06 16:30:49 +02:00
Silvan Mosberger
f5fa5fa4d6 pkgs: refactor needless quoting of homepage meta attribute (#27809)
* pkgs: refactor needless quoting of homepage meta attribute

A lot of packages are needlessly quoting the homepage meta attribute
(about 1400, 22%), this commit refactors all of those instances.

* pkgs: Fixing some links that were wrongfully unquoted in the previous
commit

* Fixed some instances
2017-08-01 22:03:30 +02:00
Peter Hoeg
e9a70ccfe9 bundler: 1.15.1 -> 1.15.3 2017-07-30 16:57:59 +08:00
Robin Gloster
0154d1b03f
fix evaluation
cc @nyarly
2017-07-30 00:03:24 +02:00
Charles Strahan
2b57cb9169 Merge pull request #25980 from nyarly/bundlerenv_usecases
BundlerEnv, now with groups and paths
2017-07-28 23:22:21 -04:00
Alastair Pharo
68935892ab bundix: use same ruby as bundler 2017-07-19 16:13:09 +10:00
roblabla
0c7c421baa gitlab: 8.17.6 -> 9.3.4 2017-07-06 13:29:49 +02:00
Michael Fellinger
42b1fdaec5 bundix: 2.2.0 -> 2.3.1 2017-07-06 11:47:07 +02:00
Judson
0641253ae6
Small changes in response to review. 2017-07-02 17:18:58 -07:00
Judson
e149f02344
Using pname and fetching versions 2017-06-27 22:33:18 -07:00
Judson
70e7e543c5
A few cleanups and renames. One feature remains... 2017-06-27 10:56:36 -07:00
Robert
107d53f40c bundix: 2.2.0 -> 2.2.1 (#26894)
This fixes `fetchurl-force.nix` not being installed, which breaks
bundix for some gems.

E.g.

```
$ nix-build --argstr url https://rubygems.org/gems/nio4r-2.1.0.gem /nix/store/y6959dxal86l3alc0ryf7752prbbkzxg-bundix-2.2.0/lib/ruby/gems/2.3.0/gems/bundix-2.2.0/lib/bundix/fetchurl-force.nix
error: getting status of ‘/nix/store/y6959dxal86l3alc0ryf7752prbbkzxg-bundix-2.2.0/lib/ruby/gems/2.3.0/gems/bundix-2.2.0/lib/bundix/fetchurl-force.nix’: No such file or directory
```
2017-06-27 10:24:16 +01:00
Judson
603e84caef
Fixing an overload of "pname" 2017-06-25 17:40:22 -07:00
Peter Hoeg
b8297ff08a bundler: 1.15.0 -> 1.15.1 2017-06-21 15:29:05 +08:00
Judson
fc302bc07f
Not quite done - something fishy about the name attr 2017-06-10 17:38:49 -07:00
Judson
dd86c6d25a
Adding Corundum as demo of rubyTool 2017-06-10 17:11:37 -07:00
Judson
53481f8f0b
Docs and extras on tool/ 2017-06-10 16:58:32 -07:00
Jörg Thalheim
95f733e0aa
bundix: 2.1.0 -> 2.2.0 2017-06-09 22:37:36 +01:00
Judson
964d9b7a06
Made gemdir handling into a common function 2017-06-09 09:04:33 -07:00
Judson
0bde4071fc
Merge branch 'bundlerenv_usecases' of github.com:nyarly/nixpkgs into bundlerenv_usecases 2017-05-31 09:53:03 -07:00
Judson
c4fc70f53c
Starting to add tool builder. Extracting bundler file computation. 2017-05-31 09:44:46 -07:00
Peter Hoeg
0cbcb95e14 bundler: 1.14.6 -> 1.15.0 2017-05-31 23:26:10 +08:00
zimbatm
2b7cfdd6e9 fix missing variable in bundler-env 2017-05-29 13:27:41 +01:00
Judson
e4bb4d4788
Cleaning out obsolete files 2017-05-27 15:22:06 -07:00
Judson
998d011e42
Restructuring files 2017-05-27 15:19:34 -07:00
midchildan
2c393164c8
mikutter: init at 3.5.7
fixes #25852
2017-05-21 12:13:34 +01:00
Jörg Thalheim
f410236ed8 Merge branch 'master' into feature/fix_rainbox_gem_deps 2017-05-20 17:26:24 +01:00
Judson
ae84d19e65
Final testing 2017-05-15 09:36:30 -07:00
Jörg Thalheim
ae9e73125f
gem-config: add rb-readline 2017-05-14 22:29:51 +01:00
Jörg Thalheim
c441ae6feb
gem-config: add pcaprub 2017-05-14 22:29:46 +01:00
Pooyan Khosravi
bc780285c0 ruby-modules gem-config: add rainbow
Rainbow needs rake (a make analogue) as build dep. This builds an specific
version of rake for building rainbow.

Since rake is private to rainbow there shouldn't be any problems until rainbow
devs decide they need another rake version which is unlikely.
2017-05-12 17:23:18 -04:00
Judson
c39508b254
Fixed platform test. 2017-05-12 09:47:00 -07:00
Judson
56d214b0ea
Fixed platform filtering. 2017-05-12 09:44:39 -07:00
Judson
07f781bd8d
Current round of tests pass, but filter function is failing to include when platform match in use. 2017-05-10 10:00:21 -07:00
Judson
0145ec999c
Current round of tests pass, but filter function is failing to include when groups match in use. 2017-05-09 09:39:20 -07:00
Judson
66fed6d28f
Basically working. Checking against actual use cases. 2017-05-03 20:27:42 -07:00
Judson
2b414e1c15
Test harnesses 2017-05-01 09:07:42 -07:00
Judson
b2065a2790
Merge remote-tracking branch 'nixos/master' into bundlerenv_usecases 2017-04-30 12:27:52 -07:00
Michael Raskin
4540123a0c Merge pull request #23471 from veprbl/jekyll
jekyll: 3.0.1 -> 3.4.1
2017-04-30 20:41:20 +02:00
Judson
89fda10d31
Starting decomposition of bundlerEnv 2017-04-24 18:45:00 -07:00
Nick Novitski
37b0be688d bundix: 2.0.8 -> 2.1.0 (#25129) 2017-04-23 13:13:50 +01:00
Maximilian Güntner
d84029f296
ruby-modules: check tzinfo version
tzinfo 0.3.xx does not contain the file

lib/tzinfo/zoneinfo_data_source.rb

it is only included in the 1.x branch.

closes #24080
closes #24682
2017-04-11 10:44:54 +02:00
Judson
ed77e113c5
Merge remote-tracking branch 'nixos/master' 2017-04-09 15:36:03 -07:00
Judson
7f6e8a1cd5
Adding "allBins" flag on bundlerEnv
The bin stubs need to be built where there's access to /nix/store - so
it can't happen in a nix-shell run. Ergo, a shell.nix needs to be able
to signal to the build that all bins need to be built.
2017-03-26 17:32:30 -07:00
Andrzej Trzaska
376d960034 bundler: 1.14.4 -> 1.14.6 (#23930) 2017-03-15 20:34:35 +00:00
Jörg Thalheim
b10fb4624b
xapian-ruby: link against correct xapian 2017-03-06 20:24:07 +01:00
Dmitry Kalinkin
212340bc6b
jekyll: set proper permissions on new site
Fixes #22858
2017-03-03 23:05:37 -05:00
Dmitry Kalinkin
0832addf67
jekyll: fix 'jekyll new'
Original error:

$ nix-shell -p jekyll --command "jekyll new test"
Running bundle install in /private/tmp/test...
  Bundler: There was an error while trying to write to
  Bundler:
`/nix/store/l67429rhvrmr7c4c1msb7s8zjq4fx7ad-gemfile-and-lockfile/.bundle/config`.
  Bundler: It is likely that you need to grant write permissions for
that path.
2017-03-03 21:47:58 -05:00
Judson
0481a33d21
Simplifying interface on gemset.nix slightly.
`usesGemspec` no longer required to trigger the "copy everything into
gemfile-and-lock" behavior. If the mainGem is referred to by path,
that's sufficient.
2017-02-20 21:03:44 -08:00
Judson
3c9941114f
Need to handle "null" mainGems
Not every gem package uses pname, nor should it.
2017-02-19 10:51:35 -08:00
Judson
2b9c7b4268
Merge remote-tracking branch 'nixos/master' 2017-02-19 10:22:55 -08:00
Judson
c765f680e3
Updates to bundlerEnv 2017-02-19 10:18:54 -08:00
Peter Hoeg
facb2c0483 bundler: 1.14.3 -> 1.14.4 2017-02-17 22:48:39 +08:00
Peter Hoeg
d1b8b0dd52 bundler: 1.13.7 -> 1.14.3 (#22260) 2017-01-29 22:42:17 +00:00
Ryan Mulligan
605ec66342 bundler: 1.13.6 -> 1.13.7 2017-01-09 10:13:38 -08:00
Maximilian Güntner
4f57a25e62 gem-config: add lxc as a dependency for ruby-lxc
Signed-off-by: Maximilian Güntner <code@klandest.in>
2016-12-18 20:10:34 +01:00
Maximilian Güntner
dec91d3b19 gem-config: add postgresql buildInput for sequel_pg (#20981)
Signed-off-by: Maximilian Güntner <code@klandest.in>
2016-12-16 11:36:05 +01:00
Graham Christensen
5cc4f50442 Merge pull request #20113 from johbo/ruby-scrypt-darwin
Adjust ruby gem defaults for scrypt on darwin
2016-11-27 21:58:17 -05:00
Michael Fellinger
0755d4becb gem-config: add uuid4r (#20603) 2016-11-21 12:41:05 +00:00
Ryan Mulligan
936db422f9 add defaultConfig for mysql ruby gem
The mysql gem needs the same libraries as the mysql2 gem.
2016-11-03 17:19:25 -07:00
Johannes Bornhold
4f01beb531 Adjust ruby gem defaults for scrypt on darwin
Without the adjustment I was not able to build scrypt. It was failing
because of missing symbols due to the parameter '-arch i386' being
appended to the clang calls.
2016-11-03 01:29:03 +01:00
Venkateswara Rao Mandela
219b9d5086 ruby-zoom: init at 4.1.0
From the website,

https://gitlab.com/mjwhitta/zoom

Zoom adds some convenience to ag/ack/grep by allowing you to quickly
open your search results in your editor of choice.

Also available as a ruby gem.

https://rubygems.org/gems/ruby-zoom

In addition to including the ruby-zoom tool, we also added a global
override for the ruby-terminfo gem to handle the ncurses build time
dependency.
2016-10-26 17:26:26 +05:30
Peter Hoeg
cd11efb651 bundler: 1.13.1 -> 1.13.6 2016-10-24 23:17:23 +08:00
zimbatm
2a194746a5 bundlerEnv: refactor
Add `pname` attribute: if passed, the derivation name defaults to the
gem name + version and only expose the gem's bin.

Add `gemdir` attribute: gives a default lookup path for the Gemfile,
Gemfile.lock and gemset.nix.

Set the `meta.platforms' to `ruby.meta.platforms' by default.
2016-10-08 22:38:56 +01:00
zimbatm
b8bcbec5fd ruby: fixes rubygems user installs
* Manage patches in git
* Fixes the hook invocation to be more safe. Thanks @Mic92
* Install gems as user by default
* Install gem binaries with the /usr/bin/env shebang
* Fixes a bug where the passthru.libPath and passthru.gemPath would
  point to the wrong directory
* Overhaul ruby version heuristics
2016-10-02 22:07:22 +01:00
zimbatm
659803f8c5 Merge pull request #18920 from peterhoeg/bundler
bundler: 1.12.5 -> 1.13.1
2016-09-24 13:41:16 +01:00
Michael Fellinger
c0bb2549b4 gem-config: add snappy 2016-09-21 14:29:12 +02:00
Peter Hoeg
73e4f644d0 bundler: 1.12.5 -> 1.13.1 2016-09-20 15:55:19 +08:00
zimbatm
62df82efcf buildRubyGem: fixes gemspec UTF-8 loading issue
If a gemspec has UTF-8 characters in it, ruby will fail loading it with

    invalid multibyte char (US-ASCII)

This change forces the encoding to be correct, we assume everyone now
uses UTF-8.
2016-09-06 14:42:58 +01:00
Joachim F
01811fe2cd Merge pull request #16276 from manveru/gemconfig-rbnacl
gemconfig: rbnacl needs libsodium
2016-09-05 01:11:57 +02:00
Graham Christensen
add3d4d45b Revert "bundix: 2.2.0" 2016-09-02 16:00:45 -04:00
zimbatm
f1035132f3 Merge pull request #18099 from zimbatm/nokogiri-fixup
Nokogiri fixup
2016-09-01 10:43:22 +01:00
Michael Fellinger
f75e2c8583 bundix: 2.2.0 2016-08-31 11:52:06 +02:00
zimbatm
a7cf555e2a buildRubyGem: handle build-time ruby dependencies
For some reason `gem install` unsets the GEM_PATH environment variable
internally unless the install dir is provided. This in turn means that
if it invokes extconf.rb and extconf.rb depends on a gem available on
the GEM_PATH (like pkg-config for nokogiri) then it's not available in
that context.

Proof: d8293c4729/lib/rubygems/commands/install_command.rb (L151)
Blame: 9ea600c9c2

This is a hack that sets the :install_dir to where we would install
anyways (the GEM_HOME is the default installation destination).
2016-08-29 22:17:59 +01:00
zimbatm
6ae57b1b63 bundler: fix usage on nested call
The combination of bundler 1.12.5 and rubygems 1.6.2 doesn't play well
at all when trying to run gems such as foreman where bundler is used to
run bundler.

Just upgrading to the latest bundler rc doesn't fix it and changing rubygems causes a massive rebuild.

Issues:

- https://github.com/bundler/bundler/issues/4402
- https://github.com/bundler/bundler/issues/4576
- https://github.com/bundler/bundler/issues/4602
- https://github.com/docker-library/ruby/issues/73

This PR patches bundler to work around the issue as highlighted here and
unbreaks everything for me:

https://github.com/bundler/bundler/issues/4602#issuecomment-233619696
2016-08-29 17:03:12 +01:00
zimbatm
a1460473cb buildRubyGem: don't set the GEM_HOME
bundler for example needs to have the GEM_HOME being passed trough to
function properly.

For gems that are loading content dynamically, or can use plugins, use
buildRubyGem.

For executables that are wrapped in their own sealed thing use
bundlerEnv.
2016-08-23 09:30:49 +01:00
zimbatm
838781ce8a buildRubyGem: fix buildFlags default attribute
lib.escapeShellArgs doesn't work well when a null value is provided.

[] is also the correct value since it's really just an empty list of
arguments that we have.
2016-07-21 11:46:16 +01:00
zimbatm
b0f8416c5c Merge pull request #16180 from zimbatm/shell-escaping
Escape all shell arguments uniformly
2016-06-19 23:27:52 +01:00
Aristid Breitkreuz
def3ad3eeb Merge pull request #16170 from zimbatm/bundler-1.12.5
bundler: 1.11.2 -> 1.12.5
2016-06-18 17:02:05 +02:00
Michael Fellinger
c3df347f7b gemconfig: rbnacl needs libsodium 2016-06-16 19:33:12 +02:00
Michael Fellinger
e86e407ce9 gemconfig: typhoeus needs curl 2016-06-16 11:43:21 +02:00
zimbatm
28fa4a2f03 Escape all shell arguments uniformly 2016-06-12 18:11:37 +01:00
zimbatm
3086250ceb bundler: 1.11.2 -> 1.12.5 2016-06-12 13:35:15 +01:00
Graham Christensen
bb5faafbca gemconfig: rmagick requires which as of 2.15.4 2016-06-06 16:00:10 -05:00
Tuomas Tynkkynen
7fb29bfa73 treewide: Make explicit that 'dev' output of zlib is used 2016-05-19 10:04:38 +02:00
Lane Seppala
8e97c64ffc chefdk: fix build of hitimes on OS X 2016-05-04 16:41:44 -06:00
Eelco Dolstra
21a2f2ba3b nix: Add a "dev" output
This gets rid of boehm-dev in the closure (as well as Nix's own
headers).
2016-04-18 21:13:18 +02:00
Michael Fellinger
7d974e7eef
gem-config: fix bundler 2016-04-18 11:12:19 +02:00
Charles Strahan
99fd109a85 Merge pull request #14786 from manveru/gemset-groups
bundlerEnv: filter gemset groups
2016-04-18 02:02:57 -04:00
Michael Fellinger
090da825fe
bundlerEnv: filter gemset groups 2016-04-17 23:07:31 +02:00
Michael Fellinger
caadfd53e3
capybara-webkit: qt5Full -> qt48 2016-04-17 22:35:04 +02:00
zimbatm
12e919bb34 Merge pull request #14653 from manveru/bundler-env-frozen
bundler-env: Gemfile.lock is frozen
2016-04-14 10:20:04 +01:00
Michael Fellinger
fe87240e68 bundler-env: Gemfile.lock is frozen 2016-04-13 11:25:41 +02:00
Vladimír Čunát
ab15a62c68 Merge branch 'master' into closure-size
Beware that stdenv doesn't build. It seems something more will be needed
than just resolution of merge conflicts.
2016-04-01 10:06:01 +02:00
Michael Fellinger
4873838f75 capybara-webkit: gem needs qt5Full 2016-03-21 12:01:37 +01:00