1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-22 13:41:26 +00:00
Commit graph

387 commits

Author SHA1 Message Date
William A. Kennington III 8f17099d6a bundler: 1.9.2 -> 1.10.5 2015-07-06 16:42:16 -07:00
William A. Kennington III 0f21f3e00b bundler-head: Correct hash 2015-07-06 16:42:16 -07:00
William A. Kennington III d5cd6eebcd ruby: Add 2.1.6 2015-07-06 16:42:16 -07:00
William A. Kennington III 84ef883ac2 rvm-patchsets: Update 2015-07-06 16:42:16 -07:00
Jude Taylor e130e9d3a3 fix bundler hash 2015-06-26 09:54:49 -07:00
Jude Taylor 80c62d1325 darwin purity: ruby-1.9.3 2015-06-25 16:36:04 -07:00
Arseniy Seroka daf4ec39a5 fix: add missing versions 2015-06-04 23:34:14 +03:00
Tobias Geerinckx-Rice 158e1cfdd0 Don't use "with licenses;" for single licences
And don't use square brackets on such lines.
2015-05-28 19:20:29 +02:00
Tobias Geerinckx-Rice b2d7f4b1ba Use common licence attributes from lib/licenses.nix
Many (less easily automatically converted) old-style strings
remain.

Where there was any possible ambiguity about the exact version or
variant intended, nothing was changed. IANAL, nor a search robot.

Use `with stdenv.lib` wherever it makes sense.
2015-05-27 22:00:06 +02:00
Pascal Wittmann 6c2fc83a85 bundler: bin/bundler expects ruby in PATH 2015-05-27 17:11:33 +02:00
Pascal Wittmann 150ae25546 bundler: do not add a ruby name prefix
Otherwise bundler replaces ruby:

% nix-env -iA nixpkgs.ruby
installing ‘ruby-1.9.3-p547’
% nix-env -iA nixpkgs.bundler
replacing old ‘ruby-1.9.3-p547’
installing ‘ruby-1.9.3-p547-bundler-1.9.2’
2015-05-27 14:48:44 +02:00
Spencer Whitt a634c11075 ruby_1_8_7: Fix on Darwin 2015-05-15 11:58:19 -04:00
Dan Peebles 5454be28aa I suppose this is the 'better' way to fix bundler for now. Ugh 2015-05-07 01:14:14 -04:00
Dan Peebles 35ddd2543a Revert "Fix bundler HEAD"
This reverts commit 00c4c52277.
2015-05-07 01:10:46 -04:00
Dan Peebles 00c4c52277 Fix bundler HEAD 2015-05-07 00:11:00 -04:00
Charles Strahan 09602f7f39 ruby: fix gems that use mysql 2015-04-27 22:00:52 -04:00
Charles Strahan 7fc3b002e6 bundlerEnv: better error handling
properly handle the case where a gemspec is missing
2015-04-15 19:24:30 -04:00
Charles Strahan be3d3dd298 bundlerEnv: fix charlock_holmes config 2015-04-15 19:24:04 -04:00
Charles Strahan bb7c9f71e1 bundix: 1.0.2 -> 1.0.3 2015-04-15 19:07:09 -04:00
Nikolay Amiantov 250a39dc79 bundler: update 2015-04-05 16:04:54 +03:00
William A. Kennington III 43d114c74b bundler-head: Fix hash 2015-04-03 23:18:23 -07:00
William A. Kennington III a604b42480 mysql: Use libs in place of the binary mysql 2015-04-01 16:46:53 -07:00
Eelco Dolstra 0e2257966f Disable packages that depend on <nixpkgs>
Nothing in Nixpkgs should use <nixpkgs>, because it can cause Nixpkgs
evaluation to depend in part on a different version of Nixpkgs,
leading to unpredictable results (including evaluation errors).
2015-03-27 16:17:48 +01:00
Jaka Hudoklin 17b9405685 bundlerEnv: add support for additional build inputs 2015-03-18 14:15:50 +01:00
Charles Strahan b4d4b88988 Merge pull request #6147 from abbradar/bundlerenv-env
bundler-env: add .env
2015-03-02 18:28:02 -05:00
Charles Strahan f87a7fd241 bundix: update 2015-02-27 14:28:34 -05:00
Nikolay Amiantov aa878ffe94 bundler: fix hash 2015-02-18 19:06:30 +03:00
Dan Peebles a68484a0ac Minor fix for broken ruby evaluation and libiconv 2015-02-17 21:39:29 -05:00
Eric Seidel e08b9ab8d3 kill libiconvOr*
Conflicts:
	pkgs/applications/networking/mailreaders/sup/default.nix
	pkgs/development/compilers/ghc/7.8.3-binary.nix
	pkgs/development/interpreters/php/5.3.nix
	pkgs/development/interpreters/ruby/patches.nix
	pkgs/development/libraries/cairo/default.nix
	pkgs/development/libraries/poppler/default.nix
	pkgs/top-level/all-packages.nix
2015-02-07 20:29:28 -08:00
Nikolay Amiantov 35f1d4459b bundix: fix checksum 2015-02-04 19:44:19 +03:00
Nikolay Amiantov 0deb3fce70 bundler-env: add .env 2015-02-04 19:42:40 +03:00
Charles Strahan 6eaa419920 gitlab: fix evaluation 2015-01-25 16:28:18 -05:00
Charles Strahan 989a894fc8 ruby: patch path in tzdata gem 2015-01-25 16:22:30 -05:00
Charles Strahan c1814073ac bundlerEnv: use full path to ruby in wrappers 2015-01-24 17:35:11 -05:00
Charles Strahan ad026dab98 ruby: don't reference baseruby 2015-01-23 21:22:34 -05:00
Charles Strahan 00f93c494b ruby: fixup 2.2's passthru 2015-01-22 01:00:00 -05:00
Charles Strahan 98bfaf52f7 ruby: use commit to identify libv8 patch 2015-01-22 00:47:08 -05:00
Charles Strahan 8d49e87dec Merge pull request #4677 from cstrahan/pleasant-ruby
Pleasant ruby
2015-01-21 23:27:38 -05:00
Charles Strahan 034488ec80 ruby: fixup mpdcron 2015-01-21 22:38:29 -05:00
Charles Strahan 8085f088cb ruby: exorcise the last few remaining rubyPackages 2015-01-21 22:23:37 -05:00
Charles Strahan 65c7c61841 ruby: use patch for libv8 2015-01-21 20:37:05 -05:00
Charles Strahan 317d78d145 consule: use new bundlerEnv 2015-01-21 20:33:19 -05:00
Charles Strahan f52c32fcfc ruby: rewrite sup package 2015-01-21 18:23:35 -05:00
Charles Strahan 115c299ea0 ruby: enable curses support by default 2015-01-21 15:22:21 -05:00
Charles Strahan 5f1622e95f ruby: allow for passing build arguments 2015-01-20 23:33:57 -05:00
Charles Strahan 7d8b2f0d60 ruby: make buildInputs work 2015-01-20 22:20:28 -05:00
Charles Strahan dfc225d143 Merge branch 'master' of github.com:nixos/nixpkgs into pleasant-ruby
Conflicts:
	pkgs/applications/version-management/git-and-tools/default.nix
	pkgs/applications/version-management/git-and-tools/hub/default.nix
	pkgs/tools/audio/mpdcron/default.nix
2015-01-20 20:21:03 -05:00
Charles Strahan bd53746646 ruby: patching gems works 2015-01-20 19:09:02 -05:00
Charles Strahan 221509b0a6 ruby: refactoring, and package bundix 2015-01-20 01:07:55 -05:00
Charles Strahan bf16d03075 ruby: support for proper bundler installs 2015-01-19 20:02:47 -05:00
Charles Strahan 673fccf505 ruby: new bundler approach 2015-01-18 18:47:28 -05:00
Charles Strahan 9ad38ec322 ruby: allow for overriding the src 2015-01-15 20:58:05 -05:00
Charles Strahan 1a1e6cfc04 ruby: various fixes 2015-01-14 21:19:53 -05:00
Charles Strahan aaa2e9705a ruby: cache gem files 2015-01-14 04:20:50 -05:00
Charles Strahan 32bae8d09a bundler: update HEAD version 2015-01-14 01:13:51 -05:00
Maurizio De Santis 5bcd29466e ruby: add 2.2.0 package 2015-01-10 19:25:37 +01:00
Maurizio De Santis 369f04ac96 ruby: update RVM patchsets 2015-01-10 19:25:12 +01:00
Tomasz Kontusz decc019220 Add test-kitchen gem, with plugins for Ansible and Vagrant
test-kitchen is a framework for testing Configuration Management scripts.
2015-01-04 02:06:06 +01:00
Charles Strahan 94dd4b9721 ruby: WIP 2014-12-30 21:05:00 -05:00
Charles Strahan 74a4f01fe4 ruby: add git fetcher 2014-12-29 00:48:01 -05:00
Charles Strahan 145733c479 Merge branch 'master' of github.com:nixos/nixpkgs into pleasant-ruby
Conflicts:
	pkgs/applications/version-management/redmine/default.nix
	pkgs/development/interpreters/ruby/gem.nix
	pkgs/development/interpreters/ruby/generated.nix
	pkgs/development/interpreters/ruby/patches.nix
	pkgs/development/tools/vagrant/default.nix
	pkgs/servers/consul/default.nix
2014-12-28 14:29:52 -05:00
Evgeny Egorochkin d9dbeeca79 ruby gems: propagate ruby because it contains the hooks to add gem search paths, needed by nix-shell-created environments 2014-12-20 01:01:39 +02:00
Shea Levy 3cf0677087 Add rubyLibs.redis 2014-12-16 13:10:35 -05:00
Shea Levy 487325a68c Add rubyLibs.rabbitmq_manager 2014-12-16 13:09:46 -05:00
Shea Levy a1e0944263 Add rubyLibs.newrelic_plugin 2014-12-16 13:07:03 -05:00
Jaka Hudoklin 61e19d6e81 rubyLibs: add tmuxinator, update 2014-12-01 00:39:40 +01:00
Domen Kožar d562934ee7 nokogiri: use libiconvOrEmpty. assert libiconv is not used on linux 2014-11-22 21:13:22 +01:00
Vladimír Čunát a19eeddd70 ruby-2.1.1: fix patch numbering (and build)
Wrong patch paths were ignored until recently by our stdenv.
It's slightly unclear to me which patches were supposed to be used.
2014-11-20 13:22:56 +01:00
Vladimír Čunát c14dee55e8 ruby-2.0: fix patch paths (and build)
Wrong patch paths were ignored until recently by our stdenv.
2014-11-20 12:54:49 +01:00
Charles Strahan e1149b71cc fix shebang patching for ruby gems 2014-11-18 03:05:44 +00:00
Charles Strahan cf8f4963a7 rename rubyLibs to rubyPackages 2014-11-09 22:16:58 +00:00
Charles Strahan 2b0750f87a passthru ruby, make stdenv overridable 2014-11-09 21:31:48 +00:00
Charles Strahan 2a3f2cfce8 add path fetcher 2014-11-08 23:46:34 +00:00
James Cook 576092eec4 Revert "ruby: Fix build on systems with store optimisation. Closes #4273. #4266 promises a better fix."
This reverts commit d2c0011c2f.

c04e492898 gives a cleaner solution that's
not specific to ruby.
2014-11-06 09:22:20 -08:00
Eelco Dolstra 0518ccf5af Merge remote-tracking branch 'origin/master' into staging
Conflicts:
	pkgs/stdenv/generic/default.nix
2014-11-06 10:16:39 +01:00
Mateusz Kowalczyk 007f80c1d0 Turn more licenses into lib.licenses style
Should eval cleanly, as far as -A tarball tells me.

Relevant: issue #2999, issue #739
2014-11-06 00:48:16 +00:00
Eelco Dolstra 7495c61d49 Merge remote-tracking branch 'origin/darwin-clang-stdenv' into staging
Conflicts:
	pkgs/applications/editors/vim/macvim.nix
2014-11-04 14:30:43 +01:00
Charles Strahan e1c40a679c fix gem builder 2014-11-02 22:05:37 +00:00
Charles Strahan 143698555a add documentation 2014-10-31 02:03:37 +00:00
Charles Strahan 3eeabc4523 more cleanup 2014-10-31 01:44:57 +00:00
Charles Strahan 845fed122a various fixes 2014-10-29 23:14:19 +00:00
Charles Strahan d5b3a6d508 update fixes 2014-10-29 01:16:02 +00:00
Charles Strahan e4a2a7e73e simplification / refactoring 2014-10-28 04:16:14 +00:00
Charles Strahan 857f017a0d misc. cleanup 2014-10-28 01:22:17 +00:00
Charles Strahan 1eb31c0838 remove old stuff 2014-10-27 22:36:00 +00:00
Charles Strahan 9eedf0f218 simplify expressions 2014-10-27 22:13:36 +00:00
Alexander Flatter b4c81a1f15 importGems now accepts an attrset 2014-10-27 21:55:13 +00:00
Alexander Flatter 5b928301c1 Expose gems when using loadRubyEnv 2014-10-27 21:55:12 +00:00
Alexander Flatter 4d3932a29e loadRubyEnv instantiates sources 2014-10-27 21:55:12 +00:00
Alexander Flatter 2cb31d576a Improve buildRubyGem 2014-10-27 21:55:12 +00:00
Alexander Flatter f4d5fa4da6 importGems doesn't crash if gemOverrides not given 2014-10-27 21:55:12 +00:00
Alexander Flatter 3b59fbd608 WIP 2014-10-27 21:55:12 +00:00
Alexander Flatter c786da0569 importGems now reads attrsets instead of derivations 2014-10-27 21:55:12 +00:00
Charles Strahan 3e499b7b65 silence rm failures 2014-10-27 21:55:12 +00:00
Charles Strahan 6863853879 fixup gem install flags 2014-10-27 21:55:12 +00:00
Charles Strahan 11903c4c10 ruby: expose RUBY_ENGINE, include teeny version in paths 2014-10-27 21:55:11 +00:00
Joel Taylor c05e0602ca fix self refs 2014-10-27 21:55:11 +00:00
Joel Taylor 0ee5695bd4 properly fix patching 2014-10-27 21:55:11 +00:00
Joel Taylor efa528a415 also recursively patch "self" 2014-10-27 21:55:11 +00:00
Joel Taylor e5783d017d don't forget: patch gems in gems.nix too! 2014-10-27 21:55:11 +00:00
Joel Taylor 820ae58ba5 inherit the correct rake in buildRubyGem
this avoids accidentally depending on Ruby 1.9.3's rake for *every* gem
2014-10-27 21:55:11 +00:00
Joel Taylor 8c072a33a1 update patch comments 2014-10-27 21:55:11 +00:00
Joel Taylor 020b204767 remove depsPath 2014-10-27 21:55:11 +00:00
Joel Taylor 4a5e725a00 patch logic 2014-10-27 21:55:10 +00:00
Joel Taylor 9c8c4c8655 reorder gem phases 2014-10-27 21:55:10 +00:00
Joel Taylor 05238cd353 call patches with the right nix 2014-10-27 21:55:10 +00:00
Joel Taylor f14f73da76 ruby updates 2014-10-27 21:55:04 +00:00
Joel Taylor 081343f099 gem build updates 2014-10-26 17:34:52 +00:00
Joel Taylor 763975d2cf ruby-dotenv 2014-10-26 17:34:52 +00:00
Joel Taylor 37640cca9f terminal-notifier 2014-10-26 17:34:52 +00:00
Joel Taylor 321ee119a8 more gem improvements 2014-10-26 17:34:52 +00:00
Joel Taylor 289b7e5068 further improvements to patches and build process 2014-10-26 17:34:52 +00:00
Joel Taylor 2dedbe6bbe correctly implement patching 2014-10-26 17:34:10 +00:00
Joel Taylor 1edaff1a2a include patches 2014-10-26 17:34:10 +00:00
Joel Taylor c694425a03 allow importGems to override cp args 2014-10-26 17:34:10 +00:00
Joel Taylor e9328fa7c3 stop using gross dependency resolution 2014-10-26 17:34:10 +00:00
Joel Taylor 3026d8833d add libs to GEM_PATH 2014-10-26 17:34:10 +00:00
Joel Taylor cfff6e8c82 some improvements 2014-10-26 17:34:10 +00:00
Joel Taylor 794740b7e3 pleasant ruby 2014-10-26 17:34:10 +00:00
Charles Strahan 7231b95f4f Ruby: 2.1.3 and Fiddle support
This packages Ruby 2.1.3, and adds Fiddle support for all 2.x versions.

closes #4656
2014-10-26 04:48:09 +00:00
James Cook d2c0011c2f ruby: Fix build on systems with store optimisation. Closes #4273. #4266 promises a better fix.
(The build process attempted to copy file a overwriting file b, where a
and b are hard-linked, which results in cp returning a non-zero exit
code.)
https://github.com/NixOS/nixpkgs/issues/4266
2014-10-25 06:13:16 +03:00
Eelco Dolstra 811de3bfaa Merge remote-tracking branch 'origin/staging' into darwin-clang-stdenv
Conflicts:
	pkgs/tools/security/gnupg/default.nix
2014-10-09 10:57:57 +02:00
Eelco Dolstra cd71f7a2e6 Merge branch 'darwin-stdenv' of github.com:joelteon/nixpkgs into staging
Conflicts:
	pkgs/development/interpreters/ruby/ruby-19.nix
	pkgs/development/libraries/libc++/default.nix
	pkgs/development/libraries/libc++abi/default.nix
	pkgs/tools/text/sgml/opensp/default.nix
2014-09-23 11:27:53 +02:00
Jaka Hudoklin aa7147c31b rubyLibs: add heroku client 2014-09-22 01:57:01 +02:00
Charles Strahan e38d7cbfb2 Fix the new Ruby interpreters (fixes #3509).
Ruby >= 2.1.0 will try to download config.{sub,guess} if not already present.
This provides both files in a pure manner, and also deletes the download script
to prevent any future confusion.
2014-09-18 11:43:16 -04:00
Cillian de Róiste a84c2d4357 Re-add rubyLibs.jekyll closes #4096 2014-09-16 15:31:29 +02:00
Jaka Hudoklin bfa3b28590 rubyLibs: fix bundler 2014-09-16 10:28:04 +02:00
Jaka Hudoklin 782c85ad27 rubyLibs: add compass, regenerate 2014-09-16 10:28:04 +02:00
Charles Strahan c27a653bba improve ruby support
* add the 2.1.x versions
* include teeny version in passthru
* by default, apply the same patches used by RVM
* clean up file names and attribute names
2014-09-15 23:54:17 -04:00
William A. Kennington III 3141ce3e15 gems: Add rdoc, execjs, uglifier 2014-09-11 15:41:45 -07:00
Domen Kožar 3f441d82f9 rubyLibs: add erubis and yajl 2014-09-12 00:31:37 +02:00
Domen Kožar aa162b388d package gim-nix and document it 2014-09-12 00:26:51 +02:00
Joel Taylor 3e8344d334 suitable clang stdenv 2014-09-09 13:54:24 -07:00
Michael Fellinger 57b667fe65 ruby: add version 2.1.2 2014-08-31 13:24:10 +01:00
Domen Kožar bce42c282a rubyLibs.nokogiri: fix build 2014-08-24 18:33:47 +02:00
Michael Raskin ede8be9281 Fix tarball evaluation; had to regenerate Ruby gem list 2014-08-24 12:55:08 +04:00
Rickard Nilsson 52b53dc370 ruby gems: Add riemann-dash 2014-08-23 12:41:49 +02:00
Bjørn Forsman f0be5119d9 ruby/patches.nix: sort attributes alphabetically
And remove trailing whitespace.
2014-02-01 19:56:54 +01:00
Shea Levy 44c97e02f6 Move GEM_PATH part of rubygems' setup hook to ruby
Fixes #1413

Signed-off-by: Shea Levy <shea@shealevy.com>
2013-12-26 18:38:10 -05:00
Nixpkgs Monitor 56c9ae9b1d rubygems: update from 1.8.17 to 1.8.25, potentially fixes CVE-2012-2125, CVE-2012-2126, CVE-2013-4287, CVE-2013-4363 2013-12-04 05:10:30 +02:00
zimbatm b802a7be88 Updates ruby 1.8.7 to the latest patch-level. WARNING: unsupported
ruby 1.8 should be phased out as it contains security issues and is
unsupported by the ruby core team. This is the last update available but it
doesn't fix all CVEs.
2013-12-02 20:11:58 +01:00
zimbatm c8065de0af Updates ruby 2.0.0 to patch-level 353. Fixes CVE-2013-4164 2013-12-02 20:11:58 +01:00
zimbatm 75a6ed8ddb Updates ruby 1.9.3 to patch-level 484. Fixes CVE-2013-4164 2013-12-02 20:11:58 +01:00
zimbatm 7c6e108c2d Use the recommended http://cache.ruby-lang.org host to get the ruby archives 2013-12-02 20:11:58 +01:00
zimbatm 7a01483d51 Fixes ruby 2.0.0 compilation on Darwin. 2013-12-02 20:11:58 +01:00
Jason "Don" O'Conal e4d0b4384e rubyLibs.rubyzip: add expression 2013-11-27 23:17:53 +01:00
Jason "Don" O'Conal 9f6353cc2b rubyLibs.pry: add expression 2013-11-27 23:17:53 +01:00
Jason "Don" O'Conal 8cdea678f0 rubyLibs.launchy: add expression 2013-11-27 23:17:53 +01:00
Jason "Don" O'Conal b323b561ec rubyLibs.coderay: add expression 2013-11-27 23:17:53 +01:00
Jason "Don" O'Conal f52a0d1110 rubyLibs.syntax: add expression 2013-11-27 23:17:53 +01:00