Commit graph

295 commits

Author SHA1 Message Date
William A. Kennington III
333f145d76 Merge branch 'master.upstream' into staging.upstream 2015-07-13 15:11:31 -07:00
Jude Taylor
7393c6c69d modernize rubies 2015-07-10 10:28:27 -07:00
William A. Kennington III
dae5b35463 ruby: Fixup libv8 versions 2015-07-08 15:10:50 -07:00
William A. Kennington III
f92c174cce ruby: Correct version string 2015-07-08 14:24:42 -07:00
William A. Kennington III
7cda24c01e Merge branch 'master.upstream' into staging.upstream 2015-07-08 14:11:16 -07:00
Charles Strahan
357324df26 ruby: add 2.2.2, bump patch levels
* Adds Ruby 2.2.2
* 1.9.3-p547 -> 1.9.3-p551
* 2.0.0-p481 -> 2.0.0-p645
2015-07-07 17:45:33 -04:00
Charles Strahan
4ea88cc526 ruby: fix version 2.2.0 2015-07-07 17:43:49 -04:00
William A. Kennington III
ae28ff8b91 Merge branch 'master.upstream' into staging.upstream 2015-07-06 17:15:11 -07:00
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